June 2012 - tor-commits - lists.torproject.org

[orbot/master] made transproxy app list alphabetical
by n8fr8＠torproject.org 29 Jun '12

29 Jun '12

commit 080fd5e249086713219351f80331f351150717a9 Author: n8fr8 <nathan(a)freitas.net> Date: Fri Jun 29 11:41:36 2012 -0400 made transproxy app list alphabetical --- .../torproject/android/settings/AppManager.java | 2 ++ .../torproject/android/settings/TorifiedApp.java | 14 +++++++++++++- 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/android/settings/AppManager.java b/src/org/torproject/android/settings/AppManager.java index db641ae..0733030 100644 --- a/src/org/torproject/android/settings/AppManager.java +++ b/src/org/torproject/android/settings/AppManager.java @@ -5,6 +5,7 @@ package org.torproject.android.settings; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.Comparator; import java.util.Iterator; import java.util.List; @@ -266,6 +267,7 @@ public class AppManager extends Activity implements OnCheckedChangeListener, OnC appIdx++; } + Collections.sort(apps); return apps; } diff --git a/src/org/torproject/android/settings/TorifiedApp.java b/src/org/torproject/android/settings/TorifiedApp.java index 8e53321..a786800 100644 --- a/src/org/torproject/android/settings/TorifiedApp.java +++ b/src/org/torproject/android/settings/TorifiedApp.java @@ -2,7 +2,7 @@ package org.torproject.android.settings; import android.graphics.drawable.Drawable; -public class TorifiedApp { +public class TorifiedApp implements Comparable { private boolean enabled; private int uid; @@ -115,4 +115,16 @@ public class TorifiedApp { public void setIcon(Drawable icon) { this.icon = icon; } + + @Override + public int compareTo(Object another) { + + return this.toString().compareTo(another.toString()); + } + + @Override + public String toString () + { + return getName(); + } }

1 0

[orbot/master] small cleanup to main layout and notify icons
by n8fr8＠torproject.org 29 Jun '12

29 Jun '12

commit ea7154f2c891300f0e465fd8d2da66372ae3bd2e Author: n8fr8 <nathan(a)freitas.net> Date: Fri Jun 29 11:41:13 2012 -0400 small cleanup to main layout and notify icons --- res/drawable/tornotification.png | Bin 779 -> 978 bytes res/drawable/tornotificationon.png | Bin 826 -> 1073 bytes res/layout/layout_main.xml | 8 ++++---- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/res/drawable/tornotification.png b/res/drawable/tornotification.png index 068c3b9..ecb5cce 100644 Binary files a/res/drawable/tornotification.png and b/res/drawable/tornotification.png differ diff --git a/res/drawable/tornotificationon.png b/res/drawable/tornotificationon.png index 68e8a34..0b62f10 100644 Binary files a/res/drawable/tornotificationon.png and b/res/drawable/tornotificationon.png differ diff --git a/res/layout/layout_main.xml b/res/layout/layout_main.xml index 36ba9a7..db167e3 100644 --- a/res/layout/layout_main.xml +++ b/res/layout/layout_main.xml @@ -16,8 +16,8 @@ <ImageView android:id="@+id/radioModeImage" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="3px" - android:layout_marginRight="3px" + android:layout_marginTop="3dp" + android:layout_marginRight="3dp" android:gravity="right" android:layout_toRightOf="@+id/radioModeLabel" android:layout_alignParentRight="true" @@ -28,7 +28,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/powered_by" - android:layout_marginTop="8px" + android:layout_marginTop="8dp" android:layout_marginRight="0px" android:gravity="right" android:layout_toLeftOf="@+id/radioModeImage" @@ -45,6 +45,7 @@ android:layout_marginTop="40dp" android:layout_weight="1" android:src="@drawable/toroff" + android:contentDescription="activate button" android:layout_gravity="center_horizontal" /> <TextView android:id="@+id/lblStatus" @@ -55,7 +56,6 @@ android:layout_height="wrap_content" android:textColor="#ffffff" - android:layout_below="@id/imgStatus" /> </LinearLayout>

1 0

[orbot/master] re-added startService() call as some devices/OS need it
by n8fr8＠torproject.org 29 Jun '12

29 Jun '12

commit 318beaabcd92f2e180428e45d9476be00c1aa4fb Author: n8fr8 <nathan(a)freitas.net> Date: Fri Jun 29 12:04:26 2012 -0400 re-added startService() call as some devices/OS need it --- src/org/torproject/android/Orbot.java | 27 +++++++++++++-------------- 1 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index e10f9af..1a09ac7 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -91,6 +91,9 @@ public class Orbot extends Activity implements TorConstants, OnLongClickListener imgStatus = (ImageView)findViewById(R.id.imgStatus); imgStatus.setOnLongClickListener(this); + + startService(new Intent(INTENT_TOR_SERVICE)); + } @@ -307,12 +310,9 @@ public class Orbot extends Activity implements TorConstants, OnLongClickListener protected void onResume() { super.onResume(); - setLocale(); - - bindService(); - // startService(new Intent(INTENT_TOR_SERVICE)); - +// setLocale(); + bindService(); if (getIntent() == null) return; @@ -393,19 +393,17 @@ public class Orbot extends Activity implements TorConstants, OnLongClickListener } } - } - - /* (non-Javadoc) - * @see android.app.Activity#onStart() - */ - protected void onStart() { - super.onStart(); - updateStatus (""); } + @Override + public void onConfigurationChanged(Configuration newConfig) { + // TODO Auto-generated method stub + super.onConfigurationChanged(newConfig); + } + /* (non-Javadoc) * @see android.app.Activity#onStop() */ @@ -462,7 +460,8 @@ public class Orbot extends Activity implements TorConstants, OnLongClickListener //then update the preferences in an async background task if (requestCode == 1 && resultCode == 1010 && mService != null) { - new ProcessSettingsAsyncTask().execute(mService); + new ProcessSettingsAsyncTask().execute(mService); + setLocale(); } }

1 0

[orbot/master] updated changelog
by n8fr8＠torproject.org 29 Jun '12

29 Jun '12

commit 8d27d150398e2924f85ea65cd74ce8da80e5a375 Author: n8fr8 <nathan(a)freitas.net> Date: Fri Jun 29 12:04:38 2012 -0400 updated changelog --- CHANGELOG | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 4bcb570..f01f6de 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -17,6 +17,9 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at http - added docs folder and readme's - clarified english strings for hidden srv and proxying - moved Tor data directory to app_data from cache +- fixed notification persistence handling +- fixed relay/server mode option resolv.conf error +- fixed app list display 1.0.8 (includes 1.0.7.3 and 1.0.7.2) - new external/Makefile and git submodules

1 0

[stem/master] Handling version 1.1 of bridge extrainfo descriptors
by atagar＠torproject.org 29 Jun '12

29 Jun '12

commit c35c8a6cbb3659841f79159512c24a08a5e1d622 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jun 29 09:59:16 2012 -0700 Handling version 1.1 of bridge extrainfo descriptors Version 1.1 of the bridge extrainfo descriptors adds a new 'transport' field. I'm not entirely sure yet of its attributes, but recognizing the new descriptor version and parsing the field. I'm also expanding the tests a bit so unit tests cover bridge extrainfo descriptors, and parsing the metrics header line rather than just doing string matches. This is to address... https://trac.torproject.org/6257 --- stem/descriptor/__init__.py | 27 ++++++++++---- stem/descriptor/extrainfo_descriptor.py | 8 ++++- test/unit/descriptor/extrainfo_descriptor.py | 50 +++++++++++++++++++++++--- 3 files changed, 71 insertions(+), 14 deletions(-) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index 929396c..21dad37 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -65,15 +65,26 @@ def parse_file(path, descriptor_file): # Metrics descriptor handling. These contain a single descriptor per file. first_line, desc = descriptor_file.readline().strip(), None + metrics_header_match = re.match("^@type (\S+) (\d+).(\d+)$", first_line) - if first_line == "@type server-descriptor 1.0": - desc = stem.descriptor.server_descriptor.RelayDescriptor(descriptor_file.read()) - elif first_line == "@type bridge-server-descriptor 1.0": - desc = stem.descriptor.server_descriptor.BridgeDescriptor(descriptor_file.read()) - elif first_line in ("@type extra-info 1.0"): - desc = stem.descriptor.extrainfo_descriptor.RelayExtraInfoDescriptor(descriptor_file.read()) - elif first_line in ("@type bridge-extra-info 1.0"): - desc = stem.descriptor.extrainfo_descriptor.BridgeExtraInfoDescriptor(descriptor_file.read()) + if metrics_header_match: + # still doesn't necessarily mean that this is a descriptor, check if the + # header contents are recognized + + desc_type, major_version, minor_version = metrics_header_match.groups() + major_version, minor_version = int(major_version), int(minor_version) + + if desc_type == "server-descriptor" and major_version == 1 and minor_version == 0: + desc = stem.descriptor.server_descriptor.RelayDescriptor(descriptor_file.read()) + elif desc_type == "bridge-server-descriptor" and major_version == 1 and minor_version == 0: + desc = stem.descriptor.server_descriptor.BridgeDescriptor(descriptor_file.read()) + elif desc_type == "extra-info" and major_version == 1 and minor_version == 0: + desc = stem.descriptor.extrainfo_descriptor.RelayExtraInfoDescriptor(descriptor_file.read()) + elif desc_type == "bridge-extra-info" and major_version == 1 and minor_version in (0, 1): + # version 1.1 introduced a 'transport' field... + # https://trac.torproject.org/6257 + + desc = stem.descriptor.extrainfo_descriptor.BridgeExtraInfoDescriptor(descriptor_file.read()) if desc: desc._set_path(path) diff --git a/stem/descriptor/extrainfo_descriptor.py b/stem/descriptor/extrainfo_descriptor.py index 04f061a..979c679 100644 --- a/stem/descriptor/extrainfo_descriptor.py +++ b/stem/descriptor/extrainfo_descriptor.py @@ -742,10 +742,13 @@ class RelayExtraInfoDescriptor(ExtraInfoDescriptor): class BridgeExtraInfoDescriptor(ExtraInfoDescriptor): """ Bridge extra-info descriptor (`specification <https://metrics.torproject.org/formats.html#bridgedesc>`_) + + :var str transport: transport method recognized by the bridge (ex. obfs3) """ def __init__(self, raw_contents, validate = True): self._digest = None + self.transport = None ExtraInfoDescriptor.__init__(self, raw_contents, validate) @@ -760,7 +763,10 @@ class BridgeExtraInfoDescriptor(ExtraInfoDescriptor): value, _ = values[0] line = "%s %s" % (keyword, value) # original line - if keyword == "router-digest": + if keyword == "transport": + self.transport = value + del entries["transport"] + elif keyword == "router-digest": if validate and not stem.util.tor_tools.is_hex_digits(value, 40): raise ValueError("Router digest line had an invalid sha1 digest: %s" % line) diff --git a/test/unit/descriptor/extrainfo_descriptor.py b/test/unit/descriptor/extrainfo_descriptor.py index 888180c..e9b06a0 100644 --- a/test/unit/descriptor/extrainfo_descriptor.py +++ b/test/unit/descriptor/extrainfo_descriptor.py @@ -4,7 +4,7 @@ Unit tests for stem.descriptor.extrainfo_descriptor. import datetime import unittest -from stem.descriptor.extrainfo_descriptor import RelayExtraInfoDescriptor, DirResponses, DirStats +from stem.descriptor.extrainfo_descriptor import RelayExtraInfoDescriptor, BridgeExtraInfoDescriptor, DirResponses, DirStats CRYPTO_BLOB = """ K5FSywk7qvw/boA4DQcqkls6Ize5vcBYfhQ8JnOeRQC9+uDxbnpm3qaYN9jZ8myj @@ -12,13 +12,19 @@ k0d2aofcVbHr4fPQOSST0LXDrhFl5Fqo5um296zpJGvRUeO6S44U/EfJAGShtqWw 7LZqklu+gVvhMKREpchVqlAwXkWR44VENm24Hs+mT3M= """ -EXTRAINFO_DESCRIPTOR_ATTR = ( +RELAY_EXTRAINFO_ATTR = ( ("extra-info", "ninja B2289C3EAB83ECD6EB916A2F481A02E6B76A0A48"), ("published", "2012-05-05 17:03:50"), ("router-signature", "\n-----BEGIN SIGNATURE-----%s-----END SIGNATURE-----" % CRYPTO_BLOB), ) -def _make_descriptor(attr = None, exclude = None): +BRIDGE_EXTRAINFO_ATTR = ( + ("extra-info", "ec2bridgereaac65a3 1EC248422B57D9C0BD751892FE787585407479A4"), + ("published", "2012-05-05 17:03:50"), + ("router-digest", "006FD96BA35E7785A6A3B8B75FE2E2435A13BDB4"), +) + +def _make_descriptor(attr = None, exclude = None, is_bridge = False): """ Constructs a minimal extrainfo descriptor with the given attributes. @@ -31,21 +37,28 @@ def _make_descriptor(attr = None, exclude = None): descriptor_lines = [] if attr is None: attr = {} if exclude is None: exclude = [] + desc_attr = BRIDGE_EXTRAINFO_ATTR if is_bridge else RELAY_EXTRAINFO_ATTR attr = dict(attr) # shallow copy since we're destructive - for keyword, value in EXTRAINFO_DESCRIPTOR_ATTR: + for keyword, value in desc_attr: if keyword in exclude: continue elif keyword in attr: value = attr[keyword] del attr[keyword] # if this is the last entry then we should dump in any unused attributes - if keyword == "router-signature": + if not is_bridge and keyword == "router-signature": for attr_keyword, attr_value in attr.items(): descriptor_lines.append("%s %s" % (attr_keyword, attr_value)) descriptor_lines.append("%s %s" % (keyword, value)) + # bridges don't have a router-signature so simply append any extra attributes + # to the end + if is_bridge: + for attr_keyword, attr_value in attr.items(): + descriptor_lines.append("%s %s" % (attr_keyword, attr_value)) + return "\n".join(descriptor_lines) class TestExtraInfoDescriptor(unittest.TestCase): @@ -492,6 +505,33 @@ class TestExtraInfoDescriptor(unittest.TestCase): desc_text = _make_descriptor({keyword: entry}) self._expect_invalid_attr(desc_text, attr, {}) + def test_minimal_bridge_descriptor(self): + """ + Basic sanity check that we can parse a descriptor with minimal attributes. + """ + + desc_text = _make_descriptor(is_bridge = True) + desc = BridgeExtraInfoDescriptor(desc_text) + + self.assertEquals("ec2bridgereaac65a3", desc.nickname) + self.assertEquals("1EC248422B57D9C0BD751892FE787585407479A4", desc.fingerprint) + self.assertEquals("006FD96BA35E7785A6A3B8B75FE2E2435A13BDB4", desc.digest()) + self.assertEquals([], desc.get_unrecognized_lines()) + + # check that we don't have crypto fields + self.assertRaises(AttributeError, getattr, desc, "signature") + + def test_transport_line(self): + """ + Basic exercise of the bridge descriptor's transport entry. + attributes. + """ + + desc_text = _make_descriptor({"transport": "obfs3"}, is_bridge = True) + desc = BridgeExtraInfoDescriptor(desc_text) + self.assertEquals("obfs3", desc.transport) + self.assertEquals([], desc.get_unrecognized_lines()) + def _expect_invalid_attr(self, desc_text, attr = None, expected_value = None): """ Asserts that construction will fail due to desc_text having a malformed

1 0

[metrics-web/master] List version 1.1 bridge extra-infos.
by karsten＠torproject.org 29 Jun '12

29 Jun '12

commit 4747c5d92fb3382b8dd629f44c544a555756bfba Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Jun 29 14:00:04 2012 +0200 List version 1.1 bridge extra-infos. --- web/WEB-INF/formats.jsp | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/web/WEB-INF/formats.jsp b/web/WEB-INF/formats.jsp index 5eabf0d..98f928b 100644 --- a/web/WEB-INF/formats.jsp +++ b/web/WEB-INF/formats.jsp @@ -83,7 +83,9 @@ are recent: <li><tt>@type network-status-vote-3 1.0</tt></li> <li><tt>@type bridge-network-status 1.0</tt></li> <li><tt>@type bridge-server-descriptor 1.0</tt></li> -<li><tt>@type bridge-extra-info 1.0</tt></li> +<li><tt>@type bridge-extra-info 1.0</tt></li> +<li><tt>@type bridge-extra-info 1.1</tt> contain sanitized + <tt>transport</tt> lines</li> <li><tt>@type torperf 1.0</tt></li> <li><tt>@type bridge-pool-assignment 1.0</tt></li> <li><tt>@type gettor 1.0</tt></li>

1 0

[metrics-db/master] Bump to @type bridge-extra-info 1.1.
by karsten＠torproject.org 29 Jun '12

29 Jun '12

commit ba749152d36c4797036008ec57c4e7d7187ccef0 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Jun 29 13:56:04 2012 +0200 Bump to @type bridge-extra-info 1.1. --- .../ernie/db/SanitizedBridgesWriter.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/ernie/db/SanitizedBridgesWriter.java b/src/org/torproject/ernie/db/SanitizedBridgesWriter.java index c72ec9f..366da00 100644 --- a/src/org/torproject/ernie/db/SanitizedBridgesWriter.java +++ b/src/org/torproject/ernie/db/SanitizedBridgesWriter.java @@ -849,7 +849,7 @@ public class SanitizedBridgesWriter { try { newFile.getParentFile().mkdirs(); BufferedWriter bw = new BufferedWriter(new FileWriter(newFile)); - bw.write("@type bridge-extra-info 1.0\n"); + bw.write("@type bridge-extra-info 1.1\n"); bw.write(scrubbedDesc); bw.write("router-digest " + descriptorDigest.toUpperCase() + "\n"); bw.close();

1 0

[metrics-lib/master] Parse transport lines in bridge extra-infos.
by karsten＠torproject.org 29 Jun '12

29 Jun '12

commit ca201de75e451e1131e1ae68f7cdfb24280c36be Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Jun 29 13:54:31 2012 +0200 Parse transport lines in bridge extra-infos. --- .../torproject/descriptor/ExtraInfoDescriptor.java | 4 ++++ .../descriptor/impl/ExtraInfoDescriptorImpl.java | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/src/org/torproject/descriptor/ExtraInfoDescriptor.java b/src/org/torproject/descriptor/ExtraInfoDescriptor.java index 229b075..05707a5 100644 --- a/src/org/torproject/descriptor/ExtraInfoDescriptor.java +++ b/src/org/torproject/descriptor/ExtraInfoDescriptor.java @@ -237,5 +237,9 @@ public interface ExtraInfoDescriptor extends Descriptor { * have connected from that country rounded up to the nearest multiple * of 8, or null if no bridge statistics are included. */ public SortedMap<String, Integer> getBridgeIps(); + + /* Return the (possibly empty) list of transports supported by this + * bridge. */ + public List<String> getTransports(); } diff --git a/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java b/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java index f6e0fd9..0a0bf1a 100644 --- a/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java +++ b/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java @@ -166,6 +166,8 @@ public class ExtraInfoDescriptorImpl extends DescriptorImpl this.parseBridgeStatsEndLine(line, lineNoOpt, partsNoOpt); } else if (keyword.equals("bridge-ips")) { this.parseBridgeStatsIpsLine(line, lineNoOpt, partsNoOpt); + } else if (keyword.equals("transport")) { + this.parseTransportLine(line, lineNoOpt, partsNoOpt); } else if (keyword.equals("router-signature")) { this.parseRouterSignatureLine(line, lineNoOpt, partsNoOpt); } else if (keyword.equals("router-digest")) { @@ -567,6 +569,14 @@ public class ExtraInfoDescriptorImpl extends DescriptorImpl partsNoOpt, 1, 2); } + private void parseTransportLine(String line, String lineNoOpt, + String[] partsNoOpt) throws DescriptorParseException { + if (partsNoOpt.length != 2) { + throw new DescriptorParseException("Illegal line '" + line + "'."); + } + this.transports.add(partsNoOpt[1]); + } + private void parseRouterSignatureLine(String line, String lineNoOpt, String[] partsNoOpt) throws DescriptorParseException { if (!lineNoOpt.equals("router-signature")) { @@ -869,5 +879,10 @@ public class ExtraInfoDescriptorImpl extends DescriptorImpl return this.bridgeIps == null ? null : new TreeMap<String, Integer>(this.bridgeIps); } + + private List<String> transports = new ArrayList<String>(); + public List<String> getTransports() { + return new ArrayList<String>(this.transports); + } }

1 0

[metrics-lib/master] We can parse all @type 1.x descriptor versions.
by karsten＠torproject.org 29 Jun '12

29 Jun '12

commit 0c19088c4b6bbd242ccbba12b9e390b5cf6a2cf3 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Jun 29 13:29:05 2012 +0200 We can parse all @type 1.x descriptor versions. --- .../torproject/descriptor/impl/DescriptorImpl.java | 24 ++++++++++---------- 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/org/torproject/descriptor/impl/DescriptorImpl.java b/src/org/torproject/descriptor/impl/DescriptorImpl.java index 98be2d8..bb6e415 100644 --- a/src/org/torproject/descriptor/impl/DescriptorImpl.java +++ b/src/org/torproject/descriptor/impl/DescriptorImpl.java @@ -26,33 +26,33 @@ public abstract class DescriptorImpl implements Descriptor { System.arraycopy(rawDescriptorBytes, 0, first100Chars, 0, first100Chars.length); String firstLines = new String(first100Chars); - if (firstLines.startsWith("@type network-status-consensus-3 1.0\n") || + if (firstLines.startsWith("@type network-status-consensus-3 1.") || ((firstLines.startsWith("network-status-version 3\n") || firstLines.contains("\nnetwork-status-version 3\n")) && firstLines.contains("\nvote-status consensus\n"))) { parsedDescriptors.addAll(RelayNetworkStatusConsensusImpl. parseConsensuses(rawDescriptorBytes, failUnrecognizedDescriptorLines)); - } else if (firstLines.startsWith("@type network-status-vote-3 1.0\n") + } else if (firstLines.startsWith("@type network-status-vote-3 1.") || ((firstLines.startsWith("network-status-version 3\n") || firstLines.contains("\nnetwork-status-version 3\n")) && firstLines.contains("\nvote-status vote\n"))) { parsedDescriptors.addAll(RelayNetworkStatusVoteImpl. parseVotes(rawDescriptorBytes, failUnrecognizedDescriptorLines)); - } else if (firstLines.startsWith("@type bridge-network-status 1.0\n") + } else if (firstLines.startsWith("@type bridge-network-status 1.") || firstLines.startsWith("r ")) { parsedDescriptors.add(new BridgeNetworkStatusImpl( rawDescriptorBytes, fileName, failUnrecognizedDescriptorLines)); - } else if (firstLines.startsWith("@type server-descriptor 1.0\n") || - firstLines.startsWith("@type bridge-server-descriptor 1.0\n") || + } else if (firstLines.startsWith("@type server-descriptor 1.") || + firstLines.startsWith("@type bridge-server-descriptor 1.") || firstLines.startsWith("router ") || firstLines.contains("\nrouter ")) { parsedDescriptors.addAll(ServerDescriptorImpl. parseDescriptors(rawDescriptorBytes, failUnrecognizedDescriptorLines)); - } else if (firstLines.startsWith("@type extra-info 1.0\n") || - firstLines.startsWith("@type bridge-extra-info 1.0\n") || + } else if (firstLines.startsWith("@type extra-info 1.") || + firstLines.startsWith("@type bridge-extra-info 1.") || firstLines.startsWith("extra-info ") || firstLines.contains("\nextra-info ")) { parsedDescriptors.addAll(ExtraInfoDescriptorImpl. @@ -64,7 +64,7 @@ public abstract class DescriptorImpl implements Descriptor { parsedDescriptors.addAll(BridgePoolAssignmentImpl. parseDescriptors(rawDescriptorBytes, failUnrecognizedDescriptorLines)); - } else if (firstLines.startsWith("@type dir-key-certificate-3 1.0") || + } else if (firstLines.startsWith("@type dir-key-certificate-3 1.") || firstLines.startsWith("dir-key-certificate-version ") || firstLines.contains("\ndir-key-certificate-version ")) { parsedDescriptors.addAll(DirectoryKeyCertificateImpl. @@ -75,20 +75,20 @@ public abstract class DescriptorImpl implements Descriptor { firstLines.contains("\nExitNode ")) { parsedDescriptors.add(new ExitListImpl(rawDescriptorBytes, fileName, failUnrecognizedDescriptorLines)); - } else if (firstLines.startsWith("@type network-status-2 1.0\n") || + } else if (firstLines.startsWith("@type network-status-2 1.") || firstLines.startsWith("network-status-version 2\n") || firstLines.contains("\nnetwork-status-version 2\n")) { parsedDescriptors.add(new RelayNetworkStatusImpl(rawDescriptorBytes, failUnrecognizedDescriptorLines)); - } else if (firstLines.startsWith("@type directory 1.0\n") || + } else if (firstLines.startsWith("@type directory 1.") || firstLines.startsWith("signed-directory\n") || firstLines.contains("\nsigned-directory\n")) { parsedDescriptors.add(new RelayDirectoryImpl(rawDescriptorBytes, failUnrecognizedDescriptorLines)); - } else if (firstLines.startsWith("@type torperf 1.0\n")) { + } else if (firstLines.startsWith("@type torperf 1.")) { parsedDescriptors.addAll(TorperfResultImpl.parseTorperfResults( rawDescriptorBytes, failUnrecognizedDescriptorLines)); - } else if (firstLines.startsWith("@type gettor 1.0\n")) { + } else if (firstLines.startsWith("@type gettor 1.")) { parsedDescriptors.addAll(GetTorStatisticsImpl.parseGetTorStatistics( rawDescriptorBytes, failUnrecognizedDescriptorLines)); } else {

1 0

[metrics-web/master] Document how we sanitize pluggable transport lines.
by karsten＠torproject.org 29 Jun '12

29 Jun '12

commit 5de9ed2a350a3219a018d0b62446a991331a763c Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Jun 29 12:55:06 2012 +0200 Document how we sanitize pluggable transport lines. --- web/WEB-INF/formats.jsp | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/web/WEB-INF/formats.jsp b/web/WEB-INF/formats.jsp index 1392a2b..5eabf0d 100644 --- a/web/WEB-INF/formats.jsp +++ b/web/WEB-INF/formats.jsp @@ -350,6 +350,11 @@ long and the <tt>secret</tt> is only 19 bytes long.</li></ul> <li>Replace contact information: If there is contact information in a descriptor, the contact line is changed to <tt>somebody</tt>.</li> +<li>Remove pluggable transport addresses and arguments: Bridges may +provide transports in addition to the onion-routing protocol and include +information about these transports in their extra-info descriptors for +BridgeDB. In that case, any IP addresses, TCP ports, or additional +arguments are removed, only leaving in the supported transport names.</li> </ol>

1 0