Merge pull request #70 from dBucik/bbmri_ga4gh_passports

Bbmri ga4gh passports
CESNET · Dec 6, 2021 · faa7260 · faa7260
2 parents 698777f + b9f5c4d
commit faa7260
Show file tree

Hide file tree

Showing 13 changed files with 1,055 additions and 629 deletions.
diff --git a/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/common/attributesConsent.tag b/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/common/attributesConsent.tag
@@ -1,5 +1,5 @@
 <%@ tag pageEncoding="UTF-8" trimDirectiveWhitespaces="true"
-        import="cz.muni.ics.oidc.server.elixir.GA4GHClaimSource" %>
+        import="cz.muni.ics.oidc.server.ga4gh.Ga4ghPassportAndVisaClaimSource" %>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <%@ taglib prefix="o" tagdir="/WEB-INF/tags" %>
@@ -53,7 +53,7 @@
                                             <c:forEach var="subValue" items="${claim.value}">
                                                 <c:choose>
                                                     <c:when test="${claim.key=='ga4gh_passport_v1'}">
-                                                        <li><%= GA4GHClaimSource.parseAndVerifyVisa(
+                                                        <li><%= Ga4ghPassportAndVisaClaimSource.parseAndVerifyVisa(
                                                                 (String) jspContext.findAttribute("subValue")).getPrettyString() %></li>
                                                     </c:when>
                                                     <c:otherwise>

diff --git a/perun-oidc-server-webapp/src/main/webapp/WEB-INF/views/themedApproveDevice.jsp b/perun-oidc-server-webapp/src/main/webapp/WEB-INF/views/themedApproveDevice.jsp
@@ -1,4 +1,4 @@
-<%@ page import="cz.muni.ics.oidc.server.elixir.GA4GHClaimSource" %>
+<%@ page import="cz.muni.ics.oidc.server.ga4gh.ElixirGa4ghClaimSource" %>
 <%@ page import="java.util.ArrayList" %>
 <%@ page import="java.util.List" %>
 <%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" trimDirectiveWhitespaces="true"%>

diff --git a/...c/server/elixir/AddHeaderInterceptor.java → ...ics/oidc/server/AddHeaderInterceptor.java b/...c/server/elixir/AddHeaderInterceptor.java → ...ics/oidc/server/AddHeaderInterceptor.java
@@ -1,4 +1,4 @@
-package cz.muni.ics.oidc.server.elixir;
+package cz.muni.ics.oidc.server;
 
 import java.io.IOException;
 import org.springframework.http.HttpRequest;
@@ -12,12 +12,12 @@
  *
  * @author Martin Kuba <[email protected]>
  */
-class AddHeaderInterceptor implements ClientHttpRequestInterceptor {
+public class AddHeaderInterceptor implements ClientHttpRequestInterceptor {
 
 	private final String header;
 	private final String value;
 
-	AddHeaderInterceptor(String header, String value) {
+	public AddHeaderInterceptor(String header, String value) {
 		this.header = header;
 		this.value = value;
 	}

diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/oidc/server/claims/ClaimSourceInitContext.java b/perun-oidc-server/src/main/java/cz/muni/ics/oidc/server/claims/ClaimSourceInitContext.java
@@ -41,6 +41,17 @@ public String getProperty(String suffix, String defaultValue) {
 		return properties.getProperty(propertyPrefix + "." + suffix, defaultValue);
 	}
 
+	public Long getLongProperty(String suffix, Long defaultValue) {
+		String propKey = propertyPrefix + '.' + suffix;
+		String prop = properties.getProperty(propertyPrefix + "." + suffix);
+		try {
+			return Long.parseLong(prop);
+		} catch (NumberFormatException e) {
+			log.warn("Could not parse value '{}' for property '{}' as Long", prop, propKey);
+		}
+		return defaultValue;
+	}
+
 	public JWTSigningAndValidationService getJwtService() {
 		return jwtService;
 	}