Fixed WebDAV connection error for Apache servers

FileProvider.podspec

@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   #
 
   s.name         = "FileProvider"
-  s.version      = "0.3.2"
+  s.version      = "0.3.3"
   s.summary      = "NSFileManager replacement for Local and Remote (WebDAV/Dropbox/SMB2) files on iOS and MacOS."
 
   # This description is used to generate tags and improve search results.

FileProvider.xcodeproj/project.pbxproj

@@ -170,16 +170,16 @@
 			isa = PBXGroup;
 			children = (
 				7993969A1D48C02300086753 /* CIFSTypes.swift */,
+				799396A41D48C02300086753 /* SMBErrorType.swift */,
 				7993969B1D48C02300086753 /* SMB2DataTypes.swift */,
-				7993969C1D48C02300086753 /* SMB2FileHandle.swift */,
+				799396A31D48C02300086753 /* SMB2Types.swift */,
+				799396A21D48C02300086753 /* SMB2Tree.swift */,
+				799396A01D48C02300086753 /* SMB2Session.swift */,
 				7993969D1D48C02300086753 /* SMB2FileOperation.swift */,
+				7993969C1D48C02300086753 /* SMB2FileHandle.swift */,
 				7993969E1D48C02300086753 /* SMB2IOCtl.swift */,
 				7993969F1D48C02300086753 /* SMB2Query.swift */,
-				799396A01D48C02300086753 /* SMB2Session.swift */,
 				799396A11D48C02300086753 /* SMB2SetInfo.swift */,
-				799396A21D48C02300086753 /* SMB2Tree.swift */,
-				799396A31D48C02300086753 /* SMB2Types.swift */,
-				799396A41D48C02300086753 /* SMBErrorType.swift */,
 			);
 			path = SMBTypes;
 			sourceTree = "<group>";
@@ -778,6 +778,7 @@
 				7993966E1D48B7F600086753 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 		7993967A1D48B80D00086753 /* Build configuration list for PBXNativeTarget "FileProvider OSX" */ = {
 			isa = XCConfigurationList;
@@ -786,6 +787,7 @@
 				7993967C1D48B80D00086753 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 		799396871D48B82700086753 /* Build configuration list for PBXNativeTarget "FileProvider tvOS" */ = {
 			isa = XCConfigurationList;
@@ -794,6 +796,7 @@
 				799396891D48B82700086753 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
 	};

README.md

@@ -30,7 +30,7 @@ Local and WebDAV providers are fully tested and can be used in production enviro
 
 ## Requirements
 
-- **Swift 2.2**
+- **Swift 2.2 or 2.3**
 - iOS 8.0 , OSX 10.10
 - XCode 7.3
 
@@ -81,7 +81,9 @@ You can't change the base url later. and all paths are related to this base url
 For remote file providers authentication may be necessary:
 
 	let credential = NSURLCredential(user: "user", password: "pass", persistence: NSURLCredentialPersistence.Permanent)
-	let webdavProvider = WebDAVFileProvider(baseURL: "http://www.example.com/dav", credential: credential)
+	let webdavProvider = WebDAVFileProvider(baseURL: NSURL(string: "http://www.example.com/dav")!, credential: credential)
+
+* In case you want to connect non-secure servers for WebDAV (http) in iOS 9+ / macOS 10.11+ you should disable App Transport Security (ATS) according to [this guide.](https://gist.github.com/mlynch/284699d676fe9ed0abfa)
 
 * For Dropbox, user is clientID and password is Token which both must be retrieved via [OAuth2 API of Dropbox](https://www.dropbox.com/developers/reference/oauth-guide). There are libraries like [p2/OAuth2](https://github.com/p2/OAuth2) or [OAuthSwift](https://github.com/OAuthSwift/OAuthSwift) which can facilate the procedure to retrieve token.
 	
@@ -101,7 +103,7 @@ Your class should conforms `FileProviderDelegate` class:
 		documentsProvider.delegate = self
 	}
 	
-	func fileproviderSucceed(fileProvider: FileProvider, operation: FileOperation) {
+	func fileproviderSucceed(fileProvider: FileProviderOperations, operation: FileOperation) {
 		switch operation {
 		case .Copy(source: let source, destination: let dest):
 			NSLog("\(source) copied to \(dest).")
@@ -112,7 +114,7 @@ Your class should conforms `FileProviderDelegate` class:
 		}
 	}
 	
-    func fileproviderFailed(fileProvider: FileProvider, operation: FileOperation) {
+    func fileproviderFailed(fileProvider: FileProviderOperations, operation: FileOperation) {
     	switch operation {
 		case .Copy(source: let source, destination: let dest):
 			NSLog("copy of \(source) failed.")
@@ -123,7 +125,7 @@ Your class should conforms `FileProviderDelegate` class:
 		}
     }
 	
-    func fileproviderProgress(fileProvider: FileProvider, operation: FileOperation, progress: Float) {
+    func fileproviderProgress(fileProvider: FileProviderOperations, operation: FileOperation, progress: Float) {
 		switch operation {
 		case .Copy(source: let source, destination: let dest):
 			NSLog("Copy\(source) to \(dest): \(progress * 100) completed.")
@@ -211,7 +213,7 @@ Move file old.txt to new.txt in current path:
 
 ### Retrieve Content of File
 
-THere is two method for this purpose, one of them loads entire file into NSData and another can load a portion of file.
+There is two method for this purpose, one of them loads entire file into NSData and another can load a portion of file.
 
 	documentsProvider.contentsAtPath(path: "old.txt", completionHandler: {
 		(contents: NSData?, error: ErrorType?) -> Void
@@ -252,6 +254,13 @@ You can monitor updates in some file system (Local and SMB2), there is three met
 
 We would love for you to contribute to **FileProvider**, check the `LICENSE` file for more info.
 
+## Projects in use
+
+* [EDM - Browse and Receive Files](https://itunes.apple.com/us/app/edm-browse-and-receive-files/id948397575?ls=1&mt=8)
+* [File Manager - PDF Reader & Music Player](https://itunes.apple.com/us/app/file-manager-pdf-reader-music/id1017809685?ls=1&mt=8)
+
+If you used this library in your project, you can open an issue to inform us.
+
 ## Meta
 
 Amir-Abbas Mousavian  – [@amosavian](https://twitter.com/amosavian)
@@ -260,7 +269,7 @@ Distributed under the MIT license. See `LICENSE` for more information.
 
 [https://github.com/yourname/github-link](https://github.com/dbader/)
 
-[swift-image]:https://img.shields.io/badge/swift-2.2-green.svg
+[swift-image]:https://img.shields.io/badge/swift-2.2%2C%202.3-green.svg
 [swift-url]: https://swift.org/
 [license-image]: https://img.shields.io/badge/License-MIT-blue.svg
 [license-url]: LICENSE

Sources/DropboxFileProvider.swift

@@ -132,7 +132,7 @@ extension DropboxFileProvider: FileProviderOperations {
     }
     
     public func createFile(fileAttribs: FileObject, atPath path: String, contents data: NSData?, completionHandler: SimpleCompletionHandler) {
-        NotImplemented()
+        self.writeContentsAtPath(path, contents: data ?? NSData(), completionHandler: completionHandler)
     }
     
     public func moveItemAtPath(path: String, toPath: String, overwrite: Bool = false, completionHandler: SimpleCompletionHandler) {
@@ -209,21 +209,28 @@ extension DropboxFileProvider: FileProviderOperations {
         task.resume()
     }
     
-    public func copyPathToLocalFile(path: String, toLocalURL: NSURL, completionHandler: SimpleCompletionHandler) {
-        NotImplemented()
-        let request = NSMutableURLRequest(URL: absoluteURL(path))
-        let task = session.downloadTaskWithRequest(request) { (sourceFileURL, response, error) in
-            if let sourceFileURL = sourceFileURL {
-                do {
-                    try NSFileManager.defaultManager().copyItemAtURL(sourceFileURL, toURL: toLocalURL)
-                } catch let e {
-                    completionHandler?(error: e)
-                    return
-                }
+    public func copyPathToLocalFile(path: String, toLocalURL destURL: NSURL, completionHandler: SimpleCompletionHandler) {
+        let url = NSURL(string: "https://api.dropboxapi.com/2/files/download")!
+        let request = NSMutableURLRequest(URL: url)
+        request.HTTPMethod = "GET"
+        request.setValue("Bearer \(credential?.password ?? "")", forHTTPHeaderField: "Authorization")
+        request.setValue("application/json", forHTTPHeaderField: "Content-Type")
+        let requestDictionary = ["path": path]
+        request.setValue(dictionaryToJSON(requestDictionary), forHTTPHeaderField: "Dropbox-API-Arg")
+        let task = session.downloadTaskWithRequest(request, completionHandler: { (cacheURL, response, error) in
+            guard let cacheURL = cacheURL, let httpResponse = response as? NSHTTPURLResponse where httpResponse.statusCode < 300 else {
+                let code = FileProviderDropboxErrorCode(rawValue: (response as? NSHTTPURLResponse)?.statusCode ?? -1)
+                let dbError: FileProviderDropboxError? = code != nil ? FileProviderDropboxError(code: code!, path: path) : nil
+                completionHandler?(error: dbError ?? error)
+                return
             }
-            completionHandler?(error: error)
-        }
-        task.taskDescription = self.dictionaryToJSON(["type": "Copy", "source": path, "dest": toLocalURL.uw_absoluteString])
+            do {
+                try NSFileManager.defaultManager().moveItemAtURL(cacheURL, toURL: destURL)
+                completionHandler?(error: nil)
+            } catch let e {
+                completionHandler?(error: e)
+            }
+        })
         task.resume()
     }
 }
@@ -234,7 +241,6 @@ extension DropboxFileProvider: FileProviderReadWrite {
     }
     
     public func contentsAtPath(path: String, offset: Int64, length: Int, completionHandler: ((contents: NSData?, error: ErrorType?) -> Void)) {
-        
         let url = NSURL(string: "https://api.dropboxapi.com/2/files/download")!
         let request = NSMutableURLRequest(URL: url)
         request.HTTPMethod = "GET"
@@ -335,6 +341,8 @@ internal extension DropboxFileProvider {
     }
 }
 
+extension DropboxFileProvider: FileProvider {}
+
 // MARK: URLSession delegate
 extension DropboxFileProvider: NSURLSessionDataDelegate, NSURLSessionDownloadDelegate {
     public func URLSession(session: NSURLSession, downloadTask: NSURLSessionDownloadTask, didFinishDownloadingToURL location: NSURL) {

Sources/FileProvider.swift

@@ -336,7 +336,7 @@ public protocol FileOperationDelegate: class {
     /// fileProvider(_:shouldOperate:) gives the delegate an opportunity to filter the file operation. Returning true from this method will allow the copy to happen. Returning false from this method causes the item in question to be skipped. If the item skipped was a directory, no children of that directory will be subject of the operation, nor will the delegate be notified of those children.
     func fileProvider(fileProvider: FileProviderOperations, shouldDoOperation operation: FileOperation) -> Bool
     
-    /// fileProvider:shouldProceedAfterError:copyingItemAtPath:toPath: gives the delegate an opportunity to recover from or continue copying after an error. If an error occurs, the error object will contain an ErrorType indicating the problem. The source path and destination paths are also provided. If this method returns true, the FileProvider instance will continue as if the error had not occurred. If this method returns false, the NSFileManager instance will stop copying, return false from copyItemAtPath:toPath:error: and the error will be provied there.
+    /// fileProvider(_:shouldProceedAfterError:copyingItemAtPath:toPath:) gives the delegate an opportunity to recover from or continue copying after an error. If an error occurs, the error object will contain an ErrorType indicating the problem. The source path and destination paths are also provided. If this method returns true, the FileProvider instance will continue as if the error had not occurred. If this method returns false, the NSFileManager instance will stop copying, return false from copyItemAtPath:toPath:error: and the error will be provied there.
     func fileProvider(fileProvider: FileProviderOperations, shouldProceedAfterError error: ErrorType, operation: FileOperation) -> Bool
 }
 

Sources/LocalFileProvider.swift

@@ -324,6 +324,7 @@ public class LocalFileProvider: FileProvider, FileProviderMonitor {
         for (i, monitor) in monitors.enumerate() {
             if self.relativePathOf(url: monitor.url) == path {
                 removedMonitor = monitors.removeAtIndex(i)
+                break
             }
         }
         removedMonitor?.stop()

Sources/SMBTypes/SMB2IOCtl.swift

@@ -243,11 +243,12 @@ extension SMB2 {
         // SRV_ENUMERATE_SNAPSHOTS
         struct SrvSnapshots: IOCtlResponseProtocol {
             let count: UInt32
+            let returnedCount: UInt32
             let snapshots: [SMBTime]
             
             init?(data: NSData) {
                 self.count = decode(data)
-                let returnedCount: UInt32 = decode(data.subdataWithRange(NSRange(location: 4, length: 4)))
+                self.returnedCount = decode(data.subdataWithRange(NSRange(location: 4, length: 4)))
                 //let size: UInt32 = decode(data.subdataWithRange(NSRange(location: 8, length: 4)))
                 var snapshots = [SMBTime]()
                 let dateFormatter = NSDateFormatter()

Sources/SMBTypes/SMB2Query.swift

@@ -11,6 +11,8 @@ import Foundation
 extension SMB2 {
     // MARK: SMB2 Query Directory
     
+    
+    
     // MARK: SMB2 Change Notify
     
     // MARK: SMB2 Query Info

Sources/WebDAVFileProvider.swift

@@ -102,7 +102,7 @@ public class WebDAVFileProvider: NSObject,  FileProviderBasic {
         let url = absoluteURL(path)
         let request = NSMutableURLRequest(URL: url)
         request.HTTPMethod = "PROPFIND"
-        request.setValue(baseURL?.uw_absoluteString, forHTTPHeaderField: "Host")
+        //request.setValue(baseURL?.uw_absoluteString, forHTTPHeaderField: "Host")
         request.setValue("1", forHTTPHeaderField: "Depth")
         request.setValue("text/xml; charset=\"utf-8\"", forHTTPHeaderField: "Content-Type")
         request.HTTPBody = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<D:propfind xmlns:D=\"DAV:\">\n<D:allprop/></D:propfind>".dataUsingEncoding(NSUTF8StringEncoding)
@@ -128,7 +128,7 @@ public class WebDAVFileProvider: NSObject,  FileProviderBasic {
     public func attributesOfItemAtPath(path: String, completionHandler: ((attributes: FileObject?, error: ErrorType?) -> Void)) {
         let request = NSMutableURLRequest(URL: absoluteURL(path))
         request.HTTPMethod = "PROPFIND"
-        request.setValue(baseURL?.uw_absoluteString, forHTTPHeaderField: "Host")
+        //request.setValue(baseURL?.uw_absoluteString, forHTTPHeaderField: "Host")
         request.setValue("1", forHTTPHeaderField: "Depth")
         request.setValue("text/xml; charset=\"utf-8\"", forHTTPHeaderField: "Content-Type")
         request.HTTPBody = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<D:propfind xmlns:D=\"DAV:\">\n<D:allprop/></D:propfind>".dataUsingEncoding(NSUTF8StringEncoding)
@@ -154,7 +154,7 @@ extension WebDAVFileProvider: FileProviderOperations {
         let url = absoluteURL((atPath as NSString).stringByAppendingPathComponent(folderName) + "/")
         let request = NSMutableURLRequest(URL: url)
         request.HTTPMethod = "MKCOL"
-        request.setValue(baseURL?.uw_absoluteString, forHTTPHeaderField: "Host")
+        //request.setValue(baseURL?.uw_absoluteString, forHTTPHeaderField: "Host")
         let task = session.dataTaskWithRequest(request) { (data, response, error) in
             if let response = response as? NSHTTPURLResponse, let code = FileProviderWebDavErrorCode(rawValue: response.statusCode) where code != .OK {
                 completionHandler?(error: FileProviderWebDavError(code: code, url: url))
@@ -193,7 +193,7 @@ extension WebDAVFileProvider: FileProviderOperations {
         } else {
             request.HTTPMethod = "COPY"
         }
-        request.setValue(baseURL?.uw_absoluteString, forHTTPHeaderField: "Host")
+        //request.setValue(baseURL?.uw_absoluteString, forHTTPHeaderField: "Host")
         request.setValue(absoluteURL(path).uw_absoluteString, forHTTPHeaderField: "Destination")
         if !overwrite {
             request.setValue("F", forHTTPHeaderField: "Overwrite")
@@ -223,7 +223,7 @@ extension WebDAVFileProvider: FileProviderOperations {
         let url = absoluteURL(path)
         let request = NSMutableURLRequest(URL: url)
         request.HTTPMethod = "DELETE"
-        request.setValue(baseURL?.uw_absoluteString, forHTTPHeaderField: "Host")
+        //request.setValue(baseURL?.uw_absoluteString, forHTTPHeaderField: "Host")
         let task = session.dataTaskWithRequest(request) { (data, response, error) in
             if let response = response as? NSHTTPURLResponse, let code = FileProviderWebDavErrorCode(rawValue: response.statusCode) {
                 defer {
@@ -317,7 +317,7 @@ extension WebDAVFileProvider: FileProviderReadWrite {
         let url = absoluteURL(path)
         let request = NSMutableURLRequest(URL: url)
         request.HTTPMethod = "PROPFIND"
-        request.setValue(baseURL?.uw_absoluteString, forHTTPHeaderField: "Host")
+        //request.setValue(baseURL?.uw_absoluteString, forHTTPHeaderField: "Host")
         //request.setValue("1", forHTTPHeaderField: "Depth")
         request.setValue("text/xml; charset=\"utf-8\"", forHTTPHeaderField: "Content-Type")
         request.HTTPBody = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<D:propfind xmlns:D=\"DAV:\">\n<D:allprop/></D:propfind>".dataUsingEncoding(NSUTF8StringEncoding)
@@ -357,6 +357,8 @@ extension WebDAVFileProvider: FileProviderReadWrite {
     // TODO: implements methods for lock mechanism
 }
 
+extension WebDAVFileProvider: FileProvider {}
+
 // MARK: WEBDAV XML response implementation
 
 internal extension WebDAVFileProvider {