Merge pull request #8 from AdRoll/add-content-type-header

Add content-type header text/plain to passwords
AdRoll · May 18, 2020 · aa373ab · aa373ab
2 parents 726ebb5 + 6c74090
commit aa373ab
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/s3keyring/metadata.py b/s3keyring/metadata.py
@@ -8,7 +8,7 @@
 package = 's3keyring'
 project = "S3 backend for the keyring module"
 project_no_spaces = project.replace(' ', '')
-version = '0.7.1.post0'
+version = '0.7.1.post1'
 description = 'Keeps your secrets safe in S3'
 authors = ['German Gomez-Herrero']
 authors_string = ', '.join(authors)

diff --git a/s3keyring/s3.py b/s3keyring/s3.py
@@ -249,9 +249,13 @@ def set_password(self, service, username, password):
         # Save in S3 using both server and client side encryption
         keyname = self._get_s3_key(service, username)
         try:
-            self.bucket.Object(keyname).put(ACL='private', Body=pwd_base64,
-                                            ServerSideEncryption='aws:kms',
-                                            SSEKMSKeyId=self.kms_key_id)
+            self.bucket.Object(keyname).put(
+                ACL='private',
+                Body=pwd_base64,
+                ServerSideEncryption='aws:kms',
+                SSEKMSKeyId=self.kms_key_id,
+                ContentType='text/plain'
+            )
         except EndpointConnectionError:
             if self.use_local_keyring:
                 # Can't connect to S3: fallback to OS keyring