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

[flashproxy/master] Move appspot → appengine.
by dcf＠torproject.org 20 May '13

20 May '13

commit cee3dd3448edff1ceac3b263de8b753717f9bf1b Author: David Fifield <david(a)bamsoftware.com> Date: Sun May 19 19:33:00 2013 -0700 Move appspot → appengine. --- appengine/app.yaml | 9 +++++++++ appengine/fp.go | 37 +++++++++++++++++++++++++++++++++++++ appspot/app.yaml | 9 --------- appspot/fp.go | 37 ------------------------------------- 4 files changed, 46 insertions(+), 46 deletions(-) diff --git a/appengine/app.yaml b/appengine/app.yaml new file mode 100644 index 0000000..fa86e75 --- /dev/null +++ b/appengine/app.yaml @@ -0,0 +1,9 @@ +application: flashproxy-reg +version: 1 +runtime: go +api_version: go1 + +handlers: +- url: /(ip|reg/.+) + script: _go_app + secure: always diff --git a/appengine/fp.go b/appengine/fp.go new file mode 100644 index 0000000..93465c3 --- /dev/null +++ b/appengine/fp.go @@ -0,0 +1,37 @@ +package fp + +import ( + "fmt" + "net" + "net/http" + + "appengine" + "appengine/urlfetch" +) + +const BASE = "https://fp-facilitator.org/reg/" + +func ipHandler(w http.ResponseWriter, r *http.Request) { + remoteAddr := r.RemoteAddr + if net.ParseIP(remoteAddr).To4() == nil { + remoteAddr = "[" + remoteAddr + "]" + } + fmt.Fprintf(w, "%s", remoteAddr) +} + +func regHandler(w http.ResponseWriter, r *http.Request) { + c := appengine.NewContext(r) + blob := r.URL.Path[5:] + client := urlfetch.Client(c) + _, err := client.Get(BASE + blob) + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + fmt.Fprintf(w, "Thanks.") +} + +func init() { + http.HandleFunc("/ip", ipHandler) + http.HandleFunc("/reg/", regHandler) +} diff --git a/appspot/app.yaml b/appspot/app.yaml deleted file mode 100644 index fa86e75..0000000 --- a/appspot/app.yaml +++ /dev/null @@ -1,9 +0,0 @@ -application: flashproxy-reg -version: 1 -runtime: go -api_version: go1 - -handlers: -- url: /(ip|reg/.+) - script: _go_app - secure: always diff --git a/appspot/fp.go b/appspot/fp.go deleted file mode 100644 index 93465c3..0000000 --- a/appspot/fp.go +++ /dev/null @@ -1,37 +0,0 @@ -package fp - -import ( - "fmt" - "net" - "net/http" - - "appengine" - "appengine/urlfetch" -) - -const BASE = "https://fp-facilitator.org/reg/" - -func ipHandler(w http.ResponseWriter, r *http.Request) { - remoteAddr := r.RemoteAddr - if net.ParseIP(remoteAddr).To4() == nil { - remoteAddr = "[" + remoteAddr + "]" - } - fmt.Fprintf(w, "%s", remoteAddr) -} - -func regHandler(w http.ResponseWriter, r *http.Request) { - c := appengine.NewContext(r) - blob := r.URL.Path[5:] - client := urlfetch.Client(c) - _, err := client.Get(BASE + blob) - if err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) - return - } - fmt.Fprintf(w, "Thanks.") -} - -func init() { - http.HandleFunc("/ip", ipHandler) - http.HandleFunc("/reg/", regHandler) -}

1 0

[flashproxy/master] Add minimal appengine README.
by dcf＠torproject.org 20 May '13

20 May '13

commit afeb7a5ff867de7e636a0d49150391d07264c22b Author: David Fifield <david(a)bamsoftware.com> Date: Sun May 19 19:39:12 2013 -0700 Add minimal appengine README. --- appengine/README | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/appengine/README b/appengine/README new file mode 100644 index 0000000..00d0611 --- /dev/null +++ b/appengine/README @@ -0,0 +1,11 @@ +This is the server-side code that runs on Google App Engine for the +"appspot" registration method. + +See doc/appengine-howto.txt for information about setting up an +application. + +To run with the development server: +$ ~/google_appengine/dev_appserver.py appengine/ + +To upload a new version: +$ torify ~/google_appengine/appcfg.py update appengine/

1 0

[torbirdy/master] Add Danish translation
by sukhbir＠torproject.org 20 May '13

20 May '13

commit 98409388a1d6bb3db87a738a5c2aece5838002f1 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon May 20 00:43:00 2013 -0400 Add Danish translation --- ChangeLog | 1 + chrome.manifest | 1 + chrome/locale/da/torbirdy.dtd | 59 ++++++++++++++++++++++++++++++++++ chrome/locale/da/torbirdy.properties | 19 +++++++++++ 4 files changed, 80 insertions(+) diff --git a/ChangeLog b/ChangeLog index 25b4417..513421b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ Add Slovak translation (thanks to K0L0M4N) Add Turkish translation (thanks to bob939800) Add Swedish translation (thanks to Bjorn Schrammel) + Add Danish translation 0.1.1, 20 Mar 2013 Add a dialog for new users that is shown during the first-run (closes #8238) diff --git a/chrome.manifest b/chrome.manifest index a27feba..0cb6850 100644 --- a/chrome.manifest +++ b/chrome.manifest @@ -12,6 +12,7 @@ category profile-after-change TorBirdy @torproject.org/torbirdy;1 locale castironthunderbirdclub ar chrome/locale/ar/ locale castironthunderbirdclub cs chrome/locale/cs/ +locale castironthunderbirdclub da chrome/locale/da/ locale castironthunderbirdclub de chrome/locale/de/ locale castironthunderbirdclub el chrome/locale/el/ locale castironthunderbirdclub en chrome/locale/en/ diff --git a/chrome/locale/da/torbirdy.dtd b/chrome/locale/da/torbirdy.dtd new file mode 100644 index 0000000..30a1fc6 --- /dev/null +++ b/chrome/locale/da/torbirdy.dtd @@ -0,0 +1,59 @@ +<!ENTITY torbirdy.accountprefs.title "Account Configuration"> +<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup"> +<!ENTITY torbirdy.accountprefs.startup.key "C"> +<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every"> +<!ENTITY torbirdy.accountprefs.minutes.key "y"> +<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes"> +<!ENTITY torbirdy.accountprefs.cancel.button "Cancel"> +<!ENTITY torbirdy.accountprefs.save.button "Save"> +<!ENTITY torbirdy.accountprefs.save.key "S"> + +<!ENTITY torbirdy.prefs.title "TorBirdy Preferences"> +<!ENTITY torbirdy.prefs.save.button "Save"> +<!ENTITY torbirdy.prefs.save.key "s"> +<!ENTITY torbirdy.prefs.cancel.button "Cancel"> +<!ENTITY torbirdy.prefs.extra2.button "Test Settings"> +<!ENTITY torbirdy.prefs.extra2.key "n"> +<!ENTITY torbirdy.prefs.proxy.label "Proxy Settings"> +<!ENTITY torbirdy.prefs.privacy.label "Privacy Settings"> +<!ENTITY torbirdy.prefs.enigmail.label "Enigmail Settings"> +<!ENTITY torbirdy.prefs.security.label "Security Settings"> +<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)"> +<!ENTITY torbirdy.prefs.recommended.key "r"> +<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service"> +<!ENTITY torbirdy.prefs.anonservice.key "a"> +<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings"> +<!ENTITY torbirdy.prefs.customsettings.key "c"> +<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: "> +<!ENTITY torbirdy.prefs.socks_host.key "h"> +<!ENTITY torbirdy.prefs.socks_port.label "Port: "> +<!ENTITY torbirdy.prefs.socks_port.key "p"> +<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)"> +<!ENTITY torbirdy.prefs.torification.key "t"> +<!ENTITY torbirdy.prefs.global "Global"> +<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]"> +<!ENTITY torbirdy.prefs.imap.key "i"> +<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled, select Local Folders]"> +<!ENTITY torbirdy.prefs.startup_folder.key "l"> +<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]"> +<!ENTITY torbirdy.prefs.timezone.key "z"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Put the recipient key IDs into encrypted messages [default: do not put]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> +<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]"> +<!ENTITY torbirdy.prefs.confirmemail.key "m"> +<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]"> +<!ENTITY torbirdy.prefs.emailwizard.key "w"> +<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]"> +<!ENTITY torbirdy.prefs.renegotiation.key "r"> +<!ENTITY torbirdy.prefs.account_specific "Account-Specific"> +<!ENTITY torbirdy.prefs.select_account.key "C"> +<!ENTITY torbirdy.prefs.select_account.label "Choose an account: "> +<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: "> +<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k"> + +<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router"> +<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)"> +<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix"> +<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences"> + +<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run"> diff --git a/chrome/locale/da/torbirdy.properties b/chrome/locale/da/torbirdy.properties new file mode 100644 index 0000000..ddb8805 --- /dev/null +++ b/chrome/locale/da/torbirdy.properties @@ -0,0 +1,19 @@ +torbirdy.name=TorBirdy + +torbirdy.enabled.tor=TorBirdy aktiveret: Tor +torbirdy.enabled.jondo=TorBirdy aktiveret: JonDo +torbirdy.enabled.custom=TorBirdy aktiveret: Tilpasset proxy +torbirdy.enabled.torification=TorBirdy aktiveret: Gennemsigtig torifikation +torbirdy.enabled.whonix=TorBirdy aktiveret: Whonix +torbirdy.disabled=TorBirdy: Deaktiveret! + +torbirdy.email.prompt=TorBirdy har deaktiveret Thunderbirds automatiske konfigurationsguide for at beskytte din anonymitet.\n\nDen anbefalede sikkerhedsindstilling for %S er blevet sat.\n\nDu kan nu konfigurere de andre kontoindstillinger manuelt. + +torbirdy.email.advanced=Bemærk venligst at ændring af de avancerede indstillinger for TorBirdy IKKE er anbefalet.\n\nDu bør kun fortsætte, hvis du er sikker på hvad du gør. +torbirdy.email.advanced.nextwarning=Vis denne advarsel næste gang +torbirdy.email.advanced.title=TorBirdy - avancerede indstillinger + +torbirdy.restart=For at tidszonepræferencen træder i kraft, så luk venligst Thunderbird og start den igen. + +torbirdy.firstrun=Du kører nu TorBirdy.\n\nFor at beskytte din anonymitet, vil TorBirdy med tvang benytte sine egne Thunderbirdindstillinger, så de forhindres i at blive ændret af dig eller eventuelle tilføjelser. Der er nogle ændringer som kan ændres og disse tilgås via TorBirdys dialog for præferencer. Når TorBirdy afinstalleres eller deaktiveres, bliver alle indstillinger programmet bruger nulstillet til deres standardværdi (værdierne før TorBirdys installation).\n\nHvis du er ny bruger, så anbefales det at du læser TorBirdys hjemmeside for at forstå hvad vi forsøger at opnå med TorBirdy for vores brugere. +torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy

1 0

[torbirdy/master] Update hu and pt-BR translations
by sukhbir＠torproject.org 20 May '13

20 May '13

commit 37e55b5e78fbe902f64f55ff3cb41b280e9cb521 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sun May 19 21:10:43 2013 -0400 Update hu and pt-BR translations --- chrome/locale/hu/torbirdy.properties | 6 +++--- chrome/locale/pt-BR/torbirdy.properties | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/chrome/locale/hu/torbirdy.properties b/chrome/locale/hu/torbirdy.properties index 11f1eba..6afc488 100644 --- a/chrome/locale/hu/torbirdy.properties +++ b/chrome/locale/hu/torbirdy.properties @@ -4,7 +4,7 @@ torbirdy.enabled.tor=TorBirdy Bekapcsolva: Tor torbirdy.enabled.jondo=TorBirdy Bekapcsolva: JonDo torbirdy.enabled.custom=TorBirdy Bekapcsolva: Egyedi Proxy torbirdy.enabled.torification=TorBirdy Bekapcsolva: Átlátszó Torosítás -torbirdy.enabled.whonix=TorBirdy Bekapcsolva: Whonix +torbirdy.enabled.whonix=TorBirdy Bekapcsolva: Whonix torbirdy.disabled=TorBirdy: Kikapcsolva! torbirdy.email.prompt=A TorBirdy kikapcoslta a Thunderbird automatikus konfigurációs varázslóját a névtelensége megőrzése érdekében\n\nAz ajánlott biztonsági beállítások a %S részére beállításra kerültek.\n\nMost már beállíthatja a további fiók beállításokat kézzel. @@ -13,7 +13,7 @@ torbirdy.email.advanced=Kérjük jegyezze meg, hogy a TorBirdy Speciális beáll torbirdy.email.advanced.nextwarning=A figyelmeztetés mutatása legközelebb is. torbirdy.email.advanced.title=TorBirdy Speciális beállítások -torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again. +torbirdy.restart=Az időzóna beállítások életbe lépéshez zárja be, majd indítsa el újra a Thunderbird-öt. -torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users. +torbirdy.firstrun=Most futtatja a TorBirdy-t.\n\nAz anonimitásának biztosításához a TorBirdy erőlteti a Thunderbird beállításokat, amit beállított, hogy megóvj azokat attól, hogy Ön vagy egy add-on megváltoztathassa azt. Néhány beállítás változtatható, és azok elérhetők a TorBirdy beállítások ablakában. Ha a TorBirdy eltávolításra vagy kikapcsolásra kerül, minden beállítás, amit átállít, visszaáll a korábbi értékekre (az értékekre, amelyek a TorBirdy telepítése előtt voltak).\n\nHa új felhasználó, javasoljuk, hogy olvassa el a TorBirdy weboldalát, és próbálja megérteni, hogy mit is próbálunk a TorBirdy-vel nyújtani a felhasználóinknak. torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy diff --git a/chrome/locale/pt-BR/torbirdy.properties b/chrome/locale/pt-BR/torbirdy.properties index 1886e92..73d3092 100644 --- a/chrome/locale/pt-BR/torbirdy.properties +++ b/chrome/locale/pt-BR/torbirdy.properties @@ -16,4 +16,4 @@ torbirdy.email.advanced.title=Configurações Avançadas do TorBirdy torbirdy.restart=Para que as configurações de fuso horário tenham efeito, por favor reinicie o Thunderbird. torbirdy.firstrun=Você agora está executando o TorBirdy.\n\nPara melhorar a sua anonimidade o TorBirdy irá forçar as configurações do Thunderbird que ele criou, prevenindo que ela seja modificada por você ou por um acessório. Há algumas configurações que podem ser modificadas através das preferências do TorBirdy. Quando o TorBirdy for removido ou desativado, todas suas configurações são restauradas a seus valores padrões (os valores anteriores ao TorBirdy ser instalado)\n\nSe você for um novo usuário, recomenda-se que leia a página do TorBirdy para entender o que estamos almejando para nossos usuários com o TorBirdy. -torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy +# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy

1 0

[flashproxy/master] Bracket IPv6 addresses returned from appspot.
by dcf＠torproject.org 20 May '13

20 May '13

commit d837ddd690fb976e31f4ec87546072cd2f0c84ae Author: Arlo Breault <arlolra(a)gmail.com> Date: Sun May 19 11:04:24 2013 -0700 Bracket IPv6 addresses returned from appspot. --- appspot/fp.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/appspot/fp.go b/appspot/fp.go index ea19c89..93465c3 100644 --- a/appspot/fp.go +++ b/appspot/fp.go @@ -2,6 +2,7 @@ package fp import ( "fmt" + "net" "net/http" "appengine" @@ -11,7 +12,11 @@ import ( const BASE = "https://fp-facilitator.org/reg/" func ipHandler(w http.ResponseWriter, r *http.Request) { - fmt.Fprintf(w, "%s", r.RemoteAddr) + remoteAddr := r.RemoteAddr + if net.ParseIP(remoteAddr).To4() == nil { + remoteAddr = "[" + remoteAddr + "]" + } + fmt.Fprintf(w, "%s", remoteAddr) } func regHandler(w http.ResponseWriter, r *http.Request) {

1 0

[stem/master] Mocking's sign_descriptor_content() incompatible with python 3.x
by atagar＠torproject.org 20 May '13

20 May '13

commit ba50df27f2b69e05ce3470c4c1127974420a93bc Author: Damian Johnson <atagar(a)torproject.org> Date: Sun May 19 14:11:39 2013 -0700 Mocking's sign_descriptor_content() incompatible with python 3.x I didn't have a python 3.x copy of pycrypto installed, so there were some code paths I didn't previously encounter. Unit tests failed due to sign_descriptor_content() not explicitly using bytes at several points. ====================================================================== ERROR: test_mirror_mirror_on_the_wall_4 ---------------------------------------------------------------------- Traceback: File "/home/atagar/Desktop/stem/test/data/python3/test/unit/tutorial.py", line 169, in test_mirror_mirror_on_the_wall_4 exit_descriptor = mocking.sign_descriptor_content(exit_descriptor) File "/home/atagar/Desktop/stem/test/data/python3/test/mocking.py", line 984, in sign_descriptor_content public_key_string = public_key_string[:64] + "\n" + public_key_string[64:128] + "\n" + public_key_string[128:] TypeError: can't concat bytes to str ---------------------------------------------------------------------- --- stem/control.py | 5 +++++ test/mocking.py | 63 +++++++++++++++++++++++++++++++++---------------------- 2 files changed, 43 insertions(+), 25 deletions(-) diff --git a/stem/control.py b/stem/control.py index 08ce196..a4dde55 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1166,6 +1166,11 @@ class Controller(BaseController): An exception is only raised if we weren't provided a default response. """ + # TODO: It would be great to add support for v3 router status entries. This + # is pending... + # + # https://trac.torproject.org/7953 + try: if stem.util.tor_tools.is_valid_fingerprint(relay): query = "ns/id/%s" % relay diff --git a/test/mocking.py b/test/mocking.py index 340a625..50a0f0e 100644 --- a/test/mocking.py +++ b/test/mocking.py @@ -954,13 +954,14 @@ def get_network_status_document_v3(attr = None, exclude = (), authorities = None def sign_descriptor_content(desc_content): """ Add a valid signature to the supplied descriptor string. - If the python-crypto library is available the function will generate a key - pair, and use it to sign the descriptor string. Any existing fingerprint, - signing-key or router-signature data will be overwritten. - If crypto is unavailable the code will return the unaltered descriptor - string. - :param string desc_content: the descriptor string to sign - :returns: a descriptor string, signed if crypto available, unaltered otherwise + + If pycrypto is available the function will generate a key pair, and use it to + sign the descriptor string. Any existing fingerprint, signing-key or + router-signature data will be overwritten. If the library's unavailable the + code will return the unaltered descriptor. + + :param str desc_content: the descriptor string to sign + :returns: a descriptor string, signed if crypto available and unaltered otherwise """ if not stem.prereq.is_crypto_available(): @@ -981,13 +982,17 @@ def sign_descriptor_content(desc_content): public_key_string = base64.b64encode(seq_as_string) # split public key into lines 64 characters long - public_key_string = public_key_string[:64] + "\n" + public_key_string[64:128] + "\n" + public_key_string[128:] + public_key_string = b'\n'.join([ + public_key_string[:64], + public_key_string[64:128], + public_key_string[128:], + ]) # generate the new signing key string - signing_key_token = "\nsigning-key\n" # note the trailing '\n' is important here so as not to match the string elsewhere - signing_key_token_start = "-----BEGIN RSA PUBLIC KEY-----\n" - signing_key_token_end = "\n-----END RSA PUBLIC KEY-----\n" + signing_key_token = b"\nsigning-key\n" # note the trailing '\n' is important here so as not to match the string elsewhere + signing_key_token_start = b"-----BEGIN RSA PUBLIC KEY-----\n" + signing_key_token_end = b"\n-----END RSA PUBLIC KEY-----\n" new_sk = signing_key_token + signing_key_token_start + public_key_string + signing_key_token_end # update the descriptor string with the new signing key @@ -998,25 +1003,25 @@ def sign_descriptor_content(desc_content): # generate the new fingerprint string - key_hash = hashlib.sha1(seq_as_string).hexdigest().upper() - grouped_fingerprint = "" + key_hash = stem.util.str_tools._to_bytes(hashlib.sha1(seq_as_string).hexdigest().upper()) + grouped_fingerprint = b"" for x in range(0, len(key_hash), 4): - grouped_fingerprint += " " + key_hash[x:x + 4] - fingerprint_token = "\nfingerprint" + grouped_fingerprint += b" " + key_hash[x:x + 4] + fingerprint_token = b"\nfingerprint" new_fp = fingerprint_token + grouped_fingerprint # update the descriptor string with the new fingerprint ft_start = desc_content.find(fingerprint_token) if ft_start < 0: - fingerprint_token = "\nopt fingerprint" + fingerprint_token = b"\nopt fingerprint" ft_start = desc_content.find(fingerprint_token) # if the descriptor does not already contain a fingerprint do not add one if ft_start >= 0: - ft_end = desc_content.find("\n", ft_start + 1) + ft_end = desc_content.find(b"\n", ft_start + 1) desc_content = desc_content[:ft_start] + new_fp + desc_content[ft_end:] # create a temporary object to use to calculate the digest @@ -1029,31 +1034,39 @@ def sign_descriptor_content(desc_content): # remove the hex encoding - new_digest = new_digest_hex.decode('hex') + if stem.prereq.is_python_3(): + new_digest = bytes.fromhex(new_digest_hex) + else: + new_digest = new_digest_hex.decode('hex_codec') # Generate the digest buffer. # block is 128 bytes in size # 2 bytes for the type info # 1 byte for the separator - padding = "" + padding = b"" for x in range(125 - len(new_digest)): - padding += '\xFF' - digestBuffer = '\x00\x01' + padding + '\x00' + new_digest + padding += b'\xFF' + digestBuffer = b'\x00\x01' + padding + b'\x00' + new_digest # generate a new signature by signing the digest buffer with the private key (signature, ) = private_key.sign(digestBuffer, None) signature_as_bytes = long_to_bytes(signature, 128) signature_base64 = base64.b64encode(signature_as_bytes) - signature_base64 = signature_base64[:64] + "\n" + signature_base64[64:128] + "\n" + signature_base64[128:] + + signature_base64 = b'b'.join([ + signature_base64[:64], + signature_base64[64:128], + signature_base64[128:], + ]) # update the descriptor string with the new signature - router_signature_token = "\nrouter-signature\n" - router_signature_start = "-----BEGIN SIGNATURE-----\n" - router_signature_end = "\n-----END SIGNATURE-----\n" + router_signature_token = b"\nrouter-signature\n" + router_signature_start = b"-----BEGIN SIGNATURE-----\n" + router_signature_end = b"\n-----END SIGNATURE-----\n" rst_start = desc_content.find(router_signature_token) desc_content = desc_content[:rst_start] + router_signature_token + router_signature_start + signature_base64 + router_signature_end

1 0

[stem/master] Minor simplifications for dependency module
by atagar＠torproject.org 20 May '13

20 May '13

commit b816137fc07d139808dd80a410eba04fd662fdba Author: Damian Johnson <atagar(a)torproject.org> Date: Sun May 19 12:52:30 2013 -0700 Minor simplifications for dependency module When we dropped python 2.5 support our _check_version() only had a single caller, making it not a very helpful helper. We were also missing pydocs for is_crypto_available(). --- stem/prereq.py | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/stem/prereq.py b/stem/prereq.py index 6017402..2104cd5 100644 --- a/stem/prereq.py +++ b/stem/prereq.py @@ -40,25 +40,33 @@ def check_requirements(): def is_python_27(): """ - Checks if we're running python 2.7 or above. + Checks if we're running python 2.7 or above (including the 3.x series). - :returns: bool that is True if we meet this requirement and False otherwise + :returns: **True** if we meet this requirement and **False** otherwise """ - return _check_version(7) + major_version, minor_version = sys.version_info[0:2] + + return major_version > 2 or (major_version == 2 and minor_version >= 7) def is_python_3(): """ Checks if we're in the 3.0 - 3.x range. - :returns: bool that is True if we meet this requirement and False otherwise + :returns: **True** if we meet this requirement and **False** otherwise """ return sys.version_info[0] == 3 def is_crypto_available(): + """ + Checks if the pycrypto functions we use are available. + + :returns: **True** if we can use pycrypto and **False** otherwise + """ + global IS_CRYPTO_AVAILABLE if IS_CRYPTO_AVAILABLE is None: @@ -73,18 +81,7 @@ def is_crypto_available(): IS_CRYPTO_AVAILABLE = False # the code that verifies relay descriptor signatures uses the python-crypto library - msg = "Unable to import the crypto module. Because of this we'll be unable to verify descriptor signature integrity." + msg = "Unable to import the pycrypto module. Because of this we'll be unable to verify descriptor signature integrity. You can get pycrypto from: https://www.dlitz.net/software/pycrypto/" log.log_once("stem.prereq.is_crypto_available", log.INFO, msg) return IS_CRYPTO_AVAILABLE - - -def _check_version(minor_req): - major_version, minor_version = sys.version_info[0:2] - - if major_version > 2: - return True - elif major_version < 2 or minor_version < minor_req: - return False - - return True

1 0

[stem/master] Using a real descriptor for test_non_ascii_descriptor
by atagar＠torproject.org 20 May '13

20 May '13

commit 525f2f9cee559fb8b77cb8daf46c68737487c63b Author: Damian Johnson <atagar(a)torproject.org> Date: Sun May 19 14:59:41 2013 -0700 Using a real descriptor for test_non_ascii_descriptor Our test_non_ascii_descriptor test used an altered descriptor with katakana (Japanese characters) in its contact line. When we use doctored descriptors we can no longer exercise _validate_content since the signature won't match. Replacing the example descriptor with the one that's causing issues in #8755. --- test/integ/descriptor/data/non-ascii_descriptor | 34 +++++++++++------------ test/integ/descriptor/server_descriptor.py | 30 ++++++++++---------- 2 files changed, 31 insertions(+), 33 deletions(-) diff --git a/test/integ/descriptor/data/non-ascii_descriptor b/test/integ/descriptor/data/non-ascii_descriptor index eb3e31a..da1d8a5 100644 --- a/test/integ/descriptor/data/non-ascii_descriptor +++ b/test/integ/descriptor/data/non-ascii_descriptor @@ -1,30 +1,30 @@ @type server-descriptor 1.0 -router torrelay389752132 130.243.230.116 9001 0 0 -platform Tor 0.2.2.35 (git-4f42b0a93422f70e) on Linux x86_64 +router Coruscant 88.182.161.122 9001 0 9030 +platform Tor 0.2.3.25 on Linux opt protocols Link 1 2 Circuit 1 -published 2012-03-21 16:28:14 -opt fingerprint 5D47 E91A 1F74 21A4 E325 5F4D 04E5 34E9 A214 07BB -uptime 3103848 -bandwidth 81920 102400 84275 -opt extra-info-digest 51E9FD0DA7C235D8C0250BAFB6E1ABB5F1EF9F04 +published 2013-05-18 11:16:19 +opt fingerprint 0B98 2154 5C48 E496 AEED 9ECC 0DB5 06C4 9FF8 158D +uptime 259738 +bandwidth 102400 204800 122818 +opt extra-info-digest 56403D838DE152421CD401B8E57DAD4483A3D56B onion-key -----BEGIN RSA PUBLIC KEY----- -MIGJAoGBAKTHzdEAocB7JhpB5iDaNYgHujJ+0mtoahZOAqgZ5BWVjw8fwt0UXEtO -BRPzNigNyAP1UWKHvgelBy49wvuC9twoBejCCYjcu9z2RmbBvYcyZRzphvHJqBpW -k3Rx75up+wsuBzhfwSYr7W+T+WkDQvz49RFPpns6Ef0qFpQ1TlHxAgMBAAE= +MIGJAoGBAK+rjPilZJVzvWn6slOpak4eUab+VXiGNkRAIKgGAqbpex7lNMcZeXbu +8uYhiDUdjRaHQUbBjLaj6nAjtlHUl3NCbIpo2p03KEcxfAGi3k6dUMBJ7aIYb8lL +SDK95huLBpyyNPikeDIiTKS1HNtmrai/iVtUiJS2I4fs3lP1TxevAgMBAAE= -----END RSA PUBLIC KEY----- signing-key -----BEGIN RSA PUBLIC KEY----- -MIGJAoGBALRHQWXGjGLNROY8At3dMnrcSxw4PF/9oLYuqCsXNAq0Gju+EBA5qfM4 -AMpeOk+7ZsZ6AsjdBPAPaOf7hm+z6Kr3Am/gC43dci+iuNHf2wYLR8TnW/C5Q6ZQ -iXpSAGrOHnIptyPHa0j9ayM4WmHWrPBKnC0QA91CGrxnnNc6DHehAgMBAAE= +MIGJAoGBANGDDMHoCtTeL4UTEGip4T+37jd4lEjBgla7lgL8W1gtVTX/uMMo+HGE +m1sD/FgBI3w8w7zpZlJgYeB/94YPUrw11iAEYAooJVmGDmel2g6CFofDs7KmrzqR +1FQDIWeY9sQd4+L+jWMquqcA3FyzuZz28gi56hIombjkfr0RwCsNAgMBAAE= -----END RSA PUBLIC KEY----- opt hidden-service-dir -contact 2048R/F171EC1F Johan Blåbäck こんにちは +contact 1024D/04D2E818 Lénaïc Huard <lenaic dot huard AT laposte dot net> reject *:* router-signature -----BEGIN SIGNATURE----- -WqBgiomhJ+XewpbOGg1r+6KXlAkdxHRhgCB/D980yJVzXWbOCrRhwyyAH9Lx+yrK -1EFXAtfQBBx2hmsw8CSYuUT6ckjXyUBAKEdABC25yRdi+fN3NfSQd56U9MvArjo9 -Y8oz244gH4BSVp4CScL8dK0EUsUrAxjs+OU7bnV5saA= +hk4jKRtI0LbjYWdGhjTuev9Hk9AilyBmBtK9nfpBPyamQZDZVirEUuP7PdtxM2U9 +EdCg+KnkrLoKoxh18YumBD2HvwHa2J1VZtezWkwxGB+HPkECTU/byl+dn6ZRncY7 +r0IrVeGUnlK/UaWpswx6amH7FEKXmBZYHxTxyuwwybQ= -----END SIGNATURE----- diff --git a/test/integ/descriptor/server_descriptor.py b/test/integ/descriptor/server_descriptor.py index 43c9d4d..7779951 100644 --- a/test/integ/descriptor/server_descriptor.py +++ b/test/integ/descriptor/server_descriptor.py @@ -192,36 +192,34 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= Parses a descriptor with non-ascii content. """ - test.mocking.mock_method(stem.descriptor.server_descriptor.RelayDescriptor, '_validate_content', test.mocking.no_op()) - descriptor_file = open(get_resource("non-ascii_descriptor"), 'rb') - expected_contact = b"2048R/F171EC1F Johan Bl\xc3\xa5b\xc3\xa4ck \xe3\x81\x93\xe3\x82\x93\xe3\x81\xab\xe3\x81\xa1\xe3\x81\xaf" + expected_contact = b"1024D/04D2E818 L\xc3\xa9na\xc3\xafc Huard <lenaic dot huard AT laposte dot net>" desc = next(stem.descriptor.parse_file(descriptor_file, "server-descriptor 1.0")) - self.assertEquals("torrelay389752132", desc.nickname) - self.assertEquals("5D47E91A1F7421A4E3255F4D04E534E9A21407BB", desc.fingerprint) - self.assertEquals("130.243.230.116", desc.address) + self.assertEquals("Coruscant", desc.nickname) + self.assertEquals("0B9821545C48E496AEED9ECC0DB506C49FF8158D", desc.fingerprint) + self.assertEquals("88.182.161.122", desc.address) self.assertEquals(9001, desc.or_port) self.assertEquals(None, desc.socks_port) - self.assertEquals(None, desc.dir_port) - self.assertEquals(b"Tor 0.2.2.35 (git-4f42b0a93422f70e) on Linux x86_64", desc.platform) - self.assertEquals(stem.version.Version("0.2.2.35"), desc.tor_version) - self.assertEquals("Linux x86_64", desc.operating_system) - self.assertEquals(3103848, desc.uptime) - self.assertEquals(datetime.datetime(2012, 3, 21, 16, 28, 14), desc.published) + self.assertEquals(9030, desc.dir_port) + self.assertEquals(b"Tor 0.2.3.25 on Linux", desc.platform) + self.assertEquals(stem.version.Version("0.2.3.25"), desc.tor_version) + self.assertEquals("Linux", desc.operating_system) + self.assertEquals(259738, desc.uptime) + self.assertEquals(datetime.datetime(2013, 5, 18, 11, 16, 19), desc.published) self.assertEquals(expected_contact, desc.contact) self.assertEquals(["1", "2"], desc.link_protocols) self.assertEquals(["1"], desc.circuit_protocols) self.assertEquals(False, desc.hibernating) self.assertEquals(False, desc.allow_single_hop_exits) self.assertEquals(False, desc.extra_info_cache) - self.assertEquals("51E9FD0DA7C235D8C0250BAFB6E1ABB5F1EF9F04", desc.extra_info_digest) + self.assertEquals("56403D838DE152421CD401B8E57DAD4483A3D56B", desc.extra_info_digest) self.assertEquals(["2"], desc.hidden_service_dir) self.assertEquals(set(), desc.family) - self.assertEquals(81920, desc.average_bandwidth) - self.assertEquals(102400, desc.burst_bandwidth) - self.assertEquals(84275, desc.observed_bandwidth) + self.assertEquals(102400, desc.average_bandwidth) + self.assertEquals(204800, desc.burst_bandwidth) + self.assertEquals(122818, desc.observed_bandwidth) self.assertEquals(stem.exit_policy.ExitPolicy("reject *:*"), desc.exit_policy) self.assertEquals([], desc.get_unrecognized_lines())

1 0

[stem/master] Revise approach to owning Tor in integ tests
by atagar＠torproject.org 19 May '13

19 May '13

commit b626f0c5156e8f5d2a89558ce54890b931648758 Author: Jeremy <saturn5971(a)gmail.com> Date: Sat May 18 22:08:57 2013 -0400 Revise approach to owning Tor in integ tests The integ tests now only try to own the Tor process via control connection if controllers have a way to access Tor. This is needed to successfully run under the RUN_NONE target. --- run_tests.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/run_tests.py b/run_tests.py index b59b405..67c9a1d 100755 --- a/run_tests.py +++ b/run_tests.py @@ -185,10 +185,16 @@ def main(): println("Running tests...\n", STATUS) - with integ_runner.get_tor_controller(True): # Controller to own our main tor process - for test_class in test.util.get_integ_tests(args.test_prefix): - run_result = _run_test(test_class, output_filters, logging_buffer) - skipped_tests += len(getattr(run_result, 'skipped', [])) + owner = None + if integ_runner.is_accessible(): + owner = integ_runner.get_tor_controller(True) # controller to own our main Tor process + + for test_class in test.util.get_integ_tests(args.test_prefix): + run_result = _run_test(test_class, output_filters, logging_buffer) + skipped_tests += len(getattr(run_result, 'skipped', [])) + + if owner: + owner.close() # We should have joined on all threads. If not then that indicates a # leak that could both likely be a bug and disrupt further targets.

1 0

[flashproxy/master] Typo.
by dcf＠torproject.org 19 May '13

19 May '13

commit 433072841fd8710e32c68a0bad4a14ff6a91726a Author: David Fifield <david(a)bamsoftware.com> Date: Sun May 19 09:14:43 2013 -0700 Typo. --- flashproxy-client | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flashproxy-client b/flashproxy-client index 863c74f..fe15f0b 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -964,12 +964,12 @@ def build_register_command(method): elif options.address_family == socket.AF_INET6: af = ["-6"] if method == "appspot": - command = [os.path.join(script_dir, "flashproxy-reg-appspot"] + af + command = [os.path.join(script_dir, "flashproxy-reg-appspot")] + af if options.facilitator_pubkey_filename is not None: command += ["--facilitator-pubkey", options.facilitator_pubkey_filename] return command elif method == "email": - command = [os.path.join(script_dir, "flashproxy-reg-email"] + af + command = [os.path.join(script_dir, "flashproxy-reg-email")] + af if options.facilitator_pubkey_filename is not None: command += ["--facilitator-pubkey", options.facilitator_pubkey_filename] return command

1 0