You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2016/07/27 15:57:21 UTC
tomee git commit: TOMEE-1889 BASIC support for ejbd client
Repository: tomee
Updated Branches:
refs/heads/master 9f91bbcf1 -> 7edb1be6a
TOMEE-1889 BASIC support for ejbd client
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/7edb1be6
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/7edb1be6
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/7edb1be6
Branch: refs/heads/master
Commit: 7edb1be6a17efb05a5ca37ff2919abd2a0aabe25
Parents: 9f91bbc
Author: Romain manni-Bucau <rm...@gmail.com>
Authored: Wed Jul 27 17:57:06 2016 +0200
Committer: Romain manni-Bucau <rm...@gmail.com>
Committed: Wed Jul 27 17:57:06 2016 +0200
----------------------------------------------------------------------
.../openejb/client/HttpConnectionFactory.java | 3 ++
.../openejb/client/HttpConnectionTest.java | 36 ++++++++++++++++++++
2 files changed, 39 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/7edb1be6/server/openejb-client/src/main/java/org/apache/openejb/client/HttpConnectionFactory.java
----------------------------------------------------------------------
diff --git a/server/openejb-client/src/main/java/org/apache/openejb/client/HttpConnectionFactory.java b/server/openejb-client/src/main/java/org/apache/openejb/client/HttpConnectionFactory.java
index 93a3aae..844cb7d 100644
--- a/server/openejb-client/src/main/java/org/apache/openejb/client/HttpConnectionFactory.java
+++ b/server/openejb-client/src/main/java/org/apache/openejb/client/HttpConnectionFactory.java
@@ -79,6 +79,9 @@ public class HttpConnectionFactory implements ConnectionFactory {
if (params.containsKey("readTimeout")) {
httpURLConnection.setReadTimeout(Integer.parseInt(params.get("readTimeout")));
}
+ if (params.containsKey("authorization")) {
+ httpURLConnection.setRequestProperty("Authorization", params.get("authorization"));
+ }
if (params.containsKey("sslKeyStore") || params.containsKey("sslTrustStore")) {
try {
http://git-wip-us.apache.org/repos/asf/tomee/blob/7edb1be6/server/openejb-client/src/test/java/org/apache/openejb/client/HttpConnectionTest.java
----------------------------------------------------------------------
diff --git a/server/openejb-client/src/test/java/org/apache/openejb/client/HttpConnectionTest.java b/server/openejb-client/src/test/java/org/apache/openejb/client/HttpConnectionTest.java
index a3287a4..565ce56 100644
--- a/server/openejb-client/src/test/java/org/apache/openejb/client/HttpConnectionTest.java
+++ b/server/openejb-client/src/test/java/org/apache/openejb/client/HttpConnectionTest.java
@@ -46,6 +46,10 @@ public class HttpConnectionTest {
final OutputStream responseBody = exchange.getResponseBody();
responseBody.write("secure page".getBytes());
+ final String authorization = exchange.getRequestHeaders().getFirst("Authorization");
+ if (authorization != null) {
+ responseBody.write(authorization.getBytes("UTF-8"));
+ }
responseBody.close();
}
});
@@ -88,4 +92,36 @@ public class HttpConnectionTest {
Assert.assertTrue("should contain", sb.toString().contains("secure"));
}
}
+
+ @Test
+ public void httpBasic() throws URISyntaxException, IOException {
+ final HttpConnectionFactory factory = new HttpConnectionFactory();
+ final String url = "http://localhost:" + server.getAddress().getPort() + "/e?authorization=Basic%20token";
+ for (int i = 0; i < 3; i++) {
+ final Connection connection = factory.getConnection(new URI(url));
+
+ BufferedReader br = null;
+ final StringBuilder sb = new StringBuilder();
+ String line;
+ try {
+ br = new BufferedReader(new InputStreamReader(connection.getInputStream()));
+ while ((line = br.readLine()) != null) {
+ sb.append(line);
+ }
+ } catch (final IOException e) {
+ e.printStackTrace();
+ } finally {
+ if (br != null) {
+ try {
+ br.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ connection.close();
+ }
+
+ Assert.assertTrue("should contain", sb.toString().contains("secure pageBasic token"));
+ }
+ }
}