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

[vidalia/alpha] Remove BootstrapStatus::Status. We will get the description from tor
by chiiph＠torproject.org 05 Mar '12

05 Mar '12

commit b7783b03dbe753d77c25e568bea994a678a152b4 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Feb 20 18:08:59 2012 -0300 Remove BootstrapStatus::Status. We will get the description from tor --- src/torcontrol/BootstrapStatus.cpp | 37 ++-------------------------------- src/torcontrol/BootstrapStatus.h | 25 ++-------------------- src/torcontrol/TorControl.cpp | 4 +- src/torcontrol/TorEvents.cpp | 2 +- src/vidalia/MainWindow.cpp | 38 +----------------------------------- 5 files changed, 10 insertions(+), 96 deletions(-) diff --git a/src/torcontrol/BootstrapStatus.cpp b/src/torcontrol/BootstrapStatus.cpp index 8184ffe..f4e38b8 100644 --- a/src/torcontrol/BootstrapStatus.cpp +++ b/src/torcontrol/BootstrapStatus.cpp @@ -20,13 +20,14 @@ BootstrapStatus::BootstrapStatus() { _severity = tc::UnrecognizedSeverity; _reason = tc::UnrecognizedReason; - _status = UnrecognizedStatus; + _status = QString(); _action = UnrecognizedRecommendation; _percentComplete = -1; } /** Constructor. */ -BootstrapStatus::BootstrapStatus(tc::Severity severity, Status status, +BootstrapStatus::BootstrapStatus(tc::Severity severity, + const QString &status, int percentComplete, const QString &description, const QString &warning, @@ -42,37 +43,6 @@ BootstrapStatus::BootstrapStatus(tc::Severity severity, Status status, _action = action; } -/** Converts a string TAG value to a BootstrapStatus enum value. */ -BootstrapStatus::Status -BootstrapStatus::statusFromString(const QString &str) -{ - if (!str.compare("CONN_DIR", Qt::CaseInsensitive)) - return ConnectingToDirMirror; - if (!str.compare("HANDSHAKE_DIR", Qt::CaseInsensitive)) - return HandshakingWithDirMirror; - if (!str.compare("ONEHOP_CREATE", Qt::CaseInsensitive)) - return CreatingOneHopCircuit; - if (!str.compare("REQUESTING_STATUS", Qt::CaseInsensitive)) - return RequestingNetworkStatus; - if (!str.compare("LOADING_STATUS", Qt::CaseInsensitive)) - return LoadingNetworkStatus; - if (!str.compare("LOADING_KEYS", Qt::CaseInsensitive)) - return LoadingAuthorityCertificates; - if (!str.compare("REQUESTING_DESCRIPTORS", Qt::CaseInsensitive)) - return RequestingDescriptors; - if (!str.compare("LOADING_DESCRIPTORS", Qt::CaseInsensitive)) - return LoadingDescriptors; - if (!str.compare("CONN_OR", Qt::CaseInsensitive)) - return ConnectingToEntryGuard; - if (!str.compare("HANDSHAKE_OR", Qt::CaseInsensitive)) - return HandshakingWithEntryGuard; - if (!str.compare("CIRCUIT_CREATE", Qt::CaseInsensitive)) - return EstablishingCircuit; - if (!str.compare("DONE", Qt::CaseInsensitive)) - return BootstrappingDone; - return UnrecognizedStatus; -} - /** Returns the action that the Tor software recommended be taken in response * to this bootstrap status. */ BootstrapStatus::Recommendation @@ -90,7 +60,6 @@ bool BootstrapStatus::isValid() const { return (_severity != tc::UnrecognizedSeverity - && _status != UnrecognizedStatus && _percentComplete >= 0); } diff --git a/src/torcontrol/BootstrapStatus.h b/src/torcontrol/BootstrapStatus.h index 7526fdb..a2e3297 100644 --- a/src/torcontrol/BootstrapStatus.h +++ b/src/torcontrol/BootstrapStatus.h @@ -25,23 +25,6 @@ class BootstrapStatus { public: - /** Currently enumerated bootstrapping states defined by Tor's control - * protocol (Tor >= 0.2.1.0-alpha-dev. */ - enum Status { - UnrecognizedStatus, - ConnectingToDirMirror, - HandshakingWithDirMirror, - CreatingOneHopCircuit, - RequestingNetworkStatus, - LoadingNetworkStatus, - LoadingAuthorityCertificates, - RequestingDescriptors, - LoadingDescriptors, - ConnectingToEntryGuard, - HandshakingWithEntryGuard, - EstablishingCircuit, - BootstrappingDone - }; /** Actions the Tor software might recommend controllers take in response to * a bootstrap status problem event. */ enum Recommendation { @@ -55,7 +38,7 @@ public: /** Constructor. */ BootstrapStatus(tc::Severity severity, - Status status, int percentComplete, + const QString &status, int percentComplete, const QString &description, const QString &warning = QString(), tc::ConnectionStatusReason reason = tc::UnrecognizedReason, @@ -66,7 +49,7 @@ public: /** Returns the BootstrapStatus enum value indicated by this bootstrap * status event. */ - Status status() const { return _status; } + QString status() const { return _status; } /** Returns an integer between 0 and 100 representing an estimate of how * much of Tor's bootstrapping process it has completed. */ @@ -94,8 +77,6 @@ public: * phase. */ bool isValid() const; - /** Converts a string TAG value to a BootstrapStatus enum value. */ - static Status statusFromString(const QString &tag); /** Converts a string RECOMMENDATION value to a RecommendAction enum * value. */ static Recommendation actionFromString(const QString &str); @@ -109,7 +90,7 @@ private: /** Current bootstrapping status value. * \sa status */ - Status _status; + QString _status; /** Approximate percentage of Tor's bootstrapping process that is complete. * \sa percentComplete diff --git a/src/torcontrol/TorControl.cpp b/src/torcontrol/TorControl.cpp index e95f9c7..3c775e8 100644 --- a/src/torcontrol/TorControl.cpp +++ b/src/torcontrol/TorControl.cpp @@ -234,7 +234,7 @@ TorControl::getBootstrapPhase() tc::Severity severity = tc::severityFromString(args.value("status/bootstrap-phase")); BootstrapStatus status = BootstrapStatus(severity, - BootstrapStatus::statusFromString(args.value("TAG")), + args.value("TAG"), args.value("PROGRESS").toInt(), args.value("SUMMARY")); emit bootstrapStatusChanged(status); @@ -407,7 +407,7 @@ TorControl::bootstrapStatus(QString *errmsg) tc::Severity severity = tc::severityFromString(str.section(' ', 0, 0)); QHash<QString,QString> args = string_parse_keyvals(str); return BootstrapStatus(severity, - BootstrapStatus::statusFromString(args.value("TAG")), + args.value("TAG"), args.value("PROGRESS").toInt(), args.value("SUMMARY"), args.value("WARNING"), diff --git a/src/torcontrol/TorEvents.cpp b/src/torcontrol/TorEvents.cpp index 588a093..f068f1a 100644 --- a/src/torcontrol/TorEvents.cpp +++ b/src/torcontrol/TorEvents.cpp @@ -368,7 +368,7 @@ TorEvents::handleClientStatusEvent(tc::Severity severity, } else if (! action.compare("BOOTSTRAP", Qt::CaseInsensitive)) { BootstrapStatus status = BootstrapStatus(severity, - BootstrapStatus::statusFromString(args.value("TAG")), + args.value("TAG"), args.value("PROGRESS").toInt(), args.value("SUMMARY"), args.value("WARNING"), diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index 65e1e3c..c6a1f21 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -1110,43 +1110,7 @@ MainWindow::bootstrapStatusChanged(const BootstrapStatus &bs) bs.recommendedAction() != BootstrapStatus::RecommendIgnore); QString description; - switch (bs.status()) { - case BootstrapStatus::ConnectingToDirMirror: - description = tr("Connecting to a relay directory"); - break; - case BootstrapStatus::HandshakingWithDirMirror: - case BootstrapStatus::CreatingOneHopCircuit: - description = tr("Establishing an encrypted directory connection"); - break; - case BootstrapStatus::RequestingNetworkStatus: - description = tr("Retrieving network status"); - break; - case BootstrapStatus::LoadingNetworkStatus: - description = tr("Loading network status"); - break; - case BootstrapStatus::LoadingAuthorityCertificates: - description = tr("Loading authority certificates"); - break; - case BootstrapStatus::RequestingDescriptors: - description = tr("Requesting relay information"); - break; - case BootstrapStatus::LoadingDescriptors: - description = tr("Loading relay information"); - break; - case BootstrapStatus::ConnectingToEntryGuard: - description = tr("Connecting to the Tor network"); - break; - case BootstrapStatus::HandshakingWithEntryGuard: - case BootstrapStatus::EstablishingCircuit: - description = tr("Establishing a Tor circuit"); - break; - case BootstrapStatus::BootstrappingDone: - description = tr("Connected to the Tor network!"); - warn = false; /* probably false anyway */ - break; - default: - description = tr("Unrecognized startup status"); - } + description = bs.description(); if (warn) { QString reason; /* Is it really a good idea to translate these? */

1 0

[vidalia/alpha] Merge branch 'featNetworkMap' into alpha
by chiiph＠torproject.org 05 Mar '12

05 Mar '12

commit 02f40534d2d72d53128ce13bbc968bfaf21ad881 Merge: d1ccb6d dcdb261 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Mar 5 09:40:42 2012 -0300 Merge branch 'featNetworkMap' into alpha changes/featNetworkMap | 3 + cmake/FindGeoIP.cmake | 20 ++-- src/torcontrol/RouterDescriptor.cpp | 95 ++++++++++------ src/torcontrol/RouterDescriptor.h | 27 ++++- src/torcontrol/TorControl.cpp | 19 +++- src/torcontrol/TorControl.h | 2 + src/vidalia/CMakeLists.txt | 2 - src/vidalia/network/NetViewer.cpp | 53 ++++++-- src/vidalia/network/NetViewer.h | 25 +++- src/vidalia/network/RouterDescriptorView.cpp | 10 +- src/vidalia/network/RouterInfoDialog.cpp | 34 ++++- src/vidalia/network/RouterListItem.cpp | 2 + src/vidalia/network/TorMapWidget.cpp | 107 ++++++----------- src/vidalia/network/TorMapWidget.h | 7 +- src/vidalia/network/TorMapWidgetInputHandler.cpp | 138 ---------------------- src/vidalia/network/TorMapWidgetInputHandler.h | 55 --------- src/vidalia/network/TorMapWidgetPopupMenu.cpp | 37 ++---- src/vidalia/network/TorMapWidgetPopupMenu.h | 20 +--- 18 files changed, 270 insertions(+), 386 deletions(-)

1 0

[vidalia/alpha] Merge branch 'bug5109_bootstrap_phase' into alpha
by chiiph＠torproject.org 05 Mar '12

05 Mar '12

commit 35bc87acd8227d5e29312c6c608eea3828d1845f Merge: 3a6592f 7af8629 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Mar 5 09:41:36 2012 -0300 Merge branch 'bug5109_bootstrap_phase' into alpha Conflicts: src/vidalia/MainWindow.cpp changes/bug5109 | 2 + src/torcontrol/BootstrapStatus.cpp | 37 ++----------------------------- src/torcontrol/BootstrapStatus.h | 25 ++------------------ src/torcontrol/TorControl.cpp | 4 +- src/torcontrol/TorEvents.cpp | 2 +- src/vidalia/MainWindow.cpp | 42 +----------------------------------- 6 files changed, 12 insertions(+), 100 deletions(-)

1 0

[vidalia/alpha] Add a changes file
by chiiph＠torproject.org 05 Mar '12

05 Mar '12

commit 7af8629cacc3103f15e38b30765c6939163f386a Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Mar 5 09:36:10 2012 -0300 Add a changes file --- changes/bug5109 | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/changes/bug5109 b/changes/bug5109 new file mode 100644 index 0000000..b9160ef --- /dev/null +++ b/changes/bug5109 @@ -0,0 +1,2 @@ + o Handle tor's bootstrap phases in a more generic way. Fixes bug + 5109. \ No newline at end of file

1 0

[vidalia/alpha] Merge branch 'featSettings' into alpha
by chiiph＠torproject.org 05 Mar '12

05 Mar '12

commit d1ccb6d960bfe886623efa8c6728eef9a9edc221 Merge: 5288d65 868091e Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Mar 5 09:40:37 2012 -0300 Merge branch 'featSettings' into alpha changes/featSettings | 6 + src/torcontrol/TorControl.cpp | 26 +- src/torcontrol/TorControl.h | 8 +- src/vidalia/CMakeLists.txt | 9 +- src/vidalia/MainWindow.cpp | 57 ++-- src/vidalia/Vidalia.cpp | 8 +- src/vidalia/Vidalia.h | 5 + src/vidalia/config/AbstractTorSettings.cpp | 10 + src/vidalia/config/AbstractTorSettings.h | 6 + src/vidalia/config/AdvancedPage.cpp | 4 +- src/vidalia/config/ConfigDialog.cpp | 16 +- src/vidalia/config/NetworkPage.cpp | 49 ++- src/vidalia/config/NetworkPage.h | 8 +- src/vidalia/config/NetworkSettings.cpp | 109 ++++-- src/vidalia/config/ServerSettings.cpp | 228 +++++++---- src/vidalia/config/ServerSettings.h | 6 +- src/vidalia/config/Service.cpp | 119 ------ src/vidalia/config/Service.h | 80 ---- src/vidalia/config/ServiceList.cpp | 56 --- src/vidalia/config/ServiceList.h | 51 --- src/vidalia/config/ServicePage.cpp | 613 ---------------------------- src/vidalia/config/ServicePage.h | 79 ---- src/vidalia/config/ServicePage.ui | 173 -------- src/vidalia/config/ServiceSettings.cpp | 167 -------- src/vidalia/config/ServiceSettings.h | 61 --- src/vidalia/config/TorSettings.cpp | 153 +++++--- src/vidalia/config/TorSettings.h | 7 +- src/vidalia/config/TorrcDialog.cpp | 92 +---- src/vidalia/config/TorrcDialog.ui | 43 -- src/vidalia/config/VSettings.cpp | 14 + src/vidalia/config/VSettings.h | 9 +- src/vidalia/config/torrc/Torrc.cpp | 247 +++++++++++ src/vidalia/config/torrc/Torrc.h | 75 ++++ src/vidalia/config/torrc/TorrcParser.cpp | 428 +++++++++++++++++++ src/vidalia/config/torrc/TorrcParser.h | 189 +++++++++ 35 files changed, 1424 insertions(+), 1787 deletions(-)

1 0

[vidalia/alpha] Update changes file to reflect support to microdescriptors
by chiiph＠torproject.org 05 Mar '12

05 Mar '12

commit a06bf9b17c2330694289663ddd7a6baa9cd948b1 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Mar 5 09:44:32 2012 -0300 Update changes file to reflect support to microdescriptors --- changes/featNetworkMap | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/changes/featNetworkMap b/changes/featNetworkMap index 740ac7a..d155342 100644 --- a/changes/featNetworkMap +++ b/changes/featNetworkMap @@ -1,3 +1,4 @@ + o Add support for Microdescriptors. Fixes ticket 4203. o Migrate the code that handles Marble to the new library interface. It works as expected with the latest Marble from the upstream git repo. \ No newline at end of file

1 0

[vidalia/alpha] Merge branch 'featAsyncControl' into alpha
by chiiph＠torproject.org 05 Mar '12

05 Mar '12

commit 3a6592f942f829f984078398e4f36ca117c912a6 Merge: 02f4053 460c177 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Mar 5 09:40:48 2012 -0300 Merge branch 'featAsyncControl' into alpha changes/featAsyncControl | 2 + src/torcontrol/ControlConnection.cpp | 98 +++++++++++----------------------- src/torcontrol/ControlConnection.h | 3 +- src/torcontrol/SendCommandEvent.cpp | 18 +----- src/torcontrol/TorControl.cpp | 4 ++ src/vidalia/MainWindow.cpp | 56 +++++++++---------- 6 files changed, 69 insertions(+), 112 deletions(-)

1 0

[onionoo/master] Escape "s in AS names and other fields.
by karsten＠torproject.org 05 Mar '12

05 Mar '12

commit d88a69b1626d1ac298d2f7fb1c2d2807223c2f9a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Mar 5 10:20:44 2012 +0100 Escape "s in AS names and other fields. --- build.xml | 1 + src/org/torproject/onionoo/DetailDataWriter.java | 29 +++++++++++++++------- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/build.xml b/build.xml index 995fa2f..652a49b 100644 --- a/build.xml +++ b/build.xml @@ -11,6 +11,7 @@ <path id="classpath"> <pathelement path="${classes}"/> <pathelement location="lib/commons-codec-1.4.jar"/> + <pathelement location="lib/commons-lang-2.5.jar"/> <pathelement location="lib/servlet-api.jar"/> <pathelement location="lib/descriptor.jar"/> <pathelement location="lib/maxmindgeoip.jar"/> diff --git a/src/org/torproject/onionoo/DetailDataWriter.java b/src/org/torproject/onionoo/DetailDataWriter.java index 98f0cb1..35b6484 100644 --- a/src/org/torproject/onionoo/DetailDataWriter.java +++ b/src/org/torproject/onionoo/DetailDataWriter.java @@ -21,6 +21,8 @@ import java.util.TimeZone; import java.util.TreeMap; import java.util.TreeSet; +import org.apache.commons.lang.StringEscapeUtils; + import org.torproject.descriptor.BridgePoolAssignment; import org.torproject.descriptor.Descriptor; import org.torproject.descriptor.DescriptorFile; @@ -278,11 +280,14 @@ public class DetailDataWriter { } sb.append("\n]"); if (descriptor.getContact() != null) { - sb.append(",\n\"contact\":\"" + descriptor.getContact() + "\""); + sb.append(",\n\"contact\":\"" + + StringEscapeUtils.escapeJavaScript( + descriptor.getContact()) + "\""); } if (descriptor.getPlatform() != null) { - sb.append(",\n\"platform\":\"" + descriptor.getPlatform() - + "\""); + sb.append(",\n\"platform\":\"" + + StringEscapeUtils.escapeJavaScript( + descriptor.getPlatform()) + "\""); } if (descriptor.getFamilyEntries() != null) { sb.append(",\n\"family\":["); @@ -338,19 +343,24 @@ public class DetailDataWriter { sb.append(",\n\"longitude\":" + longitude); } if (countryName != null) { - sb.append(",\n\"country_name\":\"" + countryName + "\""); + sb.append(",\n\"country_name\":\"" + + StringEscapeUtils.escapeJavaScript(countryName) + "\""); } if (regionName != null) { - sb.append(",\n\"region_name\":\"" + regionName + "\""); + sb.append(",\n\"region_name\":\"" + + StringEscapeUtils.escapeJavaScript(regionName) + "\""); } if (cityName != null) { - sb.append(",\n\"city_name\":\"" + cityName + "\""); + sb.append(",\n\"city_name\":\"" + + StringEscapeUtils.escapeJavaScript(cityName) + "\""); } if (aSNumber != null) { - sb.append(",\n\"as_number\":\"" + aSNumber + "\""); + sb.append(",\n\"as_number\":\"" + + StringEscapeUtils.escapeJavaScript(aSNumber) + "\""); } if (cityName != null) { - sb.append(",\n\"as_name\":\"" + aSName + "\""); + sb.append(",\n\"as_name\":\"" + + StringEscapeUtils.escapeJavaScript(aSName) + "\""); } /* Add exit addresses if at least one of them is distinct from the @@ -482,7 +492,8 @@ public class DetailDataWriter { sb.append("\"desc_published\":\"" + publishedDateTime + "\",\n" + "\"last_restarted\":\"" + lastRestartedString + "\",\n" + "\"advertised_bandwidth\":" + advertisedBandwidth + ",\n" - + "\"platform\":\"" + descriptor.getPlatform() + "\""); + + "\"platform\":\"" + StringEscapeUtils.escapeJavaScript( + descriptor.getPlatform()) + "\""); descriptorParts = sb.toString(); }

1 0

[onionoo/master] Allow for missing server descriptors.
by karsten＠torproject.org 05 Mar '12

05 Mar '12

commit 88a1569398c1b3ae8c101e40ecfcda989b18e02a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Mar 5 09:43:50 2012 +0100 Allow for missing server descriptors. --- src/org/torproject/onionoo/DetailDataWriter.java | 4 ++- web/index.html | 33 ++++++++++++++++------ 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/src/org/torproject/onionoo/DetailDataWriter.java b/src/org/torproject/onionoo/DetailDataWriter.java index fb15841..98f0cb1 100644 --- a/src/org/torproject/onionoo/DetailDataWriter.java +++ b/src/org/torproject/onionoo/DetailDataWriter.java @@ -231,7 +231,9 @@ public class DetailDataWriter { } } br.close(); - descriptorParts = sb.toString(); + if (sb.length() > 0) { + descriptorParts = sb.toString(); + } } catch (IOException e) { System.err.println("Could not read '" + detailsFile.getAbsolutePath() + "'. Skipping"); diff --git a/web/index.html b/web/index.html index 20bc02e..27bb094 100755 --- a/web/index.html +++ b/web/index.html @@ -215,22 +215,31 @@ Omitted if the relay IP address could not be found in the AS database. Added on February 28, 2012.</li> <li>"last_restarted": UTC timestamp (YYYY-MM-DD hh:mm:ss) when the relay was last (re-)started. -Required field.</li> +Optional field. +Missing if router descriptor containing this information cannot be found. +Made field optional on March 5, 2012.</li> <li>"advertised_bandwidth": Bandwidth in bytes per second that this relay is willing and capable to provide. -Required field.</li> +Optional field. +Missing if router descriptor containing this information cannot be found. +Made field optional on March 5, 2012.</li> <li>"exit_policy": Array of exit-policy lines. -Required field.</li> +Optional field. +Missing if router descriptor containing this information cannot be found. +Made field optional on March 5, 2012.</li> <li>"contact": Contact address of the relay operator. -Omitted if empty.</li> +Omitted if empty or if descriptor containing this information cannot be +found.</li> <li>"platform": Platform string containing operating system and Tor version details. Optional field. -Omitted if empty.</li> +Omitted if empty or if descriptor containing this information cannot be +found.</li> <li>"family": Array of fingerprints or nicknames of relays in the same family as this relay. Optional field. -Omitted if empty.</li> +Omitted if empty or if descriptor containing this information cannot be +found.</li> </ul> </li> <li>"bridges_published": UTC timestamp (YYYY-MM-DD hh:mm:ss) when @@ -264,13 +273,19 @@ Optional field. Omitted if empty.</li> <li>"last_restarted": UTC timestamp (YYYY-MM-DD hh:mm:ss) when the bridge was last (re-)started. -Required field.</li> +Optional field. +Missing if router descriptor containing this information cannot be found. +Made field optional on March 5, 2012.</li> <li>"advertised_bandwidth": Bandwidth in bytes per second that this bridge is willing and capable to provide. -Required field.</li> +Optional field. +Missing if router descriptor containing this information cannot be found. +Made field optional on March 5, 2012.</li> <li>"platform": Platform string containing operating system and Tor version details. -Omitted if not provided by the bridge.</li> +Optional field. +Omitted if not provided by the bridge or if descriptor containing this +information cannot be found.</li> <li>"pool_assignment": Information of the pool that BridgeDB assigned this bridge to, including further assignment information if available.

1 0

[onionoo/master] Remove deprecated details.
by karsten＠torproject.org 05 Mar '12

05 Mar '12

commit fc4a52d067c2e27c552166c45af7885b00b16c09 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Mar 5 08:55:57 2012 +0100 Remove deprecated details. --- src/org/torproject/onionoo/DetailDataWriter.java | 25 +------- src/org/torproject/onionoo/ResourceServlet.java | 4 +- web/index.html | 78 ---------------------- 3 files changed, 4 insertions(+), 103 deletions(-) diff --git a/src/org/torproject/onionoo/DetailDataWriter.java b/src/org/torproject/onionoo/DetailDataWriter.java index e6bdcdd..fb15841 100644 --- a/src/org/torproject/onionoo/DetailDataWriter.java +++ b/src/org/torproject/onionoo/DetailDataWriter.java @@ -266,7 +266,6 @@ public class DetailDataWriter { Math.min(descriptor.getBandwidthBurst(), descriptor.getBandwidthObserved())); sb.append("\"desc_published\":\"" + publishedDateTime + "\",\n" - + "\"uptime\":" + descriptor.getUptime() + ",\n" + "\"last_restarted\":\"" + lastRestartedString + "\",\n" + "\"advertised_bandwidth\":" + advertisedBandwidth + ",\n" + "\"exit_policy\":["); @@ -315,10 +314,7 @@ public class DetailDataWriter { sb.append("{\"version\":1,\n" + "\"nickname\":\"" + nickname + "\",\n" + "\"fingerprint\":\"" + fingerprint + "\",\n" - + "\"or_address\":[\"" + address + "\"],\n" - + "\"or_port\":" + orPort + ",\n" + "\"or_addresses\":[\"" + address + ":" + orPort + "\"],\n" - + "\"dir_port\":" + dirPort + ",\n" + "\"dir_address\":\"" + address + ":" + dirPort + "\",\n" + "\"running\":" + running + ",\n"); SortedSet<String> relayFlags = entry.getRelayFlags(); @@ -482,26 +478,9 @@ public class DetailDataWriter { Math.min(descriptor.getBandwidthBurst(), descriptor.getBandwidthObserved())); sb.append("\"desc_published\":\"" + publishedDateTime + "\",\n" - + "\"uptime\":" + descriptor.getUptime() + ",\n" + "\"last_restarted\":\"" + lastRestartedString + "\",\n" + "\"advertised_bandwidth\":" + advertisedBandwidth + ",\n" - + "\"exit_policy\":["); - int written = 0; - for (String exitPolicyLine : descriptor.getExitPolicyLines()) { - sb.append((written++ > 0 ? "," : "") + "\n \"" + exitPolicyLine - + "\""); - } - sb.append("\n],\n\"platform\":\"" + descriptor.getPlatform() - + "\""); - if (descriptor.getFamilyEntries() != null) { - sb.append(",\n\"family\":["); - written = 0; - for (String familyEntry : descriptor.getFamilyEntries()) { - sb.append((written++ > 0 ? "," : "") + "\n \"" + familyEntry - + "\""); - } - sb.append("\n]"); - } + + "\"platform\":\"" + descriptor.getPlatform() + "\""); descriptorParts = sb.toString(); } @@ -520,9 +499,7 @@ public class DetailDataWriter { StringBuilder sb = new StringBuilder(); sb.append("{\"version\":1,\n" + "\"hashed_fingerprint\":\"" + fingerprint + "\",\n" - + "\"or_port\":" + orPort + ",\n" + "\"or_addresses\":[\"" + address + ":" + orPort + "\"],\n" - + "\"dir_port\":" + dirPort + ",\n" + "\"running\":" + running + ","); SortedSet<String> relayFlags = entry.getRelayFlags(); if (!relayFlags.isEmpty()) { diff --git a/src/org/torproject/onionoo/ResourceServlet.java b/src/org/torproject/onionoo/ResourceServlet.java index 63d0edb..016c9ef 100644 --- a/src/org/torproject/onionoo/ResourceServlet.java +++ b/src/org/torproject/onionoo/ResourceServlet.java @@ -384,7 +384,9 @@ public class ResourceServlet extends HttpServlet { if (line != null) { sb.append("{"); while ((line = br.readLine()) != null) { - sb.append(line + "\n"); + if (!line.startsWith("\"desc_published\":")) { + sb.append(line + "\n"); + } } } br.close(); diff --git a/web/index.html b/web/index.html index 8e5766c..20bc02e 100755 --- a/web/index.html +++ b/web/index.html @@ -150,21 +150,6 @@ Omitted if the relay nickname is "Unnamed".</li> <li>"fingerprint": Relay fingerprint consisting of 40 upper-case hexadecimal characters. Required field.</li> -<li>"or_address": Array of IPv4 or IPv6 -addresses where the relay accepts onion-routing connections. -Deprecated field. -Deprecated, because a relay can have a different onion-routing port for -each onion-routing IP address. -Combining address and port in a single string solves this; see -"or_addresses" below. -Announced on January 26, will be removed after March 4, 2012.</li> -<li>"or_port": Onion-routing port. -Deprecated field. -Deprecated, because a relay can have a different onion-routing port for -each onion-routing IP address. -Combining address and port in a single string solves this; see -"or_addresses" below. -Announced on January 26, will be removed after March 4, 2012.</li> <li>"or_addresses": Array of IPv4 or IPv6 addresses and TCP ports or port lists where the relay accepts onion-routing connections. Required field.</li> @@ -175,12 +160,6 @@ Only those addresses are listed that are different from onion-routing addresses. Optional field. Omitted if array is empty.</li> -<li>"dir_port": Directory port. -Deprecated field. -Deprecated, because it's not clear which IP address the directory port -belongs to if there are more than one entries in "or_addresses". -Replaced by "dir_address". -Announced on January 26, will be removed after March 4, 2012.</li> <li>"dir_address": IPv4 address and TCP port where the relay accepts directory connections. Optional field. @@ -234,21 +213,6 @@ database by resolving the relay's first onion-routing IP address. Optional field. Omitted if the relay IP address could not be found in the AS database. Added on February 28, 2012.</li> -<li>"desc_published": UTC timestamp -(YYYY-MM-DD hh:mm:ss) when the relay last published a descriptor. -Deprecated field. -Deprecated, because this information is only useful to calculate the last -restart time of the relay, together with "uptime". -We can as well provide that time directly in "last_restarted". -Announced on January 26, will be removed after March 4, 2012.</li> -<li>"uptime" Uptime of the relay when -publishing its last descriptor. -Deprecated field. -Deprecated, because this information is only useful to calculate the last -restart time of the relay, together with "desc_published". -Even worse, it may be mistaken for the current uptime of the relay at the -time of publishing this detail document. -Announced on January 26, will be removed after March 4, 2012.</li> <li>"last_restarted": UTC timestamp (YYYY-MM-DD hh:mm:ss) when the relay was last (re-)started. Required field.</li> @@ -280,13 +244,6 @@ Each array object contains the following key-value pairs: <li>"hashed_fingerprint": SHA-1 hash of the bridge fingerprint consisting of 40 upper-case hexadecimal characters. Required field.</li> -<li>"or_port": TCP port where the bridge -accepts onion-routing connections. -Deprecated field. -Deprecated, because a bridge can use a different port for each -onion-routing address. -Replaced with "or_addresses". -Announced on January 26, will be removed after March 4, 2012.</li> <li>"or_addresses": Array of sanitized IPv4 or IPv6 addresses and TCP ports or port lists where the bridge accepts onion-routing connections. @@ -298,13 +255,6 @@ Sanitized IP addresses always change on the 1st of every month at 00:00:00 UTC, regardless of the bridge actually changing its IP address. TCP ports are not sanitized. Required field.</li> -<li>"dir_port": TCP port where the bridge -accepts directory connections. -Deprecated field. -Deprecated, because bridges don't act as directory mirrors and only have a -non-zero directory port if they're misconfigured. -Even then, the directory port number is not relevant. -Announced on January 26, will be removed after March 4, 2012.</li> <li>"running": Boolean field saying whether this bridge was listed as running in the last bridge network status. Required field.</li> @@ -312,43 +262,15 @@ Required field.</li> assigned to this bridge. Optional field. Omitted if empty.</li> -<li>"desc_published": UTC timestamp -(YYYY-MM-DD hh:mm:ss) when the bridge last published a descriptor. -Deprecated field. -Deprecated, because this information is only useful to calculate the last -restart time of the bridge, together with "uptime". -We can as well provide that time directly in "last_restarted". -Announced on January 26, will be removed after March 4, 2012.</li> -<li>"uptime" Uptime of the bridge when -publishing its last descriptor. -Deprecated field. -Deprecated, because this information is only useful to calculate the last -restart time of the bridge, together with "desc_published". -Even worse, it may be mistaken for the current uptime of the bridge at the -time of publishing this detail document. -Announced on January 26, will be removed after March 4, 2012.</li> <li>"last_restarted": UTC timestamp (YYYY-MM-DD hh:mm:ss) when the bridge was last (re-)started. Required field.</li> <li>"advertised_bandwidth": Bandwidth in bytes per second that this bridge is willing and capable to provide. Required field.</li> -<li>"exit_policy": Array of exit-policy -lines. -Deprecated field. -Deprecated, because exit policies are not relevant for bridges and only -indicate a (harmless) misconfiguration. -Announced on January 26, will be removed after March 4, 2012.</li> <li>"platform": Platform string containing operating system and Tor version details. Omitted if not provided by the bridge.</li> -<li>"family": Array of hashed fingerprints -or "Unnamed" nicknames of relays or bridges in the same family as this -bridge. -Deprecated field. -Deprecated, because node families are not relevant for bridges and only -indicate a (harmless) misconfiguration. -Announced on January 26, will be removed after March 4, 2012.</li> <li>"pool_assignment": Information of the pool that BridgeDB assigned this bridge to, including further assignment information if available.

1 0