October 2014 - tor-commits - lists.torproject.org

[obfs4/master] Do the release ritual for obfs4proxy-0.0.3.
by yawning＠torproject.org 01 Oct '14

01 Oct '14

commit fc00015ee266eed17703be114543eecdde7bc818 Author: Yawning Angel <yawning(a)torproject.org> Date: Wed Oct 1 19:29:22 2014 +0000 Do the release ritual for obfs4proxy-0.0.3. --- ChangeLog | 2 +- obfs4proxy/obfs4proxy.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8fc2275..19b5f7f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Changes in version 0.0.3 - UNRELEASED +Changes in version 0.0.3 - 2014-10-01 - Change the obfs4 bridge line format to use a "cert" argument instead of the previous "node-id" and "public-key" arguments. The "cert" consists of the Base64 encoded concatenation of the node ID and public key, with the diff --git a/obfs4proxy/obfs4proxy.go b/obfs4proxy/obfs4proxy.go index 20ad89a..5c93053 100644 --- a/obfs4proxy/obfs4proxy.go +++ b/obfs4proxy/obfs4proxy.go @@ -51,7 +51,7 @@ import ( ) const ( - obfs4proxyVersion = "0.0.2" + obfs4proxyVersion = "0.0.3" obfs4proxyLogFile = "obfs4proxy.log" socksAddr = "127.0.0.1:0" elidedAddr = "[scrubbed]"

1 0

[obfs4/master] Change the bridge line format to be more compact.
by yawning＠torproject.org 01 Oct '14

01 Oct '14

commit 6cd81ec42f203585c59e610dc16728cb0a5d1455 Author: Yawning Angel <yawning(a)torproject.org> Date: Wed Oct 1 19:00:30 2014 +0000 Change the bridge line format to be more compact. Instead of "node-id" and "public-key" that are Base16 encoded, use "cert" which contains the "node-id" and "public-key" in Base64 encoded form. This is more compact and cuts the length down by 49 characters. --- ChangeLog | 7 ++++++ README.md | 4 +-- transports/obfs4/obfs4.go | 51 ++++++++++++++++++++++++------------- transports/obfs4/statefile.go | 56 ++++++++++++++++++++++++++++++++++++++--- 4 files changed, 94 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5fa836d..8fc2275 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Changes in version 0.0.3 - UNRELEASED + - Change the obfs4 bridge line format to use a "cert" argument instead of the + previous "node-id" and "public-key" arguments. The "cert" consists of the + Base64 encoded concatenation of the node ID and public key, with the + trailing padding removed. Old style separated bridge lines are still valid, + but the newer representation is slightly more compact. + Changes in version 0.0.2 - 2014-09-26 - Write an example client bridge line suitable for use with the running obfs4 server instance to "obfs4_bridgeline.txt" for the convenience of bridge diff --git a/README.md b/README.md index fdcb34b..40d092d 100644 --- a/README.md +++ b/README.md @@ -82,8 +82,8 @@ ServerTransportPlugin obfs4 exec /usr/local/bin/obfs4proxy appropriate. * The autogenerated obfs4 bridge parameters are placed in - `DataDir/pt_state/obfs4_state.json`. An obfs4 bridge line requires the - `node-id`, `public-key` and `iat-mode` arguments. + `DataDir/pt_state/obfs4_state.json`. To ease deployment, the client side + bridge line is written to `DataDir/pt_state/obfs4_bridgeline.txt`. ### Thanks diff --git a/transports/obfs4/obfs4.go b/transports/obfs4/obfs4.go index b862e5a..256f549 100644 --- a/transports/obfs4/obfs4.go +++ b/transports/obfs4/obfs4.go @@ -57,6 +57,7 @@ const ( privateKeyArg = "private-key" seedArg = "drbg-seed" iatArg = "iat-mode" + certArg = "cert" biasCmdArg = "obfs4-distBias" @@ -122,8 +123,7 @@ func (t *Transport) ServerFactory(stateDir string, args *pt.Args) (base.ServerFa // Store the arguments that should appear in our descriptor for the clients. ptArgs := pt.Args{} - ptArgs.Add(nodeIDArg, st.nodeID.Hex()) - ptArgs.Add(publicKeyArg, st.identityKey.Public().Hex()) + ptArgs.Add(certArg, st.cert.String()) ptArgs.Add(iatArg, strconv.Itoa(st.iatMode)) // Initialize the replay filter. @@ -154,15 +154,39 @@ func (cf *obfs4ClientFactory) Transport() base.Transport { func (cf *obfs4ClientFactory) ParseArgs(args *pt.Args) (interface{}, error) { var err error - // Handle the arguments. - nodeIDStr, ok := args.Get(nodeIDArg) - if !ok { - return nil, fmt.Errorf("missing argument '%s'", nodeIDArg) - } var nodeID *ntor.NodeID - if nodeID, err = ntor.NodeIDFromHex(nodeIDStr); err != nil { - return nil, err + var publicKey *ntor.PublicKey + + // The "new" (version >= 0.0.3) bridge lines use a unified "cert" argument + // for the Node ID and Public Key. + certStr, ok := args.Get(certArg) + if ok { + var cert *obfs4ServerCert + if cert, err = serverCertFromString(certStr); err != nil { + return nil, err + } + nodeID, publicKey = cert.unpack() + } else { + // The "old" style (version <= 0.0.2) bridge lines use separate Node ID + // and Public Key arguments in Base16 encoding and are a UX disaster. + nodeIDStr, ok := args.Get(nodeIDArg) + if !ok { + return nil, fmt.Errorf("missing argument '%s'", nodeIDArg) + } + if nodeID, err = ntor.NodeIDFromHex(nodeIDStr); err != nil { + return nil, err + } + + publicKeyStr, ok := args.Get(publicKeyArg) + if !ok { + return nil, fmt.Errorf("missing argument '%s'", publicKeyArg) + } + if publicKey, err = ntor.PublicKeyFromHex(publicKeyStr); err != nil { + return nil, err + } } + + // IAT config is common across the two bridge line formats. iatStr, ok := args.Get(iatArg) if !ok { return nil, fmt.Errorf("missing argument '%s'", iatArg) @@ -173,15 +197,6 @@ func (cf *obfs4ClientFactory) ParseArgs(args *pt.Args) (interface{}, error) { return nil, fmt.Errorf("invalid iat-mode '%d'", iatMode) } - publicKeyStr, ok := args.Get(publicKeyArg) - if !ok { - return nil, fmt.Errorf("missing argument '%s'", publicKeyArg) - } - var publicKey *ntor.PublicKey - if publicKey, err = ntor.PublicKeyFromHex(publicKeyStr); err != nil { - return nil, err - } - // Generate the session key pair before connectiong to hide the Elligator2 // rejection sampling from network observers. sessionKey, err := ntor.NewKeypair(true) diff --git a/transports/obfs4/statefile.go b/transports/obfs4/statefile.go index 1e00f32..0838180 100644 --- a/transports/obfs4/statefile.go +++ b/transports/obfs4/statefile.go @@ -28,12 +28,14 @@ package obfs4 import ( + "encoding/base64" "encoding/json" "fmt" "io/ioutil" "os" "path" "strconv" + "strings" "git.torproject.org/pluggable-transports/goptlib.git" "git.torproject.org/pluggable-transports/obfs4.git/common/csrand" @@ -44,6 +46,9 @@ import ( const ( stateFile = "obfs4_state.json" bridgeFile = "obfs4_bridgeline.txt" + + certSuffix = "==" + certLength = ntor.NodeIDLength + ntor.PublicKeyLength ) type jsonServerState struct { @@ -54,11 +59,55 @@ type jsonServerState struct { IATMode int `json:"iat-mode"` } +type obfs4ServerCert struct { + raw []byte +} + +func (cert *obfs4ServerCert) String() string { + return strings.TrimSuffix(base64.StdEncoding.EncodeToString(cert.raw), certSuffix) +} + +func (cert *obfs4ServerCert) unpack() (*ntor.NodeID, *ntor.PublicKey) { + if len(cert.raw) != certLength { + panic(fmt.Sprintf("cert length %d is invalid", len(cert.raw))) + } + + nodeID, _ := ntor.NewNodeID(cert.raw[:ntor.NodeIDLength]) + pubKey, _ := ntor.NewPublicKey(cert.raw[ntor.NodeIDLength:]) + + return nodeID, pubKey +} + +func serverCertFromString(encoded string) (*obfs4ServerCert, error) { + decoded, err := base64.StdEncoding.DecodeString(encoded + certSuffix) + if err != nil { + return nil, fmt.Errorf("failed to decode cert: %s", err) + } + + if len(decoded) != certLength { + return nil, fmt.Errorf("cert length %d is invalid", len(decoded)) + } + + return &obfs4ServerCert{raw: decoded}, nil +} + +func serverCertFromState(st *obfs4ServerState) *obfs4ServerCert { + cert := new(obfs4ServerCert) + cert.raw = append(st.nodeID.Bytes()[:], st.identityKey.Public().Bytes()[:]...) + return cert +} + type obfs4ServerState struct { nodeID *ntor.NodeID identityKey *ntor.Keypair drbgSeed *drbg.Seed iatMode int + + cert *obfs4ServerCert +} + +func (st *obfs4ServerState) clientString() string { + return fmt.Sprintf("%s=%s %s=%d", certArg, st.cert, iatArg, st.iatMode) } func serverStateFromArgs(stateDir string, args *pt.Args) (*obfs4ServerState, error) { @@ -112,6 +161,7 @@ func serverStateFromJSONServerState(stateDir string, js *jsonServerState) (*obfs return nil, fmt.Errorf("invalid iat-mode '%d'", js.IATMode) } st.iatMode = js.IATMode + st.cert = serverCertFromState(st) // Generate a human readable summary of the configured endpoint. if err = newBridgeFile(stateDir, st); err != nil { @@ -190,10 +240,8 @@ func newBridgeFile(stateDir string, st *obfs4ServerState) (err error) { "# <PORT> - The TCP/IP port of your obfs4 bridge.\n" + "# <FINGERPRINT> - The bridge's fingerprint.\n\n" - bridgeLine := fmt.Sprintf("Bridge obfs4 <IP ADDRESS>:<PORT> <FINGERPRINT> node-id=%s public-key=%s iat-mode=%d\n", - st.nodeID.Hex(), - st.identityKey.Public().Hex(), - st.iatMode) + bridgeLine := fmt.Sprintf("Bridge obfs4 <IP ADDRESS>:<PORT> <FINGERPRINT> %s\n", + st.clientString()) tmp := []byte(prefix + bridgeLine) if err = ioutil.WriteFile(path.Join(stateDir, bridgeFile), tmp, 0600); err != nil {

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 01 Oct '14

01 Oct '14

commit 70d31ee1ee4d8f253605948b7696cdfc49f01fdc Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 1 18:46:09 2014 +0000 Update translations for torbutton-torbuttonproperties --- am/torbutton.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/am/torbutton.properties b/am/torbutton.properties index f331727..b612cfb 100644 --- a/am/torbutton.properties +++ b/am/torbutton.properties @@ -3,9 +3,9 @@ torbutton.button.tooltip.enabled = ድሳብለ ጦር torbutton.panel.tooltip.disabled = ችልጭቅ ቶ አናብለ ጦር torbutton.panel.tooltip.enabled = ችልጭቅ ቶ ድሳብለ ጦር torbutton.panel.plugins.disabled = ችልጭቅ ቶ አናብለ ፕሉግንስ -torbutton.panel.plugins.enabled = Click to disable plugins -torbutton.panel.label.disabled = Tor Disabled -torbutton.panel.label.enabled = Tor Enabled +torbutton.panel.plugins.enabled = ችልጭቅ ቶ ድሳብለ ፕሉግንስ +torbutton.panel.label.disabled = ጦር ድሳብለድ +torbutton.panel.label.enabled = ጦር አናብለድ extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n @@ -26,7 +26,7 @@ torbutton.popup.external.app = Tor Browser cannot display this file. You will ne torbutton.popup.external.note = Some types of files can cause applications to connect to the Internet without using Tor.\n\n torbutton.popup.external.suggest = To be safe, you should only open downloaded files while offline, or use a Tor Live CD such as Tails.\n torbutton.popup.launch = Download file -torbutton.popup.cancel = Cancel +torbutton.popup.cancel = ቻንቸል torbutton.popup.dontask = Automatically download files from now on torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.captcha.title = Avoid Google Captchas?

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 01 Oct '14

01 Oct '14

commit f9a6de6d2966317d76eb1d6199e8fd1e8b27aac7 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 1 18:45:52 2014 +0000 Update translations for tails-misc --- am.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/am.po b/am.po index 896de6e..88a8f6c 100644 --- a/am.po +++ b/am.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-29 00:14+0200\n" -"PO-Revision-Date: 2014-05-29 08:50+0000\n" +"POT-Creation-Date: 2014-08-31 21:41+0200\n" +"PO-Revision-Date: 2014-10-01 18:21+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Amharic (http://www.transifex.com/projects/p/torproject/language/am/)\n" "MIME-Version: 1.0\n" @@ -412,32 +412,32 @@ msgstr "" msgid "Failed to setup chroot." msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:175 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:182 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1 msgid "Unsafe Browser" msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:215 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:204 msgid "Shutting down the Unsafe Browser..." msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:216 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:205 msgid "" "This may take a while, and you may not restart the Unsafe Browser until it " "is properly shut down." msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:228 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:217 msgid "Failed to restart Tor." msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:236 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:225 msgid "" "Another Unsafe Browser is currently running, or being cleaned up. Please " "retry in a while." msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:249 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:238 msgid "" "No DNS server was obtained through DHCP or manually configured in " "NetworkManager."

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 01 Oct '14

01 Oct '14

commit ae454a2d4e4cf27083441f8fe4f78e8b1c41d0bf Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 1 18:16:11 2014 +0000 Update translations for torbutton-torbuttonproperties --- am/torbutton.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/am/torbutton.properties b/am/torbutton.properties index d23c67d..f331727 100644 --- a/am/torbutton.properties +++ b/am/torbutton.properties @@ -1,8 +1,8 @@ -torbutton.button.tooltip.disabled = Enable Tor -torbutton.button.tooltip.enabled = Disable Tor -torbutton.panel.tooltip.disabled = Click to enable Tor -torbutton.panel.tooltip.enabled = Click to disable Tor -torbutton.panel.plugins.disabled = Click to enable plugins +torbutton.button.tooltip.disabled = አናብለ ጦር +torbutton.button.tooltip.enabled = ድሳብለ ጦር +torbutton.panel.tooltip.disabled = ችልጭቅ ቶ አናብለ ጦር +torbutton.panel.tooltip.enabled = ችልጭቅ ቶ ድሳብለ ጦር +torbutton.panel.plugins.disabled = ችልጭቅ ቶ አናብለ ፕሉግንስ torbutton.panel.plugins.enabled = Click to disable plugins torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled

1 0

[ooni-probe/master] Update ooniprobe to 1.2.0
by art＠torproject.org 01 Oct '14

01 Oct '14

commit 520c78d1725b86f47de24d4ebf0e53d017ccfbbd Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Oct 1 16:27:54 2014 +0200 Update ooniprobe to 1.2.0 --- ChangeLog.rst | 18 ++++++++++++++++++ debian/changelog | 6 ++++++ ooni/__init__.py | 2 +- 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/ChangeLog.rst b/ChangeLog.rst index 101b63a..58b6e8e 100644 --- a/ChangeLog.rst +++ b/ChangeLog.rst @@ -1,6 +1,24 @@ Changelog ========= +v1.2.0 (Wed, 1 Oct 2014) +------------------------- + +* Introduce a new tool for generating ooniprobe test decks called oonideckgen. + +* Introduce a new tool for updating resources used for geoip lookup and deck + generation. + +* Add support for policy aware bouncing in the client. + https://trac.torproject.org/projects/tor/ticket/12579 + +* Various improvements to the bridge_reachability test (enable better tor + logging and also log obfsproxy) + +* Fix backward compatibility with twisted 13.1 and add regression tests for + this. + https://trac.torproject.org/projects/tor/ticket/13139 + v1.1.1 (Sun, 24 Aug 2014) ------------------------- diff --git a/debian/changelog b/debian/changelog index 792faca..5340a13 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ooniprobe (1.2.0-1) stable; urgency=low + + * ooniprobe 1.2.0 + + -- OONI Developers (signing key) <ooni-dev(a)lists.torproject.org> Wed, 1 Oct 2014 16:07:00 +0200 + ooniprobe (1.1.1-1) stable; urgency=low * ooniprobe 1.1.1 diff --git a/ooni/__init__.py b/ooni/__init__.py index 89fa0bf..c873f37 100644 --- a/ooni/__init__.py +++ b/ooni/__init__.py @@ -1,7 +1,7 @@ # -*- encoding: utf-8 -*- __author__ = "Open Observatory of Network Interference" -__version__ = "1.1.1" +__version__ = "1.2.0" __all__ = ['config', 'inputunit', 'kit', 'lib', 'nettest', 'oonicli', 'report', 'reporter',

1 0

[ooni-probe/master] Add manpages for oonideckgen and ooniresources
by art＠torproject.org 01 Oct '14

01 Oct '14

commit 946c6e3c627ba55d32751b73f963f70d97f7cc09 Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Oct 1 15:55:48 2014 +0200 Add manpages for oonideckgen and ooniresources --- MANIFEST.in | 2 ++ data/oonideckgen.1 | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++ data/ooniresources.1 | 78 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 165 insertions(+) diff --git a/MANIFEST.in b/MANIFEST.in index 2abe681..da56999 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -5,5 +5,7 @@ include data/GeoIP.dat include data/GeoIPASNum.dat include data/GeoLiteCity.dat include data/ooniprobe.conf.sample +include data/oonideckgen.1 include data/ooniprobe.1 include data/oonireport.1 +include data/ooniresources.1 diff --git a/data/oonideckgen.1 b/data/oonideckgen.1 new file mode 100644 index 0000000..9406d98 --- /dev/null +++ b/data/oonideckgen.1 @@ -0,0 +1,85 @@ +.\" Man page generated from reStructuredText. +. +.TH "oonideckgen" "1" "October 1, 2014" "1.1.4" "oonideckgen" +.SH NAME +oonideckgen - tool for generating ooniprobe test decks +. +.nr rst2man-indent-level 0 +. +.de1 rstReportMargin +\\$1 \\n[an-margin] +level \\n[rst2man-indent-level] +level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] +- +\\n[rst2man-indent0] +\\n[rst2man-indent1] +\\n[rst2man-indent2] +.. +.de1 INDENT +.\" .rstReportMargin pre: +. RS \\$1 +. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin] +. nr rst2man-indent-level +1 +.\" .rstReportMargin post: +.. +.de UNINDENT +. RE +.\" indent \\n[an-margin] +.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]] +.nr rst2man-indent-level -1 +.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] +.in \\n[rst2man-indent\\n[rst2man-indent-level]]u +.. + +.SH SYNOPSIS +.B oonideckgen +.RB [ --version ] +.RB [ --help ] +.RB [ \-c +.IR country-code] +.RB [ \-o +.IR output] + +.SH DESCRIPTION +.sp +oonideckgen will generate a ooniprobe test deck for the specified country. This +will then allow the user to conduct measurements useful to assess internet +censorship in that country. + + +.SH OPTIONS + +.TP +.BR \-\^h " or " \-\-help +Display this help and exit. +.TP +.BR \-\^c " or " \-\-country-code +Specify the country code for which a test deck should be geneated +.TP +.BR \-\^o " or " \-\-output +Specify in which directory the deck should be written. +.TP + + +.SH OONIDECKGEN +.sp +This tools will generate a test deck that include the following tests: + +* blocking/http_requests, with a set of relevant sites for the country to be analysed + +* blocking/dns_consistency, with all the DNS resolver of the country to be analysed and a set of relevant sites + +* manipulation/http_invalid_request_line + +* manipulation/http_header_field_manipulation + +If deckgen is run with no arugment a geoip lookup is done on the IP of the user +and that country is chosen. +In order to run deckgen you must have first have run ooniresource --update-inputs. +.sp + +.SH AUTHOR +The Tor Project +.SH COPYRIGHT +2014, The Tor Project +. diff --git a/data/ooniresources.1 b/data/ooniresources.1 new file mode 100644 index 0000000..5cd66cf --- /dev/null +++ b/data/ooniresources.1 @@ -0,0 +1,78 @@ +.\" Man page generated from reStructuredText. +. +.TH "ooniresources" "1" "October 1, 2014" "1.1.4" "ooniresources" +.SH NAME +ooniresources - tool for generating ooniprobe test decks +. +.nr rst2man-indent-level 0 +. +.de1 rstReportMargin +\\$1 \\n[an-margin] +level \\n[rst2man-indent-level] +level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] +- +\\n[rst2man-indent0] +\\n[rst2man-indent1] +\\n[rst2man-indent2] +.. +.de1 INDENT +.\" .rstReportMargin pre: +. RS \\$1 +. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin] +. nr rst2man-indent-level +1 +.\" .rstReportMargin post: +.. +.de UNINDENT +. RE +.\" indent \\n[an-margin] +.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]] +.nr rst2man-indent-level -1 +.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] +.in \\n[rst2man-indent\\n[rst2man-indent-level]]u +.. + +.SH SYNOPSIS +.B ooniresources +.RB [ --version ] +.RB [ --help ] +.RB [ --update-inputs ] +.RB [ --update-geoip ] + +.SH DESCRIPTION +.sp +ooniresources will update the resources that are needed for the functioning of +ooniprobe and related tools. + +.SH OPTIONS + +.TP +.BR \-\^h " or " \-\-help +Display this help and exit. +.TP +.BR \-\-update\-inputs +This will update the inputs that are used for generating test decks with +oonideckgen. +.TP +.BR \-\-update\-geoip +This will update the maxmind geoip databases that are used for detecting the +probes country and ASN. +.TP + +.SH OONIRESOURCES +.sp +This tools will update the resources needed for running ooniprobe and +oonideckgen. +You don't need to run it very often, but it's just sufficient to run it once +every month of so as the data usually does not update or change that often. +If you are seeing some errors related to the geoip subsystem not having some +Maxmind databases, you probably want to run: +ooniresources --update-geoip. +If on the other hand you are interested in using oonideckgen, you should run: +ooniresources --update-inputs. +.sp + +.SH AUTHOR +The Tor Project +.SH COPYRIGHT +2014, The Tor Project +.

1 0

[oonib/master] Fix bug that lead test helpers to not be started.
by art＠torproject.org 01 Oct '14

01 Oct '14

commit 7e95433b66cb96b5c524a76c04da7251ae5d3a68 Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Oct 1 12:21:28 2014 +0200 Fix bug that lead test helpers to not be started. Various pep8 related fixes. --- oonib/errors.py | 3 ++- oonib/oonibackend.py | 50 +++++++++++++++++++++++++++++++++----------------- 2 files changed, 35 insertions(+), 18 deletions(-) diff --git a/oonib/errors.py b/oonib/errors.py index e20d471..c5829d2 100644 --- a/oonib/errors.py +++ b/oonib/errors.py @@ -89,7 +89,8 @@ class CollectorNotFound(OONIBError): class NoValidCollector(OONIBError): - pass + status_code = 400 + log_message = "no-valid-collector" class TestHelpersKeyMissing(OONIBError): diff --git a/oonib/oonibackend.py b/oonib/oonibackend.py index 6074d4a..9c10dc8 100644 --- a/oonib/oonibackend.py +++ b/oonib/oonibackend.py @@ -38,6 +38,7 @@ if config.helpers['ssl'].port: http_helpers.HTTPReturnJSONHeadersHelper(), ssl_helpers.SSLContext(config)) multiService.addService(ssl_helper) + ssl_helper.startService() # Start the DNS Server related services if config.helpers['dns'].tcp_port: @@ -45,6 +46,7 @@ if config.helpers['dns'].tcp_port: tcp_dns_helper = internet.TCPServer(int(config.helpers['dns'].tcp_port), dns_helpers.DNSTestHelper()) multiService.addService(tcp_dns_helper) + tcp_dns_helper.startService() if config.helpers['dns'].udp_port: print "Starting UDP DNS Helper on %s" % config.helpers['dns'].udp_port @@ -52,22 +54,26 @@ if config.helpers['dns'].udp_port: udp_dns_helper = internet.UDPServer(int(config.helpers['dns'].udp_port), udp_dns_factory) multiService.addService(udp_dns_helper) + udp_dns_helper.startService() if config.helpers['dns_discovery'].udp_port: print ("Starting UDP DNS Discovery Helper on %s" % config.helpers['dns_discovery'].udp_port) - udp_dns_discovery = internet.UDPServer(int(config.helpers['dns_discovery'].udp_port), - dns.DNSDatagramProtocol( - dns_helpers.DNSResolverDiscovery() - )) + udp_dns_discovery = internet.UDPServer( + int(config.helpers['dns_discovery'].udp_port), + dns.DNSDatagramProtocol(dns_helpers.DNSResolverDiscovery()) + ) multiService.addService(udp_dns_discovery) if config.helpers['dns_discovery'].tcp_port: print ("Starting TCP DNS Discovery Helper on %s" % config.helpers['dns_discovery'].tcp_port) - tcp_dns_discovery = internet.TCPServer(int(config.helpers['dns_discovery'].tcp_port), - dns_helpers.DNSResolverDiscovery()) + tcp_dns_discovery = internet.TCPServer( + int(config.helpers['dns_discovery'].tcp_port), + dns_helpers.DNSResolverDiscovery() + ) multiService.addService(tcp_dns_discovery) + tcp_dns_discovery.startService() # XXX this needs to be ported @@ -77,6 +83,7 @@ if config.helpers['daphn3'].port: daphn3_helper = internet.TCPServer(int(config.helpers['daphn3'].port), tcp_helpers.Daphn3Server()) multiService.addService(daphn3_helper) + daphn3_helper.startService() if config.helpers['tcp-echo'].port: @@ -84,13 +91,16 @@ if config.helpers['tcp-echo'].port: tcp_echo_helper = internet.TCPServer(int(config.helpers['tcp-echo'].port), tcp_helpers.TCPEchoHelper()) multiService.addService(tcp_echo_helper) + tcp_echo_helper.startService() if config.helpers['http-return-json-headers'].port: - print "Starting HTTP return request helper on %s" % config.helpers['http-return-json-headers'].port + print ("Starting HTTP return request helper on %s" % + config.helpers['http-return-json-headers'].port) http_return_request_helper = internet.TCPServer( int(config.helpers['http-return-json-headers'].port), http_helpers.HTTPReturnJSONHeadersHelper()) multiService.addService(http_return_request_helper) + http_return_request_helper.startService() # add the tor collector service here @@ -101,20 +111,24 @@ if config.main.tor_hidden_service: def getHSEndpoint(data_dir): if LooseVersion(txtorcon_version) >= LooseVersion('0.10.0'): return TCPHiddenServiceEndpoint(reactor, - torconfig, 80, hidden_service_dir=data_dir) + torconfig, + 80, + hidden_service_dir=data_dir) else: return TCPHiddenServiceEndpoint(reactor, - torconfig, 80, data_dir=data_dir) + torconfig, + 80, + data_dir=data_dir) def printOnionEndpoint(endpointService): - print("Exposed %s Tor hidden service on httpo://%s" % - (endpointService.name, endpointService.endpoint.onion_uri)) + print ("Exposed %s Tor hidden service on httpo://%s" % + (endpointService.name, endpointService.endpoint.onion_uri)) def addCollector(torControlProtocol): data_dir = os.path.join(torconfig.DataDirectory, 'collector') collector_service = internet.StreamServerEndpointService( - getHSEndpoint(data_dir), - ooniBackend) + getHSEndpoint(data_dir), ooniBackend + ) collector_service.setName('collector') multiService.addService(collector_service) collector_service.startService() @@ -127,8 +141,8 @@ if config.main.tor_hidden_service: def addBouncer(torControlProtocol): data_dir = os.path.join(torconfig.DataDirectory, 'bouncer') bouncer_service = internet.StreamServerEndpointService( - getHSEndpoint(data_dir), - ooniBouncer) + getHSEndpoint(data_dir), ooniBouncer + ) bouncer_service.setName('bouncer') multiService.addService(bouncer_service) bouncer_service.startService() @@ -138,9 +152,11 @@ if config.main.tor_hidden_service: d.addCallback(printOnionEndpoint) else: if ooniBouncer: - bouncer_service = internet.TCPServer(8888, ooniBouncer, interface="127.0.0.1") + bouncer_service = internet.TCPServer(8888, ooniBouncer, + interface="127.0.0.1") multiService.addService(bouncer_service) bouncer_service.startService() - collector_service = internet.TCPServer(8889, ooniBackend, interface="127.0.0.1") + collector_service = internet.TCPServer(8889, ooniBackend, + interface="127.0.0.1") multiService.addService(collector_service) collector_service.startService()

1 0

[oonib/master] Fix typo in changelog entry date.
by art＠torproject.org 01 Oct '14

01 Oct '14

commit 5366a07d2892f7a0f63cdcc4ba45f2bb1945ac97 Author: Arturo Filastò <art(a)fuffa.org> Date: Tue Sep 30 12:06:55 2014 +0200 Fix typo in changelog entry date. --- ChangeLog.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog.rst b/ChangeLog.rst index c7c318a..9d01327 100644 --- a/ChangeLog.rst +++ b/ChangeLog.rst @@ -1,6 +1,6 @@ ChangeLog ========= -1.1.3 (Wed, 3 Sep 2014) +1.1.3 (Mon, 29 Sep 2014) ----------------------- * Add support for specifying the report archive path from config file

1 0

[support-tools/master] Add queue graphs data for September 2014
by lunar＠torproject.org 01 Oct '14

01 Oct '14

commit 25e96a02b533355fc41cfc0478cf4b6213b56502 Author: Lunar <lunar(a)torproject.org> Date: Wed Oct 1 10:29:18 2014 +0200 Add queue graphs data for September 2014 --- queue-graphs/data/2014Q3.csv | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/queue-graphs/data/2014Q3.csv b/queue-graphs/data/2014Q3.csv index 4208896..2d491bc 100644 --- a/queue-graphs/data/2014Q3.csv +++ b/queue-graphs/data/2014Q3.csv @@ -11,3 +11,9 @@ month,queue,newtickets 2014-08,fa,241 2014-08,fr,33 2014-08,zh,76 +2014-09,ar,6 +2014-09,en,1210 +2014-09,es,60 +2014-09,fa,127 +2014-09,fr,36 +2014-09,zh,94

1 0