Skip to content

[feature/tls-diff] TLS certificate comparison #872

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hosy merged 6 commits into from
Feb 2, 2021
Merged

[feature/tls-diff] TLS certificate comparison #872

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a5f5968
Add support for TLS certificate change diff:
felix-schwarz Jan 19, 2021
2500527
- update sdk
felix-schwarz Jan 19, 2021
0e5ed42
Updated to the newest SDK development commit
hosy Feb 1, 2021
f6d211c
Merge remote-tracking branch 'origin/milestone/11.5' into feature/tls…
felix-schwarz Feb 1, 2021
f40def8
Merge branch 'feature/tls-diff' of https://github.com/owncloud/ios-ap…
felix-schwarz Feb 1, 2021
e8272aa
- Update SDK to only show "Show ±" and "Hide ±" if the compared certi…
felix-schwarz Feb 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ios-sdk
Open in desktop
Submodule ios-sdk updated 7 files
+6 −2 ownCloudUI/Certificate Metadata/OCCertificate+OpenSSL.h
+2 −2 ownCloudUI/Certificate Metadata/OCCertificate+OpenSSL.m
+33 −8 ownCloudUI/Certificate Metadata/OCCertificateDetailsViewNode.h
+266 −39 ownCloudUI/Certificate Metadata/OCCertificateDetailsViewNode.m
+9 −2 ownCloudUI/Certificate Metadata/OCCertificateViewController.h
+120 −9 ownCloudUI/Certificate Metadata/OCCertificateViewController.m
+4 −0 ownCloudUI/Resources/en.lproj/Localizable.strings
4 changes: 0 additions & 4 deletions ownCloud.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,6 @@
DC18898E218A773700CFB3F9 /* ownCloudMocking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0196A620F754CA00C41B78 /* ownCloudMocking.framework */; };
DC1B2707209CF0D3004715E1 /* IssuesDismissalAnimator.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC1B26FE209CF0D2004715E1 /* IssuesDismissalAnimator.swift */; };
DC1B2708209CF0D3004715E1 /* IssuesPresentationAnimator.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC1B26FF209CF0D2004715E1 /* IssuesPresentationAnimator.swift */; };
DC1B2709209CF0D3004715E1 /* CertificateViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC1B2705209CF0D3004715E1 /* CertificateViewController.swift */; };
DC1B270A209CF0D3004715E1 /* ConnectionIssueViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC1B2706209CF0D3004715E1 /* ConnectionIssueViewController.swift */; };
DC1B270C209CF34B004715E1 /* BookmarkViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC1B270B209CF34B004715E1 /* BookmarkViewController.swift */; };
DC20DE5C21C01A3D0096000B /* ownCloudMocking.framework in EarlGrey Copy Files */ = {isa = PBXBuildFile; fileRef = DC0196A620F754CA00C41B78 /* ownCloudMocking.framework */; };
Expand Down Expand Up @@ -1156,7 +1155,6 @@
DC1AC7CF2319ADAE002B7892 /* ScanViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScanViewController.swift; sourceTree = "<group>"; };
DC1B26FE209CF0D2004715E1 /* IssuesDismissalAnimator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IssuesDismissalAnimator.swift; sourceTree = "<group>"; };
DC1B26FF209CF0D2004715E1 /* IssuesPresentationAnimator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IssuesPresentationAnimator.swift; sourceTree = "<group>"; };
DC1B2705209CF0D3004715E1 /* CertificateViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CertificateViewController.swift; sourceTree = "<group>"; };
DC1B2706209CF0D3004715E1 /* ConnectionIssueViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConnectionIssueViewController.swift; sourceTree = "<group>"; };
DC1B270B209CF34B004715E1 /* BookmarkViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarkViewController.swift; sourceTree = "<group>"; };
DC23D1D6238F390200423F62 /* OCLicenseAppStoreReceipt.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OCLicenseAppStoreReceipt.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2151,7 +2149,6 @@
DC1B2704209CF0D3004715E1 /* Issues Subclasses */ = {
isa = PBXGroup;
children = (
DC1B2705209CF0D3004715E1 /* CertificateViewController.swift */,
DC1B2706209CF0D3004715E1 /* ConnectionIssueViewController.swift */,
);
path = "Issues Subclasses";
Expand Down Expand Up @@ -3816,7 +3813,6 @@
DCD1300A23A191C000255779 /* LicenseOfferButton.swift in Sources */,
0269F589244DED02002E9D99 /* UIAlertController+UniversalLinks.swift in Sources */,
4C9BFA2323158C3F0059CA3E /* PreviewViewController.swift in Sources */,
DC1B2709209CF0D3004715E1 /* CertificateViewController.swift in Sources */,
4C3E17DB234DBF9A000D7BA8 /* PendingMediaUploadTaskExtension.swift in Sources */,
DCC832DE242C0C3700153F8C /* DisplaySleepPreventer.swift in Sources */,
6E586CFC2199A72600F680C4 /* OpenInAction.swift in Sources */,
Expand Down
7 changes: 3 additions & 4 deletions ownCloud/Bookmarks/BookmarkViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,11 +185,10 @@ class BookmarkViewController: StaticTableViewController {

certificateRow = StaticTableViewRow(rowWithAction: { [weak self] (_, _) in
if let certificate = self?.bookmark?.certificate {
if let certificateViewController : ThemeCertificateViewController = ThemeCertificateViewController(certificate: certificate) {
let navigationController = ThemeNavigationController(rootViewController: certificateViewController)
let certificateViewController : ThemeCertificateViewController = ThemeCertificateViewController(certificate: certificate, compare: nil)
let navigationController = ThemeNavigationController(rootViewController: certificateViewController)

self?.present(navigationController, animated: true, completion: nil)
}
self?.present(navigationController, animated: true, completion: nil)
}
}, title: "Certificate Details".localized, accessoryType: .disclosureIndicator, accessoryView: BorderedLabel(), identifier: "row-url-certificate")

Expand Down
68 changes: 0 additions & 68 deletions ownCloud/Bookmarks/Issues/Issues Subclasses/CertificateViewController.swift
View file
Open in desktop

This file was deleted.

23 changes: 10 additions & 13 deletions ownCloud/Bookmarks/Issues/Issues Subclasses/ConnectionIssueViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ class ConnectionIssueViewController: IssuesViewController {
private var displayIssues : DisplayIssues?
private var dismissedHandler : (() -> Void)?

var bookmark : OCBookmark?

required init?(coder aDecoder: NSCoder) {
super.init(coder: aDecoder)
}
Expand All @@ -42,12 +44,13 @@ class ConnectionIssueViewController: IssuesViewController {
displayIssues = issues
}

convenience init(displayIssues issues: DisplayIssues?, title: String? = nil, completion:@escaping (ConnectionResponse) -> Void, dismissedHandler dismissedHandlerBlock: (() -> Void)? = nil) {
convenience init(displayIssues issues: DisplayIssues?, title: String? = nil, bookmark: OCBookmark? = nil, completion:@escaping (ConnectionResponse) -> Void, dismissedHandler dismissedHandlerBlock: (() -> Void)? = nil) {
var useButtons : [IssueButton]?
var useTitle = title

self.init(displayIssues: issues, buttons: nil, title: useTitle)

self.bookmark = bookmark
self.dismissedHandler = dismissedHandlerBlock

if let displayLevel = issues?.displayLevel {
Expand Down Expand Up @@ -111,20 +114,14 @@ class ConnectionIssueViewController: IssuesViewController {

extension ConnectionIssueViewController {
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
if let issue = displayIssues?.displayIssues[indexPath.row], issue.type == OCIssueType.certificate {
let certificateViewController = CertificateViewController()
certificateViewController.modalPresentationStyle = .overCurrentContext

if let certificateNodes = OCCertificateDetailsViewNode.certificateDetailsViewNodes(for: issue.certificate, withValidationCompletionHandler: { (certificateNodes) in
let certDetails: NSAttributedString = OCCertificateDetailsViewNode.attributedString(withCertificateDetails: certificateNodes)
if let issue = displayIssues?.displayIssues[indexPath.row], issue.type == .certificate, let certificate = issue.certificate {
let certificateViewController = ThemeCertificateViewController(certificate: certificate, compare: bookmark?.certificate)

OnMainThread {
certificateViewController.localizedDescription = certDetails
}
}) {
certificateViewController.localizedDescription = OCCertificateDetailsViewNode.attributedString(withCertificateDetails: certificateNodes)
self.present(certificateViewController, animated: true, completion: nil)
if bookmark?.certificate != nil {
certificateViewController.showDifferences = true
}

self.present(ThemeNavigationController(rootViewController: certificateViewController), animated: true, completion: nil)
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ownCloud/Client/ClientRootViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,7 @@ extension ClientRootViewController : OCCoreDelegate {
if presentIssue?.type == .multipleChoice {
presentViewController = ThemedAlertController(with: presentIssue!, completion: queueCompletionHandler)
} else {
presentViewController = ConnectionIssueViewController(displayIssues: presentIssue?.prepareForDisplay(), completion: { (response) in
presentViewController = ConnectionIssueViewController(displayIssues: presentIssue?.prepareForDisplay(), bookmark: self?.bookmark, completion: { (response) in
switch response {
case .cancel:
presentIssue?.reject()
Expand Down
5 changes: 2 additions & 3 deletions ownCloud/Settings/Certificate Management/CertificateManagementViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,8 @@ class CertificateManagementViewController: StaticTableViewController {

let approvalDate = shortReason + " " + ((certificate.userAcceptedDate==nil) ? " \("undated".localized)" : DateFormatter.localizedString(from: certificate.userAcceptedDate!, dateStyle: .medium, timeStyle: .short))
let certificateRow = CertificateManagementRow(subtitleRowWithAction: { (row, _) in
if let certificateDetailsViewController = ThemeCertificateViewController(certificate: certificate) {
row.viewController?.navigationController?.pushViewController(certificateDetailsViewController, animated: true)
}
let certificateDetailsViewController = ThemeCertificateViewController(certificate: certificate, compare: nil)
row.viewController?.navigationController?.pushViewController(certificateDetailsViewController, animated: true)
}, title: certificate.hostName ?? "", subtitle: approvalDate, accessoryType: .disclosureIndicator)

certificateRow.certificate = certificate
Expand Down