From ae2f32baf143ecc312a54496f1b0df1f47af79d4 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Wed, 2 Feb 2022 17:12:48 +0100 Subject: [PATCH 1/2] Hide deleted key in bucket info (fix #211) --- src/garage/cli/util.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/garage/cli/util.rs b/src/garage/cli/util.rs index 61401e4c..7d496507 100644 --- a/src/garage/cli/util.rs +++ b/src/garage/cli/util.rs @@ -153,6 +153,9 @@ pub fn print_bucket_info(bucket: &Bucket, relevant_keys: &HashMap) println!("\nAuthorized keys:"); let mut table = vec![]; for (k, perm) in p.authorized_keys.items().iter() { + if !perm.is_any() { + continue; + } let rflag = if perm.allow_read { "R" } else { " " }; let wflag = if perm.allow_write { "W" } else { " " }; let oflag = if perm.allow_owner { "O" } else { " " }; -- 2.43.0 From 935670690f07fe1821052654e249cd7d69ce4e4b Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Wed, 2 Feb 2022 17:34:19 +0100 Subject: [PATCH 2/2] Probably fix test-smoke --- script/test-smoke.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/script/test-smoke.sh b/script/test-smoke.sh index 2dcd69ec..4483f65b 100755 --- a/script/test-smoke.sh +++ b/script/test-smoke.sh @@ -362,15 +362,15 @@ EOF aws s3api put-bucket-cors --bucket eprouvette --cors-configuration $CORS [ `aws s3api get-bucket-cors --bucket eprouvette | jq -c` == $CORS ] - curl -s -i -H 'Origin: http://example.com' http://eprouvette.web.garage.localhost:3921 | grep access-control-allow-origin - curl -s -i -X OPTIONS -H 'Access-Control-Request-Method: PUT' -H 'Origin: http://example.com' http://eprouvette.web.garage.localhost:3921|grep access-control-allow-methods - curl -s -i -X OPTIONS -H 'Access-Control-Request-Method: DELETE' -H 'Origin: http://example.com' http://eprouvette.web.garage.localhost:3921 |grep '403 Forbidden' + curl -s -i -H 'Origin: http://example.com' --header "Host: eprouvette.web.garage.localhost" http://127.0.0.1:3921/ | grep access-control-allow-origin + curl -s -i -X OPTIONS -H 'Access-Control-Request-Method: PUT' -H 'Origin: http://example.com' --header "Host: eprouvette.web.garage.localhost" http://127.0.0.1:3921/ | grep access-control-allow-methods + curl -s -i -X OPTIONS -H 'Access-Control-Request-Method: DELETE' -H 'Origin: http://example.com' --header "Host: eprouvette.web.garage.localhost" http://127.0.0.1:3921/ | grep '403 Forbidden' #@TODO we may want to test the S3 endpoint but we need to handle authentication, which is way more complex. aws s3api delete-bucket-cors --bucket eprouvette ! [ -s `aws s3api get-bucket-cors --bucket eprouvette` ] - curl -s -i -X OPTIONS -H 'Access-Control-Request-Method: PUT' -H 'Origin: http://example.com' http://eprouvette.web.garage.localhost:3921|grep '403 Forbidden' + curl -s -i -X OPTIONS -H 'Access-Control-Request-Method: PUT' -H 'Origin: http://example.com' --header "Host: eprouvette.web.garage.localhost" http://127.0.0.1:3921/ | grep '403 Forbidden' aws s3api delete-object --bucket eprouvette --key index.html garage -c /tmp/config.1.toml bucket website --deny eprouvette fi -- 2.43.0