From e2d27e1e9edb444fc087715b05404f88ac3721f9 Mon Sep 17 00:00:00 2001 From: Bluesaxorcist Date: Mon, 27 Jul 2020 12:42:36 -0500 Subject: [PATCH] changed logging to a new liibrary --- ChangeLog | 4 ++-- doc/obfs4proxy.1 | 10 ++++---- transports/Dust/v2/go.sum | 4 ++-- transports/Dust/v3/Dust.go | 11 ++++----- transports/Dust/v3/Dust_test.go | 4 ++-- transports/Dust/v3/go.mod | 1 + transports/Dust/v3/go.sum | 5 ++++ transports/Optimizer/v3/Optimizer_test.go | 16 ++++++------- transports/Optimizer/v3/go.mod | 2 +- transports/Optimizer/v3/go.sum | 4 ++++ transports/Replicant/v3/Optimizer.go | 10 ++++---- transports/Replicant/v3/go.mod | 1 - transports/Replicant/v3/go.sum | 4 ++-- transports/Replicant/v3/replicant_test.go | 6 ++--- transports/meeklite/v3/go.mod | 2 +- transports/meeklite/v3/go.sum | 4 ++-- transports/meeklite/v3/meeklite.go | 6 ++--- transports/meeklite/v3/meeklite_test.go | 4 ++-- transports/meekserver/v2/meek-server.go | 2 +- transports/meekserver/v3/go.mod | 2 +- transports/meekserver/v3/go.sum | 4 ++-- transports/meekserver/v3/meek-server.go | 2 +- transports/meekserver/v3/meekserver_test.go | 4 ++-- transports/meekserver/v3/pt21.go | 6 ++--- transports/obfs2/v2/go.mod | 2 +- transports/obfs2/v2/go.sum | 4 ++-- transports/obfs2/v2/obfs2.go | 12 +++++----- transports/obfs2/v2/obfs2_test.go | 4 ++-- transports/obfs2/v3/go.mod | 2 +- transports/obfs2/v3/go.sum | 4 ++-- transports/obfs2/v3/obfs2.go | 6 ++--- transports/obfs2/v3/obfs2_test.go | 4 ++-- transports/obfs4/v3/go.mod | 2 +- transports/obfs4/v3/go.sum | 6 +++-- transports/obfs4/v3/obfs4.go | 26 +++++++++------------ transports/obfs4/v3/test_utils.go | 20 +++++++--------- transports/shadow/v3/go.mod | 2 +- transports/shadow/v3/go.sum | 8 +++++-- transports/shadow/v3/shadow.go | 8 +++---- transports/shadow/v3/shadow_test.go | 4 ++-- 40 files changed, 118 insertions(+), 114 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8c89813..d10cddf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,7 +10,7 @@ Changes in version 0.0.7 - 2016-11-15: reduce memory consumption. Patch by oxtoacart. Changes in version 0.0.6 - 2016-01-25: - - Delay transport factory initialization till after logging has been + - Delay transport factory initialization till after golog has been initialized. - Add a meek client implementation (WARNING: Does not support using a helper to normalize TLS signatures). The brave people that want to use @@ -22,7 +22,7 @@ Changes in version 0.0.5 - 2015-04-15: - Changed the go.net import path to the new location (golang.org/x/net). - Added limited support for detecting if the parent process crashes. - Support for tor feature #15335 (stdin based termination notification). - - Moved the leveled logging wrappers into common/log so they are usable + - Moved the leveled golog wrappers into common/log so they are usable in transport implementations. - Added a DEBUG log level. - Use a bundled SOCKS 5 server instead of goptlib's SocksListener. diff --git a/doc/obfs4proxy.1 b/doc/obfs4proxy.1 index 13b89fd..17c640a 100644 --- a/doc/obfs4proxy.1 +++ b/doc/obfs4proxy.1 @@ -24,15 +24,15 @@ Display usage information and exit. \fB\-\-version\fR Display version information and exit. .TP -\fB\-\-enableLogging\fR -Enable logging. +\fB\-\-enablegolog\fR +Enable golog. .TP \fB\-\-logLevel\fR=\fIlevel\fR Specify the maximum log severity to log out of "\fBERROR\fR", "\fBWARN\fR", "\fBINFO\fR", and "\fBDEBUG\fR". .TP -\fB\-\-unsafeLogging\fR -Disable the IP address scrubber when logging, storing personally identifiable +\fB\-\-unsafegolog\fR +Disable the IP address scrubber when golog, storing personally identifiable information in the logs. .TP \fB\-\-obfs4\-distBias\fR @@ -45,7 +45,7 @@ Pluggable Transport Specification. .PP \fIDataDirectory\fR\fB/pt_state/obfs4proxy.log\fR .RS 4 -The log file, assuming logging is enabled. +The log file, assuming golog is enabled. .RE .PP \fIDataDirectory\fR\fB/pt_state/obfs4_state.json\fR diff --git a/transports/Dust/v2/go.sum b/transports/Dust/v2/go.sum index 609dff0..3284541 100644 --- a/transports/Dust/v2/go.sum +++ b/transports/Dust/v2/go.sum @@ -11,8 +11,8 @@ github.com/blanu/Dust v1.0.1/go.mod h1:jLFQI2Ufz4kBnGiTzh8O9+/p4U/9MLbouXkaympnT github.com/blanu/Dust/go/v2/interface v1.0.1 h1:lIQrNXljx8vgTTwB+gObrkA6jBhokmgH/uHp1OxbqxE= github.com/blanu/Dust/go/v2/interface v1.0.1/go.mod h1:0NnpBd5fkRrG2I/pf6bcUaL5jpp84LeShsQzn4gCOCw= github.com/dchest/siphash v1.2.1/go.mod h1:q+IRvb2gOSrUnYoPqHiyHXS0FOBBOdl6tONBlVnOnt4= -github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 h1:lDH9UUVJtmYCjyT0CI4q8xvlXPxeZ0gYCVvWbmPlp88= -github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= + h1:lDH9UUVJtmYCjyT0CI4q8xvlXPxeZ0gYCVvWbmPlp88= +/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/willscott/goturn v0.0.0-20170802220503-19f41278d0c9/go.mod h1:PfwRjodCaQXOsHnh2DeVaXqCFCIrbn5WLj1+A5bQkD4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= diff --git a/transports/Dust/v3/Dust.go b/transports/Dust/v3/Dust.go index f1686fd..8e369d5 100644 --- a/transports/Dust/v3/Dust.go +++ b/transports/Dust/v3/Dust.go @@ -26,10 +26,7 @@ package Dust import ( "fmt" - "github.com/OperatorFoundation/obfs4/common/log" - - //"github.com/OperatorFoundation/obfs4/common/log" - "github.com/op/go-logging" + "github.com/kataras/golog" "golang.org/x/net/proxy" "net" "time" @@ -71,14 +68,14 @@ type Transport struct { Address string Dialer proxy.Dialer ServerConfig *dustServer - Log *logging.Logger + Log *golog.Logger } type Config struct { ServerPublic string `json:"server-public"` } -func New(serverPublic string, address string, dialer proxy.Dialer, serverConfig *dustServer, log *logging.Logger) Transport { +func New(serverPublic string, address string, dialer proxy.Dialer, serverConfig *dustServer, log *golog.Logger) Transport { return Transport{ ServerPublic: serverPublic, Address: address, @@ -130,7 +127,7 @@ func (transport *dustClient) Dial(address string) (net.Conn, error) { if err != nil { closeErr := conn.Close() if closeErr != nil { - log.Errorf("could not close") + golog.Error("could not close") } return conn, dialErr } diff --git a/transports/Dust/v3/Dust_test.go b/transports/Dust/v3/Dust_test.go index 3068e09..ec86131 100644 --- a/transports/Dust/v3/Dust_test.go +++ b/transports/Dust/v3/Dust_test.go @@ -9,7 +9,7 @@ package Dust import ( - "github.com/op/go-logging" + "github.com/kataras/golog" "golang.org/x/net/proxy" "testing" ) @@ -87,7 +87,7 @@ func TestDust(t *testing.T) { func TestDustV3(t *testing.T) { //create a server - var log = logging.MustGetLogger("dust") + var log = golog.MustGetLogger("dust") serverConfig := dustServer{ serverPrivkey: nil, dialer: nil, diff --git a/transports/Dust/v3/go.mod b/transports/Dust/v3/go.mod index e6761dc..b3c6090 100644 --- a/transports/Dust/v3/go.mod +++ b/transports/Dust/v3/go.mod @@ -7,5 +7,6 @@ require ( github.com/OperatorFoundation/shapeshifter-ipc/v2 v2.0.0 github.com/blanu/Dust v1.0.1 // indirect github.com/blanu/Dust/go/v2/interface v1.0.1 + github.com/kataras/golog v0.0.18 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b ) diff --git a/transports/Dust/v3/go.sum b/transports/Dust/v3/go.sum index dd89648..799dbcf 100644 --- a/transports/Dust/v3/go.sum +++ b/transports/Dust/v3/go.sum @@ -11,6 +11,10 @@ github.com/blanu/Dust v1.0.1/go.mod h1:jLFQI2Ufz4kBnGiTzh8O9+/p4U/9MLbouXkaympnT github.com/blanu/Dust/go/v2/interface v1.0.1 h1:lIQrNXljx8vgTTwB+gObrkA6jBhokmgH/uHp1OxbqxE= github.com/blanu/Dust/go/v2/interface v1.0.1/go.mod h1:0NnpBd5fkRrG2I/pf6bcUaL5jpp84LeShsQzn4gCOCw= github.com/dchest/siphash v1.2.1/go.mod h1:q+IRvb2gOSrUnYoPqHiyHXS0FOBBOdl6tONBlVnOnt4= +github.com/kataras/golog v0.0.18 h1:Td7hcKN25yzqB/0SO5iohOsMk5Mq5V9kDtM5apaJLY0= +github.com/kataras/golog v0.0.18/go.mod h1:jRYl7dFYqP8aQj9VkwdBUXYZSfUktm+YYg1arJILfyw= +github.com/kataras/pio v0.0.8 h1:6pX6nHJk7DAV3x1dEimibQF2CmJLlo0jWVmM9yE9KY8= +github.com/kataras/pio v0.0.8/go.mod h1:NFfMp2kVP1rmV4N6gH6qgWpuoDKlrOeYi3VrAIWCGsE= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 h1:lDH9UUVJtmYCjyT0CI4q8xvlXPxeZ0gYCVvWbmPlp88= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/willscott/goturn v0.0.0-20170802220503-19f41278d0c9/go.mod h1:PfwRjodCaQXOsHnh2DeVaXqCFCIrbn5WLj1+A5bQkD4= @@ -22,5 +26,6 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20200226121028-0de0cce0169b h1:0mm1VjtFUOIlE1SbDlwjYaDxZVDP2S5ou6y0gSgXHu8= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/transports/Optimizer/v3/Optimizer_test.go b/transports/Optimizer/v3/Optimizer_test.go index c9afc04..bd6dfc0 100644 --- a/transports/Optimizer/v3/Optimizer_test.go +++ b/transports/Optimizer/v3/Optimizer_test.go @@ -5,7 +5,7 @@ import ( "github.com/OperatorFoundation/shapeshifter-transports/transports/obfs2/v3" "github.com/OperatorFoundation/shapeshifter-transports/transports/obfs4/v3" "github.com/OperatorFoundation/shapeshifter-transports/transports/shadow/v3" - "github.com/op/go-logging" + "github.com/kataras/golog" "golang.org/x/net/proxy" "io/ioutil" "net" @@ -82,7 +82,7 @@ func TestShadowDial(t *testing.T) { } func TestOptimizerShadowDial(t *testing.T) { - shadowTransport := shadow.NewTransport("1234", "CHACHA20-IETF-POLY1305", "127.0.0.1:1235", &logging.Logger{}) + shadowTransport := shadow.NewTransport("1234", "CHACHA20-IETF-POLY1305", "127.0.0.1:1235", &golog.Logger{}) transports := []TransportDialer{&shadowTransport} strategy := NewFirstStrategy(transports) optimizerTransport := NewOptimizerClient(transports, strategy) @@ -93,7 +93,7 @@ func TestOptimizerShadowDial(t *testing.T) { } func TestOptimizerObfs2Dial(t *testing.T) { - obfs2Transport := obfs2.New("127.0.0.1:1237", proxy.Direct, &logging.Logger{}) + obfs2Transport := obfs2.New("127.0.0.1:1237", proxy.Direct, &golog.Logger{}) transports := []TransportDialer{obfs2Transport} strategy := NewFirstStrategy(transports) optimizerTransport := NewOptimizerClient(transports, strategy) @@ -148,7 +148,7 @@ func TestOptimizerTransportFirstDial(t *testing.T) { IatMode: 0, Address: "127.0.0.1:1234", Dialer: dialer} - shadowTransport := shadow.NewTransport("1234", "CHACHA20-IETF-POLY1305", "127.0.0.1:1235", &logging.Logger{}) + shadowTransport := shadow.NewTransport("1234", "CHACHA20-IETF-POLY1305", "127.0.0.1:1235", &golog.Logger{}) transports := []TransportDialer{obfs4Transport, &shadowTransport} strategy := NewFirstStrategy(transports) optimizerTransport := NewOptimizerClient(transports, strategy) @@ -173,7 +173,7 @@ func TestOptimizerTransportRandomDial(t *testing.T) { Address: "127.0.0.1:1234", Dialer: dialer, } - shadowTransport := shadow.NewTransport("1234", "CHACHA20-IETF-POLY1305", "127.0.0.1:1235", &logging.Logger{}) + shadowTransport := shadow.NewTransport("1234", "CHACHA20-IETF-POLY1305", "127.0.0.1:1235", &golog.Logger{}) transports := []TransportDialer{obfs4Transport, &shadowTransport} strategy := NewRandomStrategy(transports) optimizerTransport := NewOptimizerClient(transports, strategy) @@ -199,7 +199,7 @@ func TestOptimizerTransportRotateDial(t *testing.T) { Address: "127.0.0.1:1234", Dialer: dialer, } - shadowTransport := shadow.NewTransport("1234", "CHACHA20-IETF-POLY1305", "127.0.0.1:1235", &logging.Logger{}) + shadowTransport := shadow.NewTransport("1234", "CHACHA20-IETF-POLY1305", "127.0.0.1:1235", &golog.Logger{}) transports := []TransportDialer{obfs4Transport, &shadowTransport} strategy := NewRotateStrategy(transports) optimizerTransport := NewOptimizerClient(transports, strategy) @@ -225,7 +225,7 @@ func TestOptimizerTransportTrackDial(t *testing.T) { Address: "127.0.0.1:1234", Dialer: dialer, } - shadowTransport := shadow.NewTransport("1234", "CHACHA20-IETF-POLY1305", "127.0.0.1:1235", &logging.Logger{}) + shadowTransport := shadow.NewTransport("1234", "CHACHA20-IETF-POLY1305", "127.0.0.1:1235", &golog.Logger{}) transports := []TransportDialer{obfs4Transport, &shadowTransport} strategy := NewTrackStrategy(transports) optimizerTransport := NewOptimizerClient(transports, strategy) @@ -251,7 +251,7 @@ func TestOptimizerTransportMinimizeDialDurationDial(t *testing.T) { Address: "127.0.0.1:1234", Dialer: dialer, } - shadowTransport := shadow.NewTransport("1234", "CHACHA20-IETF-POLY1305", "127.0.0.1:1235", &logging.Logger{}) + shadowTransport := shadow.NewTransport("1234", "CHACHA20-IETF-POLY1305", "127.0.0.1:1235", &golog.Logger{}) transports := []TransportDialer{obfs4Transport, &shadowTransport} strategy := NewMinimizeDialDuration(transports) optimizerTransport := NewOptimizerClient(transports, strategy) diff --git a/transports/Optimizer/v3/go.mod b/transports/Optimizer/v3/go.mod index e76bf43..25eb265 100644 --- a/transports/Optimizer/v3/go.mod +++ b/transports/Optimizer/v3/go.mod @@ -7,6 +7,6 @@ require ( github.com/OperatorFoundation/shapeshifter-transports/transports/obfs2/v3 v3.0.6 github.com/OperatorFoundation/shapeshifter-transports/transports/obfs4/v3 v3.0.6 github.com/OperatorFoundation/shapeshifter-transports/transports/shadow/v3 v3.0.6 - github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 + github.com/kataras/golog v0.0.18 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b ) diff --git a/transports/Optimizer/v3/go.sum b/transports/Optimizer/v3/go.sum index 28acf49..f1e1d12 100644 --- a/transports/Optimizer/v3/go.sum +++ b/transports/Optimizer/v3/go.sum @@ -17,6 +17,10 @@ github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmH github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA= github.com/dchest/siphash v1.2.1 h1:4cLinnzVJDKxTCl9B01807Yiy+W7ZzVHj/KIroQRvT4= github.com/dchest/siphash v1.2.1/go.mod h1:q+IRvb2gOSrUnYoPqHiyHXS0FOBBOdl6tONBlVnOnt4= +github.com/kataras/golog v0.0.18 h1:Td7hcKN25yzqB/0SO5iohOsMk5Mq5V9kDtM5apaJLY0= +github.com/kataras/golog v0.0.18/go.mod h1:jRYl7dFYqP8aQj9VkwdBUXYZSfUktm+YYg1arJILfyw= +github.com/kataras/pio v0.0.8 h1:6pX6nHJk7DAV3x1dEimibQF2CmJLlo0jWVmM9yE9KY8= +github.com/kataras/pio v0.0.8/go.mod h1:NFfMp2kVP1rmV4N6gH6qgWpuoDKlrOeYi3VrAIWCGsE= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 h1:lDH9UUVJtmYCjyT0CI4q8xvlXPxeZ0gYCVvWbmPlp88= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/shadowsocks/go-shadowsocks2 v0.0.11 h1:dXloqEhYnZV40jblWTK8kWeC0Eb+dgql4S0tj99e8j0= diff --git a/transports/Replicant/v3/Optimizer.go b/transports/Replicant/v3/Optimizer.go index 5fdedc1..c7e28b7 100644 --- a/transports/Replicant/v3/Optimizer.go +++ b/transports/Replicant/v3/Optimizer.go @@ -26,7 +26,7 @@ package replicant import ( pt "github.com/OperatorFoundation/shapeshifter-ipc/v2" - "github.com/op/go-logging" + "github.com/kataras/golog" "golang.org/x/net/proxy" "net" ) @@ -36,17 +36,17 @@ type TransportClient struct { Config ClientConfig Address string Dialer proxy.Dialer - Log *logging.Logger + Log *golog.Logger } type TransportServer struct { Config ServerConfig Address string Dialer proxy.Dialer - Log *logging.Logger + Log *golog.Logger } -func NewClient(config ClientConfig, address string, dialer proxy.Dialer, log *logging.Logger) TransportClient { +func NewClient(config ClientConfig, address string, dialer proxy.Dialer, log *golog.Logger) TransportClient { return TransportClient{ Config: config, Address: address, @@ -55,7 +55,7 @@ func NewClient(config ClientConfig, address string, dialer proxy.Dialer, log *lo } } -func NewServer(config ServerConfig, address string, dialer proxy.Dialer, log *logging.Logger) TransportServer { +func NewServer(config ServerConfig, address string, dialer proxy.Dialer, log *golog.Logger) TransportServer { return TransportServer{ Config: config, Address: address, diff --git a/transports/Replicant/v3/go.mod b/transports/Replicant/v3/go.mod index 48fdc06..2d0d408 100644 --- a/transports/Replicant/v3/go.mod +++ b/transports/Replicant/v3/go.mod @@ -5,7 +5,6 @@ go 1.12 require ( github.com/OperatorFoundation/monolith-go/monolith v1.0.4 github.com/OperatorFoundation/shapeshifter-ipc/v2 v2.0.0 - github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 github.com/opentracing/opentracing-go v1.1.0 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 golang.org/x/net v0.0.0-20200202094626-16171245cfb2 diff --git a/transports/Replicant/v3/go.sum b/transports/Replicant/v3/go.sum index 3d39d37..3382e0b 100644 --- a/transports/Replicant/v3/go.sum +++ b/transports/Replicant/v3/go.sum @@ -4,8 +4,8 @@ github.com/OperatorFoundation/shapeshifter-ipc/v2 v2.0.0 h1:6aQs+TF3KULMarpzbKu8 github.com/OperatorFoundation/shapeshifter-ipc/v2 v2.0.0/go.mod h1:gb/QiZH0QDXLSQ9PskyJ2oTflB7tsP4AYc8y+FppvB0= github.com/deckarep/golang-set v1.7.1 h1:SCQV0S6gTtp6itiFrTqI+pfmJ4LN85S1YzhDf9rTHJQ= github.com/deckarep/golang-set v1.7.1/go.mod h1:93vsz/8Wt4joVM7c2AVqh+YRMiUSc14yDtF28KmMOgQ= -github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 h1:lDH9UUVJtmYCjyT0CI4q8xvlXPxeZ0gYCVvWbmPlp88= -github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= + h1:lDH9UUVJtmYCjyT0CI4q8xvlXPxeZ0gYCVvWbmPlp88= +/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/opentracing/opentracing-go v1.1.0 h1:pWlfV3Bxv7k65HYwkikxat0+s3pV4bsqf19k25Ur8rU= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M= diff --git a/transports/Replicant/v3/replicant_test.go b/transports/Replicant/v3/replicant_test.go index e1b05ae..fa89943 100644 --- a/transports/Replicant/v3/replicant_test.go +++ b/transports/Replicant/v3/replicant_test.go @@ -5,7 +5,7 @@ import ( "github.com/OperatorFoundation/monolith-go/monolith" "github.com/OperatorFoundation/shapeshifter-transports/transports/Replicant/v3/polish" "github.com/OperatorFoundation/shapeshifter-transports/transports/Replicant/v3/toneburst" - "github.com/op/go-logging" + "github.com/kataras/golog" "golang.org/x/net/proxy" "io/ioutil" "math/rand" @@ -184,7 +184,7 @@ func runReplicantServer() { } func runReplicantFactoryServer() { - var log = logging.MustGetLogger("replicant") + var log = golog.MustGetLogger("replicant") serverStarted := make(chan bool) addr := "127.0.0.1:3001" @@ -304,7 +304,7 @@ func replicantConnection(clientConfig ClientConfig, serverConfig ServerConfig, t func replicantFactoryConnection(clientConfig ClientConfig, serverConfig ServerConfig, t *testing.T) { serverStarted := make(chan bool) - var log = logging.MustGetLogger("replicant") + var log = golog.MustGetLogger("replicant") // Get a random port rand.Seed(time.Now().UnixNano()) min := 1025 diff --git a/transports/meeklite/v3/go.mod b/transports/meeklite/v3/go.mod index e7e77d9..8d9bbeb 100644 --- a/transports/meeklite/v3/go.mod +++ b/transports/meeklite/v3/go.mod @@ -3,6 +3,6 @@ module github.com/OperatorFoundation/shapeshifter-transports/transports/meeklite go 1.12 require ( - github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 + golang.org/x/net v0.0.0-20200202094626-16171245cfb2 ) diff --git a/transports/meeklite/v3/go.sum b/transports/meeklite/v3/go.sum index 6ca77db..3fcd773 100644 --- a/transports/meeklite/v3/go.sum +++ b/transports/meeklite/v3/go.sum @@ -1,5 +1,5 @@ -github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 h1:lDH9UUVJtmYCjyT0CI4q8xvlXPxeZ0gYCVvWbmPlp88= -github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= + h1:lDH9UUVJtmYCjyT0CI4q8xvlXPxeZ0gYCVvWbmPlp88= +/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/net v0.0.0-20200202094626-16171245cfb2 h1:CCH4IOTTfewWjGOlSp+zGcjutRKlBEZQ6wTn8ozI/nI= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= diff --git a/transports/meeklite/v3/meeklite.go b/transports/meeklite/v3/meeklite.go index 1ba28f6..7281ed8 100644 --- a/transports/meeklite/v3/meeklite.go +++ b/transports/meeklite/v3/meeklite.go @@ -39,7 +39,7 @@ import ( "encoding/hex" "errors" "fmt" - "github.com/op/go-logging" + "github.com/kataras/golog" "golang.org/x/net/proxy" "io" "io/ioutil" @@ -128,7 +128,7 @@ type Transport struct { Front string `json:"front"` Address string Dialer proxy.Dialer - log *logging.Logger + log *golog.Logger } //Config puts the parameters in a json compatible format @@ -137,7 +137,7 @@ type Config struct { Front string `json:"front"` } -func NewMeekFactoryTransportWithFront(url *gourl.URL, front string, address string, dialer proxy.Dialer, log *logging.Logger) *Transport { +func NewMeekFactoryTransportWithFront(url *gourl.URL, front string, address string, dialer proxy.Dialer, log *golog.Logger) *Transport { return &Transport{url, front, address,dialer, log} } // Dial creates outgoing transport connection diff --git a/transports/meeklite/v3/meeklite_test.go b/transports/meeklite/v3/meeklite_test.go index 6dd9475..5aa6c80 100644 --- a/transports/meeklite/v3/meeklite_test.go +++ b/transports/meeklite/v3/meeklite_test.go @@ -34,7 +34,7 @@ package meeklite import ( - "github.com/op/go-logging" + "github.com/kataras/golog" "golang.org/x/net/proxy" gourl "net/url" "testing" @@ -79,7 +79,7 @@ func TestMeeklite(t *testing.T) { } func TestFactoryMeeklite(t *testing.T) { - var log = logging.MustGetLogger("meeklite") + var log = golog.MustGetLogger("meeklite") //create a server urlString := "https://transport-canary-meek.appspot.com/" Url, err := gourl.Parse(urlString) diff --git a/transports/meekserver/v2/meek-server.go b/transports/meekserver/v2/meek-server.go index dbd64b0..c4035f1 100644 --- a/transports/meekserver/v2/meek-server.go +++ b/transports/meekserver/v2/meek-server.go @@ -162,7 +162,7 @@ func (a scrubbedAddr) String() string { return "[scrubbed]" } -// Replace the Addr in a net.OpError with "[scrubbed]" for logging. +// Replace the Addr in a net.OpError with "[scrubbed]" for golog. func scrubError(err error) error { if operr, ok := err.(*net.OpError); ok { // net.OpError contains Op, Net, Addr, and a subsidiary Err. The diff --git a/transports/meekserver/v3/go.mod b/transports/meekserver/v3/go.mod index 9cae6a7..0108cfd 100644 --- a/transports/meekserver/v3/go.mod +++ b/transports/meekserver/v3/go.mod @@ -5,7 +5,7 @@ go 1.12 require ( github.com/deckarep/golang-set v1.7.1 github.com/mufti1/interconv v0.0.0-20190313040840-d7c72925c656 - github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 + golang.org/x/crypto v0.0.0-20200214034016-1d94cc7ab1c6 golang.org/x/net v0.0.0-20200202094626-16171245cfb2 ) diff --git a/transports/meekserver/v3/go.sum b/transports/meekserver/v3/go.sum index cbdb217..569ab80 100644 --- a/transports/meekserver/v3/go.sum +++ b/transports/meekserver/v3/go.sum @@ -2,8 +2,8 @@ github.com/deckarep/golang-set v1.7.1 h1:SCQV0S6gTtp6itiFrTqI+pfmJ4LN85S1YzhDf9r github.com/deckarep/golang-set v1.7.1/go.mod h1:93vsz/8Wt4joVM7c2AVqh+YRMiUSc14yDtF28KmMOgQ= github.com/mufti1/interconv v0.0.0-20190313040840-d7c72925c656 h1:p+IdebEeB9SAEH9IOJVF6oZ535bwvWqUdqWxG1UWeko= github.com/mufti1/interconv v0.0.0-20190313040840-d7c72925c656/go.mod h1:+db4NNs1NvceiftEzz0ymfu3zKLkynYukafc7llNoMs= -github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 h1:lDH9UUVJtmYCjyT0CI4q8xvlXPxeZ0gYCVvWbmPlp88= -github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= + h1:lDH9UUVJtmYCjyT0CI4q8xvlXPxeZ0gYCVvWbmPlp88= +/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20200214034016-1d94cc7ab1c6 h1:Sy5bstxEqwwbYs6n0/pBuxKENqOeZUgD45Gp3Q3pqLg= golang.org/x/crypto v0.0.0-20200214034016-1d94cc7ab1c6/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= diff --git a/transports/meekserver/v3/meek-server.go b/transports/meekserver/v3/meek-server.go index ddf9a81..4bbb1b8 100644 --- a/transports/meekserver/v3/meek-server.go +++ b/transports/meekserver/v3/meek-server.go @@ -189,7 +189,7 @@ func (a scrubbedAddr) String() string { return "[scrubbed]" } -// Replace the Addr in a net.OpError with "[scrubbed]" for logging. +// Replace the Addr in a net.OpError with "[scrubbed]" for golog. func scrubError(err error) error { if operr, ok := err.(*net.OpError); ok { // net.OpError contains Op, Net, Addr, and a subsidiary Err. The diff --git a/transports/meekserver/v3/meekserver_test.go b/transports/meekserver/v3/meekserver_test.go index fe4c8a9..305cc7f 100644 --- a/transports/meekserver/v3/meekserver_test.go +++ b/transports/meekserver/v3/meekserver_test.go @@ -1,7 +1,7 @@ package meekserver import ( - "github.com/op/go-logging" + "github.com/kataras/golog" "testing" ) @@ -29,7 +29,7 @@ func TestMeekServerListen(t *testing.T) { } func TestMeekServerFactoryListen(t *testing.T) { - var log = logging.MustGetLogger("meekserver") + var log = golog.MustGetLogger("meekserver") acmeEmail := "brandon@operatorfoundation.org" acmeHostNames := "operatorrss.com" meekserverTransport, newError := New(false, acmeHostNames, acmeEmail,"127.0.0.1:8080", "state", log) diff --git a/transports/meekserver/v3/pt21.go b/transports/meekserver/v3/pt21.go index bb3d92d..290ef1c 100644 --- a/transports/meekserver/v3/pt21.go +++ b/transports/meekserver/v3/pt21.go @@ -62,7 +62,7 @@ package meekserver import ( "errors" interconv "github.com/mufti1/interconv/package" - "github.com/op/go-logging" + "github.com/kataras/golog" "golang.org/x/crypto/acme/autocert" "log" "net" @@ -83,7 +83,7 @@ type Transport struct { DisableTLS bool CertManager *autocert.Manager Address string - log *logging.Logger + log *golog.Logger } //Config contains arguments formatted for a json file @@ -108,7 +108,7 @@ type fakeConn struct { writeBuffer []byte } -func New(disableTLS bool, acmeHostnamesCommas string, acmeEmail string, address string, stateDir string, Log *logging.Logger) (*Transport, error) { +func New(disableTLS bool, acmeHostnamesCommas string, acmeEmail string, address string, stateDir string, Log *golog.Logger) (*Transport, error) { var certManager *autocert.Manager if disableTLS { if acmeEmail != "" || acmeHostnamesCommas != "" { diff --git a/transports/obfs2/v2/go.mod b/transports/obfs2/v2/go.mod index e15edaa..c6fcae7 100644 --- a/transports/obfs2/v2/go.mod +++ b/transports/obfs2/v2/go.mod @@ -5,6 +5,6 @@ go 1.12 require ( github.com/OperatorFoundation/obfs4 v1.0.0 github.com/OperatorFoundation/shapeshifter-ipc v0.0.0-20170814234159-11746ba927e0 - github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 + golang.org/x/net v0.0.0-20200226121028-0de0cce0169b ) diff --git a/transports/obfs2/v2/go.sum b/transports/obfs2/v2/go.sum index 7a5e130..facf2e0 100644 --- a/transports/obfs2/v2/go.sum +++ b/transports/obfs2/v2/go.sum @@ -7,8 +7,8 @@ github.com/OperatorFoundation/shapeshifter-ipc v0.0.0-20170814234159-11746ba927e github.com/OperatorFoundation/shapeshifter-ipc v0.0.0-20170814234159-11746ba927e0/go.mod h1:kB00Ak8Dgn1uZlZHLc/WsUta58Jc+n/ZhCetcPkh42Q= github.com/dchest/siphash v1.2.1 h1:4cLinnzVJDKxTCl9B01807Yiy+W7ZzVHj/KIroQRvT4= github.com/dchest/siphash v1.2.1/go.mod h1:q+IRvb2gOSrUnYoPqHiyHXS0FOBBOdl6tONBlVnOnt4= -github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 h1:lDH9UUVJtmYCjyT0CI4q8xvlXPxeZ0gYCVvWbmPlp88= -github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= + h1:lDH9UUVJtmYCjyT0CI4q8xvlXPxeZ0gYCVvWbmPlp88= +/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/willscott/goturn v0.0.0-20170802220503-19f41278d0c9/go.mod h1:PfwRjodCaQXOsHnh2DeVaXqCFCIrbn5WLj1+A5bQkD4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= diff --git a/transports/obfs2/v2/obfs2.go b/transports/obfs2/v2/obfs2.go index 3f869fa..b3f9a23 100644 --- a/transports/obfs2/v2/obfs2.go +++ b/transports/obfs2/v2/obfs2.go @@ -36,7 +36,7 @@ import ( "crypto/sha256" "encoding/binary" "fmt" - "github.com/op/go-logging" + "github.com/kataras/golog" "io" "net" "time" @@ -66,7 +66,7 @@ const ( type OptimizerTransport struct { Address string Dialer proxy.Dialer - Log *logging.Logger + Log *golog.Logger } //Dial connects to a specified address. @@ -92,11 +92,11 @@ func (transport OptimizerTransport) Dial() (net.Conn, error) { // Transport is the obfs2 implementation of the base.Transport interface. type Transport struct { dialer proxy.Dialer - log logging.Logger + log golog.Logger } //New initializes obfs2 for Optimizer -func New(address string, dialer proxy.Dialer, log *logging.Logger) *OptimizerTransport { +func New(address string, dialer proxy.Dialer, log *golog.Logger) *OptimizerTransport { result := OptimizerTransport{ Address: address, Dialer: dialer, @@ -107,12 +107,12 @@ func New(address string, dialer proxy.Dialer, log *logging.Logger) *OptimizerTra //NewObfs2Transport is the initializer for obfs2 without a dialer func NewObfs2Transport() *Transport { - return &Transport{dialer: nil, log: logging.Logger{}} + return &Transport{dialer: nil, log: golog.Logger{}} } //NewObfs2Transport is the initializer for obfs2 with a dialer func NewObfs2TransportWithDialer(dialer proxy.Dialer) *Transport { - return &Transport{dialer: dialer, log: logging.Logger{}} + return &Transport{dialer: dialer, log: golog.Logger{}} } //obfs2TransportListener defines a TCP network listener. diff --git a/transports/obfs2/v2/obfs2_test.go b/transports/obfs2/v2/obfs2_test.go index da1ef56..5205992 100644 --- a/transports/obfs2/v2/obfs2_test.go +++ b/transports/obfs2/v2/obfs2_test.go @@ -32,7 +32,7 @@ package obfs2 import ( - "github.com/op/go-logging" + "github.com/kataras/golog" "golang.org/x/net/proxy" "os" "testing" @@ -98,7 +98,7 @@ func TestObfs2WithDialer(t *testing.T) { } func TestObfs2OptimizerTransportWithDialer(t *testing.T) { - var log = logging.MustGetLogger("obfs2") + var log = golog.MustGetLogger("obfs2") config := New("127.0.0.1:1237", proxy.Direct, log) //create client buffer clientBuffer := make([]byte, 4) diff --git a/transports/obfs2/v3/go.mod b/transports/obfs2/v3/go.mod index b2fa78f..4205bdf 100644 --- a/transports/obfs2/v3/go.mod +++ b/transports/obfs2/v3/go.mod @@ -5,6 +5,6 @@ go 1.12 require ( github.com/OperatorFoundation/obfs4 v1.0.0 github.com/OperatorFoundation/shapeshifter-ipc/v2 v2.0.0 - github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 + golang.org/x/net v0.0.0-20200226121028-0de0cce0169b ) diff --git a/transports/obfs2/v3/go.sum b/transports/obfs2/v3/go.sum index 139977a..c080a26 100644 --- a/transports/obfs2/v3/go.sum +++ b/transports/obfs2/v3/go.sum @@ -7,8 +7,8 @@ github.com/OperatorFoundation/shapeshifter-ipc/v2 v2.0.0 h1:6aQs+TF3KULMarpzbKu8 github.com/OperatorFoundation/shapeshifter-ipc/v2 v2.0.0/go.mod h1:gb/QiZH0QDXLSQ9PskyJ2oTflB7tsP4AYc8y+FppvB0= github.com/dchest/siphash v1.2.1 h1:4cLinnzVJDKxTCl9B01807Yiy+W7ZzVHj/KIroQRvT4= github.com/dchest/siphash v1.2.1/go.mod h1:q+IRvb2gOSrUnYoPqHiyHXS0FOBBOdl6tONBlVnOnt4= -github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 h1:lDH9UUVJtmYCjyT0CI4q8xvlXPxeZ0gYCVvWbmPlp88= -github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= + h1:lDH9UUVJtmYCjyT0CI4q8xvlXPxeZ0gYCVvWbmPlp88= +/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/willscott/goturn v0.0.0-20170802220503-19f41278d0c9/go.mod h1:PfwRjodCaQXOsHnh2DeVaXqCFCIrbn5WLj1+A5bQkD4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= diff --git a/transports/obfs2/v3/obfs2.go b/transports/obfs2/v3/obfs2.go index 36b8b0e..6412ceb 100644 --- a/transports/obfs2/v3/obfs2.go +++ b/transports/obfs2/v3/obfs2.go @@ -36,7 +36,7 @@ import ( "crypto/sha256" "encoding/binary" "fmt" - "github.com/op/go-logging" + "github.com/kataras/golog" "io" "net" @@ -67,7 +67,7 @@ const ( type OptimizerTransport struct { Address string Dialer proxy.Dialer - log *logging.Logger + log *golog.Logger } //Dial connects to a specified address. @@ -112,7 +112,7 @@ type Transport struct { } //New initializes obfs2 for Optimizer -func New(address string, dialer proxy.Dialer, log *logging.Logger) *OptimizerTransport { +func New(address string, dialer proxy.Dialer, log *golog.Logger) *OptimizerTransport { result := OptimizerTransport{ Address: address, Dialer: dialer, diff --git a/transports/obfs2/v3/obfs2_test.go b/transports/obfs2/v3/obfs2_test.go index 5145a45..e855778 100644 --- a/transports/obfs2/v3/obfs2_test.go +++ b/transports/obfs2/v3/obfs2_test.go @@ -32,7 +32,7 @@ package obfs2 import ( - "github.com/op/go-logging" + "github.com/kataras/golog" "golang.org/x/net/proxy" "os" "testing" @@ -98,7 +98,7 @@ func TestObfs2WithDialer(t *testing.T) { } func TestObfs2OptimizerTransportWithDialer(t *testing.T) { - var log = logging.MustGetLogger("obfs2") + var log = golog.MustGetLogger("obfs2") config := New("127.0.0.1:1237", proxy.Direct, log) //create client buffer clientBuffer := make([]byte, 4) diff --git a/transports/obfs4/v3/go.mod b/transports/obfs4/v3/go.mod index 9ecef17..12d8731 100644 --- a/transports/obfs4/v3/go.mod +++ b/transports/obfs4/v3/go.mod @@ -5,7 +5,7 @@ go 1.12 require ( github.com/OperatorFoundation/obfs4 v1.0.0 github.com/OperatorFoundation/shapeshifter-ipc/v2 v2.0.0 - github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 + github.com/kataras/golog v0.0.18 golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d golang.org/x/net v0.0.0-20200226121028-0de0cce0169b ) diff --git a/transports/obfs4/v3/go.sum b/transports/obfs4/v3/go.sum index b996e03..f1673f2 100644 --- a/transports/obfs4/v3/go.sum +++ b/transports/obfs4/v3/go.sum @@ -7,8 +7,10 @@ github.com/OperatorFoundation/shapeshifter-ipc/v2 v2.0.0 h1:6aQs+TF3KULMarpzbKu8 github.com/OperatorFoundation/shapeshifter-ipc/v2 v2.0.0/go.mod h1:gb/QiZH0QDXLSQ9PskyJ2oTflB7tsP4AYc8y+FppvB0= github.com/dchest/siphash v1.2.1 h1:4cLinnzVJDKxTCl9B01807Yiy+W7ZzVHj/KIroQRvT4= github.com/dchest/siphash v1.2.1/go.mod h1:q+IRvb2gOSrUnYoPqHiyHXS0FOBBOdl6tONBlVnOnt4= -github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 h1:lDH9UUVJtmYCjyT0CI4q8xvlXPxeZ0gYCVvWbmPlp88= -github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= +github.com/kataras/golog v0.0.18 h1:Td7hcKN25yzqB/0SO5iohOsMk5Mq5V9kDtM5apaJLY0= +github.com/kataras/golog v0.0.18/go.mod h1:jRYl7dFYqP8aQj9VkwdBUXYZSfUktm+YYg1arJILfyw= +github.com/kataras/pio v0.0.8 h1:6pX6nHJk7DAV3x1dEimibQF2CmJLlo0jWVmM9yE9KY8= +github.com/kataras/pio v0.0.8/go.mod h1:NFfMp2kVP1rmV4N6gH6qgWpuoDKlrOeYi3VrAIWCGsE= github.com/willscott/goturn v0.0.0-20170802220503-19f41278d0c9/go.mod h1:PfwRjodCaQXOsHnh2DeVaXqCFCIrbn5WLj1+A5bQkD4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d h1:1ZiEyfaQIg3Qh0EoqpwAakHVhecoE5wlSg5GjnafJGw= diff --git a/transports/obfs4/v3/obfs4.go b/transports/obfs4/v3/obfs4.go index b43bb51..bf615a6 100644 --- a/transports/obfs4/v3/obfs4.go +++ b/transports/obfs4/v3/obfs4.go @@ -35,13 +35,12 @@ import ( "flag" "fmt" "github.com/OperatorFoundation/obfs4/common/drbg" - common"github.com/OperatorFoundation/obfs4/common/log" "github.com/OperatorFoundation/obfs4/common/ntor" "github.com/OperatorFoundation/obfs4/common/probdist" "github.com/OperatorFoundation/obfs4/common/replayfilter" "github.com/OperatorFoundation/shapeshifter-ipc/v2" "github.com/OperatorFoundation/shapeshifter-transports/transports/obfs4/v3/framing" - "github.com/op/go-logging" + "github.com/kataras/golog" "golang.org/x/net/proxy" "math/rand" "net" @@ -132,7 +131,7 @@ func NewObfs4Server(stateDir string) (*Transport, error) { // Store the arguments that should appear in our descriptor for the clients. ptArgs := make(map[string]string) ptArgs[certArg] = st.cert.String() - common.Infof("certstring %s", certArg) + golog.Infof("certstring %s", certArg) ptArgs[iatArg] = strconv.Itoa(st.iatMode) // Initialize the replay filter. @@ -193,7 +192,7 @@ func (transport *Transport) Dial(address string) (net.Conn, error) { if err != nil { closeErr := dialConn.Close() if closeErr != nil { - common.Errorf("could not close") + golog.Errorf("could not close") } return nil, err } @@ -207,13 +206,11 @@ type TransportClient struct { IatMode int Address string Dialer proxy.Dialer - log *logging.Logger } type TransportServer struct { ServerFactory *ServerFactory Address string - log *logging.Logger } //Config contains arguments formatted for a json file @@ -222,12 +219,12 @@ type Config struct { IatMode string `json:"iat-mode"` } -func NewClient(certString string, iatMode int, address string, dialer proxy.Dialer, log *logging.Logger) (TransportClient, error) { - return TransportClient{CertString: certString, IatMode: iatMode, Address: address, Dialer: dialer, log: log}, nil +func NewClient(certString string, iatMode int, address string, dialer proxy.Dialer) (TransportClient, error) { + return TransportClient{CertString: certString, IatMode: iatMode, Address: address, Dialer: dialer}, nil } -func NewServer(stateDir string, address string, log *logging.Logger) (*TransportServer, error) { - sf, sFError := NewObfs4ServerFactory(stateDir, log) +func NewServer(stateDir string, address string) (*TransportServer, error) { + sf, sFError := NewObfs4ServerFactory(stateDir) if sFError != nil { return nil, sFError @@ -235,13 +232,12 @@ func NewServer(stateDir string, address string, log *logging.Logger) (*Transport transport := &TransportServer{ ServerFactory: sf, Address: address, - log: log, } return transport, nil } //NewObfs4Server initializes the obfs4 server side -func NewObfs4ServerFactory(stateDir string, log *logging.Logger) (*ServerFactory, error) { +func NewObfs4ServerFactory(stateDir string) (*ServerFactory, error) { args := make(map[string]string) st, err := serverStateFromArgs(stateDir, args) if err != nil { @@ -261,7 +257,7 @@ func NewObfs4ServerFactory(stateDir string, log *logging.Logger) (*ServerFactory // Store the arguments that should appear in our descriptor for the clients. ptArgs := make(map[string]string) ptArgs[certArg] = st.cert.String() - log.Infof("certstring %s", certArg) + golog.Infof("certstring %s", certArg) ptArgs[iatArg] = strconv.Itoa(st.iatMode) // Initialize the replay filter. @@ -315,13 +311,13 @@ func (transport *Transport) Listen(address string) (net.Listener, error) { func (transport *TransportServer) Listen() (net.Listener, error) { addr, resolveErr := pt.ResolveAddr(transport.Address) if resolveErr != nil { - transport.log.Error(resolveErr.Error()) + golog.Error(resolveErr.Error()) return nil, resolveErr } ln, err := net.ListenTCP("tcp", addr) if err != nil { - transport.log.Error(err.Error()) + golog.Error(err.Error()) return nil, err } diff --git a/transports/obfs4/v3/test_utils.go b/transports/obfs4/v3/test_utils.go index 0c44ae3..b0aded0 100644 --- a/transports/obfs4/v3/test_utils.go +++ b/transports/obfs4/v3/test_utils.go @@ -25,7 +25,7 @@ package obfs4 import ( - "github.com/op/go-logging" + "github.com/kataras/golog" "golang.org/x/net/proxy" "io/ioutil" "os" @@ -96,7 +96,7 @@ func RunLocalObfs4Server(data string) bool { func RunLocalObfs4ServerFactory(data string) bool { //create a server - log := MakeLog() + MakeLog() usr, userError := user.Current() if userError != nil { return false @@ -114,7 +114,7 @@ func RunLocalObfs4ServerFactory(data string) bool { return false } } - serverConfig, confError := NewServer(fPath, "127.0.0.1:2234", log) + serverConfig, confError := NewServer(fPath, "127.0.0.1:2234") if confError != nil { return false } @@ -187,7 +187,7 @@ func RunObfs4Client() (*Transport, error) { //RunObfs4Client runs the client side in the background for the test func RunObfs4ClientFactory() (*TransportClient, error) { - log := MakeLog() + MakeLog() usr, userError := user.Current() if userError != nil { return nil, userError @@ -214,15 +214,11 @@ func RunObfs4ClientFactory() (*TransportClient, error) { bridgePart := bridgeParts1[5] certstring := bridgePart[5:] //println(certstring) - clientConfig, confError := NewClient(certstring, 0, "127.0.0.1:2234", proxy.Direct, log) + clientConfig, confError := NewClient(certstring, 0, "127.0.0.1:2234", proxy.Direct) return &clientConfig, confError } -func MakeLog() *logging.Logger { - var log = logging.MustGetLogger("obfs4") - backend := logging.NewLogBackend(os.Stderr, "", 0) - backendLeveled := logging.AddModuleLevel(backend) - backendLeveled.SetLevel(logging.DEBUG, "") - log.SetBackend(backendLeveled) - return log +func MakeLog() { + golog.SetLevel("debug") + golog.SetOutput(os.Stderr) } diff --git a/transports/shadow/v3/go.mod b/transports/shadow/v3/go.mod index 40c8604..6363ad1 100644 --- a/transports/shadow/v3/go.mod +++ b/transports/shadow/v3/go.mod @@ -4,7 +4,7 @@ go 1.12 require ( github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect - github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 + github.com/kataras/golog v0.0.18 github.com/shadowsocks/go-shadowsocks2 v0.0.11 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 // indirect ) diff --git a/transports/shadow/v3/go.sum b/transports/shadow/v3/go.sum index e71d517..1bd4d64 100644 --- a/transports/shadow/v3/go.sum +++ b/transports/shadow/v3/go.sum @@ -1,7 +1,11 @@ github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY= github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA= -github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 h1:lDH9UUVJtmYCjyT0CI4q8xvlXPxeZ0gYCVvWbmPlp88= -github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= +github.com/kataras/golog v0.0.18 h1:Td7hcKN25yzqB/0SO5iohOsMk5Mq5V9kDtM5apaJLY0= +github.com/kataras/golog v0.0.18/go.mod h1:jRYl7dFYqP8aQj9VkwdBUXYZSfUktm+YYg1arJILfyw= +github.com/kataras/pio v0.0.8 h1:6pX6nHJk7DAV3x1dEimibQF2CmJLlo0jWVmM9yE9KY8= +github.com/kataras/pio v0.0.8/go.mod h1:NFfMp2kVP1rmV4N6gH6qgWpuoDKlrOeYi3VrAIWCGsE= + h1:lDH9UUVJtmYCjyT0CI4q8xvlXPxeZ0gYCVvWbmPlp88= +/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/shadowsocks/go-shadowsocks2 v0.0.11 h1:dXloqEhYnZV40jblWTK8kWeC0Eb+dgql4S0tj99e8j0= github.com/shadowsocks/go-shadowsocks2 v0.0.11/go.mod h1:R+KWaoIwRRhnpw6XV+dZil0XHi64Hc1D7hXUyXTjUzQ= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M= diff --git a/transports/shadow/v3/shadow.go b/transports/shadow/v3/shadow.go index eea4699..74437d1 100644 --- a/transports/shadow/v3/shadow.go +++ b/transports/shadow/v3/shadow.go @@ -26,7 +26,7 @@ package shadow import ( - "github.com/op/go-logging" + "github.com/kataras/golog" "log" "net" @@ -44,7 +44,7 @@ type Transport struct { Password string CipherName string Address string - Log *logging.Logger + Log *golog.Logger } //NewConfig is used to create a config for testing @@ -56,7 +56,7 @@ func NewConfig(password string, cipherName string) Config { } //NewTransport is used for creating a transport for Optimizer -func NewTransport(password string, cipherName string, address string, log *logging.Logger) Transport { +func NewTransport(password string, cipherName string, address string, log *golog.Logger) Transport { return Transport{ Password: password, CipherName: cipherName, @@ -69,7 +69,7 @@ func NewTransport(password string, cipherName string, address string, log *loggi func (config Config) Listen(address string) (net.Listener, error) { cipher, err := shadowsocks.PickCipher(config.CipherName, nil, config.Password) if err != nil { - log.Fatal("Failed generating ciphers:", err) + golog.Errorf("Failed generating ciphers:", err) return nil, err } diff --git a/transports/shadow/v3/shadow_test.go b/transports/shadow/v3/shadow_test.go index 92479f3..5197911 100644 --- a/transports/shadow/v3/shadow_test.go +++ b/transports/shadow/v3/shadow_test.go @@ -26,7 +26,7 @@ package shadow import ( "fmt" - "github.com/op/go-logging" + "github.com/kataras/golog" "net" "os" "testing" @@ -100,7 +100,7 @@ func TestShadow(t *testing.T) { } func TestShadowFactory(t *testing.T) { //create a server - var log = logging.MustGetLogger("shadow") + var log = golog.MustGetLogger("shadow") transport := NewTransport("1234", "CHACHA20-IETF-POLY1305", "127.0.0.1:1236", log) //create client buffer