Changeset 111810 in webkit

Timestamp:

Mar 22, 2012 7:24:00 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] http authenticate dialog popup only once no matter authentication pass or fail
​https://bugs.webkit.org/show_bug.cgi?id=80135

Patch by Jonathan Dong <Jonathan Dong> on 2012-03-22
Reviewed by Rob Buis.

Source/WebCore:

Modified the interface function authenticationChallenge() in class
PageClientBlackBerry, moved Credential from return value to the
function's reference parameter, and returned a bool to indicate if
user pressed Ok button or not.
Removed the logic which checks m_currentWebChallenge not null,
because we should challenge user again if the last provided credential
is not valid; also added the logic that will popup challenge
dialog again immediately if user press Ok buttton directly without
inputting anything.

No new tests.

• platform/blackberry/PageClientBlackBerry.h:
• platform/network/blackberry/NetworkJob.cpp:

(WebCore::NetworkJob::handleAuthHeader):
(WebCore::NetworkJob::sendRequestWithCredentials):

Source/WebKit/blackberry:

Modified the interface function authenticationChallenge() in
class WebPagePrivate by returning a bool to indicate if user
pressed Ok button or not, and moved the Credential from return
value to the reference parameter.
Also updated the corresponding interface functions in class
WebPageClient.

• Api/WebPage.cpp:

(BlackBerry::WebKit::WebPagePrivate::authenticationChallenge):

• Api/WebPageClient.h:
• Api/WebPage_p.h:

(WebPagePrivate):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/blackberry/PageClientBlackBerry.h (modified) (1 diff)
• WebCore/platform/network/blackberry/NetworkJob.cpp (modified) (2 diffs)
• WebKit/blackberry/Api/WebPage.cpp (modified) (2 diffs)
• WebKit/blackberry/Api/WebPageClient.h (modified) (1 diff)
• WebKit/blackberry/Api/WebPage_p.h (modified) (1 diff)
• WebKit/blackberry/ChangeLog (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-22  Jonathan Dong  <jonathan.dong@torchmobile.com.cn>
+
+        [BlackBerry] http authenticate dialog popup only once no matter authentication pass or fail
+        https://bugs.webkit.org/show_bug.cgi?id=80135
+
+        Reviewed by Rob Buis.
+
+        Modified the interface function authenticationChallenge() in class
+        PageClientBlackBerry, moved Credential from return value to the
+        function's reference parameter, and returned a bool to indicate if
+        user pressed Ok button or not.
+        Removed the logic which checks m_currentWebChallenge not null,
+        because we should challenge user again if the last provided credential
+        is not valid; also added the logic that will popup challenge
+        dialog again immediately if user press Ok buttton directly without
+        inputting anything.
+
+        No new tests.
+
+        * platform/blackberry/PageClientBlackBerry.h:
+        * platform/network/blackberry/NetworkJob.cpp:
+        (WebCore::NetworkJob::handleAuthHeader):
+        (WebCore::NetworkJob::sendRequestWithCredentials):
+
 2012-03-22  Jason Liu  <jason.liu@torchmobile.com.cn>
 

trunk/Source/WebCore/platform/blackberry/PageClientBlackBerry.h

@@ -70 +70 @@
     virtual int showAlertDialog(BlackBerry::WebKit::WebPageClient::AlertType) = 0;
     virtual bool isActive() const = 0;
-    virtual WebCore::Credential authenticationChallenge(const WebCore::KURL&, const WebCore::ProtectionSpace&) = 0;
+    virtual bool authenticationChallenge(const WebCore::KURL&, const WebCore::ProtectionSpace&, WebCore::Credential&) = 0;
     virtual SaveCredentialType notifyShouldSaveCredential(bool) = 0;
 };

trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp

@@ -750 +750 @@
         return false;
 
-    if (!m_handle->getInternal()->m_currentWebChallenge.isNull())
-        return false;
-
     if (header.isEmpty())
         return false;
@@ -874 +871 @@
             m_handle->getInternal()->m_pass = "";
         } else {
-            Credential inputCredential = m_frame->page()->chrome()->client()->platformPageClient()->authenticationChallenge(newURL, protectionSpace);
-            username = inputCredential.user();
-            password = inputCredential.password();
-        }
-
-        if (username.isEmpty() && password.isEmpty())
-            return false;
+            Credential inputCredential;
+            bool isConfirmed = false;
+            do {
+                isConfirmed = m_frame->page()->chrome()->client()->platformPageClient()->authenticationChallenge(newURL, protectionSpace, inputCredential);
+                username = inputCredential.user();
+                password = inputCredential.password();
+            } while (isConfirmed && username.isEmpty() && password.isEmpty());
+        }
 
         credential = Credential(username, password, CredentialPersistenceForSession);

trunk/Source/WebKit/blackberry/Api/WebPage.cpp

@@ -2020 +2020 @@
 }
 
-Credential WebPagePrivate::authenticationChallenge(const KURL& url, const ProtectionSpace& protectionSpace)
+bool WebPagePrivate::authenticationChallenge(const KURL& url, const ProtectionSpace& protectionSpace, Credential& inputCredential)
 {
     WebString username;
@@ -2030 +2030 @@
 #endif
 
-    m_client->authenticationChallenge(protectionSpace.realm().characters(), protectionSpace.realm().length(), username, password);
+    bool isConfirmed = m_client->authenticationChallenge(protectionSpace.realm().characters(), protectionSpace.realm().length(), username, password);
 
 #if ENABLE(BLACKBERRY_CREDENTIAL_PERSIST)
-    Credential inputCredential(username, password, CredentialPersistencePermanent);
+    Credential credential(username, password, CredentialPersistencePermanent);
     if (!m_webSettings->isPrivateBrowsingEnabled())
         credentialManager().saveCredentialIfConfirmed(this, CredentialTransformData(url, protectionSpace, inputCredential));
 #else
-    Credential inputCredential(username, password, CredentialPersistenceNone);
-#endif
-    return inputCredential;
+    Credential credential(username, password, CredentialPersistenceNone);
+#endif
+    inputCredential = credential;
+    return isConfirmed;
 }
 

trunk/Source/WebKit/blackberry/Api/WebPageClient.h

@@ -212 +212 @@
 
     virtual void setPreventsScreenIdleDimming(bool noDimming) = 0;
-    virtual void authenticationChallenge(const unsigned short* realm, unsigned int realmLength, WebString& username, WebString& password) = 0;
+    virtual bool authenticationChallenge(const unsigned short* realm, unsigned int realmLength, WebString& username, WebString& password) = 0;
     virtual SaveCredentialType notifyShouldSaveCredential(bool isNew) = 0;
 

trunk/Source/WebKit/blackberry/Api/WebPage_p.h

@@ -177 +177 @@
     virtual int showAlertDialog(WebPageClient::AlertType atype);
     virtual bool isActive() const;
-    virtual WebCore::Credential authenticationChallenge(const WebCore::KURL&, const WebCore::ProtectionSpace&);
+    virtual bool authenticationChallenge(const WebCore::KURL&, const WebCore::ProtectionSpace&, WebCore::Credential&);
     virtual SaveCredentialType notifyShouldSaveCredential(bool);
 

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2012-03-22  Jonathan Dong  <jonathan.dong@torchmobile.com.cn>
+
+        [BlackBerry] http authenticate dialog popup only once no matter authentication pass or fail
+        https://bugs.webkit.org/show_bug.cgi?id=80135
+
+        Reviewed by Rob Buis.
+
+        Modified the interface function authenticationChallenge() in
+        class WebPagePrivate by returning a bool to indicate if user
+        pressed Ok button or not, and moved the Credential from return
+        value to the reference parameter.
+        Also updated the corresponding interface functions in class
+        WebPageClient.
+
+        * Api/WebPage.cpp:
+        (BlackBerry::WebKit::WebPagePrivate::authenticationChallenge):
+        * Api/WebPageClient.h:
+        * Api/WebPage_p.h:
+        (WebPagePrivate):
+
 2012-03-22  Mike Lattanzio  <mlattanzio@rim.com>