[Dive4elements-commits] [PATCH 11 of 21] Pass trusted key filename to Response in WAS Authenticator

Wald Commits scm-commit at wald.intevation.org
Wed May 8 18:08:21 CEST 2013


# HG changeset patch
# User Bernhard Herzog <bh at intevation.de>
# Date 1368028574 -7200
# Node ID a96350a1c1608e628d39ce95844195adc9a83d18
# Parent  92da396f80d7a4c27ca5b1a0f9f5f5ebac9516e5
Pass trusted key filename to Response in WAS Authenticator.

diff -r 92da396f80d7 -r a96350a1c160 gwt-client/src/main/java/org/dive4elements/river/client/server/auth/was/Authenticator.java
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/auth/was/Authenticator.java	Wed May 08 17:56:14 2013 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/auth/was/Authenticator.java	Wed May 08 17:56:14 2013 +0200
@@ -62,7 +62,10 @@
                     return null;
                 }
                 else {
-                    return new Response(entity, username, password, features);
+                    String trustedKey =
+                    (String)context.getInitParameter("saml-trusted-public-key");
+                    return new Response(entity, username, password, features,
+                                        context.getRealPath(trustedKey));
                 }
             }
             catch(GeneralSecurityException e) {
diff -r 92da396f80d7 -r a96350a1c160 gwt-client/src/main/java/org/dive4elements/river/client/server/auth/was/Response.java
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/auth/was/Response.java	Wed May 08 17:56:14 2013 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/auth/was/Response.java	Wed May 08 17:56:14 2013 +0200
@@ -39,7 +39,9 @@
     private Features features;
 
 
-    public Response(HttpEntity entity, String username, String password, Features features) throws AuthenticationException, IOException {
+    public Response(HttpEntity entity, String username, String password,
+                    Features features, String trustedKeyFile)
+        throws AuthenticationException, IOException {
 
         if (entity == null) {
             throw new ServiceException("Invalid response");


More information about the Dive4elements-commits mailing list