Skip to content

Add generate_upload_policy #2998

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
theacodes merged 7 commits into from
Feb 16, 2017
Merged

Add generate_upload_policy #2998

theacodes merged 7 commits into from
Feb 16, 2017

Conversation

@theacodes
Copy link
Contributor

@theacodes theacodes commented Feb 11, 2017

Resolves #2861

@theacodes theacodes added the api: storage Issues related to the Cloud Storage API. label Feb 11, 2017
@googlebot googlebot added the cla: yes This human has signed the Contributor License Agreement. label Feb 11, 2017
dhermes
dhermes reviewed Feb 11, 2017
View reviewed changes
docs/storage_snippets.py
for key, value in policy.items()
)

upload_form = (

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

storage/google/cloud/storage/bucket.py Outdated

from google.cloud._helpers import _rfc3339_to_datetime
from google.cloud._helpers import (
_NOW, _rfc3339_to_datetime, _datetime_to_rfc3339)

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

storage/google/cloud/storage/bucket.py Outdated
:type expiration: datetime
:param expiration: Optional expiration in UTC. If not specified, the
policy will expire in 1 hour.

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

storage/google/cloud/storage/bucket.py

if not isinstance(credentials, google.auth.credentials.Signing):
auth_uri = ('http://google-cloud-python.readthedocs.io/en/latest/'
'google-cloud-auth.html#setting-up-a-service-account')

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

storage/google/cloud/storage/bucket.py

conditions = conditions + [
{'bucket': self.name}
]

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

storage/google/cloud/storage/bucket.py Outdated

policy_document = {
'expiration': _datetime_to_rfc3339(expiration),
'conditions': conditions

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

storage/google/cloud/storage/bucket.py
encoded_policy_document = base64.b64encode(
json.dumps(policy_document).encode('utf-8'))
signature = base64.b64encode(
credentials.sign_bytes(encoded_policy_document))

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

storage/google/cloud/storage/bucket.py Outdated
'bucket': self.name,
'GoogleAccessId': credentials.signer_email,
'policy': encoded_policy_document.decode('utf-8'),
'signature': signature.decode('utf-8')

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

storage/unit_tests/test_bucket.py
bucket = self._make_one(client=client, name=name)

conditions = [
['starts-with', '$key', '']]

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

storage/unit_tests/test_bucket.py
import json

credentials = _create_signing_credentials()
credentials.signer_email = mock.sentinel.signer_email

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

@theacodes
Copy link
Contributor Author

theacodes commented Feb 11, 2017

(Travis is finally green)

dhermes
dhermes reviewed Feb 16, 2017
View reviewed changes
docs/storage_snippets.py
for key, value in policy.items()
)

upload_form = (

This comment was marked as spam.

Sign in to view

storage/google/cloud/storage/bucket.py Outdated
`policy documents`_ documentation.
:type client: :class:`~google.cloud.storage.client.Client` or
`NoneType``

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

storage/google/cloud/storage/bucket.py
:rtype: dict
:returns: A dictionary of (form field name, form field value) of form
fields that should be added to your HTML upload form in order
to attach the signature.

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

storage/google/cloud/storage/bucket.py

if not isinstance(credentials, google.auth.credentials.Signing):
auth_uri = ('http://google-cloud-python.readthedocs.io/en/latest/'
'google-cloud-auth.html#setting-up-a-service-account')

This comment was marked as spam.

Sign in to view

storage/google/cloud/storage/bucket.py
encoded_policy_document = base64.b64encode(
json.dumps(policy_document).encode('utf-8'))
signature = base64.b64encode(
credentials.sign_bytes(encoded_policy_document))

This comment was marked as spam.

Sign in to view

@theacodes theacodes mentioned this pull request Feb 16, 2017
Closed
@theacodes
Copy link
Contributor Author

theacodes commented Feb 16, 2017

@dhermes LGTY?

@dhermes
Copy link
Contributor

dhermes commented Feb 16, 2017

Yup. But CircleCI is failing?

@dhermes
Copy link
Contributor

dhermes commented Feb 16, 2017

CircleCI is failing because you haven't rebased on master since #3002

@theacodes
Copy link
Contributor Author

theacodes commented Feb 16, 2017

@dhermes good eye, rebased. Will merge once all is green.

@theacodes theacodes merged commit 0a311f7 into googleapis:master Feb 16, 2017
@theacodes theacodes deleted the storage-policy branch February 16, 2017 21:11
@daspecster daspecster mentioned this pull request Feb 24, 2017
Merged
19 tasks
richkadel pushed a commit to richkadel/google-cloud-python that referenced this pull request May 6, 2017
Add generate_upload_policy (googleapis#2998)
ff6a77c
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

2 more reviewers

@dhermes dhermes dhermes left review comments

@lukesneeringer lukesneeringer lukesneeringer approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

api: storage Issues related to the Cloud Storage API. cla: yes This human has signed the Contributor License Agreement.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@theacodes @dhermes @lukesneeringer @googlebot