- tor-commits - lists.torproject.org

[flashproxy/js] We need pluggable transports, not Socks4Proxy.
by dcf＠torproject.org 02 Apr '12

02 Apr '12

commit 96b3d5dab27b96023ae9bb91addd1bb0b93528d3 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Apr 2 09:37:01 2012 -0700 We need pluggable transports, not Socks4Proxy. --- README | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README b/README index 2351195..b3cbc2d 100644 --- a/README +++ b/README @@ -31,8 +31,8 @@ https://crypto.stanford.edu/flashproxy/ == Quick start for users -You must have a version of Tor that supports the Socks4Proxy option. -This means version 0.2.2.32 (released 2011-08-29) or later. +You must have a version of Tor that supports pluggable transports. This +means version 0.2.2.32 (released 2011-08-29) or later. All the flashproxy programs and source code can be downloaded this way: git clone https://git.torproject.org/flashproxy.git

1 0

[onionoo/master] Take out some useless code.
by karsten＠torproject.org 02 Apr '12

02 Apr '12

commit 555c6404f21d8fae643fde077a1d1ad158047935 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Apr 2 18:24:01 2012 +0200 Take out some useless code. All details files with descriptor details now contain a last_restarted field, and if they don't contain descriptor details we won't be able to write a last_restarted line anyway. --- src/org/torproject/onionoo/DetailDataWriter.java | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/src/org/torproject/onionoo/DetailDataWriter.java b/src/org/torproject/onionoo/DetailDataWriter.java index 1420297..c18f7d2 100644 --- a/src/org/torproject/onionoo/DetailDataWriter.java +++ b/src/org/torproject/onionoo/DetailDataWriter.java @@ -217,7 +217,6 @@ public class DetailDataWriter { /* Read details file for this relay if it exists. */ String descriptorParts = null; long publishedMillis = -1L; - boolean containsLastRestartedLine = false; if (result.containsKey(fingerprint)) { File detailsFile = result.remove(fingerprint); try { @@ -233,8 +232,6 @@ public class DetailDataWriter { "\"desc_published\":\"1970-01-01 00:00:00".length()); publishedMillis = dateTimeFormat.parse(published).getTime(); copyDescriptorParts = true; - } else if (line.startsWith("\"last_restarted\":")) { - containsLastRestartedLine = true; } if (copyDescriptorParts) { sb.append(line + "\n"); @@ -264,8 +261,7 @@ public class DetailDataWriter { * line. */ if (this.relayServerDescriptors.containsKey(fingerprint) && (this.relayServerDescriptors.get(fingerprint). - getPublishedMillis() > publishedMillis || - !containsLastRestartedLine)) { + getPublishedMillis() > publishedMillis)) { ServerDescriptor descriptor = this.relayServerDescriptors.get( fingerprint); StringBuilder sb = new StringBuilder();

1 0

[onionoo/master] Don't use server descriptors parse histories.
by karsten＠torproject.org 02 Apr '12

02 Apr '12

commit bb770751631d86a5313679313be9084daa5be79b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Apr 2 17:29:15 2012 +0200 Don't use server descriptors parse histories. If we parse a relay or bridge server descriptor that we never saw before and learn about the relay or bridge in a later consensus or status, we'll never write the descriptor content anywhere. The result would be details files containing no descriptor parts until the relay or bridge publishes the next descriptor. Yes, this took a long time to track down. --- src/org/torproject/onionoo/DetailDataWriter.java | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/org/torproject/onionoo/DetailDataWriter.java b/src/org/torproject/onionoo/DetailDataWriter.java index a6198b1..1420297 100644 --- a/src/org/torproject/onionoo/DetailDataWriter.java +++ b/src/org/torproject/onionoo/DetailDataWriter.java @@ -57,7 +57,11 @@ public class DetailDataWriter { DescriptorSourceFactory.createDescriptorReader(); reader.addDirectory(new File( "in/relay-descriptors/server-descriptors")); - reader.setExcludeFiles(new File("status/relay-serverdesc-history")); + /* Don't remember which server descriptors we already parsed. If we + * parse a server descriptor now and first learn about the relay in a + * later consensus, we'll never write the descriptor content anywhere. + * The result would be details files containing no descriptor parts + * until the relay publishes the next descriptor. */ Iterator<DescriptorFile> descriptorFiles = reader.readDescriptors(); while (descriptorFiles.hasNext()) { DescriptorFile descriptorFile = descriptorFiles.next(); @@ -122,7 +126,11 @@ public class DetailDataWriter { DescriptorSourceFactory.createDescriptorReader(); reader.addDirectory(new File( "in/bridge-descriptors/server-descriptors")); - reader.setExcludeFiles(new File("status/bridge-serverdesc-history")); + /* Don't remember which server descriptors we already parsed. If we + * parse a server descriptor now and first learn about the relay in a + * later status, we'll never write the descriptor content anywhere. + * The result would be details files containing no descriptor parts + * until the bridge publishes the next descriptor. */ Iterator<DescriptorFile> descriptorFiles = reader.readDescriptors(); while (descriptorFiles.hasNext()) { DescriptorFile descriptorFile = descriptorFiles.next();

1 0

[onionoo/master] Rename a variable.
by karsten＠torproject.org 02 Apr '12

02 Apr '12

commit dcd18e37afb1f9794b39de387aba8ceef82ce748 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Apr 2 18:04:52 2012 +0200 Rename a variable. --- src/org/torproject/onionoo/ResourceServlet.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/org/torproject/onionoo/ResourceServlet.java b/src/org/torproject/onionoo/ResourceServlet.java index 55a96ff..4149375 100644 --- a/src/org/torproject/onionoo/ResourceServlet.java +++ b/src/org/torproject/onionoo/ResourceServlet.java @@ -477,14 +477,14 @@ public class ResourceServlet extends HttpServlet { return ""; } fingerprint = fingerprint.substring(0, 40); - File detailsFile = new File(this.outDirString + "bandwidth/" + File bandwidthFile = new File(this.outDirString + "bandwidth/" + fingerprint); StringBuilder sb = new StringBuilder(); String bandwidthLines = null; - if (detailsFile.exists()) { + if (bandwidthFile.exists()) { try { BufferedReader br = new BufferedReader(new FileReader( - detailsFile)); + bandwidthFile)); String line; while ((line = br.readLine()) != null) { sb.append(line + "\n");

1 0

[onionoo/master] Make Onionoo out/ directory configurable.
by karsten＠torproject.org 02 Apr '12

02 Apr '12

commit c51b324e13e11ac7451ea72c816c0332f59bd445 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Apr 2 17:25:29 2012 +0200 Make Onionoo out/ directory configurable. --- .gitignore | 1 + build.xml | 4 +++ etc/web.xml | 29 -------------------- etc/web.xml.template | 33 +++++++++++++++++++++++ src/org/torproject/onionoo/ResourceServlet.java | 13 ++++++--- 5 files changed, 47 insertions(+), 33 deletions(-) diff --git a/.gitignore b/.gitignore index 4ee5771..2848bda 100755 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ lib/ classes/ out/ onionoo.war +etc/web.xml etc/context.xml GeoIP.dat GeoIPASNum.dat diff --git a/build.xml b/build.xml index 652a49b..878c07f 100644 --- a/build.xml +++ b/build.xml @@ -7,6 +7,9 @@ <property name="contextxmltemplate" value="${config}/context.xml.template"/> <property name="contextxml" value="${config}/context.xml"/> + <property name="webxmltemplate" + value="${config}/web.xml.template"/> + <property name="webxml" value="${config}/web.xml"/> <property name="warfile" value="onionoo.war"/> <path id="classpath"> <pathelement path="${classes}"/> @@ -18,6 +21,7 @@ </path> <target name="init"> <copy file="${contextxmltemplate}" tofile="${contextxml}"/> + <copy file="${webxmltemplate}" tofile="${webxml}"/> <mkdir dir="${classes}"/> </target> <target name="compile" diff --git a/etc/web.xml b/etc/web.xml deleted file mode 100644 index 7855706..0000000 --- a/etc/web.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<web-app version="2.4" - xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee - http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" > - - <servlet> - <servlet-name>Resource</servlet-name> - <servlet-class> - org.torproject.onionoo.ResourceServlet - </servlet-class> - </servlet> - <servlet-mapping> - <servlet-name>Resource</servlet-name> - <url-pattern>/summary/*</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>Resource</servlet-name> - <url-pattern>/details/*</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>Resource</servlet-name> - <url-pattern>/bandwidth/*</url-pattern> - </servlet-mapping> - -</web-app> - diff --git a/etc/web.xml.template b/etc/web.xml.template new file mode 100644 index 0000000..4cba2b5 --- /dev/null +++ b/etc/web.xml.template @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app version="2.4" + xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee + http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" > + + <servlet> + <servlet-name>Resource</servlet-name> + <servlet-class> + org.torproject.onionoo.ResourceServlet + </servlet-class> + <init-param> + <param-name>outDir</param-name> + <param-value>/srv/onionoo/out/</param-value> + </init-param> + </servlet> + <servlet-mapping> + <servlet-name>Resource</servlet-name> + <url-pattern>/summary/*</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>Resource</servlet-name> + <url-pattern>/details/*</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>Resource</servlet-name> + <url-pattern>/bandwidth/*</url-pattern> + </servlet-mapping> + +</web-app> + diff --git a/src/org/torproject/onionoo/ResourceServlet.java b/src/org/torproject/onionoo/ResourceServlet.java index 037657e..55a96ff 100644 --- a/src/org/torproject/onionoo/ResourceServlet.java +++ b/src/org/torproject/onionoo/ResourceServlet.java @@ -15,6 +15,7 @@ import java.util.Map; import java.util.Set; import java.util.regex.Pattern; +import javax.servlet.ServletConfig; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; @@ -28,7 +29,11 @@ public class ResourceServlet extends HttpServlet { private static final long serialVersionUID = 7236658979947465319L; - public void init() { + private String outDirString; + + public void init(ServletConfig config) throws ServletException { + super.init(config); + this.outDirString = config.getInitParameter("outDir"); this.readSummaryFile(); } @@ -41,7 +46,7 @@ public class ResourceServlet extends HttpServlet { relayFingerprintSummaryLines = new HashMap<String, String>(), bridgeFingerprintSummaryLines = new HashMap<String, String>(); private void readSummaryFile() { - File summaryFile = new File("/srv/onionoo/out/summary.json"); + File summaryFile = new File(this.outDirString + "summary.json"); if (!summaryFile.exists()) { readSummaryFile = false; return; @@ -427,7 +432,7 @@ public class ResourceServlet extends HttpServlet { return ""; } fingerprint = fingerprint.substring(0, 40); - File detailsFile = new File("/srv/onionoo/out/details/" + File detailsFile = new File(this.outDirString + "details/" + fingerprint); StringBuilder sb = new StringBuilder(); String detailsLines = null; @@ -472,7 +477,7 @@ public class ResourceServlet extends HttpServlet { return ""; } fingerprint = fingerprint.substring(0, 40); - File detailsFile = new File("/srv/onionoo/out/bandwidth/" + File detailsFile = new File(this.outDirString + "bandwidth/" + fingerprint); StringBuilder sb = new StringBuilder(); String bandwidthLines = null;

1 0

[onionoo/master] Allow the webapp to be deployed as onionoo.war.
by karsten＠torproject.org 02 Apr '12

02 Apr '12

commit a835c3cad889e31fbc44b0455936dc61da715f1a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Apr 2 17:12:49 2012 +0200 Allow the webapp to be deployed as onionoo.war. So far, we assumed that the webapp is deployed as ROOT.war which means URLs are, e.g., /summary/all. Now we allow the webapp to be deployed as onionoo.war which leads to URLs like /onionoo/summary/all. Handle both variants. --- INSTALL | 5 +++-- src/org/torproject/onionoo/ResourceServlet.java | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/INSTALL b/INSTALL index e411d8f..0e6269d 100644 --- a/INSTALL +++ b/INSTALL @@ -123,7 +123,8 @@ re-deploy the application in the future. Run the following commands as root: # cd /var/lib/tomcat6/webapps/ -# ln -s /srv/onionoo/onionoo.war ROOT.war +# ln -s /srv/onionoo/onionoo.war onionoo.war -The Onionoo server should now be available at http://localhost:8080/. +The Onionoo server should now be available at +http://localhost:8080/onionoo/. diff --git a/src/org/torproject/onionoo/ResourceServlet.java b/src/org/torproject/onionoo/ResourceServlet.java index e11c7ac..037657e 100644 --- a/src/org/torproject/onionoo/ResourceServlet.java +++ b/src/org/torproject/onionoo/ResourceServlet.java @@ -122,6 +122,9 @@ public class ResourceServlet extends HttpServlet { } String uri = request.getRequestURI(); + if (uri.startsWith("/onionoo/")) { + uri = uri.substring("/onionoo".length()); + } String resourceType = null; if (uri.startsWith("/summary/")) { resourceType = "summary";

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 02 Apr '12

02 Apr '12

commit 1f27cc30e190ef8b3147f32a62cbcea5e39d9d14 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 2 08:15:30 2012 +0000 Update translations for https_everywhere --- fi/https-everywhere.dtd | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/fi/https-everywhere.dtd b/fi/https-everywhere.dtd new file mode 100644 index 0000000..e8480c1 --- /dev/null +++ b/fi/https-everywhere.dtd @@ -0,0 +1,37 @@ +<!ENTITY https-everywhere.about.title ""> +<!ENTITY https-everywhere.about.ext_name ""> +<!ENTITY https-everywhere.about.ext_description ""> +<!ENTITY https-everywhere.about.version "versio"> +<!ENTITY https-everywhere.about.created_by ""> +<!ENTITY https-everywhere.about.librarians ""> +<!ENTITY https-everywhere.about.thanks ""> +<!ENTITY https-everywhere.about.contribute ""> +<!ENTITY https-everywhere.about.donate_tor ""> +<!ENTITY https-everywhere.about.tor_lang_code ""> +<!ENTITY https-everywhere.about.donate_eff ""> + +<!ENTITY https-everywhere.menu.about ""> +<!ENTITY https-everywhere.menu.observatory ""> +<!ENTITY https-everywhere.menu.globalEnable ""> +<!ENTITY https-everywhere.menu.globalDisable ""> + +<!ENTITY https-everywhere.prefs.title "Asetukset..."> +<!ENTITY https-everywhere.prefs.enable_all ""> +<!ENTITY https-everywhere.prefs.disable_all ""> +<!ENTITY https-everywhere.prefs.reset_defaults ""> +<!ENTITY https-everywhere.prefs.search "Etsi"> +<!ENTITY https-everywhere.prefs.site ""> +<!ENTITY https-everywhere.prefs.notes ""> +<!ENTITY https-everywhere.prefs.list_caption ""> +<!ENTITY https-everywhere.prefs.enabled "Käytössä"> +<!ENTITY https-everywhere.prefs.ruleset_howto ""> +<!ENTITY https-everywhere.prefs.here_link ""> +<!ENTITY https-everywhere.prefs.toggle ""> +<!ENTITY https-everywhere.prefs.reset_default ""> +<!ENTITY https-everywhere.prefs.view_xml_source ""> + +<!ENTITY https-everywhere.source.downloading ""> +<!ENTITY https-everywhere.source.filename ""> +<!ENTITY https-everywhere.source.unable_to_download ""> + +

1 0

[tor/master] BridgePassword was never for debugging
by arma＠torproject.org 01 Apr '12

01 Apr '12

commit 40ab832c4e61bfddd26915e6208137b43329ae86 Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Apr 1 15:59:00 2012 -0400 BridgePassword was never for debugging It is for the not-yet-implemented bridge community design. --- doc/tor.1.txt | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 160feb0..25a440d 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1297,8 +1297,11 @@ DIRECTORY AUTHORITY SERVER OPTIONS **BridgePassword** __Password__:: If set, contains an HTTP authenticator that tells a bridge authority to - serve all requested bridge information. Used for debugging. (Default: - not set.) + serve all requested bridge information. Used by the (only partially + implemented) "bridge community" design, where a community of bridge + relay operators all use an alternate bridge directory authority, + and their target user audience can periodically fetch the list of + available community bridges to stay up-to-date. (Default: not set.) **V3AuthVotingInterval** __N__ **minutes**|**hours**:: V3 authoritative directories only. Configures the server's preferred voting

1 0

[tor/master] put a _ before or_options_t elements that aren't configurable
by arma＠torproject.org 01 Apr '12

01 Apr '12

commit 5fed1ccd901d4751a3fed7dc01042771ca76f449 Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Apr 1 15:59:38 2012 -0400 put a _ before or_options_t elements that aren't configurable it's fine with me if we change the current convention, but we should actually decide to change it if we want to. --- src/or/config.c | 6 +++--- src/or/directory.c | 5 +++-- src/or/or.h | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 1e7bd58..fbbd902 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -713,7 +713,7 @@ or_options_free(or_options_t *options) return; routerset_free(options->_ExcludeExitNodesUnion); - tor_free(options->BridgePassword_AuthDigest); + tor_free(options->_BridgePassword_AuthDigest); config_free(&options_format, options); } @@ -1310,8 +1310,8 @@ options_act(or_options_t *old_options) "BridgePassword."); return -1; } - options->BridgePassword_AuthDigest = tor_malloc(DIGEST256_LEN); - crypto_digest256(options->BridgePassword_AuthDigest, + options->_BridgePassword_AuthDigest = tor_malloc(DIGEST256_LEN); + crypto_digest256(options->_BridgePassword_AuthDigest, http_authenticator, strlen(http_authenticator), DIGEST_SHA256); tor_free(http_authenticator); diff --git a/src/or/directory.c b/src/or/directory.c index 9bc58e5..29cf10c 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3069,7 +3069,7 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers, } if (options->BridgeAuthoritativeDir && - options->BridgePassword_AuthDigest && + options->_BridgePassword_AuthDigest && connection_dir_is_encrypted(conn) && !strcmp(url,"/tor/networkstatus-bridges")) { char *status; @@ -3081,7 +3081,8 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers, /* now make sure the password is there and right */ if (!header || - tor_memneq(digest, options->BridgePassword_AuthDigest, DIGEST256_LEN)) { + tor_memneq(digest, + options->_BridgePassword_AuthDigest, DIGEST256_LEN)) { write_http_status_line(conn, 404, "Not found"); tor_free(header); goto done; diff --git a/src/or/or.h b/src/or/or.h index 92592e5..a4e8e49 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2492,8 +2492,8 @@ typedef struct { * for bridge statuses -- but only if the requests use this password. */ char *BridgePassword; /** If BridgePassword is set, this is a SHA256 digest of the basic http - * authenticator for it. */ - char *BridgePassword_AuthDigest; + * authenticator for it. Used so we can do a time-independent comparison. */ + char *_BridgePassword_AuthDigest; int UseBridges; /**< Boolean: should we start all circuits with a bridge? */ config_line_t *Bridges; /**< List of bootstrap bridge addresses. */

1 0

[tor/master] Merge branch 'maint-0.2.2'
by arma＠torproject.org 01 Apr '12

01 Apr '12

commit c7cbd06d5f2727c3742dfd426223f1f1ebe46f94 Merge: 341c6a5 5fed1ccd Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Apr 1 16:03:16 2012 -0400 Merge branch 'maint-0.2.2' Conflicts: src/or/config.c doc/tor.1.txt | 7 +++++-- src/or/config.c | 6 +++--- src/or/directory.c | 5 +++-- src/or/or.h | 4 ++-- 4 files changed, 13 insertions(+), 9 deletions(-) diff --cc src/or/config.c index 2ce930b,fbbd902..24edc4d --- a/src/or/config.c +++ b/src/or/config.c @@@ -808,12 -713,7 +808,12 @@@ or_options_free(or_options_t *options return; routerset_free(options->_ExcludeExitNodesUnion); + if (options->NodeFamilySets) { + SMARTLIST_FOREACH(options->NodeFamilySets, routerset_t *, + rs, routerset_free(rs)); + smartlist_free(options->NodeFamilySets); + } - tor_free(options->BridgePassword_AuthDigest); + tor_free(options->_BridgePassword_AuthDigest); config_free(&options_format, options); }

1 0