[ARVADOS] updated: 2.1.0-927-ge45ba3bbf

[Git user]

Summary of changes:
 services/keep-web/s3.go      | 34 +++++++++++++++++++++++++++++-----
 services/keep-web/s3_test.go | 22 +++++++++++++++++-----
 2 files changed, 46 insertions(+), 10 deletions(-)

       via  e45ba3bbf5aa851bdf8de7612eb6b587b615ba21 (commit)
       via  d86405e79b04df920e2b196e521959f33649183c (commit)
      from  b2f695cf793f6c9b47607d93f5ed1af301f7f010 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit e45ba3bbf5aa851bdf8de7612eb6b587b615ba21
Merge: b2f695cf7 d86405e79
Author: Tom Clegg <tom at curii.com>
Date:   Thu Jun 17 22:59:00 2021 -0400

    Merge branch '17810-s3-escape-non-unreserved-chars'
    
    fixes #17810
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --cc services/keep-web/s3_test.go
index 4f70168b5,d336c5f09..f411fde87
--- a/services/keep-web/s3_test.go
+++ b/services/keep-web/s3_test.go
@@@ -558,12 -558,15 +558,15 @@@ func (s *IntegrationSuite) TestS3Normal
  		rawPath        string
  		normalizedPath string
  	}{
- 		{"/foo", "/foo"},             // boring case
- 		{"/foo%5fbar", "/foo_bar"},   // _ must not be escaped
- 		{"/foo%2fbar", "/foo/bar"},   // / must not be escaped
- 		{"/(foo)", "/%28foo%29"},     // () must be escaped
- 		{"/foo%5bbar", "/foo%5Bbar"}, // %XX must be uppercase
+ 		{"/foo", "/foo"},                           // boring case
+ 		{"/foo%5fbar", "/foo_bar"},                 // _ must not be escaped
+ 		{"/foo%2fbar", "/foo/bar"},                 // / must not be escaped
+ 		{"/(foo)/[];,", "/%28foo%29/%5B%5D%3B%2C"}, // ()[];, must be escaped
+ 		{"/foo%5bbar", "/foo%5Bbar"},               // %XX must be uppercase
 -		{"//foo///bar", "/foo/bar"},                // "//" and "///" must be squashed to "/"
++		{"//foo///.bar", "/foo/.bar"},              // "//" and "///" must be squashed to "/"
  	} {
+ 		c.Logf("trial %q", trial)
+ 
  		date := time.Now().UTC().Format("20060102T150405Z")
  		scope := "20200202/zzzzz/S3/aws4_request"
  		canonicalRequest := fmt.Sprintf("%s\n%s\n%s\n%s\n%s\n%s", "GET", trial.normalizedPath, "", "host:host.example.com\n", "host", "")

-----------------------------------------------------------------------


hooks/post-receive
--