github
/
OpenID-Connect-Java-Spring-Server
mirror of https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

wiring configuration

pull/263/head
Justin Richer 2013-01-15 13:53:46 -05:00
parent 4262be1fd3
commit c17bc05b0e
4 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openid-connect-server/src/main/java/org/mitre/openid/connect/ConnectAuthorizationRequestManager.java
View File

@ -25,7 +25,7 @@ import org.springframework.security.oauth2.provider.ClientDetailsService;
import org.springframework.security.oauth2.provider.DefaultAuthorizationRequest; import org.springframework.security.oauth2.provider.DefaultAuthorizationRequest;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@Component @Component("authorizationRequestManager")
public class ConnectAuthorizationRequestManager implements AuthorizationRequestManager, InitializingBean { public class ConnectAuthorizationRequestManager implements AuthorizationRequestManager, InitializingBean {
private static Logger logger = LoggerFactory.getLogger(ConnectAuthorizationRequestManager.class); private static Logger logger = LoggerFactory.getLogger(ConnectAuthorizationRequestManager.class);

2
openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultNonceService.java
View File

@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@Service @Service("defaultNonceService")
public class DefaultNonceService implements NonceService { public class DefaultNonceService implements NonceService {
private static Logger logger = LoggerFactory.getLogger(NonceService.class); private static Logger logger = LoggerFactory.getLogger(NonceService.class);

3
openid-connect-server/src/main/java/org/mitre/openid/connect/token/TofuUserApprovalHandler.java
View File

@ -32,8 +32,8 @@ import org.springframework.security.oauth2.provider.ClientDetails;
import org.springframework.security.oauth2.provider.ClientDetailsService; import org.springframework.security.oauth2.provider.ClientDetailsService;
import org.springframework.security.oauth2.provider.DefaultAuthorizationRequest; import org.springframework.security.oauth2.provider.DefaultAuthorizationRequest;
import org.springframework.security.oauth2.provider.approval.UserApprovalHandler; import org.springframework.security.oauth2.provider.approval.UserApprovalHandler;
import org.springframework.stereotype.Component;
import com.google.common.base.Splitter;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
@ -52,6 +52,7 @@ import com.google.common.collect.Sets;
* @author aanganes * @author aanganes
* *
*/ */
@Component("tofuUserApprovalHandler")
public class TofuUserApprovalHandler implements UserApprovalHandler { public class TofuUserApprovalHandler implements UserApprovalHandler {
@Autowired @Autowired

30
openid-connect-server/src/main/webapp/WEB-INF/application-context.xml
View File

@ -107,7 +107,7 @@
client-details-service-ref="defaultOAuth2ClientDetailsEntityService" client-details-service-ref="defaultOAuth2ClientDetailsEntityService"
authorization-request-manager-ref="authorizationRequestManager" authorization-request-manager-ref="authorizationRequestManager"
token-services-ref="defaultOAuth2ProviderTokenService" token-services-ref="defaultOAuth2ProviderTokenService"
user-approval-handler-ref="jdbcUserApprovalHandler" user-approval-handler-ref="tofuUserApprovalHandler"
authorization-endpoint-url="/authorize" authorization-endpoint-url="/authorize"
token-endpoint-url="/token"> token-endpoint-url="/token">
@ -135,10 +135,6 @@
<property name="authenticationManager" ref="clientAuthenticationManager" /> <property name="authenticationManager" ref="clientAuthenticationManager" />
<property name="filterProcessesUrl" value="/revoke"/> <property name="filterProcessesUrl" value="/revoke"/>
</bean> </bean>
<authentication-manager id="clientAuthenticationManager" xmlns="http://www.springframework.org/schema/security">
<authentication-provider user-service-ref="clientUserDetailsService" />
</authentication-manager>
<!-- A JodaTime Period for the nonce storage duration. Constructor takes (hours, minutes, seconds, milliseconds). --> <!-- A JodaTime Period for the nonce storage duration. Constructor takes (hours, minutes, seconds, milliseconds). -->
<bean id="nonceStorageDurationPeriod" class="org.joda.time.Period"> <bean id="nonceStorageDurationPeriod" class="org.joda.time.Period">
@ -149,18 +145,24 @@
</bean> </bean>
<bean id="authorizationRequestManager" class="org.mitre.openid.connect.ConnectAuthorizationRequestManager"> <bean id="authorizationRequestManager" class="org.mitre.openid.connect.ConnectAuthorizationRequestManager">
<constructor-arg> <property name="nonceStorageDuration" ref="nonceStorageDurationPeriod" />
<bean class="org.mitre.oauth2.service.impl.DefaultOAuth2ClientDetailsEntityService" /> </bean>
</constructor-arg>
<constructor-arg> <bean id="clientAssertiontokenEndpointFilter" class="org.mitre.openid.connect.assertion.JwtBearerClientAssertionTokenEndpointFilter">
<bean class="org.mitre.openid.connect.service.impl.DefaultNonceService" /> <property name="authenticationManager" ref="clientAssertionAuthenticationManager" />
</constructor-arg> <property name="filterProcessesUrl" value="/token" />
<property name="nonceStorageDuration" ref="nonceStorageDurationPeriod"/>
</bean> </bean>
<bean class="org.mitre.openid.connect.token.TofuUserApprovalHandler" id="jdbcUserApprovalHandler"> <security:authentication-manager id="clientAuthenticationManager">
</bean> <security:authentication-provider user-service-ref="clientUserDetailsService" />
</security:authentication-manager>
<security:authentication-manager id="clientAssertionAuthenticationManager">
<security:authentication-provider ref="clientAssertionAuthenticationProvider" />
</security:authentication-manager>
<bean id="clientAssertionAuthenticationProvider" class="org.mitre.openid.connect.assertion.JwtBearerAuthenticationProvider" />
<!-- user services --> <!-- user services -->
<import resource="user-context.xml" /> <import resource="user-context.xml" />