Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-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 4E02E11781 for ; Mon, 25 Aug 2014 00:00:31 +0000 (UTC) Received: (qmail 55203 invoked by uid 500); 25 Aug 2014 00:00:30 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 55131 invoked by uid 500); 25 Aug 2014 00:00:30 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 54868 invoked by uid 99); 25 Aug 2014 00:00:30 -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, 25 Aug 2014 00:00:30 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id CC1ED9CB6CB; Mon, 25 Aug 2014 00:00:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bhaisaab@apache.org To: commits@cloudstack.apache.org Date: Mon, 25 Aug 2014 00:00:35 -0000 Message-Id: <5ae3b0ad005d416992d65db934c87a08@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [7/8] git commit: updated refs/heads/saml2 to 24b43f8 SAML2UserAuthenticator: check that request params has SAMLResponse Signed-off-by: Rohit Yadav Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fa0d81b5 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fa0d81b5 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fa0d81b5 Branch: refs/heads/saml2 Commit: fa0d81b5463c29f35ecbc5b9bb62b7e02e895936 Parents: 7f8e0ff Author: Rohit Yadav Authored: Mon Aug 25 01:57:24 2014 +0200 Committer: Rohit Yadav Committed: Mon Aug 25 01:58:04 2014 +0200 ---------------------------------------------------------------------- .../src/org/apache/cloudstack/saml/SAML2UserAuthenticator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fa0d81b5/plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAML2UserAuthenticator.java ---------------------------------------------------------------------- diff --git a/plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAML2UserAuthenticator.java b/plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAML2UserAuthenticator.java index a4902d1..5cd9b52 100644 --- a/plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAML2UserAuthenticator.java +++ b/plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAML2UserAuthenticator.java @@ -48,8 +48,8 @@ public class SAML2UserAuthenticator extends DefaultUserAuthenticator { return new Pair(false, null); } else { User user = _userDao.getUser(userAccount.getId()); - // TODO: check SAMLRequest, signature etc. from requestParameters - if (user != null && SAMLUtils.checkSAMLUserId(user.getUuid())) { + if (user != null && SAMLUtils.checkSAMLUserId(user.getUuid()) && + requestParameters.containsKey(SAMLUtils.SAML_RESPONSE)) { return new Pair(true, null); } }