archives/snowflake
2
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake.git synced 2025-10-13 20:11:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed log scrubber to not scrub timestamps

Browse source 
Our log scrubber was a bit over-zealous and was scrubbing timestamps as
well. While we're still over-scrubbing, we're now more precise and
ensure that compressed IPv6 addresses have "::"
This commit is contained in:
Cecylia Bocovich 2019-05-08 12:31:53 -04:00
parent d11e55aabe
commit 83fb5df260
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
common/safelog/log.go
View file

@ -10,10 +10,13 @@ import (
) )
const ipv4Address = `\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}` const ipv4Address = `\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}`
const ipv6Address = `(([0-9a-fA-F]{0,4}:){2,7}([0-9a-fA-F]{0,4})?(` + ipv4Address + `))` + const ipv6Address = `([0-9a-fA-F]{0,4}:){5,7}([0-9a-fA-F]{0,4})?`
`|(([0-9a-fA-F]{0,4}:){2,7}([0-9a-fA-F]{0,4})?)` const ipv6Compressed = `([0-9a-fA-F]{0,4}:){0,5}([0-9a-fA-F]{0,4})?(::)([0-9a-fA-F]{0,4}:){0,5}([0-9a-fA-F]{0,4})?`
const ipv6Full = `(` + ipv6Address + `(` + ipv4Address + `))` +
`|(` + ipv6Compressed + `(` + ipv4Address + `))` +
`|(` + ipv6Address + `)` + `|(` + ipv6Compressed + `)`
const optionalPort = `(:\d{1,5})?` const optionalPort = `(:\d{1,5})?`
const addressPattern = `((` + ipv4Address + `)|(\[(` + ipv6Address + `)\])|(` + ipv6Address + `))` + optionalPort const addressPattern = `((` + ipv4Address + `)|(\[(` + ipv6Full + `)\])|(` + ipv6Full + `))` + optionalPort
const fullAddrPattern = `(^|\s|[^\w:])` + addressPattern + `(\s|(:\s)|[^\w:]|$)` const fullAddrPattern = `(^|\s|[^\w:])` + addressPattern + `(\s|(:\s)|[^\w:]|$)`
var scrubberPatterns = []*regexp.Regexp{ var scrubberPatterns = []*regexp.Regexp{

8
common/safelog/log_test.go
View file

@ -72,6 +72,11 @@ func TestLogScrubberMessages(t *testing.T) {
"(1:2:3:4:c:d:e:f) {1:2:3:4:c:d:e:f}", "(1:2:3:4:c:d:e:f) {1:2:3:4:c:d:e:f}",
"([scrubbed]) {[scrubbed]}\n", "([scrubbed]) {[scrubbed]}\n",
}, },
{
//Make sure it doesn't scrub timestamps
"2019/05/08 15:37:31 starting",
"2019/05/08 15:37:31 starting\n",
},
} { } {
var buff bytes.Buffer var buff bytes.Buffer
log.SetFlags(0) //remove all extra log output for test comparisons log.SetFlags(0) //remove all extra log output for test comparisons
@ -102,9 +107,12 @@ func TestLogScrubberGoodFormats(t *testing.T) {
"[1:2:3:4:c:d:e:f]:55", "[1:2:3:4:c:d:e:f]:55",
"[1111:2222:3333:4444:CCCC:DDDD:EEEE:FFFF]:65535", "[1111:2222:3333:4444:CCCC:DDDD:EEEE:FFFF]:65535",
// compressed IPv6 // compressed IPv6
"::f",
"::d:e:f", "::d:e:f",
"1:2:3::", "1:2:3::",
"1:2:3::d:e:f", "1:2:3::d:e:f",
"1:2:3:d:e:f::",
"::1:2:3:d:e:f",
"1111:2222:3333::DDDD:EEEE:FFFF", "1111:2222:3333::DDDD:EEEE:FFFF",
// compressed IPv6 with brackets // compressed IPv6 with brackets
"[::d:e:f]", "[::d:e:f]",