November 2019 - tor-commits - lists.torproject.org

[translation/https_everywhere] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere
by translation＠torproject.org 28 Nov '19

28 Nov '19

commit 6f8659bf59313c3c964a6624110829a8aed09db8 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 28 21:16:10 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere --- fa/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fa/https-everywhere.dtd b/fa/https-everywhere.dtd index d4426e5fd7..4527e38879 100644 --- a/fa/https-everywhere.dtd +++ b/fa/https-everywhere.dtd @@ -45,7 +45,7 @@ <!ENTITY https-everywhere.cancel.he_blocking_explainer "HTTPS در همه جا متوجه شده است که شما در حال ورود به یک صفحه بدون HTTPS هستید، و تلاش کرد تا در عوض شما را به نسخه HTTPS آن بفرستد. نسخه HTTPS در دسترس نیست. به احتمال زیاد این سایت نسخه HTTPS را پشتیبانی نمیکند، اما همچنین این امکان وجود دارد که یک مهاجم در حال مسدود کردن نسخه HTTPS است. اگر تمایل دارید که که نسخه ی رمز نشده این صفحه را ببینید، می توانید این کار را با غیر فعال کردن گزینه 'رمزنگاری همه وب‌گاه‌های واجد شرایط' (EASE) در افزونه HTTPS در همه جا انجام دهید. توجه داشته باشید که غیر فعال کردن این گزینه می تواند مرورگرتان را در مقابل حم لات کاهنده حملات کاهنده مبتنی به شبکه بر روی وبسایتی که دیدن میکنید آسیب پذیر کند."> <!ENTITY https-everywhere.cancel.he_blocking_network "حملات کاهنده مبتنی به شبکه"> <!ENTITY https-everywhere.cancel.open_page "صفحه ناامن باز"> -<!ENTITY https-everywhere.cancel.http_once "Open insecure page for this session only"> +<!ENTITY https-everywhere.cancel.http_once "تنها برای این نشست صفحه نا‌امن باز کن"> <!ENTITY https-everywhere.chrome.settings_for_this_site_header "تنظیمات برای این سایت"> <!ENTITY https-everywhere.chrome.settings_for_this_site_subheader "تنظیمات خود را برای ارتباط رمزگذاری تغییر دهید">

1 0

[translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
by translation＠torproject.org 28 Nov '19

28 Nov '19

commit ea8cc51c6fa687b1334b75e1cf5679a3dfb476ac Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 28 21:15:41 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message… --- locale/fa/LC_MESSAGES/messages.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/locale/fa/LC_MESSAGES/messages.po b/locale/fa/LC_MESSAGES/messages.po index 8a42a07464..572b787bfc 100644 --- a/locale/fa/LC_MESSAGES/messages.po +++ b/locale/fa/LC_MESSAGES/messages.po @@ -14,10 +14,11 @@ # Ali A D, 2019 # A.Mehraban <Mehr.Ban(a)chmail.ir>, 2019 # Amir Alipour <amiralipour85(a)yahoo.com>, 2019 +# Shahzadeh Amir <dabamed196(a)tmail1.com>, 2019 # msgid "" msgstr "" -"Last-Translator: Amir Alipour <amiralipour85(a)yahoo.com>, 2019\n" +"Last-Translator: Shahzadeh Amir <dabamed196(a)tmail1.com>, 2019\n" "Language-Team: Persian (https://www.transifex.com/otf/teams/1519/fa/)\n" "Language: fa\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" @@ -30,7 +31,7 @@ msgstr "ردیابی ، نظارت و سانسور به صورت آنلاین گ #: tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:43 #: tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:66 msgid "Take back the internet with Tor" -msgstr "" +msgstr "اینترنت را با تور برگردانید" #: tmp/cache_locale/ff/ffee28cfc961a339d813aed75493753fcc9e985dfa212e1af03fc089d5c3fdb0.php:112 msgid "Give today, and Mozilla will match your donation." @@ -39,17 +40,17 @@ msgstr "امروز کمک کنید و موزیلا با کمک مالی شما #: tmp/cache_locale/fc/fcfb13bee445d3be78c8c44f5b32d0cb2cbb9a1865494b454e2ca509ee6160f4.php:34 #: tmp/cache_locale/6c/6cd01cfbd4684dcca4eada963c78b5d694a2f40cd309be9366b080c410b3c5a0.php:53 msgid "Subscribed | Tor" -msgstr "" +msgstr "مشترک شده | تور" #: tmp/cache_locale/fc/fcfb13bee445d3be78c8c44f5b32d0cb2cbb9a1865494b454e2ca509ee6160f4.php:44 #: tmp/cache_locale/6c/6cd01cfbd4684dcca4eada963c78b5d694a2f40cd309be9366b080c410b3c5a0.php:64 msgid "Subscription Confirmed!" -msgstr "" +msgstr "اشتراک تأیید شد!" #: tmp/cache_locale/fc/fcfb13bee445d3be78c8c44f5b32d0cb2cbb9a1865494b454e2ca509ee6160f4.php:57 #: tmp/cache_locale/6c/6cd01cfbd4684dcca4eada963c78b5d694a2f40cd309be9366b080c410b3c5a0.php:78 msgid "Thanks for joining our email list - you'll hear from us soon!" -msgstr "" +msgstr "Thanks for joining our email list - you'll hear from us soon!" #: tmp/cache_locale/fc/fcfb13bee445d3be78c8c44f5b32d0cb2cbb9a1865494b454e2ca509ee6160f4.php:59 #: tmp/cache_locale/6c/6cd01cfbd4684dcca4eada963c78b5d694a2f40cd309be9366b080c410b3c5a0.php:80

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 28 Nov '19

28 Nov '19

commit 46fdfd05d7b70bbe21a2dc24d340d03a19479870 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 28 19:53:58 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ca.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contents+ca.po b/contents+ca.po index 5c6ee58e9b..eff3b727bb 100644 --- a/contents+ca.po +++ b/contents+ca.po @@ -6,8 +6,8 @@ # Assumpta, 2019 # Marc Ripoll <markripesp(a)gmail.com>, 2019 # jmontane, 2019 -# Emma Peel, 2019 # Ecron <ecron_89(a)hotmail.com>, 2019 +# Emma Peel, 2019 # msgid "" msgstr "" @@ -15,7 +15,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: Ecron <ecron_89(a)hotmail.com>, 2019\n" +"Last-Translator: Emma Peel, 2019\n" "Language-Team: Catalan (https://www.transifex.com/otf/teams/1519/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -544,7 +544,7 @@ msgid "" "You should also check the [PGP signatures](/tbb/how-to-verify-signature/) on" " the releases, to make sure nobody messed with the distribution sites." msgstr "" -"També hauríeu de comprovar les [signatures PGP](/tbb/how-to-verify-" +"També hauríeu de comprovar les [signatures PGP](/ca/tbb/how-to-verify-" "signature/) de les versions noves, per a assegurar-vos que ningú no ha " "trastejat amb els llocs webs dels distribuïdors." @@ -614,7 +614,7 @@ msgid "" "recommended](/tbb/tbb-9/)." msgstr "" "Utilitzar el Tor amb altres navegadors és [perillós i no " -"recomanable](/tbb/tbb-9/)." +"recomanable](/ca/tbb/tbb-9/)." #: https//support.torproject.org/about/distribute-tor/ #: (content/about/distribute-tor/contents+en.lrquestion.title) @@ -937,7 +937,7 @@ msgid "" "See this visualization of [Tor and HTTPS](/https/https-1/) to understand how" " Tor and HTTPS interact." msgstr "" -"Mireu aquesta visualització del [Tor i l'HTTPS](/https/https-1/) per a " +"Mireu aquesta visualització del [Tor i l'HTTPS](/ca/https/https-1/) per a " "entendre com interactuen entre ells." #: https//support.torproject.org/about/no-data-scrubbing/

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 28 Nov '19

28 Nov '19

commit bc6cc246e87de59c61958f1a1fb2121d90ade5bb Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 28 19:50:18 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+zh-TW.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/contents+zh-TW.po b/contents+zh-TW.po index 901f13fe17..6de1e4384f 100644 --- a/contents+zh-TW.po +++ b/contents+zh-TW.po @@ -6,14 +6,15 @@ # 男孩不壞, 2019 # ian chou <ertiach(a)hotmail.com>, 2019 # Joshua Chang <j.cs.chang(a)gmail.com>, 2019 +# Emma Peel, 2019 # msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-08 10:34+CET\n" +"POT-Creation-Date: 2019-11-25 17:28+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: Joshua Chang <j.cs.chang(a)gmail.com>, 2019\n" +"Last-Translator: Emma Peel, 2019\n" "Language-Team: Chinese (Taiwan) (https://www.transifex.com/otf/teams/1519/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -269,7 +270,7 @@ msgstr "最安全簡便的下載方式即為經由 Tor 專案官方網站 https: msgid "" "Your connection to the site will be secured using [HTTPS](/secure-" "connections), which makes it much harder for somebody to tamper with." -msgstr "您與此網站的連接將使用 [HTTPS](/secure-connections) 進行保護，使他人更難以篡改。" +msgstr "您與此網站的連接將使用 [HTTPS](/zh-TW/secure-connections) 進行保護，使他人更難以篡改。" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) @@ -2011,8 +2012,8 @@ msgid "Give today, and Mozilla will match your donation." msgstr "今日您捐款，Mozilla 也會捐出相同數額。" #: lego/templates/footer.html:9 lego/templates/footer.html:18 -#: lego/templates/navbar.html:74 templates/footer.html:9 -#: templates/footer.html:18 templates/navbar.html:74 +#: lego/templates/navbar.html:79 templates/footer.html:9 +#: templates/footer.html:18 templates/navbar.html:79 msgid "Download Tor Browser" msgstr "下載 Tor 瀏覽器"

1 0

[manual/staging] update lego
by emmapeel＠torproject.org 28 Nov '19

28 Nov '19

commit 0cff990126e86891130f2b88cc91be356ff9a207 Author: emma peel <emma.peel(a)riseup.net> Date: Thu Nov 28 20:48:09 2019 +0100 update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index b0a49dc..f0ea955 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit b0a49dc23d6086410f367a0a923270ca5eb2ad20 +Subproject commit f0ea955c50f147813fd7735d226e7f4689e94523

1 0

[snowflake/master] Update broker--proxy protocol with proxy type
by cohosh＠torproject.org 28 Nov '19

28 Nov '19

commit 7277bb37cd8a96afd8516870cc286b3845fa48bb Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Wed Nov 20 12:41:53 2019 -0500 Update broker--proxy protocol with proxy type Proxies now include information about what type they are when they poll for client offers. The broker saves this information along with snowflake ids and outputs it on the /debug page. --- broker/broker.go | 26 +++++++++++++++++-------- broker/snowflake-broker_test.go | 14 +++++++------- broker/snowflake-heap.go | 1 + common/messages/proxy.go | 42 ++++++++++++++++++++++++----------------- common/messages/proxy_test.go | 28 +++++++++++++++++++++------ proxy-go/snowflake.go | 2 +- 6 files changed, 74 insertions(+), 39 deletions(-) diff --git a/broker/broker.go b/broker/broker.go index 13d2575..3edfe84 100644 --- a/broker/broker.go +++ b/broker/broker.go @@ -97,14 +97,16 @@ func (mh MetricsHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { // Proxies may poll for client offers concurrently. type ProxyPoll struct { id string + ptype string offerChannel chan []byte } // Registers a Snowflake and waits for some Client to send an offer, // as part of the polling logic of the proxy handler. -func (ctx *BrokerContext) RequestOffer(id string) []byte { +func (ctx *BrokerContext) RequestOffer(id string, ptype string) []byte { request := new(ProxyPoll) request.id = id + request.ptype = ptype request.offerChannel = make(chan []byte) ctx.proxyPolls <- request // Block until an offer is available, or timeout which sends a nil offer. @@ -117,7 +119,7 @@ func (ctx *BrokerContext) RequestOffer(id string) []byte { // client offer or nil on timeout / none are available. func (ctx *BrokerContext) Broker() { for request := range ctx.proxyPolls { - snowflake := ctx.AddSnowflake(request.id) + snowflake := ctx.AddSnowflake(request.id, request.ptype) // Wait for a client to avail an offer to the snowflake. go func(request *ProxyPoll) { select { @@ -137,10 +139,11 @@ func (ctx *BrokerContext) Broker() { // Create and add a Snowflake to the heap. // Required to keep track of proxies between providing them // with an offer and awaiting their second POST with an answer. -func (ctx *BrokerContext) AddSnowflake(id string) *Snowflake { +func (ctx *BrokerContext) AddSnowflake(id string, ptype string) *Snowflake { snowflake := new(Snowflake) snowflake.id = id snowflake.clients = 0 + snowflake.ptype = ptype snowflake.offerChannel = make(chan []byte) snowflake.answerChannel = make(chan []byte) heap.Push(ctx.snowflakes, snowflake) @@ -159,7 +162,7 @@ func proxyPolls(ctx *BrokerContext, w http.ResponseWriter, r *http.Request) { return } - sid, err := messages.DecodePollRequest(body) + sid, ptype, err := messages.DecodePollRequest(body) if err != nil { w.WriteHeader(http.StatusBadRequest) return @@ -174,7 +177,7 @@ func proxyPolls(ctx *BrokerContext, w http.ResponseWriter, r *http.Request) { } // Wait for a client to avail an offer to the snowflake, or timeout if nil. - offer := ctx.RequestOffer(sid) + offer := ctx.RequestOffer(sid, ptype) var b []byte if nil == offer { ctx.metrics.proxyIdleCount++ @@ -286,16 +289,23 @@ func proxyAnswers(ctx *BrokerContext, w http.ResponseWriter, r *http.Request) { func debugHandler(ctx *BrokerContext, w http.ResponseWriter, r *http.Request) { s := fmt.Sprintf("current snowflakes available: %d\n", ctx.snowflakes.Len()) - var browsers, standalones int + var webexts, browsers, standalones, unknowns int for _, snowflake := range ctx.idToSnowflake { - if len(snowflake.id) < 16 { + if snowflake.ptype == "badge" { browsers++ - } else { + } else if snowflake.ptype == "webext" { + webexts++ + } else if snowflake.ptype == "standalone" { standalones++ + } else { + unknowns++ } + } s += fmt.Sprintf("\tstandalone proxies: %d", standalones) s += fmt.Sprintf("\n\tbrowser proxies: %d", browsers) + s += fmt.Sprintf("\n\twebext proxies: %d", webexts) + s += fmt.Sprintf("\n\tunknown proxies: %d", unknowns) if _, err := w.Write([]byte(s)); err != nil { log.Printf("writing proxy information returned error: %v ", err) } diff --git a/broker/snowflake-broker_test.go b/broker/snowflake-broker_test.go index c35c1d6..cb5f34f 100644 --- a/broker/snowflake-broker_test.go +++ b/broker/snowflake-broker_test.go @@ -29,7 +29,7 @@ func TestBroker(t *testing.T) { Convey("Adds Snowflake", func() { So(ctx.snowflakes.Len(), ShouldEqual, 0) So(len(ctx.idToSnowflake), ShouldEqual, 0) - ctx.AddSnowflake("foo") + ctx.AddSnowflake("foo", "") So(ctx.snowflakes.Len(), ShouldEqual, 1) So(len(ctx.idToSnowflake), ShouldEqual, 1) }) @@ -55,7 +55,7 @@ func TestBroker(t *testing.T) { Convey("Request an offer from the Snowflake Heap", func() { done := make(chan []byte) go func() { - offer := ctx.RequestOffer("test") + offer := ctx.RequestOffer("test", "") done <- offer }() request := <-ctx.proxyPolls @@ -79,7 +79,7 @@ func TestBroker(t *testing.T) { Convey("with a proxy answer if available.", func() { done := make(chan bool) // Prepare a fake proxy to respond with. - snowflake := ctx.AddSnowflake("fake") + snowflake := ctx.AddSnowflake("fake", "") go func() { clientOffers(ctx, w, r) done <- true @@ -97,7 +97,7 @@ func TestBroker(t *testing.T) { return } done := make(chan bool) - snowflake := ctx.AddSnowflake("fake") + snowflake := ctx.AddSnowflake("fake", "") go func() { clientOffers(ctx, w, r) // Takes a few seconds here... @@ -147,7 +147,7 @@ func TestBroker(t *testing.T) { }) Convey("Responds to proxy answers...", func() { - s := ctx.AddSnowflake("test") + s := ctx.AddSnowflake("test", "") w := httptest.NewRecorder() data := bytes.NewReader([]byte(`{"Version":"1.0","Sid":"test","Answer":"test"}`)) @@ -211,7 +211,7 @@ func TestBroker(t *testing.T) { // Manually do the Broker goroutine action here for full control. p := <-ctx.proxyPolls So(p.id, ShouldEqual, "ymbcCMto7KHNGYlp") - s := ctx.AddSnowflake(p.id) + s := ctx.AddSnowflake(p.id, "") go func() { offer := <-s.offerChannel p.offerChannel <- offer @@ -449,7 +449,7 @@ func TestMetrics(t *testing.T) { So(err, ShouldBeNil) // Prepare a fake proxy to respond with. - snowflake := ctx.AddSnowflake("fake") + snowflake := ctx.AddSnowflake("fake", "") go func() { clientOffers(ctx, w, r) done <- true diff --git a/broker/snowflake-heap.go b/broker/snowflake-heap.go index 419956f..cf209ec 100644 --- a/broker/snowflake-heap.go +++ b/broker/snowflake-heap.go @@ -10,6 +10,7 @@ over the offer and answer channels. */ type Snowflake struct { id string + ptype string offerChannel chan []byte answerChannel chan []byte clients int diff --git a/common/messages/proxy.go b/common/messages/proxy.go index 042caf9..7ebab1d 100644 --- a/common/messages/proxy.go +++ b/common/messages/proxy.go @@ -6,16 +6,18 @@ package messages import ( "encoding/json" "fmt" + "strings" ) -const version = "1.0" +const version = "1.1" -/* Version 1.0 specification: +/* Version 1.1 specification: == ProxyPollRequest == { - Sid: [generated session id of proxy] - Version: 1.0 + Sid: [generated session id of proxy], + Version: 1.1, + Type: [badge|webext|standalone] } == ProxyPollResponse == @@ -41,11 +43,11 @@ HTTP 400 BadRequest == ProxyAnswerRequest == { - Sid: [generated session id of proxy] - Version: 1.0 + Sid: [generated session id of proxy], + Version: 1.1, Answer: { - type: answer + type: answer, sdp: [WebRTC SDP] } } @@ -73,34 +75,38 @@ HTTP 400 BadRequest type ProxyPollRequest struct { Sid string Version string + Type string } -func EncodePollRequest(sid string) ([]byte, error) { +func EncodePollRequest(sid string, ptype string) ([]byte, error) { return json.Marshal(ProxyPollRequest{ Sid: sid, Version: version, + Type: ptype, }) } // Decodes a poll message from a snowflake proxy and returns the // sid of the proxy on success and an error if it failed -func DecodePollRequest(data []byte) (string, error) { +func DecodePollRequest(data []byte) (string, string, error) { var message ProxyPollRequest err := json.Unmarshal(data, &message) if err != nil { - return "", err + return "", "", err } - if message.Version != "1.0" { - return "", fmt.Errorf("using unknown version") + + majorVersion := strings.Split(message.Version, ".")[0] + if majorVersion != "1" { + return "", "", fmt.Errorf("using unknown version") } - // Version 1.0 requires an Sid + // Version 1.x requires an Sid if message.Sid == "" { - return "", fmt.Errorf("no supplied session id") + return "", "", fmt.Errorf("no supplied session id") } - return message.Sid, nil + return message.Sid, message.Type, nil } type ProxyPollResponse struct { @@ -153,7 +159,7 @@ type ProxyAnswerRequest struct { func EncodeAnswerRequest(answer string, sid string) ([]byte, error) { return json.Marshal(ProxyAnswerRequest{ - Version: "1.0", + Version: "1.1", Sid: sid, Answer: answer, }) @@ -167,7 +173,9 @@ func DecodeAnswerRequest(data []byte) (string, string, error) { if err != nil { return "", "", err } - if message.Version != "1.0" { + + majorVersion := strings.Split(message.Version, ".")[0] + if majorVersion != "1" { return "", "", fmt.Errorf("using unknown version") } diff --git a/common/messages/proxy_test.go b/common/messages/proxy_test.go index f2f006e..83553a0 100644 --- a/common/messages/proxy_test.go +++ b/common/messages/proxy_test.go @@ -11,45 +11,60 @@ import ( func TestDecodeProxyPollRequest(t *testing.T) { Convey("Context", t, func() { for _, test := range []struct { - sid string - data string - err error + sid string + ptype string + data string + err error }{ { //Version 1.0 proxy message "ymbcCMto7KHNGYlp", + "", `{"Sid":"ymbcCMto7KHNGYlp","Version":"1.0"}`, nil, }, { + //Version 1.1 proxy message + "ymbcCMto7KHNGYlp", + "standalone", + `{"Sid":"ymbcCMto7KHNGYlp","Version":"1.1","Type":"standalone"}`, + nil, + }, + { //Version 0.X proxy message: "", + "", "ymbcCMto7KHNGYlp", &json.SyntaxError{}, }, { "", + "", `{"Sid":"ymbcCMto7KHNGYlp"}`, fmt.Errorf(""), }, { "", + "", "{}", fmt.Errorf(""), }, { "", + "", `{"Version":"1.0"}`, fmt.Errorf(""), }, { "", + "", `{"Version":"2.0"}`, fmt.Errorf(""), }, } { - sid, err := DecodePollRequest([]byte(test.data)) + sid, ptype, err := DecodePollRequest([]byte(test.data)) So(sid, ShouldResemble, test.sid) + So(ptype, ShouldResemble, test.ptype) So(err, ShouldHaveSameTypeAs, test.err) } @@ -58,10 +73,11 @@ func TestDecodeProxyPollRequest(t *testing.T) { func TestEncodeProxyPollRequests(t *testing.T) { Convey("Context", t, func() { - b, err := EncodePollRequest("ymbcCMto7KHNGYlp") + b, err := EncodePollRequest("ymbcCMto7KHNGYlp", "standalone") So(err, ShouldEqual, nil) - sid, err := DecodePollRequest(b) + sid, ptype, err := DecodePollRequest(b) So(sid, ShouldEqual, "ymbcCMto7KHNGYlp") + So(ptype, ShouldEqual, "standalone") So(err, ShouldEqual, nil) }) } diff --git a/proxy-go/snowflake.go b/proxy-go/snowflake.go index c10093a..dce7b70 100644 --- a/proxy-go/snowflake.go +++ b/proxy-go/snowflake.go @@ -175,7 +175,7 @@ func (b *Broker) pollOffer(sid string) *webrtc.SessionDescription { timeOfNextPoll = now } - body, err := messages.EncodePollRequest(sid) + body, err := messages.EncodePollRequest(sid, "standalone") if err != nil { log.Printf("Error encoding poll message: %s", err.Error()) return nil

1 0

[snowflake/master] Update proxy config to take proxy type
by cohosh＠torproject.org 28 Nov '19

28 Nov '19

commit 8ab81fc6cdbd34083a567429b51375ca5512fd50 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Wed Nov 20 13:09:11 2019 -0500 Update proxy config to take proxy type This allows badge and standalone proxies to tell the broker what proxy type they are. --- proxy/broker.js | 7 ++++--- proxy/config.js | 2 ++ proxy/init-badge.js | 3 ++- proxy/init-node.js | 2 +- proxy/init-testing.js | 2 +- proxy/init-webext.js | 3 ++- proxy/spec/broker.spec.js | 24 ++++++++++++++++++------ 7 files changed, 30 insertions(+), 13 deletions(-) diff --git a/proxy/broker.js b/proxy/broker.js index 551110b..42293ae 100644 --- a/proxy/broker.js +++ b/proxy/broker.js @@ -14,11 +14,12 @@ class Broker { // ID so the Broker can keep track of each proxy's signalling channels. // On construction, this Broker object does not do anything until // |getClientOffer| is called. - constructor(url) { + constructor(config) { this.getClientOffer = this.getClientOffer.bind(this); this._postRequest = this._postRequest.bind(this); - this.url = url; + this.config = config + this.url = config.brokerUrl; this.clients = 0; if (0 === this.url.indexOf('localhost', 0)) { // Ensure url has the right protocol + trailing slash. @@ -63,7 +64,7 @@ class Broker { } }; this._xhr = xhr; // Used by spec to fake async Broker interaction - var data = {"Version": "1.0", "Sid": id} + var data = {"Version": "1.1", "Sid": id, "Type": this.config.proxyType} return this._postRequest(xhr, 'proxy', JSON.stringify(data)); }); } diff --git a/proxy/config.js b/proxy/config.js index 9564f82..2b698a6 100644 --- a/proxy/config.js +++ b/proxy/config.js @@ -24,6 +24,8 @@ Config.prototype.defaultBrokerPollInterval = 300.0 * 1000; Config.prototype.maxNumClients = 1; +Config.prototype.proxyType = ""; + // TODO: Different ICE servers. Config.prototype.pcConfig = { iceServers: [ diff --git a/proxy/init-badge.js b/proxy/init-badge.js index 2cc5b07..2e0a261 100644 --- a/proxy/init-badge.js +++ b/proxy/init-badge.js @@ -170,10 +170,11 @@ var debug, snowflake, config, broker, ui, log, dbg, init, update, silenceNotific } config = new Config; + config.proxyType = "badge"; if ('off' !== query.get('ratelimit')) { config.rateLimitBytes = Params.getByteCount(query, 'ratelimit', config.rateLimitBytes); } - broker = new Broker(config.brokerUrl); + broker = new Broker(config); snowflake = new Snowflake(config, ui, broker); log('== snowflake proxy =='); update(); diff --git a/proxy/init-node.js b/proxy/init-node.js index 789e6e3..73c25dc 100644 --- a/proxy/init-node.js +++ b/proxy/init-node.js @@ -8,7 +8,7 @@ var config = new Config; var ui = new UI(); -var broker = new Broker(config.brokerUrl); +var broker = new Broker(config); var snowflake = new Snowflake(config, ui, broker); diff --git a/proxy/init-testing.js b/proxy/init-testing.js index 90026a9..f553f12 100644 --- a/proxy/init-testing.js +++ b/proxy/init-testing.js @@ -89,7 +89,7 @@ var snowflake, query, debug, ui, silenceNotifications, log, dbg, init; } else { ui = new UI(); } - broker = new Broker(config.brokerUrl); + broker = new Broker(config); snowflake = new Snowflake(config, ui, broker); log('== snowflake proxy =='); if (Util.snowflakeIsDisabled(config.cookieName)) { diff --git a/proxy/init-webext.js b/proxy/init-webext.js index ad345fa..afa9aee 100644 --- a/proxy/init-webext.js +++ b/proxy/init-webext.js @@ -172,8 +172,9 @@ var debug, snowflake, config, broker, ui, log, dbg, init, update, silenceNotific init = function() { config = new Config; + config.proxyType = "webext"; ui = new WebExtUI(); - broker = new Broker(config.brokerUrl); + broker = new Broker(config); snowflake = new Snowflake(config, ui, broker); log('== snowflake proxy =='); ui.initToggle(); diff --git a/proxy/spec/broker.spec.js b/proxy/spec/broker.spec.js index 6ab9691..28a66c4 100644 --- a/proxy/spec/broker.spec.js +++ b/proxy/spec/broker.spec.js @@ -22,7 +22,9 @@ describe('Broker', function() { it('can be created', function() { var b; - b = new Broker('fake'); + var config = new Config; + config.brokerUrl = 'fake'; + b = new Broker(config); expect(b.url).toEqual('https://fake/'); expect(b.id).not.toBeNull(); }); @@ -31,7 +33,9 @@ describe('Broker', function() { it('polls and promises a client offer', function(done) { var b, poll; - b = new Broker('fake'); + var config = new Config; + config.brokerUrl = 'fake'; + b = new Broker(config); // fake successful request and response from broker. spyOn(b, '_postRequest').and.callFake(function() { b._xhr.readyState = b._xhr.DONE; @@ -53,7 +57,9 @@ describe('Broker', function() { it('rejects if the broker timed-out', function(done) { var b, poll; - b = new Broker('fake'); + var config = new Config; + config.brokerUrl = 'fake'; + b = new Broker(config); // fake timed-out request from broker spyOn(b, '_postRequest').and.callFake(function() { b._xhr.readyState = b._xhr.DONE; @@ -75,7 +81,9 @@ describe('Broker', function() { it('rejects on any other status', function(done) { var b, poll; - b = new Broker('fake'); + var config = new Config; + config.brokerUrl = 'fake'; + b = new Broker(config); // fake timed-out request from broker spyOn(b, '_postRequest').and.callFake(function() { b._xhr.readyState = b._xhr.DONE; @@ -99,14 +107,18 @@ describe('Broker', function() { }); it('responds to the broker with answer', function() { - var b = new Broker('fake'); + var config = new Config; + config.brokerUrl = 'fake'; + var b = new Broker(config); spyOn(b, '_postRequest'); b.sendAnswer('fake id', 123); expect(b._postRequest).toHaveBeenCalledWith(jasmine.any(Object), 'answer', '{"Version":"1.0","Sid":"fake id","Answer":"123"}'); }); it('POST XMLHttpRequests to the broker', function() { - var b = new Broker('fake'); + var config = new Config; + config.brokerUrl = 'fake'; + var b = new Broker(config); b._xhr = new XMLHttpRequest(); spyOn(b._xhr, 'open'); spyOn(b._xhr, 'setRequestHeader');

1 0

[snowflake/master] Updated broker specification and comments
by cohosh＠torproject.org 28 Nov '19

28 Nov '19

commit 94de69aa369ebdee0cee5b683a42ebc8811a796d Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Tue Nov 26 10:44:40 2019 -0500 Updated broker specification and comments --- broker/metrics.go | 59 ++---------------------------------------------- common/messages/proxy.go | 4 ++-- doc/broker-spec.txt | 18 +++++++++++++++ 3 files changed, 22 insertions(+), 59 deletions(-) diff --git a/broker/metrics.go b/broker/metrics.go index c23a170..bf5ce29 100644 --- a/broker/metrics.go +++ b/broker/metrics.go @@ -1,66 +1,11 @@ /* -We export metrics in the following format: - - "snowflake-stats-end" YYYY-MM-DD HH:MM:SS (NSEC s) NL - [At most once.] - - YYYY-MM-DD HH:MM:SS defines the end of the included measurement - interval of length NSEC seconds (86400 seconds by default). - - "snowflake-ips" CC=NUM,CC=NUM,... NL - [At most once.] - - List of mappings from two-letter country codes to the number of - unique IP addresses of snowflake proxies that have polled. - - "snowflake-ips-total" NUM NL - [At most once.] - - A count of the total number of unique IP addresses of snowflake - proxies that have polled. - - "snowflake-ips-standalone" NUM NL - [At most once.] - - A count of the total number of unique IP addresses of snowflake - proxies of type "standalone" that have polled. - - "snowflake-ips-badge" NUM NL - [At most once.] - - A count of the total number of unique IP addresses of snowflake - proxies of type "badge" that have polled. - - "snowflake-ips-webext" NUM NL - [At most once.] - - A count of the total number of unique IP addresses of snowflake - proxies of type "webext" that have polled. - - "snowflake-idle-count" NUM NL - [At most once.] - - A count of the number of times a proxy has polled but received - no client offer, rounded up to the nearest multiple of 8. - - "client-denied-count" NUM NL - [At most once.] - - A count of the number of times a client has requested a proxy - from the broker but no proxies were available, rounded up to - the nearest multiple of 8. - - "client-snowflake-match-count" NUM NL - [At most once.] - - A count of the number of times a client successfully received a - proxy from the broker, rounded up to the nearest multiple of 8. +We export metrics in the format specified in our broker spec: +https://gitweb.torproject.org/pluggable-transports/snowflake.git/tree/doc/broker-spec.txt */ package main import ( - // "golang.org/x/net/internal/timeseries" "fmt" "log" "math" diff --git a/common/messages/proxy.go b/common/messages/proxy.go index d57af1e..89dd43c 100644 --- a/common/messages/proxy.go +++ b/common/messages/proxy.go @@ -17,7 +17,7 @@ const version = "1.1" { Sid: [generated session id of proxy], Version: 1.1, - Type: [badge|webext|standalone] + Type: ["badge"|"webext"|"standalone"] } == ProxyPollResponse == @@ -87,7 +87,7 @@ func EncodePollRequest(sid string, proxyType string) ([]byte, error) { } // Decodes a poll message from a snowflake proxy and returns the -// sid of the proxy on success and an error if it failed +// sid and proxy type of the proxy on success and an error if it failed func DecodePollRequest(data []byte) (string, string, error) { var message ProxyPollRequest diff --git a/doc/broker-spec.txt b/doc/broker-spec.txt index 2877784..eba3347 100644 --- a/doc/broker-spec.txt +++ b/doc/broker-spec.txt @@ -31,6 +31,24 @@ Metrics data from the Snowflake broker can be retrieved by sending an HTTP GET r A count of the total number of unique IP addresses of Snowflake proxies that have polled. + "snowflake-ips-standalone" NUM NL + [At most once.] + + A count of the total number of unique IP addresses of snowflake + proxies of type "standalone" that have polled. + + "snowflake-ips-badge" NUM NL + [At most once.] + + A count of the total number of unique IP addresses of snowflake + proxies of type "badge" that have polled. + + "snowflake-ips-webext" NUM NL + [At most once.] + + A count of the total number of unique IP addresses of snowflake + proxies of type "webext" that have polled. + "snowflake-idle-count" NUM NL [At most once.]

1 0

[snowflake/master] Add proxy type to stats exported by broker
by cohosh＠torproject.org 28 Nov '19

28 Nov '19

commit 981abffbd93673c483a0d41631e472303b3fd0aa Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Wed Nov 20 13:27:04 2019 -0500 Add proxy type to stats exported by broker --- broker/broker.go | 2 +- broker/metrics.go | 73 +++++++++++++++++++++++++++++++++++------ broker/snowflake-broker_test.go | 58 +++++++++++++++++++++++++------- 3 files changed, 111 insertions(+), 22 deletions(-) diff --git a/broker/broker.go b/broker/broker.go index 3edfe84..e897ffd 100644 --- a/broker/broker.go +++ b/broker/broker.go @@ -173,7 +173,7 @@ func proxyPolls(ctx *BrokerContext, w http.ResponseWriter, r *http.Request) { if err != nil { log.Println("Error processing proxy IP: ", err.Error()) } else { - ctx.metrics.UpdateCountryStats(remoteIP) + ctx.metrics.UpdateCountryStats(remoteIP, ptype) } // Wait for a client to avail an offer to the snowflake, or timeout if nil. diff --git a/broker/metrics.go b/broker/metrics.go index 15a4a88..b5c423c 100644 --- a/broker/metrics.go +++ b/broker/metrics.go @@ -19,6 +19,24 @@ We export metrics in the following format: A count of the total number of unique IP addresses of snowflake proxies that have polled. + "snowflake-ips-standalone" NUM NL + [At most once.] + + A count of the total number of unique IP addresses of snowflake + proxies of type "standalone" that have polled. + + "snowflake-ips-badge" NUM NL + [At most once.] + + A count of the total number of unique IP addresses of snowflake + proxies of type "badge" that have polled. + + "snowflake-ips-webext" NUM NL + [At most once.] + + A count of the total number of unique IP addresses of snowflake + proxies of type "webext" that have polled. + "snowflake-idle-count" NUM NL [At most once.] @@ -58,8 +76,11 @@ var ( const metricsResolution = 60 * 60 * 24 * time.Second //86400 seconds type CountryStats struct { - addrs map[string]bool - counts map[string]int + standalone map[string]bool + badge map[string]bool + webext map[string]bool + unknown map[string]bool + counts map[string]int } // Implements Observable @@ -89,13 +110,27 @@ func (s CountryStats) Display() string { return output } -func (m *Metrics) UpdateCountryStats(addr string) { +func (m *Metrics) UpdateCountryStats(addr string, ptype string) { var country string var ok bool - if m.countryStats.addrs[addr] { - return + if ptype == "standalone" { + if m.countryStats.standalone[addr] { + return + } + } else if ptype == "badge" { + if m.countryStats.badge[addr] { + return + } + } else if ptype == "webext" { + if m.countryStats.webext[addr] { + return + } + } else { + if m.countryStats.unknown[addr] { + return + } } ip := net.ParseIP(addr) @@ -118,7 +153,15 @@ func (m *Metrics) UpdateCountryStats(addr string) { //update map of unique ips and counts m.countryStats.counts[country]++ - m.countryStats.addrs[addr] = true + if ptype == "standalone" { + m.countryStats.standalone[addr] = true + } else if ptype == "badge" { + m.countryStats.badge[addr] = true + } else if ptype == "webext" { + m.countryStats.webext[addr] = true + } else { + m.countryStats.unknown[addr] = true + } } @@ -148,8 +191,11 @@ func NewMetrics(metricsLogger *log.Logger) (*Metrics, error) { m := new(Metrics) m.countryStats = CountryStats{ - counts: make(map[string]int), - addrs: make(map[string]bool), + counts: make(map[string]int), + standalone: make(map[string]bool), + badge: make(map[string]bool), + webext: make(map[string]bool), + unknown: make(map[string]bool), } m.logger = metricsLogger @@ -172,7 +218,11 @@ func (m *Metrics) logMetrics() { func (m *Metrics) printMetrics() { m.logger.Println("snowflake-stats-end", time.Now().UTC().Format("2006-01-02 15:04:05"), fmt.Sprintf("(%d s)", int(metricsResolution.Seconds()))) m.logger.Println("snowflake-ips", m.countryStats.Display()) - m.logger.Println("snowflake-ips-total", len(m.countryStats.addrs)) + m.logger.Println("snowflake-ips-total", len(m.countryStats.standalone)+ + len(m.countryStats.badge)+len(m.countryStats.webext)+len(m.countryStats.unknown)) + m.logger.Println("snowflake-ips-standalone", len(m.countryStats.standalone)) + m.logger.Println("snowflake-ips-badge", len(m.countryStats.badge)) + m.logger.Println("snowflake-ips-webext", len(m.countryStats.webext)) m.logger.Println("snowflake-idle-count", binCount(m.proxyIdleCount)) m.logger.Println("client-denied-count", binCount(m.clientDeniedCount)) m.logger.Println("client-snowflake-match-count", binCount(m.clientProxyMatchCount)) @@ -184,7 +234,10 @@ func (m *Metrics) zeroMetrics() { m.clientDeniedCount = 0 m.clientProxyMatchCount = 0 m.countryStats.counts = make(map[string]int) - m.countryStats.addrs = make(map[string]bool) + m.countryStats.standalone = make(map[string]bool) + m.countryStats.badge = make(map[string]bool) + m.countryStats.webext = make(map[string]bool) + m.countryStats.unknown = make(map[string]bool) } // Rounds up a count to the nearest multiple of 8. diff --git a/broker/snowflake-broker_test.go b/broker/snowflake-broker_test.go index cb5f34f..b23e688 100644 --- a/broker/snowflake-broker_test.go +++ b/broker/snowflake-broker_test.go @@ -387,7 +387,7 @@ func TestGeoip(t *testing.T) { if err := ctx.metrics.LoadGeoipDatabases("invalid_filename", "invalid_filename6"); err != nil { log.Printf("loading geo ip databases returned error: %v", err) } - ctx.metrics.UpdateCountryStats("127.0.0.1") + ctx.metrics.UpdateCountryStats("127.0.0.1", "") So(ctx.metrics.tablev4, ShouldEqual, nil) }) @@ -408,7 +408,6 @@ func TestMetrics(t *testing.T) { w := httptest.NewRecorder() data := bytes.NewReader([]byte("{\"Sid\":\"ymbcCMto7KHNGYlp\",\"Version\":\"1.0\"}")) r, err := http.NewRequest("POST", "snowflake.broker/proxy", data) - r.Header.Set("X-Session-ID", "test") r.RemoteAddr = "129.97.208.23:8888" //CA geoip So(err, ShouldBeNil) go func(ctx *BrokerContext) { @@ -419,8 +418,47 @@ func TestMetrics(t *testing.T) { p.offerChannel <- nil <-done + w = httptest.NewRecorder() + data = bytes.NewReader([]byte(`{"Sid":"ymbcCMto7KHNGYlp","Version":"1.0","Type":"standalone"}`)) + r, err = http.NewRequest("POST", "snowflake.broker/proxy", data) + r.RemoteAddr = "129.97.208.23:8888" //CA geoip + So(err, ShouldBeNil) + go func(ctx *BrokerContext) { + proxyPolls(ctx, w, r) + done <- true + }(ctx) + p = <-ctx.proxyPolls //manually unblock poll + p.offerChannel <- nil + <-done + + w = httptest.NewRecorder() + data = bytes.NewReader([]byte(`{"Sid":"ymbcCMto7KHNGYlp","Version":"1.0","Type":"badge"}`)) + r, err = http.NewRequest("POST", "snowflake.broker/proxy", data) + r.RemoteAddr = "129.97.208.23:8888" //CA geoip + So(err, ShouldBeNil) + go func(ctx *BrokerContext) { + proxyPolls(ctx, w, r) + done <- true + }(ctx) + p = <-ctx.proxyPolls //manually unblock poll + p.offerChannel <- nil + <-done + + w = httptest.NewRecorder() + data = bytes.NewReader([]byte(`{"Sid":"ymbcCMto7KHNGYlp","Version":"1.0","Type":"webext"}`)) + r, err = http.NewRequest("POST", "snowflake.broker/proxy", data) + r.RemoteAddr = "129.97.208.23:8888" //CA geoip + So(err, ShouldBeNil) + go func(ctx *BrokerContext) { + proxyPolls(ctx, w, r) + done <- true + }(ctx) + p = <-ctx.proxyPolls //manually unblock poll + p.offerChannel <- nil + <-done ctx.metrics.printMetrics() - So(buf.String(), ShouldResemble, "snowflake-stats-end "+time.Now().UTC().Format("2006-01-02 15:04:05")+" (86400 s)\nsnowflake-ips CA=1\nsnowflake-ips-total 1\nsnowflake-idle-count 8\nclient-denied-count 0\nclient-snowflake-match-count 0\n") + So(buf.String(), ShouldResemble, "snowflake-stats-end "+time.Now().UTC().Format("2006-01-02 15:04:05")+" (86400 s)\nsnowflake-ips CA=4\nsnowflake-ips-total 4\nsnowflake-ips-standalone 1\nsnowflake-ips-badge 1\nsnowflake-ips-webext 1\nsnowflake-idle-count 8\nclient-denied-count 0\nclient-snowflake-match-count 0\n") + }) //Test addition of client failures @@ -433,13 +471,13 @@ func TestMetrics(t *testing.T) { clientOffers(ctx, w, r) ctx.metrics.printMetrics() - So(buf.String(), ShouldResemble, "snowflake-stats-end "+time.Now().UTC().Format("2006-01-02 15:04:05")+" (86400 s)\nsnowflake-ips \nsnowflake-ips-total 0\nsnowflake-idle-count 0\nclient-denied-count 8\nclient-snowflake-match-count 0\n") + So(buf.String(), ShouldResemble, "snowflake-stats-end "+time.Now().UTC().Format("2006-01-02 15:04:05")+" (86400 s)\nsnowflake-ips \nsnowflake-ips-total 0\nsnowflake-ips-standalone 0\nsnowflake-ips-badge 0\nsnowflake-ips-webext 0\nsnowflake-idle-count 0\nclient-denied-count 8\nclient-snowflake-match-count 0\n") // Test reset buf.Reset() ctx.metrics.zeroMetrics() ctx.metrics.printMetrics() - So(buf.String(), ShouldResemble, "snowflake-stats-end "+time.Now().UTC().Format("2006-01-02 15:04:05")+" (86400 s)\nsnowflake-ips \nsnowflake-ips-total 0\nsnowflake-idle-count 0\nclient-denied-count 0\nclient-snowflake-match-count 0\n") + So(buf.String(), ShouldResemble, "snowflake-stats-end "+time.Now().UTC().Format("2006-01-02 15:04:05")+" (86400 s)\nsnowflake-ips \nsnowflake-ips-total 0\nsnowflake-ips-standalone 0\nsnowflake-ips-badge 0\nsnowflake-ips-webext 0\nsnowflake-idle-count 0\nclient-denied-count 0\nclient-snowflake-match-count 0\n") }) //Test addition of client matches Convey("for client-proxy match", func() { @@ -460,7 +498,7 @@ func TestMetrics(t *testing.T) { <-done ctx.metrics.printMetrics() - So(buf.String(), ShouldResemble, "snowflake-stats-end "+time.Now().UTC().Format("2006-01-02 15:04:05")+" (86400 s)\nsnowflake-ips \nsnowflake-ips-total 0\nsnowflake-idle-count 0\nclient-denied-count 0\nclient-snowflake-match-count 8\n") + So(buf.String(), ShouldResemble, "snowflake-stats-end "+time.Now().UTC().Format("2006-01-02 15:04:05")+" (86400 s)\nsnowflake-ips \nsnowflake-ips-total 0\nsnowflake-ips-standalone 0\nsnowflake-ips-badge 0\nsnowflake-ips-webext 0\nsnowflake-idle-count 0\nclient-denied-count 0\nclient-snowflake-match-count 8\n") }) //Test rounding boundary Convey("binning boundary", func() { @@ -479,12 +517,12 @@ func TestMetrics(t *testing.T) { clientOffers(ctx, w, r) ctx.metrics.printMetrics() - So(buf.String(), ShouldResemble, "snowflake-stats-end "+time.Now().UTC().Format("2006-01-02 15:04:05")+" (86400 s)\nsnowflake-ips \nsnowflake-ips-total 0\nsnowflake-idle-count 0\nclient-denied-count 8\nclient-snowflake-match-count 0\n") + So(buf.String(), ShouldResemble, "snowflake-stats-end "+time.Now().UTC().Format("2006-01-02 15:04:05")+" (86400 s)\nsnowflake-ips \nsnowflake-ips-total 0\nsnowflake-ips-standalone 0\nsnowflake-ips-badge 0\nsnowflake-ips-webext 0\nsnowflake-idle-count 0\nclient-denied-count 8\nclient-snowflake-match-count 0\n") clientOffers(ctx, w, r) buf.Reset() ctx.metrics.printMetrics() - So(buf.String(), ShouldResemble, "snowflake-stats-end "+time.Now().UTC().Format("2006-01-02 15:04:05")+" (86400 s)\nsnowflake-ips \nsnowflake-ips-total 0\nsnowflake-idle-count 0\nclient-denied-count 16\nclient-snowflake-match-count 0\n") + So(buf.String(), ShouldResemble, "snowflake-stats-end "+time.Now().UTC().Format("2006-01-02 15:04:05")+" (86400 s)\nsnowflake-ips \nsnowflake-ips-total 0\nsnowflake-ips-standalone 0\nsnowflake-ips-badge 0\nsnowflake-ips-webext 0\nsnowflake-idle-count 0\nclient-denied-count 16\nclient-snowflake-match-count 0\n") }) //Test unique ip @@ -492,7 +530,6 @@ func TestMetrics(t *testing.T) { w := httptest.NewRecorder() data := bytes.NewReader([]byte(`{"Sid":"ymbcCMto7KHNGYlp","Version":"1.0"}`)) r, err := http.NewRequest("POST", "snowflake.broker/proxy", data) - r.Header.Set("X-Session-ID", "test") r.RemoteAddr = "129.97.208.23:8888" //CA geoip So(err, ShouldBeNil) go func(ctx *BrokerContext) { @@ -508,7 +545,6 @@ func TestMetrics(t *testing.T) { if err != nil { log.Printf("unable to get NewRequest with error: %v", err) } - r.Header.Set("X-Session-ID", "test") r.RemoteAddr = "129.97.208.23:8888" //CA geoip go func(ctx *BrokerContext) { proxyPolls(ctx, w, r) @@ -519,7 +555,7 @@ func TestMetrics(t *testing.T) { <-done ctx.metrics.printMetrics() - So(buf.String(), ShouldResemble, "snowflake-stats-end "+time.Now().UTC().Format("2006-01-02 15:04:05")+" (86400 s)\nsnowflake-ips CA=1\nsnowflake-ips-total 1\nsnowflake-idle-count 8\nclient-denied-count 0\nclient-snowflake-match-count 0\n") + So(buf.String(), ShouldResemble, "snowflake-stats-end "+time.Now().UTC().Format("2006-01-02 15:04:05")+" (86400 s)\nsnowflake-ips CA=1\nsnowflake-ips-total 1\nsnowflake-ips-standalone 0\nsnowflake-ips-badge 0\nsnowflake-ips-webext 0\nsnowflake-idle-count 8\nclient-denied-count 0\nclient-snowflake-match-count 0\n") }) }) }

1 0

[snowflake/master] Updated proxyType variable name for readability
by cohosh＠torproject.org 28 Nov '19

28 Nov '19

commit 97554e03e4081cecb7609721e43ad4d4ce408dd4 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Tue Nov 26 10:36:27 2019 -0500 Updated proxyType variable name for readability --- broker/broker.go | 24 ++++++++++++------------ broker/metrics.go | 14 +++++++------- broker/snowflake-heap.go | 2 +- common/messages/proxy.go | 4 ++-- common/messages/proxy_test.go | 16 ++++++++-------- 5 files changed, 30 insertions(+), 30 deletions(-) diff --git a/broker/broker.go b/broker/broker.go index e897ffd..c166f1a 100644 --- a/broker/broker.go +++ b/broker/broker.go @@ -97,16 +97,16 @@ func (mh MetricsHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { // Proxies may poll for client offers concurrently. type ProxyPoll struct { id string - ptype string + proxyType string offerChannel chan []byte } // Registers a Snowflake and waits for some Client to send an offer, // as part of the polling logic of the proxy handler. -func (ctx *BrokerContext) RequestOffer(id string, ptype string) []byte { +func (ctx *BrokerContext) RequestOffer(id string, proxyType string) []byte { request := new(ProxyPoll) request.id = id - request.ptype = ptype + request.proxyType = proxyType request.offerChannel = make(chan []byte) ctx.proxyPolls <- request // Block until an offer is available, or timeout which sends a nil offer. @@ -119,7 +119,7 @@ func (ctx *BrokerContext) RequestOffer(id string, ptype string) []byte { // client offer or nil on timeout / none are available. func (ctx *BrokerContext) Broker() { for request := range ctx.proxyPolls { - snowflake := ctx.AddSnowflake(request.id, request.ptype) + snowflake := ctx.AddSnowflake(request.id, request.proxyType) // Wait for a client to avail an offer to the snowflake. go func(request *ProxyPoll) { select { @@ -139,11 +139,11 @@ func (ctx *BrokerContext) Broker() { // Create and add a Snowflake to the heap. // Required to keep track of proxies between providing them // with an offer and awaiting their second POST with an answer. -func (ctx *BrokerContext) AddSnowflake(id string, ptype string) *Snowflake { +func (ctx *BrokerContext) AddSnowflake(id string, proxyType string) *Snowflake { snowflake := new(Snowflake) snowflake.id = id snowflake.clients = 0 - snowflake.ptype = ptype + snowflake.proxyType = proxyType snowflake.offerChannel = make(chan []byte) snowflake.answerChannel = make(chan []byte) heap.Push(ctx.snowflakes, snowflake) @@ -162,7 +162,7 @@ func proxyPolls(ctx *BrokerContext, w http.ResponseWriter, r *http.Request) { return } - sid, ptype, err := messages.DecodePollRequest(body) + sid, proxyType, err := messages.DecodePollRequest(body) if err != nil { w.WriteHeader(http.StatusBadRequest) return @@ -173,11 +173,11 @@ func proxyPolls(ctx *BrokerContext, w http.ResponseWriter, r *http.Request) { if err != nil { log.Println("Error processing proxy IP: ", err.Error()) } else { - ctx.metrics.UpdateCountryStats(remoteIP, ptype) + ctx.metrics.UpdateCountryStats(remoteIP, proxyType) } // Wait for a client to avail an offer to the snowflake, or timeout if nil. - offer := ctx.RequestOffer(sid, ptype) + offer := ctx.RequestOffer(sid, proxyType) var b []byte if nil == offer { ctx.metrics.proxyIdleCount++ @@ -291,11 +291,11 @@ func debugHandler(ctx *BrokerContext, w http.ResponseWriter, r *http.Request) { var webexts, browsers, standalones, unknowns int for _, snowflake := range ctx.idToSnowflake { - if snowflake.ptype == "badge" { + if snowflake.proxyType == "badge" { browsers++ - } else if snowflake.ptype == "webext" { + } else if snowflake.proxyType == "webext" { webexts++ - } else if snowflake.ptype == "standalone" { + } else if snowflake.proxyType == "standalone" { standalones++ } else { unknowns++ diff --git a/broker/metrics.go b/broker/metrics.go index b5c423c..c23a170 100644 --- a/broker/metrics.go +++ b/broker/metrics.go @@ -110,20 +110,20 @@ func (s CountryStats) Display() string { return output } -func (m *Metrics) UpdateCountryStats(addr string, ptype string) { +func (m *Metrics) UpdateCountryStats(addr string, proxyType string) { var country string var ok bool - if ptype == "standalone" { + if proxyType == "standalone" { if m.countryStats.standalone[addr] { return } - } else if ptype == "badge" { + } else if proxyType == "badge" { if m.countryStats.badge[addr] { return } - } else if ptype == "webext" { + } else if proxyType == "webext" { if m.countryStats.webext[addr] { return } @@ -153,11 +153,11 @@ func (m *Metrics) UpdateCountryStats(addr string, ptype string) { //update map of unique ips and counts m.countryStats.counts[country]++ - if ptype == "standalone" { + if proxyType == "standalone" { m.countryStats.standalone[addr] = true - } else if ptype == "badge" { + } else if proxyType == "badge" { m.countryStats.badge[addr] = true - } else if ptype == "webext" { + } else if proxyType == "webext" { m.countryStats.webext[addr] = true } else { m.countryStats.unknown[addr] = true diff --git a/broker/snowflake-heap.go b/broker/snowflake-heap.go index cf209ec..19a64b2 100644 --- a/broker/snowflake-heap.go +++ b/broker/snowflake-heap.go @@ -10,7 +10,7 @@ over the offer and answer channels. */ type Snowflake struct { id string - ptype string + proxyType string offerChannel chan []byte answerChannel chan []byte clients int diff --git a/common/messages/proxy.go b/common/messages/proxy.go index 7ebab1d..d57af1e 100644 --- a/common/messages/proxy.go +++ b/common/messages/proxy.go @@ -78,11 +78,11 @@ type ProxyPollRequest struct { Type string } -func EncodePollRequest(sid string, ptype string) ([]byte, error) { +func EncodePollRequest(sid string, proxyType string) ([]byte, error) { return json.Marshal(ProxyPollRequest{ Sid: sid, Version: version, - Type: ptype, + Type: proxyType, }) } diff --git a/common/messages/proxy_test.go b/common/messages/proxy_test.go index 83553a0..6783874 100644 --- a/common/messages/proxy_test.go +++ b/common/messages/proxy_test.go @@ -11,10 +11,10 @@ import ( func TestDecodeProxyPollRequest(t *testing.T) { Convey("Context", t, func() { for _, test := range []struct { - sid string - ptype string - data string - err error + sid string + proxyType string + data string + err error }{ { //Version 1.0 proxy message @@ -62,9 +62,9 @@ func TestDecodeProxyPollRequest(t *testing.T) { fmt.Errorf(""), }, } { - sid, ptype, err := DecodePollRequest([]byte(test.data)) + sid, proxyType, err := DecodePollRequest([]byte(test.data)) So(sid, ShouldResemble, test.sid) - So(ptype, ShouldResemble, test.ptype) + So(proxyType, ShouldResemble, test.proxyType) So(err, ShouldHaveSameTypeAs, test.err) } @@ -75,9 +75,9 @@ func TestEncodeProxyPollRequests(t *testing.T) { Convey("Context", t, func() { b, err := EncodePollRequest("ymbcCMto7KHNGYlp", "standalone") So(err, ShouldEqual, nil) - sid, ptype, err := DecodePollRequest(b) + sid, proxyType, err := DecodePollRequest(b) So(sid, ShouldEqual, "ymbcCMto7KHNGYlp") - So(ptype, ShouldEqual, "standalone") + So(proxyType, ShouldEqual, "standalone") So(err, ShouldEqual, nil) }) }

1 0