Version bump

broker/core/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.6.1.Final</version>
+        <version>1.4.0.Final</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

broker/core/src/main/java/org/keycloak/broker/provider/BrokeredIdentityContext.java

@@ -17,7 +17,6 @@
  */
 package org.keycloak.broker.provider;
 
-import org.keycloak.models.ClientSessionModel;
 import org.keycloak.models.IdentityProviderModel;
 
 import java.util.HashMap;
@@ -44,7 +43,6 @@ public class BrokeredIdentityContext {
     private IdentityProviderModel idpConfig;
     private IdentityProvider idp;
     private Map<String, Object> contextData = new HashMap<>();
-    private ClientSessionModel clientSession;
 
     public BrokeredIdentityContext(String id) {
         if (id == null) {
@@ -168,14 +166,6 @@ public class BrokeredIdentityContext {
         this.lastName = lastName;
     }
 
-    public ClientSessionModel getClientSession() {
-        return clientSession;
-    }
-
-    public void setClientSession(ClientSessionModel clientSession) {
-        this.clientSession = clientSession;
-    }
-
     public void setName(String name) {
         if (name != null) {
             int i = name.lastIndexOf(' ');

broker/core/src/main/java/org/keycloak/broker/provider/HardcodedAttributeMapper.java

@@ -1,89 +0,0 @@
-package org.keycloak.broker.provider;
-
-import org.keycloak.models.ClientModel;
-import org.keycloak.models.IdentityProviderMapperModel;
-import org.keycloak.models.KeycloakSession;
-import org.keycloak.models.RealmModel;
-import org.keycloak.models.RoleModel;
-import org.keycloak.models.UserModel;
-import org.keycloak.provider.ProviderConfigProperty;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
- * @version $Revision: 1 $
- */
-public class HardcodedAttributeMapper extends AbstractIdentityProviderMapper {
-    public static final String ATTRIBUTE = "attribute";
-    public static final String ATTRIBUTE_VALUE = "attribute.value";
-    protected static final List<ProviderConfigProperty> configProperties = new ArrayList<ProviderConfigProperty>();
-
-    static {
-        ProviderConfigProperty property;
-        property = new ProviderConfigProperty();
-        property.setName(ATTRIBUTE);
-        property.setLabel("User Attribute");
-        property.setHelpText("Name of user attribute you want to hardcode");
-        property.setType(ProviderConfigProperty.STRING_TYPE);
-        configProperties.add(property);
-        property = new ProviderConfigProperty();
-        property.setName(ATTRIBUTE_VALUE);
-        property.setLabel("User Attribute Value");
-        property.setHelpText("Value you want to hardcode");
-        property.setType(ProviderConfigProperty.STRING_TYPE);
-        configProperties.add(property);
-    }
-
-
-
-    @Override
-    public List<ProviderConfigProperty> getConfigProperties() {
-        return configProperties;
-    }
-
-    @Override
-    public String getDisplayCategory() {
-        return "Attribute Importer";
-    }
-
-    @Override
-    public String getDisplayType() {
-        return "Hardcoded Attribute";
-    }
-
-    public static final String[] COMPATIBLE_PROVIDERS = {ANY_PROVIDER};
-
-
-    public static final String PROVIDER_ID = "hardcoded-attribute-idp-mapper";
-
-    @Override
-    public String getId() {
-        return PROVIDER_ID;
-    }
-
-    @Override
-    public String[] getCompatibleProviders() {
-        return COMPATIBLE_PROVIDERS;
-    }
-
-    @Override
-    public void importNewUser(KeycloakSession session, RealmModel realm, UserModel user, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
-        String attribute = mapperModel.getConfig().get(ATTRIBUTE);
-        String attributeValue = mapperModel.getConfig().get(ATTRIBUTE_VALUE);
-        user.setSingleAttribute(attribute, attributeValue);
-    }
-
-    @Override
-    public void updateBrokeredUser(KeycloakSession session, RealmModel realm, UserModel user, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
-        String attribute = mapperModel.getConfig().get(ATTRIBUTE);
-        String attributeValue = mapperModel.getConfig().get(ATTRIBUTE_VALUE);
-        user.setSingleAttribute(attribute, attributeValue);
-    }
-
-    @Override
-    public String getHelpText() {
-        return "When user is imported from provider, hardcode a value to a specific user attribute.";
-    }
-}

broker/core/src/main/java/org/keycloak/broker/provider/HardcodedUserSessionAttributeMapper.java

@@ -1,87 +0,0 @@
-package org.keycloak.broker.provider;
-
-import org.keycloak.models.IdentityProviderMapperModel;
-import org.keycloak.models.KeycloakSession;
-import org.keycloak.models.RealmModel;
-import org.keycloak.models.UserModel;
-import org.keycloak.provider.ProviderConfigProperty;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
- * @version $Revision: 1 $
- */
-public class HardcodedUserSessionAttributeMapper extends AbstractIdentityProviderMapper {
-    public static final String ATTRIBUTE = "attribute";
-    public static final String ATTRIBUTE_VALUE = "attribute.value";
-    protected static final List<ProviderConfigProperty> configProperties = new ArrayList<ProviderConfigProperty>();
-
-    static {
-        ProviderConfigProperty property;
-        property = new ProviderConfigProperty();
-        property.setName(ATTRIBUTE);
-        property.setLabel("User Session Attribute");
-        property.setHelpText("Name of user session attribute you want to hardcode");
-        property.setType(ProviderConfigProperty.STRING_TYPE);
-        configProperties.add(property);
-        property = new ProviderConfigProperty();
-        property.setName(ATTRIBUTE_VALUE);
-        property.setLabel("User Session Attribute Value");
-        property.setHelpText("Value you want to hardcode");
-        property.setType(ProviderConfigProperty.STRING_TYPE);
-        configProperties.add(property);
-    }
-
-
-
-    @Override
-    public List<ProviderConfigProperty> getConfigProperties() {
-        return configProperties;
-    }
-
-    @Override
-    public String getDisplayCategory() {
-        return "Attribute Importer";
-    }
-
-    @Override
-    public String getDisplayType() {
-        return "Hardcoded User Session Attribute";
-    }
-
-    public static final String[] COMPATIBLE_PROVIDERS = {ANY_PROVIDER};
-
-
-    public static final String PROVIDER_ID = "hardcoded-user-session-attribute-idp-mapper";
-
-    @Override
-    public String getId() {
-        return PROVIDER_ID;
-    }
-
-    @Override
-    public String[] getCompatibleProviders() {
-        return COMPATIBLE_PROVIDERS;
-    }
-
-    @Override
-    public void importNewUser(KeycloakSession session, RealmModel realm, UserModel user, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
-        String attribute = mapperModel.getConfig().get(ATTRIBUTE);
-        String attributeValue = mapperModel.getConfig().get(ATTRIBUTE_VALUE);
-        context.getClientSession().setUserSessionNote(attribute, attributeValue);
-    }
-
-    @Override
-    public void updateBrokeredUser(KeycloakSession session, RealmModel realm, UserModel user, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
-        String attribute = mapperModel.getConfig().get(ATTRIBUTE);
-        String attributeValue = mapperModel.getConfig().get(ATTRIBUTE_VALUE);
-        context.getClientSession().setUserSessionNote(attribute, attributeValue);
-    }
-
-    @Override
-    public String getHelpText() {
-        return "When user is imported from provider, hardcode a value to a specific user session attribute.";
-    }
-}

broker/core/src/main/resources/META-INF/services/org.keycloak.broker.provider.IdentityProviderMapper

@@ -1,3 +1 @@
-org.keycloak.broker.provider.HardcodedRoleMapper
-org.keycloak.broker.provider.HardcodedAttributeMapper
-org.keycloak.broker.provider.HardcodedUserSessionAttributeMapper
+org.keycloak.broker.provider.HardcodedRoleMapper

broker/oidc/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.6.1.Final</version>
+        <version>1.4.0.Final</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

broker/oidc/src/main/java/org/keycloak/broker/oidc/AbstractOAuth2IdentityProvider.java

@@ -20,7 +20,7 @@ package org.keycloak.broker.oidc;
 import org.codehaus.jackson.JsonNode;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.jboss.logging.Logger;
-import org.keycloak.common.ClientConnection;
+import org.keycloak.ClientConnection;
 import org.keycloak.OAuth2Constants;
 import org.keycloak.broker.provider.util.SimpleHttp;
 import org.keycloak.broker.provider.AbstractIdentityProvider;

broker/oidc/src/main/java/org/keycloak/broker/oidc/OIDCIdentityProvider.java

@@ -42,7 +42,7 @@ import org.keycloak.services.messages.Messages;
 import org.keycloak.services.resources.IdentityBrokerService;
 import org.keycloak.services.resources.RealmsResource;
 import org.keycloak.util.JsonSerialization;
-import org.keycloak.common.util.PemUtils;
+import org.keycloak.util.PemUtils;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
@@ -289,9 +289,10 @@ public class OIDCIdentityProvider extends AbstractOAuth2IdentityProvider<OIDCIde
             }
             JsonWebToken token = jws.readJsonContent(JsonWebToken.class);
 
+            String aud = token.getAudience();
             String iss = token.getIssuer();
 
-            if (!token.hasAudience(getConfig().getClientId())) {
+            if (aud != null && !aud.equals(getConfig().getClientId())) {
                 throw new IdentityBrokerException("Wrong audience from token.");
             }
 

broker/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.6.1.Final</version>
+        <version>1.4.0.Final</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

broker/saml/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.6.1.Final</version>
+        <version>1.4.0.Final</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

broker/saml/src/main/java/org/keycloak/broker/saml/SAMLEndpoint.java

@@ -1,8 +1,8 @@
 package org.keycloak.broker.saml;
 
 import org.jboss.logging.Logger;
-import org.keycloak.common.ClientConnection;
-import org.keycloak.common.VerificationException;
+import org.keycloak.ClientConnection;
+import org.keycloak.VerificationException;
 import org.keycloak.broker.provider.BrokeredIdentityContext;
 import org.keycloak.broker.provider.IdentityBrokerException;
 import org.keycloak.broker.provider.IdentityProvider;
@@ -10,6 +10,7 @@ import org.keycloak.dom.saml.v2.assertion.AssertionType;
 import org.keycloak.dom.saml.v2.assertion.AttributeStatementType;
 import org.keycloak.dom.saml.v2.assertion.AttributeType;
 import org.keycloak.dom.saml.v2.assertion.AuthnStatementType;
+import org.keycloak.dom.saml.v2.assertion.EncryptedAssertionType;
 import org.keycloak.dom.saml.v2.assertion.NameIDType;
 import org.keycloak.dom.saml.v2.assertion.SubjectType;
 import org.keycloak.dom.saml.v2.protocol.LogoutRequestType;
@@ -23,23 +24,31 @@ import org.keycloak.events.EventType;
 import org.keycloak.models.KeycloakSession;
 import org.keycloak.models.RealmModel;
 import org.keycloak.models.UserSessionModel;
-import org.keycloak.protocol.saml.JaxrsSAML2BindingBuilder;
-import org.keycloak.saml.SAML2LogoutResponseBuilder;
-import org.keycloak.saml.SAMLRequestParser;
+import org.keycloak.protocol.saml.SAML2LogoutResponseBuilder;
+import org.keycloak.protocol.saml.SAMLRequestParser;
 import org.keycloak.protocol.saml.SamlProtocol;
 import org.keycloak.protocol.saml.SamlProtocolUtils;
 import org.keycloak.saml.common.constants.GeneralConstants;
+import org.keycloak.saml.common.constants.JBossSAMLConstants;
 import org.keycloak.saml.common.constants.JBossSAMLURIConstants;
 import org.keycloak.saml.common.exceptions.ConfigurationException;
 import org.keycloak.saml.common.exceptions.ProcessingException;
+import org.keycloak.saml.common.util.DocumentUtil;
+import org.keycloak.saml.common.util.StaxParserUtil;
+import org.keycloak.saml.processing.api.saml.v2.response.SAML2Response;
+import org.keycloak.saml.processing.core.parsers.saml.SAMLParser;
 import org.keycloak.saml.processing.core.saml.v2.common.SAMLDocumentHolder;
 import org.keycloak.saml.processing.core.saml.v2.constants.X500SAMLProfileConstants;
-import org.keycloak.saml.processing.core.saml.v2.util.AssertionUtil;
+import org.keycloak.saml.processing.core.util.JAXPValidationUtil;
+import org.keycloak.saml.processing.core.util.XMLEncryptionUtil;
 import org.keycloak.saml.processing.core.util.XMLSignatureUtil;
 import org.keycloak.saml.processing.web.util.PostBindingUtil;
 import org.keycloak.services.ErrorPage;
 import org.keycloak.services.managers.AuthenticationManager;
 import org.keycloak.services.messages.Messages;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.FormParam;
@@ -52,7 +61,9 @@ import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.UriBuilder;
 import javax.ws.rs.core.UriInfo;
+import javax.xml.namespace.QName;
 import java.io.IOException;
+import java.security.PrivateKey;
 import java.security.PublicKey;
 import java.security.cert.X509Certificate;
 import java.util.List;
@@ -144,7 +155,7 @@ public class SAMLEndpoint {
         }
 
         protected abstract String getBindingType();
-        protected abstract void verifySignature(String key, SAMLDocumentHolder documentHolder) throws VerificationException;
+        protected abstract void verifySignature(SAMLDocumentHolder documentHolder) throws VerificationException;
         protected abstract SAMLDocumentHolder extractRequestDocument(String samlRequest);
         protected abstract SAMLDocumentHolder extractResponseDocument(String response);
         protected PublicKey getIDPKey() {
@@ -177,7 +188,7 @@ public class SAMLEndpoint {
             }
             if (config.isValidateSignature()) {
                 try {
-                    verifySignature(GeneralConstants.SAML_REQUEST_KEY, holder);
+                    verifySignature(holder);
                 } catch (VerificationException e) {
                     logger.error("validation failed", e);
                     event.event(EventType.IDENTITY_PROVIDER_RESPONSE);
@@ -236,18 +247,16 @@ public class SAMLEndpoint {
             builder.logoutRequestID(request.getID());
             builder.destination(config.getSingleLogoutServiceUrl());
             builder.issuer(issuerURL);
-            JaxrsSAML2BindingBuilder binding = new JaxrsSAML2BindingBuilder()
-                        .relayState(relayState);
+            builder.relayState(relayState);
             if (config.isWantAuthnRequestsSigned()) {
-                binding.signWith(realm.getPrivateKey(), realm.getPublicKey(), realm.getCertificate())
-                        .signatureAlgorithm(provider.getSignatureAlgorithm())
+                builder.signWith(realm.getPrivateKey(), realm.getPublicKey(), realm.getCertificate())
                         .signDocument();
             }
             try {
                 if (config.isPostBindingResponse()) {
-                    return binding.postBinding(builder.buildDocument()).response(config.getSingleLogoutServiceUrl());
+                    return builder.postBinding().response();
                 } else {
-                    return binding.redirectBinding(builder.buildDocument()).response(config.getSingleLogoutServiceUrl());
+                    return builder.redirectBinding().response();
                 }
             } catch (ConfigurationException e) {
                 throw new RuntimeException(e);
@@ -265,7 +274,7 @@ public class SAMLEndpoint {
         protected Response handleLoginResponse(String samlResponse, SAMLDocumentHolder holder, ResponseType responseType, String relayState) {
 
             try {
-                AssertionType assertion = AssertionUtil.getAssertion(responseType, realm.getPrivateKey());
+                AssertionType assertion = getAssertion(responseType);
                 SubjectType subject = assertion.getSubject();
                 SubjectType.STSubType subType = subject.getSubType();
                 NameIDType subjectNameID = (NameIDType) subType.getBaseID();
@@ -325,6 +334,22 @@ public class SAMLEndpoint {
 
 
 
+        private AssertionType getAssertion(ResponseType responseType) throws ProcessingException {
+            List<ResponseType.RTChoiceType> assertions = responseType.getAssertions();
+
+            if (assertions.isEmpty()) {
+                throw new IdentityBrokerException("No assertion from response.");
+            }
+
+            ResponseType.RTChoiceType rtChoiceType = assertions.get(0);
+            EncryptedAssertionType encryptedAssertion = rtChoiceType.getEncryptedAssertion();
+
+            if (encryptedAssertion != null) {
+                decryptAssertion(responseType, realm.getPrivateKey());
+
+            }
+            return responseType.getAssertions().get(0).getAssertion();
+        }
 
         public Response handleSamlResponse(String samlResponse, String relayState) {
             SAMLDocumentHolder holder = extractResponseDocument(samlResponse);
@@ -338,7 +363,7 @@ public class SAMLEndpoint {
             }
             if (config.isValidateSignature()) {
                 try {
-                    verifySignature(GeneralConstants.SAML_RESPONSE_KEY, holder);
+                    verifySignature(holder);
                 } catch (VerificationException e) {
                     logger.error("validation failed", e);
                     event.event(EventType.IDENTITY_PROVIDER_RESPONSE);
@@ -381,14 +406,43 @@ public class SAMLEndpoint {
         }
 
 
+        protected ResponseType decryptAssertion(ResponseType responseType, PrivateKey privateKey) throws ProcessingException {
+            SAML2Response saml2Response = new SAML2Response();
 
+            try {
+                Document doc = saml2Response.convert(responseType);
+                Element enc = DocumentUtil.getElement(doc, new QName(JBossSAMLConstants.ENCRYPTED_ASSERTION.get()));
+
+                if (enc == null) {
+                    throw new IdentityBrokerException("No encrypted assertion found.");
+                }
+
+                String oldID = enc.getAttribute(JBossSAMLConstants.ID.get());
+                Document newDoc = DocumentUtil.createDocument();
+                Node importedNode = newDoc.importNode(enc, true);
+                newDoc.appendChild(importedNode);
+
+                Element decryptedDocumentElement = XMLEncryptionUtil.decryptElementInDocument(newDoc, privateKey);
+                SAMLParser parser = new SAMLParser();
+
+                JAXPValidationUtil.checkSchemaValidation(decryptedDocumentElement);
+                AssertionType assertion = (AssertionType) parser.parse(StaxParserUtil.getXMLEventReader(DocumentUtil
+                        .getNodeAsStream(decryptedDocumentElement)));
+
+                responseType.replaceAssertion(oldID, new ResponseType.RTChoiceType(assertion));
+
+                return responseType;
+            } catch (Exception e) {
+                throw new IdentityBrokerException("Could not decrypt assertion.", e);
+            }
+        }
 
 
     }
 
     protected class PostBinding extends Binding {
         @Override
-        protected void verifySignature(String key, SAMLDocumentHolder documentHolder) throws VerificationException {
+        protected void verifySignature(SAMLDocumentHolder documentHolder) throws VerificationException {
             SamlProtocolUtils.verifyDocumentSignature(documentHolder.getSamlDocument(), getIDPKey());
         }
 
@@ -411,9 +465,9 @@ public class SAMLEndpoint {
 
     protected class RedirectBinding extends Binding {
         @Override
-        protected void verifySignature(String key, SAMLDocumentHolder documentHolder) throws VerificationException {
+        protected void verifySignature(SAMLDocumentHolder documentHolder) throws VerificationException {
             PublicKey publicKey = getIDPKey();
-            SamlProtocolUtils.verifyRedirectSignature(publicKey, uriInfo, key);
+            SamlProtocolUtils.verifyRedirectSignature(publicKey, uriInfo);
         }
 
 

broker/saml/src/main/java/org/keycloak/broker/saml/SAMLIdentityProvider.java

@@ -33,18 +33,20 @@ import org.keycloak.models.ClientSessionModel;
 import org.keycloak.models.FederatedIdentityModel;
 import org.keycloak.models.RealmModel;
 import org.keycloak.models.UserSessionModel;
-import org.keycloak.protocol.saml.JaxrsSAML2BindingBuilder;
-import org.keycloak.saml.SAML2AuthnRequestBuilder;
-import org.keycloak.saml.SAML2LogoutRequestBuilder;
-import org.keycloak.saml.SAML2NameIDPolicyBuilder;
-import org.keycloak.saml.SignatureAlgorithm;
+import org.keycloak.protocol.saml.SAML2AuthnRequestBuilder;
+import org.keycloak.protocol.saml.SAML2LogoutRequestBuilder;
+import org.keycloak.protocol.saml.SAML2NameIDPolicyBuilder;
 import org.keycloak.saml.common.constants.GeneralConstants;
 import org.keycloak.saml.common.constants.JBossSAMLURIConstants;
+import org.keycloak.saml.common.exceptions.ConfigurationException;
+import org.keycloak.saml.common.exceptions.ParsingException;
+import org.keycloak.saml.common.exceptions.ProcessingException;
 
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.UriBuilder;
 import javax.ws.rs.core.UriInfo;
+import java.io.IOException;
 import java.security.KeyPair;
 import java.security.PrivateKey;
 import java.security.PublicKey;
@@ -90,8 +92,7 @@ public class SAMLIdentityProvider extends AbstractIdentityProvider<SAMLIdentityP
                     .issuer(issuerURL)
                     .forceAuthn(getConfig().isForceAuthn())
                     .protocolBinding(protocolBinding)
-                    .nameIdPolicy(SAML2NameIDPolicyBuilder.format(nameIDPolicyFormat));
-            JaxrsSAML2BindingBuilder binding = new JaxrsSAML2BindingBuilder()
+                    .nameIdPolicy(SAML2NameIDPolicyBuilder.format(nameIDPolicyFormat))
                     .relayState(request.getState());
 
             if (getConfig().isWantAuthnRequestsSigned()) {
@@ -108,15 +109,14 @@ public class SAMLIdentityProvider extends AbstractIdentityProvider<SAMLIdentityP
 
                 KeyPair keypair = new KeyPair(publicKey, privateKey);
 
-                binding.signWith(keypair);
-                binding.signatureAlgorithm(getSignatureAlgorithm());
-                binding.signDocument();
+                authnRequestBuilder.signWith(keypair);
+                authnRequestBuilder.signDocument();
             }
 
             if (getConfig().isPostBindingAuthnRequest()) {
-                return binding.postBinding(authnRequestBuilder.toDocument()).request(destinationUrl);
+                return authnRequestBuilder.postBinding().request();
             } else {
-                return binding.redirectBinding(authnRequestBuilder.toDocument()).request(destinationUrl);
+                return authnRequestBuilder.redirectBinding().request();
             }
         } catch (Exception e) {
             throw new IdentityBrokerException("Could not create authentication request.", e);
@@ -153,10 +153,9 @@ public class SAMLIdentityProvider extends AbstractIdentityProvider<SAMLIdentityP
         String singleLogoutServiceUrl = getConfig().getSingleLogoutServiceUrl();
         if (singleLogoutServiceUrl == null || singleLogoutServiceUrl.trim().equals("") || !getConfig().isBackchannelSupported()) return;
         SAML2LogoutRequestBuilder logoutBuilder = buildLogoutRequest(userSession, uriInfo, realm, singleLogoutServiceUrl);
-        JaxrsSAML2BindingBuilder binding = buildLogoutBinding(userSession, realm);
         try {
             int status = SimpleHttp.doPost(singleLogoutServiceUrl)
-                    .param(GeneralConstants.SAML_REQUEST_KEY, binding.postBinding(logoutBuilder.buildDocument()).encoded())
+                    .param(GeneralConstants.SAML_REQUEST_KEY, logoutBuilder.postBinding().encoded())
                     .param(GeneralConstants.RELAY_STATE, userSession.getId()).asStatus();
             boolean success = status >=200 && status < 400;
             if (!success) {
@@ -179,8 +178,7 @@ public class SAMLIdentityProvider extends AbstractIdentityProvider<SAMLIdentityP
        } else {
             try {
                 SAML2LogoutRequestBuilder logoutBuilder = buildLogoutRequest(userSession, uriInfo, realm, singleLogoutServiceUrl);
-                JaxrsSAML2BindingBuilder binding = buildLogoutBinding(userSession, realm);
-                return binding.postBinding(logoutBuilder.buildDocument()).request(singleLogoutServiceUrl);
+                return logoutBuilder.postBinding().request();
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
@@ -194,19 +192,13 @@ public class SAMLIdentityProvider extends AbstractIdentityProvider<SAMLIdentityP
                 .issuer(getEntityId(uriInfo, realm))
                 .sessionIndex(userSession.getNote(SAMLEndpoint.SAML_FEDERATED_SESSION_INDEX))
                 .userPrincipal(userSession.getNote(SAMLEndpoint.SAML_FEDERATED_SUBJECT), userSession.getNote(SAMLEndpoint.SAML_FEDERATED_SUBJECT_NAMEFORMAT))
-                .destination(singleLogoutServiceUrl);
-        return logoutBuilder;
-    }
-
-    private JaxrsSAML2BindingBuilder buildLogoutBinding(UserSessionModel userSession, RealmModel realm) {
-        JaxrsSAML2BindingBuilder binding = new JaxrsSAML2BindingBuilder()
+                .destination(singleLogoutServiceUrl)
                 .relayState(userSession.getId());
         if (getConfig().isWantAuthnRequestsSigned()) {
-            binding.signWith(realm.getPrivateKey(), realm.getPublicKey(), realm.getCertificate())
-                    .signatureAlgorithm(getSignatureAlgorithm())
+            logoutBuilder.signWith(realm.getPrivateKey(), realm.getPublicKey(), realm.getCertificate())
                     .signDocument();
         }
-        return binding;
+        return logoutBuilder;
     }
 
     @Override
@@ -228,7 +220,7 @@ public class SAMLIdentityProvider extends AbstractIdentityProvider<SAMLIdentityP
 
 
         String descriptor =
-                "<EntityDescriptor xmlns=\"urn:oasis:names:tc:SAML:2.0:metadata\" entityID=\"" + getEntityId(uriInfo, realm) + "\">\n" +
+                "<EntityDescriptor entityID=\"" + getEntityId(uriInfo, realm) + "\">\n" +
                 "    <SPSSODescriptor AuthnRequestsSigned=\"" + getConfig().isWantAuthnRequestsSigned() + "\"\n" +
                 "            protocolSupportEnumeration=\"urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol http://schemas.xmlsoap.org/ws/2003/07/secext\">\n" +
                 "        <NameIDFormat>" + getConfig().getNameIDPolicyFormat() + "\n" +
@@ -253,14 +245,4 @@ public class SAMLIdentityProvider extends AbstractIdentityProvider<SAMLIdentityP
                 "</EntityDescriptor>\n";
         return Response.ok(descriptor, MediaType.APPLICATION_XML_TYPE).build();
     }
-
-    public SignatureAlgorithm getSignatureAlgorithm() {
-        String alg = getConfig().getSignatureAlgorithm();
-        if (alg != null) {
-            SignatureAlgorithm algorithm = SignatureAlgorithm.valueOf(alg);
-            if (algorithm != null) return algorithm;
-        }
-        return SignatureAlgorithm.RSA_SHA256;
-    }
-
 }

broker/saml/src/main/java/org/keycloak/broker/saml/SAMLIdentityProviderConfig.java

@@ -87,14 +87,6 @@ public class SAMLIdentityProviderConfig extends IdentityProviderModel {
         getConfig().put("wantAuthnRequestsSigned", String.valueOf(wantAuthnRequestsSigned));
     }
 
-    public String getSignatureAlgorithm() {
-        return getConfig().get("signatureAlgorithm");
-    }
-
-    public void setSignatureAlgorithm(String signatureAlgorithm) {
-        getConfig().put("signatureAlgorithm", signatureAlgorithm);
-    }
-
     public String getEncryptionPublicKey() {
         return getConfig().get("encryptionPublicKey");
     }

broker/saml/src/main/java/org/keycloak/broker/saml/SAMLIdentityProviderFactory.java

@@ -73,78 +73,74 @@ public class SAMLIdentityProviderFactory extends AbstractIdentityProviderFactory
             List<EntityDescriptorType.EDTChoiceType> choiceType = entityType.getChoiceType();
 
             if (!choiceType.isEmpty()) {
-                IDPSSODescriptorType idpDescriptor = null;
+                EntityDescriptorType.EDTChoiceType edtChoiceType = choiceType.get(0);
+                List<EntityDescriptorType.EDTDescriptorChoiceType> descriptors = edtChoiceType.getDescriptors();
 
-                //Metadata documents can contain multiple Descriptors (See ADFS metadata documents) such as RoleDescriptor, SPSSODescriptor, IDPSSODescriptor.
-                //So we need to loop through to find the IDPSSODescriptor.
-                for(EntityDescriptorType.EDTChoiceType edtChoiceType : entityType.getChoiceType()) {
-                    List<EntityDescriptorType.EDTDescriptorChoiceType> descriptors = edtChoiceType.getDescriptors();
+                if (!descriptors.isEmpty()) {
+                    EntityDescriptorType.EDTDescriptorChoiceType edtDescriptorChoiceType = descriptors.get(0);
+                    IDPSSODescriptorType idpDescriptor = edtDescriptorChoiceType.getIdpDescriptor();
 
-                    if(!descriptors.isEmpty() && descriptors.get(0).getIdpDescriptor() != null) {
-                        idpDescriptor = descriptors.get(0).getIdpDescriptor();
-                    }
-                }
-
-                if (idpDescriptor != null) {
-                    SAMLIdentityProviderConfig samlIdentityProviderConfig = new SAMLIdentityProviderConfig();
-                    String singleSignOnServiceUrl = null;
-                    boolean postBinding = false;
-                    for (EndpointType endpoint : idpDescriptor.getSingleSignOnService()) {
-                        if (endpoint.getBinding().toString().equals(JBossSAMLURIConstants.SAML_HTTP_POST_BINDING.get())) {
-                            singleSignOnServiceUrl = endpoint.getLocation().toString();
-                            postBinding = true;
-                            break;
-                        } else if (endpoint.getBinding().toString().equals(JBossSAMLURIConstants.SAML_HTTP_REDIRECT_BINDING.get())){
-                            singleSignOnServiceUrl = endpoint.getLocation().toString();
-                        }
-                    }
-                    String singleLogoutServiceUrl = null;
-                    for (EndpointType endpoint : idpDescriptor.getSingleLogoutService()) {
-                        if (postBinding && endpoint.getBinding().toString().equals(JBossSAMLURIConstants.SAML_HTTP_POST_BINDING.get())) {
-                            singleLogoutServiceUrl = endpoint.getLocation().toString();
-                            break;
-                        } else if (!postBinding && endpoint.getBinding().toString().equals(JBossSAMLURIConstants.SAML_HTTP_REDIRECT_BINDING.get())){
-                            singleLogoutServiceUrl = endpoint.getLocation().toString();
-                            break;
-                        }
-
-                    }
-                    samlIdentityProviderConfig.setSingleLogoutServiceUrl(singleLogoutServiceUrl);
-                    samlIdentityProviderConfig.setSingleSignOnServiceUrl(singleSignOnServiceUrl);
-                    samlIdentityProviderConfig.setWantAuthnRequestsSigned(idpDescriptor.isWantAuthnRequestsSigned());
-                    samlIdentityProviderConfig.setValidateSignature(idpDescriptor.isWantAuthnRequestsSigned());
-                    samlIdentityProviderConfig.setPostBindingResponse(postBinding);
-                    samlIdentityProviderConfig.setPostBindingAuthnRequest(postBinding);
-
-                    List<KeyDescriptorType> keyDescriptor = idpDescriptor.getKeyDescriptor();
-                    String defaultCertificate = null;
-
-                    if (keyDescriptor != null) {
-                        for (KeyDescriptorType keyDescriptorType : keyDescriptor) {
-                            Element keyInfo = keyDescriptorType.getKeyInfo();
-                            Element x509KeyInfo = DocumentUtil.getChildElement(keyInfo, new QName("dsig", "X509Certificate"));
-
-                            if (KeyTypes.SIGNING.equals(keyDescriptorType.getUse())) {
-                                samlIdentityProviderConfig.setSigningCertificate(x509KeyInfo.getTextContent());
-                            } else if (KeyTypes.ENCRYPTION.equals(keyDescriptorType.getUse())) {
-                                samlIdentityProviderConfig.setEncryptionPublicKey(x509KeyInfo.getTextContent());
-                            } else if (keyDescriptorType.getUse() ==  null) {
-                                defaultCertificate = x509KeyInfo.getTextContent();
+                    if (idpDescriptor != null) {
+                        SAMLIdentityProviderConfig samlIdentityProviderConfig = new SAMLIdentityProviderConfig();
+                        String singleSignOnServiceUrl = null;
+                        boolean postBinding = false;
+                        for (EndpointType endpoint : idpDescriptor.getSingleSignOnService()) {
+                            if (endpoint.getBinding().toString().equals(JBossSAMLURIConstants.SAML_HTTP_POST_BINDING.get())) {
+                                singleSignOnServiceUrl = endpoint.getLocation().toString();
+                                postBinding = true;
+                                break;
+                            } else if (endpoint.getBinding().toString().equals(JBossSAMLURIConstants.SAML_HTTP_REDIRECT_BINDING.get())){
+                                singleSignOnServiceUrl = endpoint.getLocation().toString();
                             }
                         }
-                    }
+                        String singleLogoutServiceUrl = null;
+                        for (EndpointType endpoint : idpDescriptor.getSingleLogoutService()) {
+                            if (postBinding && endpoint.getBinding().toString().equals(JBossSAMLURIConstants.SAML_HTTP_POST_BINDING.get())) {
+                                singleLogoutServiceUrl = endpoint.getLocation().toString();
+                                break;
+                            } else if (!postBinding && endpoint.getBinding().toString().equals(JBossSAMLURIConstants.SAML_HTTP_REDIRECT_BINDING.get())){
+                                singleLogoutServiceUrl = endpoint.getLocation().toString();
+                                break;
+                            }
 
-                    if (defaultCertificate != null) {
-                        if (samlIdentityProviderConfig.getSigningCertificate() == null) {
-                            samlIdentityProviderConfig.setSigningCertificate(defaultCertificate);
+                        }
+                        samlIdentityProviderConfig.setSingleLogoutServiceUrl(singleLogoutServiceUrl);
+                        samlIdentityProviderConfig.setSingleSignOnServiceUrl(singleSignOnServiceUrl);
+                        samlIdentityProviderConfig.setWantAuthnRequestsSigned(idpDescriptor.isWantAuthnRequestsSigned());
+                        samlIdentityProviderConfig.setValidateSignature(idpDescriptor.isWantAuthnRequestsSigned());
+                        samlIdentityProviderConfig.setPostBindingResponse(postBinding);
+                        samlIdentityProviderConfig.setPostBindingAuthnRequest(postBinding);
+
+                        List<KeyDescriptorType> keyDescriptor = idpDescriptor.getKeyDescriptor();
+                        String defaultCertificate = null;
+
+                        if (keyDescriptor != null) {
+                            for (KeyDescriptorType keyDescriptorType : keyDescriptor) {
+                                Element keyInfo = keyDescriptorType.getKeyInfo();
+                                Element x509KeyInfo = DocumentUtil.getChildElement(keyInfo, new QName("dsig", "X509Certificate"));
+
+                                if (KeyTypes.SIGNING.equals(keyDescriptorType.getUse())) {
+                                    samlIdentityProviderConfig.setSigningCertificate(x509KeyInfo.getTextContent());
+                                } else if (KeyTypes.ENCRYPTION.equals(keyDescriptorType.getUse())) {
+                                    samlIdentityProviderConfig.setEncryptionPublicKey(x509KeyInfo.getTextContent());
+                                } else if (keyDescriptorType.getUse() ==  null) {
+                                    defaultCertificate = x509KeyInfo.getTextContent();
+                                }
+                            }
                         }
 
-                        if (samlIdentityProviderConfig.getEncryptionPublicKey() == null) {
-                            samlIdentityProviderConfig.setEncryptionPublicKey(defaultCertificate);
-                        }
-                    }
+                        if (defaultCertificate != null) {
+                            if (samlIdentityProviderConfig.getSigningCertificate() == null) {
+                                samlIdentityProviderConfig.setSigningCertificate(defaultCertificate);
+                            }
 
-                    return samlIdentityProviderConfig.getConfig();
+                            if (samlIdentityProviderConfig.getEncryptionPublicKey() == null) {
+                                samlIdentityProviderConfig.setEncryptionPublicKey(defaultCertificate);
+                            }
+                        }
+
+                        return samlIdentityProviderConfig.getConfig();
+                    }
                 }
             }
         } catch (ParsingException pe) {

broker/saml/src/main/java/org/keycloak/broker/saml/mappers/UserAttributeMapper.java

@@ -98,7 +98,7 @@ public class UserAttributeMapper extends AbstractIdentityProviderMapper {
             for (AttributeStatementType.ASTChoiceType choice : statement.getAttributes()) {
                 AttributeType attr = choice.getAttribute();
                 if (name != null && !name.equals(attr.getName())) continue;
-                if (friendly != null && !friendly.equals(attr.getFriendlyName())) continue;
+                if (friendly != null && !name.equals(attr.getFriendlyName())) continue;
 
                 List<Object> attributeValue = attr.getAttributeValue();
                 if (attributeValue == null || attributeValue.isEmpty()) return null;

client-api/src/main/java/org/keycloak/client/registration/ClientRegistration.java

@@ -1,275 +0,0 @@
-package org.keycloak.client.registration;
-
-import org.apache.http.HttpHeaders;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpDelete;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.methods.HttpPut;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.keycloak.representations.idm.ClientRepresentation;
-import org.keycloak.common.util.Base64;
-import org.keycloak.util.JsonSerialization;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
- */
-public class ClientRegistration {
-
-    private String clientRegistrationUrl;
-    private HttpClient httpClient;
-    private Auth auth;
-
-    public static ClientRegistrationBuilder create() {
-        return new ClientRegistrationBuilder();
-    }
-
-    private ClientRegistration() {
-    }
-
-    public ClientRepresentation create(ClientRepresentation client) throws ClientRegistrationException {
-        String content = serialize(client);
-        InputStream resultStream = doPost(content);
-        return deserialize(resultStream, ClientRepresentation.class);
-    }
-
-    public ClientRepresentation get() throws ClientRegistrationException {
-        if (auth instanceof ClientIdSecretAuth) {
-            String clientId = ((ClientIdSecretAuth) auth).clientId;
-            return get(clientId);
-        } else {
-            throw new ClientRegistrationException("Requires client authentication");
-        }
-    }
-
-    public ClientRepresentation get(String clientId) throws ClientRegistrationException {
-        InputStream resultStream = doGet(clientId);
-        return resultStream != null ? deserialize(resultStream, ClientRepresentation.class) : null;
-    }
-
-    public void update(ClientRepresentation client) throws ClientRegistrationException {
-        String content = serialize(client);
-        doPut(content, client.getClientId());
-    }
-
-    public void delete() throws ClientRegistrationException {
-        if (auth instanceof ClientIdSecretAuth) {
-            String clientId = ((ClientIdSecretAuth) auth).clientId;
-            delete(clientId);
-        } else {
-            throw new ClientRegistrationException("Requires client authentication");
-        }
-    }
-
-    public void delete(String clientId) throws ClientRegistrationException {
-        doDelete(clientId);
-    }
-
-    public void close() throws ClientRegistrationException {
-        if (httpClient instanceof CloseableHttpClient) {
-            try {
-                ((CloseableHttpClient) httpClient).close();
-            } catch (IOException e) {
-                throw new ClientRegistrationException("Failed to close http client", e);
-            }
-        }
-    }
-
-    private InputStream doPost(String content) throws ClientRegistrationException {
-        try {
-            HttpPost request = new HttpPost(clientRegistrationUrl);
-
-            request.setHeader(HttpHeaders.CONTENT_TYPE, "application/json");
-            request.setHeader(HttpHeaders.ACCEPT, "application/json");
-            request.setEntity(new StringEntity(content));
-
-            auth.addAuth(request);
-
-            HttpResponse response = httpClient.execute(request);
-            InputStream responseStream = null;
-            if (response.getEntity() != null) {
-                responseStream = response.getEntity().getContent();
-            }
-
-            if (response.getStatusLine().getStatusCode() == 201) {
-                return responseStream;
-            } else {
-                responseStream.close();
-                throw new HttpErrorException(response.getStatusLine());
-            }
-        } catch (IOException e) {
-            throw new ClientRegistrationException("Failed to send request", e);
-        }
-    }
-
-    private InputStream doGet(String endpoint) throws ClientRegistrationException {
-        try {
-            HttpGet request = new HttpGet(clientRegistrationUrl + "/" + endpoint);
-
-            request.setHeader(HttpHeaders.ACCEPT, "application/json");
-
-            auth.addAuth(request);
-
-            HttpResponse response = httpClient.execute(request);
-            InputStream responseStream = null;
-            if (response.getEntity() != null) {
-                responseStream = response.getEntity().getContent();
-            }
-
-            if (response.getStatusLine().getStatusCode() == 200) {
-                return responseStream;
-            } else if (response.getStatusLine().getStatusCode() == 404) {
-                responseStream.close();
-                return null;
-            } else {
-                responseStream.close();
-                throw new HttpErrorException(response.getStatusLine());
-            }
-        } catch (IOException e) {
-            throw new ClientRegistrationException("Failed to send request", e);
-        }
-    }
-
-    private void doPut(String content, String endpoint) throws ClientRegistrationException {
-        try {
-            HttpPut request = new HttpPut(clientRegistrationUrl + "/" + endpoint);
-
-            request.setHeader(HttpHeaders.CONTENT_TYPE, "application/json");
-            request.setHeader(HttpHeaders.ACCEPT, "application/json");
-            request.setEntity(new StringEntity(content));
-
-            auth.addAuth(request);
-
-            HttpResponse response = httpClient.execute(request);
-            if (response.getEntity() != null) {
-                response.getEntity().getContent().close();
-            }
-
-            if (response.getStatusLine().getStatusCode() != 200) {
-                throw new HttpErrorException(response.getStatusLine());
-            }
-        } catch (IOException e) {
-            throw new ClientRegistrationException("Failed to send request", e);
-        }
-    }
-
-    private void doDelete(String endpoint) throws ClientRegistrationException {
-        try {
-            HttpDelete request = new HttpDelete(clientRegistrationUrl + "/" + endpoint);
-
-            auth.addAuth(request);
-
-            HttpResponse response = httpClient.execute(request);
-            if (response.getEntity() != null) {
-                response.getEntity().getContent().close();
-            }
-
-            if (response.getStatusLine().getStatusCode() != 200) {
-                throw new HttpErrorException(response.getStatusLine());
-            }
-        } catch (IOException e) {
-            throw new ClientRegistrationException("Failed to send request", e);
-        }
-    }
-
-    private String serialize(ClientRepresentation client) throws ClientRegistrationException {
-        try {
-            return JsonSerialization.writeValueAsString(client);
-        } catch (IOException e) {
-            throw new ClientRegistrationException("Failed to write json object", e);
-        }
-    }
-
-    private <T> T deserialize(InputStream inputStream, Class<T> clazz) throws ClientRegistrationException {
-        try {
-            return JsonSerialization.readValue(inputStream, clazz);
-        } catch (IOException e) {
-            throw new ClientRegistrationException("Failed to read json object", e);
-        }
-    }
-
-    public static class ClientRegistrationBuilder {
-
-        private String realm;
-
-        private String authServerUrl;
-
-        private Auth auth;
-
-        private HttpClient httpClient;
-
-        public ClientRegistrationBuilder realm(String realm) {
-            this.realm = realm;
-            return this;
-        }
-        public ClientRegistrationBuilder authServerUrl(String authServerUrl) {
-            this.authServerUrl = authServerUrl;
-            return this;
-        }
-
-        public ClientRegistrationBuilder auth(String token) {
-            this.auth = new TokenAuth(token);
-            return this;
-        }
-
-        public ClientRegistrationBuilder auth(String clientId, String clientSecret) {
-            this.auth = new ClientIdSecretAuth(clientId, clientSecret);
-            return this;
-        }
-
-        public ClientRegistrationBuilder httpClient(HttpClient httpClient) {
-            this.httpClient = httpClient;
-            return this;
-        }
-
-        public ClientRegistration build() {
-            ClientRegistration clientRegistration = new ClientRegistration();
-            clientRegistration.clientRegistrationUrl = authServerUrl + "/realms/" + realm + "/client-registration/default";
-
-            clientRegistration.httpClient = httpClient != null ? httpClient : HttpClients.createDefault();
-            clientRegistration.auth = auth;
-
-            return clientRegistration;
-        }
-
-    }
-
-    public interface Auth {
-        void addAuth(HttpRequest httpRequest);
-    }
-
-    public static class AuthorizationHeaderAuth implements Auth {
-        private String credentials;
-
-        public AuthorizationHeaderAuth(String credentials) {
-            this.credentials = credentials;
-        }
-
-        public void addAuth(HttpRequest httpRequest) {
-            httpRequest.setHeader(HttpHeaders.AUTHORIZATION, credentials);
-        }
-    }
-
-    public static class TokenAuth extends AuthorizationHeaderAuth {
-        public TokenAuth(String token) {
-            super("Bearer " + token);
-        }
-    }
-
-    public static class ClientIdSecretAuth extends AuthorizationHeaderAuth {
-        private String clientId;
-
-        public ClientIdSecretAuth(String clientId, String clientSecret) {
-            super("Basic " + Base64.encodeBytes((clientId + ":" + clientSecret).getBytes()));
-            this.clientId = clientId;
-        }
-    }
-
-}

client-api/src/main/java/org/keycloak/client/registration/ClientRegistrationException.java

@@ -1,16 +0,0 @@
-package org.keycloak.client.registration;
-
-/**
- * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
- */
-public class ClientRegistrationException extends Exception {
-
-    public ClientRegistrationException(String s, Throwable throwable) {
-        super(s, throwable);
-    }
-
-    public ClientRegistrationException(String s) {
-        super(s);
-    }
-
-}

client-api/src/main/java/org/keycloak/client/registration/HttpErrorException.java

@@ -1,22 +0,0 @@
-package org.keycloak.client.registration;
-
-import org.apache.http.StatusLine;
-
-import java.io.IOException;
-
-/**
- * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
- */
-public class HttpErrorException extends IOException {
-
-    private StatusLine statusLine;
-
-    public HttpErrorException(StatusLine statusLine) {
-        this.statusLine = statusLine;
-    }
-
-    public StatusLine getStatusLine() {
-        return statusLine;
-    }
-
-}

common/pom.xml

@@ -1,94 +0,0 @@
-<?xml version="1.0"?>
-<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-parent</artifactId>
-        <groupId>org.keycloak</groupId>
-        <version>1.6.1.Final</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>keycloak-common</artifactId>
-    <name>Keycloak Common</name>
-    <packaging>jar</packaging>
-    <description>Common library and dependencies shared with server and all adapters</description>
-
-    <properties>
-        <timestamp>${maven.build.timestamp}</timestamp>
-        <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
-        <keycloak.osgi.export>
-            org.keycloak.common.*
-        </keycloak.osgi.export>
-        <keycloak.osgi.import>
-            *;resolution:=optional
-        </keycloak.osgi.import>
-    </properties>
-    <dependencies>
-        <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15on</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcpkix-jdk15on</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>${maven.compiler.source}</source>
-                    <target>${maven.compiler.target}</target>
-                </configuration>
-            </plugin>
-
-            <!-- Adding OSGI metadata to the JAR without changing the packaging type. -->
-            <plugin>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-                    </archive>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <executions>
-                    <execution>
-                        <id>bundle-manifest</id>
-                        <phase>process-classes</phase>
-                        <goals>
-                            <goal>manifest</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <instructions>
-                        <Bundle-ClassPath>.</Bundle-ClassPath>
-                        <Bundle-Name>${project.name}</Bundle-Name>
-                        <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
-                        <Import-Package>${keycloak.osgi.import}</Import-Package>
-                        <Export-Package>${keycloak.osgi.export}</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

common/src/main/java/org/keycloak/common/Version.java

@@ -1,37 +0,0 @@
-package org.keycloak.common;
-
-import org.keycloak.common.util.Time;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-
-/**
- * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
- * @version $Revision: 1 $
- */
-public class Version {
-    public static final String UNKNOWN = "UNKNOWN";
-    public static String VERSION;
-    public static String RESOURCES_VERSION;
-    public static String BUILD_TIME;
-
-    static {
-        Properties props = new Properties();
-        InputStream is = Version.class.getResourceAsStream("/keycloak-version.properties");
-        try {
-            props.load(is);
-            Version.VERSION = props.getProperty("version");
-            Version.BUILD_TIME = props.getProperty("build-time");
-            Version.RESOURCES_VERSION = Version.VERSION.toLowerCase();
-            if (Version.RESOURCES_VERSION.endsWith("-snapshot")) {
-                Version.RESOURCES_VERSION = Version.RESOURCES_VERSION.replace("-snapshot", "-" + Time.currentTime());
-            }
-        } catch (IOException e) {
-            Version.VERSION= Version.UNKNOWN;
-            Version.BUILD_TIME= Version.UNKNOWN;
-        }
-
-    }
-
-}

common/src/main/java/org/keycloak/common/util/KeystoreUtil.java

@@ -1,56 +0,0 @@
-package org.keycloak.common.util;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.security.KeyStore;
-import java.security.PrivateKey;
-
-import org.keycloak.common.constants.GenericConstants;
-
-/**
- * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
- * @version $Revision: 1 $
- */
-public class KeystoreUtil {
-    static {
-        BouncyIntegration.init();
-    }
-
-    public enum KeystoreFormat {
-        JKS,
-        PKCS12
-    }
-
-    public static KeyStore loadKeyStore(String filename, String password) throws Exception {
-        KeyStore trustStore = KeyStore.getInstance(KeyStore.getDefaultType());
-        InputStream trustStream = (filename.startsWith(GenericConstants.PROTOCOL_CLASSPATH))
-                ?KeystoreUtil.class.getResourceAsStream(filename.replace(GenericConstants.PROTOCOL_CLASSPATH, ""))
-                :new FileInputStream(new File(filename));
-        trustStore.load(trustStream, password.toCharArray());
-        trustStream.close();
-        return trustStore;
-    }
-
-    public static PrivateKey loadPrivateKeyFromKeystore(String keystoreFile, String storePassword, String keyPassword, String keyAlias, KeystoreFormat format) {
-        InputStream stream = FindFile.findFile(keystoreFile);
-
-        try {
-            KeyStore keyStore = null;
-            if (format == KeystoreFormat.JKS) {
-                keyStore = KeyStore.getInstance(format.toString());
-            } else {
-                keyStore = KeyStore.getInstance(format.toString(), "BC");
-            }
-
-            keyStore.load(stream, storePassword.toCharArray());
-            PrivateKey key = (PrivateKey) keyStore.getKey(keyAlias, keyPassword.toCharArray());
-            if (key == null) {
-                throw new RuntimeException("Couldn't load key with alias '" + keyAlias + "' from keystore");
-            }
-            return key;
-        } catch (Exception e) {
-            throw new RuntimeException("Failed to load private key: " + e.getMessage(), e);
-        }
-    }
-}

common/src/main/resources/keycloak-version.properties

@@ -1,2 +0,0 @@
-version=${product.version}
-build-time=${product.build-time}

connections/file/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.6.1.Final</version>
+        <version>1.4.0.Final</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

connections/http-client/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.6.1.Final</version>
+        <version>1.4.0.Final</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

connections/http-client/src/main/java/org/keycloak/connections/httpclient/DefaultHttpClientFactory.java

@@ -12,8 +12,8 @@ import org.jboss.logging.Logger;
 import org.keycloak.Config;
 import org.keycloak.models.KeycloakSession;
 import org.keycloak.models.KeycloakSessionFactory;
-import org.keycloak.common.util.EnvUtil;
-import org.keycloak.common.util.KeystoreUtil;
+import org.keycloak.util.EnvUtil;
+import org.keycloak.util.KeystoreUtil;
 
 import java.io.IOException;
 import java.io.InputStream;

connections/infinispan/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.6.1.Final</version>
+        <version>1.4.0.Final</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -27,6 +27,5 @@
             <artifactId>infinispan-core</artifactId>
             <scope>provided</scope>
         </dependency>
-
     </dependencies>
 </project>

connections/infinispan/src/main/java/org/keycloak/connections/infinispan/DefaultInfinispanConnectionProviderFactory.java

@@ -66,19 +66,6 @@ public class DefaultInfinispanConnectionProviderFactory implements InfinispanCon
                     } else {
                         initEmbedded();
                     }
-
-                    // Backwards compatibility
-                    if (cacheManager.getCacheConfiguration(InfinispanConnectionProvider.OFFLINE_SESSION_CACHE_NAME) == null) {
-                        logger.warnf("No configuration provided for '%s' cache. Using '%s' configuration as template",
-                                InfinispanConnectionProvider.OFFLINE_SESSION_CACHE_NAME, InfinispanConnectionProvider.SESSION_CACHE_NAME);
-
-                        Configuration sessionCacheConfig = cacheManager.getCacheConfiguration(InfinispanConnectionProvider.SESSION_CACHE_NAME);
-                        if (sessionCacheConfig != null) {
-                            ConfigurationBuilder confBuilder = new ConfigurationBuilder().read(sessionCacheConfig);
-                            Configuration offlineSessionConfig = confBuilder.build();
-                            cacheManager.defineConfiguration(InfinispanConnectionProvider.OFFLINE_SESSION_CACHE_NAME, offlineSessionConfig);
-                        }
-                    }
                 }
             }
         }

connections/infinispan/src/main/java/org/keycloak/connections/infinispan/InfinispanConnectionProvider.java

@@ -11,7 +11,6 @@ public interface InfinispanConnectionProvider extends Provider {
     static final String REALM_CACHE_NAME = "realms";
     static final String USER_CACHE_NAME = "users";
     static final String SESSION_CACHE_NAME = "sessions";
-    static final String OFFLINE_SESSION_CACHE_NAME = "offlineSessions";
     static final String LOGIN_FAILURE_CACHE_NAME = "loginFailures";
 
     <K, V> Cache<K, V> getCache(String name);

connections/jpa-liquibase/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.6.1.Final</version>
+        <version>1.4.0.Final</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

connections/jpa-liquibase/src/main/java/org/keycloak/connections/jpa/updater/liquibase/LiquibaseJpaUpdaterProvider.java

@@ -231,7 +231,7 @@ public class LiquibaseJpaUpdaterProvider implements JpaUpdaterProvider {
 
     }
 
-    public static String getTable(String table, String defaultSchema) {
+    private String getTable(String table, String defaultSchema) {
         return defaultSchema != null ? defaultSchema + "." + table : table;
     }
 

connections/jpa-liquibase/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/AddRealmCodeSecret.java

@@ -12,7 +12,6 @@ import liquibase.statement.SqlStatement;
 import liquibase.statement.core.UpdateStatement;
 import liquibase.structure.core.Schema;
 import liquibase.structure.core.Table;
-import org.keycloak.connections.jpa.updater.liquibase.LiquibaseJpaUpdaterProvider;
 import org.keycloak.models.utils.KeycloakModelUtils;
 
 import java.sql.Connection;
@@ -37,7 +36,7 @@ public class AddRealmCodeSecret implements CustomSqlChange {
 
             String correctedTableName = database.correctObjectName("REALM", Table.class);
             if (SnapshotGeneratorFactory.getInstance().has(new Table().setName(correctedTableName), database)) {
-                ResultSet resultSet = connection.createStatement().executeQuery("SELECT ID FROM " + LiquibaseJpaUpdaterProvider.getTable(correctedTableName, database.getDefaultSchemaName()) + " WHERE CODE_SECRET IS NULL");
+                ResultSet resultSet = connection.createStatement().executeQuery("SELECT ID FROM REALM WHERE CODE_SECRET IS NULL");
                 while (resultSet.next()) {
                     String id = resultSet.getString(1);
 

connections/jpa-liquibase/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/CustomKeycloakTask.java

@@ -16,7 +16,6 @@ import liquibase.snapshot.SnapshotGeneratorFactory;
 import liquibase.statement.SqlStatement;
 import liquibase.structure.core.Table;
 import org.jboss.logging.Logger;
-import org.keycloak.connections.jpa.updater.liquibase.LiquibaseJpaUpdaterProvider;
 import org.keycloak.connections.jpa.updater.liquibase.ThreadLocalSessionContext;
 import org.keycloak.models.KeycloakSession;
 import org.keycloak.services.DefaultKeycloakSessionFactory;
@@ -89,7 +88,7 @@ public abstract class CustomKeycloakTask implements CustomSqlChange {
         try {
             String correctedTableName = database.correctObjectName("REALM", Table.class);
             if (SnapshotGeneratorFactory.getInstance().has(new Table().setName(correctedTableName), database)) {
-                ResultSet resultSet = connection.createStatement().executeQuery("SELECT ID FROM " + getTableName(correctedTableName));
+                ResultSet resultSet = connection.createStatement().executeQuery("SELECT ID FROM REALM");
                 try {
                     return (resultSet.next());
                 } finally {
@@ -109,9 +108,4 @@ public abstract class CustomKeycloakTask implements CustomSqlChange {
     protected abstract void generateStatementsImpl() throws CustomChangeException;
 
     protected abstract String getTaskId();
-
-    // get Table name for sql selects
-    protected String getTableName(String tableName) {
-       return LiquibaseJpaUpdaterProvider.getTable(tableName, database.getDefaultSchemaName());
-    }
 }

connections/jpa-liquibase/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate1_2_0_Beta1.java

@@ -11,7 +11,6 @@ import liquibase.statement.core.InsertStatement;
 import liquibase.statement.core.UpdateStatement;
 import liquibase.structure.core.Table;
 import org.keycloak.Config;
-import org.keycloak.connections.jpa.updater.liquibase.LiquibaseJpaUpdaterProvider;
 import org.keycloak.migration.MigrationProvider;
 import org.keycloak.models.AdminRoles;
 import org.keycloak.models.ClaimMask;
@@ -50,10 +49,7 @@ public class JpaUpdate1_2_0_Beta1 extends CustomKeycloakTask {
         String identityProviderTableName = database.correctObjectName("IDENTITY_PROVIDER", Table.class);
         String idpConfigTableName = database.correctObjectName("IDENTITY_PROVIDER_CONFIG", Table.class);
 
-        String realmSocialConfigTable = getTableName("REALM_SOCIAL_CONFIG");
-        String realmTableName = getTableName("REALM");
-        PreparedStatement statement = jdbcConnection.prepareStatement("select RSC.NAME, VALUE, REALM_ID, UPDATE_PROFILE_ON_SOC_LOGIN from " + realmSocialConfigTable + " RSC," + realmTableName +
-                " REALM where RSC.REALM_ID = REALM.ID ORDER BY RSC.REALM_ID, RSC.NAME");
+        PreparedStatement statement = jdbcConnection.prepareStatement("select RSC.NAME, VALUE, REALM_ID, UPDATE_PROFILE_ON_SOC_LOGIN from REALM_SOCIAL_CONFIG RSC,REALM where RSC.REALM_ID = REALM.ID ORDER BY RSC.REALM_ID, RSC.NAME");
         try {
             ResultSet resultSet = statement.executeQuery();
             try {
@@ -128,7 +124,7 @@ public class JpaUpdate1_2_0_Beta1 extends CustomKeycloakTask {
 
     protected void convertSocialToIdFedUsers() throws SQLException, DatabaseException {
         String federatedIdentityTableName = database.correctObjectName("FEDERATED_IDENTITY", Table.class);
-        PreparedStatement statement = jdbcConnection.prepareStatement("select REALM_ID, USER_ID, SOCIAL_PROVIDER, SOCIAL_USER_ID, SOCIAL_USERNAME from " + getTableName("USER_SOCIAL_LINK"));
+        PreparedStatement statement = jdbcConnection.prepareStatement("select REALM_ID, USER_ID, SOCIAL_PROVIDER, SOCIAL_USER_ID, SOCIAL_USERNAME from USER_SOCIAL_LINK");
         try {
             ResultSet resultSet = statement.executeQuery();
             try {
@@ -174,7 +170,7 @@ public class JpaUpdate1_2_0_Beta1 extends CustomKeycloakTask {
         String adminRoleId = getAdminRoleId();
         String masterRealmId = Config.getAdminRealm();
 
-        PreparedStatement statement = jdbcConnection.prepareStatement("select NAME from " + getTableName("REALM"));
+        PreparedStatement statement = jdbcConnection.prepareStatement("select NAME from REALM");
         try {
             ResultSet resultSet = statement.executeQuery();
             try {
@@ -182,7 +178,7 @@ public class JpaUpdate1_2_0_Beta1 extends CustomKeycloakTask {
                     String realmName = resultSet.getString("NAME");
                     String masterAdminAppName = realmName + "-realm";
 
-                    PreparedStatement statement2 = jdbcConnection.prepareStatement("select ID from " + getTableName("CLIENT") + " where REALM_ID = ? AND NAME = ?");
+                    PreparedStatement statement2 = jdbcConnection.prepareStatement("select ID from CLIENT where REALM_ID = ? AND NAME = ?");
                     statement2.setString(1, masterRealmId);
                     statement2.setString(2, masterAdminAppName);
 
@@ -213,7 +209,7 @@ public class JpaUpdate1_2_0_Beta1 extends CustomKeycloakTask {
     }
 
     private String getAdminRoleId() throws SQLException, DatabaseException {
-        PreparedStatement statement = jdbcConnection.prepareStatement("select ID from " + getTableName("KEYCLOAK_ROLE") + " where NAME = ? AND REALM = ?");
+        PreparedStatement statement = jdbcConnection.prepareStatement("select ID from KEYCLOAK_ROLE where NAME = ? AND REALM = ?");
         statement.setString(1, AdminRoles.ADMIN);
         statement.setString(2, Config.getAdminRealm());
 
@@ -235,8 +231,7 @@ public class JpaUpdate1_2_0_Beta1 extends CustomKeycloakTask {
 
 
     protected void addNewRealmAdminRoles() throws SQLException, DatabaseException {
-        PreparedStatement statement = jdbcConnection.prepareStatement("select CLIENT.ID REALM_ADMIN_APP_ID, CLIENT.REALM_ID REALM_ID, KEYCLOAK_ROLE.ID ADMIN_ROLE_ID from " +
-                getTableName("CLIENT") + " CLIENT," + getTableName("KEYCLOAK_ROLE") + " KEYCLOAK_ROLE where KEYCLOAK_ROLE.APPLICATION = CLIENT.ID AND CLIENT.NAME = 'realm-management' AND KEYCLOAK_ROLE.NAME = ?");
+        PreparedStatement statement = jdbcConnection.prepareStatement("select CLIENT.ID REALM_ADMIN_APP_ID, CLIENT.REALM_ID REALM_ID, KEYCLOAK_ROLE.ID ADMIN_ROLE_ID from CLIENT,KEYCLOAK_ROLE where KEYCLOAK_ROLE.APPLICATION = CLIENT.ID AND CLIENT.NAME = 'realm-management' AND KEYCLOAK_ROLE.NAME = ?");
         statement.setString(1, AdminRoles.REALM_ADMIN);
 
         try {
@@ -285,7 +280,7 @@ public class JpaUpdate1_2_0_Beta1 extends CustomKeycloakTask {
         String protocolMapperTableName = database.correctObjectName("PROTOCOL_MAPPER", Table.class);
         String protocolMapperCfgTableName = database.correctObjectName("PROTOCOL_MAPPER_CONFIG", Table.class);
 
-        PreparedStatement statement = jdbcConnection.prepareStatement("select ID, NAME, ALLOWED_CLAIMS_MASK from " + getTableName("CLIENT"));
+        PreparedStatement statement = jdbcConnection.prepareStatement("select ID, NAME, ALLOWED_CLAIMS_MASK from CLIENT");
 
         try {
             ResultSet resultSet = statement.executeQuery();
@@ -298,7 +293,7 @@ public class JpaUpdate1_2_0_Beta1 extends CustomKeycloakTask {
                     }
 
                     Object acmObj = resultSet.getObject("ALLOWED_CLAIMS_MASK");
-                    long mask = (acmObj != null) ? ((Number) acmObj).longValue() : ClaimMask.ALL;
+                    long mask = (acmObj != null) ? (Long) acmObj : ClaimMask.ALL;
 
                     MigrationProvider migrationProvider = this.kcSession.getProvider(MigrationProvider.class);
                     List<ProtocolMapperRepresentation> protocolMappers = migrationProvider.getMappersForClaimMask(mask);

connections/jpa-liquibase/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate1_2_0_CR1.java

@@ -19,7 +19,7 @@ public class JpaUpdate1_2_0_CR1 extends CustomKeycloakTask {
 
         try {
             String trueValue = DataTypeFactory.getInstance().getTrueBooleanValue(database);
-            PreparedStatement statement = jdbcConnection.prepareStatement("select CLIENT.REALM_ID, CLIENT.ID CLIENT_ID from " + getTableName("CLIENT") + " CLIENT where CLIENT.CONSENT_REQUIRED = " + trueValue);
+            PreparedStatement statement = jdbcConnection.prepareStatement("select CLIENT.REALM_ID, CLIENT.ID CLIENT_ID from CLIENT where CLIENT.CONSENT_REQUIRED = " + trueValue);
 
             try {
                 ResultSet resultSet = statement.executeQuery();

connections/jpa-liquibase/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate1_4_0_Final.java

@@ -20,7 +20,7 @@ public class JpaUpdate1_4_0_Final extends CustomKeycloakTask {
         String userAttributeTableName = database.correctObjectName("USER_ATTRIBUTE", Table.class);
 
         try {
-            PreparedStatement statement = jdbcConnection.prepareStatement("select NAME, USER_ID from " + getTableName("USER_ATTRIBUTE"));
+            PreparedStatement statement = jdbcConnection.prepareStatement("select NAME, USER_ID from USER_ATTRIBUTE");
 
             try {
                 ResultSet resultSet = statement.executeQuery();

connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.5.0.xml

@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
-    <changeSet author="bburke@redhat.com" id="1.5.0">
-        <delete tableName="CLIENT_SESSION_AUTH_STATUS"/>
-        <delete tableName="CLIENT_SESSION_ROLE"/>
-        <delete tableName="CLIENT_SESSION_PROT_MAPPER"/>
-        <delete tableName="CLIENT_SESSION_NOTE"/>
-        <delete tableName="CLIENT_SESSION"/>
-        <delete tableName="USER_SESSION_NOTE"/>
-        <delete tableName="USER_SESSION"/>
-
-        <dropDefaultValue tableName="AUTHENTICATION_EXECUTION" columnName="USER_SETUP_ALLOWED" />
-        <dropColumn tableName="AUTHENTICATION_EXECUTION" columnName="USER_SETUP_ALLOWED"/>
-        <addColumn tableName="CREDENTIAL">
-            <column name="COUNTER" type="INT" defaultValueNumeric="0">
-                <constraints nullable="true"/>
-            </column>
-            <column name="DIGITS" type="INT" defaultValueNumeric="6">
-                <constraints nullable="true"/>
-            </column>
-            <column name="PERIOD" type="INT" defaultValueNumeric="30">
-                <constraints nullable="true"/>
-            </column>
-            <column name="ALGORITHM" type="VARCHAR(36)" defaultValue="HmacSHA1">
-                <constraints nullable="true"/>
-            </column>
-        </addColumn>
-        <addColumn tableName="REALM">
-            <column name="OTP_POLICY_COUNTER" type="INT" defaultValueNumeric="0">
-                <constraints nullable="true"/>
-            </column>
-            <column name="OTP_POLICY_WINDOW" type="INT" defaultValueNumeric="1">
-                <constraints nullable="true"/>
-            </column>
-            <column name="OTP_POLICY_PERIOD" type="INT" defaultValueNumeric="30">
-                <constraints nullable="true"/>
-            </column>
-            <column name="OTP_POLICY_DIGITS" type="INT" defaultValueNumeric="6">
-                <constraints nullable="true"/>
-            </column>
-            <column name="OTP_POLICY_ALG" type="VARCHAR(36)" defaultValue="HmacSHA1">
-                <constraints nullable="true"/>
-            </column>
-            <column name="OTP_POLICY_TYPE" type="VARCHAR(36)" defaultValue="totp">
-                <constraints nullable="true"/>
-            </column>
-            <column name="BROWSER_FLOW" type="VARCHAR(36)">
-                <constraints nullable="true"/>
-            </column>
-            <column name="REGISTRATION_FLOW" type="VARCHAR(36)">
-                <constraints nullable="true"/>
-            </column>
-            <column name="DIRECT_GRANT_FLOW" type="VARCHAR(36)">
-                <constraints nullable="true"/>
-            </column>
-            <column name="RESET_CREDENTIALS_FLOW" type="VARCHAR(36)">
-                <constraints nullable="true"/>
-            </column>
-            <column name="CLIENT_AUTH_FLOW" type="VARCHAR(36)">
-                <constraints nullable="true"/>
-            </column>
-        </addColumn>
-
-        <addColumn tableName="CLIENT">
-            <column name="CLIENT_AUTHENTICATOR_TYPE" type="VARCHAR(255)">
-                <constraints nullable="true"/>
-            </column>
-        </addColumn>
-
-        <!-- Sybase specific hacks -->
-        <modifySql dbms="sybase">
-            <regExpReplace replace=".*(SET DEFAULT NULL)" with="SELECT 1" />
-        </modifySql>
-
-    </changeSet>
-</databaseChangeLog>

connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.6.0.xml

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
-    <changeSet author="mposolda@redhat.com" id="1.6.0">
-
-        <addColumn tableName="REALM">
-            <column name="OFFLINE_SESSION_IDLE_TIMEOUT" type="INT" defaultValueNumeric="0"/>
-            <column name="REVOKE_REFRESH_TOKEN" type="BOOLEAN" defaultValueBoolean="false">
-                <constraints nullable="false"/>
-            </column>
-        </addColumn>
-
-        <addColumn tableName="KEYCLOAK_ROLE">
-            <column name="SCOPE_PARAM_REQUIRED" type="BOOLEAN" defaultValueBoolean="false">
-                <constraints nullable="false"/>
-            </column>
-        </addColumn>
-
-        <addColumn tableName="CLIENT">
-            <column name="ROOT_URL" type="VARCHAR(255)"/>
-            <column name="DESCRIPTION" type="VARCHAR(255)"/>
-        </addColumn>
-
-        <createTable tableName="OFFLINE_USER_SESSION">
-            <column name="USER_SESSION_ID" type="VARCHAR(36)">
-                <constraints nullable="false"/>
-            </column>
-            <column name="USER_ID" type="VARCHAR(36)">
-                <constraints nullable="false"/>
-            </column>
-            <column name="REALM_ID" type="VARCHAR(36)">
-                <constraints nullable="false"/>
-            </column>
-            <column name="LAST_SESSION_REFRESH" type="INT"/>
-            <column name="OFFLINE" type="BOOLEAN" defaultValueBoolean="false">
-                <constraints nullable="false"/>
-            </column>
-            <column name="DATA" type="CLOB"/>
-        </createTable>
-
-        <createTable tableName="OFFLINE_CLIENT_SESSION">
-            <column name="CLIENT_SESSION_ID" type="VARCHAR(36)">
-                <constraints nullable="false"/>
-            </column>
-            <column name="USER_SESSION_ID" type="VARCHAR(36)">
-                <constraints nullable="false"/>
-            </column>
-            <column name="CLIENT_ID" type="VARCHAR(36)">
-                <constraints nullable="false"/>
-            </column>
-            <column name="OFFLINE" type="BOOLEAN" defaultValueBoolean="false">
-                <constraints nullable="false"/>
-            </column>
-            <column name="TIMESTAMP" type="INT"/>
-            <column name="DATA" type="CLOB"/>
-        </createTable>
-
-        <addPrimaryKey columnNames="USER_SESSION_ID, OFFLINE" constraintName="CONSTRAINT_OFFLINE_US_SES_PK" tableName="OFFLINE_USER_SESSION"/>
-        <addPrimaryKey columnNames="CLIENT_SESSION_ID, OFFLINE" constraintName="CONSTRAINT_OFFLINE_CL_SES_PK" tableName="OFFLINE_CLIENT_SESSION"/>
-    </changeSet>
-</databaseChangeLog>

connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.6.1.xml

@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
-    <changeSet author="mposolda@redhat.com" id="1.6.1_from15">
-
-        <preConditions onFail="MARK_RAN" onFailMessage="Upgrading from 1.6.0 version. Skipped 1.6.1_from15 changeSet and marked as ran">
-            <not>
-                <changeSetExecuted id="1.6.0" author="mposolda@redhat.com" changeLogFile="META-INF/jpa-changelog-1.6.0.xml" />
-            </not>
-        </preConditions>
-
-        <addColumn tableName="REALM">
-            <column name="OFFLINE_SESSION_IDLE_TIMEOUT" type="INT" defaultValueNumeric="0"/>
-            <column name="REVOKE_REFRESH_TOKEN" type="BOOLEAN" defaultValueBoolean="false">
-                <constraints nullable="false"/>
-            </column>
-        </addColumn>
-
-        <addColumn tableName="KEYCLOAK_ROLE">
-            <column name="SCOPE_PARAM_REQUIRED" type="BOOLEAN" defaultValueBoolean="false">
-                <constraints nullable="false"/>
-            </column>
-        </addColumn>
-
-        <addColumn tableName="CLIENT">
-            <column name="ROOT_URL" type="VARCHAR(255)"/>
-            <column name="DESCRIPTION" type="VARCHAR(255)"/>
-        </addColumn>
-
-        <createTable tableName="OFFLINE_USER_SESSION">
-            <column name="USER_SESSION_ID" type="VARCHAR(36)">
-                <constraints nullable="false"/>
-            </column>
-            <column name="USER_ID" type="VARCHAR(36)">
-                <constraints nullable="false"/>
-            </column>
-            <column name="REALM_ID" type="VARCHAR(36)">
-                <constraints nullable="false"/>
-            </column>
-            <column name="LAST_SESSION_REFRESH" type="INT"/>
-            <column name="OFFLINE_FLAG" type="VARCHAR(4)">
-                <constraints nullable="false"/>
-            </column>
-            <column name="DATA" type="CLOB"/>
-        </createTable>
-
-        <createTable tableName="OFFLINE_CLIENT_SESSION">
-            <column name="CLIENT_SESSION_ID" type="VARCHAR(36)">
-                <constraints nullable="false"/>
-            </column>
-            <column name="USER_SESSION_ID" type="VARCHAR(36)">
-                <constraints nullable="false"/>
-            </column>
-            <column name="CLIENT_ID" type="VARCHAR(36)">
-                <constraints nullable="false"/>
-            </column>
-            <column name="OFFLINE_FLAG" type="VARCHAR(4)">
-                <constraints nullable="false"/>
-            </column>
-            <column name="TIMESTAMP" type="INT"/>
-            <column name="DATA" type="CLOB"/>
-        </createTable>
-
-        <addPrimaryKey columnNames="USER_SESSION_ID, OFFLINE_FLAG" constraintName="CONSTRAINT_OFFL_US_SES_PK2" tableName="OFFLINE_USER_SESSION"/>
-        <addPrimaryKey columnNames="CLIENT_SESSION_ID, OFFLINE_FLAG" constraintName="CONSTRAINT_OFFL_CL_SES_PK2" tableName="OFFLINE_CLIENT_SESSION"/>
-    </changeSet>
-
-    <!-- Just for the update from 1.6.0 -->
-    <changeSet author="mposolda@redhat.com" id="1.6.1_from16">
-
-        <preConditions onFail="MARK_RAN" onFailMessage="Upgrading from 1.5.0 or older version. Skipped 1.6.1_from16 changeSet and marked as ran">
-            <changeSetExecuted id="1.6.0" author="mposolda@redhat.com" changeLogFile="META-INF/jpa-changelog-1.6.0.xml" />
-        </preConditions>
-
-        <dropPrimaryKey constraintName="CONSTRAINT_OFFLINE_US_SES_PK" tableName="OFFLINE_USER_SESSION" />
-        <dropPrimaryKey constraintName="CONSTRAINT_OFFLINE_CL_SES_PK" tableName="OFFLINE_CLIENT_SESSION" />
-
-        <addColumn tableName="OFFLINE_USER_SESSION">
-            <column name="OFFLINE_FLAG" type="VARCHAR(4)">
-                <constraints nullable="false"/>
-            </column>
-        </addColumn>
-        <update tableName="OFFLINE_USER_SESSION">
-            <column name="OFFLINE_FLAG" value="1"/>
-        </update>
-        <dropColumn tableName="OFFLINE_USER_SESSION" columnName="OFFLINE" />
-
-        <addColumn tableName="OFFLINE_CLIENT_SESSION">
-            <column name="OFFLINE_FLAG" type="VARCHAR(4)">
-                <constraints nullable="false"/>
-            </column>
-        </addColumn>
-        <update tableName="OFFLINE_CLIENT_SESSION">
-            <column name="OFFLINE_FLAG" value="1"/>
-        </update>
-        <dropColumn tableName="OFFLINE_CLIENT_SESSION" columnName="OFFLINE" />
-
-        <addPrimaryKey columnNames="USER_SESSION_ID, OFFLINE_FLAG" constraintName="CONSTRAINT_OFFL_US_SES_PK2" tableName="OFFLINE_USER_SESSION"/>
-        <addPrimaryKey columnNames="CLIENT_SESSION_ID, OFFLINE_FLAG" constraintName="CONSTRAINT_OFFL_CL_SES_PK2" tableName="OFFLINE_CLIENT_SESSION"/>
-
-    </changeSet>
-
-    <changeSet author="mposolda@redhat.com" id="1.6.1">
-    </changeSet>
-
-</databaseChangeLog>

connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-master.xml

@@ -8,6 +8,4 @@
     <include file="META-INF/jpa-changelog-1.2.0.Final.xml"/>
     <include file="META-INF/jpa-changelog-1.3.0.xml"/>
     <include file="META-INF/jpa-changelog-1.4.0.xml"/>
-    <include file="META-INF/jpa-changelog-1.5.0.xml"/>
-    <include file="META-INF/jpa-changelog-1.6.1.xml"/>
 </databaseChangeLog>

connections/jpa/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.6.1.Final</version>
+        <version>1.4.0.Final</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -24,7 +24,7 @@
         </dependency>
         <dependency>
             <groupId>org.hibernate.javax.persistence</groupId>
-            <artifactId>${hibernate.javax.persistence.artifactId}</artifactId>
+            <artifactId>hibernate-jpa-2.1-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

connections/jpa/src/main/java/org/keycloak/connections/jpa/DefaultJpaConnectionProviderFactory.java

@@ -4,7 +4,6 @@ import org.hibernate.ejb.AvailableSettings;
 import org.jboss.logging.Logger;
 import org.keycloak.Config;
 import org.keycloak.connections.jpa.updater.JpaUpdaterProvider;
-import org.keycloak.connections.jpa.util.JpaUtils;
 import org.keycloak.models.KeycloakSession;
 import org.keycloak.models.KeycloakSessionFactory;
 
@@ -109,7 +108,7 @@ public class DefaultJpaConnectionProviderFactory implements JpaConnectionProvide
 
                     String schema = config.get("schema");
                     if (schema != null) {
-                        properties.put(JpaUtils.HIBERNATE_DEFAULT_SCHEMA, schema);
+                        properties.put("hibernate.default_schema", schema);
                     }
 
                     if (databaseSchema != null) {

connections/jpa/src/main/java/org/keycloak/connections/jpa/updater/JpaUpdaterProvider.java

@@ -12,7 +12,7 @@ public interface JpaUpdaterProvider extends Provider {
 
     public String FIRST_VERSION = "1.0.0.Final";
 
-    public String LAST_VERSION = "1.6.1";
+    public String LAST_VERSION = "1.4.0";
 
     public String getCurrentVersionSql(String defaultSchema);
 

connections/jpa/src/main/java/org/keycloak/connections/jpa/util/JpaUtils.java

@@ -1,16 +0,0 @@
-package org.keycloak.connections.jpa.util;
-
-import javax.persistence.EntityManager;
-
-/**
- * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
- */
-public class JpaUtils {
-
-    public static final String HIBERNATE_DEFAULT_SCHEMA = "hibernate.default_schema";
-
-    public static String getTableNameForNativeQuery(String tableName, EntityManager em) {
-        String schema = (String) em.getEntityManagerFactory().getProperties().get(HIBERNATE_DEFAULT_SCHEMA);
-        return (schema==null) ? tableName : schema + "." + tableName;
-    }
-}

connections/jpa/src/main/resources/META-INF/persistence.xml

@@ -29,8 +29,17 @@
         <class>org.keycloak.models.jpa.entities.AuthenticationExecutionEntity</class>
         <class>org.keycloak.models.jpa.entities.AuthenticatorConfigEntity</class>
         <class>org.keycloak.models.jpa.entities.RequiredActionProviderEntity</class>
-        <class>org.keycloak.models.jpa.session.PersistentUserSessionEntity</class>
-        <class>org.keycloak.models.jpa.session.PersistentClientSessionEntity</class>
+
+        <!-- JpaUserSessionProvider -->
+        <class>org.keycloak.models.sessions.jpa.entities.ClientSessionEntity</class>
+        <class>org.keycloak.models.sessions.jpa.entities.ClientSessionRoleEntity</class>
+        <class>org.keycloak.models.sessions.jpa.entities.ClientSessionAuthStatusEntity</class>
+        <class>org.keycloak.models.sessions.jpa.entities.ClientSessionProtocolMapperEntity</class>
+        <class>org.keycloak.models.sessions.jpa.entities.ClientSessionNoteEntity</class>
+        <class>org.keycloak.models.sessions.jpa.entities.ClientUserSessionNoteEntity</class>
+        <class>org.keycloak.models.sessions.jpa.entities.UserSessionNoteEntity</class>
+        <class>org.keycloak.models.sessions.jpa.entities.UserSessionEntity</class>
+        <class>org.keycloak.models.sessions.jpa.entities.UsernameLoginFailureEntity</class>
 
         <!-- JpaAuditProviders -->
         <class>org.keycloak.events.jpa.EventEntity</class>

connections/mongo-update/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.6.1.Final</version>
+        <version>1.4.0.Final</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

connections/mongo/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.6.1.Final</version>
+        <version>1.4.0.Final</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

connections/mongo/src/main/java/org/keycloak/connections/mongo/DefaultMongoConnectionFactoryProvider.java

@@ -3,7 +3,6 @@ package org.keycloak.connections.mongo;
 import com.mongodb.DB;
 import com.mongodb.MongoClient;
 import com.mongodb.MongoClientOptions;
-import com.mongodb.MongoClientURI;
 import com.mongodb.MongoCredential;
 import com.mongodb.ServerAddress;
 
@@ -28,31 +27,30 @@ import java.util.Map;
  */
 public class DefaultMongoConnectionFactoryProvider implements MongoConnectionProviderFactory {
 
-    // TODO Make it dynamic
+    // TODO Make configurable
     private String[] entities = new String[]{
             "org.keycloak.models.mongo.keycloak.entities.MongoRealmEntity",
             "org.keycloak.models.mongo.keycloak.entities.MongoUserEntity",
             "org.keycloak.models.mongo.keycloak.entities.MongoRoleEntity",
-            "org.keycloak.models.mongo.keycloak.entities.MongoClientEntity",
-            "org.keycloak.models.mongo.keycloak.entities.MongoUserConsentEntity",
-            "org.keycloak.models.mongo.keycloak.entities.MongoMigrationModelEntity",
-            "org.keycloak.models.mongo.keycloak.entities.MongoOnlineUserSessionEntity",
-            "org.keycloak.models.mongo.keycloak.entities.MongoOfflineUserSessionEntity",
             "org.keycloak.models.entities.IdentityProviderEntity",
             "org.keycloak.models.entities.ClientIdentityProviderMappingEntity",
             "org.keycloak.models.entities.RequiredCredentialEntity",
             "org.keycloak.models.entities.CredentialEntity",
             "org.keycloak.models.entities.FederatedIdentityEntity",
+            "org.keycloak.models.mongo.keycloak.entities.MongoClientEntity",
+            "org.keycloak.models.sessions.mongo.entities.MongoUsernameLoginFailureEntity",
+            "org.keycloak.models.sessions.mongo.entities.MongoUserSessionEntity",
+            "org.keycloak.models.sessions.mongo.entities.MongoClientSessionEntity",
             "org.keycloak.models.entities.UserFederationProviderEntity",
             "org.keycloak.models.entities.UserFederationMapperEntity",
             "org.keycloak.models.entities.ProtocolMapperEntity",
             "org.keycloak.models.entities.IdentityProviderMapperEntity",
+            "org.keycloak.models.mongo.keycloak.entities.MongoUserConsentEntity",
+            "org.keycloak.models.mongo.keycloak.entities.MongoMigrationModelEntity",
             "org.keycloak.models.entities.AuthenticationExecutionEntity",
             "org.keycloak.models.entities.AuthenticationFlowEntity",
             "org.keycloak.models.entities.AuthenticatorConfigEntity",
             "org.keycloak.models.entities.RequiredActionProviderEntity",
-            "org.keycloak.models.entities.PersistentUserSessionEntity",
-            "org.keycloak.models.entities.PersistentClientSessionEntity",
     };
 
     private static final Logger logger = Logger.getLogger(DefaultMongoConnectionFactoryProvider.class);
@@ -150,55 +148,31 @@ public class DefaultMongoConnectionFactoryProvider implements MongoConnectionPro
      * @throws UnknownHostException
      */
     protected MongoClient createMongoClient() throws UnknownHostException {
-        operationalInfo = new LinkedHashMap<>();
+        String host = config.get("host", ServerAddress.defaultHost());
+        int port = config.getInt("port", ServerAddress.defaultPort());
         String dbName = config.get("db", "keycloak");
 
-        String uriString = config.get("uri");
-        if (uriString != null) {
-            MongoClientURI uri = new MongoClientURI(uriString);
-            MongoClient client = new MongoClient(uri);
+        String user = config.get("user");
+        String password = config.get("password");
 
-            StringBuilder hostsBuilder = new StringBuilder();
-            for (int i=0 ; i<uri.getHosts().size() ; i++) {
-                if (i!=0) {
-                    hostsBuilder.append(", ");
-                }
-                hostsBuilder.append(uri.getHosts().get(i));
-            }
-            String hosts = hostsBuilder.toString();
+        MongoClientOptions clientOptions = getClientOptions();
 
-            operationalInfo.put("mongoHosts", hosts);
-            operationalInfo.put("mongoDatabaseName", dbName);
-            operationalInfo.put("mongoUser", uri.getUsername());
-            operationalInfo.put("mongoDriverVersion", client.getVersion());
-
-            logger.debugv("Initialized mongo model. host(s): %s, db: %s", uri.getHosts(), dbName);
-            return client;
+        MongoClient client;
+        if (user != null && password != null) {
+            MongoCredential credential = MongoCredential.createMongoCRCredential(user, dbName, password.toCharArray());
+            client = new MongoClient(new ServerAddress(host, port), Collections.singletonList(credential), clientOptions);
         } else {
-            String host = config.get("host", ServerAddress.defaultHost());
-            int port = config.getInt("port", ServerAddress.defaultPort());
-
-            String user = config.get("user");
-            String password = config.get("password");
-
-            MongoClientOptions clientOptions = getClientOptions();
-
-            MongoClient client;
-            if (user != null && password != null) {
-                MongoCredential credential = MongoCredential.createMongoCRCredential(user, dbName, password.toCharArray());
-                client = new MongoClient(new ServerAddress(host, port), Collections.singletonList(credential), clientOptions);
-            } else {
-                client = new MongoClient(new ServerAddress(host, port), clientOptions);
-            }
-
-            operationalInfo.put("mongoServerAddress", client.getAddress().toString());
-            operationalInfo.put("mongoDatabaseName", dbName);
-            operationalInfo.put("mongoUser", user);
-            operationalInfo.put("mongoDriverVersion", client.getVersion());
-
-            logger.debugv("Initialized mongo model. host: %s, port: %d, db: %s", host, port, dbName);
-            return client;
+            client = new MongoClient(new ServerAddress(host, port), clientOptions);
         }
+        
+        operationalInfo = new LinkedHashMap<>();
+        operationalInfo.put("mongoServerAddress", client.getAddress().toString());
+        operationalInfo.put("mongoDatabaseName", dbName);
+        operationalInfo.put("mongoUser", user);
+        operationalInfo.put("mongoDriverVersion", client.getVersion());
+    		
+        logger.debugv("Initialized mongo model. host: %s, port: %d, db: %s", host, port, dbName);
+        return client;
     }
 
     protected MongoClientOptions getClientOptions() {

connections/mongo/src/main/java/org/keycloak/connections/mongo/impl/types/BasicDBObjectMapper.java

@@ -9,10 +9,11 @@ import org.keycloak.connections.mongo.api.types.MapperRegistry;
 import org.keycloak.connections.mongo.impl.EntityInfo;
 import org.keycloak.connections.mongo.impl.MongoStoreImpl;
 import org.keycloak.models.utils.reflection.Property;
-import org.keycloak.common.util.reflections.Types;
+import org.keycloak.util.reflections.Types;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 

connections/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.6.1.Final</version>
+        <version>1.4.0.Final</version>
     </parent>
     <name>Connections Parent</name>
     <description/>

core-jaxrs/pom.xml

@@ -4,45 +4,46 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.6.1.Final</version>
-        <relativePath>../../pom.xml</relativePath>
+        <version>1.4.0.Final</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>keycloak-undertow-adapter-spi</artifactId>
-    <name>Keycloak Undertow Integration</name>
+    <artifactId>keycloak-core-jaxrs</artifactId>
+    <name>Keycloak Core JAX-RS</name>
     <description/>
 
     <dependencies>
         <dependency>
-            <groupId>org.jboss.logging</groupId>
-            <artifactId>jboss-logging</artifactId>
-            <version>${jboss.logging.version}</version>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-jaxrs</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-adapter-spi</artifactId>
+            <artifactId>keycloak-core</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-common</artifactId>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-core-asl</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-mapper-asl</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-jackson-provider</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.jboss.spec.javax.servlet</groupId>
             <artifactId>jboss-servlet-api_3.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>io.undertow</groupId>
-            <artifactId>undertow-servlet</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.undertow</groupId>
-            <artifactId>undertow-core</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

core-jaxrs/src/main/java/org/keycloak/SkeletonKeyContextResolver.java

@@ -1,4 +1,4 @@
-package org.keycloak.services.util;
+package org.keycloak;
 
 import org.codehaus.jackson.map.ObjectMapper;
 import org.codehaus.jackson.map.SerializationConfig;
@@ -14,18 +14,24 @@ import javax.ws.rs.ext.Provider;
  * @version $Revision: 1 $
  */
 @Provider
-public class ObjectMapperResolver implements ContextResolver<ObjectMapper> {
+public class SkeletonKeyContextResolver implements ContextResolver<ObjectMapper> {
     protected ObjectMapper mapper = new ObjectMapper();
 
-    public ObjectMapperResolver(boolean indent) {
+    public SkeletonKeyContextResolver() {
+        mapper.setSerializationInclusion(JsonSerialize.Inclusion.NON_NULL);
+    }
+
+    public SkeletonKeyContextResolver(boolean indent) {
         mapper.setSerializationInclusion(JsonSerialize.Inclusion.NON_NULL);
         if (indent) {
             mapper.enable(SerializationConfig.Feature.INDENT_OUTPUT);
         }
     }
 
+
     @Override
     public ObjectMapper getContext(Class<?> type) {
-        return mapper;
+        if (type.getPackage() != null && type.getPackage().getName().startsWith(getClass().getPackage().getName())) return mapper;
+        return null;
     }
 }

core/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.6.1.Final</version>
+        <version>1.4.0.Final</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -21,29 +21,35 @@
             org.keycloak.*
         </keycloak.osgi.export>
         <keycloak.osgi.import>
+            net.iharder;version=${base64.version},
             *;resolution:=optional
         </keycloak.osgi.import>
     </properties>
     <dependencies>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-common</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk15on</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcpkix-jdk15on</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.iharder</groupId>
+            <artifactId>base64</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.codehaus.jackson</groupId>
             <artifactId>jackson-core-asl</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.codehaus.jackson</groupId>
             <artifactId>jackson-mapper-asl</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>

core/src/main/java/org/keycloak/AbstractOAuthClient.java

@@ -1,7 +1,7 @@
 package org.keycloak;
 
-import org.keycloak.common.enums.RelativeUrlsUsed;
-import org.keycloak.common.util.KeycloakUriBuilder;
+import org.keycloak.enums.RelativeUrlsUsed;
+import org.keycloak.util.KeycloakUriBuilder;
 
 import java.util.Map;
 import java.util.UUID;
@@ -16,7 +16,7 @@ public class AbstractOAuthClient {
     private final AtomicLong counter = new AtomicLong();
 
     protected String clientId;
-    protected Map<String, Object> credentials;
+    protected Map<String, String> credentials;
     protected String authUrl;
     protected String tokenUrl;
     protected RelativeUrlsUsed relativeUrlsUsed;
@@ -37,11 +37,11 @@ public class AbstractOAuthClient {
         this.clientId = clientId;
     }
 
-    public Map<String, Object> getCredentials() {
+    public Map<String, String> getCredentials() {
         return credentials;
     }
 
-    public void setCredentials(Map<String, Object> credentials) {
+    public void setCredentials(Map<String, String> credentials) {
         this.credentials = credentials;
     }
 

core/src/main/java/org/keycloak/ClientConnection.java

@@ -1,4 +1,4 @@
-package org.keycloak.common;
+package org.keycloak;
 
 /**
  * Information about the client connection

core/src/main/java/org/keycloak/KeycloakSecurityContext.java

@@ -2,7 +2,7 @@ package org.keycloak;
 
 import org.keycloak.representations.AccessToken;
 import org.keycloak.representations.IDToken;
-import org.keycloak.common.util.Base64Url;
+import org.keycloak.util.Base64Url;
 import org.keycloak.util.JsonSerialization;
 
 import java.io.IOException;

core/src/main/java/org/keycloak/OAuth2Constants.java

@@ -31,19 +31,6 @@ public interface OAuth2Constants {
 
     String CLIENT_CREDENTIALS = "client_credentials";
 
-    // https://tools.ietf.org/html/draft-ietf-oauth-assertions-01#page-5
-    String CLIENT_ASSERTION_TYPE = "client_assertion_type";
-    String CLIENT_ASSERTION = "client_assertion";
-
-    // https://tools.ietf.org/html/draft-jones-oauth-jwt-bearer-03#section-2.2
-    String CLIENT_ASSERTION_TYPE_JWT = "urn:ietf:params:oauth:client-assertion-type:jwt-bearer";
-
-    // http://openid.net/specs/openid-connect-core-1_0.html#OfflineAccess
-    String OFFLINE_ACCESS = "offline_access";
-
-    String UI_LOCALES_PARAM = "ui_locales";
-
-
 }
 
 

core/src/main/java/org/keycloak/RSATokenVerifier.java

@@ -1,10 +1,8 @@
 package org.keycloak;
 
-import org.keycloak.common.VerificationException;
 import org.keycloak.jose.jws.JWSInput;
 import org.keycloak.jose.jws.crypto.RSAProvider;
 import org.keycloak.representations.AccessToken;
-import org.keycloak.util.TokenUtil;
 
 import java.io.IOException;
 import java.security.PublicKey;
@@ -15,10 +13,10 @@ import java.security.PublicKey;
  */
 public class RSATokenVerifier {
     public static AccessToken verifyToken(String tokenString, PublicKey realmKey, String realmUrl) throws VerificationException {
-        return verifyToken(tokenString, realmKey, realmUrl, true, true);
+        return verifyToken(tokenString, realmKey, realmUrl, true);
     }
 
-    public static AccessToken verifyToken(String tokenString, PublicKey realmKey, String realmUrl, boolean checkActive, boolean checkTokenType) throws VerificationException {
+    public static AccessToken verifyToken(String tokenString, PublicKey realmKey, String realmUrl, boolean checkActive) throws VerificationException {
         JWSInput input = null;
         try {
             input = new JWSInput(tokenString);
@@ -44,13 +42,6 @@ public class RSATokenVerifier {
             throw new VerificationException("Token audience doesn't match domain. Token issuer is " + token.getIssuer() + ", but URL from configuration is " + realmUrl);
 
         }
-
-        if (checkTokenType) {
-            String type = token.getType();
-            if (type == null || !type.equalsIgnoreCase(TokenUtil.TOKEN_TYPE_BEARER)) {
-                throw new VerificationException("Token type is incorrect. Expected '" + TokenUtil.TOKEN_TYPE_BEARER + "' but was '" + type + "'");
-            }
-        }
         if (checkActive && !token.isActive()) {
             throw new VerificationException("Token is not active.");
         }

core/src/main/java/org/keycloak/VerificationException.java

@@ -1,4 +1,4 @@
-package org.keycloak.common;
+package org.keycloak;
 
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

core/src/main/java/org/keycloak/Version.java

@@ -0,0 +1,48 @@
+package org.keycloak;
+
+import org.codehaus.jackson.annotate.JsonProperty;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
+/**
+ * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+ * @version $Revision: 1 $
+ */
+public class Version {
+    public static String VERSION;
+    public static String RESOURCES_VERSION;
+    public static String BUILD_TIME;
+    public static final String UNKNOWN = "UNKNOWN";
+    public static final Version SINGLETON;
+
+    private final String version = VERSION;
+    private final String buildTime = BUILD_TIME;
+
+    static {
+        Properties props = new Properties();
+        InputStream is = Version.class.getResourceAsStream("/keycloak-version.properties");
+        try {
+            props.load(is);
+            VERSION = props.getProperty("version");
+            BUILD_TIME = props.getProperty("build-time");
+            RESOURCES_VERSION = VERSION.toLowerCase();
+        } catch (IOException e) {
+            VERSION=UNKNOWN;
+            BUILD_TIME=UNKNOWN;
+        }
+
+        SINGLETON = new Version();
+    }
+
+    @JsonProperty("version")
+    public String getVersion() {
+        return version;
+    }
+
+    @JsonProperty("build-time")
+    public String getBuildTime() {
+        return buildTime;
+    }
+}

core/src/main/java/org/keycloak/constants/GenericConstants.java

@@ -1,4 +1,4 @@
-package org.keycloak.common.constants;
+package org.keycloak.constants;
 
 /**
  * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>

core/src/main/java/org/keycloak/constants/KerberosConstants.java

@@ -1,4 +1,4 @@
-package org.keycloak.common.constants;
+package org.keycloak.constants;
 
 /**
  * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>

core/src/main/java/org/keycloak/constants/ServiceAccountConstants.java

@@ -1,4 +1,4 @@
-package org.keycloak.common.constants;
+package org.keycloak.constants;
 
 /**
  * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>

core/src/main/java/org/keycloak/enums/RelativeUrlsUsed.java

@@ -1,4 +1,4 @@
-package org.keycloak.common.enums;
+package org.keycloak.enums;
 
 /**
  * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>

core/src/main/java/org/keycloak/enums/SslRequired.java

@@ -1,6 +1,6 @@
-package org.keycloak.common.enums;
+package org.keycloak.enums;
 
-import org.keycloak.common.ClientConnection;
+import org.keycloak.ClientConnection;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;

core/src/main/java/org/keycloak/jose/jwk/JWKBuilder.java

@@ -1,12 +1,14 @@
 package org.keycloak.jose.jwk;
 
-import org.keycloak.common.util.Base64Url;
+import org.keycloak.util.Base64Url;
 
 import java.math.BigInteger;
 import java.security.Key;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.security.PrivateKey;
 import java.security.PublicKey;
+import java.security.interfaces.RSAPrivateKey;
 import java.security.interfaces.RSAPublicKey;
 
 /**

core/src/main/java/org/keycloak/jose/jwk/JWKParser.java

@@ -1,7 +1,7 @@
 package org.keycloak.jose.jwk;
 
 import org.codehaus.jackson.type.TypeReference;
-import org.keycloak.common.util.Base64Url;
+import org.keycloak.util.Base64Url;
 import org.keycloak.util.JsonSerialization;
 
 import java.math.BigInteger;

core/src/main/java/org/keycloak/jose/jws/JWSBuilder.java

@@ -2,7 +2,7 @@ package org.keycloak.jose.jws;
 
 import org.keycloak.jose.jws.crypto.HMACProvider;
 import org.keycloak.jose.jws.crypto.RSAProvider;
-import org.keycloak.common.util.Base64Url;
+import org.keycloak.util.Base64Url;
 import org.keycloak.util.JsonSerialization;
 
 import javax.crypto.SecretKey;

core/src/main/java/org/keycloak/jose/jws/JWSInput.java

@@ -1,7 +1,8 @@
 package org.keycloak.jose.jws;
 
-import org.keycloak.common.util.Base64Url;
+import org.keycloak.util.Base64Url;
 import org.keycloak.util.JsonSerialization;
+import static org.keycloak.jose.jws.Algorithm.*;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;

core/src/main/java/org/keycloak/jose/jws/crypto/HMACProvider.java

@@ -3,7 +3,7 @@ package org.keycloak.jose.jws.crypto;
 
 import org.keycloak.jose.jws.Algorithm;
 import org.keycloak.jose.jws.JWSInput;
-import org.keycloak.common.util.Base64Url;
+import org.keycloak.util.Base64Url;
 
 import javax.crypto.Mac;
 import javax.crypto.SecretKey;

core/src/main/java/org/keycloak/jose/jws/crypto/RSAProvider.java

@@ -3,7 +3,7 @@ package org.keycloak.jose.jws.crypto;
 
 import org.keycloak.jose.jws.Algorithm;
 import org.keycloak.jose.jws.JWSInput;
-import org.keycloak.common.util.PemUtils;
+import org.keycloak.util.PemUtils;
 
 import java.security.PrivateKey;
 import java.security.PublicKey;

core/src/main/java/org/keycloak/json/StringOrArrayDeserializer.java

@@ -1,30 +0,0 @@
-package org.keycloak.json;
-
-import org.codehaus.jackson.JsonNode;
-import org.codehaus.jackson.JsonParser;
-import org.codehaus.jackson.JsonProcessingException;
-import org.codehaus.jackson.map.DeserializationContext;
-import org.codehaus.jackson.map.JsonDeserializer;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-public class StringOrArrayDeserializer extends JsonDeserializer<Object> {
-
-    @Override
-    public Object deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException {
-        JsonNode jsonNode = jsonParser.readValueAsTree();
-        if (jsonNode.isArray()) {
-            ArrayList<String> a = new ArrayList<>(1);
-            Iterator<JsonNode> itr = jsonNode.iterator();
-            while (itr.hasNext()) {
-                a.add(itr.next().getTextValue());
-            }
-            return a.toArray(new String[a.size()]);
-        } else {
-            return new String[] { jsonNode.getTextValue() };
-        }
-    }
-
-}

core/src/main/java/org/keycloak/json/StringOrArraySerializer.java

@@ -1,25 +0,0 @@
-package org.keycloak.json;
-
-import org.codehaus.jackson.JsonGenerator;
-import org.codehaus.jackson.map.JsonSerializer;
-import org.codehaus.jackson.map.SerializerProvider;
-
-import java.io.IOException;
-
-public class StringOrArraySerializer extends JsonSerializer<Object> {
-    @Override
-    public void serialize(Object o, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException {
-        String[] array = (String[]) o;
-        if (array == null) {
-            jsonGenerator.writeNull();
-        } else if (array.length == 1) {
-            jsonGenerator.writeString(array[0]);
-        } else {
-            jsonGenerator.writeStartArray();
-            for (String s : array) {
-                jsonGenerator.writeString(s);
-            }
-            jsonGenerator.writeEndArray();
-        }
-    }
-}

core/src/main/java/org/keycloak/representations/AccessToken.java

@@ -163,6 +163,11 @@ public class AccessToken extends IDToken {
         return (AccessToken) super.issuer(issuer);
     }
 
+    @Override
+    public AccessToken audience(String audience) {
+        return (AccessToken) super.audience(audience);
+    }
+
     @Override
     public AccessToken subject(String subject) {
         return (AccessToken) super.subject(subject);

core/src/main/java/org/keycloak/representations/IDToken.java

@@ -1,6 +1,12 @@
 package org.keycloak.representations;
 
+import org.codehaus.jackson.annotate.JsonAnyGetter;
+import org.codehaus.jackson.annotate.JsonAnySetter;
 import org.codehaus.jackson.annotate.JsonProperty;
+import org.codehaus.jackson.annotate.JsonUnwrapped;
+
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

core/src/main/java/org/keycloak/representations/JsonWebToken.java

@@ -4,11 +4,7 @@ import org.codehaus.jackson.annotate.JsonAnyGetter;
 import org.codehaus.jackson.annotate.JsonAnySetter;
 import org.codehaus.jackson.annotate.JsonIgnore;
 import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonDeserialize;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
-import org.keycloak.json.StringOrArrayDeserializer;
-import org.keycloak.json.StringOrArraySerializer;
-import org.keycloak.common.util.Time;
+import org.keycloak.util.Time;
 
 import java.io.Serializable;
 import java.util.HashMap;
@@ -30,16 +26,14 @@ public class JsonWebToken implements Serializable {
     @JsonProperty("iss")
     protected String issuer;
     @JsonProperty("aud")
-    @JsonSerialize(using = StringOrArraySerializer.class)
-    @JsonDeserialize(using = StringOrArrayDeserializer.class)
-    protected String[] audience;
+    protected String audience;
     @JsonProperty("sub")
     protected String subject;
     @JsonProperty("typ")
     protected String type;
     @JsonProperty("azp")
     public String issuedFor;
-    protected Map<String, Object> otherClaims = new HashMap<>();
+    protected Map<String, Object> otherClaims = new HashMap<String, Object>();
 
     public String getId() {
         return id;
@@ -78,6 +72,7 @@ public class JsonWebToken implements Serializable {
     @JsonIgnore
     public boolean isNotBefore() {
         return Time.currentTime() >= notBefore;
+
     }
 
     /**
@@ -118,21 +113,12 @@ public class JsonWebToken implements Serializable {
         return this;
     }
 
-    @JsonIgnore
-    public String[] getAudience() {
+
+    public String getAudience() {
         return audience;
     }
 
-    public boolean hasAudience(String audience) {
-        for (String a : this.audience) {
-            if (a.equals(audience)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public JsonWebToken audience(String... audience) {
+    public JsonWebToken audience(String audience) {
         this.audience = audience;
         return this;
     }

core/src/main/java/org/keycloak/representations/PasswordToken.java

@@ -1,6 +1,6 @@
 package org.keycloak.representations;
 
-import org.keycloak.common.util.Time;
+import org.keycloak.util.Time;
 
 /**
  * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>

core/src/main/java/org/keycloak/representations/RefreshToken.java

@@ -1,6 +1,6 @@
 package org.keycloak.representations;
 
-import org.keycloak.util.TokenUtil;
+import org.codehaus.jackson.annotate.JsonProperty;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -11,8 +11,9 @@ import java.util.Map;
  */
 public class RefreshToken extends AccessToken {
 
+
     private RefreshToken() {
-        type(TokenUtil.TOKEN_TYPE_REFRESH);
+        type("REFRESH");
     }
 
     /**

core/src/main/java/org/keycloak/representations/VersionRepresentation.java

@@ -1,29 +0,0 @@
-package org.keycloak.representations;
-
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.keycloak.common.Version;
-
-/**
- * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
- * @version $Revision: 1 $
- */
-public class VersionRepresentation {
-    public static final VersionRepresentation SINGLETON;
-
-    private final String version = Version.VERSION;
-    private final String buildTime = Version.BUILD_TIME;
-
-    static {
-         SINGLETON = new VersionRepresentation();
-    }
-
-    @JsonProperty("version")
-    public String getVersion() {
-        return version;
-    }
-
-    @JsonProperty("build-time")
-    public String getBuildTime() {
-        return buildTime;
-    }
-}

core/src/main/java/org/keycloak/representations/adapters/action/AdminAction.java

@@ -1,7 +1,7 @@
 package org.keycloak.representations.adapters.action;
 
 import org.codehaus.jackson.annotate.JsonIgnore;
-import org.keycloak.common.util.Time;
+import org.keycloak.util.Time;
 
 /**
  * Posted to managed client from admin server.

core/src/main/java/org/keycloak/representations/adapters/config/BaseAdapterConfig.java

@@ -39,7 +39,7 @@ public class BaseAdapterConfig extends BaseRealmConfig {
     @JsonProperty("public-client")
     protected boolean publicClient;
     @JsonProperty("credentials")
-    protected Map<String, Object> credentials = new HashMap<>();
+    protected Map<String, String> credentials = new HashMap<String, String>();
 
 
     public boolean isUseResourceRoleMappings() {
@@ -114,11 +114,11 @@ public class BaseAdapterConfig extends BaseRealmConfig {
         this.enableBasicAuth = enableBasicAuth;
     }
 
-    public Map<String, Object> getCredentials() {
+    public Map<String, String> getCredentials() {
         return credentials;
     }
 
-    public void setCredentials(Map<String, Object> credentials) {
+    public void setCredentials(Map<String, String> credentials) {
         this.credentials = credentials;
     }
 

core/src/main/java/org/keycloak/representations/idm/AuthenticationExecutionRepresentation.java

@@ -8,6 +8,7 @@ import java.util.Comparator;
 * @version $Revision: 1 $
 */
 public class AuthenticationExecutionRepresentation implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     private String authenticatorConfig;
     private String authenticator;

core/src/main/java/org/keycloak/representations/idm/AuthenticationFlowRepresentation.java

@@ -8,6 +8,7 @@ import java.util.List;
  * @version $Revision: 1 $
  */
 public class AuthenticationFlowRepresentation implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     private String alias;
     private String description;

core/src/main/java/org/keycloak/representations/idm/AuthenticatorConfigRepresentation.java

@@ -9,6 +9,7 @@ import java.util.Map;
 * @version $Revision: 1 $
 */
 public class AuthenticatorConfigRepresentation implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     private String alias;
     private Map<String, String> config = new HashMap<String, String>();

core/src/main/java/org/keycloak/representations/idm/CertificateRepresentation.java

@@ -1,30 +0,0 @@
-package org.keycloak.representations.idm;
-
-/**
- * PEM values of key and certificate
- *
- * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
- */
-public class CertificateRepresentation {
-
-    protected String privateKey;
-    protected String certificate;
-
-    public String getPrivateKey() {
-        return privateKey;
-    }
-
-    public void setPrivateKey(String privateKey) {
-        this.privateKey = privateKey;
-    }
-
-    public String getCertificate() {
-        return certificate;
-    }
-
-    public void setCertificate(String certificate) {
-        this.certificate = certificate;
-    }
-
-
-}

core/src/main/java/org/keycloak/representations/idm/ClientRepresentation.java

@@ -11,13 +11,10 @@ public class ClientRepresentation {
     protected String id;
     protected String clientId;
     protected String name;
-    protected String description;
-    protected String rootUrl;
     protected String adminUrl;
     protected String baseUrl;
     protected Boolean surrogateAuthRequired;
     protected Boolean enabled;
-    protected String clientAuthenticatorType;
     protected String secret;
     protected String[] defaultRoles;
     protected List<String> redirectUris;
@@ -52,14 +49,6 @@ public class ClientRepresentation {
         this.name = name;
     }
 
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
     public String getClientId() {
         return clientId;
     }
@@ -84,14 +73,6 @@ public class ClientRepresentation {
         this.surrogateAuthRequired = surrogateAuthRequired;
     }
 
-    public String getRootUrl() {
-        return rootUrl;
-    }
-
-    public void setRootUrl(String rootUrl) {
-        this.rootUrl = rootUrl;
-    }
-
     public String getAdminUrl() {
         return adminUrl;
     }
@@ -108,14 +89,6 @@ public class ClientRepresentation {
         this.baseUrl = baseUrl;
     }
 
-    public String getClientAuthenticatorType() {
-        return clientAuthenticatorType;
-    }
-
-    public void setClientAuthenticatorType(String clientAuthenticatorType) {
-        this.clientAuthenticatorType = clientAuthenticatorType;
-    }
-
     public String getSecret() {
         return secret;
     }

core/src/main/java/org/keycloak/representations/idm/CredentialRepresentation.java

@@ -9,7 +9,6 @@ public class CredentialRepresentation {
     public static final String PASSWORD = "password";
     public static final String PASSWORD_TOKEN = "password-token";
     public static final String TOTP = "totp";
-    public static final String HOTP = "hotp";
     public static final String CLIENT_CERT = "cert";
     public static final String KERBEROS = "kerberos";
 
@@ -23,11 +22,6 @@ public class CredentialRepresentation {
     protected String hashedSaltedValue;
     protected String salt;
     protected Integer hashIterations;
-    protected Integer counter;
-    private String algorithm;
-    private Integer digits;
-    private Integer period;
-
     // only used when updating a credential.  Might set required action
     protected boolean temporary;
 
@@ -86,36 +80,4 @@ public class CredentialRepresentation {
     public void setTemporary(boolean temporary) {
         this.temporary = temporary;
     }
-
-    public Integer getCounter() {
-        return counter;
-    }
-
-    public void setCounter(Integer counter) {
-        this.counter = counter;
-    }
-
-    public String getAlgorithm() {
-        return algorithm;
-    }
-
-    public void setAlgorithm(String algorithm) {
-        this.algorithm = algorithm;
-    }
-
-    public Integer getDigits() {
-        return digits;
-    }
-
-    public void setDigits(Integer digits) {
-        this.digits = digits;
-    }
-
-    public Integer getPeriod() {
-        return period;
-    }
-
-    public void setPeriod(Integer period) {
-        this.period = period;
-    }
 }

core/src/main/java/org/keycloak/representations/idm/PublishedRealmRepresentation.java

@@ -3,7 +3,7 @@ package org.keycloak.representations.idm;
 import org.bouncycastle.openssl.PEMWriter;
 import org.codehaus.jackson.annotate.JsonIgnore;
 import org.codehaus.jackson.annotate.JsonProperty;
-import org.keycloak.common.util.PemUtils;
+import org.keycloak.util.PemUtils;
 
 import java.io.IOException;
 import java.io.StringWriter;

core/src/main/java/org/keycloak/representations/idm/RealmRepresentation.java

@@ -10,11 +10,9 @@ public class RealmRepresentation {
     protected String id;
     protected String realm;
     protected Integer notBefore;
-    protected Boolean revokeRefreshToken;
     protected Integer accessTokenLifespan;
     protected Integer ssoSessionIdleTimeout;
     protected Integer ssoSessionMaxLifespan;
-    protected Integer offlineSessionIdleTimeout;
     protected Integer accessCodeLifespan;
     protected Integer accessCodeLifespanUserAction;
     protected Integer accessCodeLifespanLogin;
@@ -51,13 +49,6 @@ public class RealmRepresentation {
     @Deprecated
     protected Set<String> requiredCredentials;
     protected String passwordPolicy;
-    protected String otpPolicyType;
-    protected String otpPolicyAlgorithm;
-    protected Integer otpPolicyInitialCounter;
-    protected Integer otpPolicyDigits;
-    protected Integer otpPolicyLookAheadWindow;
-    protected Integer otpPolicyPeriod;
-
     protected List<UserRepresentation> users;
     protected List<ScopeMappingRepresentation> scopeMappings;
     protected Map<String, List<ScopeMappingRepresentation>> clientScopeMappings;
@@ -89,11 +80,6 @@ public class RealmRepresentation {
     protected List<AuthenticationFlowRepresentation> authenticationFlows;
     protected List<AuthenticatorConfigRepresentation> authenticatorConfig;
     protected List<RequiredActionProviderRepresentation> requiredActions;
-    protected String browserFlow;
-    protected String registrationFlow;
-    protected String directGrantFlow;
-    protected String resetCredentialsFlow;
-    protected String clientAuthenticationFlow;
 
     @Deprecated
     protected Boolean social;
@@ -168,14 +154,6 @@ public class RealmRepresentation {
         this.sslRequired = sslRequired;
     }
 
-    public Boolean getRevokeRefreshToken() {
-        return revokeRefreshToken;
-    }
-
-    public void setRevokeRefreshToken(Boolean revokeRefreshToken) {
-        this.revokeRefreshToken = revokeRefreshToken;
-    }
-
     public Integer getAccessTokenLifespan() {
         return accessTokenLifespan;
     }
@@ -200,14 +178,6 @@ public class RealmRepresentation {
         this.ssoSessionMaxLifespan = ssoSessionMaxLifespan;
     }
 
-    public Integer getOfflineSessionIdleTimeout() {
-        return offlineSessionIdleTimeout;
-    }
-
-    public void setOfflineSessionIdleTimeout(Integer offlineSessionIdleTimeout) {
-        this.offlineSessionIdleTimeout = offlineSessionIdleTimeout;
-    }
-
     public List<ScopeMappingRepresentation> getScopeMappings() {
         return scopeMappings;
     }
@@ -629,14 +599,10 @@ public class RealmRepresentation {
     }
 
     public Set<String> getSupportedLocales() {
-        return supportedLocales;
-    }
-
-    public void addSupportedLocales(String locale) {
         if(supportedLocales == null){
-            supportedLocales = new HashSet<>();
+            supportedLocales = new HashSet<String>();
         }
-        supportedLocales.add(locale);
+        return supportedLocales;
     }
 
     public void setSupportedLocales(Set<String> supportedLocales) {
@@ -687,92 +653,4 @@ public class RealmRepresentation {
     public void setRequiredActions(List<RequiredActionProviderRepresentation> requiredActions) {
         this.requiredActions = requiredActions;
     }
-
-    public String getOtpPolicyType() {
-        return otpPolicyType;
-    }
-
-    public void setOtpPolicyType(String otpPolicyType) {
-        this.otpPolicyType = otpPolicyType;
-    }
-
-    public String getOtpPolicyAlgorithm() {
-        return otpPolicyAlgorithm;
-    }
-
-    public void setOtpPolicyAlgorithm(String otpPolicyAlgorithm) {
-        this.otpPolicyAlgorithm = otpPolicyAlgorithm;
-    }
-
-    public Integer getOtpPolicyInitialCounter() {
-        return otpPolicyInitialCounter;
-    }
-
-    public void setOtpPolicyInitialCounter(Integer otpPolicyInitialCounter) {
-        this.otpPolicyInitialCounter = otpPolicyInitialCounter;
-    }
-
-    public Integer getOtpPolicyDigits() {
-        return otpPolicyDigits;
-    }
-
-    public void setOtpPolicyDigits(Integer otpPolicyDigits) {
-        this.otpPolicyDigits = otpPolicyDigits;
-    }
-
-    public Integer getOtpPolicyLookAheadWindow() {
-        return otpPolicyLookAheadWindow;
-    }
-
-    public void setOtpPolicyLookAheadWindow(Integer otpPolicyLookAheadWindow) {
-        this.otpPolicyLookAheadWindow = otpPolicyLookAheadWindow;
-    }
-
-    public Integer getOtpPolicyPeriod() {
-        return otpPolicyPeriod;
-    }
-
-    public void setOtpPolicyPeriod(Integer otpPolicyPeriod) {
-        this.otpPolicyPeriod = otpPolicyPeriod;
-    }
-
-    public String getBrowserFlow() {
-        return browserFlow;
-    }
-
-    public void setBrowserFlow(String browserFlow) {
-        this.browserFlow = browserFlow;
-    }
-
-    public String getRegistrationFlow() {
-        return registrationFlow;
-    }
-
-    public void setRegistrationFlow(String registrationFlow) {
-        this.registrationFlow = registrationFlow;
-    }
-
-    public String getDirectGrantFlow() {
-        return directGrantFlow;
-    }
-
-    public void setDirectGrantFlow(String directGrantFlow) {
-        this.directGrantFlow = directGrantFlow;
-    }
-
-    public String getResetCredentialsFlow() {
-        return resetCredentialsFlow;
-    }
-
-    public void setResetCredentialsFlow(String resetCredentialsFlow) {
-        this.resetCredentialsFlow = resetCredentialsFlow;
-    }
-
-    public String getClientAuthenticationFlow() {
-        return clientAuthenticationFlow;
-    }
-
-    public void setClientAuthenticationFlow(String clientAuthenticationFlow) {
-        this.clientAuthenticationFlow = clientAuthenticationFlow;
-    }
 }

core/src/main/java/org/keycloak/representations/idm/RoleRepresentation.java

@@ -12,7 +12,6 @@ public class RoleRepresentation {
     protected String id;
     protected String name;
     protected String description;
-    protected Boolean scopeParamRequired;
     protected boolean composite;
     protected Composites composites;
 
@@ -47,10 +46,9 @@ public class RoleRepresentation {
     public RoleRepresentation() {
     }
 
-    public RoleRepresentation(String name, String description, boolean scopeParamRequired) {
+    public RoleRepresentation(String name, String description) {
         this.name = name;
         this.description = description;
-        this.scopeParamRequired = scopeParamRequired;
     }
 
     public String getId() {
@@ -77,14 +75,6 @@ public class RoleRepresentation {
         this.description = description;
     }
 
-    public Boolean isScopeParamRequired() {
-        return scopeParamRequired;
-    }
-
-    public void setScopeParamRequired(Boolean scopeParamRequired) {
-        this.scopeParamRequired = scopeParamRequired;
-    }
-
     public Composites getComposites() {
         return composites;
     }

core/src/main/java/org/keycloak/representations/idm/UserRepresentation.java

@@ -1,12 +1,14 @@
 package org.keycloak.representations.idm;
 
-import org.codehaus.jackson.annotate.JsonIgnore;
-
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.codehaus.jackson.annotate.JsonIgnore;
+import org.keycloak.util.MultivaluedHashMap;
+
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
  * @version $Revision: 1 $
@@ -148,6 +150,15 @@ public class UserRepresentation {
         this.credentials = credentials;
     }
 
+    public UserRepresentation credential(String type, String value) {
+        if (this.credentials == null) credentials = new ArrayList<CredentialRepresentation>();
+        CredentialRepresentation cred = new CredentialRepresentation();
+        cred.setType(type);
+        cred.setValue(value);
+        credentials.add(cred);
+        return this;
+    }
+
     public List<String> getRequiredActions() {
         return requiredActions;
     }

core/src/main/java/org/keycloak/util/Base64Url.java

@@ -1,6 +1,8 @@
-package org.keycloak.common.util;
+package org.keycloak.util;
 
 
+import net.iharder.Base64;
+
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
  * @version $Revision: 1 $

core/src/main/java/org/keycloak/util/BasicAuthHelper.java

@@ -1,6 +1,6 @@
 package org.keycloak.util;
 
-import org.keycloak.common.util.Base64;
+import net.iharder.Base64;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;

core/src/main/java/org/keycloak/util/BouncyIntegration.java

@@ -1,4 +1,4 @@
-package org.keycloak.common.util;
+package org.keycloak.util;
 
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 

core/src/main/java/org/keycloak/util/CertificateUtils.java

@@ -1,9 +1,10 @@
-package org.keycloak.common.util;
+package org.keycloak.util;
 
 import java.math.BigInteger;
 import java.security.KeyPair;
 import java.security.PrivateKey;
 import java.security.SecureRandom;
+import java.security.Security;
 import java.security.cert.X509Certificate;
 import java.util.Calendar;
 import java.util.Date;

core/src/main/java/org/keycloak/util/CollectionUtil.java

@@ -1,4 +1,4 @@
-package org.keycloak.common.util;
+package org.keycloak.util;
 
 import java.util.Collection;
 import java.util.Iterator;

core/src/main/java/org/keycloak/util/DerUtils.java

@@ -1,4 +1,4 @@
-package org.keycloak.common.util;
+package org.keycloak.util;
 
 import java.io.DataInputStream;
 import java.io.InputStream;

core/src/main/java/org/keycloak/util/Encode.java

@@ -1,4 +1,4 @@
-package org.keycloak.common.util;
+package org.keycloak.util;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;

core/src/main/java/org/keycloak/util/EnvUtil.java

@@ -1,4 +1,4 @@
-package org.keycloak.common.util;
+package org.keycloak.util;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

core/src/main/java/org/keycloak/util/FindFile.java

@@ -1,6 +1,6 @@
-package org.keycloak.common.util;
+package org.keycloak.util;
 
-import org.keycloak.common.constants.GenericConstants;
+import org.keycloak.constants.GenericConstants;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;