Update GCE AppAssertionCredentials #476

elibixby · 2016-03-25T18:32:59Z

This provides several much needed updates to GCE App Assertion Credentials

Properly populates token expiry
Retrieves credentials scopes from the metadata server
Allows credentials to use custom service accounts by providing an optional email field
Implements serialization/deserialization for this email field
Provides a project_id property using metadata server in preparation for a pull request addressing Allow GCE credentials to sign blobs #471

* Now tracks Token Expire times * Adds project_id property in preparation for googleapis#471 PR * Allows usage of custom service accounts from in GCE accordance with the [beta capabilities](https://cloud.google.com/compute/docs/authentication#createcutomserviceaccount) * Now properly knows scopes of the service account

Also use v1 endpoint

oauth2client/contrib/gce.py

-        # used by this class.
-        self.scope = util.scopes_to_string(scope)
+
+        self.scopes = None


elibixby · 2016-03-25T18:47:25Z

I am still in the process of adding tests for this PR. Do Not Merge.

* consolidates requests for email field * provides a "expiresAt" field Will revert to v1 endpoint if GCE eng team says that there are plans to deprecate 0.1 Additionally made scopes an `@property` to avoid false readings of no scopes

oauth2client/contrib/gce.py

-                  'instance/service-accounts/default/')
-META = _METADATA_ROOT + 'token'
-_DEFAULT_EMAIL_METADATA = _METADATA_ROOT + 'email'
+_METADATA_ROOT = 'http://metadata.google.internal/0.1/meta-data'


* added a service_account_info property with more detailed information and to share code between service_account_email and _refresh_scopes

oauth2client/contrib/gce.py

+
+    @property
+    def serialization_data(self):
+        return self.service_account_info


coveralls · 2016-03-29T02:40:13Z

Coverage decreased (-0.02%) to 97.544% when pulling ae03714 on elibixby:master into 3ca2ca7 on google:master.

coveralls · 2016-03-29T02:43:02Z

Coverage decreased (-0.02%) to 97.544% when pulling eed5f04 on elibixby:master into 3ca2ca7 on google:master.

coveralls · 2016-03-29T03:29:32Z

Coverage increased (+0.01%) to 97.577% when pulling d2f1bbb on elibixby:master into 3ca2ca7 on google:master.

oauth2client/contrib/gce.py

-        return False
+        self.access_token, self.token_expiry = _get_access_token(
+            http_request,
+            self._service_account_info['email']


nathanielmanistaatgoogle · 2016-04-01T20:25:46Z

Be prepared at the end of the review to squash commits.

elibixby · 2016-04-01T21:42:12Z

https://github.com/blog/2141-squash-your-commits

Is this option available to you now? Or do I still have to manually squash?

nathanielmanistaatgoogle · 2016-04-04T20:54:18Z

A repository setting to require all pull requests to be one commit each probably is available to us, but I'm not sure that we'd want to enable it for all changes. Some are still appropriate to be done in multiple commits.

oauth2client/contrib/gce.py

@@ -16,60 +16,117 @@

 Utilities for making it easier to use OAuth 2.0 on Google Compute Engine.
 """
-


* Remove deserialization arg from constructor

elibixby · 2016-04-05T00:03:56Z

@nathanielmanistaatgoogle Fixes pushed

oauth2client/contrib/gce.py


 __author__ = '[email protected] (Joe Gregorio)'

 logger = logging.getLogger(__name__)

 # URI Template for the endpoint that returns access_tokens.
-_METADATA_ROOT = ('http://metadata.google.internal/computeMetadata/v1/'
-                  'instance/service-accounts/default/')
-META = _METADATA_ROOT + 'token'


elibixby · 2016-04-05T18:52:27Z

@nathanielmanistaatgoogle More fixes.

elibixby · 2016-04-18T20:06:30Z

@nathanielmanistaatgoogle @dhermes Bump.

elibixby · 2016-04-18T20:43:33Z

After discussion with @jonparrott I'm going to break this into 3 smaller PRs:

add a metadata module that takes care of caching paths
Move gce.AppAssertionCredentials to use the metadata module
Add credentials.scopes and support for custom emails

elibixby added 3 commits March 22, 2016 16:58

Typo

e4407d2

Move back to JIT field population

bcc1198

Also use v1 endpoint

googlebot added the cla: yes label Mar 25, 2016

elibixby reviewed Mar 25, 2016
View reviewed changes

oauth2client/contrib/gce.py

# used by this class.

self.scope = util.scopes_to_string(scope)

self.scopes = None

This comment was marked as spam.

Sign in to view

elibixby mentioned this pull request Mar 25, 2016

Populate token expiry for GCE credentials #473

Merged

elibixby added 2 commits March 25, 2016 12:23

Move back to 0.1 endpoint

b721ec8

* consolidates requests for email field * provides a "expiresAt" field Will revert to v1 endpoint if GCE eng team says that there are plans to deprecate 0.1 Additionally made scopes an `@property` to avoid false readings of no scopes

no project/ prefix in 0.1 endpoint

73b0a8d

dhermes added the don't merge label Mar 25, 2016

dhermes reviewed Mar 25, 2016
View reviewed changes

elibixby added 3 commits March 25, 2016 16:10

Moved back to v1 endpoint

96e7250

* added a service_account_info property with more detailed information and to share code between service_account_email and _refresh_scopes

More specific exception

c0b2300

Include scopes and aliases in serialization

b593ac0

elibixby reviewed Mar 28, 2016
View reviewed changes

oauth2client/contrib/gce.py

@property

def serialization_data(self):

return self.service_account_info

This comment was marked as spam.

Sign in to view

Added tests to green, ready for review

ae03714

python 2.6 fix -_-

eed5f04

elibixby added 2 commits March 28, 2016 20:08

Check scopes and error

3f70a0e

Fixed silliness + coverage

d2f1bbb

nathanielmanistaatgoogle reviewed Apr 1, 2016
View reviewed changes

oauth2client/contrib/gce.py

return False

self.access_token, self.token_expiry = _get_access_token(

http_request,

self._service_account_info['email']

This comment was marked as spam.

Sign in to view

Style + docstring fixes

baada2a

nathanielmanistaatgoogle reviewed Apr 4, 2016
View reviewed changes

oauth2client/contrib/gce.py

@@ -16,60 +16,117 @@

Utilities for making it easier to use OAuth 2.0 on Google Compute Engine.

"""

This comment was marked as spam.

Sign in to view

elibixby added 2 commits April 4, 2016 16:52

Style fixes

1ffa704

* Remove deserialization arg from constructor

Docstring and error prose fixes

ccad050

nathanielmanistaatgoogle reviewed Apr 5, 2016
View reviewed changes

elibixby added 3 commits April 5, 2016 10:13

Style fix

35dc570

More style fixes

d4a1bfc

Typo

7afce10

project id isn't really a property of creds

6bb58a3

elibixby closed this Apr 19, 2016

elibixby mentioned this pull request Jun 8, 2016

Factor metadata interface into a separate module #520

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update GCE AppAssertionCredentials #476

Update GCE AppAssertionCredentials #476

elibixby commented Mar 25, 2016

This comment was marked as spam.

elibixby commented Mar 25, 2016

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

coveralls commented Mar 29, 2016

coveralls commented Mar 29, 2016

coveralls commented Mar 29, 2016

This comment was marked as spam.

nathanielmanistaatgoogle commented Apr 1, 2016

elibixby commented Apr 1, 2016

nathanielmanistaatgoogle commented Apr 4, 2016

This comment was marked as spam.

elibixby commented Apr 5, 2016

This comment was marked as spam.

elibixby commented Apr 5, 2016

elibixby commented Apr 18, 2016

elibixby commented Apr 18, 2016

		@@ -16,60 +16,117 @@

		Utilities for making it easier to use OAuth 2.0 on Google Compute Engine.
		"""

Update GCE AppAssertionCredentials #476

Update GCE AppAssertionCredentials #476

Conversation

elibixby commented Mar 25, 2016

This comment was marked as spam.

elibixby commented Mar 25, 2016

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

coveralls commented Mar 29, 2016

coveralls commented Mar 29, 2016

coveralls commented Mar 29, 2016

This comment was marked as spam.

nathanielmanistaatgoogle commented Apr 1, 2016

elibixby commented Apr 1, 2016

nathanielmanistaatgoogle commented Apr 4, 2016

This comment was marked as spam.

elibixby commented Apr 5, 2016

This comment was marked as spam.

elibixby commented Apr 5, 2016

elibixby commented Apr 18, 2016

elibixby commented Apr 18, 2016