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

Commit ff184f1

Browse files
author
Dominik František Bučík
committed
feat: 🎸 Return samlError from token in devicecode
BREAKING CHANGE: requires DB update
1 parent e605eaa commit ff184f1

File tree

18 files changed

+342
-137
lines changed

18 files changed

+342
-137
lines changed

‎perun-oidc-server-webapp/src/main/resources/db/mysql/v11.0.0.sql‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ALTER TABLE device_code ADD recorded_error TEXT DEFAULT NULL;

‎perun-oidc-server-webapp/src/main/resources/db/psql/v11.0.0.sql‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ALTER TABLE device_code ADD COLUMN recorded_error TEXT DEFAULT NULL;

‎perun-oidc-server-webapp/src/main/resources/localization/messages_cs.properties‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,3 +184,7 @@ login_success_msg=Byl(a) jste \u00FAsp\u011B\u0161n\u011B p\u0159ihl\u00E1\u0161
184184
logout_denied_title=Odhl\u00E1\u0161en\u00ED zru\u0161eno
185185
logout_denied_header=Odhl\u00E1\u0161en\u00ED zru\u0161eno
186186
logout_denied_msg=Proces odhl\u00E1\u0161en\u00ED byl zastaven.
187+
188+
# Device flow error
189+
device_flow_error_header=Do\u0161lo ke chyb\u011B
190+
device_flow_error_message=P\u0159i schv\u00E1len\u00ED p\u0159\u00EDstupu aplikace/za\u0159\u00EDzen\u00ED k informac\u00EDm pod Va\u0161\u00ED identitou do\u0161lo ke chyb\u011B. Pro v\u00EDce informac\u00ED se vra\u0165te do aplikace, kter\u00E1 tento proces iniciovala.

‎perun-oidc-server-webapp/src/main/resources/localization/messages_en.properties‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,3 +184,6 @@ logout_denied_title=Logout denied
184184
logout_denied_header=Logout canceled
185185
logout_denied_msg=You have canceled the logout process.
186186

187+
# Device flow error
188+
device_flow_error_header=Ooops, there was an error
189+
device_flow_error_message=There was an error in the approval process. To see the details, please get back to the application which has initiated your login.

‎perun-oidc-server-webapp/src/main/webapp/WEB-INF/views/device_flow_error.jsp‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" trimDirectiveWhitespaces="true" %>
2+
<%@ page import="java.util.ArrayList" %>
3+
<%@ page import="java.util.List" %>
4+
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
5+
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
6+
<%@ taglib prefix="t" tagdir="/WEB-INF/tags/common" %>
7+
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
8+
9+
<%
10+
11+
List<String> cssLinks = new ArrayList<>();
12+
13+
pageContext.setAttribute("cssLinks", cssLinks);
14+
15+
%>
16+
17+
<spring:message code="device_flow_error_header" var="title"/>
18+
<t:header title="${title}" reqURL="${reqURL}" baseURL="${baseURL}" cssLinks="${cssLinks}" theme="${theme}"/>
19+
20+
<h1><spring:message code="device_flow_error_header"/></h1>
21+
22+
</div> <%-- header --%>
23+
24+
<div id="content">
25+
<p><spring:message code="device_flow_error_message"/></p>
26+
</div>
27+
</div><!-- wrap -->
28+
29+
<t:footer baseURL="${baseURL}" theme="${theme}"/>

‎perun-oidc-server-webapp/src/main/webapp/WEB-INF/views/lsaai/device_flow_error.jsp‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<%@ page contentType="text/html; charset=utf-8" pageEncoding="utf-8"%>
2+
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
3+
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
4+
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
5+
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
6+
<%@ taglib prefix="ls" tagdir="/WEB-INF/tags/lsaai" %>
7+
8+
<ls:header />
9+
10+
<h3><spring:message code="device_flow_error_header"/></h3>
11+
<p><spring:message code="device_flow_error_message"/></p>
12+
13+
<ls:footer/>

‎perun-oidc-server/src/main/java/cz/muni/ics/oauth2/model/DeviceCode.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,14 @@
2323
import static cz.muni.ics.oauth2.model.DeviceCode.QUERY_BY_USER_CODE;
2424
import static cz.muni.ics.oauth2.model.DeviceCode.QUERY_EXPIRED_BY_DATE;
2525

26+
import cz.muni.ics.oauth2.model.convert.ExtendedOAuth2ExceptionConverter;
27+
import cz.muni.ics.oidc.saml.ExtendedOAuth2Exception;
2628
import java.util.Date;
2729
import java.util.Map;
2830
import java.util.Set;
2931
import javax.persistence.CollectionTable;
3032
import javax.persistence.Column;
33+
import javax.persistence.Convert;
3134
import javax.persistence.ElementCollection;
3235
import javax.persistence.Entity;
3336
import javax.persistence.FetchType;
@@ -121,6 +124,10 @@ public class DeviceCode {
121124
@JoinColumn(name = "auth_holder_id")
122125
private AuthenticationHolderEntity authenticationHolder;
123126

127+
@Column(name = "recorded_error")
128+
@Convert(converter = ExtendedOAuth2ExceptionConverter.class)
129+
private ExtendedOAuth2Exception error;
130+
124131
public DeviceCode(String deviceCode,
125132
String userCode,
126133
Set<String> scope,

‎perun-oidc-server/src/main/java/cz/muni/ics/oauth2/model/convert/ExtendedOAuth2ExceptionConverter.java‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
/*******************************************************************************
2+
* Copyright 2018 The MIT Internet Trust Consortium
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*******************************************************************************/
16+
17+
package cz.muni.ics.oauth2.model.convert;
18+
19+
import cz.muni.ics.oidc.saml.ExtendedOAuth2Exception;
20+
import javax.persistence.AttributeConverter;
21+
import javax.persistence.Converter;
22+
import lombok.extern.slf4j.Slf4j;
23+
24+
/**
25+
* Translates a Serializable object of certain primitive types
26+
* into a String for storage in the database, for use with the
27+
* OAuth2Request extensions map.
28+
*
29+
* This class does allow some extension data to be lost.
30+
*
31+
* @author jricher
32+
*/
33+
@Converter
34+
@Slf4j
35+
public class ExtendedOAuth2ExceptionConverter implements AttributeConverter<ExtendedOAuth2Exception, String> {
36+
37+
@Override
38+
public String convertToDatabaseColumn(ExtendedOAuth2Exception attribute) {
39+
return ExtendedOAuth2Exception.serialize(attribute);
40+
}
41+
42+
@Override
43+
public ExtendedOAuth2Exception convertToEntityAttribute(String dbData) {
44+
return ExtendedOAuth2Exception.deserialize(dbData);
45+
}
46+
47+
}

‎perun-oidc-server/src/main/java/cz/muni/ics/oauth2/service/DeviceCodeService.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
import cz.muni.ics.oauth2.exception.DeviceCodeCreationException;
2020
import cz.muni.ics.oauth2.model.ClientDetailsEntity;
2121
import cz.muni.ics.oauth2.model.DeviceCode;
22+
import cz.muni.ics.oidc.saml.ExtendedOAuth2Exception;
23+
import cz.muni.ics.oidc.saml.SamlAuthenticationExceptionAuthenticationToken;
2224
import java.util.Map;
2325
import java.util.Set;
2426
import org.springframework.security.oauth2.provider.ClientDetails;
@@ -40,4 +42,6 @@ public interface DeviceCodeService {
4042
DeviceCode createNewDeviceCode(Set<String> requestedScopes, ClientDetailsEntity client, Map<String, String> parameters) throws DeviceCodeCreationException;
4143

4244
void clearExpiredDeviceCodes();
45+
46+
void addErrorToCode(String userCode, ExtendedOAuth2Exception exc);
4347
}

‎perun-oidc-server/src/main/java/cz/muni/ics/oauth2/service/impl/DefaultDeviceCodeService.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,16 @@
1616

1717
package cz.muni.ics.oauth2.service.impl;
1818

19+
import com.fasterxml.jackson.core.JsonProcessingException;
20+
import com.fasterxml.jackson.databind.ObjectMapper;
1921
import cz.muni.ics.data.AbstractPageOperationTemplate;
2022
import cz.muni.ics.oauth2.model.AuthenticationHolderEntity;
2123
import cz.muni.ics.oauth2.model.ClientDetailsEntity;
2224
import cz.muni.ics.oauth2.model.DeviceCode;
2325
import cz.muni.ics.oauth2.repository.impl.DeviceCodeRepository;
2426
import cz.muni.ics.oauth2.service.DeviceCodeService;
27+
import cz.muni.ics.oidc.saml.ExtendedOAuth2Exception;
28+
import cz.muni.ics.oidc.saml.SamlAuthenticationExceptionAuthenticationToken;
2529
import java.util.Collection;
2630
import java.util.Date;
2731
import java.util.Map;
@@ -153,4 +157,10 @@ public void clearDeviceCode(String deviceCode, ClientDetails client) {
153157

154158
}
155159

160+
@Override
161+
public void addErrorToCode(String userCode, ExtendedOAuth2Exception exc) {
162+
DeviceCode deviceCode = lookUpByUserCode(userCode);
163+
deviceCode.setError(exc);
164+
repository.save(deviceCode);
165+
}
156166
}

0 commit comments

Comments
 (0)