Revert change that made core webdriver API depend on httpclient.

shs96c · shs96c · commit d4286706d2ea · 2015-07-20T14:44:31.000+01:00
This reintroduces our own Credentials API, with a single subclass. Since there's now a working implementation, I've kept the protocol as it was, but really Credentials could be something like a finger print, so just "username" and "password" is not always going to be a workable solution. This reverts commit 16842a8.
diff --git a/java/client/src/org/openqa/selenium/Alert.java b/java/client/src/org/openqa/selenium/Alert.java
@@ -17,7 +17,7 @@
 
 package org.openqa.selenium;
 
-import org.apache.http.auth.Credentials;
+import org.openqa.selenium.security.Credentials;
 
 public interface Alert {
   void dismiss();
diff --git a/java/client/src/org/openqa/selenium/BUCK b/java/client/src/org/openqa/selenium/BUCK
@@ -8,6 +8,7 @@ java_library(name = 'webdriver-api',
     '//java/client/src/org/openqa/selenium/interactions:interactions',
     '//java/client/src/org/openqa/selenium/interactions:exceptions',
     '//java/client/src/org/openqa/selenium/logging:api',
+    '//java/client/src/org/openqa/selenium/security:security',
   ],
   visibility = ['PUBLIC'],
 )
diff --git a/java/client/src/org/openqa/selenium/build.desc b/java/client/src/org/openqa/selenium/build.desc
@@ -84,7 +84,7 @@ java_library(name = "webdriver-api",
     ":codecs",
     "//java/client/src/org/openqa/selenium/interactions:api",
     "//java/client/src/org/openqa/selenium/logging:api",
-    "//third_party/java/httpcomponents:httpclient",
+    "//java/client/src/org/openqa/selenium/security",
   ])
 
 java_library(name = "client-combined",
diff --git a/java/client/src/org/openqa/selenium/htmlunit/HtmlUnitAlert.java b/java/client/src/org/openqa/selenium/htmlunit/HtmlUnitAlert.java
@@ -22,10 +22,10 @@
 import java.util.Map;
 import java.util.Queue;
 
-import org.apache.http.auth.Credentials;
 import org.openqa.selenium.Alert;
 import org.openqa.selenium.ElementNotVisibleException;
 import org.openqa.selenium.NoAlertPresentException;
+import org.openqa.selenium.security.Credentials;
 
 import com.gargoylesoftware.htmlunit.AlertHandler;
 import com.gargoylesoftware.htmlunit.Page;
diff --git a/java/client/src/org/openqa/selenium/remote/RemoteWebDriver.java b/java/client/src/org/openqa/selenium/remote/RemoteWebDriver.java
@@ -24,7 +24,6 @@
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
-import org.apache.http.auth.Credentials;
 import org.openqa.selenium.Alert;
 import org.openqa.selenium.Beta;
 import org.openqa.selenium.By;
@@ -60,6 +59,8 @@
 import org.openqa.selenium.logging.NeedsLocalLogs;
 import org.openqa.selenium.remote.internal.JsonToWebElementConverter;
 import org.openqa.selenium.remote.internal.WebElementToJsonConverter;
+import org.openqa.selenium.security.Credentials;
+import org.openqa.selenium.security.UserAndPassword;
 
 import java.net.URL;
 import java.util.Date;
@@ -936,9 +937,16 @@ public void sendKeys(String keysToSend) {
 
     @Beta
     public void setCredentials(Credentials credentials) {
-      execute(DriverCommand.SET_ALERT_CREDENTIALS, ImmutableMap
-        .of("username", credentials.getUserPrincipal().getName(), "password",
-            credentials.getPassword()));
+      if (!(credentials instanceof UserAndPassword)) {
+        throw new RuntimeException("Unsupported credentials: " + credentials);
+      }
+
+      UserAndPassword userAndPassword = (UserAndPassword) credentials;
+      execute(
+        DriverCommand.SET_ALERT_CREDENTIALS,
+        ImmutableMap.of(
+          "username", userAndPassword.getUsername(),
+          "password", userAndPassword.getPassword()));
     }
 
     /**
diff --git a/java/client/src/org/openqa/selenium/security/BUCK b/java/client/src/org/openqa/selenium/security/BUCK
@@ -0,0 +1,10 @@
+java_library(name = 'security',
+  srcs = glob(['*.java']),
+  deps = [
+    '//java/client/src/org/openqa/selenium:beta',
+  ],
+  visibility = [
+    '//java/client/src/org/openqa/selenium:core',
+    '//java/client/src/org/openqa/selenium:webdriver-api',
+  ],
+)
diff --git a/java/client/src/org/openqa/selenium/security/Credentials.java b/java/client/src/org/openqa/selenium/security/Credentials.java
@@ -0,0 +1,28 @@
+// Licensed to the Software Freedom Conservancy (SFC) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The SFC licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.openqa.selenium.security;
+
+import org.openqa.selenium.Beta;
+
+/**
+ * Marker interface used to indicate that this object can be used for
+ * authentication.
+ */
+@Beta
+public interface Credentials {
+}
diff --git a/java/client/src/org/openqa/selenium/security/UserAndPassword.java b/java/client/src/org/openqa/selenium/security/UserAndPassword.java
@@ -0,0 +1,43 @@
+// Licensed to the Software Freedom Conservancy (SFC) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The SFC licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.openqa.selenium.security;
+
+import org.openqa.selenium.Beta;
+
+/**
+ * Represents the authentication credentials for a user with username and password
+ */
+@Beta
+public class UserAndPassword implements Credentials {
+
+  private final String username;
+  private final String password;
+
+  public UserAndPassword(String username, String password) {
+    this.username = username;
+    this.password = password;
+  }
+
+  public String getUsername() {
+    return username;
+  }
+
+  public String getPassword() {
+    return password;
+  }
+}
diff --git a/java/client/src/org/openqa/selenium/security/build.desc b/java/client/src/org/openqa/selenium/security/build.desc
@@ -0,0 +1,6 @@
+
+java_library(name = "security",
+  srcs = [ "*.java" ],
+  deps = [
+    "//java/client/src/org/openqa/selenium:beta",
+  ])
diff --git a/java/client/test/org/openqa/selenium/AuthenticatedPageLoadingTest.java b/java/client/test/org/openqa/selenium/AuthenticatedPageLoadingTest.java
@@ -22,13 +22,13 @@
 import static org.openqa.selenium.testing.Ignore.Driver.CHROME;
 import static org.openqa.selenium.testing.Ignore.Driver.FIREFOX;
 import static org.openqa.selenium.testing.Ignore.Driver.HTMLUNIT;
-import static org.openqa.selenium.testing.Ignore.Driver.IE;
 import static org.openqa.selenium.testing.Ignore.Driver.MARIONETTE;
 import static org.openqa.selenium.testing.Ignore.Driver.PHANTOMJS;
 import static org.openqa.selenium.testing.Ignore.Driver.SAFARI;
 
-import org.apache.http.auth.UsernamePasswordCredentials;
 import org.junit.Test;
+import org.openqa.selenium.security.Credentials;
+import org.openqa.selenium.security.UserAndPassword;
 import org.openqa.selenium.testing.Ignore;
 import org.openqa.selenium.testing.JUnit4TestBase;
 
@@ -42,7 +42,7 @@ public void canAuthenticateUsingBasicAuthentication() {
 
     Alert alert = wait.until(alertIsPresent());
 
-    UsernamePasswordCredentials user = new UsernamePasswordCredentials("test", "test");
+    Credentials user = new UserAndPassword("test", "test");
 
     alert.authenticateUsing(user);
 
diff --git a/java/server/src/org/openqa/selenium/remote/server/handler/SetAlertCredentials.java b/java/server/src/org/openqa/selenium/remote/server/handler/SetAlertCredentials.java
@@ -17,11 +17,10 @@
 
 package org.openqa.selenium.remote.server.handler;
 
-import org.apache.http.auth.Credentials;
-import org.apache.http.auth.UsernamePasswordCredentials;
-
 import org.openqa.selenium.remote.server.JsonParametersAware;
 import org.openqa.selenium.remote.server.Session;
+import org.openqa.selenium.security.Credentials;
+import org.openqa.selenium.security.UserAndPassword;
 
 import java.util.Map;
 
@@ -40,7 +39,7 @@ public void setJsonParameters(Map<String, Object> allParameters) throws Exceptio
 
   @Override
   public Void call() throws Exception {
-    UsernamePasswordCredentials credentials = new UsernamePasswordCredentials(username, password);
+    Credentials credentials = new UserAndPassword(username, password);
     getDriver().switchTo().alert().setCredentials(credentials);
     return null;
   }

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ java_library(name = 'webdriver-api',`
`8`	`8`	`'//java/client/src/org/openqa/selenium/interactions:interactions',`
`9`	`9`	`'//java/client/src/org/openqa/selenium/interactions:exceptions',`
`10`	`10`	`'//java/client/src/org/openqa/selenium/logging:api',`
	`11`	`+ '//java/client/src/org/openqa/selenium/security:security',`
`11`	`12`	`],`
`12`	`13`	`visibility = ['PUBLIC'],`
`13`	`14`	`)`