- tor-commits - lists.torproject.org

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 20 Feb '16

20 Feb '16

commit 696021b77258a06437b6ac648639ccfa567a1b8b Author: Translation commit bot <translation(a)torproject.org> Date: Sat Feb 20 13:15:31 2016 +0000 Update translations for mat-gui --- ro.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ro.po b/ro.po index 4e4b147..2ba8568 100644 --- a/ro.po +++ b/ro.po @@ -4,6 +4,7 @@ # # Translators: # Andrei Draga, 2013 +# Jobava <jobaval10n(a)gmail.com>, 2016 # kyx <mihaidiaconu(a)gmail.com>, 2016 # clopotel <yo_sergiu05(a)yahoo.com>, 2014 msgid "" @@ -11,8 +12,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-10 23:06+0100\n" -"PO-Revision-Date: 2016-02-11 09:31+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2016-02-20 13:02+0000\n" +"Last-Translator: Jobava <jobaval10n(a)gmail.com>\n" "Language-Team: Romanian (http://www.transifex.com/otf/torproject/language/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -76,11 +77,11 @@ msgstr "Redu mărimea și calitatea PDF-ului produs" #: mat-gui:238 msgid "Remove unsupported file from archives" -msgstr "" +msgstr "Șterge fișierul nesuportat din arhive" #: mat-gui:241 msgid "Remove non-supported (and so non-anonymised) file from output archive" -msgstr "" +msgstr "Șterge fișierul nesuportat (și prin urmare neanonimizat) din arhiva de ieșire" #: mat-gui:280 msgid "Unknown"

1 0

[webwml/master] make it clearer we're not accepted to gsoc 2016 yet
by arma＠torproject.org 20 Feb '16

20 Feb '16

commit 04a21f6daa6f9551657e2831ed69414fb8846f2f Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Feb 19 22:02:10 2016 -0500 make it clearer we're not accepted to gsoc 2016 yet --- about/en/gsoc.wml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/about/en/gsoc.wml b/about/en/gsoc.wml index 7d77410..59046fe 100644 --- a/about/en/gsoc.wml +++ b/about/en/gsoc.wml @@ -26,6 +26,8 @@ href="https://www.google-melange.com/gsoc/homepage/google/gsoc2015">Google Summer of Code 2016</a>! --> + We have applied to GSoC 2016, and we should know at the end of February + whether we are in this year. </p> <p>

1 0

[torspec/master] update some proposal status
by nickm＠torproject.org 19 Feb '16

19 Feb '16

commit 6a400cfd5c3fde6a8a2f3b194aac3a322af5897d Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 19 13:13:23 2016 -0500 update some proposal status --- proposals/000-index.txt | 8 ++++---- proposals/257-hiding-authorities.txt | 9 ++++++++- proposals/258-dirauth-dos.txt | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/proposals/000-index.txt b/proposals/000-index.txt index 3199b7c..20d6bb7 100644 --- a/proposals/000-index.txt +++ b/proposals/000-index.txt @@ -177,8 +177,8 @@ Proposals by number: 254 Padding Negotiation [DRAFT] 255 Controller features to allow for load-balancing hidden services [DRAFT] 256 Key revocation for relays and authorities [OPEN] -257 Refactoring authorities and taking parts offline [DRAFT] -258 Denial-of-service resistance for directory authorities [OPEN] +257 Refactoring authorities and taking parts offline [META] +258 Denial-of-service resistance for directory authorities [ACCEPTED] 259 New Guard Selection Behaviour [DRAFT] 260 Rendezvous Single Onion Services [DRAFT] 261 AEZ for relay cryptography [OPEN] @@ -210,7 +210,6 @@ Proposals by status: 253 Out of Band Circuit HMACs 254 Padding Negotiation 255 Controller features to allow for load-balancing hidden services - 257 Refactoring authorities and taking parts offline 259 New Guard Selection Behaviour 260 Rendezvous Single Onion Services 265 Load Balancing with Overhead Parameters @@ -242,7 +241,6 @@ Proposals by status: 237 All relays are directory servers [for 0.2.7.x] 242 Better performance and usability for the MyFamily option 256 Key revocation for relays and authorities - 258 Denial-of-service resistance for directory authorities 261 AEZ for relay cryptography 262 Re-keying live circuits with new cryptographic material 263 Request to change key exchange protocol for handshake v1.1 @@ -254,11 +252,13 @@ Proposals by status: 188 Bridge Guards and other anti-enumeration defenses 220 Migrate server identity keys to Ed25519 [for 0.2.x.x] 244 Use RFC5705 Key Exporting in our AUTHENTICATE calls + 258 Denial-of-service resistance for directory authorities META: 000 Index of Tor Proposals 001 The Tor Proposal Process 098 Proposals that should be written 099 Miscellaneous proposals + 257 Refactoring authorities and taking parts offline FINISHED: 121 Hidden Service Authentication [in 0.2.1.x] 151 Improving Tor Path Selection diff --git a/proposals/257-hiding-authorities.txt b/proposals/257-hiding-authorities.txt index 330bb03..cab85ba 100644 --- a/proposals/257-hiding-authorities.txt +++ b/proposals/257-hiding-authorities.txt @@ -2,7 +2,14 @@ Filename: 257-hiding-authorities.txt Title: Refactoring authorities and taking parts offline Authors: Nick Mathewson, Andrea Shepard Created: 2015-10-27 -Status: Draft +Status: Meta + +0. Meta status + + This proposal is 'accepted' as an outline for future proposals, though + it doesn't actually specify itself in enough detail to be implemented as + it stands. + 1. Introduction diff --git a/proposals/258-dirauth-dos.txt b/proposals/258-dirauth-dos.txt index 966a094..bb75c22 100644 --- a/proposals/258-dirauth-dos.txt +++ b/proposals/258-dirauth-dos.txt @@ -2,7 +2,7 @@ Filename: 258-dirauth-dos.txt Title: Denial-of-service resistance for directory authorities Author: Andrea Shepard Created: 2015-10-27 -Status: Open +Status: Accepted 1. Problem statement

1 0

[webwml/master] update gsoc page for 2016
by arma＠torproject.org 19 Feb '16

19 Feb '16

commit fedc193b8102e1790a409e10c2b93754a3de96dc Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Feb 19 13:08:38 2016 -0500 update gsoc page for 2016 --- about/en/gsoc.wml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/about/en/gsoc.wml b/about/en/gsoc.wml index b8f4e25..7d77410 100644 --- a/about/en/gsoc.wml +++ b/about/en/gsoc.wml @@ -2,29 +2,29 @@ # Revision: $Revision$ # Translation-Priority: 4-optional -#include "head.wmi" TITLE="Tor: Google Summer of Code 2015" CHARSET="UTF-8" +#include "head.wmi" TITLE="Tor: Google Summer of Code 2016" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Home » </a> <a href="<page about/gsoc>">Google Summer of Code</a> </div> <div id="maincol"> - <h2>Tor: Google Summer of Code 2015</h2> + <h2>Tor: Google Summer of Code 2016</h2> <hr> - <h3>IMPORTANT NOTE: Tor <a href="https://lists.torproject.org/pipermail/tor-dev/2015-March/008358.html">was not accepted</a> into GSoC 2015. Hopefully we'll be back next year, but in the meantime we're running our own program: <a href="https://trac.torproject.org/projects/tor/wiki/org/TorSoP">the Summer of Privacy</a>!</h3> - <br /><br /> <p> The Tor Project, in collaboration with <a href="https://www.eff.org/">The Electronic Frontier Foundation</a>, have taken part in Google Summer of Code for 2007 through 2014, mentoring the total of 53 students. + In 2015, Tor <a href="https://lists.torproject.org/pipermail/tor-dev/2015-March/008358.html">was not accepted</a> into GSoC (along with many other established organizations). Instead we ran our own program that summer: +<a href="https://trac.torproject.org/projects/tor/wiki/org/TorSoP">the Summer of Privacy</a>!  </p>

1 0

[meek/master] Use permalinks for Tor Trac tickets.
by dcf＠torproject.org 19 Feb '16

19 Feb '16

commit aa17eaa0d3da4f84d0714f8c7f1b6295e2929001 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Feb 19 09:19:05 2016 -0800 Use permalinks for Tor Trac tickets. --- firefox/components/main.js | 6 +++--- meek-client-torbrowser/meek-client-torbrowser.go | 9 ++++----- meek-client/meek-client.go | 2 +- terminateprocess-buffer/terminateprocess-buffer.go | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/firefox/components/main.js b/firefox/components/main.js index 540e193..e892c4b 100644 --- a/firefox/components/main.js +++ b/firefox/components/main.js @@ -71,7 +71,7 @@ MeekHTTPHelper.prototype = { // browser updates. // We do this before we change the network.proxy.socks_remote_dns // value since we do not want that change to be permanent. See - // https://trac.torproject.org/projects/tor/ticket/16269. + // https://bugs.torproject.org/16269. let prefSvc = Components.classes["@mozilla.org/preferences-service;1"] .getService(Components.interfaces.nsIPrefService); prefSvc.savePrefFile(null); @@ -79,7 +79,7 @@ MeekHTTPHelper.prototype = { let prefs = Components.classes["@mozilla.org/preferences-service;1"] .getService(Components.interfaces.nsIPrefBranch); // Allow unproxied DNS, working around a Tor Browser patch: - // https://trac.torproject.org/projects/tor/ticket/11183#comment:6. + // https://bugs.torproject.org/11183#comment:6. // We set TRANSPARENT_PROXY_RESOLVES_HOST whenever we are asked to // use a proxy, so name resolution uses the proxy despite this pref. prefs.setBoolPref("network.proxy.socks_remote_dns", false); @@ -197,7 +197,7 @@ MeekHTTPHelper.buildProxyInfo = function(spec) { // 3.6.2, leak the covert Host header in HTTP proxy CONNECT requests. // Using an HTTP proxy cannot provide effective obfuscation without such // a patched Firefox. - // https://trac.torproject.org/projects/tor/ticket/12146 + // https://bugs.torproject.org/12146 // https://gitweb.torproject.org/tor-browser.git/commit/?id=e08b91c78d919f66dd… // https://bugzilla.mozilla.org/show_bug.cgi?id=1017769 // https://hg.mozilla.org/mozilla-central/rev/a1f6458800d4 diff --git a/meek-client-torbrowser/meek-client-torbrowser.go b/meek-client-torbrowser/meek-client-torbrowser.go index 605bc85..bb27c58 100644 --- a/meek-client-torbrowser/meek-client-torbrowser.go +++ b/meek-client-torbrowser/meek-client-torbrowser.go @@ -153,9 +153,9 @@ func main() { // XRE_PROFILE_PATH, in particular, overrides the -profile option that // runFirefox sets, causing Firefox to run with profile.default instead // of profile.meek-http-helper, which conflicts with the profile.default - // that is already running. See - // https://trac.torproject.org/projects/tor/ticket/13247, particularly - // #comment:17 and #comment:18. The environment variable names come from + // that is already running. See https://bugs.torproject.org/13247, + // particularly #comment:17 and #comment:18. The environment variable + // names come from // https://hg.mozilla.org/mozilla-central/file/cfde3603b020/toolkit/xre/nsAppR… var firefoxRestartEnvVars = []string{ "XRE_PROFILE_PATH", @@ -198,8 +198,7 @@ func main() { if os.Getenv("TOR_PT_EXIT_ON_STDIN_CLOSE") == "1" { // This environment variable means we should treat EOF on stdin - // just like SIGTERM. - // https://trac.torproject.org/projects/tor/ticket/15435 + // just like SIGTERM: https://bugs.torproject.org/15435. go func() { io.Copy(ioutil.Discard, os.Stdin) log.Printf("synthesizing SIGTERM because of stdin close") diff --git a/meek-client/meek-client.go b/meek-client/meek-client.go index c42c3d8..9de4056 100644 --- a/meek-client/meek-client.go +++ b/meek-client/meek-client.go @@ -334,7 +334,7 @@ func checkProxyURL(u *url.URL) error { // covert Host header in HTTP proxy CONNECT requests. Using an // HTTP proxy cannot provide effective obfuscation without such // a patched Firefox. - // https://trac.torproject.org/projects/tor/ticket/12146 + // https://bugs.torproject.org/12146 // https://gitweb.torproject.org/tor-browser.git/commit/?id=e08b91c78d919f66dd… // https://bugzilla.mozilla.org/show_bug.cgi?id=1017769 // https://hg.mozilla.org/mozilla-central/rev/a1f6458800d4 diff --git a/terminateprocess-buffer/terminateprocess-buffer.go b/terminateprocess-buffer/terminateprocess-buffer.go index 6f77e98..85df446 100644 --- a/terminateprocess-buffer/terminateprocess-buffer.go +++ b/terminateprocess-buffer/terminateprocess-buffer.go @@ -12,7 +12,7 @@ // notice that its stdin has closed, and exit gracefully. // // TOR_PT_EXIT_ON_STDIN_CLOSE: -// https://trac.torproject.org/projects/tor/ticket/15435 +// https://bugs.torproject.org/15435 package main import (

1 0

[meek/master] Link to discussion of the headless browser tricks on mac.
by dcf＠torproject.org 19 Feb '16

19 Feb '16

commit 53e4b9fbd7971dbd431a63a05f821eab9bf8e35c Author: David Fifield <david(a)bamsoftware.com> Date: Fri Feb 19 09:23:54 2016 -0800 Link to discussion of the headless browser tricks on mac. --- meek-client-torbrowser/mac.go | 1 + 1 file changed, 1 insertion(+) diff --git a/meek-client-torbrowser/mac.go b/meek-client-torbrowser/mac.go index 7eee72d..22f9be4 100644 --- a/meek-client-torbrowser/mac.go +++ b/meek-client-torbrowser/mac.go @@ -9,6 +9,7 @@ const ( // The TorBrowser.app.meek-http-helper directory is a special case for // the mac bundle. It is a copy of TorBrowser.app that has a modified // Info.plist file so that it doesn't show a dock icon. + // https://bugs.torproject.org/11429#comment:10 firefoxPath = "PluggableTransports/TorBrowser.app.meek-http-helper/Contents/MacOS/firefox" firefoxProfilePath = "../Data/Browser/profile.meek-http-helper" )

1 0

[webwml/master] Deprecate old Tor Browser versions
by gk＠torproject.org 19 Feb '16

19 Feb '16

commit e6d27a580d814cc30f1b9903ef65994f295dc36d Author: Georg Koppen <gk(a)torproject.org> Date: Fri Feb 19 13:39:59 2016 +0000 Deprecate old Tor Browser versions --- projects/torbrowser/RecommendedTBBVersions | 6 ------ 1 file changed, 6 deletions(-) diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index 7fabb7e..17aaaff 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -3,16 +3,10 @@ "5.5.2-Linux", "5.5.2-MacOS", "5.5.2-Windows", -"6.0a1", -"6.0a1-Linux", -"6.0a1-MacOS", -"6.0a1-Windows", "6.0a2", "6.0a2-Linux", "6.0a2-MacOS", "6.0a2-Windows", -"6.0a1-hardened", -"6.0a1-hardened-Linux", "6.0a2-hardened", "6.0a2-hardened-Linux" ]

1 0

[tor-browser/tor-browser-38.6.1esr-6.0-1] squash! Bug #13749.2: Regression tests for first-party isolation of cache
by gk＠torproject.org 19 Feb '16

19 Feb '16

commit df2cdeb77b7133ea672920caa8c2eac5d69f71c6 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Feb 17 22:19:31 2016 -0800 squash! Bug #13749.2: Regression tests for first-party isolation of cache Also checks first-party isolation of favicons: https://bugs.torproject.org/16728 --- netwerk/test/browser/browser.ini | 1 + netwerk/test/browser/browser_cacheFirstParty.js | 21 ++++++++++++--------- netwerk/test/browser/firstPartyGrandParent.html | 4 +++- netwerk/test/browser/firstPartyParent.html | 4 +++- netwerk/test/browser/thirdPartyChild.favicon.ico | Bin 0 -> 1150 bytes 5 files changed, 19 insertions(+), 11 deletions(-) diff --git a/netwerk/test/browser/browser.ini b/netwerk/test/browser/browser.ini index ca711b7..5ab1546 100644 --- a/netwerk/test/browser/browser.ini +++ b/netwerk/test/browser/browser.ini @@ -14,6 +14,7 @@ support-files = thirdPartyChild.worker.xhr.html thirdPartyChild.xhr.html thirdPartyChild.track.vtt + thirdPartyChild.favicon.ico [browser_cacheFirstParty.js] [browser_NetUtil.js] diff --git a/netwerk/test/browser/browser_cacheFirstParty.js b/netwerk/test/browser/browser_cacheFirstParty.js index c23f669..c1b5ee6 100644 --- a/netwerk/test/browser/browser_cacheFirstParty.js +++ b/netwerk/test/browser/browser_cacheFirstParty.js @@ -4,12 +4,13 @@ // ("privacy.thirdparty.isolate" pref is set to 2) then when a loaded file is cached, // it is indexed by the URL-bar domain. -// In this test, a number of files are loaded (via IFRAME, LINK, SCRIPT, IMG, OBJECT, -// EMBED, AUDIO, VIDEO, TRACK and XMLHttpRequest) by parent pages with different URL bar -// domains. When isolation is active, we test to confirm that a separate copy of each file -// is cached for each different parent domain. We also test to make sure that when -// isolation is inactive, a single copy of the child page is cached and reused for all -// parent domains. +// In this test, a number of files are loaded (via IFRAME, LINK [both CSS +// and Favicon], SCRIPT, IMG, OBJECT, EMBED, AUDIO, VIDEO, TRACK and +// XMLHttpRequest) by parent pages with different URL bar domains. When +// isolation is active, we test to confirm that a separate copy of each file is +// cached for each different parent domain. We also test to make sure that when +// isolation is inactive, a single copy of the child page is cached +// and reused for all parent domains. // In this file, functions are defined in call stack order (later functions call earlier // functions). Comments are formatted for docco. @@ -104,13 +105,15 @@ let privacyPref = "privacy.thirdparty.isolate", // share cached embedded objects. duplicatedDomains = [].concat(domains, domains), // We will check cache for example.net content from - // iframe, link, script, img, object, embed, xhr, audio, video, track + // iframe, link (css), script, img, object, embed, xhr, audio, video, + // track, favicon suffixes = ["iframe.html", "link.css", "script.js", "img.png", "object.png", - "embed.png", "xhr.html", "worker.xhr.html", "audio.ogg", "video.ogv", "track.vtt" ]; + "embed.png", "xhr.html", "worker.xhr.html", "audio.ogg", + "video.ogv", "track.vtt", "favicon.ico" ]; // __checkCachePopulation(pref, numberOfDomains)__. // Check if the number of entries found in the cache for each -// embedded file type matches the number we expect, given the +// embedded file type matches the number we expect, given the // number of domains and the isolation state. let checkCachePopulation = function* (pref, numberOfDomains) { let expectedEntryCount = (pref === 2) ? numberOfDomains : 1; diff --git a/netwerk/test/browser/firstPartyGrandParent.html b/netwerk/test/browser/firstPartyGrandParent.html index c990831..969b429 100644 --- a/netwerk/test/browser/firstPartyGrandParent.html +++ b/netwerk/test/browser/firstPartyGrandParent.html @@ -1,7 +1,9 @@ <!DOCTYPE html> <html> <head> -<meta content="text/html;charset=utf-8" http-equiv="Content-Type"> + <meta content="text/html;charset=utf-8" http-equiv="Content-Type"> + <link rel="icon" type="image/ico" + href="http://example.net/browser/netwerk/test/browser/thirdPartyChild.favicon.ico"> </head> <frameset cols="50%,50%"> <frame src="http://example.net/browser/netwerk/test/browser/firstPartyParent.html"> diff --git a/netwerk/test/browser/firstPartyParent.html b/netwerk/test/browser/firstPartyParent.html index 7f2f5c8..fa29a74 100644 --- a/netwerk/test/browser/firstPartyParent.html +++ b/netwerk/test/browser/firstPartyParent.html @@ -5,6 +5,8 @@ <head> <link rel="stylesheet" type="text/css" href="http://example.net/browser/netwerk/test/browser/thirdPartyChild.link.css"> + <link rel="icon" type="image/ico" + href="http://example.net/browser/netwerk/test/browser/thirdPartyChild.favicon.ico"> </head> <body> <div>firstPartyParent.html</div> @@ -26,7 +28,7 @@ <source src="http://example.net/browser/netwerk/test/browser/thirdPartyChild.audio.ogg" type="audio/ogg"> <track src="http://example.net/browser/netwerk/test/browser/thirdPartyChild.track.vtt" - kind="subtitles"> + kind="subtitles"> </audio> <video id="video" diff --git a/netwerk/test/browser/thirdPartyChild.favicon.ico b/netwerk/test/browser/thirdPartyChild.favicon.ico new file mode 100644 index 0000000..48060b1 Binary files /dev/null and b/netwerk/test/browser/thirdPartyChild.favicon.ico differ

1 0

[snowflake/master] another goconvey test for RequestOffer, fix data race in the Broker test
by serene＠torproject.org 18 Feb '16

18 Feb '16

commit 661286894a2c3a20ef0dba207314291c14c24708 Author: Serene Han <keroserene+git(a)gmail.com> Date: Wed Feb 17 12:52:22 2016 -0800 another goconvey test for RequestOffer, fix data race in the Broker test --- broker/snowflake-broker_test.go | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/broker/snowflake-broker_test.go b/broker/snowflake-broker_test.go index 0e125cc..44940a3 100644 --- a/broker/snowflake-broker_test.go +++ b/broker/snowflake-broker_test.go @@ -22,20 +22,35 @@ func TestBroker(t *testing.T) { So(len(ctx.idToSnowflake), ShouldEqual, 1) }) - /* Convey("Broker goroutine matches clients with proxies", func() { - ctx2 := NewBrokerContext() p := new(ProxyPoll) p.id = "test" + p.offerChannel = make(chan []byte) + go func(ctx *BrokerContext) { + ctx.proxyPolls <- p + close(ctx.proxyPolls) + }(ctx) + ctx.Broker() + So(ctx.snowflakes.Len(), ShouldEqual, 1) + snowflake := heap.Pop(ctx.snowflakes).(*Snowflake) + snowflake.offerChannel <- []byte("test offer") + offer := <-p.offerChannel + So(ctx.idToSnowflake["test"], ShouldNotBeNil) + So(offer, ShouldResemble, []byte("test offer")) + So(ctx.snowflakes.Len(), ShouldEqual, 0) + }) + + Convey("Request an offer from the Snowflake Heap", func() { + done := make(chan []byte) go func() { - ctx2.proxyPolls <- p - close(ctx2.proxyPolls) + offer := ctx.RequestOffer("test") + done <- offer }() - ctx2.Broker() - So(ctx2.snowflakes.Len(), ShouldEqual, 1) - So(ctx2.idToSnowflake["test"], ShouldNotBeNil) + request := <-ctx.proxyPolls + request.offerChannel <- []byte("test offer") + offer := <-done + So(offer, ShouldResemble, []byte("test offer")) }) - */ Convey("Responds to client offers...", func() { w := httptest.NewRecorder()

1 0

[snowflake/master] Simplify proxy poll handler, and broker match test
by serene＠torproject.org 18 Feb '16

18 Feb '16

commit 791f6925ec749a28ad95c76325f802bc4de2d75c Author: Serene Han <keroserene+git(a)gmail.com> Date: Tue Feb 16 20:50:00 2016 -0800 Simplify proxy poll handler, and broker match test --- broker/broker.go | 89 ++++++++++++++++++++++------------------- broker/snowflake-broker_test.go | 25 +++++++++--- broker/snowflake-heap.go | 4 ++ 3 files changed, 70 insertions(+), 48 deletions(-) diff --git a/broker/broker.go b/broker/broker.go index 69b8369..9e5ee30 100644 --- a/broker/broker.go +++ b/broker/broker.go @@ -28,17 +28,17 @@ type BrokerContext struct { snowflakes *SnowflakeHeap // Map keeping track of snowflakeIDs required to match SDP answers from // the second http POST. - snowflakeMap map[string]*Snowflake - createChannel chan *ProxyRequest + snowflakeMap map[string]*Snowflake + proxyPolls chan *ProxyPoll } func NewBrokerContext() *BrokerContext { snowflakes := new(SnowflakeHeap) heap.Init(snowflakes) return &BrokerContext{ - snowflakes: snowflakes, - snowflakeMap: make(map[string]*Snowflake), - createChannel: make(chan *ProxyRequest), + snowflakes: snowflakes, + snowflakeMap: make(map[string]*Snowflake), + proxyPolls: make(chan *ProxyPoll), } } @@ -51,46 +51,58 @@ func (sh SnowflakeHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { sh.h(sh.BrokerContext, w, r) } -type ProxyRequest struct { - id string - offerChan chan []byte +// Proxies may poll for client offers concurrently. +type ProxyPoll struct { + id string + offerChannel chan []byte } -// Create and add a Snowflake to the heap. -func (sc *BrokerContext) AddSnowflake(id string) *Snowflake { - snowflake := new(Snowflake) - snowflake.id = id - snowflake.clients = 0 - snowflake.offerChannel = make(chan []byte) - snowflake.answerChannel = make(chan []byte) - heap.Push(sc.snowflakes, snowflake) - sc.snowflakeMap[id] = snowflake - return snowflake +// 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 { + request := new(ProxyPoll) + request.id = id + request.offerChannel = make(chan []byte) + ctx.proxyPolls <- request + // Block until an offer is available... + offer := <-request.offerChannel + return offer } -// Match proxies to clients. -// func (ctx *BrokerContext) Broker(proxies <-chan *ProxyRequest) { +// goroutine which match proxies to clients. +// Safely processes proxy requests, responding to them with either an available +// client offer or nil on timeout / none are available. func (ctx *BrokerContext) Broker() { - // for p := range proxies { - for p := range ctx.createChannel { - snowflake := ctx.AddSnowflake(p.id) - // Wait for a client to avail an offer to the snowflake, or timeout - // and ask the snowflake to poll later. - go func(p *ProxyRequest) { + for request := range ctx.proxyPolls { + snowflake := ctx.AddSnowflake(request.id) + // Wait for a client to avail an offer to the snowflake. + go func(request *ProxyPoll) { select { case offer := <-snowflake.offerChannel: - log.Println("Passing client offer to snowflake.") - p.offerChan <- offer + log.Println("Passing client offer to snowflake proxy.") + request.offerChannel <- offer case <-time.After(time.Second * ProxyTimeout): // This snowflake is no longer available to serve clients. heap.Remove(ctx.snowflakes, snowflake.index) delete(ctx.snowflakeMap, snowflake.id) - p.offerChan <- nil + request.offerChannel <- nil } - }(p) + }(request) } } +// Create and add a Snowflake to the heap. +func (ctx *BrokerContext) AddSnowflake(id string) *Snowflake { + snowflake := new(Snowflake) + snowflake.id = id + snowflake.clients = 0 + snowflake.offerChannel = make(chan []byte) + snowflake.answerChannel = make(chan []byte) + heap.Push(ctx.snowflakes, snowflake) + ctx.snowflakeMap[id] = snowflake + return snowflake +} + func robotsTxtHandler(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "text/plain; charset=utf-8") w.Write([]byte("User-agent: *\nDisallow:\n")) @@ -145,14 +157,15 @@ func clientHandler(ctx *BrokerContext, w http.ResponseWriter, r *http.Request) { case answer := <-snowflake.answerChannel: log.Println("Client: Retrieving answer") w.Write(answer) - // Only remove from the snowflake map once the answer is set. - delete(ctx.snowflakeMap, snowflake.id) case <-time.After(time.Second * ClientTimeout): log.Println("Client: Timed out.") w.WriteHeader(http.StatusGatewayTimeout) w.Write([]byte("timed out waiting for answer!")) } + // Remove from the snowflake map whether answer was sent or not, because + // this client request is now over. + delete(ctx.snowflakeMap, snowflake.id) } /* @@ -172,17 +185,9 @@ func proxyHandler(ctx *BrokerContext, w http.ResponseWriter, r *http.Request) { if string(body) != id { // Mismatched IDs! w.WriteHeader(http.StatusBadRequest) } - // Maybe confirm that X-Session-ID is the same. log.Println("Received snowflake: ", id) - - p := new(ProxyRequest) - p.id = id - p.offerChan = make(chan []byte) - ctx.createChannel <- p - - // Wait for a client to avail an offer to the snowflake, or timeout - // and ask the snowflake to poll later. - offer := <-p.offerChan + // Wait for a client to avail an offer to the snowflake, or timeout if nil. + offer := ctx.RequestOffer(id) if nil == offer { log.Println("Proxy " + id + " did not receive a Client offer.") w.WriteHeader(http.StatusGatewayTimeout) diff --git a/broker/snowflake-broker_test.go b/broker/snowflake-broker_test.go index ee984b0..b9432d8 100644 --- a/broker/snowflake-broker_test.go +++ b/broker/snowflake-broker_test.go @@ -22,6 +22,19 @@ func TestBroker(t *testing.T) { So(len(ctx.snowflakeMap), ShouldEqual, 1) }) + Convey("Broker goroutine matches clients with proxies", func() { + p := new(ProxyPoll) + p.id = "test" + p.offerChannel = make(chan []byte) + go func() { + ctx.proxyPolls <- p + close(ctx.proxyPolls) + }() + ctx.Broker() + So(ctx.snowflakes.Len(), ShouldEqual, 1) + So(ctx.snowflakes.Len(), ShouldEqual, 1) + }) + Convey("Responds to client offers...", func() { w := httptest.NewRecorder() data := bytes.NewReader([]byte("test")) @@ -83,9 +96,9 @@ func TestBroker(t *testing.T) { done <- true }(ctx) // Pass a fake client offer to this proxy - p := <-ctx.createChannel + p := <-ctx.proxyPolls So(p.id, ShouldEqual, "test") - p.offerChan <- []byte("fake offer") + p.offerChannel <- []byte("fake offer") <-done So(w.Code, ShouldEqual, http.StatusOK) So(w.Body.String(), ShouldEqual, "fake offer") @@ -96,10 +109,10 @@ func TestBroker(t *testing.T) { proxyHandler(ctx, w, r) done <- true }(ctx) - p := <-ctx.createChannel + p := <-ctx.proxyPolls So(p.id, ShouldEqual, "test") // nil means timeout - p.offerChan <- nil + p.offerChannel <- nil <-done So(w.Body.String(), ShouldEqual, "") So(w.Code, ShouldEqual, http.StatusGatewayTimeout) @@ -159,12 +172,12 @@ func TestBroker(t *testing.T) { }() // Manually do the Broker goroutine action here for full control. - p := <-ctx.createChannel + p := <-ctx.proxyPolls So(p.id, ShouldEqual, "test") s := ctx.AddSnowflake(p.id) go func() { offer := <-s.offerChannel - p.offerChan <- offer + p.offerChannel <- offer }() So(ctx.snowflakeMap["test"], ShouldNotBeNil) diff --git a/broker/snowflake-heap.go b/broker/snowflake-heap.go index d37228f..cf249fe 100644 --- a/broker/snowflake-heap.go +++ b/broker/snowflake-heap.go @@ -4,6 +4,10 @@ Keeping track of pending available snowflake proxies. package snowflake_broker +/* +The Snowflake struct contains a single interaction +over the offer and answer channels. +*/ type Snowflake struct { id string offerChannel chan []byte

1 0