TrueCloudLab/rclone
16
0
Fork 4
Code Issues 4 Pull requests 2 Projects Releases 1 Packages Wiki Activity Actions

fs: Remove X-Auth-Token: from headers when dumping for swift

Browse source
This commit is contained in:
Nick Craig-Wood 2017-11-21 12:14:52 +00:00
parent 1a65a4e769
commit cbe5d7ce64
2 changed files with 33 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
fs/http.go
View file

@ -195,10 +195,8 @@ func checkServerTime(req *http.Request, resp *http.Response) {
checkedHostMu.Unlock() checkedHostMu.Unlock()
} }
var authBuf = []byte("Authorization: ") // cleanAuth gets rid of one authBuf header within the first 4k
func cleanAuth(buf, authBuf []byte) []byte {
// cleanAuth gets rid of one Authorization: header within the first 4k
func cleanAuth(buf []byte) []byte {
// Find how much buffer to check // Find how much buffer to check
n := 4096 n := 4096
if len(buf) < n { if len(buf) < n {
@ -227,6 +225,19 @@ func cleanAuth(buf []byte) []byte {
return buf[:i+n] return buf[:i+n]
} }
var authBufs = [][]byte{
[]byte("Authorization: "),
[]byte("X-Auth-Token: "),
}
// cleanAuths gets rid of all the possible Auth headers
func cleanAuths(buf []byte) []byte {
for _, authBuf := range authBufs {
buf = cleanAuth(buf, authBuf)
}
return buf
}
// RoundTrip implements the RoundTripper interface. // RoundTrip implements the RoundTripper interface.
func (t *Transport) RoundTrip(req *http.Request) (resp *http.Response, err error) { func (t *Transport) RoundTrip(req *http.Request) (resp *http.Response, err error) {
// Get transactions per second token first if limiting // Get transactions per second token first if limiting
@ -242,7 +253,7 @@ func (t *Transport) RoundTrip(req *http.Request) (resp *http.Response, err error
if t.dump&(DumpHeaders|DumpBodies|DumpAuth|DumpRequests|DumpResponses) != 0 { if t.dump&(DumpHeaders|DumpBodies|DumpAuth|DumpRequests|DumpResponses) != 0 {
buf, _ := httputil.DumpRequestOut(req, t.dump&(DumpBodies|DumpRequests) != 0) buf, _ := httputil.DumpRequestOut(req, t.dump&(DumpBodies|DumpRequests) != 0)
if t.dump&DumpAuth == 0 { if t.dump&DumpAuth == 0 {
buf = cleanAuth(buf) buf = cleanAuths(buf)
} }
Debugf(nil, "%s", separatorReq) Debugf(nil, "%s", separatorReq)
Debugf(nil, "%s (req %p)", "HTTP REQUEST", req) Debugf(nil, "%s (req %p)", "HTTP REQUEST", req)

18
fs/http_test.go
View file

@ -58,7 +58,23 @@ func TestCleanAuth(t *testing.T) {
{"Authorization: AAAAAAAAA\nPotato: Help\n", "Authorization: XXXX\nPotato: Help\n"}, {"Authorization: AAAAAAAAA\nPotato: Help\n", "Authorization: XXXX\nPotato: Help\n"},
{"Sausage: 1\nAuthorization: AAAAAAAAA\nPotato: Help\n", "Sausage: 1\nAuthorization: XXXX\nPotato: Help\n"}, {"Sausage: 1\nAuthorization: AAAAAAAAA\nPotato: Help\n", "Sausage: 1\nAuthorization: XXXX\nPotato: Help\n"},
} { } {
got := string(cleanAuth([]byte(test.in))) got := string(cleanAuth([]byte(test.in), authBufs[0]))
assert.Equal(t, test.want, got, test.in)
}
}
func TestCleanAuths(t *testing.T) {
for _, test := range []struct {
in string
want string
}{
{"", ""},
{"floo", "floo"},
{"Authorization: AAAAAAAAA\nPotato: Help\n", "Authorization: XXXX\nPotato: Help\n"},
{"X-Auth-Token: AAAAAAAAA\nPotato: Help\n", "X-Auth-Token: XXXX\nPotato: Help\n"},
{"X-Auth-Token: AAAAAAAAA\nAuthorization: AAAAAAAAA\nPotato: Help\n", "X-Auth-Token: XXXX\nAuthorization: XXXX\nPotato: Help\n"},
} {
got := string(cleanAuths([]byte(test.in)))
assert.Equal(t, test.want, got, test.in) assert.Equal(t, test.want, got, test.in)
} }
} }