File size: 3,347 Bytes
f50dbbb | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 | diff --git a/.changes/next-release/enhancement-cloudtrailvalidatelogs-71283.json b/.changes/next-release/enhancement-cloudtrailvalidatelogs-71283.json
new file mode 100644
index 000000000000..4c4b483f45c6
--- /dev/null
+++ b/.changes/next-release/enhancement-cloudtrailvalidatelogs-71283.json
@@ -0,0 +1,5 @@
+{
+ "type": "enhancement",
+ "category": "``cloudtrail validate-logs``",
+ "description": "Invalidate log files with data appended to the end of the gzip stream."
+}
diff --git a/awscli/customizations/cloudtrail/validation.py b/awscli/customizations/cloudtrail/validation.py
index a877ff7dfb38..b0c1870fc4c3 100644
--- a/awscli/customizations/cloudtrail/validation.py
+++ b/awscli/customizations/cloudtrail/validation.py
@@ -1136,6 +1136,9 @@ def _download_log(self, log):
remaining_data = gzip_inflater.flush()
if remaining_data:
rolling_hash.update(remaining_data)
+ if gzip_inflater.unused_data:
+ self._on_log_trailing_data(log)
+ return
computed_hash = rolling_hash.hexdigest()
if computed_hash != log['hashValue']:
self._on_log_invalid(log)
@@ -1243,6 +1246,14 @@ def _on_invalid_log_format(self, log_data):
True,
)
+ def _on_log_trailing_data(self, log_data):
+ self._invalid_logs += 1
+ self._write_status(
+ f'Log file\ts3://{log_data["s3Bucket"]}/{log_data["s3Object"]}\t'
+ f'INVALID: unexpected data after end of compressed stream',
+ True,
+ )
+
def _on_log_invalid(self, log_data):
self._invalid_logs += 1
self._write_status(
diff --git a/tests/functional/cloudtrail/test_validation.py b/tests/functional/cloudtrail/test_validation.py
index ac9d2db2a77d..ad386c0b1a2c 100644
--- a/tests/functional/cloudtrail/test_validation.py
+++ b/tests/functional/cloudtrail/test_validation.py
@@ -380,6 +380,33 @@ def test_fails_and_warns_when_log_hash_is_invalid(self):
self.assertIn('1/1 backfill digest files valid', stdout)
self.assertIn('0/2 log files valid, 2/2 log files INVALID', stdout)
+ def test_rejects_multi_member_gzip_log_file(self):
+ body = _gz_compress(self._logs[0]['_raw_value']) + _gz_compress(
+ '{"extra":"member"}'
+ )
+ key_provider, digest_provider, validator = create_scenario(
+ ['gap'], [[self._logs[0]]]
+ )
+ self.parsed_responses = [
+ {'LocationConstraint': ''},
+ {'Body': BytesIO(body)},
+ {'Body': BytesIO(body)},
+ ]
+ _setup_mock_traverser(
+ self._mock_traverser, key_provider, digest_provider, validator
+ )
+ stdout, stderr, rc = self.run_cmd(
+ f"cloudtrail validate-logs --trail-arn {TEST_TRAIL_ARN} "
+ f"--start-time {START_TIME_ARG} --region us-east-1",
+ 1,
+ )
+ self.assertIn(
+ 'Log file\ts3://1/key1\t'
+ 'INVALID: unexpected data after end of compressed stream',
+ stderr,
+ )
+ self.assertIn('0/2 log files valid, 2/2 log files INVALID', stdout)
+
def test_validates_valid_log_files(self):
key_provider, digest_provider, validator = create_scenario(
['gap', 'link', 'link'],
|