Changeset 164138 in webkit

Timestamp:

Feb 14, 2014 3:15:18 PM (10 years ago)

Author:

andersca@apple.com

Message:

Add SPI for authentication
​https://bugs.webkit.org/show_bug.cgi?id=128847

Reviewed by Dan Bernstein.

• UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h:
• UIProcess/Cocoa/NavigationState.h:
• UIProcess/Cocoa/NavigationState.mm:

(WebKit::NavigationState::setNavigationDelegate):
(WebKit::NavigationState::LoaderClient::canAuthenticateAgainstProtectionSpaceInFrame):
(WebKit::NavigationState::LoaderClient::didReceiveAuthenticationChallengeInFrame):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKBackForwardList.mm (modified) (1 diff)
• UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h (modified) (1 diff)
• UIProcess/Cocoa/NavigationState.h (modified) (2 diffs)
• UIProcess/Cocoa/NavigationState.mm (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-02-14  Anders Carlsson  <andersca@apple.com>
+
+        Add SPI for authentication 
+        https://bugs.webkit.org/show_bug.cgi?id=128847
+
+        Reviewed by Dan Bernstein.
+
+        * UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h:
+        * UIProcess/Cocoa/NavigationState.h:
+        * UIProcess/Cocoa/NavigationState.mm:
+        (WebKit::NavigationState::setNavigationDelegate):
+        (WebKit::NavigationState::LoaderClient::canAuthenticateAgainstProtectionSpaceInFrame):
+        (WebKit::NavigationState::LoaderClient::didReceiveAuthenticationChallengeInFrame):
+
 2014-02-14  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.mm

@@ -32 +32 @@
 #import "WKNSArray.h"
 
-WK_EXPORT NSString * const WKBackForwardListDidChangeNotification = @"WKBackForwardListDidChangeNotification";
-WK_EXPORT NSString * const WKBackForwardListAddedItemKey = @"WKBackForwardListAddedItemKey";
-WK_EXPORT NSString * const WKBackForwardListRemovedItemsKey = @"WKBackForwardListRemovedItemsKey";
+NSString * const WKBackForwardListDidChangeNotification = @"WKBackForwardListDidChangeNotification";
+NSString * const WKBackForwardListAddedItemKey = @"WKBackForwardListAddedItemKey";
+NSString * const WKBackForwardListRemovedItemsKey = @"WKBackForwardListRemovedItemsKey";
 
 using namespace WebKit;

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h

@@ -35 +35 @@
 - (void)_webView:(WKWebView *)webView renderingProgressDidChange:(_WKRenderingProgressEvents)progressEvents;
 
+- (BOOL)_webView:(WKWebView *)webView canAuthenticateAgainstProtectionSpace:(NSURLProtectionSpace *)protectionSpace;
+- (void)_webView:(WKWebView *)webView didReceiveAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge;
+
 @end
 

trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h

@@ -85 +85 @@
         virtual void didFailLoadWithErrorForFrame(WebPageProxy*, WebFrameProxy*, uint64_t navigationID, const WebCore::ResourceError&, API::Object*) override;
         virtual void didLayout(WebKit::WebPageProxy*, WebCore::LayoutMilestones, API::Object*) override;
+        virtual bool canAuthenticateAgainstProtectionSpaceInFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, WebKit::WebProtectionSpace*) override;
+        virtual void didReceiveAuthenticationChallengeInFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, WebKit::AuthenticationChallengeProxy*) override;
         virtual void didChangeBackForwardList(WebKit::WebPageProxy*, WebKit::WebBackForwardListItem* addedItem, Vector<RefPtr<WebKit::WebBackForwardListItem>> removedItems) override;
 
@@ -117 +119 @@
 
         bool webViewRenderingProgressDidChange : 1;
+        bool webViewCanAuthenticateAgainstProtectionSpace : 1;
+        bool webViewDidReceiveAuthenticationChallenge : 1;
     } m_navigationDelegateMethods;
 

trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm

@@ -34 +34 @@
 #import "WKBackForwardListItemInternal.h"
 #import "WKFrameInfoInternal.h"
+#import "WKNSURLAuthenticationChallenge.h"
+#import "WKNSURLProtectionSpace.h"
 #import "WKNavigationActionInternal.h"
 #import "WKNavigationDelegatePrivate.h"
@@ -88 +90 @@
 
     m_navigationDelegateMethods.webViewRenderingProgressDidChange = [delegate respondsToSelector:@selector(_webView:renderingProgressDidChange:)];
+    m_navigationDelegateMethods.webViewCanAuthenticateAgainstProtectionSpace = [delegate respondsToSelector:@selector(_webView:canAuthenticateAgainstProtectionSpace:)];
+    m_navigationDelegateMethods.webViewDidReceiveAuthenticationChallenge = [delegate respondsToSelector:@selector(_webView:didReceiveAuthenticationChallenge:)];
 }
 
@@ -375 +379 @@
 }
 
+bool NavigationState::LoaderClient::canAuthenticateAgainstProtectionSpaceInFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, WebKit::WebProtectionSpace* protectionSpace)
+{
+    if (!m_navigationState.m_navigationDelegateMethods.webViewCanAuthenticateAgainstProtectionSpace)
+        return false;
+
+    auto navigationDelegate = m_navigationState.m_navigationDelegate.get();
+    if (!navigationDelegate)
+        return false;
+
+    return [static_cast<id <WKNavigationDelegatePrivate>>(navigationDelegate.get()) _webView:m_navigationState.m_webView canAuthenticateAgainstProtectionSpace:wrapper(*protectionSpace)];
+}
+
+void NavigationState::LoaderClient::didReceiveAuthenticationChallengeInFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, WebKit::AuthenticationChallengeProxy* authenticationChallenge)
+{
+    if (!m_navigationState.m_navigationDelegateMethods.webViewDidReceiveAuthenticationChallenge)
+        return;
+
+    auto navigationDelegate = m_navigationState.m_navigationDelegate.get();
+    if (!navigationDelegate)
+        return;
+
+    [static_cast<id <WKNavigationDelegatePrivate>>(navigationDelegate.get()) _webView:m_navigationState.m_webView didReceiveAuthenticationChallenge:wrapper(*authenticationChallenge)];
+}
+
 void NavigationState::LoaderClient::didChangeBackForwardList(WebKit::WebPageProxy*, WebKit::WebBackForwardListItem* addedItem, Vector<RefPtr<WebKit::WebBackForwardListItem>> removedItems)
 {