Hello community, here is the log from the commit of package python-gcs-oauth2-boto-plugin for openSUSE:Factory checked in at 2017-03-03 17:55:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-gcs-oauth2-boto-plugin (Old) and /work/SRC/openSUSE:Factory/.python-gcs-oauth2-boto-plugin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-gcs-oauth2-boto-plugin" Fri Mar 3 17:55:13 2017 rev:3 rq:461916 version:1.14 Changes: -------- --- /work/SRC/openSUSE:Factory/python-gcs-oauth2-boto-plugin/python-gcs-oauth2-boto-plugin.changes 2015-12-24 12:16:33.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-gcs-oauth2-boto-plugin.new/python-gcs-oauth2-boto-plugin.changes 2017-03-03 17:55:14.338408449 +0100 @@ -1,0 +2,8 @@ +Wed Oct 5 19:19:36 UTC 2016 - rjschwei@suse.com + +- Update to version 1.14 (bsc#1002895) + + Remove gcs_hidePyRequires.patch, dependencies are in acceptable format + + Remove gcs_respectBotoCfgKeyword.patch applied upstream + + No upstream changelog + +------------------------------------------------------------------- Old: ---- gcs-oauth2-boto-plugin-1.8.tar.bz2 gcs_hidePyRequires.patch gcs_respectBotoCfgKeyword.patch New: ---- gcs-oauth2-boto-plugin-1.14.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-gcs-oauth2-boto-plugin.spec ++++++ --- /var/tmp/diff_new_pack.75dOh1/_old 2017-03-03 17:55:14.834338400 +0100 +++ /var/tmp/diff_new_pack.75dOh1/_new 2017-03-03 17:55:14.834338400 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-gcs-oauth2-boto-plugin # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,24 +17,23 @@ Name: python-gcs-oauth2-boto-plugin -Version: 1.8 +Version: 1.14 Release: 0 Url: https://github.com/GoogleCloudPlatform/gcs-oauth2-boto-plugin Summary: GCE Storage plugin for OAuth2 License: Apache-2.0 Group: Development/Languages/Python -Source: gcs-oauth2-boto-plugin-1.8.tar.bz2 -Patch0: gcs_hidePyRequires.patch -Patch1: gcs_respectBotoCfgKeyword.patch +Source: gcs-oauth2-boto-plugin-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python BuildRequires: python-setuptools Requires: python-SocksiPy >= 1.01 Requires: python-boto >= 2.29.1 Requires: python-httplib2 >= 0.8 -Requires: python-oauth2client +Requires: python-oauth2client > 2.1.0 Requires: python-pyOpenSSL >= 0.13 -Requires: python-retry_decorator +Requires: python-retry_decorator >= 1.0.0 +Requires: python-six >= 1.6.1 %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} @@ -53,8 +52,6 @@ %prep %setup -q -n gcs-oauth2-boto-plugin-%{version} -%patch0 -%patch1 -p1 %build python setup.py build @@ -64,7 +61,7 @@ %files %defattr(-,root,root,-) -%doc LICENSE README.md +%doc COPYING README.md %{python_sitelib}/* %changelog ++++++ gcs-oauth2-boto-plugin-1.8.tar.bz2 -> gcs-oauth2-boto-plugin-1.14.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gcs-oauth2-boto-plugin-1.8/.gitignore new/gcs-oauth2-boto-plugin-1.14/.gitignore --- old/gcs-oauth2-boto-plugin-1.8/.gitignore 2015-01-27 22:16:26.006568806 +0100 +++ new/gcs-oauth2-boto-plugin-1.14/.gitignore 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -.py[cod] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gcs-oauth2-boto-plugin-1.8/COPYING new/gcs-oauth2-boto-plugin-1.14/COPYING --- old/gcs-oauth2-boto-plugin-1.8/COPYING 1970-01-01 01:00:00.000000000 +0100 +++ new/gcs-oauth2-boto-plugin-1.14/COPYING 2016-10-05 21:02:42.252530719 +0200 @@ -0,0 +1,203 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gcs-oauth2-boto-plugin-1.8/LICENSE new/gcs-oauth2-boto-plugin-1.14/LICENSE --- old/gcs-oauth2-boto-plugin-1.8/LICENSE 2015-01-27 22:16:26.007568782 +0100 +++ new/gcs-oauth2-boto-plugin-1.14/LICENSE 1970-01-01 01:00:00.000000000 +0100 @@ -1,203 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gcs-oauth2-boto-plugin-1.8/README.md new/gcs-oauth2-boto-plugin-1.14/README.md --- old/gcs-oauth2-boto-plugin-1.8/README.md 2015-01-27 22:16:26.007568782 +0100 +++ new/gcs-oauth2-boto-plugin-1.14/README.md 2016-10-05 21:02:42.256530823 +0200 @@ -4,8 +4,8 @@ an auth plugin for the [boto] auth plugin framework for use with [OAuth 2.0] credentials for the Google Cloud Platform. This plugin is compatible with both [user accounts] and [service accounts], and its functionality is -essentially a wrapper around the oauth2client package of -[google-api-python-client] with the addition of automatically caching tokens +essentially a wrapper around [oauth2client] +with the addition of automatically caching tokens for the machine in a thread- and process-safe fashion. For more information about how to use this plugin to access Google Cloud Storage @@ -24,6 +24,8 @@ 2. environment variables (OAUTH2_CLIENT_ID and OAUTH2_CLIENT_SECRET), if not set 3. CLIENT_ID and CLIENT_SECRET values set by SetFallbackClientIdAndSecret function. +Service accounts are supported via key files in either JSON or .p12 format. +The file is first interpreted as JSON, with .p12 format as a fallback. The default locking mechanism used is threading.Lock. You can switch to using another locking mechanism by calling SetLock. Example: @@ -42,5 +44,5 @@ [OAuth 2.0]: https://developers.google.com/accounts/docs/OAuth2Login [user accounts]: https://developers.google.com/accounts/docs/OAuth2#installed [service accounts]: https://developers.google.com/accounts/docs/OAuth2#serviceaccount -[google-api-python-client]: https://code.google.com/p/google-api-python-client/wiki/OAuth2Client +[oauth2client]: https://github.com/google/oauth2client [GCS documentation]: https://developers.google.com/storage/docs/gspythonlibrary diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gcs-oauth2-boto-plugin-1.8/gcs_oauth2_boto_plugin/oauth2_client.py new/gcs-oauth2-boto-plugin-1.14/gcs_oauth2_boto_plugin/oauth2_client.py --- old/gcs-oauth2-boto-plugin-1.8/gcs_oauth2_boto_plugin/oauth2_client.py 2015-01-27 22:16:26.008568758 +0100 +++ new/gcs-oauth2-boto-plugin-1.14/gcs_oauth2_boto_plugin/oauth2_client.py 2016-10-05 21:02:42.252530719 +0200 @@ -42,6 +42,7 @@ import threading import urllib +# pylint: disable=g-import-not-at-top if os.environ.get('USER_AGENT'): import boto boto.UserAgent += os.environ.get('USER_AGENT') @@ -54,8 +55,9 @@ from retry_decorator.retry_decorator import retry as Retry import socks -if HAS_CRYPTO: - from oauth2client.client import SignedJwtAssertionCredentials + +from six import BytesIO + LOG = logging.getLogger('oauth2_client') @@ -71,18 +73,70 @@ 'service-accounts/default/token') META_HEADERS = { - 'X-Google-Metadata-Request': 'True' + 'Metadata-Flavor': 'Google' } +# The following implements cross-compatibility with versions of oauth2client. +# oauth2client 2.0.0 introduced major backwards-incompatibility changes, +# and it's possible that consumers of this library may be pinned to an +# old version such as 1.5.2. This must be kept in place until/unless +# we're certain no clients still depend on the older oauth2 client. +OAUTH2CLIENT_V2 = False +try: + from oauth2client.service_account import ServiceAccountCredentials + # oauth2client >= 2.0.0 + OAUTH2CLIENT_V2 = True +except ImportError: + # oauth2client < 2.0.0 + if HAS_CRYPTO: + from oauth2client.client import SignedJwtAssertionCredentials + + from oauth2client import service_account + from oauth2client.client import Credentials + from oauth2client.client import EXPIRY_FORMAT + + # pylint: disable=protected-access + class ServiceAccountCredentials(service_account._ServiceAccountCredentials): + + def to_json(self): + self.service_account_name = self._service_account_email + strip = (['_private_key'] + + Credentials.NON_SERIALIZED_MEMBERS) + return super(ServiceAccountCredentials, self)._to_json(strip) + + @classmethod + def from_json(cls, s): + try: + data = json.loads(s) + retval = ServiceAccountCredentials( + service_account_id=data['_service_account_id'], + service_account_email=data['_service_account_email'], + private_key_id=data['_private_key_id'], + private_key_pkcs8_text=data['_private_key_pkcs8_text'], + scopes=[DEFAULT_SCOPE]) + # TODO: Need to define user agent here, + # but it is not known until runtime. + retval.invalid = data['invalid'] + retval.access_token = data['access_token'] + if 'token_expiry' in data: + retval.token_expiry = datetime.datetime.strptime( + data['token_expiry'], EXPIRY_FORMAT) + return retval + except KeyError, e: + raise Exception('Your JSON credentials are invalid; ' + 'missing required entry %s.' % e[0]) + # pylint: enable=protected-access +# pylint: enable=g-import-not-at-top + # Note: this is copied from gsutil's gslib.cred_types. It should be kept in # sync. Also note that this library does not use HMAC, but it's preserved from # gsutil's copy to maintain compatibility. class CredTypes(object): - HMAC = "HMAC" - OAUTH2_SERVICE_ACCOUNT = "OAuth 2.0 Service Account" - OAUTH2_USER_ACCOUNT = "Oauth 2.0 User Account" - GCE = "GCE" + HMAC = 'HMAC' + OAUTH2_SERVICE_ACCOUNT = 'OAuth 2.0 Service Account' + OAUTH2_USER_ACCOUNT = 'Oauth 2.0 User Account' + GCE = 'GCE' class Error(Exception): @@ -90,11 +144,6 @@ pass -class AccessTokenRefreshError(Error): - """Error trying to exchange a refresh token into an access token.""" - pass - - class AuthorizationCodeExchangeError(Error): """Error trying to exchange an authorization code into a refresh token.""" pass @@ -347,7 +396,54 @@ return 'Bearer %s' % self.GetAccessToken().token -class OAuth2ServiceAccountClient(OAuth2Client): +class _BaseOAuth2ServiceAccountClient(OAuth2Client): + """Base class for OAuth2ServiceAccountClients. + + Args: + client_id: The OAuth2 client ID of this client. + access_token_cache: An optional instance of a TokenCache. If omitted or + None, an InMemoryTokenCache is used. + auth_uri: The URI for OAuth2 authorization. + token_uri: The URI used to refresh access tokens. + datetime_strategy: datetime module strategy to use. + disable_ssl_certificate_validation: True if certifications should not be + validated. + proxy_host: An optional string specifying the host name of an HTTP proxy + to be used. + proxy_port: An optional int specifying the port number of an HTTP proxy + to be used. + proxy_user: An optional string specifying the user name for interacting + with the HTTP proxy. + proxy_pass: An optional string specifying the password for interacting + with the HTTP proxy. + ca_certs_file: The cacerts.txt file to use. + """ + + def __init__(self, client_id, access_token_cache=None, auth_uri=None, + token_uri=None, datetime_strategy=datetime.datetime, + disable_ssl_certificate_validation=False, + proxy_host=None, proxy_port=None, proxy_user=None, + proxy_pass=None, ca_certs_file=None): + + super(_BaseOAuth2ServiceAccountClient, self).__init__( + cache_key_base=client_id, auth_uri=auth_uri, token_uri=token_uri, + access_token_cache=access_token_cache, + datetime_strategy=datetime_strategy, + disable_ssl_certificate_validation=disable_ssl_certificate_validation, + proxy_host=proxy_host, proxy_port=proxy_port, proxy_user=proxy_user, + proxy_pass=proxy_pass, ca_certs_file=ca_certs_file) + self._client_id = client_id + + def FetchAccessToken(self): + credentials = self.GetCredentials() + http = self.CreateHttpRequest() + credentials.refresh(http) + return AccessToken(credentials.access_token, credentials.token_expiry, + datetime_strategy=self.datetime_strategy) + + +class OAuth2ServiceAccountClient(_BaseOAuth2ServiceAccountClient): + """An OAuth2 service account client using .p12 or .pem keys.""" def __init__(self, client_id, private_key, password, access_token_cache=None, auth_uri=None, token_uri=None, @@ -355,72 +451,114 @@ disable_ssl_certificate_validation=False, proxy_host=None, proxy_port=None, proxy_user=None, proxy_pass=None, ca_certs_file=None): + # Avoid long repeated kwargs list. + # pylint: disable=g-doc-args """Creates an OAuth2ServiceAccountClient. Args: client_id: The OAuth2 client ID of this client. private_key: The private key associated with this service account. password: The private key password used for the crypto signer. - access_token_cache: An optional instance of a TokenCache. If omitted or - None, an InMemoryTokenCache is used. - auth_uri: The URI for OAuth2 authorization. - token_uri: The URI used to refresh access tokens. - datetime_strategy: datetime module strategy to use. - disable_ssl_certificate_validation: True if certifications should not be - validated. - proxy_host: An optional string specifying the host name of an HTTP proxy - to be used. - proxy_port: An optional int specifying the port number of an HTTP proxy - to be used. - proxy_user: An optional string specifying the user name for interacting - with the HTTP proxy. - proxy_pass: An optional string specifying the password for interacting - with the HTTP proxy. - ca_certs_file: The cacerts.txt file to use. + + Keyword arguments match the _BaseOAuth2ServiceAccountClient class. """ + # pylint: enable=g-doc-args super(OAuth2ServiceAccountClient, self).__init__( - cache_key_base=client_id, auth_uri=auth_uri, token_uri=token_uri, + client_id, auth_uri=auth_uri, token_uri=token_uri, access_token_cache=access_token_cache, datetime_strategy=datetime_strategy, disable_ssl_certificate_validation=disable_ssl_certificate_validation, proxy_host=proxy_host, proxy_port=proxy_port, proxy_user=proxy_user, proxy_pass=proxy_pass, ca_certs_file=ca_certs_file) - self.client_id = client_id - self.private_key = private_key - self.password = password - - def FetchAccessToken(self): - credentials = self.GetCredentials() - http = self.CreateHttpRequest() - credentials.refresh(http) - return AccessToken(credentials.access_token, - credentials.token_expiry, datetime_strategy=self.datetime_strategy) + self._private_key = private_key + self._password = password def GetCredentials(self): if HAS_CRYPTO: - return SignedJwtAssertionCredentials(self.client_id, - self.private_key, scope=DEFAULT_SCOPE, - private_key_password=self.password) + if OAUTH2CLIENT_V2: + # pylint: disable=protected-access + return ServiceAccountCredentials.from_p12_keyfile_buffer( + self._client_id, BytesIO(self._private_key), + private_key_password=self._password, scopes=DEFAULT_SCOPE, + token_uri=self.token_uri) + # pylint: enable=protected-access + else: + return SignedJwtAssertionCredentials( + self._client_id, self._private_key, scope=DEFAULT_SCOPE, + private_key_password=self._password, token_uri=self.token_uri) else: raise MissingDependencyError( 'Service account authentication requires PyOpenSSL. Please install ' 'this library and try again.') +class OAuth2JsonServiceAccountClient(_BaseOAuth2ServiceAccountClient): + """An OAuth2 service account client using .json keys.""" + + def __init__(self, json_key_dict, access_token_cache=None, auth_uri=None, + token_uri=None, datetime_strategy=datetime.datetime, + disable_ssl_certificate_validation=False, + proxy_host=None, proxy_port=None, proxy_user=None, + proxy_pass=None, ca_certs_file=None): + # Avoid long repeated kwargs list. + # pylint: disable=g-doc-args + """Creates an OAuth2JsonServiceAccountClient. + + Args: + json_key_dict: dictionary from the json private key file. Includes: + client_id: The OAuth2 client ID of this client. + client_email: The email associated with this client. + private_key_id: The private key id associated with this service + account. + private_key_pkcs8_text: The pkcs8 text containing the private key + data. + + Keyword arguments match the _BaseOAuth2ServiceAccountClient class. + """ + # pylint: enable=g-doc-args + super(OAuth2JsonServiceAccountClient, self).__init__( + json_key_dict['client_id'], auth_uri=auth_uri, token_uri=token_uri, + access_token_cache=access_token_cache, + datetime_strategy=datetime_strategy, + disable_ssl_certificate_validation=disable_ssl_certificate_validation, + proxy_host=proxy_host, proxy_port=proxy_port, proxy_user=proxy_user, + proxy_pass=proxy_pass, ca_certs_file=ca_certs_file) + self._json_key_dict = json_key_dict + self._service_account_email = json_key_dict['client_email'] + self._private_key_id = json_key_dict['private_key_id'] + self._private_key_pkcs8_text = json_key_dict['private_key'] + + def GetCredentials(self): + if OAUTH2CLIENT_V2: + return ServiceAccountCredentials.from_json_keyfile_dict( + self._json_key_dict, scopes=[DEFAULT_SCOPE], token_uri=self.token_uri) + else: + return ServiceAccountCredentials( + service_account_id=self._client_id, + service_account_email=self._service_account_email, + private_key_id=self._private_key_id, + private_key_pkcs8_text=self._private_key_pkcs8_text, + scopes=[DEFAULT_SCOPE], token_uri=self.token_uri) + # TODO: Need to plumb user agent through here. + + class GsAccessTokenRefreshError(Exception): """Transient error when requesting access token.""" + def __init__(self, e): - super(Exception, self).__init__(e) + super(GsAccessTokenRefreshError, self).__init__(e) class GsInvalidRefreshTokenError(Exception): + def __init__(self, e): - super(Exception, self).__init__(e) + super(GsInvalidRefreshTokenError, self).__init__(e) class MissingDependencyError(Exception): + def __init__(self, e): - super(Exception, self).__init__(e) + super(MissingDependencyError, self).__init__(e) class OAuth2UserAccountClient(OAuth2Client): @@ -489,10 +627,12 @@ try: http = self.CreateHttpRequest() credentials = OAuth2Credentials(None, self.client_id, self.client_secret, - self.refresh_token, None, self.token_uri, None) + self.refresh_token, None, self.token_uri, + None) credentials.refresh(http) - return AccessToken(credentials.access_token, - credentials.token_expiry, datetime_strategy=self.datetime_strategy) + return AccessToken( + credentials.access_token, credentials.token_expiry, + datetime_strategy=self.datetime_strategy) except AccessTokenRefreshError, e: if 'Invalid response 403' in e.message: # This is the most we can do at the moment to accurately detect rate @@ -529,8 +669,8 @@ http = httplib2.Http() response, content = http.request(META_TOKEN_URI, method='GET', body=None, headers=META_HEADERS) - except Exception: - raise GsAccessTokenRefreshError() + except Exception, e: + raise GsAccessTokenRefreshError(e) if response.status == 200: d = json.loads(content) @@ -538,7 +678,7 @@ return AccessToken( d['access_token'], datetime.datetime.now() + - datetime.timedelta(seconds=d.get('expires_in', 0)), + datetime.timedelta(seconds=d.get('expires_in', 0)), datetime_strategy=self.datetime_strategy) @@ -555,7 +695,7 @@ # this approach, we'll avoid having to enumerate all possible non-transient # socket errors. return False - except Exception, e: + except Exception, e: # pylint: disable=broad-except LOG.warning("Failed to determine whether we're running on GCE, so we'll" "assume that we aren't: %s", e) return False @@ -590,7 +730,7 @@ try: expiry = datetime.datetime( *[int(n) for n in expiry_tuple.split(',')]) - except: + except: # pylint: disable=bare-except return None return AccessToken(GetValue(kv, 'token'), expiry) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gcs-oauth2-boto-plugin-1.8/gcs_oauth2_boto_plugin/oauth2_helper.py new/gcs-oauth2-boto-plugin-1.14/gcs_oauth2_boto_plugin/oauth2_helper.py --- old/gcs-oauth2-boto-plugin-1.8/gcs_oauth2_boto_plugin/oauth2_helper.py 2015-01-27 22:16:26.008568758 +0100 +++ new/gcs-oauth2-boto-plugin-1.14/gcs_oauth2_boto_plugin/oauth2_helper.py 2016-10-05 21:02:42.252530719 +0200 @@ -16,14 +16,14 @@ from __future__ import absolute_import +import json import os import sys import time import webbrowser -from oauth2client.client import OAuth2WebServerFlow - from gcs_oauth2_boto_plugin import oauth2_client +from oauth2client.client import OAuth2WebServerFlow CLIENT_ID = None CLIENT_SECRET = None @@ -36,8 +36,9 @@ OOB_REDIRECT_URI = 'urn:ietf:wg:oauth:2.0:oob' -def OAuth2ClientFromBotoConfig(config, - cred_type=oauth2_client.CredTypes.OAUTH2_USER_ACCOUNT): + +def OAuth2ClientFromBotoConfig( + config, cred_type=oauth2_client.CredTypes.OAUTH2_USER_ACCOUNT): token_cache = None token_cache_type = config.get('OAuth2', 'token_cache', 'file_system') if token_cache_type == 'file_system': @@ -50,7 +51,7 @@ token_cache = oauth2_client.InMemoryTokenCache() else: raise Exception( - "Invalid value for config option OAuth2/token_cache: %s" % + 'Invalid value for config option OAuth2/token_cache: %s' % token_cache_type) proxy_host = None @@ -73,19 +74,41 @@ if cred_type == oauth2_client.CredTypes.OAUTH2_SERVICE_ACCOUNT: service_client_id = config.get('Credentials', 'gs_service_client_id', '') private_key_filename = config.get('Credentials', 'gs_service_key_file', '') - key_file_pass = config.get('Credentials', 'gs_service_key_file_password', - GOOGLE_OAUTH2_DEFAULT_FILE_PASSWORD) with open(private_key_filename, 'rb') as private_key_file: private_key = private_key_file.read() - return oauth2_client.OAuth2ServiceAccountClient( - service_client_id, private_key, key_file_pass, - access_token_cache=token_cache, auth_uri=provider_authorization_uri, - token_uri=provider_token_uri, - disable_ssl_certificate_validation=not(config.getbool( - 'Boto', 'https_validate_certificates', True)), - proxy_host=proxy_host, proxy_port=proxy_port, - proxy_user=proxy_user, proxy_pass=proxy_pass) + json_key_dict = None + try: + json_key_dict = json.loads(private_key) + except ValueError: + pass + if json_key_dict: + for json_entry in ('client_id', 'client_email', 'private_key_id', + 'private_key'): + if json_entry not in json_key_dict: + raise Exception('The JSON private key file at %s ' + 'did not contain the required entry: %s' % + (private_key_filename, json_entry)) + + return oauth2_client.OAuth2JsonServiceAccountClient( + json_key_dict, access_token_cache=token_cache, + auth_uri=provider_authorization_uri, token_uri=provider_token_uri, + disable_ssl_certificate_validation=not(config.getbool( + 'Boto', 'https_validate_certificates', True)), + proxy_host=proxy_host, proxy_port=proxy_port, + proxy_user=proxy_user, proxy_pass=proxy_pass) + else: + key_file_pass = config.get('Credentials', 'gs_service_key_file_password', + GOOGLE_OAUTH2_DEFAULT_FILE_PASSWORD) + + return oauth2_client.OAuth2ServiceAccountClient( + service_client_id, private_key, key_file_pass, + access_token_cache=token_cache, auth_uri=provider_authorization_uri, + token_uri=provider_token_uri, + disable_ssl_certificate_validation=not(config.getbool( + 'Boto', 'https_validate_certificates', True)), + proxy_host=proxy_host, proxy_port=proxy_port, + proxy_user=proxy_user, proxy_pass=proxy_pass) elif cred_type == oauth2_client.CredTypes.OAUTH2_USER_ACCOUNT: client_id = config.get('OAuth2', 'client_id', @@ -100,6 +123,10 @@ client_secret = config.get('OAuth2', 'client_secret', os.environ.get('OAUTH2_CLIENT_SECRET', CLIENT_SECRET)) + ca_certs_file = config.get_value('Boto', 'ca_certificates_file') + if ca_certs_file == 'system': + ca_certs_file = None + if not client_secret: raise Exception( 'client_secret for your application obtained from ' @@ -114,10 +141,10 @@ 'Boto', 'https_validate_certificates', True)), proxy_host=proxy_host, proxy_port=proxy_port, proxy_user=proxy_user, proxy_pass=proxy_pass, - ca_certs_file=config.get_value('Boto', 'ca_certificates_file')) + ca_certs_file=ca_certs_file) else: raise Exception('You have attempted to create an OAuth2 client without ' - 'setting up OAuth2 credentials.') + 'setting up OAuth2 credentials.') def OAuth2ApprovalFlow(client, scopes, launch_browser=False): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gcs-oauth2-boto-plugin-1.8/gcs_oauth2_boto_plugin/oauth2_plugin.py new/gcs-oauth2-boto-plugin-1.14/gcs_oauth2_boto_plugin/oauth2_plugin.py --- old/gcs-oauth2-boto-plugin-1.8/gcs_oauth2_boto_plugin/oauth2_plugin.py 2015-01-27 22:16:26.008568758 +0100 +++ new/gcs-oauth2-boto-plugin-1.14/gcs_oauth2_boto_plugin/oauth2_plugin.py 2016-10-05 21:02:42.252530719 +0200 @@ -50,7 +50,6 @@ def __init__(self, path, config, provider): if (provider.name == 'google' - and config.has_option('Credentials', 'gs_service_client_id') and config.has_option('Credentials', 'gs_service_key_file')): self.oauth2_client = oauth2_helper.OAuth2ClientFromBotoConfig(config, cred_type=oauth2_client.CredTypes.OAUTH2_SERVICE_ACCOUNT) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gcs-oauth2-boto-plugin-1.8/requirements.txt new/gcs-oauth2-boto-plugin-1.14/requirements.txt --- old/gcs-oauth2-boto-plugin-1.8/requirements.txt 2015-01-27 22:16:26.009568735 +0100 +++ new/gcs-oauth2-boto-plugin-1.14/requirements.txt 2016-10-05 21:02:42.256530823 +0200 @@ -1,6 +1,11 @@ boto>=2.29.1 httplib2>=0.8 -google-api-python-client>=1.1 +oauth2client>=1.5.2 +oauth2client!=2.0.0 +oauth2client!=2.0.1 +oauth2client!=2.0.2 +oauth2client!=2.1.0 pyOpenSSL>=0.13 SocksiPy-branch==1.01 retry_decorator>=1.0.0 +six>=1.6.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gcs-oauth2-boto-plugin-1.8/setup.py new/gcs-oauth2-boto-plugin-1.14/setup.py --- old/gcs-oauth2-boto-plugin-1.8/setup.py 2015-01-27 22:16:26.009568735 +0100 +++ new/gcs-oauth2-boto-plugin-1.14/setup.py 2016-10-05 21:02:42.256530823 +0200 @@ -25,25 +25,29 @@ auth plugin for the boto auth plugin framework for use with OAuth 2.0 credentials for the Google Cloud Platform. This plugin is compatible with both user accounts and service accounts, and its functionality is essentially a -wrapper around the oauth2client package of google-api-python-client with the -addition of automatically caching tokens for the machine in a thread- and -process-safe fashion. +wrapper around oauth2client with the addition of automatically caching tokens +for the machine in a thread- and process-safe fashion. """ requires = [ 'boto>=2.29.1', 'httplib2>=0.8', - 'google-api-python-client>=1.1', + 'oauth2client>=1.5.2', + 'oauth2client!=2.0.0', + 'oauth2client!=2.0.1', + 'oauth2client!=2.0.2', + 'oauth2client!=2.1.0', 'pyOpenSSL>=0.13', # Not using 1.02 because of: # https://code.google.com/p/socksipy-branch/issues/detail?id=3 'SocksiPy-branch==1.01', 'retry_decorator>=1.0.0', + 'six>=1.6.1' ] setup( name='gcs-oauth2-boto-plugin', - version='1.8', + version='1.14', url='https://developers.google.com/storage/docs/gspythonlibrary', download_url=('https://github.com/GoogleCloudPlatform' '/gcs-oauth2-boto-plugin'),