Attachment 346858 Details for Bug 186870 – Patch

[patch] Patch

bug-186870-20180809132521.patch (text/plain), 7.72 KB, created by Ansh Shukla on 2018-08-09 13:25:22 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ansh Shukla

Created: 2018-08-09 13:25:22 PDT

Size: 7.72 KB

patch

obsolete

>Subversion Revision: 234713
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 1a7de65ef11598dd4becab5c46542292ae1bd4f1..dc6b6b6668162da87c753ad376a0ea0761ee259e 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,21 @@
>+2018-08-09  Ansh Shukla  <ansh_shukla@apple.com>
>+
>+        NSURLAuthenticationMethodOAuth challenges are surfaced to clients in -didReceiveAuthenticationChallenge as NSURLAuthenticationMethodDefault
>+        https://bugs.webkit.org/show_bug.cgi?id=186870
>+        <rdar://problem/41314410>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Add the ProtectionSpaceAuthenticationSchemeOAuth type.
>+
>+        * platform/network/ProtectionSpaceBase.cpp:
>+        (WebCore::ProtectionSpaceBase::isPasswordBased const): Return yes because the oauth challenge
>+        expects a token in return.
>+        * platform/network/ProtectionSpaceBase.h:
>+        * platform/network/cocoa/ProtectionSpaceCocoa.mm:
>+        (WebCore::scheme):
>+        (WebCore::ProtectionSpace::nsSpace const):
>+
> 2018-08-08  Don Olmstead  <don.olmstead@sony.com>
> 
>         [Nicosia] Add the Nicosia-specific PlatformLayer type alias
>diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog
>index fa8557c7e9ea58558e24207f743683b6d8460848..7ea79bb1e86ceb51c266ca0a4c645520c73aefec 100644
>--- a/Source/WebCore/PAL/ChangeLog
>+++ b/Source/WebCore/PAL/ChangeLog
>@@ -1,3 +1,14 @@
>+2018-08-09  Ansh Shukla  <ansh_shukla@apple.com>
>+
>+        NSURLAuthenticationMethodOAuth challenges are surfaced to clients in -didReceiveAuthenticationChallenge as NSURLAuthenticationMethodDefault
>+        https://bugs.webkit.org/show_bug.cgi?id=186870
>+        <rdar://problem/41314410>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * pal/spi/cf/CFNetworkSPI.h: Declare OAuth string when not building against the
>+        internal SDK.
>+
> 2018-08-07  Ryan Haddad  <ryanhaddad@apple.com>
> 
>         Unreviewed, suppress warnings to fix the build.
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index b854c601526f4042875433994e5781d73e4bb17a..1a7873d1a894f6f2ccc4eb7af67ff7f06a91232c 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-08-09  Ansh Shukla  <ansh_shukla@apple.com>
>+
>+        NSURLAuthenticationMethodOAuth challenges are surfaced to clients in -didReceiveAuthenticationChallenge as NSURLAuthenticationMethodDefault
>+        https://bugs.webkit.org/show_bug.cgi?id=186870
>+        <rdar://problem/41314410>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Correctly expose the OAuth protection space type in API.
>+
>+        * UIProcess/API/C/WKAPICast.h:
>+        (WebKit::toAPI):
>+        * UIProcess/API/C/WKProtectionSpaceTypes.h:
>+
> 2018-08-08  Commit Queue  <commit-queue@webkit.org>
> 
>         Unreviewed, rolling out r234314, r234320, and r234321.
>diff --git a/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h b/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h
>index d9ba909b7fb6f8fbd0d8d2915f3183b223376554..3dc2950aad8b4aa2ad6b1780b94f7a2508318ef3 100644
>--- a/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h
>+++ b/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h
>@@ -178,6 +178,8 @@ typedef void (^CFCachedURLResponseCallBackBlock)(CFCachedURLResponseRef);
> #endif
> @end
> 
>+extern NSString * const NSURLAuthenticationMethodOAuth;
>+
> #endif // defined(__OBJC__)
> 
> #endif // !PLATFORM(WIN) && !USE(APPLE_INTERNAL_SDK)
>diff --git a/Source/WebCore/platform/network/ProtectionSpaceBase.cpp b/Source/WebCore/platform/network/ProtectionSpaceBase.cpp
>index fca64c8012e6d6c72ca2a1e066be49e131ed4696..14eac6a042ee7134d1251ef3f197ba2b0b651952 100644
>--- a/Source/WebCore/platform/network/ProtectionSpaceBase.cpp
>+++ b/Source/WebCore/platform/network/ProtectionSpaceBase.cpp
>@@ -108,6 +108,7 @@ bool ProtectionSpaceBase::isPasswordBased() const
>     case ProtectionSpaceAuthenticationSchemeHTMLForm:
>     case ProtectionSpaceAuthenticationSchemeNTLM:
>     case ProtectionSpaceAuthenticationSchemeNegotiate:
>+    case ProtectionSpaceAuthenticationSchemeOAuth:
>         return true;
>     case ProtectionSpaceAuthenticationSchemeClientCertificateRequested:
>     case ProtectionSpaceAuthenticationSchemeServerTrustEvaluationRequested:
>diff --git a/Source/WebCore/platform/network/ProtectionSpaceBase.h b/Source/WebCore/platform/network/ProtectionSpaceBase.h
>index b393e6401846ddbd2c9f6027ad1646ae9816c408..720592dbb9f821b131c3872579b4afb9277d157d 100644
>--- a/Source/WebCore/platform/network/ProtectionSpaceBase.h
>+++ b/Source/WebCore/platform/network/ProtectionSpaceBase.h
>@@ -52,6 +52,7 @@ enum ProtectionSpaceAuthenticationScheme {
>     ProtectionSpaceAuthenticationSchemeNegotiate = 6,
>     ProtectionSpaceAuthenticationSchemeClientCertificateRequested = 7,
>     ProtectionSpaceAuthenticationSchemeServerTrustEvaluationRequested = 8,
>+    ProtectionSpaceAuthenticationSchemeOAuth = 9,
>     ProtectionSpaceAuthenticationSchemeUnknown = 100
> };
>   
>diff --git a/Source/WebCore/platform/network/cocoa/ProtectionSpaceCocoa.mm b/Source/WebCore/platform/network/cocoa/ProtectionSpaceCocoa.mm
>index db1fb51bf99027bc2f3530a5d518b0ff7b7861bb..6218ceab2fb32251770fb12e0142fcd9ef16d24d 100644
>--- a/Source/WebCore/platform/network/cocoa/ProtectionSpaceCocoa.mm
>+++ b/Source/WebCore/platform/network/cocoa/ProtectionSpaceCocoa.mm
>@@ -26,6 +26,8 @@
> #import "config.h"
> #import "ProtectionSpaceCocoa.h"
> 
>+#import <pal/spi/cf/CFNetworkSPI.h>
>+
> namespace WebCore {
> 
> static ProtectionSpaceServerType type(NSURLProtectionSpace *space)
>@@ -80,6 +82,8 @@ static ProtectionSpaceAuthenticationScheme scheme(NSURLProtectionSpace *space)
>     if ([method isEqualToString:NSURLAuthenticationMethodServerTrust])
>         return ProtectionSpaceAuthenticationSchemeServerTrustEvaluationRequested;
> #endif
>+    if ([method isEqualToString:NSURLAuthenticationMethodOAuth])
>+        return ProtectionSpaceAuthenticationSchemeOAuth;
> 
>     ASSERT_NOT_REACHED();
>     return ProtectionSpaceAuthenticationSchemeUnknown;
>@@ -155,6 +159,9 @@ NSURLProtectionSpace *ProtectionSpace::nsSpace() const
>         method = NSURLAuthenticationMethodClientCertificate;
>         break;
> #endif
>+    case ProtectionSpaceAuthenticationSchemeOAuth:
>+        method = NSURLAuthenticationMethodOAuth;
>+        break;
>     default:
>         ASSERT_NOT_REACHED();
>     }
>diff --git a/Source/WebKit/UIProcess/API/C/WKAPICast.h b/Source/WebKit/UIProcess/API/C/WKAPICast.h
>index c50e1f92e00f30a15140df29ad8761688c668998..e65fd97026ce9d982843b39bb6f8798e2874912e 100644
>--- a/Source/WebKit/UIProcess/API/C/WKAPICast.h
>+++ b/Source/WebKit/UIProcess/API/C/WKAPICast.h
>@@ -364,6 +364,8 @@ inline WKProtectionSpaceAuthenticationScheme toAPI(WebCore::ProtectionSpaceAuthe
>         return kWKProtectionSpaceAuthenticationSchemeClientCertificateRequested;
>     case WebCore::ProtectionSpaceAuthenticationSchemeServerTrustEvaluationRequested:
>         return kWKProtectionSpaceAuthenticationSchemeServerTrustEvaluationRequested;
>+    case WebCore::ProtectionSpaceAuthenticationSchemeOAuth:
>+        return kWKProtectionSpaceAuthenticationSchemeOAuth;
>     default:
>         return kWKProtectionSpaceAuthenticationSchemeUnknown;
>     }
>diff --git a/Source/WebKit/UIProcess/API/C/WKProtectionSpaceTypes.h b/Source/WebKit/UIProcess/API/C/WKProtectionSpaceTypes.h
>index 4741460490c16f8e15daca02823c79619709f51b..1b25d038746ce085e2da2e8f1e62030445354b00 100644
>--- a/Source/WebKit/UIProcess/API/C/WKProtectionSpaceTypes.h
>+++ b/Source/WebKit/UIProcess/API/C/WKProtectionSpaceTypes.h
>@@ -53,6 +53,7 @@ enum  {
>     kWKProtectionSpaceAuthenticationSchemeNegotiate,
>     kWKProtectionSpaceAuthenticationSchemeClientCertificateRequested,
>     kWKProtectionSpaceAuthenticationSchemeServerTrustEvaluationRequested,
>+    kWKProtectionSpaceAuthenticationSchemeOAuth,
>     kWKProtectionSpaceAuthenticationSchemeUnknown = 100,
> };
> typedef uint32_t WKProtectionSpaceAuthenticationScheme;

Actions: View | Formatted Diff | Diff

Attachments on bug 186870: 343201 | 346858 | 347110 | 347114 | 347120 | 347128 | 347209 | 347213 | 347217 | 347221 | 347222 | 347230 | 347231 | 347235 | 347237 | 347238