cxf-fediz git commit: Fixing system test to always send Basic Auth creds to the token endpoint
Repository: cxf-fediz
Updated Branches:
refs/heads/master c059ba8bf -> 245c592d7
Fixing system test to always send Basic Auth creds to the token endpoint
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/245c592d
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/245c592d
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/245c592d
Branch: refs/heads/master
Commit: 245c592d728db3d88d7d5a6d078e141609348342
Parents: c059ba8
Author: Colm O hEigeartaigh
Authored: Mon Jul 3 15:01:16 2017 +0100
Committer: Colm O hEigeartaigh
Committed: Mon Jul 3 15:01:16 2017 +0100
--
.../org/apache/cxf/fediz/systests/oidc/OIDCTest.java | 11 +++
1 file changed, 11 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/245c592d/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java
--
diff --git
a/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java
b/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java
index d7dceb0..241e1b6 100644
---
a/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java
+++
b/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java
@@ -25,6 +25,7 @@ import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.net.URL;
+import java.nio.charset.StandardCharsets;
import java.security.KeyStore;
import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
@@ -62,6 +63,7 @@ import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleState;
import org.apache.catalina.connector.Connector;
import org.apache.catalina.startup.Tomcat;
+import org.apache.commons.codec.binary.Base64;
import org.apache.commons.io.IOUtils;
import org.apache.cxf.fediz.tomcat8.FederationAuthenticator;
import org.apache.cxf.rs.security.jose.jwa.SignatureAlgorithm;
@@ -88,6 +90,7 @@ public class OIDCTest {
private static String storedClientId;
private static String storedClient2Id;
+private static String storedClientPassword;
@BeforeClass
public static void init() throws Exception {
@@ -240,6 +243,11 @@ public class OIDCTest {
storedClientId = table.getCellAt(1, 1).asText().trim();
Assert.assertNotNull(storedClientId);
+// Get the password
+registeredClientPage = webClient.getPage(url + "/" + storedClientId);
+table = registeredClientPage.getHtmlElementById("client");
+storedClientPassword = table.getCellAt(1, 2).asText().trim();
+
// Try to register another new client
registeredClientPage =
registerNewClient(webClient, url, "new-client2",
"https://127.0.1.1";,
@@ -812,6 +820,9 @@ public class OIDCTest {
// Now use the code to get an IdToken
WebClient webClient2 = setupWebClient(user, password,
getIdpHttpsPort());
+String data = storedClientId + ":" + storedClientPassword;
+String authorizationHeader = "Basic " +
Base64.encodeBase64String(data.getBytes(StandardCharsets.UTF_8));
+webClient2.addRequestHeader("Authorization", authorizationHeader);
String tokenUrl = "https://localhost:"; + getRpHttpsPort() +
"/fediz-oidc/oauth2/token";
WebRequest request = new WebRequest(new URL(tokenUrl),
HttpMethod.POST);
cxf git commit: [CXF-7435] set test scope for logging dependency and use spring-boot-starter-logging
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 6736d0bb9 -> 67bc32587
[CXF-7435] set test scope for logging dependency and use
spring-boot-starter-logging
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/67bc3258
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/67bc3258
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/67bc3258
Branch: refs/heads/3.1.x-fixes
Commit: 67bc32587210b9823798bdcab5ebdcc93a2a14f8
Parents: 6736d0b
Author: Dennis Kieselhorst
Authored: Mon Jul 3 13:37:52 2017 +0200
Committer: Dennis Kieselhorst
Committed: Mon Jul 3 13:41:17 2017 +0200
--
integration/spring-boot/autoconfigure/pom.xml | 32 ++
1 file changed, 14 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/67bc3258/integration/spring-boot/autoconfigure/pom.xml
--
diff --git a/integration/spring-boot/autoconfigure/pom.xml
b/integration/spring-boot/autoconfigure/pom.xml
index d18aa47..8f07f01 100644
--- a/integration/spring-boot/autoconfigure/pom.xml
+++ b/integration/spring-boot/autoconfigure/pom.xml
@@ -111,26 +111,22 @@
test
- org.slf4j
- jcl-over-slf4j
- ${cxf.slf4j.version}
-
-
- ch.qos.logback
- logback-core
- ${cxf.logback.classic.version}
+org.springframework.boot
+spring-boot-starter-logging
+${cxf.spring.boot.version}
+test
- javax.el
- javax.el-api
- ${cxf.javax.el.version}
- test
-
-
- org.hibernate
- hibernate-validator
- ${cxf.hibernate.validator.version}
- test
+javax.el
+javax.el-api
+${cxf.javax.el.version}
+test
+
+
+org.hibernate
+hibernate-validator
+${cxf.hibernate.validator.version}
+test
cxf git commit: [CXF-7435] set test scope for logging dependency and use spring-boot-starter-logging
Repository: cxf
Updated Branches:
refs/heads/master 3c8f552f6 -> 3855a20c6
[CXF-7435] set test scope for logging dependency and use
spring-boot-starter-logging
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/3855a20c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3855a20c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3855a20c
Branch: refs/heads/master
Commit: 3855a20c6ab5dd29363833459f1718616275fc5e
Parents: 3c8f552
Author: Dennis Kieselhorst
Authored: Mon Jul 3 13:37:52 2017 +0200
Committer: Dennis Kieselhorst
Committed: Mon Jul 3 13:37:52 2017 +0200
--
integration/spring-boot/autoconfigure/pom.xml | 32 ++
1 file changed, 14 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/3855a20c/integration/spring-boot/autoconfigure/pom.xml
--
diff --git a/integration/spring-boot/autoconfigure/pom.xml
b/integration/spring-boot/autoconfigure/pom.xml
index 16eb333..ca6a992 100644
--- a/integration/spring-boot/autoconfigure/pom.xml
+++ b/integration/spring-boot/autoconfigure/pom.xml
@@ -111,26 +111,22 @@
test
- org.slf4j
- jcl-over-slf4j
- ${cxf.slf4j.version}
-
-
- ch.qos.logback
- logback-core
- ${cxf.logback.classic.version}
+org.springframework.boot
+spring-boot-starter-logging
+${cxf.spring.boot.version}
+test
- javax.el
- javax.el-api
- ${cxf.javax.el.version}
- test
-
-
- org.hibernate
- hibernate-validator
- ${cxf.hibernate.validator.version}
- test
+javax.el
+javax.el-api
+${cxf.javax.el.version}
+test
+
+
+org.hibernate
+hibernate-validator
+${cxf.hibernate.validator.version}
+test
cxf-fediz git commit: Updating CXF
Repository: cxf-fediz Updated Branches: refs/heads/1.2.x-fixes a38a7eb20 -> e7783768a Updating CXF Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/e7783768 Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/e7783768 Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/e7783768 Branch: refs/heads/1.2.x-fixes Commit: e7783768afef30c95477015bffc2b68e437a8456 Parents: a38a7eb Author: Colm O hEigeartaigh Authored: Mon Jul 3 10:28:27 2017 +0100 Committer: Colm O hEigeartaigh Committed: Mon Jul 3 10:28:27 2017 +0100 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/e7783768/pom.xml -- diff --git a/pom.xml b/pom.xml index 7076b60..34bc46a 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ 1.2 2.5 1.5.1 -3.0.13 +3.0.14 3.0.0 3.4 4.4.2
cxf-fediz git commit: CXF upgrade
Repository: cxf-fediz Updated Branches: refs/heads/master 384b31253 -> c059ba8bf CXF upgrade Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/c059ba8b Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/c059ba8b Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/c059ba8b Branch: refs/heads/master Commit: c059ba8bfb49f8a508f322004977d1408c4e6c4a Parents: 384b312 Author: Colm O hEigeartaigh Authored: Mon Jul 3 10:01:48 2017 +0100 Committer: Colm O hEigeartaigh Committed: Mon Jul 3 10:01:48 2017 +0100 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/c059ba8b/pom.xml -- diff --git a/pom.xml b/pom.xml index 5961122..998dfe3 100644 --- a/pom.xml +++ b/pom.xml @@ -44,7 +44,7 @@ 1.2 2.5 1.6 -3.1.11 +3.1.12 3.2.0 2.1.1 3.4
cxf-fediz git commit: CXF upgrade
Repository: cxf-fediz Updated Branches: refs/heads/1.3.x-fixes 8cf91c593 -> 7ab93afa1 CXF upgrade Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/7ab93afa Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/7ab93afa Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/7ab93afa Branch: refs/heads/1.3.x-fixes Commit: 7ab93afa1d0d57c20bfd69e55abec184db8b9d86 Parents: 8cf91c5 Author: Colm O hEigeartaigh Authored: Mon Jul 3 10:01:18 2017 +0100 Committer: Colm O hEigeartaigh Committed: Mon Jul 3 10:01:18 2017 +0100 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7ab93afa/pom.xml -- diff --git a/pom.xml b/pom.xml index 81d8dfa..48ac407 100644 --- a/pom.xml +++ b/pom.xml @@ -44,7 +44,7 @@ 1.2 2.5 1.5.1 -3.1.11 +3.1.12 3.2.0 3.4 4.6.1
