Add generate_upload_policy #2998

theacodes · 2017-02-11T00:16:07Z

Resolves #2861

docs/storage_snippets.py

+        for key, value in policy.items()
+    )
+
+    upload_form = (


storage/google/cloud/storage/bucket.py

 import six

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


storage/google/cloud/storage/bucket.py

+
+        :type expiration: datetime
+        :param expiration: Optional expiration in UTC. If not specified, the
+            policy will expire in 1 hour.


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')


storage/google/cloud/storage/bucket.py

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


storage/google/cloud/storage/bucket.py

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


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))


storage/google/cloud/storage/bucket.py

+            'bucket': self.name,
+            'GoogleAccessId': credentials.signer_email,
+            'policy': encoded_policy_document.decode('utf-8'),
+            'signature': signature.decode('utf-8')


storage/unit_tests/test_bucket.py

+        bucket = self._make_one(client=client, name=name)
+
+        conditions = [
+            ['starts-with', '$key', '']]


storage/unit_tests/test_bucket.py

+        import json
+
+        credentials = _create_signing_credentials()
+        credentials.signer_email = mock.sentinel.signer_email


theacodes · 2017-02-11T04:24:08Z

(Travis is finally green)

docs/storage_snippets.py

+        for key, value in policy.items()
+    )
+
+    upload_form = (


storage/google/cloud/storage/bucket.py

+                          `policy documents`_ documentation.
+
+        :type client: :class:`~google.cloud.storage.client.Client` or
+                      `NoneType``


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.


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')


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))


theacodes · 2017-02-16T19:12:50Z

@dhermes LGTY?

dhermes · 2017-02-16T19:48:55Z

Yup. But CircleCI is failing?

dhermes · 2017-02-16T19:49:34Z

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

theacodes · 2017-02-16T20:23:23Z

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

theacodes added the api: storage Issues related to the Cloud Storage API. label Feb 11, 2017

googlebot added the cla: yes This human has signed the Contributor License Agreement. label Feb 11, 2017

dhermes reviewed Feb 11, 2017

View reviewed changes

dhermes reviewed Feb 16, 2017

View reviewed changes

theacodes mentioned this pull request Feb 16, 2017

Cleanup duplicated "credentials can not sign" error #3031

Closed

lukesneeringer approved these changes Feb 16, 2017

View reviewed changes

Jon Wayne Parrott added 7 commits February 16, 2017 12:23

Add generate_upload_policy

80e3c0b

Fix small typo

beb9167

Address review comments

1719afa

Fix lint

fb11002

Fix condition comparison

46036d7

Fix coverage

d077e96

Address review comments

1327323

theacodes force-pushed the storage-policy branch from 4c5d439 to 1327323 Compare February 16, 2017 20:23

theacodes merged commit 0a311f7 into googleapis:master Feb 16, 2017

theacodes deleted the storage-policy branch February 16, 2017 21:11

daspecster mentioned this pull request Feb 24, 2017

Upgrading all versions for umbrella release. #3068

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

Add generate_upload_policy #2998

Add generate_upload_policy #2998

Conversation

theacodes commented Feb 11, 2017

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

theacodes commented Feb 11, 2017

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

theacodes commented Feb 16, 2017

dhermes commented Feb 16, 2017

dhermes commented Feb 16, 2017

theacodes commented Feb 16, 2017