Browse Source

fix checkTrustedChallenge [rollback] + host

Signed-off-by: marinofaggiana <marino@marinofaggiana.com>
marinofaggiana 3 years ago
parent
commit
7b1d3387ec

+ 0 - 4
iOSClient/NCGlobal.swift

@@ -196,10 +196,6 @@ class NCGlobal: NSObject {
     //
     let fileNameRichWorkspace                       = "Readme.md"
     
-    // Certificate pinning
-    //
-    let certificateTmp                              = "tmp.der"
-
     // Extension
     @objc let extensionPreview                      = "ico"
     

+ 2 - 2
iOSClient/Networking/NCNetworking.swift

@@ -181,7 +181,7 @@ import Queuer
                 let certificate = NSData(bytes: data, length: size)
                 
                 // write certificate tmp to disk
-                certificate.write(toFile: directoryCertificate + "/" + NCGlobal.shared.certificateTmp, atomically: true)
+                certificate.write(toFile: directoryCertificate + "/" + host + ".tmp", atomically: true)
                 
                 // verify
                 let certificateSavedPath = directoryCertificate + "/" + host + ".der"
@@ -210,7 +210,7 @@ import Queuer
             let urlComponents = URLComponents(url: url, resolvingAgainstBaseURL: false)
             if let host = urlComponents?.host {
             
-                let certificateAtPath = directoryCertificate + "/" + NCGlobal.shared.certificateTmp
+                let certificateAtPath = directoryCertificate + "/" + host + ".tmp"
                 let certificateToPath = directoryCertificate + "/" + host + ".der"
             
                 if !NCUtilityFileSystem.shared.moveFile(atPath: certificateAtPath, toPath: certificateToPath) {

+ 3 - 3
iOSClient/Security/NCViewCertificateDetails.swift

@@ -53,10 +53,10 @@ class NCViewCertificateDetails: UIViewController  {
         self.navigationItem.title = NSLocalizedString("_certificate_details_", comment: "")
         buttonCancel.title = NSLocalizedString("_close_", comment: "")
         
-        let certificatePath = directoryCertificate + "/" + host + ".txt"
-        if FileManager.default.fileExists(atPath: certificatePath) {
+        let certNamePathTXT = directoryCertificate + "/" + host + ".txt"
+        if FileManager.default.fileExists(atPath: certNamePathTXT) {
             do {
-                let text = try String(contentsOfFile: certificatePath, encoding: .utf8)
+                let text = try String(contentsOfFile: certNamePathTXT, encoding: .utf8)
                 let font = UIFont.systemFont(ofSize: 13)
                 let attributes = [NSAttributedString.Key.font: font] as [NSAttributedString.Key : Any]
                 var contentRect = NSString(string: text).boundingRect(with: CGSize(width: CGFloat.greatestFiniteMagnitude, height: 0), options: NSStringDrawingOptions.usesLineFragmentOrigin, attributes: attributes, context: nil)