- tor-commits - lists.torproject.org

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 11 Feb '16

11 Feb '16

commit 6d10a17143d4a6e6a567d26de7fa679cce8552c2 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 11 07:45:21 2016 +0000 Update translations for https_everywhere_completed --- ro/https-everywhere.dtd | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/ro/https-everywhere.dtd b/ro/https-everywhere.dtd index 0a0cad5..0db8434 100644 --- a/ro/https-everywhere.dtd +++ b/ro/https-everywhere.dtd @@ -37,18 +37,7 @@ <!ENTITY https-everywhere.prefs.reset_default "Revino la setările inițiale"> <!ENTITY https-everywhere.prefs.view_xml_source "Vezi sursa XML"> -<!ENTITY https-everywhere.source.downloading "Se descarcă"> -<!ENTITY https-everywhere.source.filename "Nume fișier"> -<!ENTITY https-everywhere.source.unable_to_download "Nu se poate descărca sursa."> - -<!ENTITY https-everywhere.popup.title "Notificare HTTPS Everywhere 4.0development.11"> -<!ENTITY https-everywhere.popup.paragraph1 "Foloseai versiunea stabilă de HTTPS Oriunde dar accidental te-am actualizat la versiunea de dezvoltare la ultima noastră lansare."> -<!ENTITY https-everywhere.popup.paragraph2 "Vrei să te întorci la versiunea stabilă?"> -<!ENTITY https-everywhere.popup.paragraph3 "Ne-ar plăcea dacă ai continua să folosești versiunea de dezvoltare, ajutându-ne să facem HTTPS Oriunde mai bună! Ai putea găsi câteva hibe pe alocuri pe care le poți raporta la https-everywhere(a)eff.org. -Ne pare rău de neplăcerea produsă și îți mulțumim pentru că folosești HTTPS Oriunde."> -<!ENTITY https-everywhere.popup.keep "Ține-mă pe versiunea de dezvoltare"> -<!ENTITY https-everywhere.popup.revert "Descarcă ultima versiune stabilă"> - -<!ENTITY https-everywhere.ruleset-tests.status_title "Teste pentru seturile de reguli ale HTTPS Oriunde"> -<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Anulare"> -<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start"> +<!ENTITY https-everywhere.chrome.stable_rules "Reguli stabile"> +<!ENTITY https-everywhere.chrome.stable_rules_description "Pentru aceste pagini se folosesc obligatoriu conexiuni criptate:"> +<!ENTITY https-everywhere.chrome.experimental_rules "Reguli experimentale"> +<!ENTITY https-everywhere.chrome.experimental_rules_description "Poate genera avertismente sau pierderi. Implicit dezactivat. ">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 11 Feb '16

11 Feb '16

commit 01af6b3bcdbbb0238c6a357a0f9261b3a885bcb2 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 11 07:45:16 2016 +0000 Update translations for https_everywhere --- ro/https-everywhere.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ro/https-everywhere.dtd b/ro/https-everywhere.dtd index cf8d1fc..0db8434 100644 --- a/ro/https-everywhere.dtd +++ b/ro/https-everywhere.dtd @@ -37,7 +37,7 @@ <!ENTITY https-everywhere.prefs.reset_default "Revino la setările inițiale"> <!ENTITY https-everywhere.prefs.view_xml_source "Vezi sursa XML"> -<!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> -<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> -<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules"> -<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default."> +<!ENTITY https-everywhere.chrome.stable_rules "Reguli stabile"> +<!ENTITY https-everywhere.chrome.stable_rules_description "Pentru aceste pagini se folosesc obligatoriu conexiuni criptate:"> +<!ENTITY https-everywhere.chrome.experimental_rules "Reguli experimentale"> +<!ENTITY https-everywhere.chrome.experimental_rules_description "Poate genera avertismente sau pierderi. Implicit dezactivat. ">

1 0

[metrics-web/master] Be smarter about re-importing consensuses.
by karsten＠torproject.org 11 Feb '16

11 Feb '16

commit 2b3f4b90191b5e8eadd8a72f3841789d6a9e22ba Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Feb 10 17:50:03 2016 +0100 Be smarter about re-importing consensuses. A recent analysis of Metrics' back-end performance has revealed that importing consensuses into the database can take between a few seconds and a few *hours*. More precisely, importing a consensus for the first time takes seconds and re-importing a consensus that was already (partially) contained in the database can take hours. The reason for the latter is that we're checking for every status entry whether it's contained in the database before we're inserting it, and these 7k queries are crazy expensive. What we should do, which is what we're doing now, is request and store a list of fingerprints of contained status entry for a given consensus and only inserting a status entry if its fingerprint is not contained in that list. Now we can avoid making these 7k queries and re-import a consensus within seconds. There were two situations when we re-imported one or more consensuses which took hours or more: whenever the host was rebooted during the database import and we lost import history, and whenever CollecTor fetched an outdated consensus from a directory authority that it already received the hour before and that Metrics already imported in its previous run. --- .../cron/RelayDescriptorDatabaseImporter.java | 50 ++++------------------ 1 file changed, 8 insertions(+), 42 deletions(-) diff --git a/modules/legacy/src/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java b/modules/legacy/src/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java index c92baa7..19f2a0f 100644 --- a/modules/legacy/src/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java +++ b/modules/legacy/src/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java @@ -77,12 +77,6 @@ public final class RelayDescriptorDatabaseImporter { private PreparedStatement psSs; /** - * Prepared statement to check whether a given network status consensus - * entry has been imported into the database before. - */ - private PreparedStatement psRs; - - /** * Prepared statement to check whether a given server descriptor has * been imported into the database before. */ @@ -174,13 +168,7 @@ public final class RelayDescriptorDatabaseImporter { * Set of fingerprints that we imported for the valid-after time in * <code>lastCheckedStatusEntries</code>. */ - private Set<String> insertedStatusEntries; - - /** - * Flag that tells us whether we need to check whether a network status - * entry is already contained in the database or not. - */ - private boolean separateStatusEntryCheckNecessary; + private Set<String> insertedStatusEntries = new HashSet<String>(); private boolean importIntoDatabase; private boolean writeRawImportFiles; @@ -218,11 +206,8 @@ public final class RelayDescriptorDatabaseImporter { this.conn.setAutoCommit(false); /* Prepare statements. */ - this.psSs = conn.prepareStatement("SELECT COUNT(*) " + this.psSs = conn.prepareStatement("SELECT fingerprint " + "FROM statusentry WHERE validafter = ?"); - this.psRs = conn.prepareStatement("SELECT COUNT(*) " - + "FROM statusentry WHERE validafter = ? AND " - + "fingerprint = ?"); this.psDs = conn.prepareStatement("SELECT COUNT(*) " + "FROM descriptor WHERE descriptor = ?"); this.psCs = conn.prepareStatement("SELECT COUNT(*) " @@ -253,10 +238,6 @@ public final class RelayDescriptorDatabaseImporter { this.logger.log(Level.WARNING, "Could not connect to database or " + "prepare statements.", e); } - - /* Initialize set of fingerprints to remember which status entries - * we already imported. */ - this.insertedStatusEntries = new HashSet<String>(); } /* Remember where we want to write raw import files. */ @@ -305,33 +286,17 @@ public final class RelayDescriptorDatabaseImporter { Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC")); Timestamp validAfterTimestamp = new Timestamp(validAfter); if (lastCheckedStatusEntries != validAfter) { + insertedStatusEntries.clear(); this.psSs.setTimestamp(1, validAfterTimestamp, cal); ResultSet rs = psSs.executeQuery(); - rs.next(); - if (rs.getInt(1) == 0) { - separateStatusEntryCheckNecessary = false; - insertedStatusEntries.clear(); - } else { - separateStatusEntryCheckNecessary = true; + while (rs.next()) { + String insertedFingerprint = rs.getString(1); + insertedStatusEntries.add(insertedFingerprint); } rs.close(); lastCheckedStatusEntries = validAfter; } - boolean alreadyContained = false; - if (separateStatusEntryCheckNecessary || - insertedStatusEntries.contains(fingerprint)) { - this.psRs.setTimestamp(1, validAfterTimestamp, cal); - this.psRs.setString(2, fingerprint); - ResultSet rs = psRs.executeQuery(); - rs.next(); - if (rs.getInt(1) > 0) { - alreadyContained = true; - } - rs.close(); - } else { - insertedStatusEntries.add(fingerprint); - } - if (!alreadyContained) { + if (!insertedStatusEntries.contains(fingerprint)) { this.psR.clearParameters(); this.psR.setTimestamp(1, validAfterTimestamp, cal); this.psR.setString(2, nickname); @@ -364,6 +329,7 @@ public final class RelayDescriptorDatabaseImporter { if (rrsCount % autoCommitCount == 0) { this.conn.commit(); } + insertedStatusEntries.add(fingerprint); } } catch (SQLException e) { this.logger.log(Level.WARNING, "Could not add network status "

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 11 Feb '16

11 Feb '16

commit d0709d56afe37bdc3813ed5482f96cea3963f5a1 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 11 02:15:18 2016 +0000 Update translations for https_everywhere_completed --- fr/https-everywhere.dtd | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/fr/https-everywhere.dtd b/fr/https-everywhere.dtd index f73db51..e32703a 100644 --- a/fr/https-everywhere.dtd +++ b/fr/https-everywhere.dtd @@ -37,17 +37,7 @@ <!ENTITY https-everywhere.prefs.reset_default "Revenir aux paramètres par défaut"> <!ENTITY https-everywhere.prefs.view_xml_source "Voir le code source XML"> -<!ENTITY https-everywhere.source.downloading "Téléchargement"> -<!ENTITY https-everywhere.source.filename "Nom du fichier"> -<!ENTITY https-everywhere.source.unable_to_download "Impossible de télécharger le code source."> - -<!ENTITY https-everywhere.popup.title "Notification de HTTPS Everywhere 4.0development.11"> -<!ENTITY https-everywhere.popup.paragraph1 "Oups. Vous utilisiez la version stable de HTTPS Everywhere, mais notre dernière version a accidentellement pu effectuer la mise à jour vers la version de développement."> -<!ENTITY https-everywhere.popup.paragraph2 "Est-ce que vous souhaitez revenir vers la version stable ?"> -<!ENTITY https-everywhere.popup.paragraph3 "Nous aimerions vous voir continuer à utiliser notre version de développement et à nous aider à améliorer HTTPS Everywhere ! Vous allez peut-être trouver quelques bogues ici et là, que vous pouvez rapporter (en anglais) en écrivant à https-everywhere(a)eff.org. Désolé pour le dérangement, et merci d'utiliser HTTPS Everywhere."> -<!ENTITY https-everywhere.popup.keep "Rester sur la version de développement"> -<!ENTITY https-everywhere.popup.revert "Télécharger la dernière version stable"> - -<!ENTITY https-everywhere.ruleset-tests.status_title "Tests de règles pour HTTPS Everywhere"> -<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Annuler"> -<!ENTITY https-everywhere.ruleset-tests.status_start_button "Démarrer"> +<!ENTITY https-everywhere.chrome.stable_rules "Règles permanentes"> +<!ENTITY https-everywhere.chrome.stable_rules_description "Forcer le chiffrement des connexions pour les sites internet suivant:"> +<!ENTITY https-everywhere.chrome.experimental_rules "Règles expérimentales"> +<!ENTITY https-everywhere.chrome.experimental_rules_description "Peut causer des alertes ou des ruptures. Désactivé par défaut.">

1 0

[translation/tor-messenger-privproperties_completed] Update translations for tor-messenger-privproperties_completed
by translation＠torproject.org 11 Feb '16

11 Feb '16

commit 7b12611687ab8e28a2e451d76ecfe2e709eb6776 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 11 01:46:41 2016 +0000 Update translations for tor-messenger-privproperties_completed --- fr/priv.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/fr/priv.properties b/fr/priv.properties index ac633c7..72d764e 100644 --- a/fr/priv.properties +++ b/fr/priv.properties @@ -1 +1,2 @@ priv.account=Génération d'une clé privée pour %S (%S) ... +priv.failed=La génération des clés a échoué : %S

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 11 Feb '16

11 Feb '16

commit 1ad52d227c747163091017f11e4044658232c1fe Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 11 01:45:16 2016 +0000 Update translations for https_everywhere --- fr/https-everywhere.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fr/https-everywhere.dtd b/fr/https-everywhere.dtd index 933c79e..4a986e9 100644 --- a/fr/https-everywhere.dtd +++ b/fr/https-everywhere.dtd @@ -38,6 +38,6 @@ <!ENTITY https-everywhere.prefs.view_xml_source "Voir le code source XML"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> -<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> -<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules"> +<!ENTITY https-everywhere.chrome.stable_rules_description "Forcer le chiffrement des connexions pour les sites internet suivant:"> +<!ENTITY https-everywhere.chrome.experimental_rules "Règles expérimentales"> <!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">

1 0

[snowflake/master] Complete broker spec cases
by serene＠torproject.org 10 Feb '16

10 Feb '16

commit 4f18340c163c18d4bcad249b4e4976d3106cd014 Author: Serene Han <keroserene+git(a)gmail.com> Date: Wed Feb 10 13:05:21 2016 -0800 Complete broker spec cases --- proxy/broker.coffee | 67 +++++++++++++++--------------- proxy/spec/broker.spec.coffee | 94 +++++++++++++++++++++++++++++++------------ 2 files changed, 102 insertions(+), 59 deletions(-) diff --git a/proxy/broker.coffee b/proxy/broker.coffee index 71fe6eb..e989d57 100644 --- a/proxy/broker.coffee +++ b/proxy/broker.coffee @@ -9,6 +9,9 @@ STATUS_OK = 200 STATUS_GONE = 410 STATUS_GATEWAY_TIMEOUT = 504 +MESSAGE_TIMEOUT = 'Timed out waiting for a client offer.' +MESSAGE_UNEXPECTED = 'Unexpected status.' + genSnowflakeID = -> Math.random().toString(36).substring(2) @@ -17,7 +20,6 @@ class Broker clients: 0 id: null - request: null # When interacting with the Broker, snowflake must generate a unique session # ID so the Broker can keep track of which signalling channel it's speaking @@ -29,53 +31,35 @@ class Broker @url = 'https://' + @url if 0 != @url.indexOf('https://', 0) @url += '/' if '/' != @url.substr -1 - # Snowflake registers with the broker using an HTTP POST request, and expects - # a response from the broker containing some client offer. + # Promises some client SDP Offer. + # Registers this Snowfalke with the broker using an HTTP POST request, and + # waits for a response containing some client offer that the Broker chooses + # for this proxy.. # TODO: Actually support multiple clients. getClientOffer: => new Promise (fulfill, reject) => xhr = new XMLHttpRequest() - @request = xhr - @fulfill = fulfill - # @request.onreadystatechange = @processOffer - xhr.onreadystatechange = => + xhr.onreadystatechange = -> return if xhr.DONE != xhr.readyState switch xhr.status when STATUS_OK fulfill xhr.responseText # Should contain offer. when STATUS_GATEWAY_TIMEOUT - reject 'Timed out waiting for a client to serve.' + reject MESSAGE_TIMEOUT else log 'Broker ERROR: Unexpected ' + xhr.status + ' - ' + xhr.statusText - Status.set ' failure. Please refresh.' - @sendRequest() - - sendRequest: => - try - @request.open 'POST', @url + 'proxy' - @request.setRequestHeader('X-Session-ID', @id) - catch err - ### - An exception happens here when, for example, NoScript allows the domain - on which the proxy badge runs, but not the domain to which it's trying - to make the HTTP request. The exception message is like "Component - returned failure code: 0x805e0006 [nsIXMLHttpRequest.open]" on Firefox. - ### - log 'Broker: exception while connecting: ' + err.message - return - @request.send @id + snowflake.ui.setStatus ' failure. Please refresh.' + reject MESSAGE_UNEXPECTED + @_xhr = xhr # Used by spec to fake async Broker interaction + @_postRequest xhr, 'proxy', @id + # Assumes getClientOffer happened, and a WebRTC SDP answer has been generated. + # Sends it back to the broker, which passes it to back to the original client. sendAnswer: (answer) -> dbg @id + ' - Sending answer back to broker...\n' dbg answer.sdp xhr = new XMLHttpRequest() - try - xhr.open 'POST', @url + 'answer' - xhr.setRequestHeader('X-Session-ID', @id) - catch err - log 'Broker: exception while connecting: ' + err.message - return xhr.onreadystatechange = -> return if xhr.DONE != xhr.readyState switch xhr.status @@ -87,5 +71,22 @@ class Broker else dbg 'Broker ERROR: Unexpected ' + xhr.status + ' - ' + xhr.statusText - Status.set ' failure. Please refresh.' - xhr.send JSON.stringify(answer) + snowflake.ui.setStatus ' failure. Please refresh.' + @_postRequest xhr, 'answer', JSON.stringify(answer) + + # urlSuffix for the broker is different depending on what action + # is desired. + _postRequest: (xhr, urlSuffix, payload) => + try + xhr.open 'POST', @url + urlSuffix + xhr.setRequestHeader('X-Session-ID', @id) + catch err + ### + An exception happens here when, for example, NoScript allows the domain + on which the proxy badge runs, but not the domain to which it's trying + to make the HTTP xhr. The exception message is like "Component + returned failure code: 0x805e0006 [nsIXMLHttpRequest.open]" on Firefox. + ### + log 'Broker: exception while connecting: ' + err.message + return + xhr.send payload diff --git a/proxy/spec/broker.spec.coffee b/proxy/spec/broker.spec.coffee index 3b47cd3..db936c1 100644 --- a/proxy/spec/broker.spec.coffee +++ b/proxy/spec/broker.spec.coffee @@ -19,32 +19,74 @@ describe 'Broker', -> expect(b.url).toEqual 'https://fake/' expect(b.id).not.toBeNull() - it 'polls and promises a client offer', (done) -> - b = new Broker 'fake' - # fake successful request - spyOn(b, 'sendRequest').and.callFake -> - b.request.readyState = b.request.DONE - b.request.status = STATUS_OK - b.request.responseText = 'test' - b.request.onreadystatechange() - poll = b.getClientOffer() - expect(poll).not.toBeNull() - poll.then (desc) => - expect(desc).toEqual 'test' - done() - - it 'requests correctly', -> - b = new Broker 'fake' - b.request = new XMLHttpRequest() - spyOn(b.request, 'open') - spyOn(b.request, 'setRequestHeader') - spyOn(b.request, 'send') - b.sendRequest() - expect(b.request.open).toHaveBeenCalled() - expect(b.request.setRequestHeader).toHaveBeenCalled() - expect(b.request.send).toHaveBeenCalled() + describe 'getClientOffer', -> + it 'polls and promises a client offer', (done) -> + b = new Broker 'fake' + # fake successful request and response from broker. + spyOn(b, '_postRequest').and.callFake -> + b._xhr.readyState = b._xhr.DONE + b._xhr.status = STATUS_OK + b._xhr.responseText = 'fake offer' + b._xhr.onreadystatechange() + poll = b.getClientOffer() + expect(poll).not.toBeNull() + expect(b._postRequest).toHaveBeenCalled() + poll.then (desc) -> + expect(desc).toEqual 'fake offer' + done() + .catch -> + fail 'should not reject on STATUS_OK' + done() + + it 'rejects if the broker timed-out', (done) -> + b = new Broker 'fake' + # fake timed-out request from broker + spyOn(b, '_postRequest').and.callFake -> + b._xhr.readyState = b._xhr.DONE + b._xhr.status = 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' + done() + , (err) -> + expect(err).toBe MESSAGE_TIMEOUT + done() + + it 'rejects on any other status', (done) -> + b = new Broker 'fake' + # fake timed-out request from broker + spyOn(b, '_postRequest').and.callFake -> + b._xhr.readyState = b._xhr.DONE + b._xhr.status = 1337 + b._xhr.onreadystatechange() + poll = b.getClientOffer() + expect(poll).not.toBeNull() + expect(b._postRequest).toHaveBeenCalled() + poll.then (desc) -> + fail 'should not fulfill on non-OK status' + done() + , (err) -> + expect(err).toBe MESSAGE_UNEXPECTED + expect(b._xhr.status).toBe 1337 + done() it 'responds to the broker with answer', -> - # TODO: fix b = new Broker 'fake' - b.sendAnswer 'foo' + spyOn(b, '_postRequest') + b.sendAnswer 123 + expect(b._postRequest).toHaveBeenCalledWith( + jasmine.any(Object), 'answer', '123') + + it 'POST XMLHttpRequests to the broker', -> + b = new Broker 'fake' + b._xhr = new XMLHttpRequest() + spyOn(b._xhr, 'open') + spyOn(b._xhr, 'setRequestHeader') + spyOn(b._xhr, 'send') + b._postRequest b._xhr, 'test', 'data' + expect(b._xhr.open).toHaveBeenCalled() + expect(b._xhr.setRequestHeader).toHaveBeenCalled() + expect(b._xhr.send).toHaveBeenCalled()

1 0

[snowflake/master] Fix jasmine spec for broker async request
by serene＠torproject.org 10 Feb '16

10 Feb '16

commit bb9eb721e26f6809cc596746112298c646b74775 Author: Serene Han <keroserene+git(a)gmail.com> Date: Tue Feb 9 18:13:54 2016 -0800 Fix jasmine spec for broker async request --- proxy/broker.coffee | 35 +++++++++++++++++-------------- proxy/spec/broker.spec.coffee | 48 +++++++++++++++++++++++++++---------------- 2 files changed, 50 insertions(+), 33 deletions(-) diff --git a/proxy/broker.coffee b/proxy/broker.coffee index b196df5..71fe6eb 100644 --- a/proxy/broker.coffee +++ b/proxy/broker.coffee @@ -32,23 +32,13 @@ class Broker # Snowflake registers with the broker using an HTTP POST request, and expects # a response from the broker containing some client offer. # TODO: Actually support multiple clients. - getClientOffer: -> + getClientOffer: => new Promise (fulfill, reject) => xhr = new XMLHttpRequest() @request = xhr - try - xhr.open 'POST', @url + 'proxy' - xhr.setRequestHeader('X-Session-ID', @id) - catch err - ### - An exception happens here when, for example, NoScript allows the domain - on which the proxy badge runs, but not the domain to which it's trying - to make the HTTP request. The exception message is like "Component - returned failure code: 0x805e0006 [nsIXMLHttpRequest.open]" on Firefox. - ### - log 'Broker: exception while connecting: ' + err.message - return - xhr.onreadystatechange = -> + @fulfill = fulfill + # @request.onreadystatechange = @processOffer + xhr.onreadystatechange = => return if xhr.DONE != xhr.readyState switch xhr.status when STATUS_OK @@ -59,7 +49,22 @@ class Broker log 'Broker ERROR: Unexpected ' + xhr.status + ' - ' + xhr.statusText Status.set ' failure. Please refresh.' - xhr.send @id + @sendRequest() + + sendRequest: => + try + @request.open 'POST', @url + 'proxy' + @request.setRequestHeader('X-Session-ID', @id) + catch err + ### + An exception happens here when, for example, NoScript allows the domain + on which the proxy badge runs, but not the domain to which it's trying + to make the HTTP request. The exception message is like "Component + returned failure code: 0x805e0006 [nsIXMLHttpRequest.open]" on Firefox. + ### + log 'Broker: exception while connecting: ' + err.message + return + @request.send @id sendAnswer: (answer) -> dbg @id + ' - Sending answer back to broker...\n' diff --git a/proxy/spec/broker.spec.coffee b/proxy/spec/broker.spec.coffee index 2844cdb..3b47cd3 100644 --- a/proxy/spec/broker.spec.coffee +++ b/proxy/spec/broker.spec.coffee @@ -3,36 +3,48 @@ jasmine tests for Snowflake broker ### # fake xhr +# class XMLHttpRequest class XMLHttpRequest + constructor: -> + @onreadystatechange = null open: -> + setRequestHeader: -> send: -> - onreadystatechange: -> DONE: 1 describe 'Broker', -> it 'can be created', -> - b = new Broker('fake') + b = new Broker 'fake' expect(b.url).toEqual 'https://fake/' expect(b.id).not.toBeNull() - it 'polls for client offer', (done) -> - b = new Broker('fake') - # TODO: fix this + it 'polls and promises a client offer', (done) -> + b = new Broker 'fake' + # fake successful request + spyOn(b, 'sendRequest').and.callFake -> + b.request.readyState = b.request.DONE + b.request.status = STATUS_OK + b.request.responseText = 'test' + b.request.onreadystatechange() poll = b.getClientOffer() - spyOn(b.request, 'open') - spyOn(b.request, 'send').and.callFake -> - b.onreadystatechange() - poll.then = -> - done() expect(poll).not.toBeNull() - # expect(b.request.open).toHaveBeenCalled() - # expect(b.request.send).toHaveBeenCalled() - # fake successful poll - b.request.readyState = XMLHttpRequest.DONE - b.request.status = STATUS_OK - b.request.responseText = 'test' - done() + poll.then (desc) => + expect(desc).toEqual 'test' + done() + + it 'requests correctly', -> + b = new Broker 'fake' + b.request = new XMLHttpRequest() + spyOn(b.request, 'open') + spyOn(b.request, 'setRequestHeader') + spyOn(b.request, 'send') + b.sendRequest() + expect(b.request.open).toHaveBeenCalled() + expect(b.request.setRequestHeader).toHaveBeenCalled() + expect(b.request.send).toHaveBeenCalled() it 'responds to the broker with answer', -> - # TODO + # TODO: fix + b = new Broker 'fake' + b.sendAnswer 'foo'

1 0

[snowflake/master] Update Snowflake embed, and add info page about it (close #16)
by serene＠torproject.org 10 Feb '16

10 Feb '16

commit 6fb2e4753fb72ea70ed817310ed0d8f0d7c0d0fa Author: Serene Han <keroserene+git(a)gmail.com> Date: Wed Feb 10 13:54:07 2016 -0800 Update Snowflake embed, and add info page about it (close #16) --- proxy/README.md | 9 +++++- proxy/static/embed.html | 30 ++++++++++--------- proxy/static/index.html | 78 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 102 insertions(+), 15 deletions(-) diff --git a/proxy/README.md b/proxy/README.md index 364ac0e..5b5761d 100644 --- a/proxy/README.md +++ b/proxy/README.md @@ -1,6 +1,13 @@ This is the browser proxy component of Snowflake. -### Testing: +### Embedding + +See [keroserene.net/snowflake](http://keroserene.net/snowflake) for more info: +``` +<iframe src="http://keroserene.net/snowflake/embed.html" width="88" height="16" frameborder="0" scrolling="no"></iframe> +``` + +### Testing Unit testing with Jasmine are available with: ``` diff --git a/proxy/static/embed.html b/proxy/static/embed.html index c59809e..5d68576 100644 --- a/proxy/static/embed.html +++ b/proxy/static/embed.html @@ -6,36 +6,38 @@ <style> * { box-sizing: border-box; - -webkit-transition: all 0.3s; - -moz-transition: all 0.3s; - transition: all 0.3s; } body { - position: absolute; - width: 100%; height: 100%; top: 0; margin: 0 auto; - background-color: #424; color: #000; - font-size: 10px; letter-spacing: 1px; font-variant: small-caps; + position: absolute; width: 100%; height: 100%; + top: 0; margin: 0 auto; padding: 0; + background-color: #424; text-align: center; cursor: default; - margin: 0; padding: 0; } #badge { margin: auto; padding: 0; width: 88px; height: 16px; background-image: url('koch.jpg'); - text-shadow: 0 0 5px #fef; - font-weight: 900; + white-space: nowrap; + color: #000; + font-size: 12px; font-weight: 900; + font-variant: small-caps; + text-shadow: 0 0 5px #fef, + 0 1px 2px #fef, + 0 -1px 2px #fef; + 1px 0px 3px #fef; + -1px 0px 3px #fef; } .active { -webkit-animation: bgScroll 8s linear infinite; animation: bgScroll 8s linear infinite; } @-webkit-keyframes bgScroll { - from {background-position: 49% -4%;} - to {background-position: 49% 104%;} + from {background-position: 0 -4%;} + to {background-position: 0 104%;} } @keyframes bgScroll { - from {background-position: 49% -4%;} - to {background-position: 49% 104%;} + from {background-position: 0 -4%;} + to {background-position: 0 104%;} } </style> </head> diff --git a/proxy/static/index.html b/proxy/static/index.html new file mode 100644 index 0000000..895f67d --- /dev/null +++ b/proxy/static/index.html @@ -0,0 +1,78 @@ +<!doctype html> +<html> + +<head> +<style> +body { + text-align: center; margin: auto; + width: 50%; + min-width: 40em; +} +textarea { + width: 100%; + height: 4em; + font-size: 12px; + resize: none; + padding: 1em; +} +</style> +</head> + +<body> + +<h1>Snowflake</h1> + +<p> +<a href="https://github.com/keroserene/snowflake" target="_blank">Snowflake</a> +is a WebRTC pluggable transport for Tor. +</p> + +<p> +Minimum functionality has been achieved, and it is possible +to bootstrap a Tor client to 100% using Snowflake, and the +browsing experience using this PT is reasonable enough. +</p> + +<p> +However, Snowflake is also under active development and much work is needed. +<br/> +It is not yet stable or audited, probably has many issues, +and should not yet be relied upon!! +</p> + +See +<a href="https://lists.torproject.org/pipermail/tor-dev/2016-January/010310.html" +target="_blank"> +here</a> for more information. + +<hr> + +<p> +It is now possible to embed the Snowflake badge on any website: +</p> + +<textarea readonly> +<iframe src="http://keroserene.net/snowflake/embed.html" width="88" height="16" frameborder="0" scrolling="no"></iframe> +</textarea> + +<p> +Which looks like this: +</p> +<iframe src="http://keroserene.net/snowflake/embed.html" width="88" height="16" frameborder="0" scrolling="no"></iframe> + +<p> +If it animates, then congratulations -- you are currently acting as a Tor bridge. +</p> +<hr> + +Repo: <a target="_blank" +href="https://gitweb.torproject.org/pluggable-transports/snowflake.git/"> +gitweb.torproject.org/pluggable-transports/snowflake.git +</a> +<br/> +Last update: 2016-02-10 +<br/> +~Serene + +</body> +<html>

1 0

[snowflake/master] Begin spec for proxy-side broker interaction
by serene＠torproject.org 10 Feb '16

10 Feb '16

commit 548c100160f17e5daa78dd59810f963f362888cd Author: Serene Han <keroserene+git(a)gmail.com> Date: Mon Feb 8 19:26:58 2016 -0800 Begin spec for proxy-side broker interaction --- proxy/Cakefile | 1 + proxy/broker.coffee | 2 ++ proxy/spec/broker.spec.coffee | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+) diff --git a/proxy/Cakefile b/proxy/Cakefile index 88d142b..045468f 100644 --- a/proxy/Cakefile +++ b/proxy/Cakefile @@ -14,6 +14,7 @@ FILES = [ FILES_SPEC = [ 'spec/util.spec.coffee' 'spec/ui.spec.coffee' + 'spec/broker.spec.coffee' 'spec/proxypair.spec.coffee' 'spec/snowflake.spec.coffee' ] diff --git a/proxy/broker.coffee b/proxy/broker.coffee index acd5a5f..b196df5 100644 --- a/proxy/broker.coffee +++ b/proxy/broker.coffee @@ -17,6 +17,7 @@ class Broker clients: 0 id: null + request: null # When interacting with the Broker, snowflake must generate a unique session # ID so the Broker can keep track of which signalling channel it's speaking @@ -34,6 +35,7 @@ class Broker getClientOffer: -> new Promise (fulfill, reject) => xhr = new XMLHttpRequest() + @request = xhr try xhr.open 'POST', @url + 'proxy' xhr.setRequestHeader('X-Session-ID', @id) diff --git a/proxy/spec/broker.spec.coffee b/proxy/spec/broker.spec.coffee new file mode 100644 index 0000000..2844cdb --- /dev/null +++ b/proxy/spec/broker.spec.coffee @@ -0,0 +1,38 @@ +### +jasmine tests for Snowflake broker +### + +# fake xhr +class XMLHttpRequest + open: -> + send: -> + onreadystatechange: -> + DONE: 1 + +describe 'Broker', -> + + it 'can be created', -> + b = new Broker('fake') + expect(b.url).toEqual 'https://fake/' + expect(b.id).not.toBeNull() + + it 'polls for client offer', (done) -> + b = new Broker('fake') + # TODO: fix this + poll = b.getClientOffer() + spyOn(b.request, 'open') + spyOn(b.request, 'send').and.callFake -> + b.onreadystatechange() + poll.then = -> + done() + expect(poll).not.toBeNull() + # expect(b.request.open).toHaveBeenCalled() + # expect(b.request.send).toHaveBeenCalled() + # fake successful poll + b.request.readyState = XMLHttpRequest.DONE + b.request.status = STATUS_OK + b.request.responseText = 'test' + done() + + it 'responds to the broker with answer', -> + # TODO

1 0