Skip to content
This repository has been archived by the owner on Sep 28, 2022. It is now read-only.

Commit

Permalink
Merge pull request #115 from CESNET/merge_controllers
Browse files Browse the repository at this point in the history 
refactor: Merged some controllers
  • Loading branch information
Dominik František Bučík authored Jan 6, 2022
2 parents 3cf3478 + e8b34f9 commit 7877e18
Show file tree
Hide file tree
Showing 25 changed files with 577 additions and 602 deletions.
10 changes: 6 additions & 4 deletions perun-oidc-server-webapp/src/main/webapp/WEB-INF/application-context.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,12 @@
<mvc:exclude-mapping path="/#{T(cz.muni.ics.openid.connect.web.ProtectedResourceRegistrationEndpoint).URL}/**" />
<mvc:exclude-mapping path="/#{T(cz.muni.ics.openid.connect.web.UserInfoEndpoint).URL}**" />
<mvc:exclude-mapping path="/#{T(cz.muni.ics.openid.connect.web.RootController).API_URL}/**" />
<mvc:exclude-mapping path="/#{T(cz.muni.ics.oauth2.web.DeviceEndpoint).URL}/**" />
<mvc:exclude-mapping path="#{T(cz.muni.ics.oauth2.web.DeviceEndpoint).ENDPOINT_URL}**" />
<mvc:exclude-mapping path="#{T(cz.muni.ics.oauth2.web.DeviceEndpoint).REQUEST_USER_CODE_URL}**" />
<mvc:exclude-mapping path="#{T(cz.muni.ics.oauth2.web.DeviceEndpoint).DEVICE_APPROVED_URL}**" />
<mvc:exclude-mapping path="/#{T(cz.muni.ics.oauth2.web.IntrospectionEndpoint).URL}**" />
<mvc:exclude-mapping path="/#{T(cz.muni.ics.oauth2.web.RevocationEndpoint).URL}**" />

<!-- Inject the UserInfo into the response -->
<ref bean="userInfoInterceptor"/>
</mvc:interceptor>
Expand All @@ -83,7 +85,7 @@
<mvc:exclude-mapping path="/#{T(cz.muni.ics.openid.connect.web.ProtectedResourceRegistrationEndpoint).URL}/**" />
<mvc:exclude-mapping path="/#{T(cz.muni.ics.openid.connect.web.UserInfoEndpoint).URL}**" />
<mvc:exclude-mapping path="/#{T(cz.muni.ics.openid.connect.web.RootController).API_URL}/**" />
<mvc:exclude-mapping path="/#{T(cz.muni.ics.oauth2.web.DeviceEndpoint).URL}/**" />
<mvc:exclude-mapping path="#{T(cz.muni.ics.oauth2.web.DeviceEndpoint).ENDPOINT_URL}**" />
<mvc:exclude-mapping path="/#{T(cz.muni.ics.oauth2.web.IntrospectionEndpoint).URL}**" />
<mvc:exclude-mapping path="/#{T(cz.muni.ics.oauth2.web.RevocationEndpoint).URL}**" />
<!-- Inject the server configuration into the response -->
Expand Down Expand Up @@ -189,7 +191,7 @@
<security:csrf disabled="true"/>
</security:http>

<security:http pattern="/#{T(cz.muni.ics.oauth2.web.DeviceEndpoint).URL}/**"
<security:http pattern="#{T(cz.muni.ics.oauth2.web.DeviceEndpoint).ENDPOINT_URL}**"
use-expressions="true"
entry-point-ref="oauthAuthenticationEntryPoint"
create-session="stateless"
Expand Down
8 changes: 5 additions & 3 deletions perun-oidc-server-webapp/src/main/webapp/WEB-INF/user-context.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@
<mvc:exclude-mapping path="/#{T(cz.muni.ics.openid.connect.web.ProtectedResourceRegistrationEndpoint).URL}/**" />
<mvc:exclude-mapping path="/#{T(cz.muni.ics.openid.connect.web.UserInfoEndpoint).URL}**" />
<mvc:exclude-mapping path="/#{T(cz.muni.ics.openid.connect.web.RootController).API_URL}/**" />
<mvc:exclude-mapping path="/#{T(cz.muni.ics.oauth2.web.DeviceEndpoint).URL}/**" />
<mvc:exclude-mapping path="#{T(cz.muni.ics.oauth2.web.DeviceEndpoint).ENDPOINT_URL}**" />
<mvc:exclude-mapping path="#{T(cz.muni.ics.oauth2.web.DeviceEndpoint).REQUEST_USER_CODE_URL}**" />
<mvc:exclude-mapping path="#{T(cz.muni.ics.oauth2.web.DeviceEndpoint).DEVICE_APPROVED_URL}**" />
<mvc:exclude-mapping path="/#{T(cz.muni.ics.oauth2.web.IntrospectionEndpoint).URL}**" />
<mvc:exclude-mapping path="/#{T(cz.muni.ics.oauth2.web.RevocationEndpoint).URL}**" />
<mvc:exclude-mapping path="#{T(cz.muni.ics.oidc.web.controllers.IsTestSpController).MAPPING}**" />
Expand Down Expand Up @@ -82,7 +84,7 @@
<mvc:exclude-mapping path="/#{T(cz.muni.ics.openid.connect.web.ProtectedResourceRegistrationEndpoint).URL}/**" />
<mvc:exclude-mapping path="/#{T(cz.muni.ics.openid.connect.web.UserInfoEndpoint).URL}**" />
<mvc:exclude-mapping path="/#{T(cz.muni.ics.openid.connect.web.RootController).API_URL}/**" />
<mvc:exclude-mapping path="/#{T(cz.muni.ics.oauth2.web.DeviceEndpoint).URL}/**" />
<mvc:exclude-mapping path="#{T(cz.muni.ics.oauth2.web.DeviceEndpoint).ENDPOINT_URL}**" />
<mvc:exclude-mapping path="/#{T(cz.muni.ics.oauth2.web.IntrospectionEndpoint).URL}**" />
<mvc:exclude-mapping path="/#{T(cz.muni.ics.oauth2.web.RevocationEndpoint).URL}**" />
<!-- Inject the server configuration into the response -->
Expand Down Expand Up @@ -495,13 +497,13 @@
<!-- SAML -->

<bean id="clearSessionFilter" class="cz.muni.ics.oidc.saml.SamlInvalidateSessionFilter">
<constructor-arg name="pattern" value="/authorize**"/>
<constructor-arg name="oidcIssuer" value="${main.oidc.issuer.url}"/>
<constructor-arg name="idpEntityId" value="${saml.idp.defaultIdpEntityId}"/>
<constructor-arg name="proxySpEntityId" value="${saml.proxy.spEntityId}"/>
<constructor-arg name="internalReferrers" value="#{'${saml.internalReferrers}'.split('\s*,\s*')}"/>
<constructor-arg name="contextLogoutHandler" ref="logoutHandler"/>
</bean>

<bean id="samlDiscovery" class="org.springframework.security.saml.SAMLDiscovery">
<property name="contextProvider" ref="samlContextProvider"/>
<property name="samlEntryPoint" ref="samlEntryPoint"/>
Expand Down
2 changes: 1 addition & 1 deletion perun-oidc-server-webapp/src/main/webapp/WEB-INF/views/approveDevice.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
</h1>

<form name="confirmationForm"
action="${ config.issuer }${ config.issuer.endsWith('/') ? '' : '/' }device/approve" method="post">
action="${ config.issuer }${ config.issuer.endsWith('/') ? '' : '/' }device/approved" method="post">

<div class="row">
<div class="span5 offset1 well-small" style="text-align: left">
Expand Down
5 changes: 3 additions & 2 deletions perun-oidc-server-webapp/src/main/webapp/WEB-INF/views/requestUserCode.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,15 @@
</c:if>


<form action="${ config.issuer }${ config.issuer.endsWith('/') ? '' : '/' }device/verify" method="POST">
<form action="${ config.issuer }${ config.issuer.endsWith('/') ? '' : '/' }device/code" method="POST">

<div class="row-fluid">
<div class="span12">
<spring:message code="device.request_code.submit" var="authorize_label"/>
<div>
<div class="input-block-level input-xlarge">
<input type="text" name="user_code" placeholder="code" autocorrect="off" autocapitalize="off" autocomplete="off" spellcheck="false" value="" />
<input type="text" name="user_code" placeholder="code" autocorrect="off"
autocapitalize="off" autocomplete="off" spellcheck="false" value="${user_code}" />
</div>
</div>
<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}" />
Expand Down
2 changes: 1 addition & 1 deletion perun-oidc-server-webapp/src/main/webapp/WEB-INF/views/themedApproveDevice.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<div id="content">
<c:remove scope="session" var="SPRING_SECURITY_LAST_EXCEPTION" />
<form name="confirmationForm"
action="${ config.issuer }${ config.issuer.endsWith('/') ? '' : '/' }device/approve" method="post">
action="${ config.issuer }${ config.issuer.endsWith('/') ? '' : '/' }device/approved" method="post">
<p>
<c:if test="${not empty client.policyUri}">
<spring:message code="device_approve_privacy"/>${" "}<a target='_blank' href='${fn:escapeXml(client.policyUri)}'><em>${fn:escapeXml(client.clientName)}</em></a>
Expand Down
2 changes: 1 addition & 1 deletion perun-oidc-server-webapp/src/main/webapp/WEB-INF/views/themedDeviceApproved.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ pageContext.setAttribute("cssLinks", cssLinks);
</c:if>
${". "}<spring:message code="device_approved_text_rejected_end"/>
</c:if>
</p>q
</p>
</div>

</div> <%-- wrap --%>
Expand Down
6 changes: 3 additions & 3 deletions perun-oidc-server-webapp/src/main/webapp/WEB-INF/views/themedRequestUserCode.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,15 @@
</c:otherwise>
</c:choose>

<form name="confirmationForm" class="mt-2" method="post"
action="${ config.issuer }${ config.issuer.endsWith('/') ? '' : '/' }device/verify">
<form name="confirmationForm" class="mt-2" method="POST"
action="${ config.issuer }${ config.issuer.endsWith('/') ? '' : '/' }device/code">
<div class="row-fluid">
<div class="span12">
<div>
<div class="input-block-level input-xlarge">
<spring:message code="code" var="code_placeholder"/>
<input type="text" name="user_code" placeholder="${code_placeholder}"
autocapitalize="off" autocomplete="off" spellcheck="false" value="" />
autocapitalize="off" autocomplete="off" spellcheck="false" value="${user_code}" />
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion perun-oidc-server/src/main/java/cz/muni/ics/discovery/web/DiscoveryEndpoint.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ OPTIONAL. JSON array containing a list of the JWS signing algorithms (alg values

m.put("code_challenge_methods_supported", Lists.newArrayList(PKCEAlgorithm.plain.getName(), PKCEAlgorithm.S256.getName()));

m.put("device_authorization_endpoint", baseUrl + DeviceEndpoint.URL);
m.put("device_authorization_endpoint", config.getIssuer(false) + DeviceEndpoint.ENDPOINT_URL);

model.addAttribute(JsonEntityView.ENTITY, m);

Expand Down
15 changes: 15 additions & 0 deletions perun-oidc-server/src/main/java/cz/muni/ics/oauth2/model/ClientWithScopes.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package cz.muni.ics.oauth2.model;

import lombok.Getter;
import lombok.Setter;

import java.util.Set;

@Getter
@Setter
public class ClientWithScopes {

private ClientDetailsEntity client;
private Set<String> requestedScopes;

}
Loading

0 comments on commit 7877e18

Please sign in to comment.