mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git
blame | history | patch | commit | commitdiff | ignore whitespace
Nicolas Capponi
11.04.2016 fd51cbf2554c76ecfb8ccc13de4ce9dabbe5b8b2 
 opendj-rest2ldap/pom.xml


@@ -34,7 +34,6 @@


            org.forgerock.opendj.*;provide:=true,


            org.forgerock.json.*;provide:=true


        </opendj.osgi.import.additional>


        <openig.toolkit.version>5.0.0-SNAPSHOT</openig.toolkit.version>


    </properties>






@@ -64,11 +63,10 @@


            <artifactId>i18n-core</artifactId>


        </dependency>




        <dependency>


            <groupId>org.forgerock.openig</groupId>


            <artifactId>openig-toolkit</artifactId>


            <version>${openig.toolkit.version}</version>


        </dependency>


      <dependency>


         <groupId>org.forgerock.http</groupId>


         <artifactId>chf-oauth2</artifactId>


      </dependency>




        <dependency>


            <groupId>org.forgerock.http</groupId>




 opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LdapHttpApplication.java


@@ -62,6 +62,11 @@


import org.forgerock.http.filter.Filters;


import org.forgerock.http.handler.HttpClientHandler;


import org.forgerock.http.io.Buffer;


import org.forgerock.http.oauth2.AccessTokenException;


import org.forgerock.http.oauth2.AccessTokenInfo;


import org.forgerock.http.oauth2.AccessTokenResolver;


import org.forgerock.http.oauth2.resolver.CachingAccessTokenResolver;


import org.forgerock.http.oauth2.resolver.OpenAmAccessTokenResolver;


import org.forgerock.http.protocol.Headers;


import org.forgerock.http.swagger.OpenApiRequestFilter;


import org.forgerock.i18n.LocalizableMessage;


@@ -79,11 +84,6 @@


import org.forgerock.opendj.ldap.schema.Schema;


import org.forgerock.opendj.rest2ldap.authz.AuthenticationStrategy;


import org.forgerock.opendj.rest2ldap.authz.ConditionalFilters.ConditionalFilter;


import org.forgerock.openig.oauth2.AccessTokenException;


import org.forgerock.openig.oauth2.AccessTokenInfo;


import org.forgerock.openig.oauth2.AccessTokenResolver;


import org.forgerock.openig.oauth2.resolver.CachingAccessTokenResolver;


import org.forgerock.openig.oauth2.resolver.OpenAmAccessTokenResolver;


import org.forgerock.services.context.SecurityContext;


import org.forgerock.util.Factory;


import org.forgerock.util.Function;




 opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/Authorization.java


@@ -24,14 +24,14 @@


import java.util.Map;


import java.util.Set;




import org.forgerock.openig.oauth2.AccessTokenInfo;


import org.forgerock.openig.oauth2.AccessTokenResolver;


import org.forgerock.openig.oauth2.OAuth2Context;


import org.forgerock.openig.oauth2.ResourceAccess;


import org.forgerock.openig.oauth2.ResourceServerFilter;


import org.forgerock.http.Filter;


import org.forgerock.http.Handler;


import org.forgerock.http.filter.Filters;


import org.forgerock.http.oauth2.AccessTokenInfo;


import org.forgerock.http.oauth2.AccessTokenResolver;


import org.forgerock.http.oauth2.OAuth2Context;


import org.forgerock.http.oauth2.ResourceAccess;


import org.forgerock.http.oauth2.ResourceServerFilter;


import org.forgerock.http.protocol.Headers;


import org.forgerock.http.protocol.Request;


import org.forgerock.http.protocol.Response;




 opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/CtsAccessTokenResolver.java


@@ -25,9 +25,9 @@


import java.io.IOException;


import java.util.concurrent.atomic.AtomicReference;




import org.forgerock.openig.oauth2.AccessTokenInfo;


import org.forgerock.openig.oauth2.AccessTokenException;


import org.forgerock.openig.oauth2.AccessTokenResolver;


import org.forgerock.http.oauth2.AccessTokenException;


import org.forgerock.http.oauth2.AccessTokenInfo;


import org.forgerock.http.oauth2.AccessTokenResolver;


import org.forgerock.http.util.Json;


import org.forgerock.json.JsonValue;


import org.forgerock.opendj.ldap.Connection;




 opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/FileAccessTokenResolver.java


@@ -27,9 +27,9 @@


import java.io.IOException;


import java.io.InputStream;




import org.forgerock.openig.oauth2.AccessTokenInfo;


import org.forgerock.openig.oauth2.AccessTokenException;


import org.forgerock.openig.oauth2.AccessTokenResolver;


import org.forgerock.http.oauth2.AccessTokenException;


import org.forgerock.http.oauth2.AccessTokenInfo;


import org.forgerock.http.oauth2.AccessTokenResolver;


import org.forgerock.http.util.Json;


import org.forgerock.json.JsonValue;


import org.forgerock.json.JsonValueException;




 opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/Rfc7662AccessTokenResolver.java


@@ -26,10 +26,10 @@


import java.util.HashSet;


import java.util.Set;




import org.forgerock.openig.oauth2.AccessTokenInfo;


import org.forgerock.openig.oauth2.AccessTokenException;


import org.forgerock.openig.oauth2.AccessTokenResolver;


import org.forgerock.http.Handler;


import org.forgerock.http.oauth2.AccessTokenException;


import org.forgerock.http.oauth2.AccessTokenInfo;


import org.forgerock.http.oauth2.AccessTokenResolver;


import org.forgerock.http.protocol.Responses;


import org.forgerock.http.protocol.Entity;


import org.forgerock.http.protocol.Form;




 opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/Utils.java


@@ -21,7 +21,7 @@


import java.io.Closeable;


import java.util.concurrent.atomic.AtomicReference;




import org.forgerock.openig.oauth2.AccessTokenException;


import org.forgerock.http.oauth2.AccessTokenException;


import org.forgerock.http.protocol.Response;


import org.forgerock.http.protocol.Status;


import org.forgerock.i18n.LocalizableMessage;




 opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/AuthorizationTestCase.java


@@ -27,10 +27,10 @@


import java.util.Map;


import java.util.Set;




import org.forgerock.openig.oauth2.AccessTokenInfo;


import org.forgerock.openig.oauth2.AccessTokenException;


import org.forgerock.openig.oauth2.AccessTokenResolver;


import org.forgerock.http.Handler;


import org.forgerock.http.oauth2.AccessTokenException;


import org.forgerock.http.oauth2.AccessTokenInfo;


import org.forgerock.http.oauth2.AccessTokenResolver;


import org.forgerock.http.protocol.Request;


import org.forgerock.json.JsonValue;


import org.forgerock.opendj.rest2ldap.authz.Authorization;




 opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/OAuth2JsonConfigurationTestCase.java


@@ -22,7 +22,7 @@


import static org.mockito.Mockito.spy;


import static org.mockito.Mockito.when;




import org.forgerock.openig.oauth2.AccessTokenResolver;


import org.forgerock.http.oauth2.AccessTokenResolver;


import org.forgerock.json.JsonValueException;


import org.forgerock.opendj.ldap.ConnectionFactory;


import org.forgerock.testng.ForgeRockTestCase;




 opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/authz/CtsAccessTokenResolverTestCase.java


@@ -26,8 +26,8 @@




import java.util.concurrent.ExecutionException;




import org.forgerock.openig.oauth2.AccessTokenInfo;


import org.forgerock.openig.oauth2.AccessTokenResolver;


import org.forgerock.http.oauth2.AccessTokenInfo;


import org.forgerock.http.oauth2.AccessTokenResolver;


import org.forgerock.json.JsonPointer;


import org.forgerock.opendj.ldap.Attribute;


import org.forgerock.opendj.ldap.Connection;




 opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/authz/Rfc7662AccessResolverTestCase.java


@@ -27,11 +27,11 @@


import java.util.Map;


import java.util.concurrent.ExecutionException;




import org.forgerock.openig.oauth2.AccessTokenInfo;


import org.forgerock.openig.oauth2.AccessTokenException;


import org.forgerock.openig.oauth2.AccessTokenResolver;


import org.forgerock.http.Handler;


import org.forgerock.http.MutableUri;


import org.forgerock.http.oauth2.AccessTokenException;


import org.forgerock.http.oauth2.AccessTokenInfo;


import org.forgerock.http.oauth2.AccessTokenResolver;


import org.forgerock.http.protocol.Request;


import org.forgerock.http.protocol.Response;


import org.forgerock.http.protocol.Status;




 opendj-server-legacy/src/main/java/org/opends/server/protocols/http/authz/HttpOAuth2AuthorizationMechanism.java


@@ -33,10 +33,10 @@


import java.util.concurrent.ScheduledExecutorService;


import java.util.concurrent.TimeUnit;




import org.forgerock.openig.oauth2.AccessTokenException;


import org.forgerock.openig.oauth2.AccessTokenInfo;


import org.forgerock.openig.oauth2.AccessTokenResolver;


import org.forgerock.openig.oauth2.resolver.CachingAccessTokenResolver;


import org.forgerock.http.oauth2.AccessTokenException;


import org.forgerock.http.oauth2.AccessTokenInfo;


import org.forgerock.http.oauth2.AccessTokenResolver;


import org.forgerock.http.oauth2.resolver.CachingAccessTokenResolver;


import org.forgerock.json.JsonException;


import org.forgerock.json.JsonPointer;


import org.forgerock.opendj.config.server.ConfigException;




 opendj-server-legacy/src/main/java/org/opends/server/protocols/http/authz/HttpOAuth2CtsAuthorizationMechanism.java


@@ -19,7 +19,7 @@


import static org.forgerock.opendj.rest2ldap.authz.Authorization.newCtsAccessTokenResolver;


import static org.opends.messages.ConfigMessages.ERR_CONFIG_AUTHZ_REFERENCED_DN_DOESNT_EXISTS;




import org.forgerock.openig.oauth2.AccessTokenResolver;


import org.forgerock.http.oauth2.AccessTokenResolver;


import org.forgerock.opendj.config.server.ConfigException;


import org.forgerock.opendj.ldap.DN;


import org.forgerock.opendj.server.config.server.HTTPOauth2CtsAuthorizationMechanismCfg;




 opendj-server-legacy/src/main/java/org/opends/server/protocols/http/authz/HttpOAuth2FileAuthorizationMechanism.java


@@ -22,7 +22,7 @@


import java.nio.file.Files;


import java.nio.file.Paths;




import org.forgerock.openig.oauth2.AccessTokenResolver;


import org.forgerock.http.oauth2.AccessTokenResolver;


import org.forgerock.opendj.config.server.ConfigException;


import org.forgerock.opendj.server.config.server.HTTPOauth2FileAuthorizationMechanismCfg;


import org.opends.server.core.ServerContext;




 opendj-server-legacy/src/main/java/org/opends/server/protocols/http/authz/HttpOAuth2OpenAmAuthorizationMechanism.java


@@ -21,10 +21,10 @@


import java.net.URI;


import java.net.URISyntaxException;




import org.forgerock.openig.oauth2.AccessTokenResolver;


import org.forgerock.openig.oauth2.resolver.OpenAmAccessTokenResolver;


import org.forgerock.http.HttpApplicationException;


import org.forgerock.http.handler.HttpClientHandler;


import org.forgerock.http.oauth2.AccessTokenResolver;


import org.forgerock.http.oauth2.resolver.OpenAmAccessTokenResolver;


import org.forgerock.opendj.config.server.ConfigException;


import org.forgerock.opendj.server.config.server.HTTPOauth2OpenamAuthorizationMechanismCfg;


import org.forgerock.util.time.TimeService;




 opendj-server-legacy/src/main/java/org/opends/server/protocols/http/authz/HttpOAuth2TokenIntrospectionAuthorizationMechanism.java


@@ -22,9 +22,9 @@


import java.net.URI;


import java.net.URISyntaxException;




import org.forgerock.openig.oauth2.AccessTokenResolver;


import org.forgerock.http.HttpApplicationException;


import org.forgerock.http.handler.HttpClientHandler;


import org.forgerock.http.oauth2.AccessTokenResolver;


import org.forgerock.opendj.config.server.ConfigException;


import org.forgerock.opendj.server.config.server.HTTPOauth2TokenIntrospectionAuthorizationMechanismCfg;


import org.opends.server.core.ServerContext;