libre.sh/keycloak-scim
2
0
Fork 0
Code Issues 14 Pull requests Releases Packages Activity Actions 6

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Bill Burke 2015-10-19 10:21:03 -04:00
commit 0d05d38eb6
622 changed files with 1431 additions and 1284 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
broker/core/pom.xml
View file

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

2
broker/oidc/pom.xml
View file

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

2
broker/oidc/src/main/java/org/keycloak/broker/oidc/AbstractOAuth2IdentityProvider.java
View file

@ -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.ClientConnection;
import org.keycloak.common.ClientConnection;
import org.keycloak.OAuth2Constants;
import org.keycloak.broker.provider.util.SimpleHttp;
import org.keycloak.broker.provider.AbstractIdentityProvider;

2
broker/oidc/src/main/java/org/keycloak/broker/oidc/OIDCIdentityProvider.java
View file

@ -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.util.PemUtils;
import org.keycloak.common.util.PemUtils;
import javax.ws.rs.GET;
import javax.ws.rs.Path;

2
broker/pom.xml
View file

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

2
broker/saml/pom.xml
View file

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

4
broker/saml/src/main/java/org/keycloak/broker/saml/SAMLEndpoint.java
View file

@ -1,8 +1,8 @@
package org.keycloak.broker.saml;
import org.jboss.logging.Logger;
import org.keycloak.ClientConnection;
import org.keycloak.VerificationException;
import org.keycloak.common.ClientConnection;
import org.keycloak.common.VerificationException;
import org.keycloak.broker.provider.BrokeredIdentityContext;
import org.keycloak.broker.provider.IdentityBrokerException;
import org.keycloak.broker.provider.IdentityProvider;

2
client-api/pom.xml
View file

@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.6.0.Final-SNAPSHOT</version>
<version>1.7.0.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

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

@ -12,7 +12,7 @@ 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.util.Base64;
import org.keycloak.common.util.Base64;
import org.keycloak.util.JsonSerialization;
import java.io.IOException;

4
common/pom.xml
View file

@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.6.0.Final-SNAPSHOT</version>
<version>1.7.0.Final-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -18,7 +18,7 @@
<timestamp>${maven.build.timestamp}</timestamp>
<maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
<keycloak.osgi.export>
org.keycloak.*
org.keycloak.common.*
</keycloak.osgi.export>
<keycloak.osgi.import>
*;resolution:=optional

2
common/src/main/java/org/keycloak/ClientConnection.java → common/src/main/java/org/keycloak/common/ClientConnection.java
View file

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

2
common/src/main/java/org/keycloak/VerificationException.java → common/src/main/java/org/keycloak/common/VerificationException.java
View file

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

4
common/src/main/java/org/keycloak/Version.java → common/src/main/java/org/keycloak/common/Version.java
View file

@ -1,6 +1,6 @@
package org.keycloak;
package org.keycloak.common;
import org.keycloak.util.Time;
import org.keycloak.common.util.Time;
import java.io.IOException;
import java.io.InputStream;

2
common/src/main/java/org/keycloak/constants/GenericConstants.java → common/src/main/java/org/keycloak/common/constants/GenericConstants.java
View file

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

2
common/src/main/java/org/keycloak/constants/KerberosConstants.java → common/src/main/java/org/keycloak/common/constants/KerberosConstants.java
View file

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

2
common/src/main/java/org/keycloak/constants/ServiceAccountConstants.java → common/src/main/java/org/keycloak/common/constants/ServiceAccountConstants.java
View file

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

2
common/src/main/java/org/keycloak/enums/RelativeUrlsUsed.java → common/src/main/java/org/keycloak/common/enums/RelativeUrlsUsed.java
View file

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

4
common/src/main/java/org/keycloak/enums/SslRequired.java → common/src/main/java/org/keycloak/common/enums/SslRequired.java
View file

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

2
common/src/main/java/org/keycloak/util/Base64.java → common/src/main/java/org/keycloak/common/util/Base64.java
View file

@ -1,4 +1,4 @@
package org.keycloak.util;
package org.keycloak.common.util;
/**
* <p>Encodes and decodes to and from Base64 notation.</p>

4
common/src/main/java/org/keycloak/util/Base64Url.java → common/src/main/java/org/keycloak/common/util/Base64Url.java
View file

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

2
common/src/main/java/org/keycloak/util/BouncyIntegration.java → common/src/main/java/org/keycloak/common/util/BouncyIntegration.java
View file

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

3
common/src/main/java/org/keycloak/util/CertificateUtils.java → common/src/main/java/org/keycloak/common/util/CertificateUtils.java
View file

@ -1,10 +1,9 @@
package org.keycloak.util;
package org.keycloak.common.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;

2
common/src/main/java/org/keycloak/util/CollectionUtil.java → common/src/main/java/org/keycloak/common/util/CollectionUtil.java
View file

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

2
common/src/main/java/org/keycloak/util/DerUtils.java → common/src/main/java/org/keycloak/common/util/DerUtils.java
View file

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

2
common/src/main/java/org/keycloak/util/Encode.java → common/src/main/java/org/keycloak/common/util/Encode.java
View file

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

2
common/src/main/java/org/keycloak/util/EnvUtil.java → common/src/main/java/org/keycloak/common/util/EnvUtil.java
View file

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

4
common/src/main/java/org/keycloak/util/FindFile.java → common/src/main/java/org/keycloak/common/util/FindFile.java
View file

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

2
common/src/main/java/org/keycloak/util/HostUtils.java → common/src/main/java/org/keycloak/common/util/HostUtils.java
View file

@ -1,4 +1,4 @@
package org.keycloak.util;
package org.keycloak.common.util;
import java.net.InetAddress;
import java.net.UnknownHostException;

2
common/src/main/java/org/keycloak/util/HtmlUtils.java → common/src/main/java/org/keycloak/common/util/HtmlUtils.java
View file

@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.keycloak.util;
package org.keycloak.common.util;
/**
* @author pedroigor

7
common/src/main/java/org/keycloak/util/KerberosSerializationUtils.java → common/src/main/java/org/keycloak/common/util/KerberosSerializationUtils.java
View file

@ -1,4 +1,4 @@
package org.keycloak.util;
package org.keycloak.common.util;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@ -12,13 +12,12 @@ import java.lang.reflect.Method;
import javax.security.auth.kerberos.KerberosTicket;
import org.keycloak.util.Base64;
import org.ietf.jgss.GSSCredential;
import org.ietf.jgss.GSSException;
import org.ietf.jgss.GSSManager;
import org.ietf.jgss.Oid;
import org.keycloak.constants.KerberosConstants;
import org.keycloak.util.reflections.Reflections;
import org.keycloak.common.constants.KerberosConstants;
import org.keycloak.common.util.reflections.Reflections;
import sun.security.jgss.GSSCredentialImpl;
import sun.security.jgss.GSSManagerImpl;
import sun.security.jgss.krb5.Krb5InitCredential;

2
common/src/main/java/org/keycloak/util/KeycloakUriBuilder.java → common/src/main/java/org/keycloak/common/util/KeycloakUriBuilder.java
View file

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

4
common/src/main/java/org/keycloak/util/KeystoreUtil.java → common/src/main/java/org/keycloak/common/util/KeystoreUtil.java
View file

@ -1,4 +1,4 @@
package org.keycloak.util;
package org.keycloak.common.util;
import java.io.File;
import java.io.FileInputStream;
@ -6,7 +6,7 @@ import java.io.InputStream;
import java.security.KeyStore;
import java.security.PrivateKey;
import org.keycloak.constants.GenericConstants;
import org.keycloak.common.constants.GenericConstants;
/**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

2
common/src/main/java/org/keycloak/util/MimeTypeUtil.java → common/src/main/java/org/keycloak/common/util/MimeTypeUtil.java
View file

@ -1,4 +1,4 @@
package org.keycloak.util;
package org.keycloak.common.util;
import javax.activation.MimetypesFileTypeMap;
import java.io.File;

2
common/src/main/java/org/keycloak/util/MultivaluedHashMap.java → common/src/main/java/org/keycloak/common/util/MultivaluedHashMap.java
View file

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

2
common/src/main/java/org/keycloak/util/NetworkUtils.java → common/src/main/java/org/keycloak/common/util/NetworkUtils.java
View file

@ -1,4 +1,4 @@
package org.keycloak.util;
package org.keycloak.common.util;
/*
* JBoss, Home of Professional Open Source.

2
common/src/main/java/org/keycloak/util/ObjectUtil.java → common/src/main/java/org/keycloak/common/util/ObjectUtil.java
View file

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

2
common/src/main/java/org/keycloak/util/PathHelper.java → common/src/main/java/org/keycloak/common/util/PathHelper.java
View file

@ -1,7 +1,7 @@
/**
*
*/
package org.keycloak.util;
package org.keycloak.common.util;
import java.util.regex.Pattern;

4
common/src/main/java/org/keycloak/util/PemUtils.java → common/src/main/java/org/keycloak/common/util/PemUtils.java
View file

@ -1,8 +1,6 @@
package org.keycloak.util;
package org.keycloak.common.util;
import org.keycloak.util.Base64;
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
import java.io.IOException;

2
common/src/main/java/org/keycloak/util/ServerCookie.java → common/src/main/java/org/keycloak/common/util/ServerCookie.java
View file

@ -1,4 +1,4 @@
package org.keycloak.util;
package org.keycloak.common.util;
import java.io.Serializable;
import java.text.DateFormat;

2
common/src/main/java/org/keycloak/util/StreamUtil.java → common/src/main/java/org/keycloak/common/util/StreamUtil.java
View file

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

2
common/src/main/java/org/keycloak/util/StringPropertyReplacer.java → common/src/main/java/org/keycloak/common/util/StringPropertyReplacer.java
View file

@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
package org.keycloak.util;
package org.keycloak.common.util;
import java.io.File;
import java.util.Properties;

2
common/src/main/java/org/keycloak/util/SystemEnvProperties.java → common/src/main/java/org/keycloak/common/util/SystemEnvProperties.java
View file

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

2
common/src/main/java/org/keycloak/util/Time.java → common/src/main/java/org/keycloak/common/util/Time.java
View file

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

2
common/src/main/java/org/keycloak/util/UriUtils.java → common/src/main/java/org/keycloak/common/util/UriUtils.java
View file

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

2
common/src/main/java/org/keycloak/util/reflections/Reflections.java → common/src/main/java/org/keycloak/common/util/reflections/Reflections.java
View file

@ -1,4 +1,4 @@
package org.keycloak.util.reflections;
package org.keycloak.common.util.reflections;
import java.beans.Introspector;
import java.io.Serializable;

2
common/src/main/java/org/keycloak/util/reflections/SetAccessiblePrivilegedAction.java → common/src/main/java/org/keycloak/common/util/reflections/SetAccessiblePrivilegedAction.java
View file

@ -1,4 +1,4 @@
package org.keycloak.util.reflections;
package org.keycloak.common.util.reflections;
import java.lang.reflect.AccessibleObject;
import java.security.PrivilegedAction;

2
common/src/main/java/org/keycloak/util/reflections/Types.java → common/src/main/java/org/keycloak/common/util/reflections/Types.java
View file

@ -1,4 +1,4 @@
package org.keycloak.util.reflections;
package org.keycloak.common.util.reflections;
import java.lang.reflect.Type;

2
connections/file/pom.xml
View file

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

2
connections/http-client/pom.xml
View file

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

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

@ -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.util.EnvUtil;
import org.keycloak.util.KeystoreUtil;
import org.keycloak.common.util.EnvUtil;
import org.keycloak.common.util.KeystoreUtil;
import java.io.IOException;
import java.io.InputStream;

2
connections/infinispan/pom.xml
View file

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

2
connections/jpa-liquibase/pom.xml
View file

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

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

@ -3,7 +3,7 @@
<changeSet author="mposolda@redhat.com" id="1.6.0">
<addColumn tableName="REALM">
<column name="OFFLINE_SESSION_IDLE_TIMEOUT" type="INT"/>
<column name="OFFLINE_SESSION_IDLE_TIMEOUT" type="INT" defaultValueNumeric="0"/>
<column name="REVOKE_REFRESH_TOKEN" type="BOOLEAN" defaultValueBoolean="false">
<constraints nullable="false"/>
</column>
@ -31,7 +31,7 @@
<constraints nullable="false"/>
</column>
<column name="LAST_SESSION_REFRESH" type="INT"/>
<column name="OFFLINE" type="BOOLEAN" defaultValueBoolean="false">
<column name="OFFLINE_FLAG" type="VARCHAR(4)">
<constraints nullable="false"/>
</column>
<column name="DATA" type="CLOB"/>
@ -47,14 +47,14 @@
<column name="CLIENT_ID" type="VARCHAR(36)">
<constraints nullable="false"/>
</column>
<column name="OFFLINE" type="BOOLEAN" defaultValueBoolean="false">
<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" 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"/>
<addPrimaryKey columnNames="USER_SESSION_ID, OFFLINE_FLAG" constraintName="CONSTRAINT_OFFLINE_US_SES_PK" tableName="OFFLINE_USER_SESSION"/>
<addPrimaryKey columnNames="CLIENT_SESSION_ID, OFFLINE_FLAG" constraintName="CONSTRAINT_OFFLINE_CL_SES_PK" tableName="OFFLINE_CLIENT_SESSION"/>
</changeSet>
</databaseChangeLog>

2
connections/jpa/pom.xml
View file

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

2
connections/mongo-update/pom.xml
View file

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

2
connections/mongo/pom.xml
View file

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

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

@ -9,11 +9,10 @@ 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.util.reflections.Types;
import org.keycloak.common.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;

2
connections/pom.xml
View file

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

2
core/pom.xml
View file

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

4
core/src/main/java/org/keycloak/AbstractOAuthClient.java
View file

@ -1,7 +1,7 @@
package org.keycloak;
import org.keycloak.enums.RelativeUrlsUsed;
import org.keycloak.util.KeycloakUriBuilder;
import org.keycloak.common.enums.RelativeUrlsUsed;
import org.keycloak.common.util.KeycloakUriBuilder;
import java.util.Map;
import java.util.UUID;

2
core/src/main/java/org/keycloak/KeycloakSecurityContext.java
View file

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

1
core/src/main/java/org/keycloak/RSATokenVerifier.java
View file

@ -1,5 +1,6 @@
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;

4
core/src/main/java/org/keycloak/jose/jwk/JWKBuilder.java
View file

@ -1,14 +1,12 @@
package org.keycloak.jose.jwk;
import org.keycloak.util.Base64Url;
import org.keycloak.common.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;
/**

2
core/src/main/java/org/keycloak/jose/jwk/JWKParser.java
View file

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

2
core/src/main/java/org/keycloak/jose/jws/JWSBuilder.java
View file

@ -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.util.Base64Url;
import org.keycloak.common.util.Base64Url;
import org.keycloak.util.JsonSerialization;
import javax.crypto.SecretKey;

3
core/src/main/java/org/keycloak/jose/jws/JWSInput.java
View file

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

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

@ -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.util.Base64Url;
import org.keycloak.common.util.Base64Url;
import javax.crypto.Mac;
import javax.crypto.SecretKey;

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

@ -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.util.PemUtils;
import org.keycloak.common.util.PemUtils;
import java.security.PrivateKey;
import java.security.PublicKey;

2
core/src/main/java/org/keycloak/representations/JsonWebToken.java
View file

@ -8,7 +8,7 @@ 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.util.Time;
import org.keycloak.common.util.Time;
import java.io.Serializable;
import java.util.HashMap;

2
core/src/main/java/org/keycloak/representations/PasswordToken.java
View file

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

2
core/src/main/java/org/keycloak/representations/VersionRepresentation.java
View file

@ -1,7 +1,7 @@
package org.keycloak.representations;
import org.codehaus.jackson.annotate.JsonProperty;
import org.keycloak.Version;
import org.keycloak.common.Version;
/**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

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

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

35
core/src/main/java/org/keycloak/representations/idm/OfflineClientSessionRepresentation.java
View file

@ -1,35 +0,0 @@
package org.keycloak.representations.idm;
/**
* @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
*/
public class OfflineClientSessionRepresentation {
private String clientSessionId;
private String client; // clientId (not DB ID)
private String data;
public String getClientSessionId() {
return clientSessionId;
}
public void setClientSessionId(String clientSessionId) {
this.clientSessionId = clientSessionId;
}
public String getClient() {
return client;
}
public void setClient(String client) {
this.client = client;
}
public String getData() {
return data;
}
public void setData(String data) {
this.data = data;
}
}

37
core/src/main/java/org/keycloak/representations/idm/OfflineUserSessionRepresentation.java
View file

@ -1,37 +0,0 @@
package org.keycloak.representations.idm;
import java.util.List;
/**
* @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
*/
public class OfflineUserSessionRepresentation {
private String userSessionId;
private String data;
private List<OfflineClientSessionRepresentation> offlineClientSessions;
public String getUserSessionId() {
return userSessionId;
}
public void setUserSessionId(String userSessionId) {
this.userSessionId = userSessionId;
}
public String getData() {
return data;
}
public void setData(String data) {
this.data = data;
}
public List<OfflineClientSessionRepresentation> getOfflineClientSessions() {
return offlineClientSessions;
}
public void setOfflineClientSessions(List<OfflineClientSessionRepresentation> offlineClientSessions) {
this.offlineClientSessions = offlineClientSessions;
}
}

2
core/src/main/java/org/keycloak/representations/idm/PublishedRealmRepresentation.java
View file

@ -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.util.PemUtils;
import org.keycloak.common.util.PemUtils;
import java.io.IOException;
import java.io.StringWriter;

9
core/src/main/java/org/keycloak/representations/idm/UserRepresentation.java
View file

@ -34,7 +34,6 @@ public class UserRepresentation {
protected List<String> realmRoles;
protected Map<String, List<String>> clientRoles;
protected List<UserConsentRepresentation> clientConsents;
protected List<OfflineUserSessionRepresentation> offlineUserSessions;
@Deprecated
protected Map<String, List<String>> applicationRoles;
@ -217,12 +216,4 @@ public class UserRepresentation {
public void setServiceAccountClientId(String serviceAccountClientId) {
this.serviceAccountClientId = serviceAccountClientId;
}
public List<OfflineUserSessionRepresentation> getOfflineUserSessions() {
return offlineUserSessions;
}
public void setOfflineUserSessions(List<OfflineUserSessionRepresentation> offlineUserSessions) {
this.offlineUserSessions = offlineUserSessions;
}
}

2
core/src/main/java/org/keycloak/util/BasicAuthHelper.java
View file

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

3
core/src/main/java/org/keycloak/util/SystemPropertiesJsonParserFactory.java
View file

@ -3,13 +3,14 @@ package org.keycloak.util;
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
import java.util.Map;
import java.util.Properties;
import org.codehaus.jackson.JsonParser;
import org.codehaus.jackson.io.IOContext;
import org.codehaus.jackson.map.MappingJsonFactory;
import org.codehaus.jackson.util.JsonParserDelegate;
import org.keycloak.common.util.StringPropertyReplacer;
import org.keycloak.common.util.SystemEnvProperties;
/**
* Provides replacing of system properties for parsed values

3
core/src/test/java/org/keycloak/RSAVerifierTest.java
View file

@ -7,9 +7,10 @@ import org.bouncycastle.x509.X509V1CertificateGenerator;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import org.keycloak.common.VerificationException;
import org.keycloak.jose.jws.JWSBuilder;
import org.keycloak.representations.AccessToken;
import org.keycloak.util.Time;
import org.keycloak.common.util.Time;
import org.keycloak.util.TokenUtil;
import javax.security.auth.x500.X500Principal;

3
core/src/test/java/org/keycloak/util/UriUtilsTest.java
View file

@ -1,6 +1,7 @@
package org.keycloak.util;
import org.junit.Test;
import org.keycloak.common.util.UriUtils;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@ -50,7 +51,7 @@ public class UriUtilsTest {
assertEquals("http://localhost",UriUtils.stripQueryParam("http://localhost?login_hint=michael@me.com","login_hint"));
assertEquals("http://localhost?param=test",UriUtils.stripQueryParam("http://localhost?param=test&login_hint=michael","login_hint"));
assertEquals("http://localhost?param=test",UriUtils.stripQueryParam("http://localhost?param=test&login_hint=michael@me.com","login_hint"));
assertEquals("http://localhost?param=test",UriUtils.stripQueryParam("http://localhost?login_hint=michael&param=test","login_hint"));
assertEquals("http://localhost?param=test", UriUtils.stripQueryParam("http://localhost?login_hint=michael&param=test", "login_hint"));
assertEquals("http://localhost?param=test",UriUtils.stripQueryParam("http://localhost?login_hint=michael@me.com&param=test","login_hint"));
assertEquals("http://localhost?pre=test&param=test",UriUtils.stripQueryParam("http://localhost?pre=test&login_hint=michael&param=test","login_hint"));
assertEquals("http://localhost?pre=test&param=test",UriUtils.stripQueryParam("http://localhost?pre=test&login_hint=michael@me.com&param=test","login_hint"));

2
dependencies/pom.xml vendored
View file

@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.6.0.Final-SNAPSHOT</version>
<version>1.7.0.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
dependencies/server-all/pom.xml vendored
View file

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

2
dependencies/server-min/pom.xml vendored
View file

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

2
distribution/adapters/as7-eap6-adapter/as7-adapter-zip/pom.xml
View file

@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.6.0.Final-SNAPSHOT</version>
<version>1.7.0.Final-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>

2
distribution/adapters/as7-eap6-adapter/as7-modules/pom.xml
View file

@ -8,7 +8,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.6.0.Final-SNAPSHOT</version>
<version>1.7.0.Final-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>

2
distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/pom.xml
View file

@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.6.0.Final-SNAPSHOT</version>
<version>1.7.0.Final-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>

2
distribution/adapters/as7-eap6-adapter/pom.xml
View file

@ -3,7 +3,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.6.0.Final-SNAPSHOT</version>
<version>1.7.0.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<name>Keycloak AS7 / JBoss EAP 6 Adapter Distros</name>

2
distribution/adapters/jetty81-adapter-zip/pom.xml
View file

@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.6.0.Final-SNAPSHOT</version>
<version>1.7.0.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>

2
distribution/adapters/jetty91-adapter-zip/pom.xml
View file

@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.6.0.Final-SNAPSHOT</version>
<version>1.7.0.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>

2
distribution/adapters/jetty92-adapter-zip/pom.xml
View file

@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.6.0.Final-SNAPSHOT</version>
<version>1.7.0.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>

2
distribution/adapters/js-adapter-zip/pom.xml
View file

@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.6.0.Final-SNAPSHOT</version>
<version>1.7.0.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>

2
distribution/adapters/osgi/features/pom.xml
View file

@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.6.0.Final-SNAPSHOT</version>
<version>1.7.0.Final-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
<name>Keycloak OSGI Features</name>

2
distribution/adapters/osgi/features/src/main/resources/features.xml
View file

@ -12,6 +12,7 @@
<bundle dependency="true">mvn:org.jboss.logging/jboss-logging/${jboss.logging.version}</bundle>
<bundle>mvn:org.keycloak/keycloak-common/${project.version}</bundle>
<bundle>mvn:org.keycloak/keycloak-core/${project.version}</bundle>
<bundle>mvn:org.keycloak/keycloak-adapter-spi/${project.version}</bundle>
<bundle>mvn:org.keycloak/keycloak-adapter-core/${project.version}</bundle>
</feature>
@ -26,6 +27,7 @@
<details>The keycloak Jetty8 adapter</details>
<feature>keycloak-adapter-core</feature>
<feature version="[8.1,9)">jetty</feature>
<bundle>mvn:org.keycloak/keycloak-jetty-adapter-spi/${project.version}</bundle>
<bundle>mvn:org.keycloak/keycloak-jetty-core/${project.version}</bundle>
<bundle>mvn:org.keycloak/keycloak-jetty81-adapter/${project.version}</bundle>
</feature>

2
distribution/adapters/osgi/jaas/pom.xml
View file

@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.6.0.Final-SNAPSHOT</version>
<version>1.7.0.Final-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
<name>Keycloak OSGI JAAS Realm Configuration</name>

2
distribution/adapters/osgi/pom.xml
View file

@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.6.0.Final-SNAPSHOT</version>
<version>1.7.0.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<name>Keycloak OSGI Integration</name>

2
distribution/adapters/osgi/thirdparty/pom.xml vendored
View file

@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.6.0.Final-SNAPSHOT</version>
<version>1.7.0.Final-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>

2
distribution/adapters/pom.xml
View file

@ -3,7 +3,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.6.0.Final-SNAPSHOT</version>
<version>1.7.0.Final-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

2
distribution/adapters/tomcat6-adapter-zip/pom.xml
View file

@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.6.0.Final-SNAPSHOT</version>
<version>1.7.0.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>

2
distribution/adapters/tomcat7-adapter-zip/pom.xml
View file

@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.6.0.Final-SNAPSHOT</version>
<version>1.7.0.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>

2
distribution/adapters/tomcat8-adapter-zip/pom.xml
View file

@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.6.0.Final-SNAPSHOT</version>
<version>1.7.0.Final-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>

Some files were not shown because too many files have changed in this diff Show more