Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D2ACF11E5D for ; Mon, 1 Sep 2014 13:29:14 +0000 (UTC) Received: (qmail 97104 invoked by uid 500); 1 Sep 2014 13:29:14 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 97045 invoked by uid 500); 1 Sep 2014 13:29:14 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 97036 invoked by uid 99); 1 Sep 2014 13:29:14 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Sep 2014 13:29:14 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 73E1A95788B; Mon, 1 Sep 2014 13:29:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: coheigea@apache.org To: commits@cxf.apache.org Message-Id: <4b6fa4fa173a4e51bd924d1f304cd0ed@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: Avoid manual use of URLDecoder - thanks to Sergey Date: Mon, 1 Sep 2014 13:29:14 +0000 (UTC) Repository: cxf-fediz Updated Branches: refs/heads/master 7078bdc7f -> 4f9c2beca Avoid manual use of URLDecoder - thanks to Sergey Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/4f9c2bec Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/4f9c2bec Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/4f9c2bec Branch: refs/heads/master Commit: 4f9c2becafb618ca7e7a9ff1e4174871d62d06d5 Parents: 7078bdc Author: Colm O hEigeartaigh Authored: Mon Sep 1 14:28:58 2014 +0100 Committer: Colm O hEigeartaigh Committed: Mon Sep 1 14:28:58 2014 +0100 ---------------------------------------------------------------------- .../cxf/fediz/cxf/plugin/FedizRedirectBindingFilter.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/4f9c2bec/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/plugin/FedizRedirectBindingFilter.java ---------------------------------------------------------------------- diff --git a/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/plugin/FedizRedirectBindingFilter.java b/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/plugin/FedizRedirectBindingFilter.java index c927588..438f615 100644 --- a/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/plugin/FedizRedirectBindingFilter.java +++ b/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/plugin/FedizRedirectBindingFilter.java @@ -21,7 +21,6 @@ package org.apache.cxf.fediz.cxf.plugin; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URI; -import java.net.URLDecoder; import java.security.cert.X509Certificate; import java.util.Collections; import java.util.Date; @@ -84,7 +83,7 @@ public class FedizRedirectBindingFilter extends AbstractServiceProviderFilter { params = context.getUriInfo().getQueryParameters(); } else if (HttpMethod.POST.equals(httpMethod)) { String strForm = IOUtils.toString(context.getEntityStream()); - params = JAXRSUtils.getStructuredParams(strForm, "&", false, false); + params = JAXRSUtils.getStructuredParams(strForm, "&", true, false); } if (isSignInRequired(fedConfig, params)) { @@ -236,10 +235,7 @@ public class FedizRedirectBindingFilter extends AbstractServiceProviderFilter { private String getResponseToken(FedizContext fedConfig, MultivaluedMap params) throws IOException { if (params != null && fedConfig.getProtocol() instanceof FederationProtocol) { - String result = params.getFirst(FederationConstants.PARAM_RESULT); - if (result != null) { - return URLDecoder.decode(result, "UTF-8"); - } + return params.getFirst(FederationConstants.PARAM_RESULT); } else if (params != null && fedConfig.getProtocol() instanceof SAMLProtocol) { return params.getFirst(SAMLSSOConstants.SAML_RESPONSE); }