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 9E077172CD for ; Wed, 15 Apr 2015 08:05:16 +0000 (UTC) Received: (qmail 45639 invoked by uid 500); 15 Apr 2015 08:05:03 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 45584 invoked by uid 500); 15 Apr 2015 08:05:03 -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 45009 invoked by uid 99); 15 Apr 2015 08:05:03 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Apr 2015 08:05:03 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4887BDF9F4; Wed, 15 Apr 2015 08:05:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: widodh@apache.org To: commits@cloudstack.apache.org Date: Wed, 15 Apr 2015 08:05:46 -0000 Message-Id: <60c6ce46169d40e68f86ba52cd91ef1f@git.apache.org> In-Reply-To: <65365b0d0bc14baa9bd3e185c2e60478@git.apache.org> References: <65365b0d0bc14baa9bd3e185c2e60478@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [46/53] [abbrv] git commit: updated refs/heads/reporter to 5c99784 server: ignore params signatureversion and expires when validating API args (cherry picked from commit d361bf684704719902419d372c6ce31d941abe9e) 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/c0d3e6f5 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c0d3e6f5 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c0d3e6f5 Branch: refs/heads/reporter Commit: c0d3e6f5e8dbe5f2ad917b5209ea8707f02c67ca Parents: ac06ec0 Author: Rohit Yadav Authored: Tue Apr 14 15:25:17 2015 +0530 Committer: Rohit Yadav Committed: Tue Apr 14 16:52:32 2015 +0530 ---------------------------------------------------------------------- .../src/com/cloud/api/dispatch/ParamGenericValidationWorker.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c0d3e6f5/server/src/com/cloud/api/dispatch/ParamGenericValidationWorker.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/dispatch/ParamGenericValidationWorker.java b/server/src/com/cloud/api/dispatch/ParamGenericValidationWorker.java index 7aaafbb..6509d11 100644 --- a/server/src/com/cloud/api/dispatch/ParamGenericValidationWorker.java +++ b/server/src/com/cloud/api/dispatch/ParamGenericValidationWorker.java @@ -90,7 +90,7 @@ public class ParamGenericValidationWorker implements DispatchWorker { break; } } - if (!matchedCurrentParam) { + if (!matchedCurrentParam && !((String)actualParamName).equalsIgnoreCase("expires") && !((String)actualParamName).equalsIgnoreCase("signatureversion")) { errorMsg.append(" ").append(actualParamName); foundUnknownParam= true; }