Merge pull request #1052 from patriot1burke/master

set saml issuer

forms/common-themes/src/main/resources/theme/admin/base/resources/js/controllers/applications.js

@@ -1180,7 +1180,9 @@ module.controller('ApplicationProtocolMapperCtrl', function($scope, realm, serve
     $scope.realm = realm;
     $scope.application = application;
     $scope.create = false;
-    var protocol = application.protocol;
+    if (application.protocol == null) {
+        application.protocol = 'openid-connect';
+    }
     $scope.protocol = application.protocol;
     $scope.mapper = angular.copy(mapper);
     var oldCopy = angular.copy($scope.realm);
@@ -1245,6 +1247,9 @@ module.controller('ApplicationProtocolMapperCreateCtrl', function($scope, realm,
     $scope.realm = realm;
     $scope.application = application;
     $scope.create = true;
+    if (application.protocol == null) {
+        application.protocol = 'openid-connect';
+    }
     var protocol = application.protocol;
     $scope.protocol = protocol;
     $scope.mapper = { protocol :  application.protocol, config: {}};

pom.xml

@@ -611,14 +611,15 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>2.8</version>
+                    <version>2.10.1</version>
                     <configuration>
+                        <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
                         <minmemory>128m</minmemory>
                         <maxmemory>1024m</maxmemory>
                         <quiet>false</quiet>
                         <aggregate>true</aggregate>
                         <excludePackageNames>
-                            com.restfully.*:org.jboss.resteasy.examples.*:se.unlogic.*:org.jboss.resteasy.tests.*
+                            com.restfully.*:org.jboss.resteasy.examples.*:se.unlogic.*:org.jboss.resteasy.tests.*:org.apache.*
                         </excludePackageNames>
                         <archive>
                             <index>true</index>

saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/SamlProtocol.java

@@ -463,6 +463,7 @@ public class SamlProtocol implements LoginProtocol {
         SAML2LogoutResponseBuilder builder = new SAML2LogoutResponseBuilder();
         builder.logoutRequestID(userSession.getNote(SAML_LOGOUT_REQUEST_ID));
         builder.destination(userSession.getNote(SAML_LOGOUT_ISSUER));
+        builder.issuer(getResponseIssuer(realm));
         String signingAlgorithm = userSession.getNote(SAML_LOGOUT_SIGNATURE_ALGORITHM);
         if (signingAlgorithm != null) {
             SignatureAlgorithm algorithm = SignatureAlgorithm.valueOf(signingAlgorithm);
@@ -546,6 +547,7 @@ public class SamlProtocol implements LoginProtocol {
     protected SAML2LogoutRequestBuilder createLogoutRequest(ClientSessionModel clientSession, ClientModel client) {
         // build userPrincipal with subject used at login
         SAML2LogoutRequestBuilder logoutBuilder = new SAML2LogoutRequestBuilder()
+                                         .issuer(getResponseIssuer(realm))
                                          .userPrincipal(clientSession.getNote(SAML_NAME_ID), clientSession.getNote(SAML_NAME_ID_FORMAT))
                                          .destination(client.getClientId());
         if (requiresRealmSignature(client)) {

services/pom.xml

@@ -200,7 +200,6 @@
                     <target>${maven.compiler.target}</target>
                 </configuration>
             </plugin>
-            <!--
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
@@ -233,7 +232,6 @@
                     </execution>
                 </executions>
             </plugin>
-    -->
         </plugins>
     </build>
 </project>

services/src/main/java/org/keycloak/services/resources/admin/AdminConsole.java

@@ -305,7 +305,7 @@ public class AdminConsole {
     }
 
     @GET
-    @Path("index.html")
+    @Path("{indexhtml: index.html}") // this expression is a hack to get around jaxdoclet generation bug.  Doesn't like index.html
     public Response getIndexHtmlRedirect() {
         return Response.status(302).location(uriInfo.getRequestUriBuilder().path("../").build()).build();
     }

testsuite/integration/pom.xml

@@ -223,6 +223,10 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.apache.directory.jdbm</groupId>
+                    <artifactId>apacheds-jdbm1</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -232,6 +236,16 @@
         <dependency>
             <groupId>org.apache.directory.server</groupId>
             <artifactId>apacheds-server-annotations</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.directory.jdbm</groupId>
+                    <artifactId>apacheds-jdbm1</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.directory.api</groupId>
@@ -293,6 +307,13 @@
                 <inherited>true</inherited>
                 <extensions>true</extensions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

testsuite/integration/src/test/java/org/keycloak/testsuite/account/AccountTest.java

@@ -157,7 +157,7 @@ public class AccountTest {
         });
     }
 
-    @Test @Ignore
+    //@Test @Ignore
     public void runit() throws Exception {
         Thread.sleep(10000000);
     }

testsuite/pom.xml

@@ -22,6 +22,13 @@
                     <skip>true</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
     <modules>