diff gwt-client/src/main/java/org/dive4elements/river/client/server/SamlServlet.java @ 9747:cfc0aab9947f 3.2.x

Enable bind-mounting client configuration in docker container
author Tom Gottfried <tom@intevation.de>
date Mon, 05 Sep 2022 17:55:32 +0200
parents 0a5239a1e46e
children
line wrap: on
line diff
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/SamlServlet.java	Tue Aug 30 15:02:10 2022 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/SamlServlet.java	Mon Sep 05 17:55:32 2022 +0200
@@ -8,6 +8,7 @@
 
 package org.dive4elements.river.client.server;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.StringBufferInputStream;
@@ -71,12 +72,14 @@
 
         Assertion assertion = null;
         try {
-            String keyfile =
-                (String)sc.getInitParameter("saml-trusted-public-key");
+            File keyfile = new File(
+                sc.getInitParameter("saml-trusted-public-key"));
+            String path = keyfile.isAbsolute()
+                ? keyfile.getPath()
+                : sc.getRealPath(keyfile.getPath());
             int timeEps = Integer.parseInt(
                 sc.getInitParameter("saml-time-tolerance"));
-            TicketValidator validator =
-                new TicketValidator(sc.getRealPath(keyfile), timeEps);
+            TicketValidator validator = new TicketValidator(path, timeEps);
 
             InputStream in = new StringBufferInputStream(samlTicketXML);
             assertion = validator.checkTicket(new Base64InputStream(in));

http://dive4elements.wald.intevation.org