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

Ported log sanitization to client

Browse source
This commit is contained in:
Cecylia Bocovich 2019-04-12 09:52:23 -04:00
parent 482d60d9d3
commit b4a4a256db
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
client/snowflake.go
View file

@ -16,6 +16,7 @@ import (
"git.torproject.org/pluggable-transports/goptlib.git" "git.torproject.org/pluggable-transports/goptlib.git"
sf "git.torproject.org/pluggable-transports/snowflake.git/client/lib" sf "git.torproject.org/pluggable-transports/snowflake.git/client/lib"
"git.torproject.org/pluggable-transports/snowflake.git/common/safelog"
"github.com/keroserene/go-webrtc" "github.com/keroserene/go-webrtc"
) )
@ -77,6 +78,12 @@ func main() {
webrtc.SetLoggingVerbosity(1) webrtc.SetLoggingVerbosity(1)
log.SetFlags(log.LstdFlags | log.LUTC) log.SetFlags(log.LstdFlags | log.LUTC)
// Don't write to stderr; versions of tor earlier than about
// 0.3.5.6 do not read from the pipe, and eventually we will
// deadlock because the buffer is full.
// https://bugs.torproject.org/26360
// https://bugs.torproject.org/25600#comment:14
var logOutput io.Writer = ioutil.Discard
if *logFilename != "" { if *logFilename != "" {
if *logToStateDir { if *logToStateDir {
stateDir, err := pt.MakeStateDir() stateDir, err := pt.MakeStateDir()
@ -91,15 +98,10 @@ func main() {
log.Fatal(err) log.Fatal(err)
} }
defer logFile.Close() defer logFile.Close()
log.SetOutput(logFile) logOutput = logFile
} else {
// Don't write to stderr; versions of tor earlier than about
// 0.3.5.6 do not read from the pipe, and eventually we will
// deadlock because the buffer is full.
// https://bugs.torproject.org/26360
// https://bugs.torproject.org/25600#comment:14
log.SetOutput(ioutil.Discard)
} }
//We want to send the log output through our scrubber first
log.SetOutput(&safelog.LogScrubber{Output: logOutput})
log.Println("\n\n\n --- Starting Snowflake Client ---") log.Println("\n\n\n --- Starting Snowflake Client ---")