Identify grantee by email address

VirtueSecurity · Sep 21, 2017 · 1451512 · 1451512
1 parent ad2e303
commit 1451512
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/aws_extender.py b/aws_extender.py
@@ -385,8 +385,8 @@ def enumerate_keys(bucket, bucket_name, bucket_type):
             try:
                 bucket_acl = bucket.get_acl().acl
                 for grant in bucket_acl.grants:
-                    grants.append((grant.display_name or grant.uri or grant.id) + '->' +
-                                  grant.permission)
+                    grants.append((grant.display_name or grant.uri or grant.id or
+                                   grant.email_address) + '->' + grant.permission)
                 issues.append('s3:GetBucketAcl<ul><li>%s</li></ul>' % '</li><li>'.join(grants))
             except S3ResponseError as error:
                 print('Error Code (get_bucket_acl): ' + str(error.error_code))
@@ -770,8 +770,8 @@ def test_object(self, bucket_name, bucket_type, key, mark=True):
         try:
             key_acl = key_obj.get_acl().acl
             for grant in key_acl.grants:
-                grants.append((grant.display_name or grant.uri or grant.id) + '->' +
-                              grant.permission)
+                grants.append((grant.display_name or grant.uri or grant.id or
+                               grant.email_address) + '->' + grant.permission)
             permission = 's3:GetObjectAcl' if bucket_type == 'S3' else 'getIamPolicy'
             issues.append('%s<ul><li>%s</li></ul>' % (permission, '</li><li>'.join(grants)))
         except S3ResponseError: