libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

KEYCLOAK-8529 Fix most of adapter tests on EAP6

Browse source
This commit is contained in:
mposolda 2018-10-11 18:00:45 +02:00 committed by Marek Posolda
parent 0e8d79bbfb
commit 4483677cdd
7 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
adapters/oidc/adapter-core/src/main/java/org/keycloak/adapters/BearerTokenRequestAuthenticator.java
View file

@ -74,9 +74,8 @@ public class BearerTokenRequestAuthenticator {
if (split == null || split.length != 2) continue; if (split == null || split.length != 2) continue;
if (split[0].equalsIgnoreCase("Bearer")) { if (split[0].equalsIgnoreCase("Bearer")) {
tokenString = split[1]; tokenString = split[1];
if (log.isDebugEnabled()) {
log.debugf("Found [%s] values in authorization header, selecting the first value for Bearer.", authHeaders.size()); log.debugf("Found [%d] values in authorization header, selecting the first value for Bearer.", (Integer) authHeaders.size());
}
break; break;
}; };
} }

1
distribution/adapters/as7-eap6-adapter/as7-modules/src/main/resources/modules/org/keycloak/keycloak-authz-client/main/module.xml
View file

@ -37,6 +37,7 @@
<module name="com.fasterxml.jackson.core.jackson-annotations"/> <module name="com.fasterxml.jackson.core.jackson-annotations"/>
<module name="com.fasterxml.jackson.core.jackson-databind"/> <module name="com.fasterxml.jackson.core.jackson-databind"/>
<module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider"/> <module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider"/>
<module name="org.jboss.logging"/>
</dependencies> </dependencies>
</module> </module>

1
distribution/adapters/wf8-adapter/wf8-modules/src/main/resources/modules/org/keycloak/keycloak-authz-client/main/module.xml
View file

@ -36,6 +36,7 @@
<module name="com.fasterxml.jackson.core.jackson-annotations"/> <module name="com.fasterxml.jackson.core.jackson-annotations"/>
<module name="com.fasterxml.jackson.core.jackson-databind"/> <module name="com.fasterxml.jackson.core.jackson-databind"/>
<module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider"/> <module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider"/>
<module name="org.jboss.logging"/>
</dependencies> </dependencies>
</module> </module>

17
testsuite/integration-arquillian/HOW-TO-RUN.md
View file

@ -194,7 +194,7 @@ Assumed you downloaded `fuse-karaf-7.0.0.fuse-000202.zip`
mvn install:install-file \ mvn install:install-file \
-DgroupId=org.jboss.as \ -DgroupId=org.jboss.as \
-DartifactId=jboss-as-dist \ -DartifactId=jboss-as-dist \
-Dversion=7.5.0.Final-redhat-21 \ -Dversion=7.5.21.Final-redhat-1 \
-Dpackaging=zip \ -Dpackaging=zip \
-Dfile=/mydownloads/jboss-eap-6.4.0.zip -Dfile=/mydownloads/jboss-eap-6.4.0.zip
@ -207,9 +207,9 @@ Assumed you downloaded `fuse-karaf-7.0.0.fuse-000202.zip`
mvn install:install-file \ mvn install:install-file \
-DgroupId=com.redhat.fuse.eap \ -DgroupId=com.redhat.fuse.eap \
-DartifactId=fuse-eap-installer \ -DartifactId=fuse-eap-installer \
-Dversion=6.3.0.redhat-220 \ -Dversion=6.3.0.redhat-347 \
-Dpackaging=jar \ -Dpackaging=jar \
-Dfile=/fuse-eap-installer-6.3.0.redhat-220.jar -Dfile=/fuse-eap-installer-6.3.0.redhat-347.jar
5) Prepare EAP6 with Hawtio and run the test 5) Prepare EAP6 with Hawtio and run the test
@ -219,15 +219,16 @@ Assumed you downloaded `fuse-karaf-7.0.0.fuse-000202.zip`
mvn -f testsuite/integration-arquillian/servers \ mvn -f testsuite/integration-arquillian/servers \
clean install \ clean install \
-Pauth-server-wildfly \ -Pauth-server-wildfly \
-Papp-server-eap6-fuse \ -Papp-server-eap6 \
-Dapp.server.jboss.version=7.5.0.Final-redhat-21 \ -Dapp.server.jboss.version=7.5.21.Final-redhat-1 \
-Dfuse.installer.version=6.3.0.redhat-220 -Dfuse63.version=6.3.0.redhat-347
# Run the test # Run the test
mvn -f testsuite/integration-arquillian/tests/other/adapters/jboss/eap6-fuse/pom.xml \ mvn -f testsuite/integration-arquillian/tests/base/pom.xml \
clean install \ clean install \
-Pauth-server-wildfly \ -Pauth-server-wildfly \
-Papp-server-eap6-fuse -Papp-server-eap6 \
-Dtest=EAP6Fuse6HawtioAdapterTest
## Migration test ## Migration test

2
testsuite/integration-arquillian/servers/pom.xml
View file

@ -33,7 +33,7 @@
<script.suffix>sh</script.suffix> <script.suffix>sh</script.suffix>
<!--app container versions--> <!--app container versions-->
<eap6.version>7.5.20.Final-redhat-1</eap6.version> <eap6.version>7.5.21.Final-redhat-1</eap6.version>
<eap71.version>7.1.4.GA-redhat-1</eap71.version> <eap71.version>7.1.4.GA-redhat-1</eap71.version>
<jboss.as.version>7.1.1.Final</jboss.as.version> <jboss.as.version>7.1.1.Final</jboss.as.version>
<tomcat7.version>7.0.68</tomcat7.version> <tomcat7.version>7.0.68</tomcat7.version>

2
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/DemoServletsAdapterTest.java
View file

@ -1043,7 +1043,7 @@ public class DemoServletsAdapterTest extends AbstractServletsAdapterTest {
public void testWithoutKeycloakConf() { public void testWithoutKeycloakConf() {
customerPortalNoConf.navigateTo(); customerPortalNoConf.navigateTo();
String pageSource = driver.getPageSource(); String pageSource = driver.getPageSource();
assertThat(pageSource, anyOf(containsString("Forbidden"), containsString("HTTP Status 401"))); assertThat(pageSource, anyOf(containsString("Forbidden"), containsString("forbidden"), containsString("HTTP Status 401")));
} }
// KEYCLOAK-3509 // KEYCLOAK-3509

2
testsuite/integration-arquillian/tests/base/src/test/resources/adapter-test/customer-db-audience-required/WEB-INF/web.xml
View file

@ -21,7 +21,7 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
version="3.0"> version="3.0">
<module-name>customer-db</module-name> <module-name>customer-db-audience-required</module-name>
<filter> <filter>