From b1a23a13d68b2c53400aa2ecc5091b269bca4bf9 Mon Sep 17 00:00:00 2001
From: Bill Burke <bburke@redhat.com>
Date: Mon, 28 Sep 2015 16:30:03 -0400
Subject: [PATCH] jetty saml fixes

---
 .../adapters/saml/SamlAuthenticator.java      |  2 +-
 .../saml/AbstractSamlAuthenticatorValve.java  |  2 +-
 testsuite/jetty/jetty81/pom.xml               |  8 +++----
 .../org/keycloak/testsuite/Jetty8Test.java    |  1 +
 .../org/keycloak/testsuite/JettySamlTest.java |  1 +
 .../org/keycloak/testsuite/Jetty9Test.java    |  1 +
 .../org/keycloak/testsuite/JettySamlTest.java |  1 +
 testsuite/jetty/pom.xml                       | 21 +++++++++++++++++++
 testsuite/pom.xml                             |  4 +---
 9 files changed, 32 insertions(+), 9 deletions(-)
 create mode 100755 testsuite/jetty/pom.xml

diff --git a/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/SamlAuthenticator.java b/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/SamlAuthenticator.java
index f95bb5d650..ae7eb4baf6 100755
--- a/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/SamlAuthenticator.java
+++ b/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/SamlAuthenticator.java
@@ -270,7 +270,7 @@ public abstract class SamlAuthenticator {
                         if (attributeValues != null) {
                             for (Object attrValue : attributeValues) {
                                 String role = getAttributeValue(attrValue);
-                                log.info("Add role: " + role);
+                                log.debugv("Add role: {0}", role);
                                 roles.add(role);
                             }
                         }
diff --git a/saml/client-adapter/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/saml/AbstractSamlAuthenticatorValve.java b/saml/client-adapter/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/saml/AbstractSamlAuthenticatorValve.java
index 2032488f89..af5a8c683f 100755
--- a/saml/client-adapter/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/saml/AbstractSamlAuthenticatorValve.java
+++ b/saml/client-adapter/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/saml/AbstractSamlAuthenticatorValve.java
@@ -179,7 +179,7 @@ public abstract class AbstractSamlAuthenticatorValve extends FormAuthenticator i
     }
 
     protected boolean authenticateInternal(Request request, HttpServletResponse response, Object loginConfig) throws IOException {
-        log.info("authenticateInternal");
+        log.fine("authenticateInternal");
         CatalinaHttpFacade facade = new CatalinaHttpFacade(response, request);
         SamlDeployment deployment = deploymentContext.resolveDeployment(facade);
         if (deployment == null || !deployment.isConfigured()) {
diff --git a/testsuite/jetty/jetty81/pom.xml b/testsuite/jetty/jetty81/pom.xml
index 2925c5450c..d079952132 100755
--- a/testsuite/jetty/jetty81/pom.xml
+++ b/testsuite/jetty/jetty81/pom.xml
@@ -26,10 +26,6 @@
            <groupId>org.keycloak</groupId>
            <artifactId>keycloak-admin-client</artifactId>
        </dependency>
-       <dependency>
-           <groupId>org.keycloak</groupId>
-           <artifactId>keycloak-jetty81-saml-adapter</artifactId>
-       </dependency>
        <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
@@ -110,6 +106,10 @@
            <groupId>org.keycloak</groupId>
            <artifactId>keycloak-undertow-adapter</artifactId>
        </dependency>
+       <dependency>
+           <groupId>org.keycloak</groupId>
+           <artifactId>keycloak-jetty81-saml-adapter</artifactId>
+       </dependency>
        <dependency>
            <groupId>org.keycloak</groupId>
            <artifactId>keycloak-jetty81-adapter</artifactId>
diff --git a/testsuite/jetty/jetty81/src/test/java/org/keycloak/testsuite/Jetty8Test.java b/testsuite/jetty/jetty81/src/test/java/org/keycloak/testsuite/Jetty8Test.java
index 2453aaba25..a2e4b42b6a 100755
--- a/testsuite/jetty/jetty81/src/test/java/org/keycloak/testsuite/Jetty8Test.java
+++ b/testsuite/jetty/jetty81/src/test/java/org/keycloak/testsuite/Jetty8Test.java
@@ -87,6 +87,7 @@ public class Jetty8Test {
     public static void shutdownJetty() throws Exception {
         server.stop();
         server.destroy();
+        Thread.sleep(1000);
     }
 
     @Rule
diff --git a/testsuite/jetty/jetty81/src/test/java/org/keycloak/testsuite/JettySamlTest.java b/testsuite/jetty/jetty81/src/test/java/org/keycloak/testsuite/JettySamlTest.java
index b64fae56fa..644435a7c7 100755
--- a/testsuite/jetty/jetty81/src/test/java/org/keycloak/testsuite/JettySamlTest.java
+++ b/testsuite/jetty/jetty81/src/test/java/org/keycloak/testsuite/JettySamlTest.java
@@ -99,6 +99,7 @@ public class JettySamlTest {
     public static void shutdownJetty() throws Exception {
         server.stop();
         server.destroy();
+        Thread.sleep(1000);
     }
 
     @Test
diff --git a/testsuite/jetty/jetty91/src/test/java/org/keycloak/testsuite/Jetty9Test.java b/testsuite/jetty/jetty91/src/test/java/org/keycloak/testsuite/Jetty9Test.java
index ba6b2e9afa..fcf75ca465 100755
--- a/testsuite/jetty/jetty91/src/test/java/org/keycloak/testsuite/Jetty9Test.java
+++ b/testsuite/jetty/jetty91/src/test/java/org/keycloak/testsuite/Jetty9Test.java
@@ -87,6 +87,7 @@ public class Jetty9Test {
     public static void shutdownJetty() throws Exception {
         server.stop();
         server.destroy();
+        Thread.sleep(1000);
     }
 
     @Rule
diff --git a/testsuite/jetty/jetty91/src/test/java/org/keycloak/testsuite/JettySamlTest.java b/testsuite/jetty/jetty91/src/test/java/org/keycloak/testsuite/JettySamlTest.java
index ac096188d0..c9323c4cd4 100755
--- a/testsuite/jetty/jetty91/src/test/java/org/keycloak/testsuite/JettySamlTest.java
+++ b/testsuite/jetty/jetty91/src/test/java/org/keycloak/testsuite/JettySamlTest.java
@@ -98,6 +98,7 @@ public class JettySamlTest {
     public static void shutdownJetty() throws Exception {
         server.stop();
         server.destroy();
+        Thread.sleep(1000);
     }
 
     @Test
diff --git a/testsuite/jetty/pom.xml b/testsuite/jetty/pom.xml
new file mode 100755
index 0000000000..c1f4f4ffc2
--- /dev/null
+++ b/testsuite/jetty/pom.xml
@@ -0,0 +1,21 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <artifactId>keycloak-testsuite-pom</artifactId>
+        <groupId>org.keycloak</groupId>
+        <version>1.6.0.Final-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <name>Keycloak SAML Jetty Testsuite Integration</name>
+    <description/>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>keycloak-jetty-testsuite-integration-pom</artifactId>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>jetty81</module>
+        <module>jetty91</module>
+        <module>jetty92</module>
+    </modules>
+</project>
diff --git a/testsuite/pom.xml b/testsuite/pom.xml
index beae79ed8b..5f4274e99f 100755
--- a/testsuite/pom.xml
+++ b/testsuite/pom.xml
@@ -69,9 +69,7 @@
         <module>tomcat6</module>
         <module>tomcat7</module>
         <module>tomcat8</module>
-        <module>jetty/jetty81</module>
-        <module>jetty/jetty92</module>
-        <module>jetty/jetty91</module>
+        <module>jetty</module>
         <module>performance</module>
         <!--<module>docker-cluster</module>-->
     </modules>