Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
The Tor Project
Anti-censorship
Pluggable Transports
Snowflake
Commits
f58c865d
Commit
f58c865d
authored
Feb 07, 2020
by
Arlo Breault
Browse files
Add unsafe logging
parent
e521a721
Changes
4
Hide whitespace changes
Inline
Side-by-side
broker/broker.go
View file @
f58c865d
...
...
@@ -376,6 +376,7 @@ func main() {
var
certFilename
,
keyFilename
string
var
disableGeoip
bool
var
metricsFilename
string
var
unsafeLogging
bool
flag
.
StringVar
(
&
acmeEmail
,
"acme-email"
,
""
,
"optional contact email for Let's Encrypt notifications"
)
flag
.
StringVar
(
&
acmeHostnamesCommas
,
"acme-hostnames"
,
""
,
"comma-separated hostnames for TLS certificate"
)
...
...
@@ -388,13 +389,18 @@ func main() {
flag
.
BoolVar
(
&
disableTLS
,
"disable-tls"
,
false
,
"don't use HTTPS"
)
flag
.
BoolVar
(
&
disableGeoip
,
"disable-geoip"
,
false
,
"don't use geoip for stats collection"
)
flag
.
StringVar
(
&
metricsFilename
,
"metrics-log"
,
""
,
"path to metrics logging output"
)
flag
.
BoolVar
(
&
unsafeLogging
,
"unsafe-logging"
,
false
,
"prevent logs from being scrubbed"
)
flag
.
Parse
()
var
err
error
var
metricsFile
io
.
Writer
var
logOutput
io
.
Writer
=
os
.
Stderr
//We want to send the log output through our scrubber first
log
.
SetOutput
(
&
safelog
.
LogScrubber
{
Output
:
logOutput
})
if
unsafeLogging
{
log
.
SetOutput
(
logOutput
)
}
else
{
// We want to send the log output through our scrubber first
log
.
SetOutput
(
&
safelog
.
LogScrubber
{
Output
:
logOutput
})
}
log
.
SetFlags
(
log
.
LstdFlags
|
log
.
LUTC
)
...
...
client/snowflake.go
View file @
f58c865d
...
...
@@ -91,6 +91,7 @@ func main() {
logFilename
:=
flag
.
String
(
"log"
,
""
,
"name of log file"
)
logToStateDir
:=
flag
.
Bool
(
"logToStateDir"
,
false
,
"resolve the log file relative to tor's pt state dir"
)
keepLocalAddresses
:=
flag
.
Bool
(
"keepLocalAddresses"
,
false
,
"keep local LAN address ICE candidates"
)
unsafeLogging
:=
flag
.
Bool
(
"unsafe-logging"
,
false
,
"prevent logs from being scrubbed"
)
max
:=
flag
.
Int
(
"max"
,
DefaultSnowflakeCapacity
,
"capacity for number of multiplexed WebRTC peers"
)
flag
.
Parse
()
...
...
@@ -119,8 +120,12 @@ func main() {
defer
logFile
.
Close
()
logOutput
=
logFile
}
// We want to send the log output through our scrubber first
log
.
SetOutput
(
&
safelog
.
LogScrubber
{
Output
:
logOutput
})
if
*
unsafeLogging
{
log
.
SetOutput
(
logOutput
)
}
else
{
// 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 ---"
)
...
...
proxy-go/snowflake.go
View file @
f58c865d
...
...
@@ -408,12 +408,14 @@ func main() {
var
stunURL
string
var
logFilename
string
var
rawBrokerURL
string
var
unsafeLogging
bool
flag
.
UintVar
(
&
capacity
,
"capacity"
,
10
,
"maximum concurrent clients"
)
flag
.
StringVar
(
&
rawBrokerURL
,
"broker"
,
defaultBrokerURL
,
"broker URL"
)
flag
.
StringVar
(
&
relayURL
,
"relay"
,
defaultRelayURL
,
"websocket relay URL"
)
flag
.
StringVar
(
&
stunURL
,
"stun"
,
defaultSTUNURL
,
"stun URL"
)
flag
.
StringVar
(
&
logFilename
,
"log"
,
""
,
"log filename"
)
flag
.
BoolVar
(
&
unsafeLogging
,
"unsafe-logging"
,
false
,
"prevent logs from being scrubbed"
)
flag
.
Parse
()
var
logOutput
io
.
Writer
=
os
.
Stderr
...
...
@@ -426,8 +428,12 @@ func main() {
defer
f
.
Close
()
logOutput
=
io
.
MultiWriter
(
os
.
Stderr
,
f
)
}
//We want to send the log output through our scrubber first
log
.
SetOutput
(
&
safelog
.
LogScrubber
{
Output
:
logOutput
})
if
unsafeLogging
{
log
.
SetOutput
(
logOutput
)
}
else
{
// We want to send the log output through our scrubber first
log
.
SetOutput
(
&
safelog
.
LogScrubber
{
Output
:
logOutput
})
}
log
.
Println
(
"starting"
)
...
...
server/server.go
View file @
f58c865d
...
...
@@ -214,12 +214,14 @@ func main() {
var
acmeHostnamesCommas
string
var
disableTLS
bool
var
logFilename
string
var
unsafeLogging
bool
flag
.
Usage
=
usage
flag
.
StringVar
(
&
acmeEmail
,
"acme-email"
,
""
,
"optional contact email for Let's Encrypt notifications"
)
flag
.
StringVar
(
&
acmeHostnamesCommas
,
"acme-hostnames"
,
""
,
"comma-separated hostnames for TLS certificate"
)
flag
.
BoolVar
(
&
disableTLS
,
"disable-tls"
,
false
,
"don't use HTTPS"
)
flag
.
StringVar
(
&
logFilename
,
"log"
,
""
,
"log file to write to"
)
flag
.
BoolVar
(
&
unsafeLogging
,
"unsafe-logging"
,
false
,
"prevent logs from being scrubbed"
)
flag
.
Parse
()
log
.
SetFlags
(
log
.
LstdFlags
|
log
.
LUTC
)
...
...
@@ -233,8 +235,12 @@ func main() {
defer
f
.
Close
()
logOutput
=
f
}
//We want to send the log output through our scrubber first
log
.
SetOutput
(
&
safelog
.
LogScrubber
{
Output
:
logOutput
})
if
unsafeLogging
{
log
.
SetOutput
(
logOutput
)
}
else
{
// We want to send the log output through our scrubber first
log
.
SetOutput
(
&
safelog
.
LogScrubber
{
Output
:
logOutput
})
}
if
!
disableTLS
&&
acmeHostnamesCommas
==
""
{
log
.
Fatal
(
"the --acme-hostnames option is required"
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment