July 2015 - tor-commits - lists.torproject.org

[tor-messenger-build/master] Pin ctypes-otr to 0.0.0 tag
by arlo＠torproject.org 13 Jul '15

13 Jul '15

commit eb35f9d31514a81340340f31ebbd706869428732 Author: Arlo Breault <arlolra(a)gmail.com> Date: Mon Jul 13 08:25:58 2015 -0700 Pin ctypes-otr to 0.0.0 tag --- projects/ctypes-otr/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/ctypes-otr/config b/projects/ctypes-otr/config index 313efbd..d6ca2c6 100644 --- a/projects/ctypes-otr/config +++ b/projects/ctypes-otr/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/arlolra/ctypes-otr -git_hash: master +git_hash: 0.0.0 filename: 'ctypes-otr-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: lib_glob: 'lib/*.so*'

1 0

[tor-messenger-build/master] Update js-locale.mozpatch
by sukhbir＠torproject.org 13 Jul '15

13 Jul '15

commit fd6f7de06ff2ae1beffb8d62bb75d7d16d1037c6 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Jul 13 09:16:41 2015 -0400 Update js-locale.mozpatch --- projects/instantbird/js-locale.mozpatch | 286 +++++++++++++++---------------- 1 file changed, 143 insertions(+), 143 deletions(-) diff --git a/projects/instantbird/js-locale.mozpatch b/projects/instantbird/js-locale.mozpatch index b135523..bf45525 100644 --- a/projects/instantbird/js-locale.mozpatch +++ b/projects/instantbird/js-locale.mozpatch @@ -1,204 +1,204 @@ diff --git a/browser/base/content/test/general/mochitest.ini b/browser/base/content/test/general/mochitest.ini -index a129d73..139133e 100644 +index 139133e..a129d73 100644 --- a/browser/base/content/test/general/mochitest.ini +++ b/browser/base/content/test/general/mochitest.ini -@@ -28,7 +28,6 @@ support-files = +@@ -28,6 +28,7 @@ support-files = [test_bug364677.html] [test_bug395533.html] --[test_bug_jsdefaultlocale.html] ++[test_bug_jsdefaultlocale.html] [test_contextmenu.html] skip-if = toolkit == "gtk2" || toolkit == "gtk3" || (os == 'mac' && os_version != '10.6') # disabled on Linux due to bug 513558, on Mac after 10.6 due to bug 792304 [test_contextmenu_input.html] diff --git a/browser/base/content/test/general/test_bug_jsdefaultlocale.html b/browser/base/content/test/general/test_bug_jsdefaultlocale.html -deleted file mode 100644 -index 6566ae0..0000000 ---- a/browser/base/content/test/general/test_bug_jsdefaultlocale.html -+++ /dev/null -@@ -1,41 +0,0 @@ --<!DOCTYPE HTML> --<html> -- --<head> -- <meta charset="utf-8"> -- <title>Test for Tor Bug #13019: Prevent fingerprinting of JS-exposed locale</title> -- <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> -- <script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script> -- <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/> --</head> --<body> --<a target="_blank" href="https://bugs.torproject.org">Bug 13019</a> --<p id="display"></p> --<pre id="test"></pre> --<script type="application/javascript;version=1.8"> --let prefName = "javascript.use_us_english_locale", -- originalPrefValue = null, -- date = new Date(); --// Read the current pref value. --try { -- originalPrefValue = SpecialPowers.getBoolPref(prefName); --} catch (e) { } --// Enable pref "javascript.use_us_english_locale". --SpecialPowers.setBoolPref(prefName, true); --// Test that we are getting en-US locale everywhere it is exposed in JavaScript --is(Intl.Collator().resolvedOptions().locale, "en-US", "content JS locale from Intl.Collator"); --is(Intl.DateTimeFormat().resolvedOptions().locale, "en-US", "content JS locale Intl.DateTimeFormat"); --is(Intl.NumberFormat().resolvedOptions().locale, "en-US", "content JS locale from Intl.NumberFormat"); --is(date.toLocaleString(), date.toLocaleString("en-US"), "Date formatted by JS locale"); --// Return pref to its original value, if it had one. --if (originalPrefValue === null) { -- SpecialPowers.clearUserPref(prefName); --} else { -- SpecialPowers.setBoolPref(prefName, originalPrefValue); --} -- --</script> --</body> --</html> +new file mode 100644 +index 0000000..6566ae0 +--- /dev/null ++++ b/browser/base/content/test/general/test_bug_jsdefaultlocale.html +@@ -0,0 +1,41 @@ ++<!DOCTYPE HTML> ++<html> ++ ++<head> ++ <meta charset="utf-8"> ++ <title>Test for Tor Bug #13019: Prevent fingerprinting of JS-exposed locale</title> ++ <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> ++ <script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script> ++ <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/> ++</head> ++<body> ++<a target="_blank" href="https://bugs.torproject.org">Bug 13019</a> ++<p id="display"></p> ++<pre id="test"></pre> ++<script type="application/javascript;version=1.8"> ++let prefName = "javascript.use_us_english_locale", ++ originalPrefValue = null, ++ date = new Date(); ++// Read the current pref value. ++try { ++ originalPrefValue = SpecialPowers.getBoolPref(prefName); ++} catch (e) { } ++// Enable pref "javascript.use_us_english_locale". ++SpecialPowers.setBoolPref(prefName, true); ++// Test that we are getting en-US locale everywhere it is exposed in JavaScript ++is(Intl.Collator().resolvedOptions().locale, "en-US", "content JS locale from Intl.Collator"); ++is(Intl.DateTimeFormat().resolvedOptions().locale, "en-US", "content JS locale Intl.DateTimeFormat"); ++is(Intl.NumberFormat().resolvedOptions().locale, "en-US", "content JS locale from Intl.NumberFormat"); ++is(date.toLocaleString(), date.toLocaleString("en-US"), "Date formatted by JS locale"); ++// Return pref to its original value, if it had one. ++if (originalPrefValue === null) { ++ SpecialPowers.clearUserPref(prefName); ++} else { ++ SpecialPowers.setBoolPref(prefName, originalPrefValue); ++} ++ ++</script> ++</body> ++</html> diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp -index 877056e..169981e9 100644 +index 169981e9..877056e 100644 --- a/js/src/jsapi.cpp +++ b/js/src/jsapi.cpp -@@ -5217,13 +5217,6 @@ JS_SetDefaultLocale(JSRuntime* rt, const char* locale) +@@ -5217,6 +5217,13 @@ JS_SetDefaultLocale(JSRuntime* rt, const char* locale) return rt->setDefaultLocale(locale); } --JS_PUBLIC_API(const char*) --JS_GetDefaultLocale(JSRuntime *rt) --{ -- AssertHeapIsIdle(rt); -- return rt->getDefaultLocale(); --} -- ++JS_PUBLIC_API(const char*) ++JS_GetDefaultLocale(JSRuntime *rt) ++{ ++ AssertHeapIsIdle(rt); ++ return rt->getDefaultLocale(); ++} ++ JS_PUBLIC_API(void) JS_ResetDefaultLocale(JSRuntime* rt) { diff --git a/js/src/jsapi.h b/js/src/jsapi.h -index 2a6fe34..2b279b5 100644 +index 2b279b5..2a6fe34 100644 --- a/js/src/jsapi.h +++ b/js/src/jsapi.h -@@ -4266,15 +4266,6 @@ extern JS_PUBLIC_API(bool) +@@ -4266,6 +4266,15 @@ extern JS_PUBLIC_API(bool) JS_SetDefaultLocale(JSRuntime* rt, const char* locale); /* -- * Returns the default locale for the ECMAScript Internationalization API -- * (Intl.Collator, Intl.NumberFormat, Intl.DateTimeFormat). -- * Note that the Internationalization API encourages clients to -- * specify their own locales. -- */ --extern JS_PUBLIC_API(const char*) --JS_GetDefaultLocale(JSRuntime *rt); -- --/* ++ * Returns the default locale for the ECMAScript Internationalization API ++ * (Intl.Collator, Intl.NumberFormat, Intl.DateTimeFormat). ++ * Note that the Internationalization API encourages clients to ++ * specify their own locales. ++ */ ++extern JS_PUBLIC_API(const char*) ++JS_GetDefaultLocale(JSRuntime *rt); ++ ++/* * Reset the default locale to OS defaults. */ extern JS_PUBLIC_API(void) diff --git a/xpcom/build/XPCOMInit.cpp b/xpcom/build/XPCOMInit.cpp -index 292652d..a58d89c 100644 +index a58d89c..292652d 100644 --- a/xpcom/build/XPCOMInit.cpp +++ b/xpcom/build/XPCOMInit.cpp -@@ -8,7 +8,6 @@ +@@ -8,6 +8,7 @@ #include "mozilla/Atomics.h" #include "mozilla/Poison.h" --#include "mozilla/Preferences.h" ++#include "mozilla/Preferences.h" #include "mozilla/XPCOM.h" #include "nsXULAppAPI.h" -@@ -44,8 +43,6 @@ +@@ -43,6 +44,8 @@ #include "nsSupportsPrimitives.h" #include "nsConsoleService.h" --#include "nsIJSRuntimeService.h" -- ++#include "nsIJSRuntimeService.h" ++ #include "nsComponentManager.h" #include "nsCategoryManagerUtils.h" #include "nsIServiceManager.h" -@@ -488,67 +485,6 @@ NS_IMPL_ISUPPORTS(NesteggReporter, nsIMemoryReporter) +@@ -485,6 +488,67 @@ NS_IMPL_ISUPPORTS(NesteggReporter, nsIMemoryReporter) CountingAllocatorBase<NesteggReporter>::sAmount(0); #endif /* MOZ_WEBM */ --// Anonymous namespace for customizing the default locale that JavaScript --// uses, according to the value of the "javascript.use_us_english_locale" pref. --// The current default locale can be detected in JavaScript by calling --// `Intl.DateTimeFormat().resolvedOptions().locale` --namespace { -- --#define USE_US_ENGLISH_LOCALE_PREF "javascript.use_us_english_locale" -- --static char* sSystemLocale; --static char* sJSLocale; -- --// Returns a pointer to the current JS Runtime. --static --JSRuntime* GetRuntime() { -- nsresult rv; -- nsCOMPtr<nsIJSRuntimeService> rts = do_GetService("@mozilla.org/js/xpc/RuntimeService;1", &rv); -- if (NS_FAILED(rv)) return NULL; -- JSRuntime* rt; -- rts->GetRuntime(&rt); -- return rt; --} -- --// If the USE_US_ENGLISH_LOCALE_PREF is active, set all locales to US English. --// Otherwise, fall back to the default system and JS locales. --static --void UseUSEnglishLocalePrefChangedCallback(const char* /* pref */, void* /* closure */) { -- // Get a pointer to the default JS Runtime. -- JSRuntime* rt = GetRuntime(); -- if (rt) { -- // Read the pref to see if we will use US English locale. -- bool useUSEnglishLocale = mozilla::Preferences::GetBool(USE_US_ENGLISH_LOCALE_PREF, false); -- // Set the application-wide C-locale. Needed for Date.toLocaleFormat(). -- setlocale(LC_ALL, useUSEnglishLocale ? "C" : sSystemLocale); -- // Now override the JavaScript Runtime Locale that is used by the Intl API -- // as well as Date.toLocaleString, Number.toLocaleString, and String.localeCompare. -- JS_SetDefaultLocale(rt, useUSEnglishLocale ? "en-US" : sJSLocale); -- } --} -- --static --void StartWatchingUseUSEnglishLocalePref() { -- // Get the default system locale. To be used if US English locale pref is deactivated. -- sSystemLocale = strdup(setlocale(LC_ALL,NULL)); -- // Store the default JavaScript locale. -- JSRuntime* rt = GetRuntime(); -- if (rt) { -- sJSLocale = strdup(JS_GetDefaultLocale(rt)); -- } -- // Now keep the locale updated with the current pref value. -- mozilla::Preferences::RegisterCallbackAndCall(UseUSEnglishLocalePrefChangedCallback, USE_US_ENGLISH_LOCALE_PREF); --} -- --static --void StopWatchingUseUSEnglishLocalePref() { -- mozilla::Preferences::UnregisterCallback(UseUSEnglishLocalePrefChangedCallback, USE_US_ENGLISH_LOCALE_PREF); -- if (sSystemLocale) free(sSystemLocale); -- if (sJSLocale) JS_free(nullptr, sJSLocale); --} -- --} // anonymous namespace for locale hiding -- ++// Anonymous namespace for customizing the default locale that JavaScript ++// uses, according to the value of the "javascript.use_us_english_locale" pref. ++// The current default locale can be detected in JavaScript by calling ++// `Intl.DateTimeFormat().resolvedOptions().locale` ++namespace { ++ ++#define USE_US_ENGLISH_LOCALE_PREF "javascript.use_us_english_locale" ++ ++static char* sSystemLocale; ++static char* sJSLocale; ++ ++// Returns a pointer to the current JS Runtime. ++static ++JSRuntime* GetRuntime() { ++ nsresult rv; ++ nsCOMPtr<nsIJSRuntimeService> rts = do_GetService("@mozilla.org/js/xpc/RuntimeService;1", &rv); ++ if (NS_FAILED(rv)) return NULL; ++ JSRuntime* rt; ++ rts->GetRuntime(&rt); ++ return rt; ++} ++ ++// If the USE_US_ENGLISH_LOCALE_PREF is active, set all locales to US English. ++// Otherwise, fall back to the default system and JS locales. ++static ++void UseUSEnglishLocalePrefChangedCallback(const char* /* pref */, void* /* closure */) { ++ // Get a pointer to the default JS Runtime. ++ JSRuntime* rt = GetRuntime(); ++ if (rt) { ++ // Read the pref to see if we will use US English locale. ++ bool useUSEnglishLocale = mozilla::Preferences::GetBool(USE_US_ENGLISH_LOCALE_PREF, false); ++ // Set the application-wide C-locale. Needed for Date.toLocaleFormat(). ++ setlocale(LC_ALL, useUSEnglishLocale ? "C" : sSystemLocale); ++ // Now override the JavaScript Runtime Locale that is used by the Intl API ++ // as well as Date.toLocaleString, Number.toLocaleString, and String.localeCompare. ++ JS_SetDefaultLocale(rt, useUSEnglishLocale ? "en-US" : sJSLocale); ++ } ++} ++ ++static ++void StartWatchingUseUSEnglishLocalePref() { ++ // Get the default system locale. To be used if US English locale pref is deactivated. ++ sSystemLocale = strdup(setlocale(LC_ALL,NULL)); ++ // Store the default JavaScript locale. ++ JSRuntime* rt = GetRuntime(); ++ if (rt) { ++ sJSLocale = strdup(JS_GetDefaultLocale(rt)); ++ } ++ // Now keep the locale updated with the current pref value. ++ mozilla::Preferences::RegisterCallbackAndCall(UseUSEnglishLocalePrefChangedCallback, USE_US_ENGLISH_LOCALE_PREF); ++} ++ ++static ++void StopWatchingUseUSEnglishLocalePref() { ++ mozilla::Preferences::UnregisterCallback(UseUSEnglishLocalePrefChangedCallback, USE_US_ENGLISH_LOCALE_PREF); ++ if (sSystemLocale) free(sSystemLocale); ++ if (sJSLocale) JS_free(nullptr, sJSLocale); ++} ++ ++} // anonymous namespace for locale hiding ++ // Note that on OSX, aBinDirectory will point to .app/Contents/Resources/browser EXPORT_XPCOM_API(nsresult) NS_InitXPCOM2(nsIServiceManager** aResult, -@@ -830,8 +766,6 @@ NS_InitXPCOM2(nsIServiceManager** aResult, +@@ -766,6 +830,8 @@ NS_InitXPCOM2(nsIServiceManager** aResult, mozilla::eventtracer::Init(); #endif -- // Start watching the "javascript.use_us_english_locale" pref. -- StartWatchingUseUSEnglishLocalePref(); ++ // Start watching the "javascript.use_us_english_locale" pref. ++ StartWatchingUseUSEnglishLocalePref(); return NS_OK; } -@@ -1104,8 +1038,6 @@ ShutdownXPCOM(nsIServiceManager* aServMgr) +@@ -1038,6 +1104,8 @@ ShutdownXPCOM(nsIServiceManager* aServMgr) delete sExitManager; sExitManager = nullptr; -- StopWatchingUseUSEnglishLocalePref(); -- ++ StopWatchingUseUSEnglishLocalePref(); ++ Omnijar::CleanUp(); HangMonitor::Shutdown();

1 0

[exonerator/master] Restrict searches to full dates.
by karsten＠torproject.org 13 Jul '15

13 Jul '15

commit 30dcb1f1ff2af09eb4060a22c5c790d862db03bc Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Mar 25 11:29:46 2015 +0100 Restrict searches to full dates. Implements part of #15001. --- .../torproject/exonerator/ExoneraTorServlet.java | 108 +++++--------------- 1 file changed, 24 insertions(+), 84 deletions(-) diff --git a/src/org/torproject/exonerator/ExoneraTorServlet.java b/src/org/torproject/exonerator/ExoneraTorServlet.java index 826fcde..59cc7b3 100644 --- a/src/org/torproject/exonerator/ExoneraTorServlet.java +++ b/src/org/torproject/exonerator/ExoneraTorServlet.java @@ -253,28 +253,17 @@ public class ExoneraTorServlet extends HttpServlet { /* Parse timestamp parameter. */ String timestampParameter = request.getParameter("timestamp"); long timestamp = 0L; - boolean timestampIsDate = false; String timestampStr = "", timestampWarning = ""; - SimpleDateFormat shortDateTimeFormat = new SimpleDateFormat( - "yyyy-MM-dd HH:mm"); - shortDateTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC")); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); if (timestampParameter != null && timestampParameter.length() > 0) { try { - if (timestampParameter.split(" ").length == 1) { - timestamp = dateFormat.parse(timestampParameter).getTime(); - timestampStr = dateFormat.format(timestamp); - timestampIsDate = true; - } else { - timestamp = shortDateTimeFormat.parse(timestampParameter). - getTime(); - timestampStr = shortDateTimeFormat.format(timestamp); - } + timestamp = dateFormat.parse(timestampParameter).getTime(); + timestampStr = dateFormat.format(timestamp); if (timestamp < firstValidAfter || timestamp > lastValidAfter) { - timestampWarning = "Please pick a date or timestamp between \"" - + shortDateTimeFormat.format(firstValidAfter) + "\" and \"" - + shortDateTimeFormat.format(lastValidAfter) + "\"."; + timestampWarning = "Please pick a date between \"" + + dateFormat.format(firstValidAfter) + "\" and \"" + + dateFormat.format(lastValidAfter) + "\"."; timestamp = 0L; } } catch (ParseException e) { @@ -284,7 +273,7 @@ public class ExoneraTorServlet extends HttpServlet { StringEscapeUtils.escapeHtml(timestampParameter. substring(0, 20)) + "[...]" : StringEscapeUtils.escapeHtml(timestampParameter)) - + "\" is not a valid date or timestamp."; + + "\" is not a valid date."; } } @@ -296,7 +285,7 @@ public class ExoneraTorServlet extends HttpServlet { } if (relayIP.length() > 0 && timestamp < 1 && timestampWarning.length() < 1) { - timestampWarning = "Please provide a date or timestamp."; + timestampWarning = "Please provide a date."; } /* Parse target IP parameter. */ @@ -378,8 +367,7 @@ public class ExoneraTorServlet extends HttpServlet { + "2001:858:2:2:aabb:0:563b:1526)</i></td>\n" + " </tr>\n" + " <tr>\n" - + " <td align=\"right\">Date or timestamp, in " - + "UTC:</td>\n" + + " <td align=\"right\">Date:</td>\n" + " <td><input type=\"text\" name=\"timestamp\"" + " size=\"30\"" + (timestampStr.length() > 0 ? " value=\"" + timestampStr + "\"" @@ -388,7 +376,7 @@ public class ExoneraTorServlet extends HttpServlet { + (timestampWarning.length() > 0 ? "<br><font color=\"red\">" + timestampWarning + "</font>" : "") + "</td>\n" - + " <td><i>(Ex.: 2010-01-01 or 2010-01-01 12:00)" + + " <td><i>(Ex.: 2010-01-01)" + "</i></td>\n" + " </tr>\n" + " <tr>\n" @@ -417,22 +405,11 @@ public class ExoneraTorServlet extends HttpServlet { out.printf("<p>Looking up IP address %s in the relay lists " + "published ", relayIP); long timestampFrom, timestampTo; - if (timestampIsDate) { - /* If we only have a date, consider all consensuses published on the - * given date, plus the ones published 3 hours before the given date - * and until 23:59:59. */ - timestampFrom = timestamp - 3L * 60L * 60L * 1000L; - timestampTo = timestamp + (24L * 60L * 60L - 1L) * 1000L; - out.printf("on %s", timestampStr); - } else { - /* If we have an exact timestamp, consider the consensuses published - * in the 3 hours preceding the UTC timestamp. */ - timestampFrom = timestamp - 3L * 60L * 60L * 1000L; - timestampTo = timestamp; - out.printf("between %s and %s UTC", - shortDateTimeFormat.format(timestampFrom), - shortDateTimeFormat.format(timestampTo)); - } + /* Consider all consensuses published on the given date, plus the ones + * published 3 hours before the given date and until 23:59:59. */ + timestampFrom = timestamp - 3L * 60L * 60L * 1000L; + timestampTo = timestamp + (24L * 60L * 60L - 1L) * 1000L; + out.printf("on %s", timestampStr); /* If we don't find any relays in the given time interval, also look * at consensuses published 12 hours before and 12 hours after the * interval, in case the user got the "UTC" bit wrong. */ @@ -481,8 +458,8 @@ public class ExoneraTorServlet extends HttpServlet { out.println(" <p>No relay lists found!</p>\n" + " <p>Result is INDECISIVE!</p>\n" + " <p>We cannot make any statement whether there was " - + "a Tor relay running on IP address " + relayIP - + (timestampIsDate ? " on " : " at ") + timestampStr + "! We " + + "a Tor relay running on IP address " + relayIP + " on " + + timestampStr + "! We " + "did not find any relevant relay lists at the given time. If " + "you think this is an error on our side, please " + "<a href=\"mailto:tor-assistants@torproject.org\">contact " @@ -701,11 +678,7 @@ public class ExoneraTorServlet extends HttpServlet { inTooOldConsensuses = false, inTooNewConsensuses = false; for (long match : positiveConsensusesNoTarget) { - if (timestampIsDate && - dateFormat.format(match).equals(timestampStr)) { - inMostRelevantConsensuses = true; - } else if (!timestampIsDate && - match == relevantConsensuses.last()) { + if (dateFormat.format(match).equals(timestampStr)) { inMostRelevantConsensuses = true; } else if (relevantConsensuses.contains(match)) { inOtherRelevantConsensus = true; @@ -720,11 +693,7 @@ public class ExoneraTorServlet extends HttpServlet { + "</p>\n" + " <p>We found one or more relays on IP address " + relayIP + " in "); - if (timestampIsDate) { - out.print("relay list published on " + timestampStr); - } else { - out.print("the most recent relay list preceding " + timestampStr); - } + out.print("relay list published on " + timestampStr); out.print(" that clients were likely to know.</p>\n"); } else { if (inOtherRelevantConsensus) { @@ -732,12 +701,7 @@ public class ExoneraTorServlet extends HttpServlet { + "with moderate certainty!</p>\n"); out.println("<p>We found one or more relays on IP address " + relayIP + ", but not in "); - if (timestampIsDate) { - out.print("a relay list published on " + timestampStr); - } else { - out.print("the most recent relay list preceding " - + timestampStr); - } + out.print("a relay list published on " + timestampStr); out.print(". A possible reason for the relay being missing in a " + "relay list might be that some of the directory " + "authorities had difficulties connecting to the relay. " @@ -764,14 +728,7 @@ public class ExoneraTorServlet extends HttpServlet { + "hours before and in relay lists that were published " + "up to 12 hours after " + timestampStr + ".</p>\n"); } - if (timestampIsDate) { - out.println("<p>Be sure to try out the previous/next day or " - + "provide an exact timestamp in UTC.</p>"); - } else { - out.println("<p>Make sure that the timestamp you " - + "provided is correctly converted to the UTC " - + "timezone.</p>"); - } + out.println("<p>Be sure to try out the previous/next day.</p>"); } /* We didn't find any descriptor. No need to look up targets. */ writeFooter(out); @@ -1000,10 +957,7 @@ public class ExoneraTorServlet extends HttpServlet { inTooOldConsensuses = false; inTooNewConsensuses = false; for (long match : positiveConsensuses) { - if (timestampIsDate && - dateFormat.format(match).equals(timestampStr)) { - inMostRelevantConsensuses = true; - } else if (!timestampIsDate && match == relevantConsensuses.last()) { + if (dateFormat.format(match).equals(timestampStr)) { inMostRelevantConsensuses = true; } else if (relevantConsensuses.contains(match)) { inOtherRelevantConsensus = true; @@ -1018,11 +972,7 @@ public class ExoneraTorServlet extends HttpServlet { + "</p>\n" + " <p>We found one or more relays on IP address " + relayIP + " permitting exit to " + target + " in "); - if (timestampIsDate) { - out.print("relay list published on " + timestampStr); - } else { - out.print("the most recent relay list preceding " + timestampStr); - } + out.print("relay list published on " + timestampStr); out.print(" that clients were likely to know.</p>\n"); writeFooter(out); try { @@ -1053,11 +1003,7 @@ public class ExoneraTorServlet extends HttpServlet { } out.println("<p>We found one or more relays on IP address " + relayIP + " permitting exit to " + target + ", but not in "); - if (timestampIsDate) { - out.print("a relay list published on " + timestampStr); - } else { - out.print("the most recent relay list preceding " + timestampStr); - } + out.print("a relay list published on " + timestampStr); out.print(". A possible reason for the relay being missing in a " + "relay list might be that some of the directory authorities " + "had difficulties connecting to the relay. However, clients " @@ -1086,13 +1032,7 @@ public class ExoneraTorServlet extends HttpServlet { + "hours before and in relay lists that were published up " + "to 12 hours after " + timestampStr + ".</p>\n"); } - if (timestampIsDate) { - out.println("<p>Be sure to try out the previous/next day or " - + "provide an exact timestamp in UTC.</p>"); - } else { - out.println("<p>Make sure that the timestamp you provided is " - + "correctly converted to the UTC timezone.</p>"); - } + out.println("<p>Be sure to try out the previous/next day.</p>"); } } if (target != null) {

1 0

[exonerator/master] Extend searches to previous and next day.
by karsten＠torproject.org 13 Jul '15

13 Jul '15

commit 9c31f93ac9e662495b0951040ddee40cd627215e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jul 13 14:50:57 2015 +0200 Extend searches to previous and next day. Implements the rest of #15001. --- .../torproject/exonerator/ExoneraTorServlet.java | 139 ++++++-------------- 1 file changed, 39 insertions(+), 100 deletions(-) diff --git a/src/org/torproject/exonerator/ExoneraTorServlet.java b/src/org/torproject/exonerator/ExoneraTorServlet.java index 838b32d..daa9328 100644 --- a/src/org/torproject/exonerator/ExoneraTorServlet.java +++ b/src/org/torproject/exonerator/ExoneraTorServlet.java @@ -338,16 +338,11 @@ public class ExoneraTorServlet extends HttpServlet { out.printf("<p>Looking up IP address %s in the relay lists " + "published ", relayIP); long timestampFrom, timestampTo; - /* Consider all consensuses published on the given date, plus the ones - * published 3 hours before the given date and until 23:59:59. */ - timestampFrom = timestamp - 3L * 60L * 60L * 1000L; - timestampTo = timestamp + (24L * 60L * 60L - 1L) * 1000L; - out.printf("on %s", timestampStr); - /* If we don't find any relays in the given time interval, also look - * at consensuses published 12 hours before and 12 hours after the - * interval, in case the user got the "UTC" bit wrong. */ - long timestampTooOld = timestampFrom - 12L * 60L * 60L * 1000L; - long timestampTooNew = timestampTo + 12L * 60L * 60L * 1000L; + /* Consider all consensuses published on or within a day of the given + * date. */ + timestampFrom = timestamp - 24L * 60L * 60L * 1000L; + timestampTo = timestamp + 2 * 24L * 60L * 60L * 1000L - 1L; + out.printf("on or within a day of %s", timestampStr); out.print(" as well as in the relevant exit lists. Clients could " + "have selected any of these relays to build circuits. " + "You may follow the links to relay lists and relay descriptors " @@ -356,11 +351,9 @@ public class ExoneraTorServlet extends HttpServlet { SimpleDateFormat validAfterTimeFormat = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss"); validAfterTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC")); - String fromValidAfter = validAfterTimeFormat.format(timestampTooOld); - String toValidAfter = validAfterTimeFormat.format(timestampTooNew); - SortedSet<Long> tooOldConsensuses = new TreeSet<Long>(); + String fromValidAfter = validAfterTimeFormat.format(timestampFrom); + String toValidAfter = validAfterTimeFormat.format(timestampTo); SortedSet<Long> relevantConsensuses = new TreeSet<Long>(); - SortedSet<Long> tooNewConsensuses = new TreeSet<Long>(); try { Statement statement = conn.createStatement(); String query = "SELECT validafter FROM consensus " @@ -369,13 +362,7 @@ public class ExoneraTorServlet extends HttpServlet { ResultSet rs = statement.executeQuery(query); while (rs.next()) { long consensusTime = rs.getTimestamp(1).getTime(); - if (consensusTime < timestampFrom) { - tooOldConsensuses.add(consensusTime); - } else if (consensusTime > timestampTo) { - tooNewConsensuses.add(consensusTime); - } else { - relevantConsensuses.add(consensusTime); - } + relevantConsensuses.add(consensusTime); } rs.close(); statement.close(); @@ -383,17 +370,14 @@ public class ExoneraTorServlet extends HttpServlet { /* Looks like we don't have any consensuses in the requested * interval. */ } - SortedSet<Long> allConsensuses = new TreeSet<Long>(); - allConsensuses.addAll(tooOldConsensuses); - allConsensuses.addAll(relevantConsensuses); - allConsensuses.addAll(tooNewConsensuses); - if (allConsensuses.isEmpty()) { + if (relevantConsensuses.isEmpty()) { out.println(" <p>No relay lists found!</p>\n" + " <p>Result is INDECISIVE!</p>\n" + " <p>We cannot make any statement whether there was " + "a Tor relay running on IP address " + relayIP + " on " + timestampStr + "! We " - + "did not find any relevant relay lists at the given time. If " + + "did not find any relevant relay lists on or within a day of " + + "the given date. If " + "you think this is an error on our side, please " + "<a href=\"mailto:tor-assistants@torproject.org\">contact " + "us</a>!</p>\n"); @@ -473,23 +457,20 @@ public class ExoneraTorServlet extends HttpServlet { "yyyy-MM-dd-HH-mm-ss"); validAfterUrlFormat.setTimeZone(TimeZone.getTimeZone("UTC")); out.print("<pre><code>"); - for (long consensus : allConsensuses) { - if (relevantConsensuses.contains(consensus)) { - String validAfterDatetime = validAfterTimeFormat.format( - consensus); - String validAfterString = validAfterUrlFormat.format(consensus); - out.print("valid-after <b>" - + "<a href=\"consensus?valid-after=" - + validAfterString + "\" target=\"_blank\">" - + validAfterDatetime + "</b></a>\n"); - if (statusEntries.containsKey(consensus)) { - for (String htmlString : - statusEntries.get(consensus).values()) { - out.print(htmlString); - } + for (long consensus : relevantConsensuses) { + String validAfterDatetime = validAfterTimeFormat.format(consensus); + String validAfterString = validAfterUrlFormat.format(consensus); + out.print("valid-after <b>" + + "<a href=\"consensus?valid-after=" + + validAfterString + "\" target=\"_blank\">" + + validAfterDatetime + "</b></a>\n"); + if (statusEntries.containsKey(consensus)) { + for (String htmlString : + statusEntries.get(consensus).values()) { + out.print(htmlString); } - out.print("\n"); } + out.print("\n"); } out.print("</code></pre>"); if (relevantDescriptors.isEmpty()) { @@ -497,9 +478,8 @@ public class ExoneraTorServlet extends HttpServlet { + " <p>Result is NEGATIVE with high certainty!</p>\n" + " <p>We did not find IP " + "address " + relayIP + " in any of the relay or exit lists " - + "that were published between %s and %s.</p>\n", - dateFormat.format(timestampTooOld), - dateFormat.format(timestampTooNew)); + + "that were published on or within a day of %s.</p>\n", + timestampStr); /* Run another query to find out if there are relays running on * other IP addresses in the same /24 or /48 network and tell the * user about it. */ @@ -580,12 +560,14 @@ public class ExoneraTorServlet extends HttpServlet { if (!relayIP.contains(":")) { out.print(" <p>The following other IP addresses of Tor " + "relays in the same /24 network were found in relay " - + "and/or exit lists around the time that could be related " + + "and/or exit lists on or within a day of " + timestampStr + + " that could be related " + "to IP address " + relayIP + ":</p>\n"); } else { out.print(" <p>The following other IP addresses of Tor " + "relays in the same /48 network were found in relay " - + "lists around the time that could be related to IP " + + "lists on or within a day of " + timestampStr + + " that could be related to IP " + "address " + relayIP + ":</p>\n"); } out.print(" <ul>\n"); @@ -606,64 +588,21 @@ public class ExoneraTorServlet extends HttpServlet { } /* Print out result. */ - boolean inMostRelevantConsensuses = false, - inOtherRelevantConsensus = false, - inTooOldConsensuses = false, - inTooNewConsensuses = false; - for (long match : positiveConsensusesNoTarget) { - if (dateFormat.format(match).equals(timestampStr)) { - inMostRelevantConsensuses = true; - } else if (relevantConsensuses.contains(match)) { - inOtherRelevantConsensus = true; - } else if (tooOldConsensuses.contains(match)) { - inTooOldConsensuses = true; - } else if (tooNewConsensuses.contains(match)) { - inTooNewConsensuses = true; - } - } - if (inMostRelevantConsensuses) { + if (!positiveConsensusesNoTarget.isEmpty()) { out.print(" <p>Result is POSITIVE with high certainty!" + "</p>\n" + " <p>We found one or more relays on IP address " - + relayIP + " in "); - out.print("relay list published on " + timestampStr); + + relayIP + " in a "); + out.print("relay list published on or within a day of " + + timestampStr); out.print(" that clients were likely to know.</p>\n"); } else { - if (inOtherRelevantConsensus) { - out.println(" <p>Result is POSITIVE " - + "with moderate certainty!</p>\n"); - out.println("<p>We found one or more relays on IP address " - + relayIP + ", but not in "); - out.print("a relay list published on " + timestampStr); - out.print(". A possible reason for the relay being missing in a " - + "relay list might be that some of the directory " - + "authorities had difficulties connecting to the relay. " - + "However, clients might still have used the relay.</p>\n"); - } else { - out.println(" <p>Result is NEGATIVE " - + "with high certainty!</p>\n"); - out.println(" <p>We did not find any relay on IP address " - + relayIP - + " in the relay lists 3 hours preceding " + timestampStr - + ".</p>\n"); - if (inTooOldConsensuses || inTooNewConsensuses) { - if (inTooOldConsensuses && !inTooNewConsensuses) { - out.println(" <p>Note that we found a matching relay " - + "in relay lists that were published between 15 and 3 " - + "hours before " + timestampStr + ".</p>\n"); - } else if (!inTooOldConsensuses && inTooNewConsensuses) { - out.println(" <p>Note that we found a matching relay " - + "in relay lists that were published up to 12 hours " - + "after " + timestampStr + ".</p>\n"); - } else { - out.println(" <p>Note that we found a matching relay " - + "in relay lists that were published between 15 and 3 " - + "hours before and in relay lists that were published " - + "up to 12 hours after " + timestampStr + ".</p>\n"); - } - out.println("<p>Be sure to try out the previous/next day.</p>"); - } - } + out.println(" <p>Result is NEGATIVE " + + "with high certainty!</p>\n"); + out.println(" <p>We did not find any relay on IP address " + + relayIP + + " in the relay lists on or within a day of " + timestampStr + + ".</p>\n"); } try {

1 0

[exonerator/master] Remove search for target address and port.
by karsten＠torproject.org 13 Jul '15

13 Jul '15

commit 5113f55887a00c9dd62a9d7962a0263c31bac0dc Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Mar 25 11:53:15 2015 +0100 Remove search for target address and port. Implements part of #15002. --- .../torproject/exonerator/ExoneraTorServlet.java | 387 +------------------- 1 file changed, 5 insertions(+), 382 deletions(-) diff --git a/src/org/torproject/exonerator/ExoneraTorServlet.java b/src/org/torproject/exonerator/ExoneraTorServlet.java index 59cc7b3..838b32d 100644 --- a/src/org/torproject/exonerator/ExoneraTorServlet.java +++ b/src/org/torproject/exonerator/ExoneraTorServlet.java @@ -2,10 +2,8 @@ * See LICENSE for licensing information */ package org.torproject.exonerator; -import java.io.BufferedReader; import java.io.IOException; import java.io.PrintWriter; -import java.io.StringReader; import java.sql.CallableStatement; import java.sql.Connection; import java.sql.ResultSet; @@ -24,7 +22,6 @@ import java.util.TreeMap; import java.util.TreeSet; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.naming.Context; @@ -99,13 +96,11 @@ public class ExoneraTorServlet extends HttpServlet { + " <br>\n" + " <p>ExoneraTor tells you whether there was a Tor relay " + "running on a given IP address at a given time. ExoneraTor " - + "can further indicate whether this relay permitted exiting " - + "to a given server and/or TCP port. ExoneraTor learns these " - + "facts by parsing the public relay lists and relay " - + "descriptors that are collected from the Tor directory " - + "authorities and the exit lists collected by TorDNSEL. By " - + "inputting an IP address and time, you can determine whether " - + "that IP was then a part of the Tor network.</p>\n" + + "learns these facts by parsing the public relay lists that " + + "are collected from the Tor directory authorities and the " + + "exit lists collected by TorDNSEL. By inputting an IP " + + "address and time, you can determine whether that IP was " + + "then a part of the Tor network.</p>\n" + " <br>\n" + " <p><font color=\"red\"><b>Notice:</b> Note that the " + "information you are providing below may be visible to " @@ -288,70 +283,8 @@ public class ExoneraTorServlet extends HttpServlet { timestampWarning = "Please provide a date."; } - /* Parse target IP parameter. */ - String targetIP = "", targetPort = "", target = ""; - String[] targetIPParts = null; - String targetAddrParameter = request.getParameter("targetaddr"); - String targetAddrWarning = ""; - if (targetAddrParameter != null && targetAddrParameter.length() > 0) { - Matcher targetAddrParameterMatcher = - ipv4AddressPattern.matcher(targetAddrParameter); - if (targetAddrParameterMatcher.matches()) { - String[] targetAddrParts = targetAddrParameter.split("\\."); - targetIP = Integer.parseInt(targetAddrParts[0]) + "." - + Integer.parseInt(targetAddrParts[1]) + "." - + Integer.parseInt(targetAddrParts[2]) + "." - + Integer.parseInt(targetAddrParts[3]); - target = targetIP; - targetIPParts = targetIP.split("\\."); - } else { - targetAddrWarning = "\"" + (targetAddrParameter.length() > 20 ? - StringEscapeUtils.escapeHtml(targetAddrParameter.substring( - 0, 20)) + "[...]" : StringEscapeUtils.escapeHtml( - targetAddrParameter)) + "\" is not a valid IP address."; - } - } - - /* Parse target port parameter. */ - String targetPortParameter = request.getParameter("targetport"); - String targetPortWarning = ""; - if (targetPortParameter != null && targetPortParameter.length() > 0) { - Pattern targetPortPattern = Pattern.compile("\\d+"); - if (targetPortParameter.length() < 5 && - targetPortPattern.matcher(targetPortParameter).matches() && - !targetPortParameter.equals("0") && - Integer.parseInt(targetPortParameter) < 65536) { - targetPort = targetPortParameter; - if (target != null) { - target += ":" + targetPort; - } else { - target = targetPort; - } - } else { - targetPortWarning = "\"" + (targetPortParameter.length() > 8 ? - StringEscapeUtils.escapeHtml(targetPortParameter. - substring(0, 8)) + "[...]" : - StringEscapeUtils.escapeHtml(targetPortParameter)) - + "\" is not a valid TCP port."; - } - } - - /* If target port is provided, a target address must be provided, - * too. */ - /* TODO Relax this requirement. */ - if (targetPort.length() > 0 && targetIP.length() < 1 && - targetAddrWarning.length() < 1) { - targetAddrWarning = "Please provide an IP address."; - } - /* Write form with IP address and timestamp. */ out.println(" <form action=\"#relay\">\n" - + " <input type=\"hidden\" name=\"targetaddr\" " - + (targetIP.length() > 0 ? " value=\"" + targetIP + "\"" : "") - + ">\n" - + " <input type=\"hidden\" name=\"targetPort\"" - + (targetPort.length() > 0 ? " value=\"" + targetPort + "\"" : "") - + ">\n" + " <table>\n" + " <tr>\n" + " <td align=\"right\">IP address in question:" @@ -730,319 +663,9 @@ public class ExoneraTorServlet extends HttpServlet { } out.println("<p>Be sure to try out the previous/next day.</p>"); } - /* We didn't find any descriptor. No need to look up targets. */ - writeFooter(out); - try { - conn.close(); - this.logger.info("Returned a database connection to the pool " - + "after " + (System.currentTimeMillis() - - requestedConnection) + " millis."); - } catch (SQLException e) { - } - return; - } - } - - /* Looking up targets for IPv6 is not supported yet. */ - if (relayIP.contains(":")) { - writeFooter(out); - return; - } - - /* Second part: target */ - out.println("<br><a name=\"exit\"></a><h3>Was this relay configured " - + "to permit exiting to a given target?</h3>"); - - out.println(" <form action=\"#exit\">\n" - + " <input type=\"hidden\" name=\"timestamp\"\n" - + " value=\"" + timestampStr + "\">\n" - + " <input type=\"hidden\" name=\"ip\" " - + "value=\"" + relayIP + "\">\n" - + " <table>\n" - + " <tr>\n" - + " <td align=\"right\">Target address:</td>\n" - + " <td><input type=\"text\" name=\"targetaddr\"" - + (targetIP.length() > 0 ? " value=\"" + targetIP + "\"" : "") - + "\">" - + (targetAddrWarning.length() > 0 ? "<br><font color=\"red\">" - + targetAddrWarning + "</font>" : "") - + "</td>\n" - + " <td><i>(Ex.: 4.3.2.1)</i></td>\n" - + " </tr>\n" - + " <tr>\n" - + " <td align=\"right\">Target port:</td>\n" - + " <td><input type=\"text\" name=\"targetport\"" - + (targetPort.length() > 0 ? " value=\"" + targetPort + "\"" - : "") - + ">" - + (targetPortWarning.length() > 0 ? "<br><font color=\"red\">" - + targetPortWarning + "</font>" : "") - + "</td>\n" - + " <td><i>(Ex.: 80)</i></td>\n" - + " </tr>\n" - + " <tr>\n" - + " <td></td>\n" - + " <td>\n" - + " <input type=\"submit\">\n" - + " <input type=\"reset\">\n" - + " </td>\n" - + " <td></td>\n" - + " </tr>\n" - + " </table>\n" - + " </form>\n"); - - if (targetIP.length() < 1) { - writeFooter(out); - try { - conn.close(); - this.logger.info("Returned a database connection to the pool " - + "after " + (System.currentTimeMillis() - - requestedConnection) + " millis."); - } catch (SQLException e) { - } - return; - } - - /* Parse router descriptors to check exit policies. */ - out.println("<p>Searching the relay descriptors published by the " - + "relay on IP address " + relayIP + " to find out whether this " - + "relay permitted exiting to " + target + ". You may follow the " - + "links above to the relay descriptors and grep them for the " - + "lines printed below to confirm that results are correct.</p>"); - SortedSet<Long> positiveConsensuses = new TreeSet<Long>(); - Set<String> missingDescriptors = new HashSet<String>(); - Set<String> descriptors = relevantDescriptors.keySet(); - for (String descriptor : descriptors) { - byte[] rawDescriptor = null; - try { - String query = "SELECT rawdescriptor FROM descriptor " - + "WHERE descriptor = '" + descriptor + "'"; - Statement statement = conn.createStatement(); - ResultSet rs = statement.executeQuery(query); - if (rs.next()) { - rawDescriptor = rs.getBytes(1); - } - rs.close(); - statement.close(); - } catch (SQLException e) { - /* Consider this descriptors as 'missing'. */ - continue; - } - if (rawDescriptor != null && rawDescriptor.length > 0) { - missingDescriptors.remove(descriptor); - String rawDescriptorString = new String(rawDescriptor, - "US-ASCII"); - try { - BufferedReader br = new BufferedReader( - new StringReader(rawDescriptorString)); - String line = null, routerLine = null, publishedLine = null; - StringBuilder acceptRejectLines = new StringBuilder(); - boolean foundMatch = false; - while ((line = br.readLine()) != null) { - if (line.startsWith("router ")) { - routerLine = line; - } else if (line.startsWith("published ")) { - publishedLine = line; - } else if (line.startsWith("reject ") || - line.startsWith("accept ")) { - if (foundMatch) { - out.println(line); - continue; - } - boolean ruleAccept = line.split(" ")[0].equals("accept"); - String ruleAddress = line.split(" ")[1].split(":")[0]; - if (!ruleAddress.equals("*")) { - if (!ruleAddress.contains("/") && - !ruleAddress.equals(targetIP)) { - /* IP address does not match. */ - acceptRejectLines.append(line + "\n"); - continue; - } - String[] ruleIPParts = ruleAddress.split("/")[0]. - split("\\."); - int ruleNetwork = ruleAddress.contains("/") ? - Integer.parseInt(ruleAddress.split("/")[1]) : 32; - for (int i = 0; i < 4; i++) { - if (ruleNetwork == 0) { - break; - } else if (ruleNetwork >= 8) { - if (ruleIPParts[i].equals(targetIPParts[i])) { - ruleNetwork -= 8; - } else { - break; - } - } else { - int mask = 255 ^ 255 >>> ruleNetwork; - if ((Integer.parseInt(ruleIPParts[i]) & mask) == - (Integer.parseInt(targetIPParts[i]) & mask)) { - ruleNetwork = 0; - } - break; - } - } - if (ruleNetwork > 0) { - /* IP address does not match. */ - acceptRejectLines.append(line + "\n"); - continue; - } - } - String rulePort = line.split(" ")[1].split(":")[1]; - if (targetPort.length() < 1 && !ruleAccept && - !rulePort.equals("*")) { - /* With no port given, we only consider reject :* rules as - matching. */ - acceptRejectLines.append(line + "\n"); - continue; - } - if (targetPort.length() > 0 && !rulePort.equals("*") && - rulePort.contains("-")) { - int fromPort = Integer.parseInt(rulePort.split("-")[0]); - int toPort = Integer.parseInt(rulePort.split("-")[1]); - int targetPortInt = Integer.parseInt(targetPort); - if (targetPortInt < fromPort || - targetPortInt > toPort) { - /* Port not contained in interval. */ - continue; - } - } - if (targetPort.length() > 0) { - if (!rulePort.equals("*") && - !rulePort.contains("-") && - !targetPort.equals(rulePort)) { - /* Ports do not match. */ - acceptRejectLines.append(line + "\n"); - continue; - } - } - boolean relevantMatch = false; - for (long match : relevantDescriptors.get(descriptor)) { - if (relevantConsensuses.contains(match)) { - relevantMatch = true; - } - } - if (relevantMatch) { - String[] routerParts = routerLine.split(" "); - out.println("<pre><code>" + routerParts[0] + " " - + routerParts[1] + " <b>" + routerParts[2] + "</b> " - + routerParts[3] + " " + routerParts[4] + " " - + routerParts[5]); - String[] publishedParts = publishedLine.split(" "); - out.println(publishedParts[0] + " <b>" - + publishedParts[1] + " " + publishedParts[2] - + "</b>"); - out.print(acceptRejectLines.toString()); - out.println("<b>" + line + "</b>"); - foundMatch = true; - } - if (ruleAccept) { - positiveConsensuses.addAll( - relevantDescriptors.get(descriptor)); - } - } - } - br.close(); - if (foundMatch) { - out.println("</code></pre>"); - } - } catch (IOException e) { - /* Could not read descriptor string. */ - continue; - } } } - /* Print out result. */ - inMostRelevantConsensuses = false; - inOtherRelevantConsensus = false; - inTooOldConsensuses = false; - inTooNewConsensuses = false; - for (long match : positiveConsensuses) { - if (dateFormat.format(match).equals(timestampStr)) { - inMostRelevantConsensuses = true; - } else if (relevantConsensuses.contains(match)) { - inOtherRelevantConsensus = true; - } else if (tooOldConsensuses.contains(match)) { - inTooOldConsensuses = true; - } else if (tooNewConsensuses.contains(match)) { - inTooNewConsensuses = true; - } - } - if (inMostRelevantConsensuses) { - out.print(" <p>Result is POSITIVE with high certainty!" - + "</p>\n" - + " <p>We found one or more relays on IP address " - + relayIP + " permitting exit to " + target + " in "); - out.print("relay list published on " + timestampStr); - out.print(" that clients were likely to know.</p>\n"); - writeFooter(out); - try { - conn.close(); - this.logger.info("Returned a database connection to the pool " - + "after " + (System.currentTimeMillis() - - requestedConnection) + " millis."); - } catch (SQLException e) { - } - return; - } - boolean resultIndecisive = target.length() > 0 - && !missingDescriptors.isEmpty(); - if (resultIndecisive) { - out.println(" <p>Result is INDECISIVE!</p>\n" - + " <p>At least one referenced descriptor could not be " - + "found. This is a rare case, but one that (apparently) " - + "happens. We cannot make any good statement about exit " - + "relays without these descriptors. The following descriptors " - + "are missing:</p>"); - for (String desc : missingDescriptors) - out.println(" <p>" + desc + "</p>\n"); - } - if (inOtherRelevantConsensus) { - if (!resultIndecisive) { - out.println(" <p>Result is POSITIVE " - + "with moderate certainty!</p>\n"); - } - out.println("<p>We found one or more relays on IP address " - + relayIP + " permitting exit to " + target + ", but not in "); - out.print("a relay list published on " + timestampStr); - out.print(". A possible reason for the relay being missing in a " - + "relay list might be that some of the directory authorities " - + "had difficulties connecting to the relay. However, clients " - + "might still have used the relay.</p>\n"); - } else { - if (!resultIndecisive) { - out.println(" <p>Result is NEGATIVE " - + "with high certainty!</p>\n"); - } - out.println(" <p>We did not find any relay on IP address " - + relayIP + " permitting exit to " + target - + " in the relay list 3 hours preceding " + timestampStr - + ".</p>\n"); - if (inTooOldConsensuses || inTooNewConsensuses) { - if (inTooOldConsensuses && !inTooNewConsensuses) { - out.println(" <p>Note that we found a matching relay in " - + "relay lists that were published between 15 and 3 " - + "hours before " + timestampStr + ".</p>\n"); - } else if (!inTooOldConsensuses && inTooNewConsensuses) { - out.println(" <p>Note that we found a matching relay in " - + "relay lists that were published up to 12 hours after " - + timestampStr + ".</p>\n"); - } else { - out.println(" <p>Note that we found a matching relay in " - + "relay lists that were published between 15 and 3 " - + "hours before and in relay lists that were published up " - + "to 12 hours after " + timestampStr + ".</p>\n"); - } - out.println("<p>Be sure to try out the previous/next day.</p>"); - } - } - if (target != null) { - if (positiveConsensuses.isEmpty() && - !positiveConsensusesNoTarget.isEmpty()) { - out.println(" <p>Note that although the found relay(s) did " - + "not permit exiting to " + target + ", there have been one " - + "or more relays running at the given time.</p>"); - } - } try { conn.close(); this.logger.info("Returned a database connection to the pool "

1 0

[exonerator/master] Include exit policy summaries.
by karsten＠torproject.org 13 Jul '15

13 Jul '15

commit 125701831fb7437a30f6d91a4b783ff7cafca34c Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jul 13 14:58:56 2015 +0200 Include exit policy summaries. Implements the rest of #15002. --- src/org/torproject/exonerator/ExoneraTorServlet.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/org/torproject/exonerator/ExoneraTorServlet.java b/src/org/torproject/exonerator/ExoneraTorServlet.java index daa9328..d12f2c3 100644 --- a/src/org/torproject/exonerator/ExoneraTorServlet.java +++ b/src/org/torproject/exonerator/ExoneraTorServlet.java @@ -434,6 +434,8 @@ public class ExoneraTorServlet extends HttpServlet { line.lastIndexOf(":")); String port = line.substring(line.lastIndexOf(":")); html.append("a <b>" + address + "</b>" + port + "\n"); + } else if (line.startsWith("p ")) { + html.append(line + "\n"); } } if (exitaddress != null && exitaddress.length() > 0) {

1 0

[metrics-tasks/master] Remove service addresses, add graph letters (#15513).
by karsten＠torproject.org 13 Jul '15

13 Jul '15

commit ea45da10fde9180f6a9093d3fcf927ec365941f4 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jul 13 10:10:38 2015 +0200 Remove service addresses, add graph letters (#15513). --- task-15513/plot.R | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/task-15513/plot.R b/task-15513/plot.R index 4f83c6d..078c791 100644 --- a/task-15513/plot.R +++ b/task-15513/plot.R @@ -8,8 +8,8 @@ ggplot(l, aes(x = lifetime_millis / 3600000, colour = service)) + scale_x_continuous("\nLifetime in hours", limits = c(0, max(l$lifetime_millis) / 3600000)) + scale_y_continuous("Cumulative fraction\n", labels = percent) + - scale_colour_hue("Service") + - ggtitle("Lifetime of introduction points\n") + scale_colour_hue("Service", guide = FALSE) + + ggtitle("(a) Lifetime of introduction points\n") l <- read.csv("published-descs.csv") ggplot(l, aes(x = descs, colour = service)) + @@ -17,8 +17,8 @@ ggplot(l, aes(x = descs, colour = service)) + scale_x_continuous("\nNumber of descriptors", limits = c(0, max(l$descs))) + scale_y_continuous("Cumulative fraction\n", labels = percent) + - scale_colour_hue("Service") + - ggtitle(paste("Number of descriptors published per hour,\n", + scale_colour_hue("Service", guide = FALSE) + + ggtitle(paste("(b) Number of descriptors published per hour,\n", "including descriptor replicas\n", sep = "")) l <- read.csv("established-intros.csv") @@ -27,8 +27,8 @@ ggplot(l, aes(x = intros, colour = service)) + scale_x_continuous("\nNumber of introduction points", limits = c(0, max(l$intros))) + scale_y_continuous("Cumulative fraction\n", labels = percent) + - scale_colour_hue("Service") + - ggtitle("Number of distinct introduction points used per hour\n") + scale_colour_hue("Service", guide = FALSE) + + ggtitle("(c) Number of distinct introduction points used per hour\n") l <- read.csv("intros-per-desc.csv") ggplot(l, aes(x = introsperdesc, colour = service)) + @@ -37,8 +37,8 @@ ggplot(l, aes(x = introsperdesc, colour = service)) + limits = c(0, max(l$introsperdesc)), breaks = seq(0, max(l$introsperdesc), 2)) + scale_y_continuous("Cumulative fraction\n", labels = percent) + - scale_colour_hue("Service") + - ggtitle("Number of introduction points per descriptor\n") + scale_colour_hue("Service", guide = FALSE) + + ggtitle("(d) Number of introduction points per descriptor\n") l <- read.csv("intros-per-relay.csv") data <- rbind( @@ -64,9 +64,9 @@ ggplot(data) + limits = c(0, max(data$x))) + scale_y_continuous(paste("Cumulative number of relays used for", "introduction points\n")) + - scale_colour_hue("Service") + - ggtitle(paste("Number of introduction points established on\nthe same", - "relay (in the measurement period)\n")) + scale_colour_hue("Service", guide = FALSE) + + ggtitle(paste("(e) Number of introduction points established on\nthe", + "same relay (in the measurement period)\n")) data <- data[as.character(data$colour) != "agorahooawayyfoe", ] ggplot(data) + @@ -75,9 +75,9 @@ ggplot(data) + limits = c(0, max(data$x, na.rm = TRUE))) + scale_y_continuous(paste("Cumulative number of relays used for", "introduction points\n")) + - scale_colour_hue("Service") + - ggtitle(paste("Number of introduction points established on\nthe same", - "relay (in the measurement period)\n")) + scale_colour_hue("Service", guide = FALSE) + + ggtitle(paste("(f) Number of introduction points established on\nthe", + "same relay (in the measurement period)\n")) l <- read.csv("intros-per-desc.csv") l <- aggregate(list(introsperdesc = l$introsperdesc), by = list( @@ -90,7 +90,9 @@ ggplot(l, aes(x = as.POSIXct(publication, facet_grid(service ~ .) + scale_x_datetime("") + scale_y_continuous("") + - ggtitle("Number of introduction points over time\n") + ggtitle("(g) Number of introduction points over time\n") + + theme(strip.background = element_blank(), + strip.text.y = element_blank()) l <- read.csv("novel-introduction-points.csv") ggplot(l, aes( @@ -99,7 +101,7 @@ ggplot(l, aes( geom_line() + scale_x_datetime("") + scale_y_continuous("Cumulative number of relays\n") + - scale_colour_hue("Service") + - ggtitle(paste("Cumulative number of distinct relays\nused for", + scale_colour_hue("Service", guide = FALSE) + + ggtitle(paste("(h) Cumulative number of distinct relays\nused for", "establishing introduction points\n"))

1 0

[tor-messenger-build/master] Set JS locale to English/C
by sukhbir＠torproject.org 13 Jul '15

13 Jul '15

commit 427ef050da6d1adc026508299d631ce6a3fc0d01 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sun Jul 12 23:12:22 2015 -0400 Set JS locale to English/C This patch is copied from Tor Browser Bundle; ticket #13019, patch by Arthur Edelstein. --- projects/instantbird/config | 1 + projects/instantbird/js-locale.mozpatch | 204 +++++++++++++++++++++++++++++++ 2 files changed, 205 insertions(+) diff --git a/projects/instantbird/config b/projects/instantbird/config index 95f6c46..c216ce4 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -116,6 +116,7 @@ input_files: enable: '[% c("var/windows") %]' - filename: Bug-9173-Change-the-default-Firefox-profile-director.mozpatch - filename: block-plugins.mozpatch + - filename: js-locale.mozpatch - filename: 824009fbc42f.mozpatch enable: '[% c("var/windows") %]' - filename: Bug-1133689-backport-Make-D3DVsyncDisplay-destructor.mozpatch diff --git a/projects/instantbird/js-locale.mozpatch b/projects/instantbird/js-locale.mozpatch new file mode 100644 index 0000000..b135523 --- /dev/null +++ b/projects/instantbird/js-locale.mozpatch @@ -0,0 +1,204 @@ +diff --git a/browser/base/content/test/general/mochitest.ini b/browser/base/content/test/general/mochitest.ini +index a129d73..139133e 100644 +--- a/browser/base/content/test/general/mochitest.ini ++++ b/browser/base/content/test/general/mochitest.ini +@@ -28,7 +28,6 @@ support-files = + + [test_bug364677.html] + [test_bug395533.html] +-[test_bug_jsdefaultlocale.html] + [test_contextmenu.html] + skip-if = toolkit == "gtk2" || toolkit == "gtk3" || (os == 'mac' && os_version != '10.6') # disabled on Linux due to bug 513558, on Mac after 10.6 due to bug 792304 + [test_contextmenu_input.html] +diff --git a/browser/base/content/test/general/test_bug_jsdefaultlocale.html b/browser/base/content/test/general/test_bug_jsdefaultlocale.html +deleted file mode 100644 +index 6566ae0..0000000 +--- a/browser/base/content/test/general/test_bug_jsdefaultlocale.html ++++ /dev/null +@@ -1,41 +0,0 @@ +-<!DOCTYPE HTML> +-<html> +- +-<head> +- <meta charset="utf-8"> +- <title>Test for Tor Bug #13019: Prevent fingerprinting of JS-exposed locale</title> +- <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> +- <script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script> +- <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/> +-</head> +-<body> +-<a target="_blank" href="https://bugs.torproject.org">Bug 13019</a> +-<p id="display"></p> +-<pre id="test"></pre> +-<script type="application/javascript;version=1.8"> +-let prefName = "javascript.use_us_english_locale", +- originalPrefValue = null, +- date = new Date(); +-// Read the current pref value. +-try { +- originalPrefValue = SpecialPowers.getBoolPref(prefName); +-} catch (e) { } +-// Enable pref "javascript.use_us_english_locale". +-SpecialPowers.setBoolPref(prefName, true); +-// Test that we are getting en-US locale everywhere it is exposed in JavaScript +-is(Intl.Collator().resolvedOptions().locale, "en-US", "content JS locale from Intl.Collator"); +-is(Intl.DateTimeFormat().resolvedOptions().locale, "en-US", "content JS locale Intl.DateTimeFormat"); +-is(Intl.NumberFormat().resolvedOptions().locale, "en-US", "content JS locale from Intl.NumberFormat"); +-is(date.toLocaleString(), date.toLocaleString("en-US"), "Date formatted by JS locale"); +-// Return pref to its original value, if it had one. +-if (originalPrefValue === null) { +- SpecialPowers.clearUserPref(prefName); +-} else { +- SpecialPowers.setBoolPref(prefName, originalPrefValue); +-} +- +-</script> +-</body> +-</html> +diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp +index 877056e..169981e9 100644 +--- a/js/src/jsapi.cpp ++++ b/js/src/jsapi.cpp +@@ -5217,13 +5217,6 @@ JS_SetDefaultLocale(JSRuntime* rt, const char* locale) + return rt->setDefaultLocale(locale); + } + +-JS_PUBLIC_API(const char*) +-JS_GetDefaultLocale(JSRuntime *rt) +-{ +- AssertHeapIsIdle(rt); +- return rt->getDefaultLocale(); +-} +- + JS_PUBLIC_API(void) + JS_ResetDefaultLocale(JSRuntime* rt) + { +diff --git a/js/src/jsapi.h b/js/src/jsapi.h +index 2a6fe34..2b279b5 100644 +--- a/js/src/jsapi.h ++++ b/js/src/jsapi.h +@@ -4266,15 +4266,6 @@ extern JS_PUBLIC_API(bool) + JS_SetDefaultLocale(JSRuntime* rt, const char* locale); + + /* +- * Returns the default locale for the ECMAScript Internationalization API +- * (Intl.Collator, Intl.NumberFormat, Intl.DateTimeFormat). +- * Note that the Internationalization API encourages clients to +- * specify their own locales. +- */ +-extern JS_PUBLIC_API(const char*) +-JS_GetDefaultLocale(JSRuntime *rt); +- +-/* + * Reset the default locale to OS defaults. + */ + extern JS_PUBLIC_API(void) +diff --git a/xpcom/build/XPCOMInit.cpp b/xpcom/build/XPCOMInit.cpp +index 292652d..a58d89c 100644 +--- a/xpcom/build/XPCOMInit.cpp ++++ b/xpcom/build/XPCOMInit.cpp +@@ -8,7 +8,6 @@ + + #include "mozilla/Atomics.h" + #include "mozilla/Poison.h" +-#include "mozilla/Preferences.h" + #include "mozilla/XPCOM.h" + #include "nsXULAppAPI.h" + +@@ -44,8 +43,6 @@ + #include "nsSupportsPrimitives.h" + #include "nsConsoleService.h" + +-#include "nsIJSRuntimeService.h" +- + #include "nsComponentManager.h" + #include "nsCategoryManagerUtils.h" + #include "nsIServiceManager.h" +@@ -488,67 +485,6 @@ NS_IMPL_ISUPPORTS(NesteggReporter, nsIMemoryReporter) + CountingAllocatorBase<NesteggReporter>::sAmount(0); + #endif /* MOZ_WEBM */ + +-// Anonymous namespace for customizing the default locale that JavaScript +-// uses, according to the value of the "javascript.use_us_english_locale" pref. +-// The current default locale can be detected in JavaScript by calling +-// `Intl.DateTimeFormat().resolvedOptions().locale` +-namespace { +- +-#define USE_US_ENGLISH_LOCALE_PREF "javascript.use_us_english_locale" +- +-static char* sSystemLocale; +-static char* sJSLocale; +- +-// Returns a pointer to the current JS Runtime. +-static +-JSRuntime* GetRuntime() { +- nsresult rv; +- nsCOMPtr<nsIJSRuntimeService> rts = do_GetService("@mozilla.org/js/xpc/RuntimeService;1", &rv); +- if (NS_FAILED(rv)) return NULL; +- JSRuntime* rt; +- rts->GetRuntime(&rt); +- return rt; +-} +- +-// If the USE_US_ENGLISH_LOCALE_PREF is active, set all locales to US English. +-// Otherwise, fall back to the default system and JS locales. +-static +-void UseUSEnglishLocalePrefChangedCallback(const char* /* pref */, void* /* closure */) { +- // Get a pointer to the default JS Runtime. +- JSRuntime* rt = GetRuntime(); +- if (rt) { +- // Read the pref to see if we will use US English locale. +- bool useUSEnglishLocale = mozilla::Preferences::GetBool(USE_US_ENGLISH_LOCALE_PREF, false); +- // Set the application-wide C-locale. Needed for Date.toLocaleFormat(). +- setlocale(LC_ALL, useUSEnglishLocale ? "C" : sSystemLocale); +- // Now override the JavaScript Runtime Locale that is used by the Intl API +- // as well as Date.toLocaleString, Number.toLocaleString, and String.localeCompare. +- JS_SetDefaultLocale(rt, useUSEnglishLocale ? "en-US" : sJSLocale); +- } +-} +- +-static +-void StartWatchingUseUSEnglishLocalePref() { +- // Get the default system locale. To be used if US English locale pref is deactivated. +- sSystemLocale = strdup(setlocale(LC_ALL,NULL)); +- // Store the default JavaScript locale. +- JSRuntime* rt = GetRuntime(); +- if (rt) { +- sJSLocale = strdup(JS_GetDefaultLocale(rt)); +- } +- // Now keep the locale updated with the current pref value. +- mozilla::Preferences::RegisterCallbackAndCall(UseUSEnglishLocalePrefChangedCallback, USE_US_ENGLISH_LOCALE_PREF); +-} +- +-static +-void StopWatchingUseUSEnglishLocalePref() { +- mozilla::Preferences::UnregisterCallback(UseUSEnglishLocalePrefChangedCallback, USE_US_ENGLISH_LOCALE_PREF); +- if (sSystemLocale) free(sSystemLocale); +- if (sJSLocale) JS_free(nullptr, sJSLocale); +-} +- +-} // anonymous namespace for locale hiding +- + // Note that on OSX, aBinDirectory will point to .app/Contents/Resources/browser + EXPORT_XPCOM_API(nsresult) + NS_InitXPCOM2(nsIServiceManager** aResult, +@@ -830,8 +766,6 @@ NS_InitXPCOM2(nsIServiceManager** aResult, + mozilla::eventtracer::Init(); + #endif + +- // Start watching the "javascript.use_us_english_locale" pref. +- StartWatchingUseUSEnglishLocalePref(); + return NS_OK; + } + +@@ -1104,8 +1038,6 @@ ShutdownXPCOM(nsIServiceManager* aServMgr) + delete sExitManager; + sExitManager = nullptr; + +- StopWatchingUseUSEnglishLocalePref(); +- + Omnijar::CleanUp(); + + HangMonitor::Shutdown();

1 0

[tor-messenger-build/master] Switch to comm-esr38 and Thunderbird release tag
by sukhbir＠torproject.org 13 Jul '15

13 Jul '15

commit 87780dd5b94087f5650e715a049058d41b9e6368 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sun Jul 12 23:02:04 2015 -0400 Switch to comm-esr38 and Thunderbird release tag --- projects/instantbird/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/instantbird/config b/projects/instantbird/config index f984538..95f6c46 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' -hg_url: https://hg.mozilla.org/releases/comm-beta/ -hg_hash: THUNDERBIRD_38_0b4_RELEASE +hg_url: https://hg.mozilla.org/releases/comm-esr38/ +hg_hash: THUNDERBIRD_38_1_0_RELEASE filename: "[% project %]-[% c('version') %]-[% c('var/osname') %]-[% c('var/build_id') %].[% c('var/archive_suffix') %]" remote_docker: 1 lsb_release:

1 0

[webwml/master] Forgot some ccc mirror stuff
by sebastian＠torproject.org 12 Jul '15

12 Jul '15

commit ac4b4dfbe5d858b361f0d4d3886fc20a9e5f9e33 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Jul 13 00:45:17 2015 +0200 Forgot some ccc mirror stuff --- include/mirrors-table.wmi | 2 +- include/tor-mirrors.csv | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/mirrors-table.wmi b/include/mirrors-table.wmi index f980e70..0b8aeaf 100644 --- a/include/mirrors-table.wmi +++ b/include/mirrors-table.wmi @@ -826,7 +826,7 @@ <td> - </td> <td><a href="http://tor.ccc.de/dist/">http</a></td> <td><a href="http://tor.ccc.de/">http</a></td> - <td> - </td> + <td><a href="https://tor.ccc.de/dist/">https</a></td> <td><a href="https://tor.ccc.de">https</a></td> <td> - </td> <td> - </td> diff --git a/include/tor-mirrors.csv b/include/tor-mirrors.csv index 27ddce6..0d33d9b 100644 --- a/include/tor-mirrors.csv +++ b/include/tor-mirrors.csv @@ -116,4 +116,4 @@ Stefan, sela Internet, DE, Germany, DE, TRUE, TRUE, No, http://sela.io/mirrors/t justaguy AT justaguy DOT pw, Justaguy, NL, The Netherlands, NL, True, False, No, http://services.justaguy.pw/, https://services.justaguy.pw/, , , http://services.justaguy.pw/dist, https://services.justaguy.pw/dist, , http://3qzbcsjhwseov7k4.onion, Sun Jul 12 15:19:35 2015 thomaswhite AT riseup DOT net, TheCthulhu, NL, The Netherlands, NL, True, False, No, http://tor.thecthulhu.com/, https://tor.thecthulhu.com/, , , http://tor.thecthulhu.com/dist/, https://tor.thecthulhu.com/dist/, , , Sun Jul 12 15:19:35 2015 rush23 AT gmx DOT net, Tor Supporter, DE, Germany, Europe, TRUE, FALSE, No, http://tor-proxy.euve59946.serverprofi24.de/, , , , http://tor-proxy.euve59946.serverprofi24.de/dist/, , , , Thu Jun 4 19:06:42 2015 -webmaster AT ccc DOT de, CCC, NL, The Netherlands, Europe, TRUE, FALSE, No, http://tor.ccc.de/, https://tor.ccc.de, , , http://tor.ccc.de/dist/, , , , Sun Jul 12 17:37:47 2015 +webmaster AT ccc DOT de, CCC, NL, The Netherlands, Europe, TRUE, FALSE, No, http://tor.ccc.de/, https://tor.ccc.de, , , http://tor.ccc.de/dist/, https://tor.ccc.de/dist/, , , Sun Jul 12 17:37:47 2015

1 0