January 2022 - tor-commits - lists.torproject.org

[snowflake/main] Add EventOnProxyConnectionOver Reporting
by shelikhoo＠torproject.org 31 Jan '22

31 Jan '22

commit e4305a4d2b01f248f70546f745f64b3373f84a2e Author: Shelikhoo <xiaokangwang(a)outlook.com> Date: Mon Dec 20 13:36:22 2021 +0000 Add EventOnProxyConnectionOver Reporting --- proxy/lib/snowflake.go | 6 ++++++ proxy/lib/webrtcconn.go | 2 ++ 2 files changed, 8 insertions(+) diff --git a/proxy/lib/snowflake.go b/proxy/lib/snowflake.go index a9ac399..cef5644 100644 --- a/proxy/lib/snowflake.go +++ b/proxy/lib/snowflake.go @@ -40,6 +40,7 @@ import ( "sync" "time" + "git.torproject.org/pluggable-transports/snowflake.git/v2/common/event" "git.torproject.org/pluggable-transports/snowflake.git/v2/common/messages" "git.torproject.org/pluggable-transports/snowflake.git/v2/common/task" "git.torproject.org/pluggable-transports/snowflake.git/v2/common/util" @@ -350,6 +351,11 @@ func (sf *SnowflakeProxy) makePeerConnectionFromOffer(sdp *webrtc.SessionDescrip defer conn.lock.Unlock() log.Println("OnClose channel") log.Println(conn.bytesLogger.ThroughputSummary()) + in, out := conn.bytesLogger.GetStat() + conn.eventLogger.OnNewSnowflakeEvent(event.EventOnProxyConnectionOver{ + InboundTraffic: in, + OutboundTraffic: out, + }) conn.dc = nil dc.Close() pw.Close() diff --git a/proxy/lib/webrtcconn.go b/proxy/lib/webrtcconn.go index 6e16bec..919a679 100644 --- a/proxy/lib/webrtcconn.go +++ b/proxy/lib/webrtcconn.go @@ -9,6 +9,7 @@ import ( "sync" "time" + "git.torproject.org/pluggable-transports/snowflake.git/v2/common/event" "github.com/pion/ice/v2" "github.com/pion/sdp/v3" "github.com/pion/webrtc/v3" @@ -30,6 +31,7 @@ type webRTCConn struct { once sync.Once // Synchronization for PeerConnection destruction bytesLogger bytesLogger + eventLogger event.SnowflakeEventReceiver } func (c *webRTCConn) Read(b []byte) (int, error) {

1 0

[snowflake/main] Add proxy event logger state propagate
by shelikhoo＠torproject.org 31 Jan '22

31 Jan '22

commit f12cfe6a9f682c479314440ac9d53389cb38a54f Author: Shelikhoo <xiaokangwang(a)outlook.com> Date: Mon Dec 20 13:45:53 2021 +0000 Add proxy event logger state propagate --- proxy/lib/snowflake.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/proxy/lib/snowflake.go b/proxy/lib/snowflake.go index cef5644..8747f66 100644 --- a/proxy/lib/snowflake.go +++ b/proxy/lib/snowflake.go @@ -115,6 +115,7 @@ type SnowflakeProxy struct { NATProbeURL string // NATTypeMeasurementInterval is time before NAT type is retested NATTypeMeasurementInterval time.Duration + EventDispatcher event.SnowflakeEventDispatcher shutdown chan struct{} } @@ -340,7 +341,7 @@ func (sf *SnowflakeProxy) makePeerConnectionFromOffer(sdp *webrtc.SessionDescrip close(dataChan) pr, pw := io.Pipe() - conn := &webRTCConn{pc: pc, dc: dc, pr: pr} + conn := &webRTCConn{pc: pc, dc: dc, pr: pr, eventLogger: sf.EventDispatcher} conn.bytesLogger = newBytesSyncLogger() dc.OnOpen(func() { @@ -524,6 +525,9 @@ func (sf *SnowflakeProxy) Start() error { if sf.NATProbeURL == "" { sf.NATProbeURL = DefaultNATProbeURL } + if sf.EventDispatcher == nil { + sf.EventDispatcher = event.NewSnowflakeEventDispatcher() + } broker, err = newSignalingServer(sf.BrokerURL, sf.KeepLocalAddresses) if err != nil {

1 0

[snowflake/main] Add EventOnProxyConnectionOver Event
by shelikhoo＠torproject.org 31 Jan '22

31 Jan '22

commit d64af3139496481436f8870f4f43f43dca0d4552 Author: Shelikhoo <xiaokangwang(a)outlook.com> Date: Mon Dec 20 13:23:33 2021 +0000 Add EventOnProxyConnectionOver Event --- common/event/interface.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/common/event/interface.go b/common/event/interface.go index 697f2b7..b41d7c3 100644 --- a/common/event/interface.go +++ b/common/event/interface.go @@ -28,6 +28,12 @@ type EventOnSnowflakeConnectionFailed struct { Error error } +type EventOnProxyConnectionOver struct { + SnowflakeEvent + InboundTraffic int + OutboundTraffic int +} + type SnowflakeEventReceiver interface { // OnNewSnowflakeEvent notify receiver about a new event // This method MUST not block

1 0

[snowflake/main] Extract traffic formatter
by shelikhoo＠torproject.org 31 Jan '22

31 Jan '22

commit 9208364475bddb186cb9d6fba6508a420ba1734d Author: Shelikhoo <xiaokangwang(a)outlook.com> Date: Mon Dec 20 14:46:18 2021 +0000 Extract traffic formatter --- proxy/lib/util.go | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/proxy/lib/util.go b/proxy/lib/util.go index a9ac8aa..c7b3684 100644 --- a/proxy/lib/util.go +++ b/proxy/lib/util.go @@ -72,28 +72,28 @@ func (b *bytesSyncLogger) AddInbound(amount int) { // ThroughputSummary view a formatted summary of the throughput totals func (b *bytesSyncLogger) ThroughputSummary() string { - var inUnit, outUnit string - units := []string{"B", "KB", "MB", "GB"} - inbound := b.inbound outbound := b.outbound - for i, u := range units { - inUnit = u - if (inbound < 1000) || (i == len(units)-1) { - break - } - inbound = inbound / 1000 - } - for i, u := range units { - outUnit = u - if (outbound < 1000) || (i == len(units)-1) { - break - } - outbound = outbound / 1000 - } + inbound, inUnit := formatTraffic(inbound) + outbound, outUnit := formatTraffic(outbound) + t := time.Now() return fmt.Sprintf("Traffic throughput (up|down): %d %s|%d %s -- (%d OnMessages, %d Sends, over %d seconds)", inbound, inUnit, outbound, outUnit, b.outEvents, b.inEvents, int(t.Sub(b.start).Seconds())) } func (b *bytesSyncLogger) GetStat() (in int, out int) { return b.inbound, b.outbound } + +func formatTraffic(amount int) (value int, unit string) { + value = amount + units := []string{"B", "KB", "MB", "GB"} + for i, u := range units { + unit = u + if (value < 1000) || (i == len(units)-1) { + break + } + value = value / 1000 + } + return + +}

1 0

[snowflake/main] Fix ProxyEventLogger output
by shelikhoo＠torproject.org 31 Jan '22

31 Jan '22

commit 88af9da4a25c26169cadaee9256ce7539db17b19 Author: Shelikhoo <xiaokangwang(a)outlook.com> Date: Mon Dec 20 16:22:55 2021 +0000 Fix ProxyEventLogger output --- proxy/lib/pt_event_logger.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/proxy/lib/pt_event_logger.go b/proxy/lib/pt_event_logger.go index 5804614..6c4f4e9 100644 --- a/proxy/lib/pt_event_logger.go +++ b/proxy/lib/pt_event_logger.go @@ -9,7 +9,7 @@ import ( ) func NewProxyEventLogger(logPeriod time.Duration) event.SnowflakeEventReceiver { - el := &logEventLogger{} + el := &logEventLogger{logPeriod: logPeriod} el.task = &task.Periodic{Interval: logPeriod, Execute: el.logTick} el.task.Start() return el @@ -36,7 +36,7 @@ func (p *logEventLogger) OnNewSnowflakeEvent(e event.SnowflakeEvent) { func (p *logEventLogger) logTick() error { inbound, inboundUnit := formatTraffic(p.inboundSum) outbound, outboundUnit := formatTraffic(p.inboundSum) - fmt.Printf("In the last %v, there are %v connections. Traffic Relaied ↑ %v %v, ↓ %v %v.", + fmt.Printf("In the last %v, there are %v connections. Traffic Relaied ↑ %v %v, ↓ %v %v.\n", p.logPeriod.String(), p.connectionCount, inbound, inboundUnit, outbound, outboundUnit) p.outboundSum = 0 p.inboundSum = 0

1 0

[snowflake/main] Fix build break in Go 1.16 for missing import
by shelikhoo＠torproject.org 31 Jan '22

31 Jan '22

commit bf3bd635f71fd5faae1ebaa05d5987cfa464b30b Author: Shelikhoo <xiaokangwang(a)outlook.com> Date: Wed Jan 26 13:39:12 2022 +0000 Fix build break in Go 1.16 for missing import See also: https://gitlab.torproject.org/shelikhoo/snowflake/-/jobs/86751 --- go.mod | 1 + 1 file changed, 1 insertion(+) diff --git a/go.mod b/go.mod index e8038f1..03541eb 100644 --- a/go.mod +++ b/go.mod @@ -15,6 +15,7 @@ require ( github.com/prometheus/client_golang v1.10.0 github.com/prometheus/client_model v0.2.0 github.com/smartystreets/goconvey v1.6.4 + github.com/stretchr/testify v1.7.0 // indirect github.com/xtaci/kcp-go/v5 v5.6.1 github.com/xtaci/smux v1.5.15 gitlab.torproject.org/tpo/anti-censorship/geoip v0.0.0-20210928150955-7ce4b3d98d01

1 0

[snowflake/main] Add Proxy Event Logger
by shelikhoo＠torproject.org 31 Jan '22

31 Jan '22

commit 1116bc81c86580316e13b07ecd8d7f0a3ac5ffd5 Author: Shelikhoo <xiaokangwang(a)outlook.com> Date: Mon Dec 20 15:42:16 2021 +0000 Add Proxy Event Logger --- proxy/lib/pt_event_logger.go | 49 ++++++++++++++++++++++++++++++++++++++++++++ proxy/main.go | 10 +++++++++ 2 files changed, 59 insertions(+) diff --git a/proxy/lib/pt_event_logger.go b/proxy/lib/pt_event_logger.go new file mode 100644 index 0000000..5804614 --- /dev/null +++ b/proxy/lib/pt_event_logger.go @@ -0,0 +1,49 @@ +package snowflake_proxy + +import ( + "fmt" + "git.torproject.org/pluggable-transports/snowflake.git/v2/common/task" + "time" + + "git.torproject.org/pluggable-transports/snowflake.git/v2/common/event" +) + +func NewProxyEventLogger(logPeriod time.Duration) event.SnowflakeEventReceiver { + el := &logEventLogger{} + el.task = &task.Periodic{Interval: logPeriod, Execute: el.logTick} + el.task.Start() + return el +} + +type logEventLogger struct { + inboundSum int + outboundSum int + connectionCount int + logPeriod time.Duration + task *task.Periodic +} + +func (p *logEventLogger) OnNewSnowflakeEvent(e event.SnowflakeEvent) { + switch e.(type) { + case event.EventOnProxyConnectionOver: + e := e.(event.EventOnProxyConnectionOver) + p.inboundSum += e.InboundTraffic + p.outboundSum += e.OutboundTraffic + p.connectionCount += 1 + } +} + +func (p *logEventLogger) logTick() error { + inbound, inboundUnit := formatTraffic(p.inboundSum) + outbound, outboundUnit := formatTraffic(p.inboundSum) + fmt.Printf("In the last %v, there are %v connections. Traffic Relaied ↑ %v %v, ↓ %v %v.", + p.logPeriod.String(), p.connectionCount, inbound, inboundUnit, outbound, outboundUnit) + p.outboundSum = 0 + p.inboundSum = 0 + p.connectionCount = 0 + return nil +} + +func (p *logEventLogger) Close() error { + return p.task.Close() +} diff --git a/proxy/main.go b/proxy/main.go index b85dde0..de31913 100644 --- a/proxy/main.go +++ b/proxy/main.go @@ -2,6 +2,7 @@ package main import ( "flag" + "git.torproject.org/pluggable-transports/snowflake.git/v2/common/event" "io" "log" "os" @@ -21,9 +22,17 @@ func main() { relayURL := flag.String("relay", sf.DefaultRelayURL, "websocket relay URL") NATTypeMeasurementInterval := flag.Duration("nat-retest-interval", time.Hour*24, "the time interval in second before NAT type is retested, 0s disables retest. Valid time units are \"s\", \"m\", \"h\". ") + SummaryInterval := flag.Duration("summary-interval", time.Hour, + "the time interval to output summary, 0s disables retest. Valid time units are \"s\", \"m\", \"h\". ") flag.Parse() + periodicEventLogger := sf.NewProxyEventLogger(*SummaryInterval) + + eventLogger := event.NewSnowflakeEventDispatcher() + + eventLogger.AddSnowflakeEventListener(periodicEventLogger) + proxy := sf.SnowflakeProxy{ Capacity: uint(*capacity), STUNURL: *stunURL, @@ -32,6 +41,7 @@ func main() { RelayURL: *relayURL, NATTypeMeasurementInterval: *NATTypeMeasurementInterval, + EventDispatcher: eventLogger, } var logOutput io.Writer = os.Stderr

1 0

[snowflake/main] Fix ProxyEventLogger output
by shelikhoo＠torproject.org 31 Jan '22

31 Jan '22

commit eb229d512b3b1015e28dfcb744000b66a66e648a Author: Shelikhoo <xiaokangwang(a)outlook.com> Date: Mon Dec 20 16:27:12 2021 +0000 Fix ProxyEventLogger output --- proxy/lib/pt_event_logger.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxy/lib/pt_event_logger.go b/proxy/lib/pt_event_logger.go index 6c4f4e9..f6552c8 100644 --- a/proxy/lib/pt_event_logger.go +++ b/proxy/lib/pt_event_logger.go @@ -36,7 +36,7 @@ func (p *logEventLogger) OnNewSnowflakeEvent(e event.SnowflakeEvent) { func (p *logEventLogger) logTick() error { inbound, inboundUnit := formatTraffic(p.inboundSum) outbound, outboundUnit := formatTraffic(p.inboundSum) - fmt.Printf("In the last %v, there are %v connections. Traffic Relaied ↑ %v %v, ↓ %v %v.\n", + fmt.Printf("In the last %v, there are %v connections. Traffic Relayed ↑ %v %v, ↓ %v %v.\n", p.logPeriod.String(), p.connectionCount, inbound, inboundUnit, outbound, outboundUnit) p.outboundSum = 0 p.inboundSum = 0

1 0

[snowflake/main] Use log instead of fmt in proxy event logger
by shelikhoo＠torproject.org 31 Jan '22

31 Jan '22

commit e828b0607662c7325f4d1bbf4c5072ce81f38fb9 Author: Shelikhoo <xiaokangwang(a)outlook.com> Date: Fri Jan 28 14:46:45 2022 +0000 Use log instead of fmt in proxy event logger See also: https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snow… --- proxy/lib/pt_event_logger.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/proxy/lib/pt_event_logger.go b/proxy/lib/pt_event_logger.go index f6552c8..b0dbf60 100644 --- a/proxy/lib/pt_event_logger.go +++ b/proxy/lib/pt_event_logger.go @@ -1,8 +1,8 @@ package snowflake_proxy import ( - "fmt" "git.torproject.org/pluggable-transports/snowflake.git/v2/common/task" + "log" "time" "git.torproject.org/pluggable-transports/snowflake.git/v2/common/event" @@ -36,7 +36,7 @@ func (p *logEventLogger) OnNewSnowflakeEvent(e event.SnowflakeEvent) { func (p *logEventLogger) logTick() error { inbound, inboundUnit := formatTraffic(p.inboundSum) outbound, outboundUnit := formatTraffic(p.inboundSum) - fmt.Printf("In the last %v, there are %v connections. Traffic Relayed ↑ %v %v, ↓ %v %v.\n", + log.Printf("In the last %v, there are %v connections. Traffic Relayed ↑ %v %v, ↓ %v %v.\n", p.logPeriod.String(), p.connectionCount, inbound, inboundUnit, outbound, outboundUnit) p.outboundSum = 0 p.inboundSum = 0

1 0

[translation/communitytpo-contentspot] new translations in communitytpo-contentspot
by translation＠torproject.org 31 Jan '22

31 Jan '22

commit 0bce465d064babc795d58a56f3bb54e5502b2290 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 31 11:45:09 2022 +0000 new translations in communitytpo-contentspot --- contents+zh-TW.po | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/contents+zh-TW.po b/contents+zh-TW.po index 62d8126dda..352ece77e9 100644 --- a/contents+zh-TW.po +++ b/contents+zh-TW.po @@ -2718,14 +2718,14 @@ msgstr "因此不會有任何中央伺服器被攻擊者入侵的可能性。" #: https//community.torproject.org/onion-services/talk/ #: (content/onion-services/talk/contents+en.lrpage.body) msgid "### Educate users about privacy by design" -msgstr "" +msgstr "### 教導使用者有關由設計出發的隱私觀念" #: https//community.torproject.org/onion-services/talk/ #: (content/onion-services/talk/contents+en.lrpage.body) msgid "" "Onion services are an excellent example of privacy by design technology, " "where one is secure and anonymous by default." -msgstr "" +msgstr "洋蔥服務是以隱私為設計出發的科技典範，可以同時確保安全性與匿名性，" #: https//community.torproject.org/onion-services/talk/ #: (content/onion-services/talk/contents+en.lrpage.body) @@ -2734,6 +2734,7 @@ msgid "" "educate the general public about Tor and how a more secure way to access the" " internet looks like: easy as browsing a web page." msgstr "" +"透過洋蔥服務來提供您的網路服務是一個教育廣大群眾的好機會，可以讓大眾有機會了解洋蔥路由技術，也讓他們知道還有這種更安全的方式可以上網，而且就跟瀏覽普通網頁一樣簡單。" #: https//community.torproject.org/onion-services/talk/ #: (content/onion-services/talk/contents+en.lrpage.body) @@ -2742,11 +2743,13 @@ msgid "" "[#MoreOnionsPorFavor](https://blog.torproject.org/more-onions-porfavor) and " "teach others about the importance of anonymity." msgstr "" +"可以藉由我們的[#MoreOnionsPorFavor](https://blog.torproject.org/more-onions-" +"porfavor)活動來獲得更多啟發，並且讓更多人了解匿名的重要性。" #: https//community.torproject.org/onion-services/talk/ #: (content/onion-services/talk/contents+en.lrpage.body) msgid "### Metadata obfuscation or elimination" -msgstr "" +msgstr "### 中繼資料的混淆與清除" #: https//community.torproject.org/onion-services/talk/ #: (content/onion-services/talk/contents+en.lrpage.body)

1 0