Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6a90a59 authored by Steve Block's avatar Steve Block
Browse files

Provides ability to store HTTP authentication credentials supplied to an XHR from JavaScript 

This change forwards to the WebViewClient HTTP authentication credentials that
are supplied to an XHR from JavaScript. This allows the client to store these
credentials for use with later requests.

Currently, the browser only stores credentials that have been entered manually
by the user through the authentication dialog.

Bug: 2544330
Change-Id: I913e35d80b7ad41ff75586092408b86ea9f543d8
parent 6108af25

core/java/android/webkit/CallbackProxy.java

+25 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ class CallbackProxy extends Handler { 
    private static final int OPEN_FILE_CHOOSER                   = 134;

    private static final int ADD_HISTORY_ITEM                    = 135;

    private static final int HISTORY_INDEX_CHANGED               = 136;

    private static final int AUTH_CREDENTIALS                    = 137;



    // Message triggered by the client to resume execution

    private static final int NOTIFY                              = 200;
@@ -734,6 +735,16 @@ class CallbackProxy extends Handler { 
                            (WebHistoryItem) msg.obj, msg.arg1);

                }

                break;

            case AUTH_CREDENTIALS:

                if (mWebViewClient != null) {

                    String host = msg.getData().getString("host");

                    String realm = msg.getData().getString("realm");

                    username = msg.getData().getString("username");

                    password = msg.getData().getString("password");

                    mWebViewClient.onReceivedHttpAuthCredentials(

                            mWebView, host, realm, username, password);

                }

                break;

        }

    }
@@ -917,6 +928,20 @@ class CallbackProxy extends Handler { 
        msg.getData().putString("realm", realmName);

        sendMessage(msg);

    }



    public void onReceivedHttpAuthCredentials(String host, String realm,

            String username, String password) {

        if (mWebViewClient == null) {

            return;

        }

        Message msg = obtainMessage(AUTH_CREDENTIALS);

        msg.getData().putString("host", host);

        msg.getData().putString("realm", realm);

        msg.getData().putString("username", username);

        msg.getData().putString("password", password);

        sendMessage(msg);

    }



    /**

     * @hide - hide this because it contains a parameter of type SslError.

     * SslError is located in a hidden package.

core/java/android/webkit/HttpAuthHandler.java

+10 −0
Original line number Diff line number Diff line
@@ -267,4 +267,14 @@ public class HttpAuthHandler extends Handler { 
            proxy.onReceivedHttpAuthRequest(this, hostname, realm);

        }

    }



    /**

     * Informs the proxy of a new set of credentials.

     * @hide Pending API council review

     */

    public static void onReceivedCredentials(LoadListener loader,

            String host, String realm, String username, String password) {

        CallbackProxy proxy = loader.getFrame().getCallbackProxy();

        proxy.onReceivedHttpAuthCredentials(host, realm, username, password);

    }

}

core/java/android/webkit/LoadListener.java

+5 −0
Original line number Diff line number Diff line
@@ -663,6 +663,11 @@ class LoadListener extends Handler implements EventHandler { 
                    // If this is the first attempt to authenticate, try again with the username and

                    // password supplied in the URL, if present.

                    if (!mAuthFailed && mUsername != null && mPassword != null) {

                        String host = mAuthHeader.isProxy() ?

                                Network.getInstance(mContext).getProxyHostname() :

                                mUri.mHost;

                        HttpAuthHandler.onReceivedCredentials(this, host,

                                mAuthHeader.getRealm(), mUsername, mPassword);

                        makeAuthResponse(mUsername, mPassword);

                    } else {

                        Network.getInstance(mContext).handleAuthRequest(this);

core/java/android/webkit/WebViewClient.java

+16 −0
Original line number Diff line number Diff line
@@ -196,6 +196,22 @@ public class WebViewClient { 
        handler.cancel();

    }



    /**

     * Notify the host application that authentication credentials have been

     * supplied from Script.

     * The default behavior is to do nothing.

     * @hide Pending API council review

     *

     * @param view The WebView that is initiating the callback.

     * @param host The host requiring authentication.

     * @param realm A description to help store user credentials for future

     * @param username The username

     * @param password The password

     */

    public void onReceivedHttpAuthCredentials(WebView view, String host,

            String realm, String username, String password) {

    }



    /**

     * Give the host application a chance to handle the key event synchronously.

     * e.g. menu shortcut key events need to be filtered this way. If return