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

Use safelog scrubber in broker and proxy-go

Browse source
This commit is contained in:
Cecylia Bocovich 2019-04-11 14:47:31 -04:00
parent 49042511a3
commit 482d60d9d3
2 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
broker/broker.go
View file

@ -10,12 +10,15 @@ import (
"crypto/tls" "crypto/tls"
"flag" "flag"
"fmt" "fmt"
"io"
"io/ioutil" "io/ioutil"
"log" "log"
"net/http" "net/http"
"os"
"strings" "strings"
"time" "time"
"git.torproject.org/pluggable-transports/snowflake.git/common/safelog"
"golang.org/x/crypto/acme/autocert" "golang.org/x/crypto/acme/autocert"
) )
@ -233,6 +236,10 @@ func main() {
flag.BoolVar(&disableTLS, "disable-tls", false, "don't use HTTPS") flag.BoolVar(&disableTLS, "disable-tls", false, "don't use HTTPS")
flag.Parse() flag.Parse()
var logOutput io.Writer = os.Stderr
//We want to send the log output through our scrubber first
log.SetOutput(&safelog.LogScrubber{Output: logOutput})
log.SetFlags(log.LstdFlags | log.LUTC) log.SetFlags(log.LstdFlags | log.LUTC)
ctx := NewBrokerContext() ctx := NewBrokerContext()

7
proxy-go/snowflake.go
View file

@ -18,6 +18,7 @@ import (
"sync" "sync"
"time" "time"
"git.torproject.org/pluggable-transports/snowflake.git/common/safelog"
"github.com/keroserene/go-webrtc" "github.com/keroserene/go-webrtc"
"golang.org/x/net/websocket" "golang.org/x/net/websocket"
) )
@ -26,6 +27,7 @@ const defaultBrokerURL = "https://snowflake-broker.bamsoftware.com/"
const defaultRelayURL = "wss://snowflake.bamsoftware.com/" const defaultRelayURL = "wss://snowflake.bamsoftware.com/"
const defaultSTUNURL = "stun:stun.l.google.com:19302" const defaultSTUNURL = "stun:stun.l.google.com:19302"
const pollInterval = 5 * time.Second const pollInterval = 5 * time.Second
//amount of time after sending an SDP answer before the proxy assumes the //amount of time after sending an SDP answer before the proxy assumes the
//client is not going to connect //client is not going to connect
const dataChannelTimeout = time.Minute const dataChannelTimeout = time.Minute
@ -380,6 +382,7 @@ func main() {
flag.StringVar(&logFilename, "log", "", "log filename") flag.StringVar(&logFilename, "log", "", "log filename")
flag.Parse() flag.Parse()
var logOutput io.Writer = os.Stderr
log.SetFlags(log.LstdFlags | log.LUTC) log.SetFlags(log.LstdFlags | log.LUTC)
if logFilename != "" { if logFilename != "" {
f, err := os.OpenFile(logFilename, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0600) f, err := os.OpenFile(logFilename, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0600)
@ -387,8 +390,10 @@ func main() {
log.Fatal(err) log.Fatal(err)
} }
defer f.Close() defer f.Close()
log.SetOutput(io.MultiWriter(os.Stderr, f)) logOutput = io.MultiWriter(os.Stderr, f)
} }
//We want to send the log output through our scrubber first
log.SetOutput(&safelog.LogScrubber{Output: logOutput})
log.Println("starting") log.Println("starting")