openstack/glance_store
Code Issues Proposed changes

s3: Do not log access keys

Browse Source 
The previous attempt a5ba027922 was
incomplete and there are still a few more logs where access keys are
logged. This fixes these to avoid leaking access keys to log.

Related-Bug: #2047688
Change-Id: I8dc564bed33d6fc71965f4f573ae9109b410b1d4
This commit is contained in:
Takashi Kajinami 2024-01-21 02:09:05 +09:00
parent e823a3caa0
commit d6e531af48
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
glance_store/_drivers/s3.py
View File

@ -539,10 +539,8 @@ class Store(glance_store.driver.Store):
key = s3_client.get_object(Bucket=bucket, Key=key) key = s3_client.get_object(Bucket=bucket, Key=key)
LOG.debug("Retrieved image object from S3 using s3_host=%(s3_host)s, " LOG.debug("Retrieved image object from S3 using s3_host=%(s3_host)s, "
"access_key=%(accesskey)s, bucket=%(bucket)s, " "bucket=%(bucket)s key=%(key)s)",
"key=%(key)s)", {'s3_host': loc.s3serviceurl, 'bucket': bucket, 'key': key})
{'s3_host': loc.s3serviceurl, 'accesskey': loc.accesskey,
'bucket': bucket, 'key': key})
cs = self.READ_CHUNKSIZE cs = self.READ_CHUNKSIZE
@ -828,9 +826,8 @@ class Store(glance_store.driver.Store):
raise exceptions.NotFound(image=key) raise exceptions.NotFound(image=key)
LOG.debug("Deleting image object from S3 using s3_host=%(s3_host)s, " LOG.debug("Deleting image object from S3 using s3_host=%(s3_host)s, "
"accesskey=%(accesskey)s, bucket=%(bucket)s, key=%(key)s)", "bucket=%(bucket)s, key=%(key)s)",
{'s3_host': loc.s3serviceurl, 'accesskey': loc.accesskey, {'s3_host': loc.s3serviceurl, 'bucket': bucket, 'key': key})
'bucket': bucket, 'key': key})
return s3_client.delete_object(Bucket=bucket, Key=key) return s3_client.delete_object(Bucket=bucket, Key=key)