Merge remote-tracking branch 'origin/master' into swift-5.1-branch

Author: swift-ci

Foundation/URLProtectionSpace.swift

@@ -96,20 +96,22 @@ public let NSURLAuthenticationMethodNegotiate: String = "NSURLAuthenticationMeth
     @const NSURLAuthenticationMethodClientCertificate
     @abstract SSL Client certificate.  Applies to any protocol.
  */
+@available(*, deprecated, message: "swift-corelibs-foundation does not currently support certificate authentication.")
 public let NSURLAuthenticationMethodClientCertificate: String = "NSURLAuthenticationMethodClientCertificate"
 
 /*!
     @const NSURLAuthenticationMethodServerTrust
     @abstract SecTrustRef validation required.  Applies to any protocol.
  */
+@available(*, deprecated, message: "swift-corelibs-foundation does not support methods of authentication that rely on the Darwin Security framework.")
 public let NSURLAuthenticationMethodServerTrust: String = "NSURLAuthenticationMethodServerTrust"
 
 
 /*!
     @class URLProtectionSpace
     @discussion This class represents a protection space requiring authentication.
 */
-open class URLProtectionSpace : NSObject, NSSecureCoding, NSCopying {
+open class URLProtectionSpace : NSObject, NSCopying {
 
     private let _host: String
     private let _isProxy: Bool
@@ -123,17 +125,10 @@ open class URLProtectionSpace : NSObject, NSSecureCoding, NSCopying {
         return copy(with: nil)
     }
 
-    open func copy(with zone: NSZone? = nil) -> Any { NSUnimplemented() }
-    public static var supportsSecureCoding: Bool { return true }
-
-    open func encode(with aCoder: NSCoder) {
-        NSUnimplemented()
-    }
-    public required init?(coder aDecoder: NSCoder) {
-        NSUnimplemented()
+    open func copy(with zone: NSZone? = nil) -> Any {
+        return self // These instances are immutable.
     }
 
-    
     /*!
         @method initWithHost:port:protocol:realm:authenticationMethod:
         @abstract Initialize a protection space representing an origin server, or a realm on one
@@ -199,7 +194,34 @@ open class URLProtectionSpace : NSObject, NSSecureCoding, NSCopying {
         @abstract Determine if the password for this protection space can be sent securely
         @result YES if a secure authentication method or protocol will be used, NO otherwise
     */
-    open var receivesCredentialSecurely: Bool { NSUnimplemented() }
+    open var receivesCredentialSecurely: Bool {
+        switch self.protocol {
+        // The documentation is ambiguous whether a protection space needs to use the NSURLProtectionSpace… constants, or URL schemes.
+        // Allow both.
+        case NSURLProtectionSpaceHTTPS: fallthrough
+        case "https": fallthrough
+        case "ftps":
+            return true
+            
+        default:
+            switch authenticationMethod {
+            case NSURLAuthenticationMethodDefault: fallthrough
+            case NSURLAuthenticationMethodHTTPBasic: fallthrough
+            case NSURLAuthenticationMethodHTTPDigest: fallthrough
+            case NSURLAuthenticationMethodHTMLForm:
+                return false
+                
+            case NSURLAuthenticationMethodNTLM: fallthrough
+            case NSURLAuthenticationMethodNegotiate: fallthrough
+            case NSURLAuthenticationMethodClientCertificate: fallthrough
+            case NSURLAuthenticationMethodServerTrust:
+                return true
+                
+            default:
+                return false
+            }
+        }
+    }
 
     /*!
         @method host
@@ -333,18 +355,14 @@ extension URLProtectionSpace {
         @abstract Returns an array of acceptable certificate issuing authorities for client certification authentication. Issuers are identified by their distinguished name and returned as a DER encoded data.
         @result An array of NSData objects.  (Nil if the authenticationMethod is not NSURLAuthenticationMethodClientCertificate)
      */
-    public var distinguishedNames: [Data]? { NSUnimplemented() }
-}
-
-// TODO: Currently no implementation of Security.framework
-/*
-extension URLProtectionSpace {
+    @available(*, deprecated, message: "swift-corelibs-foundation does not currently support certificate authentication.")
+    public var distinguishedNames: [Data]? { return nil }
 
     /*!
         @method serverTrust
         @abstract Returns a SecTrustRef which represents the state of the servers SSL transaction state
         @result A SecTrustRef from Security.framework.  (Nil if the authenticationMethod is not NSURLAuthenticationMethodServerTrust)
      */
-    public var serverTrust: SecTrust? { NSUnimplemented() }
+    @available(*, unavailable, message: "swift-corelibs-foundation does not support methods of authentication that rely on the Darwin Security framework.")
+    public var serverTrust: Any? { NSUnsupported() }
 }
-*/

Foundation/URLProtocol.swift

@@ -261,7 +261,9 @@ open class URLProtocol : NSObject {
         @param request A request to make canonical.
         @result The canonical form of the given request. 
     */
-    open class func canonicalRequest(for request: URLRequest) -> URLRequest { NSUnimplemented() }
+    open class func canonicalRequest(for request: URLRequest) -> URLRequest {
+        NSRequiresConcreteImplementation()
+    }
 
     /*!
         @method requestIsCacheEquivalent:toRequest:
@@ -272,7 +274,9 @@ open class URLProtocol : NSObject {
         implementation-specific checks.
         @result YES if the two requests are cache-equivalent, NO otherwise.
     */
-    open class func requestIsCacheEquivalent(_ a: URLRequest, to b: URLRequest) -> Bool { NSUnimplemented() }
+    open class func requestIsCacheEquivalent(_ a: URLRequest, to b: URLRequest) -> Bool {
+        NSRequiresConcreteImplementation()
+    }
 
     /*! 
         @method startLoading