tor-commits April 2013

tor-commits@lists.torproject.org

19 participants
1496 discussions

[tor-launcher/master] If env var TOR_SKIP_LAUNCH=1, do not start the tor process.
by brade＠torproject.org 10 Apr '13

10 Apr '13

commit 9e444ef8062dfcdef233fc1a5e19a01afbc941c9 Author: Kathy Brade <brade(a)torproject.org> Date: Wed Apr 10 12:01:01 2013 -0400 If env var TOR_SKIP_LAUNCH=1, do not start the tor process. --- src/components/tl-process.js | 3 +-- src/components/tl-protocol.js | 4 +--- src/modules/tl-util.jsm | 16 ++++++++++++++++ 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 655745e..6bff855 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -30,7 +30,6 @@ TorProcessService.prototype = kServiceName : "Tor Launcher Process Service", kClassID: Components.ID("{FE7B4CAF-BCF4-4848-8BFF-EFA66C9AFDA1}"), - kPrefStartTor: "extensions.torlauncher.start_tor", kPrefPromptAtStartup: "extensions.torlauncher.prompt_at_startup", kInitialMonitorDelayMS: 1000, // TODO: how can we avoid this delay? kMonitorDelayMS: 200, @@ -78,7 +77,7 @@ TorProcessService.prototype = this.mObsSvc.addObserver(this, kOpenNetworkSettingsTopic, false); this.mObsSvc.addObserver(this, kUserQuitTopic, false); - if (TorLauncherUtil.getBoolPref(this.kPrefStartTor)) + if (TorLauncherUtil.shouldStartAndOwnTor) this._startTor(); } else if ("quit-application-granted" == aTopic) diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js index f760e63..15000a5 100644 --- a/src/components/tl-protocol.js +++ b/src/components/tl-protocol.js @@ -71,8 +71,6 @@ TorProtocolService.prototype = kServiceName : "Tor Launcher Protocol Service", kClassID: Components.ID("{4F476361-23FB-43EF-A427-B36A14D3208E}"), - kPrefStartTor: "extensions.torlauncher.start_tor", - // nsISupports implementation. QueryInterface: function(aIID) { @@ -438,7 +436,7 @@ TorProtocolService.prototype = return null; } - if (TorLauncherUtil.getBoolPref(this.kPrefStartTor)) + if (TorLauncherUtil.shouldStartAndOwnTor) { // Try to become the primary controller (TAKEOWNERSHIP). reply = this._sendCommand(conn, "TAKEOWNERSHIP", null); diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index 8809ee4..0de2f05 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -128,6 +128,22 @@ let TorLauncherUtil = // Public return rv; }, + + get shouldStartAndOwnTor() + { + const kPrefStartTor = "extensions.torlauncher.start_tor"; + try + { + const kEnvSkipLaunch = "TOR_SKIP_LAUNCH"; + + var env = Cc["@mozilla.org/process/environment;1"] + .getService(Ci.nsIEnvironment); + if (env.exists(kEnvSkipLaunch)) + return ("1" != env.get(kEnvSkipLaunch)); + } catch(e) {} + + return this.getBoolPref(kPrefStartTor, true); + }, };

1 0

[tor-launcher/master] Improve progress dialog.
by brade＠torproject.org 10 Apr '13

10 Apr '13

commit 0ae1c7685850958c4f5a81919d7a5d9c98bd6f15 Author: Kathy Brade <brade(a)torproject.org> Date: Wed Apr 10 11:28:25 2013 -0400 Improve progress dialog. Show "Connecting to the Tor network" heading and, if browser window is not open yet, show "Your browser will open after you are connected." message. --- src/chrome/content/network-settings.js | 3 ++- src/chrome/content/progress.js | 16 +++++++++++++++- src/chrome/content/progress.xul | 3 ++- src/chrome/locale/en/progress.dtd | 2 ++ src/chrome/skin/progress.css | 5 +++++ src/components/tl-process.js | 23 ++++++++++++++--------- 6 files changed, 40 insertions(+), 12 deletions(-) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index a2f57ad..85f7422 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -291,7 +291,8 @@ function openProgressDialog() { var chromeURL = "chrome://torlauncher/content/progress.xul"; var features = "chrome,dialog=yes,modal=yes,dependent=yes"; - window.openDialog(chromeURL, "_blank", features, onProgressDialogClose); + window.openDialog(chromeURL, "_blank", features, + gIsInitialBootstrap, onProgressDialogClose); } diff --git a/src/chrome/content/progress.js b/src/chrome/content/progress.js index 33bdcda..0f21d4c 100644 --- a/src/chrome/content/progress.js +++ b/src/chrome/content/progress.js @@ -27,8 +27,14 @@ function initDialog() } catch (e) {} + var isBrowserStartup = false; if (window.arguments) - gOpenerCallbackFunc = window.arguments[0]; + { + isBrowserStartup = window.arguments[0]; + + if (window.arguments.length > 1) + gOpenerCallbackFunc = window.arguments[1]; + } // If this dialog was not opened from network settings, change Cancel to Quit. if (!gOpenerCallbackFunc) @@ -37,6 +43,14 @@ function initDialog() var quitKey = (TorLauncherUtil.isWindows) ? "quit_win" : "quit"; cancelBtn.label = TorLauncherUtil.getLocalizedString(quitKey); } + + // If opened during browser startup, display the "please wait" message. + if (isBrowserStartup) + { + var pleaseWait = document.getElementById("progressPleaseWait"); + if (pleaseWait) + pleaseWait.removeAttribute("hidden"); + } } diff --git a/src/chrome/content/progress.xul b/src/chrome/content/progress.xul index b8b2026..c5c5aca 100644 --- a/src/chrome/content/progress.xul +++ b/src/chrome/content/progress.xul @@ -30,10 +30,11 @@ </vbox> <separator orient="vertical" /> <vbox> - <label id="progressHeading" value="&torprogress.dialog.title;" /> + <label id="progressHeading" value="&torprogress.heading;" /> <description id="progressDesc" /> </vbox> </hbox> <progressmeter id="progressMeter" mode="determined" value="0" /> + <label id="progressPleaseWait" value="&torprogress.pleaseWait;" hidden="true" /> </vbox> </dialog> diff --git a/src/chrome/locale/en/progress.dtd b/src/chrome/locale/en/progress.dtd index 1fe3a86..ce247a4 100644 --- a/src/chrome/locale/en/progress.dtd +++ b/src/chrome/locale/en/progress.dtd @@ -1 +1,3 @@ <!ENTITY torprogress.dialog.title "Tor Status"> +<!ENTITY torprogress.heading "Connecting to the Tor network"> +<!ENTITY torprogress.pleaseWait "Your browser will open after you are connected."> diff --git a/src/chrome/skin/progress.css b/src/chrome/skin/progress.css index c3ca079..671870f 100644 --- a/src/chrome/skin/progress.css +++ b/src/chrome/skin/progress.css @@ -15,6 +15,11 @@ dialog { font-weight: bold; } +#progressPleaseWait { + font-size: 110%; + margin-bottom: 15px; +} + #tbb-icon { list-style-image: url("chrome://torlauncher/skin/default48.png"); width: 48px; diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 4d77d21..655745e 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -342,14 +342,7 @@ TorProcessService.prototype = var wwSvc = Cc["@mozilla.org/embedcomp/window-watcher;1"] .getService(Ci.nsIWindowWatcher); var winFeatures = "chrome,dialog=yes,modal,all"; - - var argsArray = Cc["@mozilla.org/array;1"] - .createInstance(Ci.nsIMutableArray); - var variant = Cc["@mozilla.org/variant;1"] - .createInstance(Ci.nsIWritableVariant); - variant.setFromVariant(aIsInitialBootstrap); - argsArray.appendElement(variant, false); - + var argsArray = this._createOpenWindowArgsArray(aIsInitialBootstrap); wwSvc.openWindow(null, kChromeURL, "_blank", winFeatures, argsArray); }, @@ -359,7 +352,19 @@ TorProcessService.prototype = var wwSvc = Cc["@mozilla.org/embedcomp/window-watcher;1"] .getService(Ci.nsIWindowWatcher); var winFeatures = "chrome,dialog=yes,modal,all"; - wwSvc.openWindow(null, chromeURL, "_blank", winFeatures, null); + var argsArray = this._createOpenWindowArgsArray(true); + wwSvc.openWindow(null, chromeURL, "_blank", winFeatures, argsArray); + }, + + _createOpenWindowArgsArray: function(aBool) + { + var argsArray = Cc["@mozilla.org/array;1"] + .createInstance(Ci.nsIMutableArray); + var variant = Cc["@mozilla.org/variant;1"] + .createInstance(Ci.nsIWritableVariant); + variant.setFromVariant(aBool); + argsArray.appendElement(variant, false); + return argsArray; }, // Returns an nsIFile.

1 0

r26154: {website} Raising the JTor activity to moderate Bruce and velope reque (website/trunk/getinvolved/en)
by Damian Johnson 10 Apr '13

10 Apr '13

Author: atagar Date: 2013-04-10 14:52:43 +0000 (Wed, 10 Apr 2013) New Revision: 26154 Modified: website/trunk/getinvolved/en/volunteer.wml Log: Raising the JTor activity to moderate Bruce and velope requested for it to be raised. I'm tempted to say 'heavy' based on the number of commits, but prior to March there was no activity at all for two years so I'm gonna hold off on doing that until we see if this is maintained or a flash in the pan. Modified: website/trunk/getinvolved/en/volunteer.wml =================================================================== --- website/trunk/getinvolved/en/volunteer.wml 2013-04-09 16:41:49 UTC (rev 26153) +++ website/trunk/getinvolved/en/volunteer.wml 2013-04-10 14:52:43 UTC (rev 26154) @@ -156,7 +156,7 @@ <td>*<a href="#project-jtor">JTor</a></td> <td>Core</td> <td>Java</td> - <td>None</td> + <td>Moderate</td> <td>bleidl</td> </tr>

1 0

[onionoo/master] Make two new parameters for #6509 visible.
by karsten＠torproject.org 10 Apr '13

10 Apr '13

commit f237433ca2ec23fe0bdb597819b6947b6c08fa6a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Apr 10 11:55:38 2013 +0200 Make two new parameters for #6509 visible. --- web/index.html | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/web/index.html b/web/index.html index e1f15d5..9651160 100755 --- a/web/index.html +++ b/web/index.html @@ -674,7 +674,6 @@ first parameter value will be considered. Filtering by flag is case-insensitive. Added on April 9. </td></tr> - </table> Relay and/or bridge documents in the response can be ordered and limited by providing further parameters.

1 0

[onionoo/master] Clarify that the flag parameter is not for bridges.
by karsten＠torproject.org 10 Apr '13

10 Apr '13

commit 9995811ac0e2fc018baa5dd463bea68eef1c2dd5 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Apr 10 10:31:59 2013 +0200 Clarify that the flag parameter is not for bridges. --- web/index.html | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/web/index.html b/web/index.html index 9427978..e1f15d5 100755 --- a/web/index.html +++ b/web/index.html @@ -667,9 +667,8 @@ Filtering by AS number is case-insensitive. Added on April 9. </td></tr> <tr><td>flag</td> -<td>Return only relays or bridges which have the -given relay flag assigned by the directory authorities or the bridge -authority. +<td>Return only relays which have the +given relay flag assigned by the directory authorities. Note that if the flag parameter is specified more than once, only the first parameter value will be considered. Filtering by flag is case-insensitive.

1 0

[onionoo/master] Log back-end performance to find bottlenecks.
by karsten＠torproject.org 10 Apr '13

10 Apr '13

commit d49ab37d9ab06b175013d94ba7c56f0c947e82a9 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Apr 10 10:23:20 2013 +0200 Log back-end performance to find bottlenecks. --- src/org/torproject/onionoo/Main.java | 38 ++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/src/org/torproject/onionoo/Main.java b/src/org/torproject/onionoo/Main.java index af45221..e83e4b5 100644 --- a/src/org/torproject/onionoo/Main.java +++ b/src/org/torproject/onionoo/Main.java @@ -12,49 +12,87 @@ public class Main { printStatus("Updating internal node list."); CurrentNodes cn = new CurrentNodes(); cn.readRelaySearchDataFile(new File("status/summary")); + printStatusTime("Read status/summary"); cn.readRelayNetworkConsensuses(); + printStatusTime("Read network status consensuses"); cn.setRelayRunningBits(); + printStatusTime("Set relay running bits"); cn.lookUpCitiesAndASes(); + printStatusTime("Looked up cities and ASes"); cn.readBridgeNetworkStatuses(); + printStatusTime("Read bridge network statuses"); cn.setBridgeRunningBits(); + printStatusTime("Set bridge running bits"); cn.writeRelaySearchDataFile(new File("status/summary"), true); + printStatusTime("Wrote status/summary"); printStatus("Updating detail data."); DetailDataWriter ddw = new DetailDataWriter(); ddw.setCurrentRelays(cn.getCurrentRelays()); + printStatusTime("Set current relays"); ddw.setCurrentBridges(cn.getCurrentBridges()); + printStatusTime("Set current bridges"); ddw.startReverseDomainNameLookups(); + printStatusTime("Started reverse domain name lookups"); ddw.readRelayServerDescriptors(); + printStatusTime("Read relay server descriptors"); ddw.calculatePathSelectionProbabilities(cn.getLastBandwidthWeights()); + printStatusTime("Calculated path selection probabilities"); ddw.readExitLists(); + printStatusTime("Read exit lists"); ddw.readBridgeServerDescriptors(); + printStatusTime("Read bridge server descriptors"); ddw.readBridgePoolAssignments(); + printStatusTime("Read bridge-pool assignments"); ddw.finishReverseDomainNameLookups(); + printStatusTime("Finished reverse domain name lookups"); ddw.writeDetailDataFiles(); + printStatusTime("Wrote detail data files"); printStatus("Updating bandwidth data."); BandwidthDataWriter bdw = new BandwidthDataWriter(); bdw.setCurrentRelays(cn.getCurrentRelays()); + printStatusTime("Set current relays"); bdw.setCurrentBridges(cn.getCurrentBridges()); + printStatusTime("Set current bridges"); bdw.readExtraInfoDescriptors(); + printStatusTime("Read extra-info descriptors"); bdw.deleteObsoleteBandwidthFiles(); + printStatusTime("Deleted obsolete bandwidth files"); printStatus("Updating weights data."); WeightsDataWriter wdw = new WeightsDataWriter(); wdw.setCurrentRelays(cn.getCurrentRelays()); + printStatusTime("Set current relays"); wdw.readRelayServerDescriptors(); + printStatusTime("Read relay server descriptors"); wdw.readRelayNetworkConsensuses(); + printStatusTime("Read relay network consensuses"); wdw.writeWeightsDataFiles(); + printStatusTime("Wrote weights data files"); wdw.deleteObsoleteWeightsDataFiles(); + printStatusTime("Deleted obsolete weights files"); printStatus("Updating summary data."); cn.writeRelaySearchDataFile(new File("out/summary"), false); + printStatusTime("Wrote out/summary"); printStatus("Terminating."); } + private static long printedLastStatusMessage = + System.currentTimeMillis(); + private static void printStatus(String message) { System.out.println(new Date() + ": " + message); + printedLastStatusMessage = System.currentTimeMillis(); + } + + private static void printStatusTime(String message) { + long now = System.currentTimeMillis(); + System.out.println(" " + message + " (" + + (now - printedLastStatusMessage) + " millis)."); + printedLastStatusMessage = now; } }

1 0

[onionoo/master] Add first_seen_days and last_seen_days parameters.
by karsten＠torproject.org 10 Apr '13

10 Apr '13

commit 63f9e228dc3b02bf0831476f7dbd36721ddfb531 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Apr 9 15:19:59 2013 +0200 Add first_seen_days and last_seen_days parameters. Implements step 3 of #6509. --- src/org/torproject/onionoo/ResourceServlet.java | 127 ++++++++++++++++++++++- web/index.html | 23 ++++ 2 files changed, 147 insertions(+), 3 deletions(-) diff --git a/src/org/torproject/onionoo/ResourceServlet.java b/src/org/torproject/onionoo/ResourceServlet.java index 8c88781..03e129b 100644 --- a/src/org/torproject/onionoo/ResourceServlet.java +++ b/src/org/torproject/onionoo/ResourceServlet.java @@ -16,8 +16,10 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.SortedMap; import java.util.SortedSet; import java.util.TimeZone; +import java.util.TreeMap; import java.util.TreeSet; import java.util.regex.Pattern; @@ -56,6 +58,9 @@ public class ResourceServlet extends HttpServlet { bridgeFingerprintSummaryLines = null; private Map<String, Set<String>> relaysByCountryCode = null, relaysByASNumber = null, relaysByFlag = null; + private SortedMap<Integer, Set<String>> relaysByFirstSeenDays = null, + bridgesByFirstSeenDays = null, relaysByLastSeenDays = null, + bridgesByLastSeenDays = null; private void readSummaryFile() { if (!summaryFile.exists()) { readSummaryFile = false; @@ -70,6 +75,11 @@ public class ResourceServlet extends HttpServlet { relaysByCountryCode = new HashMap<String, Set<String>>(), relaysByASNumber = new HashMap<String, Set<String>>(), relaysByFlag = new HashMap<String, Set<String>>(); + SortedMap<Integer, Set<String>> + relaysByFirstSeenDays = new TreeMap<Integer, Set<String>>(), + bridgesByFirstSeenDays = new TreeMap<Integer, Set<String>>(), + relaysByLastSeenDays = new TreeMap<Integer, Set<String>>(), + bridgesByLastSeenDays = new TreeMap<Integer, Set<String>>(); CurrentNodes cn = new CurrentNodes(); cn.readRelaySearchDataFile(this.summaryFile); cn.setRelayRunningBits(); @@ -82,6 +92,7 @@ public class ResourceServlet extends HttpServlet { this.bridgesPublishedString = dateTimeFormat.format( cn.getLastPublishedMillis()); List<String> orderRelaysByConsensusWeight = new ArrayList<String>(); + long now = System.currentTimeMillis(); for (Node entry : cn.getCurrentRelays().values()) { String fingerprint = entry.getFingerprint().toUpperCase(); String hashedFingerprint = entry.getHashedFingerprint(). @@ -118,6 +129,24 @@ public class ResourceServlet extends HttpServlet { relaysByFlag.get(flagLowerCase).add(fingerprint); relaysByFlag.get(flagLowerCase).add(hashedFingerprint); } + int daysSinceFirstSeen = (int) ((now - entry.getFirstSeenMillis()) + / 86400000L); + if (!relaysByFirstSeenDays.containsKey(daysSinceFirstSeen)) { + relaysByFirstSeenDays.put(daysSinceFirstSeen, + new HashSet<String>()); + } + relaysByFirstSeenDays.get(daysSinceFirstSeen).add(fingerprint); + relaysByFirstSeenDays.get(daysSinceFirstSeen).add( + hashedFingerprint); + int daysSinceLastSeen = (int) ((now - entry.getLastSeenMillis()) + / 86400000L); + if (!relaysByLastSeenDays.containsKey(daysSinceLastSeen)) { + relaysByLastSeenDays.put(daysSinceLastSeen, + new HashSet<String>()); + } + relaysByLastSeenDays.get(daysSinceLastSeen).add(fingerprint); + relaysByLastSeenDays.get(daysSinceLastSeen).add( + hashedFingerprint); } Collections.sort(orderRelaysByConsensusWeight); relaysByConsensusWeight = new ArrayList<String>(); @@ -131,6 +160,26 @@ public class ResourceServlet extends HttpServlet { String line = this.formatBridgeSummaryLine(entry); bridgeFingerprintSummaryLines.put(hashedFingerprint, line); bridgeFingerprintSummaryLines.put(hashedHashedFingerprint, line); + int daysSinceFirstSeen = (int) ((now - entry.getFirstSeenMillis()) + / 86400000L); + if (!bridgesByFirstSeenDays.containsKey(daysSinceFirstSeen)) { + bridgesByFirstSeenDays.put(daysSinceFirstSeen, + new HashSet<String>()); + } + bridgesByFirstSeenDays.get(daysSinceFirstSeen).add( + hashedFingerprint); + bridgesByFirstSeenDays.get(daysSinceFirstSeen).add( + hashedHashedFingerprint); + int daysSinceLastSeen = (int) ((now - entry.getLastSeenMillis()) + / 86400000L); + if (!bridgesByLastSeenDays.containsKey(daysSinceLastSeen)) { + bridgesByLastSeenDays.put(daysSinceLastSeen, + new HashSet<String>()); + } + bridgesByLastSeenDays.get(daysSinceLastSeen).add( + hashedFingerprint); + bridgesByLastSeenDays.get(daysSinceLastSeen).add( + hashedHashedFingerprint); } this.relaysByConsensusWeight = relaysByConsensusWeight; this.relayFingerprintSummaryLines = relayFingerprintSummaryLines; @@ -138,6 +187,10 @@ public class ResourceServlet extends HttpServlet { this.relaysByCountryCode = relaysByCountryCode; this.relaysByASNumber = relaysByASNumber; this.relaysByFlag = relaysByFlag; + this.relaysByFirstSeenDays = relaysByFirstSeenDays; + this.relaysByLastSeenDays = relaysByLastSeenDays; + this.bridgesByFirstSeenDays = bridgesByFirstSeenDays; + this.bridgesByLastSeenDays = bridgesByLastSeenDays; } this.summaryFileLastModified = summaryFile.lastModified(); this.readSummaryFile = true; @@ -225,9 +278,9 @@ public class ResourceServlet extends HttpServlet { /* Make sure that the request doesn't contain any unknown * parameters. */ - Set<String> knownParameters = new HashSet<String>(Arrays.asList( - "type,running,search,lookup,country,as,flag,order,limit,offset". - split(","))); + Set<String> knownParameters = new HashSet<String>(Arrays.asList(( + "type,running,search,lookup,country,as,flag,first_seen_days," + + "last_seen_days,order,limit,offset").split(","))); for (String parameterKey : parameterMap.keySet()) { if (!knownParameters.contains(parameterKey)) { response.sendError(HttpServletResponse.SC_BAD_REQUEST); @@ -313,6 +366,30 @@ public class ResourceServlet extends HttpServlet { } this.filterByFlag(filteredRelays, filteredBridges, flagParameter); } + if (parameterMap.containsKey("first_seen_days")) { + int[] days = this.parseDaysParameter( + parameterMap.get("first_seen_days")); + if (days == null) { + response.sendError(HttpServletResponse.SC_BAD_REQUEST); + return; + } + this.filterNodesByDays(filteredRelays, this.relaysByFirstSeenDays, + days); + this.filterNodesByDays(filteredBridges, this.bridgesByFirstSeenDays, + days); + } + if (parameterMap.containsKey("last_seen_days")) { + int[] days = this.parseDaysParameter( + parameterMap.get("last_seen_days")); + if (days == null) { + response.sendError(HttpServletResponse.SC_BAD_REQUEST); + return; + } + this.filterNodesByDays(filteredRelays, this.relaysByLastSeenDays, + days); + this.filterNodesByDays(filteredBridges, this.bridgesByLastSeenDays, + days); + } /* Re-order and limit results. */ List<String> orderedRelays = new ArrayList<String>(); @@ -468,6 +545,33 @@ public class ResourceServlet extends HttpServlet { return parameter; } + private static Pattern daysPattern = Pattern.compile("^[0-9-]{1,10}$"); + private int[] parseDaysParameter(String parameter) { + if (!daysPattern.matcher(parameter).matches()) { + return null; + } + int x = 0, y = Integer.MAX_VALUE; + try { + if (!parameter.contains("-")) { + x = y = Integer.parseInt(parameter); + } else { + String[] parts = parameter.split("-", 2); + if (parts[0].length() > 0) { + x = Integer.parseInt(parts[0]); + } + if (parts.length > 1 && parts[1].length() > 0) { + y = Integer.parseInt(parts[1]); + } + } + } catch (NumberFormatException e) { + return null; + } + if (x > y) { + return null; + } + return new int[] { x, y }; + } + private void filterByType(Map<String, String> filteredRelays, Map<String, String> filteredBridges, boolean relaysRequested) { if (relaysRequested) { @@ -664,6 +768,23 @@ public class ResourceServlet extends HttpServlet { filteredBridges.clear(); } + private void filterNodesByDays(Map<String, String> filteredNodes, + SortedMap<Integer, Set<String>> nodesByDays, int[] days) { + Set<String> removeNodes = new HashSet<String>(); + for (Set<String> nodes : nodesByDays.headMap(days[0]).values()) { + removeNodes.addAll(nodes); + } + if (days[1] < Integer.MAX_VALUE) { + for (Set<String> nodes : + nodesByDays.tailMap(days[1] + 1).values()) { + removeNodes.addAll(nodes); + } + } + for (String fingerprint : removeNodes) { + filteredNodes.remove(fingerprint); + } + } + private void writeRelays(List<String> relays, PrintWriter pw, String resourceType) { pw.write("{\"relays_published\":\"" + this.relaysPublishedString diff --git a/web/index.html b/web/index.html index cfd857d..9427978 100755 --- a/web/index.html +++ b/web/index.html @@ -675,6 +675,29 @@ first parameter value will be considered. Filtering by flag is case-insensitive. Added on April 9. </td></tr> + </table> Relay and/or bridge documents in the response can be ordered and limited by providing further parameters.

1 0

[onionoo/master] Remember nodes even if they drop out for 7+ days.
by karsten＠torproject.org 10 Apr '13

10 Apr '13

commit 49595204ad73da7fca1a5285e693400195d66247 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Apr 9 11:08:00 2013 +0200 Remember nodes even if they drop out for 7+ days. Implements step 2 of #6509. --- src/org/torproject/onionoo/CurrentNodes.java | 93 ++++++++++++++----------- src/org/torproject/onionoo/Main.java | 5 +- web/index.html | 27 ++++---- 3 files changed, 68 insertions(+), 57 deletions(-) diff --git a/src/org/torproject/onionoo/CurrentNodes.java b/src/org/torproject/onionoo/CurrentNodes.java index f2bbac7..db4305d 100644 --- a/src/org/torproject/onionoo/CurrentNodes.java +++ b/src/org/torproject/onionoo/CurrentNodes.java @@ -11,6 +11,7 @@ import java.io.IOException; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Arrays; +import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; @@ -36,16 +37,12 @@ import org.torproject.descriptor.RelayNetworkStatusConsensus; * days. */ public class CurrentNodes { - private File internalRelaySearchDataFile; - /* Read the internal relay search data file from disk. */ - public void readRelaySearchDataFile(File internalRelaySearchDataFile) { - this.internalRelaySearchDataFile = internalRelaySearchDataFile; - if (this.internalRelaySearchDataFile.exists() && - !this.internalRelaySearchDataFile.isDirectory()) { + public void readRelaySearchDataFile(File summaryFile) { + if (summaryFile.exists() && !summaryFile.isDirectory()) { try { BufferedReader br = new BufferedReader(new FileReader( - this.internalRelaySearchDataFile)); + summaryFile)); String line; SimpleDateFormat dateTimeFormat = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss"); @@ -55,7 +52,7 @@ public class CurrentNodes { boolean isRelay = parts[0].equals("r"); if (parts.length < 9) { System.err.println("Line '" + line + "' in '" - + this.internalRelaySearchDataFile.getAbsolutePath() + + summaryFile.getAbsolutePath() + "' is invalid. Exiting."); System.exit(1); } @@ -69,7 +66,7 @@ public class CurrentNodes { String[] addressParts = addresses.split(";", -1); if (addressParts.length != 3) { System.err.println("Line '" + line + "' in '" - + this.internalRelaySearchDataFile.getAbsolutePath() + + summaryFile.getAbsolutePath() + " is invalid. Exiting."); System.exit(1); } @@ -147,14 +144,12 @@ public class CurrentNodes { br.close(); } catch (IOException e) { System.err.println("Could not read " - + this.internalRelaySearchDataFile.getAbsolutePath() - + ". Exiting."); + + summaryFile.getAbsolutePath() + ". Exiting."); e.printStackTrace(); System.exit(1); } catch (ParseException e) { System.err.println("Could not read " - + this.internalRelaySearchDataFile.getAbsolutePath() - + ". Exiting."); + + summaryFile.getAbsolutePath() + ". Exiting."); e.printStackTrace(); System.exit(1); } @@ -162,21 +157,18 @@ public class CurrentNodes { } /* Write the internal relay search data file to disk. */ - public void writeRelaySearchDataFile() { + public void writeRelaySearchDataFile(File summaryFile, + boolean includeOldNodes) { try { - this.internalRelaySearchDataFile.getParentFile().mkdirs(); + summaryFile.getParentFile().mkdirs(); BufferedWriter bw = new BufferedWriter(new FileWriter( - this.internalRelaySearchDataFile)); + summaryFile)); SimpleDateFormat dateTimeFormat = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss"); dateTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC")); - long cutoff = System.currentTimeMillis() - - 7L * 24L * 60L * 60L * 1000L; - for (Node entry : this.currentRelays.values()) { - long lastSeenMillis = entry.getLastSeenMillis(); - if (lastSeenMillis < cutoff) { - continue; - } + Collection<Node> relays = includeOldNodes + ? this.knownRelays.values() : this.getCurrentRelays().values(); + for (Node entry : relays) { String nickname = entry.getNickname(); String fingerprint = entry.getFingerprint(); String address = entry.getAddress(); @@ -193,7 +185,8 @@ public class CurrentNodes { addressesBuilder.append((written++ > 0 ? "+" : "") + exitAddress); } - String lastSeen = dateTimeFormat.format(lastSeenMillis); + String lastSeen = dateTimeFormat.format( + entry.getLastSeenMillis()); String orPort = String.valueOf(entry.getOrPort()); String dirPort = String.valueOf(entry.getDirPort()); StringBuilder flagsBuilder = new StringBuilder(); @@ -226,7 +219,10 @@ public class CurrentNodes { + portList + " " + firstSeen + " " + lastChangedAddresses + " " + aSNumber + "\n"); } - for (Node entry : this.currentBridges.values()) { + Collection<Node> bridges = includeOldNodes + ? this.knownBridges.values() + : this.getCurrentBridges().values(); + for (Node entry : bridges) { String nickname = entry.getNickname(); String fingerprint = entry.getFingerprint(); String published = dateTimeFormat.format( @@ -258,8 +254,7 @@ public class CurrentNodes { bw.close(); } catch (IOException e) { System.err.println("Could not write '" - + this.internalRelaySearchDataFile.getAbsolutePath() - + "' to disk. Exiting."); + + summaryFile.getAbsolutePath() + "' to disk. Exiting."); e.printStackTrace(); System.exit(1); } @@ -294,7 +289,7 @@ public class CurrentNodes { public void setRelayRunningBits() { if (this.lastValidAfterMillis > 0L) { - for (Node entry : this.currentRelays.values()) { + for (Node entry : this.knownRelays.values()) { entry.setRunning(entry.getLastSeenMillis() == this.lastValidAfterMillis); } @@ -350,8 +345,8 @@ public class CurrentNodes { addresses.addAll(orAddressesAndPorts); lastAddresses.put(lastChangedAddresses, addresses); /* See if there's already an entry for this relay. */ - if (this.currentRelays.containsKey(fingerprint)) { - Node existingEntry = this.currentRelays.get(fingerprint); + if (this.knownRelays.containsKey(fingerprint)) { + Node existingEntry = this.knownRelays.get(fingerprint); if (lastSeenMillis < existingEntry.getLastSeenMillis()) { /* Use latest information for nickname, current addresses, etc. */ nickname = existingEntry.getNickname(); @@ -384,7 +379,7 @@ public class CurrentNodes { dirPort, relayFlags, consensusWeight, countryCode, hostName, lastRdnsLookup, defaultPolicy, portList, firstSeenMillis, lastAddresses, aSNumber); - this.currentRelays.put(fingerprint, entry); + this.knownRelays.put(fingerprint, entry); /* If this entry comes from a new consensus, update our global last * valid-after time. */ if (lastSeenMillis > this.lastValidAfterMillis) { @@ -436,7 +431,7 @@ public class CurrentNodes { /* Obtain a map from relay IP address strings to numbers. */ Map<String, Long> addressStringNumbers = new HashMap<String, Long>(); Pattern ipv4Pattern = Pattern.compile("^[0-9\\.]{7,15}$"); - for (Node relay : this.currentRelays.values()) { + for (Node relay : this.knownRelays.values()) { String addressString = relay.getAddress(); long addressNumber = -1L; if (ipv4Pattern.matcher(addressString).matches()) { @@ -695,7 +690,7 @@ public class CurrentNodes { } /* Finally, set relays' city and ASN information. */ - for (Node relay : currentRelays.values()) { + for (Node relay : knownRelays.values()) { String addressString = relay.getAddress(); if (addressStringNumbers.containsKey(addressString)) { long addressNumber = addressStringNumbers.get(addressString); @@ -756,7 +751,7 @@ public class CurrentNodes { public void setBridgeRunningBits() { if (this.lastPublishedMillis > 0L) { - for (Node entry : this.currentBridges.values()) { + for (Node entry : this.knownBridges.values()) { entry.setRunning(entry.getRelayFlags().contains("Running") && entry.getLastSeenMillis() == this.lastPublishedMillis); } @@ -788,8 +783,8 @@ public class CurrentNodes { String defaultPolicy, String portList, long firstSeenMillis, long lastChangedAddresses, String aSNumber) { /* See if there's already an entry for this bridge. */ - if (this.currentBridges.containsKey(fingerprint)) { - Node existingEntry = this.currentBridges.get(fingerprint); + if (this.knownBridges.containsKey(fingerprint)) { + Node existingEntry = this.knownBridges.get(fingerprint); if (lastSeenMillis < existingEntry.getLastSeenMillis()) { /* Use latest information for nickname, current addresses, etc. */ nickname = existingEntry.getNickname(); @@ -816,7 +811,7 @@ public class CurrentNodes { dirPort, relayFlags, consensusWeight, countryCode, hostname, lastRdnsLookup, defaultPolicy, portList, firstSeenMillis, null, aSNumber); - this.currentBridges.put(fingerprint, entry); + this.knownBridges.put(fingerprint, entry); /* If this entry comes from a new status, update our global last * published time. */ if (lastSeenMillis > this.lastPublishedMillis) { @@ -824,16 +819,32 @@ public class CurrentNodes { } } - private SortedMap<String, Node> currentRelays = + private SortedMap<String, Node> knownRelays = new TreeMap<String, Node>(); public SortedMap<String, Node> getCurrentRelays() { - return new TreeMap<String, Node>(this.currentRelays); + long cutoff = System.currentTimeMillis() + - 7L * 24L * 60L * 60L * 1000L; + SortedMap<String, Node> currentRelays = new TreeMap<String, Node>(); + for (Map.Entry<String, Node> e : this.knownRelays.entrySet()) { + if (e.getValue().getLastSeenMillis() >= cutoff) { + currentRelays.put(e.getKey(), e.getValue()); + } + } + return currentRelays; } - private SortedMap<String, Node> currentBridges = + private SortedMap<String, Node> knownBridges = new TreeMap<String, Node>(); public SortedMap<String, Node> getCurrentBridges() { - return new TreeMap<String, Node>(this.currentBridges); + long cutoff = System.currentTimeMillis() + - 7L * 24L * 60L * 60L * 1000L; + SortedMap<String, Node> currentBridges = new TreeMap<String, Node>(); + for (Map.Entry<String, Node> e : this.knownBridges.entrySet()) { + if (e.getValue().getLastSeenMillis() >= cutoff) { + currentBridges.put(e.getKey(), e.getValue()); + } + } + return currentBridges; } public long getLastValidAfterMillis() { diff --git a/src/org/torproject/onionoo/Main.java b/src/org/torproject/onionoo/Main.java index e3e7c5b..af45221 100644 --- a/src/org/torproject/onionoo/Main.java +++ b/src/org/torproject/onionoo/Main.java @@ -11,12 +11,13 @@ public class Main { printStatus("Updating internal node list."); CurrentNodes cn = new CurrentNodes(); - cn.readRelaySearchDataFile(new File("out/summary")); + cn.readRelaySearchDataFile(new File("status/summary")); cn.readRelayNetworkConsensuses(); cn.setRelayRunningBits(); cn.lookUpCitiesAndASes(); cn.readBridgeNetworkStatuses(); cn.setBridgeRunningBits(); + cn.writeRelaySearchDataFile(new File("status/summary"), true); printStatus("Updating detail data."); DetailDataWriter ddw = new DetailDataWriter(); @@ -47,7 +48,7 @@ public class Main { wdw.deleteObsoleteWeightsDataFiles(); printStatus("Updating summary data."); - cn.writeRelaySearchDataFile(); + cn.writeRelaySearchDataFile(new File("out/summary"), false); printStatus("Terminating."); } diff --git a/web/index.html b/web/index.html index 152cec6..cfd857d 100755 --- a/web/index.html +++ b/web/index.html @@ -137,20 +137,19 @@ or TCP port where it previously accepted onion-routing or directory connections. This timestamp can serve as indicator whether this relay would be a suitable fallback directory. -Note that this timestamp is reset when a relay drops out of the consensus -for more than 7 days, so that whenever that relay rejoins, it would seem -as if it changed its address(es) at that time; this is a known limitation -of the current Onionoo design. Required field. Added on March 27. +On April 9, fixed limitation that timestamp is reset +when a relay drops out of the consensus for more than 7 days and +rejoins. </li> <li>"first_seen": UTC timestamp (YYYY-MM-DD hh:mm:ss) when this relay was first seen in a network status consensus. -Note that this timestamp is reset when a relay drops out of the consensus -for more than 7 days, so that whenever that relay rejoins, it would seem -as if it joined for the first time; this is a known limitation of the -current Onionoo design. -Required field.</li> +Required field. +On April 9, fixed limitation that timestamp is reset +when a relay drops out of the consensus for more than 7 days and +rejoins. +</li> <li>"running": Boolean field saying whether this relay was listed as running in the last relay network status consensus. Required field.</li> @@ -340,11 +339,11 @@ was last seen in a bridge network status. Required field.</li> <li>"first_seen": UTC timestamp (YYYY-MM-DD hh:mm:ss) when this bridge was first seen in a bridge network status. -Note that this timestamp is reset when a bridge drops out of the network -status for more than 7 days, so that whenever that bridge rejoins, it -would seem as if it joined for the first time; this is a known limitation -of the current Onionoo design. -Required field.</li> +Required field. +On April 9, fixed limitation that timestamp is reset +when a bridge drops out of the network status for more than 7 days and +rejoins. +</li> <li>"running": Boolean field saying whether this bridge was listed as running in the last bridge network status. Required field.</li>

1 0

[translation/tsum_completed] Update translations for tsum_completed
by translation＠torproject.org 09 Apr '13

09 Apr '13

commit e4eb6629b88a6496e50611cb64da4206c9d97273 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 9 22:45:18 2013 +0000 Update translations for tsum_completed --- zh_CN/short-user-manual_zh_CN_noimg.xhtml | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/zh_CN/short-user-manual_zh_CN_noimg.xhtml b/zh_CN/short-user-manual_zh_CN_noimg.xhtml index 858ce62..cad6238 100644 --- a/zh_CN/short-user-manual_zh_CN_noimg.xhtml +++ b/zh_CN/short-user-manual_zh_CN_noimg.xhtml @@ -56,12 +56,12 @@ sub 2048R/EB399FD7 2003-10-16 </code> </pre> 输出的结果应为 Good signature。错误签名表示该文件可能受到篡改。如果遇到错误签名，请把该软件包的下载地址、签名验证方式，以及 GunPG 的输出结果一并发送到 help-zh(a)rt.torproject.org. - 当你已完成校验并看到 &quot;Good signature&quot; 的输出结果，请把软件包解压缩。然后你应该会看到一个类似 tor-browser_en-US 这样的文件夹。此文件夹里有另一个名为 Docs 的文件夹，内含一个 changelog 文件。请确保 changelog 里第一行的版本号与文件名中的版本号相符。 - <h3 id="how-to-use-the-tor-browser-bundle">如何使用 Tor 浏览器软件包</h3> + 当你已完成验证并且输出结果是 Good signature，请把软件包解压缩。然后你应该会看到一个类似 tor-browser_en-US 这样的文件夹。此文件夹里有另一个名为 Docs 的文件夹，内含一个 changelog 文件。请确保 changelog 里第一行的版本号与文件名中的版本号相符。 + <h3 id="how-to-use-the-tor-browser-bundle">如何使用 Tor Browser Bundle</h3> 下载 Tor Browser Bundle 并提取文件之后，将会出现一个包含几个文件的文件夹。其中包含一个可执行文件，文件名为“Start Tor Browser“（或”start-tor-browser“，这取决于你的操作系统）。 - 当你运行 Tor 浏览器软件包，你会首先看到 Vidalia 启动并把你接入到 Tor 网络。之后你会看到一个浏览器打开了 <a href="https://check.torproject.org/">https://check.torproject.org/</a>，确认你正在使用 Tor。现在你可以开始通过 Tor 来浏览互联网了。 + 运行 Tor Browser Bundle 时，首先启动 Vidalia 启动将用户连接到 Tor 网络，然后在浏览器打开 <a href="https://check.torproject.org/">https://check.torproject.org/</a>，确认你正在使用 Tor。现在你可以开始通过 Tor 来浏览互联网了。 - 请注意，你必须使用软件包里的浏览器，而不是你自己的浏览器。这点至关重要。 + 请注意：务必使用该软件包附带的浏览器，不可使用用户自己安装的浏览器。这点至关重要。 <h3 id="what-to-do-when-tor-does-not-connect">当 Tor 无法连接时怎么办</h3> 有些用户会遇到 Vidalia 在尝试连接到 Tor 网络时卡住不动的情况。遇到这种情况，请确保你已连接到互联网。如果你需要通过代理服务器连接，请参阅下面的 “如何使用代理服务器”。

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 09 Apr '13

09 Apr '13

commit 90d589b21e6d807aa261cdfc924087c160fc8a0c Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 9 22:45:15 2013 +0000 Update translations for tsum --- zh_CN/short-user-manual_zh_CN_noimg.xhtml | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/zh_CN/short-user-manual_zh_CN_noimg.xhtml b/zh_CN/short-user-manual_zh_CN_noimg.xhtml index 858ce62..cad6238 100644 --- a/zh_CN/short-user-manual_zh_CN_noimg.xhtml +++ b/zh_CN/short-user-manual_zh_CN_noimg.xhtml @@ -56,12 +56,12 @@ sub 2048R/EB399FD7 2003-10-16 </code> </pre> 输出的结果应为 Good signature。错误签名表示该文件可能受到篡改。如果遇到错误签名，请把该软件包的下载地址、签名验证方式，以及 GunPG 的输出结果一并发送到 help-zh(a)rt.torproject.org. - 当你已完成校验并看到 &quot;Good signature&quot; 的输出结果，请把软件包解压缩。然后你应该会看到一个类似 tor-browser_en-US 这样的文件夹。此文件夹里有另一个名为 Docs 的文件夹，内含一个 changelog 文件。请确保 changelog 里第一行的版本号与文件名中的版本号相符。 - <h3 id="how-to-use-the-tor-browser-bundle">如何使用 Tor 浏览器软件包</h3> + 当你已完成验证并且输出结果是 Good signature，请把软件包解压缩。然后你应该会看到一个类似 tor-browser_en-US 这样的文件夹。此文件夹里有另一个名为 Docs 的文件夹，内含一个 changelog 文件。请确保 changelog 里第一行的版本号与文件名中的版本号相符。 + <h3 id="how-to-use-the-tor-browser-bundle">如何使用 Tor Browser Bundle</h3> 下载 Tor Browser Bundle 并提取文件之后，将会出现一个包含几个文件的文件夹。其中包含一个可执行文件，文件名为“Start Tor Browser“（或”start-tor-browser“，这取决于你的操作系统）。 - 当你运行 Tor 浏览器软件包，你会首先看到 Vidalia 启动并把你接入到 Tor 网络。之后你会看到一个浏览器打开了 <a href="https://check.torproject.org/">https://check.torproject.org/</a>，确认你正在使用 Tor。现在你可以开始通过 Tor 来浏览互联网了。 + 运行 Tor Browser Bundle 时，首先启动 Vidalia 启动将用户连接到 Tor 网络，然后在浏览器打开 <a href="https://check.torproject.org/">https://check.torproject.org/</a>，确认你正在使用 Tor。现在你可以开始通过 Tor 来浏览互联网了。 - 请注意，你必须使用软件包里的浏览器，而不是你自己的浏览器。这点至关重要。 + 请注意：务必使用该软件包附带的浏览器，不可使用用户自己安装的浏览器。这点至关重要。 <h3 id="what-to-do-when-tor-does-not-connect">当 Tor 无法连接时怎么办</h3> 有些用户会遇到 Vidalia 在尝试连接到 Tor 网络时卡住不动的情况。遇到这种情况，请确保你已连接到互联网。如果你需要通过代理服务器连接，请参阅下面的 “如何使用代理服务器”。

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits April 2013