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

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 16 May '19

16 May '19

commit 812a29d865a0b74f46a638a83c191788f586e1d9 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 16 17:15:58 2019 +0000 Update translations for https_everywhere --- nb/https-everywhere.dtd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nb/https-everywhere.dtd b/nb/https-everywhere.dtd index c9dd9fca0..ae0ec6ab0 100644 --- a/nb/https-everywhere.dtd +++ b/nb/https-everywhere.dtd @@ -10,11 +10,11 @@ <!ENTITY https-everywhere.menu.globalDisable "HTTPS Everywhere er AV"> <!ENTITY https-everywhere.menu.globalEnable "HTTPS Everywhere er PÅ"> <!ENTITY https-everywhere.menu.encryptAllSitesEligibleOn "Krypter alle nettsteder Kvalifisert er PÅ"> -<!ENTITY https-everywhere.menu.encryptAllSitesEligibleOff "Encrypt All Sites Eligible is OFF"> +<!ENTITY https-everywhere.menu.encryptAllSitesEligibleOff "Krypter alle nettsteder Kvalifisert er AV"> <!ENTITY https-everywhere.menu.httpNoWhereExplainedBlocked "Ukryptert forespørsler er for øyeblikket blokkert"> -<!ENTITY https-everywhere.menu.httpNoWhereExplainedAllowed "Unencrypted requests are currently allowed"> +<!ENTITY https-everywhere.menu.httpNoWhereExplainedAllowed "Ikke-krypterte forespørsler er foreløpig tillatt"> <!ENTITY https-everywhere.menu.seeMore "Se mer"> -<!ENTITY https-everywhere.menu.seeLess "See less"> +<!ENTITY https-everywhere.menu.seeLess "Se mindre"> <!ENTITY https-everywhere.menu.httpNoWhereMore "Denne modusen blokkerer ukryptert innhold og forespørsler"> <!ENTITY https-everywhere.menu.showCounter "Vis teller"> <!ENTITY https-everywhere.menu.viewAllRules "Vis alle regler"> @@ -40,13 +40,13 @@ <!ENTITY https-everywhere.prefs.reset_defaults "Tilbakestill til forvalg"> <!ENTITY https-everywhere.prefs.reset_defaults_message "Dette vil tilbakestille hver regelsett til standardstatus. Fortsette?"> -<!ENTITY https-everywhere.cancel.he_blocking_explainer "HTTPS Everywhere noticed you were navigating to a non-HTTPS page, and tried to send you to the HTTPS version instead. The HTTPS version is unavailable. Most likely this site does not support HTTPS, but it is also possible that an attacker is blocking the HTTPS version. If you wish to view the unencrypted version of this page, you can still do so by disabling the 'Encrypt All Sites Eligible' (EASE) option in your HTTPS Everywhere extension. Be aware that disabling this option could make your browser vulnerable to network-based downgrade attacks on websites you visit."> +<!ENTITY https-everywhere.cancel.he_blocking_explainer "HTTPS Everywhere har merket at du navigerte til en ikke-HTTPS-side, og prøvde å sende deg til HTTPS-versjonen i stedet. HTTPS-versjonen er utilgjengelig. Mest sannsynlig støtter dette nettstedet ikke HTTPS, men det er også mulig at en angriper blokkerer HTTPS-versjonen. Hvis du ønsker å se den ukrypterte versjonen av denne siden, kan du fortsatt gjøre det ved å deaktivere alternativet "Krypter alle sider som er kvalifisert" (EASE) i HTTPS Everywhere-utvidelsen. Vær oppmerksom på at deaktivering av dette alternativet kan gjøre nettleseren din sårbar for nettverksbaserte nedgraderingsangrep på nettsteder du besøker."> <!ENTITY https-everywhere.cancel.he_blocking_network "nettverksbaserte nedgraderingsangrep"> <!ENTITY https-everywhere.cancel.open_page "Åpne usikker side"> <!ENTITY https-everywhere.chrome.settings_for_this_site_header "Innstillinger for dette nettstedet"> <!ENTITY https-everywhere.chrome.settings_for_this_site_subheader "Endre dine preferanser for krypterte tilkoblinger"> -<!ENTITY https-everywhere.chrome.settings_for_this_site_explained "As you browse different websites, you can change your preferences for each website"> +<!ENTITY https-everywhere.chrome.settings_for_this_site_explained "Når du surfer på forskjellige nettsteder, kan du endre dine preferanser for hvert nettsted"> <!ENTITY https-everywhere.chrome.stable_rules "Stabile regler"> <!ENTITY https-everywhere.chrome.stable_rules_description "Tving krypterte forbindelser til disse nettstedene:"> <!ENTITY https-everywhere.chrome.experimental_rules "Eksperimentelle regler">

1 0

[translation/exoneratorproperties_completed] Update translations for exoneratorproperties_completed
by translation＠torproject.org 16 May '19

16 May '19

commit f46789020af35f21373bcda05a0468c881cb4532 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 16 17:15:50 2019 +0000 Update translations for exoneratorproperties_completed --- nb/exonerator.properties | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/nb/exonerator.properties b/nb/exonerator.properties index 033f3ff87..45114138e 100644 --- a/nb/exonerator.properties +++ b/nb/exonerator.properties @@ -43,10 +43,9 @@ technicaldetails.exit.yes=Ja technicaldetails.exit.no=Nei permanentlink.heading=Permanent lenke footer.abouttor.heading=Om Tor -footer.abouttor.body.text=Tor er et internasjonalt programvareprosjekt for å anonymisere internettrafikk ved %s.  Det er derfor, når du ser trafikk fra et Tor-routingstafettoppsett, som oftest noe som har sitt opphav i at noen bruker Tor, snarere enn fra routingstafettoperatøren.&nbps; Tor-prosjektet og routingstafettoperatørene har ingen nedtegninger over trafikken som passerer i nettverket og kan derfor ikke tilkjennegi informasjon om dens opphav.  Forsikre deg om %s, og ikke nøl med å %s for ytterligere informasjon. -footer.abouttor.body.link1=krypterer pakker og sender dem over flere nettverkssteg før de når sitt endelige mål -footer.abouttor.body.link2=lær mer om Tor -footer.abouttor.body.link3=kontakt The Tor Project, Inc. +footer.abouttor.body.text=Tor er et internasjonalt programvareprosjekt for å anonymisere Internett-trafikk ved å kryptere pakker og sende dem gjennom en serie hopp før de når målet.&Nbsp; Derfor, hvis du ser trafikk fra et Tor-relé, kommer denne trafikken vanligvis fra noen som bruker Tor, i stedet for fra reléoperatøren.&Nbsp; Tor-prosjekt og Tor-reléoperatørene har ingen oversikt over trafikken som passerer over nettverket, og kan derfor ikke gi noen informasjon om opprinnelsen.&Nbsp; Husk å%s, og ikke nøl med å%s for mer informasjon. +footer.abouttor.body.link1=lær mer om Tor +footer.abouttor.body.link2=kontakt The Tor Project, Inc. footer.aboutexonerator.heading=Om ExoneraTor footer.aboutexonerator.body=ExoneraTor-tjenesten veldikeholder en database med IP-adresser som har vært en del av Tor-nettverket.  Den svarer på spørsmål knyttet til om et Tor-routingstafettoppsett kjørte på en angitt IP-adresse på en gitt dato.  ExoneraTor kan lagre mer enn én IP-adresse per routingstafettoppsett hvis de bruker en annen IP-adresse for å trå over til Internett enn for å registrere seg i Tor-nettverket, og den lagrer hvorvidt et routingstafettoppsett tillot Tor-trafikk overgang til det åpne Internett på dette tidspunktet. footer.language.name=Engelsk

1 0

[translation/exoneratorproperties] Update translations for exoneratorproperties
by translation＠torproject.org 16 May '19

16 May '19

commit c1b527129d1b5f6509a0ac3474b9a54fe780df54 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 16 17:15:45 2019 +0000 Update translations for exoneratorproperties --- nb/exonerator.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nb/exonerator.properties b/nb/exonerator.properties index bb62e2ca7..45114138e 100644 --- a/nb/exonerator.properties +++ b/nb/exonerator.properties @@ -43,7 +43,7 @@ technicaldetails.exit.yes=Ja technicaldetails.exit.no=Nei permanentlink.heading=Permanent lenke footer.abouttor.heading=Om Tor -footer.abouttor.body.text=Tor is an international software project to anonymize Internet traffic by encrypting packets and sending them through a series of hops before they reach their destination.  Therefore, if you see traffic from a Tor relay, this traffic usually originates from someone using Tor, rather than from the relay operator.  The Tor Project and Tor relay operators have no records of the traffic that passes over the network and therefore cannot provide any information about its origin.  Be sure to %s, and don't hesitate to %s for more information. +footer.abouttor.body.text=Tor er et internasjonalt programvareprosjekt for å anonymisere Internett-trafikk ved å kryptere pakker og sende dem gjennom en serie hopp før de når målet.&Nbsp; Derfor, hvis du ser trafikk fra et Tor-relé, kommer denne trafikken vanligvis fra noen som bruker Tor, i stedet for fra reléoperatøren.&Nbsp; Tor-prosjekt og Tor-reléoperatørene har ingen oversikt over trafikken som passerer over nettverket, og kan derfor ikke gi noen informasjon om opprinnelsen.&Nbsp; Husk å%s, og ikke nøl med å%s for mer informasjon. footer.abouttor.body.link1=lær mer om Tor footer.abouttor.body.link2=kontakt The Tor Project, Inc. footer.aboutexonerator.heading=Om ExoneraTor

1 0

[snowflake/master] Appease `go vet`s complaints about passing locks by value
by arlo＠torproject.org 16 May '19

16 May '19

commit dd927050d9f00a4a8a46418b4c4980f10556356e Author: Arlo Breault <arlolra(a)gmail.com> Date: Thu May 16 12:58:25 2019 -0400 Appease `go vet`s complaints about passing locks by value --- broker/geoip.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/broker/geoip.go b/broker/geoip.go index 16cada1..5a16a8a 100644 --- a/broker/geoip.go +++ b/broker/geoip.go @@ -70,8 +70,8 @@ type GeoIPv6Table struct { lock sync.Mutex // synchronization for geoip table accesses and reloads } -func (table GeoIPv4Table) Len() int { return len(table.table) } -func (table GeoIPv6Table) Len() int { return len(table.table) } +func (table *GeoIPv4Table) Len() int { return len(table.table) } +func (table *GeoIPv6Table) Len() int { return len(table.table) } func (table *GeoIPv4Table) Append(entry GeoIPEntry) { (*table).table = append(table.table, entry) @@ -80,8 +80,8 @@ func (table *GeoIPv6Table) Append(entry GeoIPEntry) { (*table).table = append(table.table, entry) } -func (table GeoIPv4Table) ElementAt(i int) GeoIPEntry { return table.table[i] } -func (table GeoIPv6Table) ElementAt(i int) GeoIPEntry { return table.table[i] } +func (table *GeoIPv4Table) ElementAt(i int) GeoIPEntry { return table.table[i] } +func (table *GeoIPv6Table) ElementAt(i int) GeoIPEntry { return table.table[i] } func (table *GeoIPv4Table) Lock() { (*table).lock.Lock() } func (table *GeoIPv6Table) Lock() { (*table).lock.Lock() }

1 0

[snowflake/master] Fix broker tests
by arlo＠torproject.org 16 May '19

16 May '19

commit b77a99b565104082c0f6c1872e8f47db15a3bf0f Author: Arlo Breault <arlolra(a)gmail.com> Date: Thu May 16 12:34:21 2019 -0400 Fix broker tests NewBrokerContext now requires a logger so give it one to discard the logs. --- broker/snowflake-broker_test.go | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/broker/snowflake-broker_test.go b/broker/snowflake-broker_test.go index 463c5e7..0d50035 100644 --- a/broker/snowflake-broker_test.go +++ b/broker/snowflake-broker_test.go @@ -4,16 +4,25 @@ import ( "bytes" "container/heap" . "github.com/smartystreets/goconvey/convey" + "io/ioutil" + "log" "net" "net/http" "net/http/httptest" + "os" "testing" ) +func NullLogger() *log.Logger { + logger := log.New(os.Stdout, "", 0) + logger.SetOutput(ioutil.Discard) + return logger +} + func TestBroker(t *testing.T) { Convey("Context", t, func() { - ctx := NewBrokerContext() + ctx := NewBrokerContext(NullLogger()) Convey("Adds Snowflake", func() { So(ctx.snowflakes.Len(), ShouldEqual, 0) @@ -175,7 +184,7 @@ func TestBroker(t *testing.T) { Convey("End-To-End", t, func() { done := make(chan bool) polled := make(chan bool) - ctx := NewBrokerContext() + ctx := NewBrokerContext(NullLogger()) // Proxy polls with its ID first... dataP := bytes.NewReader([]byte("test")) @@ -364,7 +373,7 @@ func TestGeoip(t *testing.T) { }) // Make sure things behave properly if geoip file fails to load - ctx := NewBrokerContext() + ctx := NewBrokerContext(NullLogger()) ctx.metrics.LoadGeoipDatabases("invalid_filename", "invalid_filename6") ctx.metrics.UpdateCountryStats("127.0.0.1") So(ctx.metrics.tablev4, ShouldEqual, nil)

1 0

[snowflake/master] Make MODE a class constant
by arlo＠torproject.org 16 May '19

16 May '19

commit 9df66b15b1385a6fd314a4f4d9954ab54832f813 Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed May 8 13:24:37 2019 -0400 Make MODE a class constant --- proxy/init.coffee | 8 +------- proxy/proxypair.coffee | 6 +++--- proxy/snowflake.coffee | 11 +++++++++-- proxy/spec/snowflake.spec.coffee | 14 +++++++------- 4 files changed, 20 insertions(+), 19 deletions(-) diff --git a/proxy/init.coffee b/proxy/init.coffee index 22d4315..d3101c3 100644 --- a/proxy/init.coffee +++ b/proxy/init.coffee @@ -29,12 +29,6 @@ config = { ] } -# Janky state machine -MODE = - INIT: 0 - WEBRTC_CONNECTING: 1 - WEBRTC_READY: 2 - CONFIRMATION_MESSAGE = 'You\'re currently serving a Tor user via Snowflake.' snowflake = null @@ -80,7 +74,7 @@ init = () -> # Notification of closing tab with active proxy. window.onbeforeunload = -> - if !silenceNotifications && MODE.WEBRTC_READY == snowflake.state + if !silenceNotifications && Snowflake.MODE.WEBRTC_READY == snowflake.state return CONFIRMATION_MESSAGE null diff --git a/proxy/proxypair.coffee b/proxy/proxypair.coffee index 5a11f9a..da45784 100644 --- a/proxy/proxypair.coffee +++ b/proxy/proxypair.coffee @@ -68,7 +68,7 @@ class ProxyPair prepareDataChannel: (channel) => channel.onopen = => log 'WebRTC DataChannel opened!' - snowflake.state = MODE.WEBRTC_READY + snowflake.state = Snowflake.MODE.WEBRTC_READY snowflake.ui?.setActive true # This is the point when the WebRTC datachannel is done, so the next step # is to establish websocket to the server. @@ -77,7 +77,7 @@ class ProxyPair log 'WebRTC DataChannel closed.' snowflake.ui?.setStatus 'disconnected by webrtc.' snowflake.ui?.setActive false - snowflake.state = MODE.INIT + snowflake.state = Snowflake.MODE.INIT @flush() @close() # TODO: Change this for multiplexing. @@ -114,7 +114,7 @@ class ProxyPair log @relay.label + ' closed.' snowflake.ui?.setStatus 'disconnected.' snowflake.ui?.setActive false - snowflake.state = MODE.INIT + snowflake.state = Snowflake.MODE.INIT @flush() @close() @relay.onerror = @onError diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index 1cf6582..07c90c6 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -14,11 +14,18 @@ class Snowflake relayAddr: null proxyPairs: [] rateLimit: null - state: MODE.INIT retries: 0 + # Janky state machine + @MODE = + INIT: 0 + WEBRTC_CONNECTING: 1 + WEBRTC_READY: 2 + # Prepare the Snowflake with a Broker (to find clients) and optional UI. constructor: (@broker, @ui) -> + @state = Snowflake.MODE.INIT + rateLimitBytes = undefined if 'off' != query['ratelimit'] rateLimitBytes = Params.getByteCount(query, 'ratelimit', @@ -41,7 +48,7 @@ class Snowflake # Initialize WebRTC PeerConnection, which requires beginning the signalling # process. |pollBroker| automatically arranges signalling. beginWebRTC: -> - @state = MODE.WEBRTC_CONNECTING + @state = Snowflake.MODE.WEBRTC_CONNECTING for i in [1..CONNECTIONS_PER_CLIENT] @makeProxyPair @relayAddr log 'ProxyPair Slots: ' + @proxyPairs.length diff --git a/proxy/spec/snowflake.spec.coffee b/proxy/spec/snowflake.spec.coffee index 8c11a22..6986883 100644 --- a/proxy/spec/snowflake.spec.coffee +++ b/proxy/spec/snowflake.spec.coffee @@ -25,7 +25,7 @@ snowflake = ui: fakeUI broker: sendAnswer: -> - state: MODE.INIT + state: Snowflake.MODE.INIT describe 'Snowflake', -> @@ -72,19 +72,19 @@ describe 'Snowflake', -> it 'gives a dialog when closing, only while active', -> silenceNotifications = false - snowflake.state = MODE.WEBRTC_READY + snowflake.state = Snowflake.MODE.WEBRTC_READY msg = window.onbeforeunload() - expect(snowflake.state).toBe MODE.WEBRTC_READY + expect(snowflake.state).toBe Snowflake.MODE.WEBRTC_READY expect(msg).toBe CONFIRMATION_MESSAGE - snowflake.state = MODE.INIT + snowflake.state = Snowflake.MODE.INIT msg = window.onbeforeunload() - expect(snowflake.state).toBe MODE.INIT + expect(snowflake.state).toBe Snowflake.MODE.INIT expect(msg).toBe null it 'does not give a dialog when silent flag is on', -> silenceNotifications = true - snowflake.state = MODE.WEBRTC_READY + snowflake.state = Snowflake.MODE.WEBRTC_READY msg = window.onbeforeunload() - expect(snowflake.state).toBe MODE.WEBRTC_READY + expect(snowflake.state).toBe Snowflake.MODE.WEBRTC_READY expect(msg).toBe null

1 0

[snowflake/master] Initialize arrays when constructing
by arlo＠torproject.org 16 May '19

16 May '19

commit 3839c2e0b118a6d569a3be1642d801c2a4efd100 Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed May 8 13:29:23 2019 -0400 Initialize arrays when constructing Otherwise, this is set on the prototype and shared across instances :/ Note the change to the test that highlights this bug. A proxy pair was already created when an earlier test called `beginWebRTC()` but a new Snowflake instance should start with an empty array. --- proxy/proxypair.coffee | 5 ++--- proxy/snowflake.coffee | 2 +- proxy/spec/snowflake.spec.coffee | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/proxy/proxypair.coffee b/proxy/proxypair.coffee index da45784..bd6850b 100644 --- a/proxy/proxypair.coffee +++ b/proxy/proxypair.coffee @@ -10,8 +10,6 @@ Broker with an WebRTC answer. class ProxyPair MAX_BUFFER: 10 * 1024 * 1024 pc: null - c2rSchedule: [] - r2cSchedule: [] client: null # WebRTC Data channel relay: null # websocket timer: 0 @@ -27,8 +25,9 @@ class ProxyPair - @rateLimit specifies a rate limit on traffic ### constructor: (@relayAddr, @rateLimit) -> - @active = false @id = Util.genSnowflakeID() + @c2rSchedule = [] + @r2cSchedule = [] # Prepare a WebRTC PeerConnection and await for an SDP offer. begin: -> diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index 07c90c6..9656c0b 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -12,7 +12,6 @@ TODO: More documentation # Minimum viable snowflake for now - just 1 client. class Snowflake relayAddr: null - proxyPairs: [] rateLimit: null retries: 0 @@ -25,6 +24,7 @@ class Snowflake # Prepare the Snowflake with a Broker (to find clients) and optional UI. constructor: (@broker, @ui) -> @state = Snowflake.MODE.INIT + @proxyPairs = [] rateLimitBytes = undefined if 'off' != query['ratelimit'] diff --git a/proxy/spec/snowflake.spec.coffee b/proxy/spec/snowflake.spec.coffee index 6986883..bb6e348 100644 --- a/proxy/spec/snowflake.spec.coffee +++ b/proxy/spec/snowflake.spec.coffee @@ -68,7 +68,7 @@ describe 'Snowflake', -> it 'can make a proxypair', -> s = new Snowflake(new FakeBroker(), fakeUI) s.makeProxyPair() - expect(s.proxyPairs.length).toBe 2 + expect(s.proxyPairs.length).toBe 1 it 'gives a dialog when closing, only while active', -> silenceNotifications = false

1 0

[snowflake/master] Initialize snowflake instance with a config
by arlo＠torproject.org 16 May '19

16 May '19

commit 2d8a1690ba833829f086e0bfe9fc450513682d44 Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed May 8 16:13:22 2019 -0400 Initialize snowflake instance with a config --- proxy/Cakefile | 2 ++ proxy/broker.coffee | 24 +++++++++-------- proxy/config.coffee | 26 ++++++++++++++++++ proxy/init.coffee | 57 ++++++++++------------------------------ proxy/proxypair.coffee | 10 +++---- proxy/snowflake.coffee | 25 +++++++++++------- proxy/spec/broker.spec.coffee | 12 ++++----- proxy/spec/init.spec.coffee | 28 ++++++++++++++++++++ proxy/spec/proxypair.spec.coffee | 5 ++-- proxy/spec/snowflake.spec.coffee | 43 ++++++++---------------------- proxy/util.coffee | 4 +-- 11 files changed, 124 insertions(+), 112 deletions(-) diff --git a/proxy/Cakefile b/proxy/Cakefile index 8013dac..e0d610c 100644 --- a/proxy/Cakefile +++ b/proxy/Cakefile @@ -11,6 +11,7 @@ FILES = [ 'broker.coffee' 'ui.coffee' 'snowflake.coffee' + 'config.coffee' ] FILES_SPEC = [ 'spec/util.spec.coffee' @@ -19,6 +20,7 @@ FILES_SPEC = [ 'spec/proxypair.spec.coffee' 'spec/snowflake.spec.coffee' 'spec/websocket.spec.coffee' + 'spec/init.spec.coffee' ] FILES_ALL = FILES.concat FILES_SPEC OUTFILE = 'snowflake.js' diff --git a/proxy/broker.coffee b/proxy/broker.coffee index 981a761..ca8a2e5 100644 --- a/proxy/broker.coffee +++ b/proxy/broker.coffee @@ -7,12 +7,14 @@ to get assigned to clients. # Represents a broker running remotely. class Broker - @STATUS_OK = 200 - @STATUS_GONE = 410 - @STATUS_GATEWAY_TIMEOUT = 504 + @STATUS: + OK: 200 + GONE: 410 + GATEWAY_TIMEOUT: 504 - @MESSAGE_TIMEOUT = 'Timed out waiting for a client offer.' - @MESSAGE_UNEXPECTED = 'Unexpected status.' + @MESSAGE: + TIMEOUT: 'Timed out waiting for a client offer.' + UNEXPECTED: 'Unexpected status.' clients: 0 @@ -38,15 +40,15 @@ class Broker xhr.onreadystatechange = -> return if xhr.DONE != xhr.readyState switch xhr.status - when Broker.STATUS_OK + when Broker.STATUS.OK fulfill xhr.responseText # Should contain offer. - when Broker.STATUS_GATEWAY_TIMEOUT - reject Broker.MESSAGE_TIMEOUT + when Broker.STATUS.GATEWAY_TIMEOUT + reject Broker.MESSAGE.TIMEOUT else log 'Broker ERROR: Unexpected ' + xhr.status + ' - ' + xhr.statusText snowflake.ui.setStatus ' failure. Please refresh.' - reject Broker.MESSAGE_UNEXPECTED + reject Broker.MESSAGE.UNEXPECTED @_xhr = xhr # Used by spec to fake async Broker interaction @_postRequest id, xhr, 'proxy', id @@ -59,10 +61,10 @@ class Broker xhr.onreadystatechange = -> return if xhr.DONE != xhr.readyState switch xhr.status - when Broker.STATUS_OK + when Broker.STATUS.OK dbg 'Broker: Successfully replied with answer.' dbg xhr.responseText - when Broker.STATUS_GONE + when Broker.STATUS.GONE dbg 'Broker: No longer valid to reply with answer.' else dbg 'Broker ERROR: Unexpected ' + xhr.status + diff --git a/proxy/config.coffee b/proxy/config.coffee new file mode 100644 index 0000000..810c79f --- /dev/null +++ b/proxy/config.coffee @@ -0,0 +1,26 @@ +class Config + brokerUrl: 'snowflake-broker.bamsoftware.com' + relayAddr: + host: 'snowflake.bamsoftware.com' + port: '443' + # Original non-wss relay: + # host: '192.81.135.242' + # port: 9902 + + cookieName: "snowflake-allow" + + # Bytes per second. Set to undefined to disable limit. + rateLimitBytes: undefined + minRateLimit: 10 * 1024 + rateLimitHistory: 5.0 + defaultBrokerPollInterval: 5.0 * 1000 + + maxNumClients: 1 + connectionsPerClient: 1 + + # TODO: Different ICE servers. + pcConfig = { + iceServers: [ + { urls: ['stun:stun.l.google.com:19302'] } + ] + } diff --git a/proxy/init.coffee b/proxy/init.coffee index 497a54f..48a2c39 100644 --- a/proxy/init.coffee +++ b/proxy/init.coffee @@ -1,37 +1,9 @@ -# General snowflake proxy constants. -# For websocket-specific constants, see websocket.coffee. -BROKER = 'snowflake-broker.bamsoftware.com' -RELAY = - host: 'snowflake.bamsoftware.com' - port: '443' - # Original non-wss relay: - # host: '192.81.135.242' - # port: 9902 -COOKIE_NAME = "snowflake-allow" -# Bytes per second. Set to undefined to disable limit. -DEFAULT_RATE_LIMIT = undefined -MIN_RATE_LIMIT = 10 * 1024 -RATE_LIMIT_HISTORY = 5.0 -DEFAULT_BROKER_POLL_INTERVAL = 5.0 * 1000 - -MAX_NUM_CLIENTS = 1 -CONNECTIONS_PER_CLIENT = 1 - -# TODO: Different ICE servers. -config = { - iceServers: [ - { urls: ['stun:stun.l.google.com:19302'] } - ] -} - -CONFIRMATION_MESSAGE = 'You\'re currently serving a Tor user via Snowflake.' +snowflake = null query = Query.parse(location) -DEBUG = Params.getBool(query, 'debug', false) - -snowflake = null -silenceNotifications = false +debug = Params.getBool(query, 'debug', false) +silenceNotifications = Params.getBool(query, 'silent', false) # Log to both console and UI if applicable. # Requires that the snowflake and UI objects are hooked up in order to @@ -40,13 +12,17 @@ log = (msg) -> console.log 'Snowflake: ' + msg snowflake?.ui.log msg -dbg = (msg) -> log msg if DEBUG or (snowflake?.ui instanceof DebugUI) - +dbg = (msg) -> log msg if debug or (snowflake?.ui instanceof DebugUI) ### Entry point. ### init = () -> + config = new Config + + if 'off' != query['ratelimit'] + config.rateLimitBytes = Params.getByteCount(query, 'ratelimit', config.rateLimitBytes) + ui = null if (document.getElementById('badge') != null) ui = new BadgeUI() @@ -57,29 +33,24 @@ init = () -> else ui = new UI() - rateLimitBytes = undefined - if 'off' != query['ratelimit'] - rateLimitBytes = Params.getByteCount(query, 'ratelimit', DEFAULT_RATE_LIMIT) - - silenceNotifications = Params.getBool(query, 'silent', false) - broker = new Broker BROKER - snowflake = new Snowflake broker, ui, rateLimitBytes + broker = new Broker config.brokerUrl + snowflake = new Snowflake config, ui, broker log '== snowflake proxy ==' - if Util.snowflakeIsDisabled() + if Util.snowflakeIsDisabled(config.cookieName) # Do not activate the proxy if any number of conditions are true. log 'Currently not active.' return # Otherwise, begin setting up WebRTC and acting as a proxy. dbg 'Contacting Broker at ' + broker.url - snowflake.setRelayAddr RELAY + snowflake.setRelayAddr config.relayAddr snowflake.beginWebRTC() # Notification of closing tab with active proxy. window.onbeforeunload = -> if !silenceNotifications && Snowflake.MODE.WEBRTC_READY == snowflake.state - return CONFIRMATION_MESSAGE + return Snowflake.MESSAGE.CONFIRMATION null window.onunload = -> diff --git a/proxy/proxypair.coffee b/proxy/proxypair.coffee index bd6850b..879c6b6 100644 --- a/proxy/proxypair.coffee +++ b/proxy/proxypair.coffee @@ -24,14 +24,14 @@ class ProxyPair - @relayAddr is the destination relay - @rateLimit specifies a rate limit on traffic ### - constructor: (@relayAddr, @rateLimit) -> + constructor: (@relayAddr, @rateLimit, @pcConfig) -> @id = Util.genSnowflakeID() @c2rSchedule = [] @r2cSchedule = [] # Prepare a WebRTC PeerConnection and await for an SDP offer. begin: -> - @pc = new PeerConnection config, { + @pc = new PeerConnection @pcConfig, { optional: [ { DtlsSrtpKeyAgreement: true } { RtpDataChannels: false } @@ -126,15 +126,13 @@ class ProxyPair # WebRTC --> websocket onClientToRelayMessage: (msg) => - if DEBUG - log 'WebRTC --> websocket data: ' + msg.data.byteLength + ' bytes' + dbg 'WebRTC --> websocket data: ' + msg.data.byteLength + ' bytes' @c2rSchedule.push msg.data @flush() # websocket --> WebRTC onRelayToClientMessage: (event) => - if DEBUG - log 'websocket --> WebRTC data: ' + event.data.byteLength + ' bytes' + dbg 'websocket --> WebRTC data: ' + event.data.byteLength + ' bytes' @r2cSchedule.push event.data @flush() diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index fa421ee..66885d9 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -16,21 +16,26 @@ class Snowflake retries: 0 # Janky state machine - @MODE = + @MODE: INIT: 0 WEBRTC_CONNECTING: 1 WEBRTC_READY: 2 + @MESSAGE: + CONFIRMATION: 'You\'re currently serving a Tor user via Snowflake.' + # Prepare the Snowflake with a Broker (to find clients) and optional UI. - constructor: (@broker, @ui, rateLimitBytes) -> + constructor: (@config, @ui, @broker) -> @state = Snowflake.MODE.INIT @proxyPairs = [] - if undefined == rateLimitBytes + if undefined == @config.rateLimitBytes @rateLimit = new DummyRateLimit() else - @rateLimit = new BucketRateLimit(rateLimitBytes * RATE_LIMIT_HISTORY, - RATE_LIMIT_HISTORY) + @rateLimit = new BucketRateLimit( + @config.rateLimitBytes * @config.rateLimitHistory, + @config.rateLimitHistory + ) @retries = 0 # Set the target relay address spec, which is expected to be websocket. @@ -45,7 +50,7 @@ class Snowflake # process. |pollBroker| automatically arranges signalling. beginWebRTC: -> @state = Snowflake.MODE.WEBRTC_CONNECTING - for i in [1..CONNECTIONS_PER_CLIENT] + for i in [1..(a)config.connectionsPerClient] @makeProxyPair @relayAddr log 'ProxyPair Slots: ' + @proxyPairs.length log 'Snowflake IDs: ' + (@proxyPairs.map (p) -> p.id).join ' | ' @@ -77,9 +82,9 @@ class Snowflake recv = @broker.getClientOffer pair.id recv.then (desc) => @receiveOffer pair, desc - countdown('Serving 1 new client.', DEFAULT_BROKER_POLL_INTERVAL / 1000) - , (err) -> - countdown(err, DEFAULT_BROKER_POLL_INTERVAL / 1000) + countdown('Serving 1 new client.', @config.defaultBrokerPollInterval / 1000) + , (err) => + countdown(err, @config.defaultBrokerPollInterval / 1000) @retries++ findClients() @@ -111,7 +116,7 @@ class Snowflake .catch fail makeProxyPair: (relay) -> - pair = new ProxyPair relay, @rateLimit + pair = new ProxyPair relay, @rateLimit, @config.pcConfig @proxyPairs.push pair pair.onCleanup = (event) => # Delete from the list of active proxy pairs. diff --git a/proxy/spec/broker.spec.coffee b/proxy/spec/broker.spec.coffee index 3532fe1..2b1d2bd 100644 --- a/proxy/spec/broker.spec.coffee +++ b/proxy/spec/broker.spec.coffee @@ -25,7 +25,7 @@ describe 'Broker', -> # fake successful request and response from broker. spyOn(b, '_postRequest').and.callFake -> b._xhr.readyState = b._xhr.DONE - b._xhr.status = Broker.STATUS_OK + b._xhr.status = Broker.STATUS.OK b._xhr.responseText = 'fake offer' b._xhr.onreadystatechange() poll = b.getClientOffer() @@ -35,7 +35,7 @@ describe 'Broker', -> expect(desc).toEqual 'fake offer' done() .catch -> - fail 'should not reject on Broker.STATUS_OK' + fail 'should not reject on Broker.STATUS.OK' done() it 'rejects if the broker timed-out', (done) -> @@ -43,16 +43,16 @@ describe 'Broker', -> # fake timed-out request from broker spyOn(b, '_postRequest').and.callFake -> b._xhr.readyState = b._xhr.DONE - b._xhr.status = Broker.STATUS_GATEWAY_TIMEOUT + b._xhr.status = Broker.STATUS.GATEWAY_TIMEOUT b._xhr.onreadystatechange() poll = b.getClientOffer() expect(poll).not.toBeNull() expect(b._postRequest).toHaveBeenCalled() poll.then (desc) -> - fail 'should not fulfill on GATEWAY_TIMEOUT' + fail 'should not fulfill on Broker.STATUS.GATEWAY_TIMEOUT' done() , (err) -> - expect(err).toBe Broker.MESSAGE_TIMEOUT + expect(err).toBe Broker.MESSAGE.TIMEOUT done() it 'rejects on any other status', (done) -> @@ -69,7 +69,7 @@ describe 'Broker', -> fail 'should not fulfill on non-OK status' done() , (err) -> - expect(err).toBe Broker.MESSAGE_UNEXPECTED + expect(err).toBe Broker.MESSAGE.UNEXPECTED expect(b._xhr.status).toBe 1337 done() diff --git a/proxy/spec/init.spec.coffee b/proxy/spec/init.spec.coffee new file mode 100644 index 0000000..4134a22 --- /dev/null +++ b/proxy/spec/init.spec.coffee @@ -0,0 +1,28 @@ + +# Fake snowflake to interact with +snowflake = + ui: new UI + broker: + sendAnswer: -> + state: Snowflake.MODE.INIT + +describe 'Init', -> + + it 'gives a dialog when closing, only while active', -> + silenceNotifications = false + snowflake.state = Snowflake.MODE.WEBRTC_READY + msg = window.onbeforeunload() + expect(snowflake.state).toBe Snowflake.MODE.WEBRTC_READY + expect(msg).toBe Snowflake.MESSAGE.CONFIRMATION + + snowflake.state = Snowflake.MODE.INIT + msg = window.onbeforeunload() + expect(snowflake.state).toBe Snowflake.MODE.INIT + expect(msg).toBe null + + it 'does not give a dialog when silent flag is on', -> + silenceNotifications = true + snowflake.state = Snowflake.MODE.WEBRTC_READY + msg = window.onbeforeunload() + expect(snowflake.state).toBe Snowflake.MODE.WEBRTC_READY + expect(msg).toBe null diff --git a/proxy/spec/proxypair.spec.coffee b/proxy/spec/proxypair.spec.coffee index 566c6f1..87aeb55 100644 --- a/proxy/spec/proxypair.spec.coffee +++ b/proxy/spec/proxypair.spec.coffee @@ -24,10 +24,11 @@ arrayMatching = (sample) -> { describe 'ProxyPair', -> fakeRelay = Parse.address '0.0.0.0:12345' - rateLimit = new DummyRateLimit() + rateLimit = new DummyRateLimit + config = new Config destination = [] # Using the mock PeerConnection definition from spec/snowflake.spec.coffee. - pp = new ProxyPair(fakeRelay, rateLimit) + pp = new ProxyPair(fakeRelay, rateLimit, config.pcConfig) beforeEach -> pp.begin() diff --git a/proxy/spec/snowflake.spec.coffee b/proxy/spec/snowflake.spec.coffee index a619a06..2c87204 100644 --- a/proxy/spec/snowflake.spec.coffee +++ b/proxy/spec/snowflake.spec.coffee @@ -15,40 +15,38 @@ class WebSocket constructor: -> @bufferedAmount = 0 send: (data) -> + log = -> -fakeUI = new UI() + +config = new Config +ui = new UI + class FakeBroker getClientOffer: -> new Promise((F,R) -> {}) -# Fake snowflake to interact with -snowflake = - ui: fakeUI - broker: - sendAnswer: -> - state: Snowflake.MODE.INIT describe 'Snowflake', -> it 'constructs correctly', -> - s = new Snowflake({ fake: 'broker' }, fakeUI) + s = new Snowflake(config, ui, { fake: 'broker' }) expect(s.rateLimit).not.toBeNull() expect(s.broker).toEqual { fake: 'broker' } expect(s.ui).not.toBeNull() expect(s.retries).toBe 0 it 'sets relay address correctly', -> - s = new Snowflake(null, fakeUI) + s = new Snowflake(config, ui, null) s.setRelayAddr 'foo' expect(s.relayAddr).toEqual 'foo' it 'initalizes WebRTC connection', -> - s = new Snowflake(new FakeBroker(), fakeUI) + s = new Snowflake(config, ui, new FakeBroker()) spyOn(s.broker, 'getClientOffer').and.callThrough() s.beginWebRTC() expect(s.retries).toBe 1 expect(s.broker.getClientOffer).toHaveBeenCalled() it 'receives SDP offer and sends answer', -> - s = new Snowflake(new FakeBroker(), fakeUI) + s = new Snowflake(config, ui, new FakeBroker()) pair = { receiveWebRTCOffer: -> } spyOn(pair, 'receiveWebRTCOffer').and.returnValue true spyOn(s, 'sendAnswer') @@ -56,7 +54,7 @@ describe 'Snowflake', -> expect(s.sendAnswer).toHaveBeenCalled() it 'does not send answer when receiving invalid offer', -> - s = new Snowflake(new FakeBroker(), fakeUI) + s = new Snowflake(config, ui, new FakeBroker()) pair = { receiveWebRTCOffer: -> } spyOn(pair, 'receiveWebRTCOffer').and.returnValue false spyOn(s, 'sendAnswer') @@ -64,25 +62,6 @@ describe 'Snowflake', -> expect(s.sendAnswer).not.toHaveBeenCalled() it 'can make a proxypair', -> - s = new Snowflake(new FakeBroker(), fakeUI) + s = new Snowflake(config, ui, new FakeBroker()) s.makeProxyPair() expect(s.proxyPairs.length).toBe 1 - - it 'gives a dialog when closing, only while active', -> - silenceNotifications = false - snowflake.state = Snowflake.MODE.WEBRTC_READY - msg = window.onbeforeunload() - expect(snowflake.state).toBe Snowflake.MODE.WEBRTC_READY - expect(msg).toBe CONFIRMATION_MESSAGE - - snowflake.state = Snowflake.MODE.INIT - msg = window.onbeforeunload() - expect(snowflake.state).toBe Snowflake.MODE.INIT - expect(msg).toBe null - - it 'does not give a dialog when silent flag is on', -> - silenceNotifications = true - snowflake.state = Snowflake.MODE.WEBRTC_READY - msg = window.onbeforeunload() - expect(snowflake.state).toBe Snowflake.MODE.WEBRTC_READY - expect(msg).toBe null diff --git a/proxy/util.coffee b/proxy/util.coffee index 15b4152..b8057fb 100644 --- a/proxy/util.coffee +++ b/proxy/util.coffee @@ -22,10 +22,10 @@ class Util @genSnowflakeID: -> Math.random().toString(36).substring(2) - @snowflakeIsDisabled = -> + @snowflakeIsDisabled = (cookieName) -> cookies = Parse.cookie document.cookie # Do nothing if snowflake has not been opted in by user. - if cookies[COOKIE_NAME] != '1' + if cookies[cookieName] != '1' log 'Not opted-in. Please click the badge to change options.' return true # Also do nothing if running in Tor Browser.

1 0

[snowflake/master] Move querystring access to init
by arlo＠torproject.org 16 May '19

16 May '19

commit edbbea1d0336098a767b7426bc558c90c7746bd1 Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed May 8 14:08:22 2019 -0400 Move querystring access to init --- proxy/init.coffee | 16 ++++++++++------ proxy/snowflake.coffee | 6 +----- proxy/spec/snowflake.spec.coffee | 2 -- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/proxy/init.coffee b/proxy/init.coffee index d3101c3..497a54f 100644 --- a/proxy/init.coffee +++ b/proxy/init.coffee @@ -9,12 +9,8 @@ RELAY = # port: 9902 COOKIE_NAME = "snowflake-allow" -silenceNotifications = false -query = Query.parse(location) -DEBUG = Params.getBool(query, 'debug', false) - # Bytes per second. Set to undefined to disable limit. -DEFAULT_RATE_LIMIT = DEFAULT_RATE_LIMIT || undefined +DEFAULT_RATE_LIMIT = undefined MIN_RATE_LIMIT = 10 * 1024 RATE_LIMIT_HISTORY = 5.0 DEFAULT_BROKER_POLL_INTERVAL = 5.0 * 1000 @@ -31,7 +27,11 @@ config = { CONFIRMATION_MESSAGE = 'You\'re currently serving a Tor user via Snowflake.' +query = Query.parse(location) +DEBUG = Params.getBool(query, 'debug', false) + snowflake = null +silenceNotifications = false # Log to both console and UI if applicable. # Requires that the snowflake and UI objects are hooked up in order to @@ -57,9 +57,13 @@ init = () -> else ui = new UI() + rateLimitBytes = undefined + if 'off' != query['ratelimit'] + rateLimitBytes = Params.getByteCount(query, 'ratelimit', DEFAULT_RATE_LIMIT) + silenceNotifications = Params.getBool(query, 'silent', false) broker = new Broker BROKER - snowflake = new Snowflake broker, ui + snowflake = new Snowflake broker, ui, rateLimitBytes log '== snowflake proxy ==' if Util.snowflakeIsDisabled() diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index 9656c0b..fa421ee 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -22,14 +22,10 @@ class Snowflake WEBRTC_READY: 2 # Prepare the Snowflake with a Broker (to find clients) and optional UI. - constructor: (@broker, @ui) -> + constructor: (@broker, @ui, rateLimitBytes) -> @state = Snowflake.MODE.INIT @proxyPairs = [] - rateLimitBytes = undefined - if 'off' != query['ratelimit'] - rateLimitBytes = Params.getByteCount(query, 'ratelimit', - DEFAULT_RATE_LIMIT) if undefined == rateLimitBytes @rateLimit = new DummyRateLimit() else diff --git a/proxy/spec/snowflake.spec.coffee b/proxy/spec/snowflake.spec.coffee index bb6e348..a619a06 100644 --- a/proxy/spec/snowflake.spec.coffee +++ b/proxy/spec/snowflake.spec.coffee @@ -2,7 +2,6 @@ jasmine tests for Snowflake ### -query = {} # Fake browser functionality: class PeerConnection setRemoteDescription: -> @@ -31,7 +30,6 @@ describe 'Snowflake', -> it 'constructs correctly', -> s = new Snowflake({ fake: 'broker' }, fakeUI) - query['ratelimit'] = 'off' expect(s.rateLimit).not.toBeNull() expect(s.broker).toEqual { fake: 'broker' } expect(s.ui).not.toBeNull()

1 0

[snowflake/master] Separate build per use
by arlo＠torproject.org 16 May '19

16 May '19

commit 4d40f17487fba217490da80186b9674d0302c691 Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed May 8 16:46:51 2019 -0400 Separate build per use --- proxy/Cakefile | 49 +++++++++++++++++++++----------- proxy/{init.coffee => init-badge.coffee} | 8 ++---- proxy/init-node.coffee | 19 +++++++++++++ proxy/init-webext.coffee | 39 +++++++++++++++++++++++++ proxy/package.json | 2 +- proxy/shims.coffee | 2 -- 6 files changed, 94 insertions(+), 25 deletions(-) diff --git a/proxy/Cakefile b/proxy/Cakefile index e0d610c..ba2e5ec 100644 --- a/proxy/Cakefile +++ b/proxy/Cakefile @@ -3,41 +3,49 @@ fs = require 'fs' # All coffeescript files required. FILES = [ - 'shims.coffee' - 'util.coffee' - 'init.coffee' - 'proxypair.coffee' - 'websocket.coffee' 'broker.coffee' - 'ui.coffee' - 'snowflake.coffee' 'config.coffee' + 'proxypair.coffee' + 'snowflake.coffee' + 'ui.coffee' + 'util.coffee' + 'websocket.coffee' + + 'shims.coffee' ] + +INITS = [ + 'init-badge.coffee' + 'init-node.coffee' + 'init-webext.coffee' +] + FILES_SPEC = [ - 'spec/util.spec.coffee' - 'spec/ui.spec.coffee' 'spec/broker.spec.coffee' + 'spec/init.spec.coffee' 'spec/proxypair.spec.coffee' 'spec/snowflake.spec.coffee' + 'spec/ui.spec.coffee' + 'spec/util.spec.coffee' 'spec/websocket.spec.coffee' - 'spec/init.spec.coffee' ] -FILES_ALL = FILES.concat FILES_SPEC + OUTFILE = 'snowflake.js' STATIC = 'static' copyStaticFiles = -> exec 'cp ' + STATIC + '/* build/' -compileCoffee = (outDir) -> - exec 'cat ' + FILES.join(' ') + ' | coffee -cs > ' + outDir + '/' + OUTFILE, (err, stdout, stderr) -> +compileCoffee = (outDir, init) -> + files = FILES.concat('init-' + init + '.coffee') + exec 'cat ' + files.join(' ') + ' | coffee -cs > ' + outDir + '/' + OUTFILE, (err, stdout, stderr) -> throw err if err task 'test', 'snowflake unit tests', -> exec 'mkdir -p test' exec 'jasmine init >&-' # Simply concat all the files because we're not using node exports. - jasmineFiles = FILES_ALL + jasmineFiles = FILES.concat('init-badge.coffee', FILES_SPEC) outFile = 'test/bundle.spec.coffee' exec 'echo "TESTING = true" > ' + outFile exec 'cat ' + jasmineFiles.join(' ') + ' | cat >> ' + outFile @@ -50,15 +58,22 @@ task 'test', 'snowflake unit tests', -> task 'build', 'build the snowflake proxy', -> exec 'mkdir -p build' copyStaticFiles() - compileCoffee('build') + compileCoffee('build', 'badge') console.log 'Snowflake prepared.' task 'webext', 'build the webextension', -> - compileCoffee('webext') + exec 'mkdir -p webext' + compileCoffee('webext', 'webext') console.log 'Webextension prepared.' +task 'node', 'build the node binary', -> + exec 'mkdir -p build' + compileCoffee('build', 'node') + console.log 'Node prepared.' + task 'lint', 'ensure idiomatic coffeescript', -> - proc = spawn 'coffeelint', FILES_ALL, { + filesAll = FILES.concat(INITS, FILES_SPEC) + proc = spawn 'coffeelint', filesAll, { file: 'coffeelint.json' stdio: 'inherit' } diff --git a/proxy/init.coffee b/proxy/init-badge.coffee similarity index 95% rename from proxy/init.coffee rename to proxy/init-badge.coffee index 48a2c39..295f84b 100644 --- a/proxy/init.coffee +++ b/proxy/init-badge.coffee @@ -1,3 +1,6 @@ +### +Entry point. +### snowflake = null @@ -14,9 +17,6 @@ log = (msg) -> dbg = (msg) -> log msg if debug or (snowflake?.ui instanceof DebugUI) -### -Entry point. -### init = () -> config = new Config @@ -28,8 +28,6 @@ init = () -> ui = new BadgeUI() else if (document.getElementById('status') != null) ui = new DebugUI() - else if (document.getElementById('webext') != null) - ui = new WebExtUI() else ui = new UI() diff --git a/proxy/init-node.coffee b/proxy/init-node.coffee new file mode 100644 index 0000000..814e3fc --- /dev/null +++ b/proxy/init-node.coffee @@ -0,0 +1,19 @@ +### +Entry point. +### + +config = new Config +ui = new UI() +broker = new Broker config.brokerUrl +snowflake = new Snowflake config, ui, broker + +log = (msg) -> + console.log 'Snowflake: ' + msg + +dbg = log + +log '== snowflake proxy ==' +dbg 'Contacting Broker at ' + broker.url + +snowflake.setRelayAddr config.relayAddr +snowflake.beginWebRTC() diff --git a/proxy/init-webext.coffee b/proxy/init-webext.coffee new file mode 100644 index 0000000..1ba6391 --- /dev/null +++ b/proxy/init-webext.coffee @@ -0,0 +1,39 @@ +### +Entry point. +### + +debug = false +snowflake = null + +# Log to both console and UI if applicable. +# Requires that the snowflake and UI objects are hooked up in order to +# log to console. +log = (msg) -> + console.log 'Snowflake: ' + msg + snowflake?.ui.log msg + +dbg = (msg) -> log msg if debug + +init = () -> + config = new Config + ui = new WebExtUI() + broker = new Broker config.brokerUrl + snowflake = new Snowflake config, ui, broker + + log '== snowflake proxy ==' + # Otherwise, begin setting up WebRTC and acting as a proxy. + dbg 'Contacting Broker at ' + broker.url + snowflake.setRelayAddr config.relayAddr + snowflake.beginWebRTC() + +# Notification of closing tab with active proxy. +window.onbeforeunload = -> + if !silenceNotifications && Snowflake.MODE.WEBRTC_READY == snowflake.state + return Snowflake.MESSAGE.CONFIRMATION + null + +window.onunload = -> + pair.close() for pair in snowflake.proxyPairs + null + +window.onload = init diff --git a/proxy/package.json b/proxy/package.json index 8bc5fb5..889e2e2 100644 --- a/proxy/package.json +++ b/proxy/package.json @@ -12,7 +12,7 @@ "build": "cake build", "webext": "cake webext", "clean": "cake clean", - "prepublish": "npm run build", + "prepublish": "cake node", "start": "node build/snowflake.js" }, "bin": { diff --git a/proxy/shims.coffee b/proxy/shims.coffee index 5c4bae0..dc7412f 100644 --- a/proxy/shims.coffee +++ b/proxy/shims.coffee @@ -19,8 +19,6 @@ if module?.exports WebSocket = require 'ws' { XMLHttpRequest } = require 'xmlhttprequest' - process.nextTick () -> init - else window = this document = window.document

1 0