diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs index f897a7f1c..225274368 100644 --- a/.settings/org.eclipse.m2e.core.prefs +++ b/.settings/org.eclipse.m2e.core.prefs @@ -1,3 +1,4 @@ +#Thu Mar 15 10:09:48 EDT 2012 activeProfiles= eclipse.preferences.version=1 resolveWorkspaceProjects=true diff --git a/server/.project b/server/.project index f0808e7fa..4c7c87524 100644 --- a/server/.project +++ b/server/.project @@ -31,14 +31,8 @@ - - org.springframework.ide.eclipse.core.springbuilder - - - - org.springframework.ide.eclipse.core.springnature org.eclipse.jem.workbench.JavaEMFNature org.eclipse.wst.common.modulecore.ModuleCoreNature org.eclipse.jdt.core.javanature diff --git a/server/src/main/java/org/mitre/oauth2/model/ClientDetailsEntity.java b/server/src/main/java/org/mitre/oauth2/model/ClientDetailsEntity.java index d3ed2d149..2f7997e9d 100644 --- a/server/src/main/java/org/mitre/oauth2/model/ClientDetailsEntity.java +++ b/server/src/main/java/org/mitre/oauth2/model/ClientDetailsEntity.java @@ -4,7 +4,6 @@ package org.mitre.oauth2.model; import java.util.Collections; -import java.util.List; import java.util.Set; import javax.persistence.Basic; diff --git a/server/src/main/java/org/mitre/oauth2/model/ClientDetailsEntityFactory.java b/server/src/main/java/org/mitre/oauth2/model/ClientDetailsEntityFactory.java index 5f9f68ccb..f3412f1a6 100644 --- a/server/src/main/java/org/mitre/oauth2/model/ClientDetailsEntityFactory.java +++ b/server/src/main/java/org/mitre/oauth2/model/ClientDetailsEntityFactory.java @@ -1,6 +1,5 @@ package org.mitre.oauth2.model; -import org.mitre.oauth2.model.ClientDetailsEntity.ClientDetailsEntityBuilder; public interface ClientDetailsEntityFactory { diff --git a/server/src/main/java/org/mitre/oauth2/repository/OAuth2ClientRepository.java b/server/src/main/java/org/mitre/oauth2/repository/OAuth2ClientRepository.java index cd9de162f..1dd0d8137 100644 --- a/server/src/main/java/org/mitre/oauth2/repository/OAuth2ClientRepository.java +++ b/server/src/main/java/org/mitre/oauth2/repository/OAuth2ClientRepository.java @@ -1,11 +1,8 @@ package org.mitre.oauth2.repository; import java.util.Collection; -import java.util.List; import org.mitre.oauth2.model.ClientDetailsEntity; -import org.springframework.security.oauth2.provider.ClientDetails; -import org.springframework.stereotype.Repository; public interface OAuth2ClientRepository { diff --git a/server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ClientDetailsEntityService.java b/server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ClientDetailsEntityService.java index d865ac4fa..785d7ed9f 100644 --- a/server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ClientDetailsEntityService.java +++ b/server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ClientDetailsEntityService.java @@ -1,7 +1,6 @@ package org.mitre.oauth2.service.impl; import java.util.Collection; -import java.util.List; import java.util.Set; import org.mitre.oauth2.model.ClientDetailsEntity; diff --git a/server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ProviderTokenService.java b/server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ProviderTokenService.java index dac2527a6..d641afd4c 100644 --- a/server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ProviderTokenService.java +++ b/server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ProviderTokenService.java @@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException; import org.springframework.security.core.AuthenticationException; +import org.springframework.security.oauth2.common.OAuth2AccessToken; import org.springframework.security.oauth2.common.exceptions.InvalidClientException; import org.springframework.security.oauth2.common.exceptions.InvalidTokenException; import org.springframework.security.oauth2.provider.AuthorizationRequest; @@ -327,4 +328,10 @@ public class DefaultOAuth2ProviderTokenService implements OAuth2TokenEntityServi } } + @Override + public OAuth2AccessToken readAccessToken(String accessToken) { + // TODO Auto-generated method stub + return null; + } + } diff --git a/server/src/main/java/org/mitre/oauth2/web/OAuthClientAPI.java b/server/src/main/java/org/mitre/oauth2/web/OAuthClientAPI.java index 8182df153..e9c2b036f 100644 --- a/server/src/main/java/org/mitre/oauth2/web/OAuthClientAPI.java +++ b/server/src/main/java/org/mitre/oauth2/web/OAuthClientAPI.java @@ -1,7 +1,6 @@ package org.mitre.oauth2.web; import java.util.Collection; -import java.util.List; import java.util.Set; import org.mitre.oauth2.exception.ClientNotFoundException; @@ -13,7 +12,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.authority.GrantedAuthorityImpl; +import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -22,7 +21,6 @@ import org.springframework.web.servlet.ModelAndView; import com.google.common.base.Function; import com.google.common.base.Splitter; import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; import com.google.common.collect.Sets; @Controller @@ -74,7 +72,7 @@ public class OAuthClientAPI { Iterables.transform(spaceDelimited.split(authorities), new Function() { @Override public GrantedAuthority apply(String auth) { - return new GrantedAuthorityImpl(auth); + return new SimpleGrantedAuthority(auth); } })); logger.info("apiAddClient - printing client details"); @@ -154,7 +152,7 @@ public class OAuthClientAPI { Iterables.transform(spaceDelimited.split(authorities), new Function() { @Override public GrantedAuthority apply(String auth) { - return new GrantedAuthorityImpl(auth); + return new SimpleGrantedAuthority(auth); } })); Set resourceIdSet = Sets.newHashSet(spaceDelimited.split(resourceIds)); diff --git a/server/src/main/java/org/mitre/oauth2/web/OAuthClientController.java b/server/src/main/java/org/mitre/oauth2/web/OAuthClientController.java index f96f67531..e6e9f064b 100644 --- a/server/src/main/java/org/mitre/oauth2/web/OAuthClientController.java +++ b/server/src/main/java/org/mitre/oauth2/web/OAuthClientController.java @@ -18,7 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.core.Authentication; import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.authority.GrantedAuthorityImpl; +import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.oauth2.provider.AuthorizationRequest; import org.springframework.security.oauth2.provider.OAuth2Authentication; @@ -106,7 +106,7 @@ public class OAuthClientController { public ModelAndView addClientPage(ModelAndView modelAndView) { Set auth = Sets.newHashSet(); - auth.add(new GrantedAuthorityImpl("ROLE_CLIENT")); + auth.add(new SimpleGrantedAuthority("ROLE_CLIENT")); ClientDetailsEntity client = ClientDetailsEntity.makeBuilder() .setScope(Sets.newHashSet("scope")) diff --git a/server/src/main/java/org/mitre/oauth2/web/OAuthConfirmationController.java b/server/src/main/java/org/mitre/oauth2/web/OAuthConfirmationController.java index f11b509c8..6b54db931 100644 --- a/server/src/main/java/org/mitre/oauth2/web/OAuthConfirmationController.java +++ b/server/src/main/java/org/mitre/oauth2/web/OAuthConfirmationController.java @@ -23,6 +23,7 @@ import org.springframework.web.servlet.ModelAndView; @SessionAttributes(types = AuthorizationRequest.class) public class OAuthConfirmationController { + @Autowired private ClientDetailsEntityService clientService; public OAuthConfirmationController() { @@ -61,7 +62,6 @@ public class OAuthConfirmationController { /** * @param clientService the clientService to set */ - @Autowired public void setClientService(ClientDetailsEntityService clientService) { this.clientService = clientService; } diff --git a/server/src/main/java/org/mitre/openid/connect/exception/ExpiredTokenException.java b/server/src/main/java/org/mitre/openid/connect/exception/ExpiredTokenException.java index 8e1bc075d..1f4970cb9 100644 --- a/server/src/main/java/org/mitre/openid/connect/exception/ExpiredTokenException.java +++ b/server/src/main/java/org/mitre/openid/connect/exception/ExpiredTokenException.java @@ -2,4 +2,9 @@ package org.mitre.openid.connect.exception; public class ExpiredTokenException extends RuntimeException { + /** + * + */ + private static final long serialVersionUID = 1L; + } diff --git a/server/src/main/java/org/mitre/openid/connect/exception/InvalidJwtIssuerException.java b/server/src/main/java/org/mitre/openid/connect/exception/InvalidJwtIssuerException.java index b7b625bb1..a40e69fe5 100644 --- a/server/src/main/java/org/mitre/openid/connect/exception/InvalidJwtIssuerException.java +++ b/server/src/main/java/org/mitre/openid/connect/exception/InvalidJwtIssuerException.java @@ -2,4 +2,9 @@ package org.mitre.openid.connect.exception; public class InvalidJwtIssuerException extends RuntimeException { + /** + * + */ + private static final long serialVersionUID = 1L; + } diff --git a/server/src/main/java/org/mitre/openid/connect/exception/InvalidJwtSignatureException.java b/server/src/main/java/org/mitre/openid/connect/exception/InvalidJwtSignatureException.java index 4b613bf6d..0a59ace8b 100644 --- a/server/src/main/java/org/mitre/openid/connect/exception/InvalidJwtSignatureException.java +++ b/server/src/main/java/org/mitre/openid/connect/exception/InvalidJwtSignatureException.java @@ -2,4 +2,9 @@ package org.mitre.openid.connect.exception; public class InvalidJwtSignatureException extends RuntimeException { + /** + * + */ + private static final long serialVersionUID = 1L; + } diff --git a/server/src/main/java/org/mitre/openid/connect/token/DummyIdTokenGeneratorService.java b/server/src/main/java/org/mitre/openid/connect/token/DummyIdTokenGeneratorService.java index 755b7d0eb..63278c966 100644 --- a/server/src/main/java/org/mitre/openid/connect/token/DummyIdTokenGeneratorService.java +++ b/server/src/main/java/org/mitre/openid/connect/token/DummyIdTokenGeneratorService.java @@ -4,7 +4,6 @@ import java.util.Date; import org.mitre.openid.connect.model.IdToken; import org.mitre.openid.connect.model.IdTokenClaims; -import org.mitre.util.Utility; import org.springframework.stereotype.Service; /** diff --git a/server/src/main/java/org/mitre/openid/connect/view/JwkKeyListView.java b/server/src/main/java/org/mitre/openid/connect/view/JwkKeyListView.java index af7794a0d..399f2919f 100644 --- a/server/src/main/java/org/mitre/openid/connect/view/JwkKeyListView.java +++ b/server/src/main/java/org/mitre/openid/connect/view/JwkKeyListView.java @@ -7,7 +7,6 @@ import java.io.Writer; import java.lang.reflect.Type; import java.math.BigInteger; import java.security.PublicKey; -import java.security.interfaces.DSAPublicKey; import java.security.interfaces.ECPublicKey; import java.security.interfaces.RSAPublicKey; import java.util.Map; @@ -81,6 +80,7 @@ public class JwkKeyListView extends AbstractView { return o; } else if (src instanceof ECPublicKey) { + @SuppressWarnings("unused") ECPublicKey ec = (ECPublicKey)src; // TODO: serialize the EC diff --git a/server/src/main/java/org/mitre/openid/connect/web/JsonWebKeyEndpoint.java b/server/src/main/java/org/mitre/openid/connect/web/JsonWebKeyEndpoint.java index b5abb363a..1973e1ded 100644 --- a/server/src/main/java/org/mitre/openid/connect/web/JsonWebKeyEndpoint.java +++ b/server/src/main/java/org/mitre/openid/connect/web/JsonWebKeyEndpoint.java @@ -1,8 +1,6 @@ package org.mitre.openid.connect.web; import java.security.PublicKey; -import java.security.interfaces.ECPublicKey; -import java.security.interfaces.RSAPublicKey; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/server/src/main/java/org/mitre/openid/connect/web/UserInfoEndpoint.java b/server/src/main/java/org/mitre/openid/connect/web/UserInfoEndpoint.java index e68d65934..d137b2953 100644 --- a/server/src/main/java/org/mitre/openid/connect/web/UserInfoEndpoint.java +++ b/server/src/main/java/org/mitre/openid/connect/web/UserInfoEndpoint.java @@ -1,8 +1,5 @@ package org.mitre.openid.connect.web; -import org.mitre.jwt.model.Jwt; -import org.mitre.jwt.model.JwtClaims; -import org.mitre.jwt.model.JwtHeader; import org.mitre.oauth2.model.ClientDetailsEntity; import org.mitre.oauth2.model.OAuth2AccessTokenEntity; import org.mitre.oauth2.service.OAuth2TokenEntityService; diff --git a/server/src/main/java/org/mitre/swd/view/JsonOpenIdConfigurationView.java b/server/src/main/java/org/mitre/swd/view/JsonOpenIdConfigurationView.java index e4dcc57f6..6182155e7 100644 --- a/server/src/main/java/org/mitre/swd/view/JsonOpenIdConfigurationView.java +++ b/server/src/main/java/org/mitre/swd/view/JsonOpenIdConfigurationView.java @@ -1,13 +1,11 @@ package org.mitre.swd.view; import java.io.Writer; -import java.lang.reflect.Type; import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.springframework.security.core.GrantedAuthority; import org.springframework.validation.BeanPropertyBindingResult; import org.springframework.web.servlet.view.AbstractView; @@ -15,10 +13,6 @@ import com.google.gson.ExclusionStrategy; import com.google.gson.FieldAttributes; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.google.gson.JsonElement; -import com.google.gson.JsonPrimitive; -import com.google.gson.JsonSerializationContext; -import com.google.gson.JsonSerializer; public class JsonOpenIdConfigurationView extends AbstractView { diff --git a/server/src/main/java/org/mitre/swd/view/SwdResponse.java b/server/src/main/java/org/mitre/swd/view/SwdResponse.java index 6097a9cfa..82d2b3bf4 100644 --- a/server/src/main/java/org/mitre/swd/view/SwdResponse.java +++ b/server/src/main/java/org/mitre/swd/view/SwdResponse.java @@ -4,13 +4,11 @@ package org.mitre.swd.view; import java.io.Writer; -import java.lang.reflect.Type; import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.springframework.security.core.GrantedAuthority; import org.springframework.validation.BeanPropertyBindingResult; import org.springframework.web.servlet.view.AbstractView; @@ -18,10 +16,6 @@ import com.google.gson.ExclusionStrategy; import com.google.gson.FieldAttributes; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.google.gson.JsonElement; -import com.google.gson.JsonPrimitive; -import com.google.gson.JsonSerializationContext; -import com.google.gson.JsonSerializer; /** * @author jricher diff --git a/server/src/main/java/org/mitre/util/jpa/JpaUtil.java b/server/src/main/java/org/mitre/util/jpa/JpaUtil.java index 9ce03c1b9..0f897d5e7 100644 --- a/server/src/main/java/org/mitre/util/jpa/JpaUtil.java +++ b/server/src/main/java/org/mitre/util/jpa/JpaUtil.java @@ -1,10 +1,10 @@ package org.mitre.util.jpa; -import org.springframework.dao.IncorrectResultSizeDataAccessException; -import org.springframework.transaction.annotation.Transactional; +import java.util.List; import javax.persistence.EntityManager; -import java.util.List; + +import org.springframework.dao.IncorrectResultSizeDataAccessException; /** * @author mfranklin diff --git a/server/src/main/webapp/resources/bootstrap/js/tests/unit/bootstrap-scrollspy.js b/server/src/main/webapp/resources/bootstrap/js/tests/unit/bootstrap-scrollspy.js index b9b309062..047bb7320 100644 --- a/server/src/main/webapp/resources/bootstrap/js/tests/unit/bootstrap-scrollspy.js +++ b/server/src/main/webapp/resources/bootstrap/js/tests/unit/bootstrap-scrollspy.js @@ -25,7 +25,7 @@ $(function () { + '' , $topbar = $(topbarHTML).topbar() - ok(topbar.find('.active', true) + ok(topbar.find('.active', true)) }) }) \ No newline at end of file diff --git a/spring-security-oauth b/spring-security-oauth index 2e7150fc0..5a784a9fb 160000 --- a/spring-security-oauth +++ b/spring-security-oauth @@ -1 +1 @@ -Subproject commit 2e7150fc0fd1307bc4adb33112bd9487e5b9715f +Subproject commit 5a784a9fb7ac11a46cc161e94676e62dac57c2c8