April 2019 - tor-commits - lists.torproject.org

[snowflake/master] Modified log scrubber to handle split lines
by cohosh＠torproject.org 09 Apr '19

09 Apr '19

commit c6a4a4191f2031abc744013d63f536612c37b512 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Mon Mar 25 10:51:47 2019 -0400 Modified log scrubber to handle split lines Log scrubber now scrubs addresses even in the case where they are split across calls to the scrubber's output io.Writer. Added test cases to test that the writer behaves correctly across split lines. --- server/server.go | 24 +++++++++++++++++++++--- server/server_test.go | 47 +++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 66 insertions(+), 5 deletions(-) diff --git a/server/server.go b/server/server.go index decfed4..539d0e1 100644 --- a/server/server.go +++ b/server/server.go @@ -3,6 +3,7 @@ package main import ( + "bytes" "crypto/tls" "errors" "flag" @@ -66,15 +67,32 @@ var scrubberPatterns = []*regexp.Regexp{ // sanitizes logs and then writes to the provided io.Writer type logScrubber struct { output io.Writer + buffer []byte } -func (ls *logScrubber) Write(b []byte) (n int, err error) { +func scrub(b []byte) []byte { scrubbedBytes := b for _, pattern := range scrubberPatterns { scrubbedBytes = pattern.ReplaceAll(scrubbedBytes, []byte("[scrubbed]")) } + return scrubbedBytes +} - return ls.output.Write(scrubbedBytes) +func (ls *logScrubber) Write(b []byte) (n int, err error) { + n = len(b) + ls.buffer = append(ls.buffer, b...) + for { + i := bytes.LastIndexByte(ls.buffer, '\n') + if i == -1 { + return + } + fullLines := ls.buffer[:i+1] + _, err = ls.output.Write(scrub(fullLines)) + if err != nil { + return + } + ls.buffer = ls.buffer[i+1:] + } } // An abstraction that makes an underlying WebSocket connection look like an @@ -308,7 +326,7 @@ func main() { logOutput = f } //We want to send the log output through our scrubber first - log.SetOutput(&logScrubber{logOutput}) + log.SetOutput(&logScrubber{output: logOutput}) if !disableTLS && acmeHostnamesCommas == "" { log.Fatal("the --acme-hostnames option is required") diff --git a/server/server_test.go b/server/server_test.go index cfe4653..846d95e 100644 --- a/server/server_test.go +++ b/server/server_test.go @@ -50,7 +50,50 @@ func TestClientAddr(t *testing.T) { } } -func TestLogScrubber(t *testing.T) { +//Check to make sure that addresses split across calls to write are still scrubbed +func TestLogScrubberSplit(t *testing.T) { + input := []byte("test\nhttp2: panic serving [2620:101:f000:780:9097:75b1:519f:dbb8]:58344: interface conversion: *http2.responseWriter is not http.Hijacker: missing method Hijack\n") + + expected := "test\nhttp2: panic serving [scrubbed]:58344: interface conversion: *http2.responseWriter is not http.Hijacker: missing method Hijack\n" + + var buff bytes.Buffer + scrubber := &logScrubber{output: &buff} + n, err := scrubber.Write(input[:12]) //test\nhttp2: + if n != 12 { + t.Errorf("wrong number of bytes %d", n) + } + if err != nil { + t.Errorf("%q", err) + } + if buff.String() != "test\n" { + t.Errorf("Got %q, expected %q", buff.String(), "test\n") + } + + n, err = scrubber.Write(input[12:30]) //panic serving [2620:101:f + if n != 18 { + t.Errorf("wrong number of bytes %d", n) + } + if err != nil { + t.Errorf("%q", err) + } + if buff.String() != "test\n" { + t.Errorf("Got %q, expected %q", buff.String(), "test\n") + } + + n, err = scrubber.Write(input[30:]) //000:780:9097:75b1:519f:dbb8]:58344: interface conversion: *http2.responseWriter is not http.Hijacker: missing method Hijack\n + if n != (len(input) - 30) { + t.Errorf("wrong number of bytes %d", n) + } + if err != nil { + t.Errorf("%q", err) + } + if buff.String() != expected { + t.Errorf("Got %q, expected %q", buff.String(), expected) + } + +} + +func TestLogScrubberFormats(t *testing.T) { for _, test := range []struct { input, expected string }{ @@ -98,7 +141,7 @@ func TestLogScrubber(t *testing.T) { } { var buff bytes.Buffer log.SetFlags(0) //remove all extra log output for test comparisons - log.SetOutput(&logScrubber{&buff}) + log.SetOutput(&logScrubber{output: &buff}) log.Print(test.input) if buff.String() != test.expected { t.Errorf("%q: got %q, expected %q", test.input, buff.String(), test.expected)

1 0

[snowflake/master] Made regular expressions more precise
by cohosh＠torproject.org 09 Apr '19

09 Apr '19

commit 611cb889c5f2a12e1ccd3a3bea5bf6c6bf4234cb Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Mon Mar 25 12:56:10 2019 -0400 Made regular expressions more precise Modified regular expressions to not scrub fingerprints, but catch all instances of IPv4 and IPv6 addresses. Expanded test cases with those suggested by dcf. --- server/server.go | 20 ++++++++--- server/server_test.go | 95 ++++++++++++++++++++++++++++++++++----------------- 2 files changed, 79 insertions(+), 36 deletions(-) diff --git a/server/server.go b/server/server.go index 539d0e1..e6b6f10 100644 --- a/server/server.go +++ b/server/server.go @@ -56,13 +56,19 @@ additional HTTP listener on port 80 to work with ACME. flag.PrintDefaults() } +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 + `))` + + `|(([0-9a-fA-F]{0,4}:){2,7}([0-9a-fA-F]{0,4})?)` +const optionalPort = `(:\d{1,5})?` +const addressPattern = `((` + ipv4Address + `)|(\[(` + ipv6Address + `)\])|(` + ipv6Address + `))` + optionalPort +const fullAddrPattern = `(^|\s|[^\w:])` + addressPattern + `(\s|(:\s)|[^\w:]|$)` + var scrubberPatterns = []*regexp.Regexp{ - /* IPv6 */ - regexp.MustCompile(`\[([0-9a-fA-F]{0,4}:){2,7}([0-9a-fA-F]{0,4})?(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})?\]`), - /* IPv4 */ - regexp.MustCompile(`\b\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\b`), + regexp.MustCompile(fullAddrPattern), } +var addressRegexp = regexp.MustCompile(addressPattern) + // An io.Writer that can be used as the output for a logger that first // sanitizes logs and then writes to the provided io.Writer type logScrubber struct { @@ -73,7 +79,11 @@ type logScrubber struct { func scrub(b []byte) []byte { scrubbedBytes := b for _, pattern := range scrubberPatterns { - scrubbedBytes = pattern.ReplaceAll(scrubbedBytes, []byte("[scrubbed]")) + // this is a workaround since go does not yet support look ahead or look + // behind for regular expressions. + scrubbedBytes = pattern.ReplaceAllFunc(scrubbedBytes, func(b []byte) []byte { + return addressRegexp.ReplaceAll(b, []byte("[scrubbed]")) + }) } return scrubbedBytes } diff --git a/server/server_test.go b/server/server_test.go index 846d95e..fe895d2 100644 --- a/server/server_test.go +++ b/server/server_test.go @@ -54,7 +54,7 @@ func TestClientAddr(t *testing.T) { func TestLogScrubberSplit(t *testing.T) { input := []byte("test\nhttp2: panic serving [2620:101:f000:780:9097:75b1:519f:dbb8]:58344: interface conversion: *http2.responseWriter is not http.Hijacker: missing method Hijack\n") - expected := "test\nhttp2: panic serving [scrubbed]:58344: interface conversion: *http2.responseWriter is not http.Hijacker: missing method Hijack\n" + expected := "test\nhttp2: panic serving [scrubbed]: interface conversion: *http2.responseWriter is not http.Hijacker: missing method Hijack\n" var buff bytes.Buffer scrubber := &logScrubber{output: &buff} @@ -93,17 +93,18 @@ func TestLogScrubberSplit(t *testing.T) { } -func TestLogScrubberFormats(t *testing.T) { +//Test the log scrubber on known problematic log messages +func TestLogScrubberMessages(t *testing.T) { for _, test := range []struct { input, expected string }{ { - "http: TLS handshake error from 129.97.208.23:38310:", - "http: TLS handshake error from [scrubbed]:38310:\n", + "http: TLS handshake error from 129.97.208.23:38310: ", + "http: TLS handshake error from [scrubbed]: \n", }, { "http2: panic serving [2620:101:f000:780:9097:75b1:519f:dbb8]:58344: interface conversion: *http2.responseWriter is not http.Hijacker: missing method Hijack", - "http2: panic serving [scrubbed]:58344: interface conversion: *http2.responseWriter is not http.Hijacker: missing method Hijack\n", + "http2: panic serving [scrubbed]: interface conversion: *http2.responseWriter is not http.Hijacker: missing method Hijack\n", }, { //Make sure it doesn't scrub fingerprint @@ -111,32 +112,9 @@ func TestLogScrubberFormats(t *testing.T) { "a=fingerprint:sha-256 33:B6:FA:F6:94:CA:74:61:45:4A:D2:1F:2C:2F:75:8A:D9:EB:23:34:B2:30:E9:1B:2A:A6:A9:E0:44:72:CC:74\n", }, { - "[1::]:58344", - "[scrubbed]:58344\n", - }, - { - "[1:2:3:4:5:6::8]", - "[scrubbed]\n", - }, - { - "[1::7:8]", - "[scrubbed]\n", - }, - { - "[::4:5:6:7:8]", - "[scrubbed]\n", - }, - { - "[::255.255.255.255]", - "[scrubbed]\n", - }, - { - "[::ffff:0:255.255.255.255]", - "[scrubbed]\n", - }, - { - "[2001:db8:3:4::192.0.2.33]", - "[scrubbed]\n", + //try with enclosing parens + "(1:2:3:4:c:d:e:f) {1:2:3:4:c:d:e:f}", + "([scrubbed]) {[scrubbed]}\n", }, } { var buff bytes.Buffer @@ -149,3 +127,58 @@ func TestLogScrubberFormats(t *testing.T) { } } + +func TestLogScrubberGoodFormats(t *testing.T) { + for _, addr := range []string{ + // IPv4 + "1.2.3.4", + "255.255.255.255", + // IPv4 with port + "1.2.3.4:55", + "255.255.255.255:65535", + // IPv6 + "1:2:3:4:c:d:e:f", + "1111:2222:3333:4444:CCCC:DDDD:EEEE:FFFF", + // IPv6 with brackets + "[1:2:3:4:c:d:e:f]", + "[1111:2222:3333:4444:CCCC:DDDD:EEEE:FFFF]", + // IPv6 with brackets and port + "[1:2:3:4:c:d:e:f]:55", + "[1111:2222:3333:4444:CCCC:DDDD:EEEE:FFFF]:65535", + // compressed IPv6 + "::d:e:f", + "1:2:3::", + "1:2:3::d:e:f", + "1111:2222:3333::DDDD:EEEE:FFFF", + // compressed IPv6 with brackets + "[::d:e:f]", + "[1:2:3::]", + "[1:2:3::d:e:f]", + "[1111:2222:3333::DDDD:EEEE:FFFF]", + "[1:2:3:4:5:6::8]", + "[1::7:8]", + // compressed IPv6 with brackets and port + "[1::]:58344", + "[::d:e:f]:55", + "[1:2:3::]:55", + "[1:2:3::d:e:f]:55", + "[1111:2222:3333::DDDD:EEEE:FFFF]:65535", + // IPv4-compatible and IPv4-mapped + "::255.255.255.255", + "::ffff:255.255.255.255", + "[::255.255.255.255]", + "[::ffff:255.255.255.255]", + "[::255.255.255.255]:65535", + "[::ffff:255.255.255.255]:65535", + "[::ffff:0:255.255.255.255]", + "[2001:db8:3:4::192.0.2.33]", + } { + var buff bytes.Buffer + log.SetFlags(0) //remove all extra log output for test comparisons + log.SetOutput(&logScrubber{output: &buff}) + log.Print(addr) + if buff.String() != "[scrubbed]\n" { + t.Errorf("%q: Got %q, expected %q", addr, buff.String(), "[scrubbed]\n") + } + } +}

1 0

[snowflake/master] Restructured scrubbing code and tests
by cohosh＠torproject.org 09 Apr '19

09 Apr '19

commit 1ea467c4cf950b571ccb25b434b6cb29682fef07 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Mon Mar 25 09:59:20 2019 -0400 Restructured scrubbing code and tests It is now more readable, and the regexp's are only compiled once --- server/server.go | 34 +++++++++++---------- server/server_test.go | 85 +++++++++++++++++++++++++++++++-------------------- 2 files changed, 70 insertions(+), 49 deletions(-) diff --git a/server/server.go b/server/server.go index 74cffd6..decfed4 100644 --- a/server/server.go +++ b/server/server.go @@ -55,6 +55,13 @@ additional HTTP listener on port 80 to work with ACME. flag.PrintDefaults() } +var scrubberPatterns = []*regexp.Regexp{ + /* IPv6 */ + regexp.MustCompile(`\[([0-9a-fA-F]{0,4}:){2,7}([0-9a-fA-F]{0,4})?(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})?\]`), + /* IPv4 */ + regexp.MustCompile(`\b\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\b`), +} + // An io.Writer that can be used as the output for a logger that first // sanitizes logs and then writes to the provided io.Writer type logScrubber struct { @@ -62,13 +69,11 @@ type logScrubber struct { } func (ls *logScrubber) Write(b []byte) (n int, err error) { - //First scrub the input of IP addresses - reIPv4 := regexp.MustCompile(`\b\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\b`) - //Note that for embedded IPv4 address, the previous regex will scrub it - reIPv6 := regexp.MustCompile(`([0-9a-fA-F]{0,4}:){2,7}([0-9a-fA-F]{0,4})?`) - scrubbedBytes := reIPv4.ReplaceAll(b, []byte("X.X.X.X")) - scrubbedBytes = reIPv6.ReplaceAll(scrubbedBytes, - []byte("X:X:X:X:X:X:X:X")) + scrubbedBytes := b + for _, pattern := range scrubberPatterns { + scrubbedBytes = pattern.ReplaceAll(scrubbedBytes, []byte("[scrubbed]")) + } + return ls.output.Write(scrubbedBytes) } @@ -292,21 +297,18 @@ func main() { flag.Parse() log.SetFlags(log.LstdFlags | log.LUTC) + + var logOutput io.Writer = os.Stderr if logFilename != "" { f, err := os.OpenFile(logFilename, os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0600) if err != nil { log.Fatalf("can't open log file: %s", err) } defer f.Close() - //We want to send the log output through our scrubber first - scrubber := &logScrubber{f} - log.SetOutput(scrubber) - } else { - // we still want to send log output through our scrubber, even - // if no log file was specified - scrubber := &logScrubber{os.Stdout} - log.SetOutput(scrubber) - } + logOutput = f + } + //We want to send the log output through our scrubber first + log.SetOutput(&logScrubber{logOutput}) if !disableTLS && acmeHostnamesCommas == "" { log.Fatal("the --acme-hostnames option is required") diff --git a/server/server_test.go b/server/server_test.go index 537360a..cfe4653 100644 --- a/server/server_test.go +++ b/server/server_test.go @@ -51,39 +51,58 @@ func TestClientAddr(t *testing.T) { } func TestLogScrubber(t *testing.T) { - - var buff bytes.Buffer - scrubber := &logScrubber{&buff} - log.SetFlags(0) //remove all extra log output for test comparisons - log.SetOutput(scrubber) - - log.Printf("%s", "http: TLS handshake error from 129.97.208.23:38310:") - - //Example IPv4 address that ended up in log - if bytes.Compare(buff.Bytes(), []byte("http: TLS handshake error from X.X.X.X:38310:\n")) != 0 { - t.Errorf("log scrubber didn't scrub IPv4 address. Output: %s", string(buff.Bytes())) - } - buff.Reset() - - log.Printf("%s", "http2: panic serving [2620:101:f000:780:9097:75b1:519f:dbb8]:58344: interface conversion: *http2.responseWriter is not http.Hijacker: missing method Hijack") - - //Example IPv6 address that ended up in log - if bytes.Compare(buff.Bytes(), []byte("http2: panic serving [X:X:X:X:X:X:X:X]:58344: interface conversion: *http2.responseWriter is not http.Hijacker: missing method Hijack\n")) != 0 { - t.Errorf("log scrubber didn't scrub IPv6 address. Output: %s", string(buff.Bytes())) + for _, test := range []struct { + input, expected string + }{ + { + "http: TLS handshake error from 129.97.208.23:38310:", + "http: TLS handshake error from [scrubbed]:38310:\n", + }, + { + "http2: panic serving [2620:101:f000:780:9097:75b1:519f:dbb8]:58344: interface conversion: *http2.responseWriter is not http.Hijacker: missing method Hijack", + "http2: panic serving [scrubbed]:58344: interface conversion: *http2.responseWriter is not http.Hijacker: missing method Hijack\n", + }, + { + //Make sure it doesn't scrub fingerprint + "a=fingerprint:sha-256 33:B6:FA:F6:94:CA:74:61:45:4A:D2:1F:2C:2F:75:8A:D9:EB:23:34:B2:30:E9:1B:2A:A6:A9:E0:44:72:CC:74", + "a=fingerprint:sha-256 33:B6:FA:F6:94:CA:74:61:45:4A:D2:1F:2C:2F:75:8A:D9:EB:23:34:B2:30:E9:1B:2A:A6:A9:E0:44:72:CC:74\n", + }, + { + "[1::]:58344", + "[scrubbed]:58344\n", + }, + { + "[1:2:3:4:5:6::8]", + "[scrubbed]\n", + }, + { + "[1::7:8]", + "[scrubbed]\n", + }, + { + "[::4:5:6:7:8]", + "[scrubbed]\n", + }, + { + "[::255.255.255.255]", + "[scrubbed]\n", + }, + { + "[::ffff:0:255.255.255.255]", + "[scrubbed]\n", + }, + { + "[2001:db8:3:4::192.0.2.33]", + "[scrubbed]\n", + }, + } { + var buff bytes.Buffer + log.SetFlags(0) //remove all extra log output for test comparisons + log.SetOutput(&logScrubber{&buff}) + log.Print(test.input) + if buff.String() != test.expected { + t.Errorf("%q: got %q, expected %q", test.input, buff.String(), test.expected) + } } - buff.Reset() - - //Testing IPv6 edge cases - log.Printf("%s", "[1::]:58344") - log.Printf("%s", "[1:2:3:4:5:6::8]:58344") - log.Printf("%s", "[1::7:8]:58344") - log.Printf("%s", "[::4:5:6:7:8]:58344") - log.Printf("%s", "[::255.255.255.255]:58344") - log.Printf("%s", "[::ffff:0:255.255.255.255]:58344") - log.Printf("%s", "[2001:db8:3:4::192.0.2.33]:58344") - if bytes.Compare(buff.Bytes(), []byte("[X:X:X:X:X:X:X:X]:58344\n[X:X:X:X:X:X:X:X]:58344\n[X:X:X:X:X:X:X:X]:58344\n[X:X:X:X:X:X:X:X]:58344\n[X:X:X:X:X:X:X:XX.X.X.X]:58344\n[X:X:X:X:X:X:X:XX.X.X.X]:58344\n[X:X:X:X:X:X:X:XX.X.X.X]:58344\n")) != 0 { - t.Errorf("log scrubber didn't scrub IPv6 address. Output: %s", string(buff.Bytes())) - } - buff.Reset() }

1 0

[snowflake/master] Removed unecessary output from logs
by cohosh＠torproject.org 09 Apr '19

09 Apr '19

commit 3eb9064438ca6242f935173aed88ec29a0c16c7d Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Mon Mar 25 15:15:22 2019 -0400 Removed unecessary output from logs Removed raw bytes of ICE answers from broker logs and the SDP stanzas from the client logs --- broker/broker.go | 2 +- client/lib/webrtc.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/broker/broker.go b/broker/broker.go index a41aadb..b3a255e 100644 --- a/broker/broker.go +++ b/broker/broker.go @@ -203,7 +203,7 @@ func proxyAnswers(ctx *BrokerContext, w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusBadRequest) return } - log.Println("Received answer: ", body) + log.Println("Received answer.") snowflake.answerChannel <- body } diff --git a/client/lib/webrtc.go b/client/lib/webrtc.go index e71a407..fe8b44c 100644 --- a/client/lib/webrtc.go +++ b/client/lib/webrtc.go @@ -309,7 +309,7 @@ func (c *WebRTCPeer) exchangeSDP() error { answer = nil } } - log.Printf("Received Answer:\n\n%s\n", answer.Sdp) + log.Printf("Received Answer.\n") err := c.pc.SetRemoteDescription(answer) if nil != err { log.Println("WebRTC: Unable to SetRemoteDescription:", err)

1 0

[rbm/master] Bug 30039: Add the target_append and target_prepend input_files options
by gk＠torproject.org 09 Apr '19

09 Apr '19

commit 87adfb7b7be7e7e0f437020dbf8a119673133412 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 4 19:11:56 2019 +0200 Bug 30039: Add the target_append and target_prepend input_files options --- NEWS | 2 ++ doc/rbm_input_files.asc | 11 ++++++++++- lib/RBM.pm | 23 ++++++++++++++++++++--- 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index 256cad9..e54f988 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +- Add the target_append and target_prepend input_files options + - Add the build_log_append option - Add the rbm_tmp_dir option diff --git a/doc/rbm_input_files.asc b/doc/rbm_input_files.asc index 2716b23..d56f125 100644 --- a/doc/rbm_input_files.asc +++ b/doc/rbm_input_files.asc @@ -77,7 +77,16 @@ project:: target:: An array defining the build targets for the selected project. If this - option is not set, the current build target is forwarded. + option is not set, the current build target is forwarded. If set, + this replaces the current targets. + +target_append:: + The same as +target+, but instead of replacing the current targets, + the new targets are appended. + +target_prepend:: + The same as +target+, but instead of replacing the current targets, + the new targets are prepended. enable:: The files are enabled by default. If this option is set to diff --git a/lib/RBM.pm b/lib/RBM.pm index 1400700..4416a0c 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -784,10 +784,27 @@ sub input_files { if ($input_file->{enable} && !$t->('enable')) { next; } - if ($input_file->{target}) { + if ($input_file->{target} || $input_file->{target_append} + || $input_file->{target_prepend}) { $input_file = { %$input_file }; - $input_file->{target} = process_template_opt($project, - $input_file->{target}, $options); + if (ref $input_file->{target} eq 'ARRAY') { + $input_file->{target} = process_template_opt($project, + $input_file->{target}, $options); + } else { + $input_file->{target} = $config->{run}{target}; + } + if (ref $input_file->{target_prepend} eq 'ARRAY') { + $input_file->{target} = [ @{ process_template_opt($project, + $input_file->{target_prepend}, + $options) }, + @{$input_file->{target}} ]; + } + if (ref $input_file->{target_append} eq 'ARRAY') { + $input_file->{target} = [ @{$input_file->{target}}, + @{ process_template_opt($project, + $input_file->{target_append}, + $options) } ]; + } } if ($action eq 'getfnames') { my $getfnames_name;

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 09 Apr '19

09 Apr '19

commit 86236ceec4aa05fee09b4ed1fa13ebf0498700ad Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 9 18:20:00 2019 +0000 Update translations for torcheck_completed --- da/torcheck.po | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/da/torcheck.po b/da/torcheck.po index 6ac946708..939300f5b 100644 --- a/da/torcheck.po +++ b/da/torcheck.po @@ -7,13 +7,14 @@ # bna1605 <bna1605(a)gmail.com>, 2014 # Caspar Christensen, 2013 # Christian Villum <villum(a)autofunk.dk>, 2014-2015 +# Emma Peel, 2019 # scootergrisen, 2017-2019 # Simon Grønkjær <zimi.grnkjr(a)gmail.com>, 2012 msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2019-04-08 06:05+0000\n" +"PO-Revision-Date: 2019-04-09 18:11+0000\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" @@ -36,34 +37,26 @@ msgid "There is a security update available for Tor Browser." msgstr "Der er en sikkerhedsopdatering tilgængelig til Tor Browser." msgid "" -"<a href=\"https://www.torproject.org/download/download-easy.html\">Click " -"here to go to the download page</a>" -msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">Klik her for at gå til download siden</a>" +"<a href=\"https://www.torproject.org/download/\">Click here to go to the " +"download page</a>" +msgstr "<a href=\"https://www.torproject.org/download/\">Klik her for at gå til download siden</a>" msgid "Sorry. You are not using Tor." -msgstr "Desværre. Du anvender ikke Tor." +msgstr "Desværre. Du bruger ikke Tor." msgid "" "If you are attempting to use a Tor client, please refer to the <a " "href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a" -" href=\"https://www.torproject.org/docs/faq#DoesntWork\">instructions for " -"configuring your Tor client</a>." -msgstr "Hvis du forsøger at anvende en Tor-klient henvises der til <a href=\"https://www.torproject.org/\">Tor-webstedet</a> og særligt til <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">instruktionerne for opsætning af din Tor klient</a>." +" href=\"https://support.torproject.org/#faq\">frequently asked " +"questions</a>." +msgstr "Hvis du prøver at bruge en Tor-klient, så referer venligst til <a href=\"https://www.torproject.org/\">Tor-webstedet</a> og specielt de <a href=\"https://support.torproject.org/#faq\">oftest stillede spørgsmål</a>." msgid "Sorry, your query failed or an unexpected response was received." msgstr "Beklager. Din forespørgsel mislykkedes, eller et uventet svar blev modtaget." -msgid "" -"A temporary service outage prevents us from determining if your source IP " -"address is a <a href=\"https://www.torproject.org/\">Tor</a> node." -msgstr "Et midlertidigt servicenedbrud forhindre os i at fastslå om din kilde IP-adresse er et <a href=\"https://www.torproject.org/\">Tor</a>-knudepunkt." - msgid "Your IP address appears to be: " msgstr "Din IP-adresse ser ud til at være: " -msgid "Are you using Tor?" -msgstr "Bruger du Tor?" - msgid "This page is also available in the following languages:" msgstr "Siden er også tilgængelig på følgende sprog:" @@ -81,9 +74,6 @@ msgstr "Lær mere »" msgid "Go" msgstr "Start" -msgid "Short User Manual" -msgstr "Kort Bruger Manual" - msgid "Donate to Support Tor" msgstr "Donér for at støtte Tor" @@ -107,3 +97,6 @@ msgstr "Kør et relæ" msgid "Stay Anonymous" msgstr "Vær anonym" + +msgid "Relay Search" +msgstr "Relæsøgning"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 09 Apr '19

09 Apr '19

commit 23f64ff81f9c6d2063255471ac2c859b9ee9ffe5 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 9 18:19:54 2019 +0000 Update translations for torcheck --- da/torcheck.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/da/torcheck.po b/da/torcheck.po index 077071846..939300f5b 100644 --- a/da/torcheck.po +++ b/da/torcheck.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2019-04-09 07:48+0000\n" -"Last-Translator: Emma Peel\n" +"PO-Revision-Date: 2019-04-09 18:11+0000\n" +"Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -42,14 +42,14 @@ msgid "" msgstr "<a href=\"https://www.torproject.org/download/\">Klik her for at gå til download siden</a>" msgid "Sorry. You are not using Tor." -msgstr "Desværre. Du anvender ikke Tor." +msgstr "Desværre. Du bruger ikke Tor." msgid "" "If you are attempting to use a Tor client, please refer to the <a " "href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a" " href=\"https://support.torproject.org/#faq\">frequently asked " "questions</a>." -msgstr "" +msgstr "Hvis du prøver at bruge en Tor-klient, så referer venligst til <a href=\"https://www.torproject.org/\">Tor-webstedet</a> og specielt de <a href=\"https://support.torproject.org/#faq\">oftest stillede spørgsmål</a>." msgid "Sorry, your query failed or an unexpected response was received." msgstr "Beklager. Din forespørgsel mislykkedes, eller et uventet svar blev modtaget." @@ -99,4 +99,4 @@ msgid "Stay Anonymous" msgstr "Vær anonym" msgid "Relay Search" -msgstr "" +msgstr "Relæsøgning"

1 0

[tor/master] Actually I believe this should be an EINVAL.
by nickm＠torproject.org 09 Apr '19

09 Apr '19

commit 9f3f99938e441c09c1b3bf64510b8fb682dba007 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 9 13:49:10 2019 -0400 Actually I believe this should be an EINVAL. --- src/test/test_util.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 1b8897a17..3a0eb1515 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -699,13 +699,6 @@ test_util_time(void *arg) #define CHECK_TIMEGM_ARG_OUT_OF_RANGE(msg) \ CHECK_TIMEGM_WARNING("Out-of-range argument to tor_timegm") -#define CHECK_POSSIBLE_TIMEGM_ARG_OUT_OF_RANGE(msg) \ - do { \ - if (mock_saved_log_n_entries()) { \ - expect_single_log_msg_containing("Out-of-range argument");\ - } \ - teardown_capture_of_logs(); \ - } while (0) /* year */ @@ -894,7 +887,7 @@ test_util_time(void *arg) t_res = -1; CAPTURE(); tor_gmtime_r(&t_res, &b_time); - CHECK_POSSIBLE_TIMEGM_ARG_OUT_OF_RANGE(); + CHECK_POSSIBLE_EINVAL(); tt_assert(b_time.tm_year == (1970-1900) || b_time.tm_year == (1969-1900));

1 0

[tor/master] Merge branch 'maint-0.4.0'
by nickm＠torproject.org 09 Apr '19

09 Apr '19

commit c28cdcc9bf5df9ed6479881a1fc4124a7b7a2676 Merge: 16041d791 ffdca3dd1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 9 13:51:44 2019 -0400 Merge branch 'maint-0.4.0' src/test/test_util.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)

1 0

[tor/maint-0.4.0] Actually I believe this should be an EINVAL.
by nickm＠torproject.org 09 Apr '19

09 Apr '19

commit 9f3f99938e441c09c1b3bf64510b8fb682dba007 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 9 13:49:10 2019 -0400 Actually I believe this should be an EINVAL. --- src/test/test_util.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 1b8897a17..3a0eb1515 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -699,13 +699,6 @@ test_util_time(void *arg) #define CHECK_TIMEGM_ARG_OUT_OF_RANGE(msg) \ CHECK_TIMEGM_WARNING("Out-of-range argument to tor_timegm") -#define CHECK_POSSIBLE_TIMEGM_ARG_OUT_OF_RANGE(msg) \ - do { \ - if (mock_saved_log_n_entries()) { \ - expect_single_log_msg_containing("Out-of-range argument");\ - } \ - teardown_capture_of_logs(); \ - } while (0) /* year */ @@ -894,7 +887,7 @@ test_util_time(void *arg) t_res = -1; CAPTURE(); tor_gmtime_r(&t_res, &b_time); - CHECK_POSSIBLE_TIMEGM_ARG_OUT_OF_RANGE(); + CHECK_POSSIBLE_EINVAL(); tt_assert(b_time.tm_year == (1970-1900) || b_time.tm_year == (1969-1900));

1 0