[FEDIZ-79] Encoding of SignInResponse configurable

git-svn-id: https://svn.apache.org/repos/asf/cxf/fediz/trunk@1574223 13f79535-47bb-0310-9956-ffa450edef68
apache · Mar 4, 2014 · 0fbe60a · 0fbe60a
1 parent 7c08ab9
commit 0fbe60a
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/plugins/jetty/src/main/java/org/apache/cxf/fediz/jetty/FederationAuthenticator.java b/plugins/jetty/src/main/java/org/apache/cxf/fediz/jetty/FederationAuthenticator.java
@@ -22,6 +22,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
 import java.security.cert.X509Certificate;
 
 import javax.servlet.ServletOutputStream;
@@ -83,6 +84,7 @@ public class FederationAuthenticator extends LoginAuthenticator {
 
     private String configFile;
     private FederationConfigurator configurator;
+    private String encoding = "UTF-8";
 
     public FederationAuthenticator() {
     }
@@ -130,14 +132,28 @@ public void setConfigFile(String configFile) {
         this.configFile = configFile;
     }
 
+    public String getEncoding() {
+        return encoding;
+    }
+
+    public void setEncoding(String encoding) {
+        this.encoding = encoding;
+    }
+
     /* ------------------------------------------------------------ */
     public Authentication validateRequest(ServletRequest req, ServletResponse res, boolean mandatory)
         throws ServerAuthException {
 
         if (!mandatory) {
             return new DeferredAuthentication(this);
         }
-
+
+        try {
+            req.setCharacterEncoding(this.encoding);
+        } catch (UnsupportedEncodingException ex) {
+            LOG.warn("Unsupported encoding '" + this.encoding + "'", ex);
+        }
+
         HttpServletRequest request = (HttpServletRequest)req;
         HttpServletResponse response = (HttpServletResponse)res;
         String uri = request.getRequestURI();

diff --git a/plugins/tomcat/src/main/java/org/apache/cxf/fediz/tomcat/FederationAuthenticator.java b/plugins/tomcat/src/main/java/org/apache/cxf/fediz/tomcat/FederationAuthenticator.java
@@ -76,6 +76,7 @@ public class FederationAuthenticator extends FormAuthenticator {
      */
     protected String configFile;
     protected boolean tokenExpirationValidation = true;
+    protected String encoding = "UTF-8";
 
     private FederationConfigurator configurator;
 
@@ -99,6 +100,14 @@ public void setConfigFile(String configFile) {
         this.configFile = configFile;
     }
 
+    public String getEncoding() {
+        return encoding;
+    }
+
+    public void setEncoding(String encoding) {
+        this.encoding = encoding;
+    }
+
     public boolean isTokenExpirationValidation() {
         return tokenExpirationValidation;
     }
@@ -166,6 +175,8 @@ public void invoke(Request request, Response response) throws IOException,
     ServletException {
 
         LOG.debug("WsFedAuthenticator:invoke()");
+        request.setCharacterEncoding(this.encoding);
+
         if (request.getRequestURL().indexOf(FederationConstants.METADATA_PATH_URI) != -1) {
             if (LOG.isInfoEnabled()) {
                 LOG.info("WS-Federation Metadata document requested");