Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 4EEC0200BBD for ; Mon, 24 Oct 2016 17:07:10 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 4D222160B04; Mon, 24 Oct 2016 15:07:10 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id D59CD160C0C for ; Mon, 24 Oct 2016 16:49:15 +0200 (CEST) Received: (qmail 61573 invoked by uid 500); 24 Oct 2016 14:49:15 -0000 Mailing-List: contact commits-help@airflow.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airflow.incubator.apache.org Delivered-To: mailing list commits@airflow.incubator.apache.org Received: (qmail 61564 invoked by uid 99); 24 Oct 2016 14:49:14 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Oct 2016 14:49:14 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 6AA20C6664 for ; Mon, 24 Oct 2016 14:49:14 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -6.219 X-Spam-Level: X-Spam-Status: No, score=-6.219 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=-2.999] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id S0FkRZBOnBxL for ; Mon, 24 Oct 2016 14:49:11 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with SMTP id 878DD5FBCD for ; Mon, 24 Oct 2016 14:49:10 +0000 (UTC) Received: (qmail 57741 invoked by uid 99); 24 Oct 2016 14:48:35 -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; Mon, 24 Oct 2016 14:48:35 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 54229DFDCF; Mon, 24 Oct 2016 14:48:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: criccomini@apache.org To: commits@airflow.incubator.apache.org Message-Id: <148fc21f314f4c48b48a6d33a4c3ef75@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-airflow git commit: [AIRFLOW-587] Fix incorrect scope for Google Auth[] Date: Mon, 24 Oct 2016 14:48:35 +0000 (UTC) archived-at: Mon, 24 Oct 2016 15:07:10 -0000 Repository: incubator-airflow Updated Branches: refs/heads/master c65f403a5 -> 928fa986c [AIRFLOW-587] Fix incorrect scope for Google Auth[] The requested scope is incorrect when calling the Googe API. This splits the scope defines as a single script into an array. Closes #1850 from alexvanboxel/bugfix/airflow-587 -google-auth Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/928fa986 Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/928fa986 Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/928fa986 Branch: refs/heads/master Commit: 928fa986c3e1509bfcaa2de4a19edac023ade87f Parents: c65f403 Author: Alex Van Boxel Authored: Mon Oct 24 07:48:28 2016 -0700 Committer: Chris Riccomini Committed: Mon Oct 24 07:48:28 2016 -0700 ---------------------------------------------------------------------- airflow/contrib/auth/backends/google_auth.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/928fa986/airflow/contrib/auth/backends/google_auth.py ---------------------------------------------------------------------- diff --git a/airflow/contrib/auth/backends/google_auth.py b/airflow/contrib/auth/backends/google_auth.py index 8aed03a..70c8e13 100644 --- a/airflow/contrib/auth/backends/google_auth.py +++ b/airflow/contrib/auth/backends/google_auth.py @@ -90,8 +90,9 @@ class GoogleAuthBackend(object): 'google', consumer_key=get_config_param('client_id'), consumer_secret=get_config_param('client_secret'), - request_token_params={'scope': '''https://www.googleapis.com/auth/userinfo.profile - https://www.googleapis.com/auth/userinfo.email'''}, + request_token_params={'scope': [ + 'https://www.googleapis.com/auth/userinfo.profile', + 'https://www.googleapis.com/auth/userinfo.email']}, base_url='https://www.google.com/accounts/', request_token_url=None, access_token_method='POST',