Return-Path: X-Original-To: apmail-hawq-commits-archive@minotaur.apache.org Delivered-To: apmail-hawq-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A826718107 for ; Thu, 24 Mar 2016 19:02:56 +0000 (UTC) Received: (qmail 61272 invoked by uid 500); 24 Mar 2016 19:02:56 -0000 Delivered-To: apmail-hawq-commits-archive@hawq.apache.org Received: (qmail 61239 invoked by uid 500); 24 Mar 2016 19:02:56 -0000 Mailing-List: contact commits-help@hawq.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hawq.incubator.apache.org Delivered-To: mailing list commits@hawq.incubator.apache.org Received: (qmail 61229 invoked by uid 99); 24 Mar 2016 19:02:55 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Mar 2016 19:02:55 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 80E2C18054C for ; Thu, 24 Mar 2016 19:02:55 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.221 X-Spam-Level: X-Spam-Status: No, score=-3.221 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id m0JV1BCMhSVZ for ; Thu, 24 Mar 2016 19:02:54 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 6A59D5F24E for ; Thu, 24 Mar 2016 19:02:53 +0000 (UTC) Received: (qmail 61198 invoked by uid 99); 24 Mar 2016 19:02:52 -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; Thu, 24 Mar 2016 19:02:52 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3831BDFBAF; Thu, 24 Mar 2016 19:02:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: shivram@apache.org To: commits@hawq.incubator.apache.org Message-Id: <7b40954049d74153bfeb485703844a08@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-hawq git commit: HAWQ-459. ProtocolData handling for MetdataResource Date: Thu, 24 Mar 2016 19:02:52 +0000 (UTC) Repository: incubator-hawq Updated Branches: refs/heads/HAWQ-459 bb7773478 -> 20c45fe50 HAWQ-459. ProtocolData handling for MetdataResource Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/20c45fe5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/20c45fe5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/20c45fe5 Branch: refs/heads/HAWQ-459 Commit: 20c45fe5037dc5fde592403bee73b187e3f10a47 Parents: bb77734 Author: Shivram Mani Authored: Thu Mar 24 12:02:48 2016 -0700 Committer: Shivram Mani Committed: Thu Mar 24 12:02:48 2016 -0700 ---------------------------------------------------------------------- .../hawq/pxf/service/rest/MetadataResource.java | 5 +++-- .../hawq/pxf/service/utilities/ProtocolData.java | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/20c45fe5/pxf/pxf-service/src/main/java/org/apache/hawq/pxf/service/rest/MetadataResource.java ---------------------------------------------------------------------- diff --git a/pxf/pxf-service/src/main/java/org/apache/hawq/pxf/service/rest/MetadataResource.java b/pxf/pxf-service/src/main/java/org/apache/hawq/pxf/service/rest/MetadataResource.java index cb50479..e16d14a 100644 --- a/pxf/pxf-service/src/main/java/org/apache/hawq/pxf/service/rest/MetadataResource.java +++ b/pxf/pxf-service/src/main/java/org/apache/hawq/pxf/service/rest/MetadataResource.java @@ -94,8 +94,9 @@ public class MetadataResource extends RestResource { Map params = convertToCaseInsensitiveMap(headers.getRequestHeaders()); // Add profile and verify token - params.put("X-GP-PROFILE", profile.toLowerCase()); - ProtocolData protData = new ProtocolData(params); + ProtocolData protData = new ProtocolData(params, profile.toLowerCase()); + + // 0. Verify token SecuredHDFS.verifyToken(protData, servletContext); // 1. start MetadataFetcher http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/20c45fe5/pxf/pxf-service/src/main/java/org/apache/hawq/pxf/service/utilities/ProtocolData.java ---------------------------------------------------------------------- diff --git a/pxf/pxf-service/src/main/java/org/apache/hawq/pxf/service/utilities/ProtocolData.java b/pxf/pxf-service/src/main/java/org/apache/hawq/pxf/service/utilities/ProtocolData.java index 50ce46a..ec258fa 100644 --- a/pxf/pxf-service/src/main/java/org/apache/hawq/pxf/service/utilities/ProtocolData.java +++ b/pxf/pxf-service/src/main/java/org/apache/hawq/pxf/service/utilities/ProtocolData.java @@ -151,6 +151,24 @@ public class ProtocolData extends InputData { } /** + * Constructs a ProtocolData. Parses X-GP-* configuration variables. + * + * @param paramsMap contains all query-specific parameters from Hawq + * @param profile contains the profile name + */ + public ProtocolData(Map paramsMap, String profileString) { + requestParametersMap = paramsMap; + profile = profileString; + setProfilePlugins(); + metadata = getProperty("METADATA"); + + /* Kerberos token information */ + if (UserGroupInformation.isSecurityEnabled()) { + token = getProperty("TOKEN"); + } + } + + /** * Sets the requested profile plugins from profile file into * {@link #requestParametersMap}. */