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

[torspec/master] Use correct terms from RFC's in spec.
by nickm＠torproject.org 13 Jul '11

13 Jul '11

commit adb2bf39305f7e97d4dc58abe91b9ae6939075a1 Author: Linus Nordberg <linus(a)nordberg.se> Date: Tue Jul 12 09:34:00 2011 -0400 Use correct terms from RFC's in spec. --- socks-extensions.txt | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/socks-extensions.txt b/socks-extensions.txt index 60695e5..f587d9c 100644 --- a/socks-extensions.txt +++ b/socks-extensions.txt @@ -31,11 +31,12 @@ Tor's extensions to the SOCKS protocol SOCKS5: - The (SOCKS5) "UDP ASSOCIATE" command is not supported. - IPv6 is not supported in CONNECT commands. - - The "NO AUTHENTICATION" (SOCKS5) authentication method [00] is supported. - As of Tor 0.2.3.2-alpha, the "USERNAME/PASSWORD" (SOCKS5) authentication - method [02] is supported too. As an extension to support some broken - clients, we allow clients to pass "USERNAME/PASSWORD" authentication to - us even if no authentication was selected. + - The "NO AUTHENTICATION REQUIRED" (SOCKS5) authentication method [00] is + supported; and as of Tor 0.2.3.2-alpha, the "USERNAME/PASSWORD" (SOCKS5) + authentication method [02] is supported too. Any credentials passed to + the latter are ignored. As an extension to support some broken clients, + we allow clients to pass "USERNAME/PASSWORD" authentication to us even if + no authentication was selected. 2. Name lookup

1 0

[metrics-web/master] Allow importing descriptors from a local Tor directory.
by karsten＠torproject.org 13 Jul '11

13 Jul '11

commit d19126aeab5974db35a7a087ff21984ea6085682 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jul 13 17:38:56 2011 +0200 Allow importing descriptors from a local Tor directory. The `KeepDirectoryArchiveImportHistory` option allows us to keep a history of imported directory archive files to know which files have been imported before. This history can be useful when importing from a changing source to avoid importing descriptors over and over again, but it can be confusing to users who don't know about it. However, this approach does not work for importing cached descriptors from a local Tor directory, because descriptors are contained in files like cached-descriptors. Filenames never change here, just contents. The new approach is to also keep the file modification time in our history and check whether files have been modified after we last read them. This lets us import descriptors from a local Tor directory, too. Also update the README. --- ChangeLog | 1 + README | 27 ++++++++----------- src/org/torproject/ernie/cron/ArchiveReader.java | 31 ++++++++++++++++----- 3 files changed, 35 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index 387e813..42032ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Metrics database and website change log: Changes in version 0.0.2 - 2011-??-?? - Let users download votes from a given valid-after time. + - Allow importing descriptors from a local Tor directory. Changes in version 0.0.1 - 2011-06-08 - Initial release diff --git a/README b/README index 0786852..111543a 100644 --- a/README +++ b/README @@ -25,7 +25,7 @@ delivery service, and others. 1.1. Preparing the operating system ------------------------------------ +=================================== This README describes the steps for installing metrics-web on a Debian GNU/Linux Squeeze server. Instructions for other operating systems may @@ -151,22 +151,25 @@ can process. Look for the config option WriteRelayDescriptorsRawFiles in /srv/metrics-web/config.template for more information on this experimental feature. +In a future version of metrics-web it may also be possible to update local +relay descriptor tarballs from the official metrics server via rsync and +import only the changes into the metrics database. The idea is to simply +rsync the data/ directory from the metrics server and have all information +available. However, this feature is not implemented yet. + 1.4. Importing relay descriptors from a local Tor data directory ================================================================ -WARNING: The functions described in this section are not implemented yet! - -In a future version of metrics-web, the metrics database importer will be -able to import the cached descriptors from a local Tor data directory. -(A special case of importing descriptors from a continuously updated -directory is when both metrics-db and metrics-web are run on the same -machine, but this shouldn't be the general case.) +In order to keep the data in the metrics database up-to-date, the metrics +database importer can import the cached descriptors from a local Tor data +directory. Configure a local Tor client to fetch all known descriptors as early as possible by adding these config options to its torrc file: FetchUselessDescriptors 1 +FetchDirInfoEarly 1 FetchDirInfoExtraEarly 1 Tell the metrics database importer where to find the cached descriptor @@ -181,14 +184,6 @@ Add a crontab entry for the database importer to run once per hour: 15 * * * * cd /srv/metrics-web/ && ./run.sh -In a future version of metrics-web it may also be possible to update local -relay descriptor tarballs from the official metrics server via rsync and -import only the changes into the metrics database. The idea is to simply -rsync the data/ directory from the metrics server and have all information -available. But until this is implemented, the recommended way to keep the -metrics website up-to-date would be the one described above in this -section. - 1.5. Importing GeoIP information ================================ diff --git a/src/org/torproject/ernie/cron/ArchiveReader.java b/src/org/torproject/ernie/cron/ArchiveReader.java index b21233d..4d4fe64 100644 --- a/src/org/torproject/ernie/cron/ArchiveReader.java +++ b/src/org/torproject/ernie/cron/ArchiveReader.java @@ -21,8 +21,9 @@ public class ArchiveReader { int parsedFiles = 0, ignoredFiles = 0; Logger logger = Logger.getLogger(ArchiveReader.class.getName()); - SortedSet<String> lastArchivesImportHistory = new TreeSet<String>(); - SortedSet<String> newArchivesImportHistory = new TreeSet<String>(); + SortedMap<String, Long> + lastArchivesImportHistory = new TreeMap<String, Long>(), + newArchivesImportHistory = new TreeMap<String, Long>(); File archivesImportHistoryFile = new File(statsDirectory, "archives-import-history"); if (keepImportHistory && archivesImportHistoryFile.exists()) { @@ -31,7 +32,15 @@ public class ArchiveReader { archivesImportHistoryFile)); String line = null; while ((line = br.readLine()) != null) { - lastArchivesImportHistory.add(line); + String[] parts = line.split(","); + if (parts.length < 2) { + logger.warning("Archives import history file does not " + + "contain timestamps. Skipping."); + break; + } + long lastModified = Long.parseLong(parts[0]); + String filename = parts[1]; + lastArchivesImportHistory.put(filename, lastModified); } br.close(); } catch (IOException e) { @@ -53,14 +62,17 @@ public class ArchiveReader { } } else { try { + long lastModified = pop.lastModified(); + String filename = pop.getName(); if (keepImportHistory) { - newArchivesImportHistory.add(pop.getName()); + newArchivesImportHistory.put(filename, lastModified); } if (keepImportHistory && - lastArchivesImportHistory.contains(pop.getName())) { + lastArchivesImportHistory.containsKey(filename) && + lastArchivesImportHistory.get(filename) >= lastModified) { ignoredFiles++; continue; - } else if (pop.getName().endsWith(".tar.bz2")) { + } else if (filename.endsWith(".tar.bz2")) { logger.warning("Cannot parse compressed tarball " + pop.getAbsolutePath() + ". Skipping."); continue; @@ -99,6 +111,7 @@ public class ArchiveReader { break; } } + logger.warning(sb.toString()); } } if (keepImportHistory) { @@ -106,8 +119,10 @@ public class ArchiveReader { archivesImportHistoryFile.getParentFile().mkdirs(); BufferedWriter bw = new BufferedWriter(new FileWriter( archivesImportHistoryFile)); - for (String line : newArchivesImportHistory) { - bw.write(line + "\n"); + for (Map.Entry<String, Long> historyEntry : + newArchivesImportHistory.entrySet()) { + bw.write(String.valueOf(historyEntry.getValue()) + "," + + historyEntry.getKey() + "\n"); } bw.close(); } catch (IOException e) {

1 0

[torbrowser/master] bump all tbb versions to firefox 3.6.19
by erinn＠torproject.org 13 Jul '11

13 Jul '11

commit 715c03a582523dfe89b64e1bd13a7f3859285796 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jul 13 10:58:08 2011 -0300 bump all tbb versions to firefox 3.6.19 --- README | 9 ++++++--- README.Linux | 6 +++--- README.OSX | 5 ++++- build-scripts/Makefile | 4 ++-- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 4 ++-- 6 files changed, 18 insertions(+), 12 deletions(-) diff --git a/README b/README index 2afd038..c9df4a1 100644 --- a/README +++ b/README @@ -7,8 +7,8 @@ Included applications Vidalia 0.2.12 (with Qt 4.6.2) Tor 0.2.1.30 (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-1.0.0d) Polipo 1.0.4.1 -FirefoxPortable 3.6.18 - \_ Firefox 3.6.18 +FirefoxPortable 3.6.19 + \_ Firefox 3.6.19 \_ Torbutton 1.2.5 \_ HTTPS Everywhere 1.0.0development.4 PidginPortable 2.7.4 @@ -347,7 +347,10 @@ Changelog Update zlib to 1.2.5 Update OpenSSL to 1.0.0d -1.3.25: Released 2011-06-11 +1.3.25: Released 2011-07-11 Update Firefox to 3.6.18 Update Libevent to 2.0.12-stable Update HTTPS-Everywhere to 1.0.0development.4 + +1.3.26: Released 2011-07-13 + Update Firefox to 3.6.19 diff --git a/README.Linux b/README.Linux index 850608c..b5325b1 100644 --- a/README.Linux +++ b/README.Linux @@ -6,7 +6,7 @@ Included applications Vidalia 0.2.12 (with Qt 4.6.2) Tor 0.2.2.30-rc (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-0.9.8p) -Firefox 3.6.18 +Firefox 3.6.19 \_ Torbutton 1.2.5 |_ NoScript 2.1.1.2 |_ BetterPrivacy 1.51 @@ -29,9 +29,9 @@ To exit, close Firefox. Vidalia will automatically clean up and exit. Changelog --------- -1.1.12: Released 2011-07-11 +1.1.12: Released 2011-07-13 Update Tor to 0.2.2.30-rc - Update Firefox to 3.6.18 + Update Firefox to 3.6.1999999999 Update NoScript to 2.1.1.2 Update HTTPS-Everywhere to 1.0.0development.4 diff --git a/README.OSX b/README.OSX index 3a05c7a..08ca414 100644 --- a/README.OSX +++ b/README.OSX @@ -7,7 +7,7 @@ Included applications Vidalia 0.2.12 (with Qt 4.6.2) Tor 0.2.2.30-rc (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-0.9.8p) Polipo 1.0.4.1 -Firefox 3.6.18 +Firefox 3.6.19 \_ Torbutton 1.2.5 |_ NoScript 2.1.1.2 |_ HTTPS-Everywhere 1.0.0development.4 @@ -24,6 +24,9 @@ To exit, close Firefox and Vidalia. Changelog --------- +1.0.22: Released 2011-07-13 + Update Firefox to 3.6.19 + 1.0.21: Released 2011-07-12 The new HTTPS-Everywhere was missing from the last release. Actually add it this time. diff --git a/build-scripts/Makefile b/build-scripts/Makefile index 97085bb..2d0f6b3 100644 --- a/build-scripts/Makefile +++ b/build-scripts/Makefile @@ -18,7 +18,7 @@ OPENSSL=/e/build/openssl-0.9.8p/ ## Versions TORBUTTON_VERSION=1.2.5 -FIREFOX_VERSION=3.6.18 +FIREFOX_VERSION=3.6.19 PIDGIN_VERSION=2.7.5 ## Location of bundle components @@ -49,7 +49,7 @@ DEST="Generic Bundle" NAME="Tor Browser" ## Version and name of the compressed bundle (also used for source) -VERSION=1.3.25 +VERSION=1.3.26 DEFAULT_COMPRESSED_BASENAME=tor-browser- IM_COMPRESSED_BASENAME=tor-im-browser- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index cc185be..aa5c919 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -42,7 +42,7 @@ TBB_FINAL=$(BUILT_DIR)/TBBL ## Versions for our source packages HTTPSEVERY_VER=1.0.0development.4 -FIREFOX_VER=3.6.18 +FIREFOX_VER=3.6.19 LIBEVENT_VER=2.0.12-stable LIBPNG_VER=1.4.3 NOSCRIPT_VER=2.1.1.2 diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 9096537..0269494 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -42,7 +42,7 @@ TBB_FINAL=$(BUILT_DIR)/TBBL ## Versions for our source packages HTTPSEVERY_VER=1.0.0development.4 -FIREFOX_VER=3.6.18 +FIREFOX_VER=3.6.19 LIBEVENT_VER=2.0.12-stable LIBPNG_VER=1.4.3 NOSCRIPT_VER=2.1.1.2 @@ -211,7 +211,7 @@ NAME=TorBrowser DISTDIR=tbbosx-dist ## Version and name of the compressed bundle (also used for source) -VERSION=1.0.21-dev +VERSION=1.0.22-dev DEFAULT_COMPRESSED_BASENAME=TorBrowser-$(VERSION)-osx-$(ARCH_TYPE)- IM_COMPRESSED_BASENAME=TorBrowser-IM-$(VERSION)- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)

1 0

r24891: {translation} updated translation templates for the website (in translation/trunk/projects/website/po/templates: docs donate download)
by Runa Sandvik 13 Jul '11

13 Jul '11

Author: runa Date: 2011-07-13 13:55:34 +0000 (Wed, 13 Jul 2011) New Revision: 24891 Added: translation/trunk/projects/website/po/templates/donate/3-low.thankyou.pot Modified: translation/trunk/projects/website/po/templates/docs/2-medium.faq.pot translation/trunk/projects/website/po/templates/donate/3-low.donate.pot translation/trunk/projects/website/po/templates/download/1-high.download-easy.pot translation/trunk/projects/website/po/templates/download/3-low.download.pot Log: updated translation templates for the website Modified: translation/trunk/projects/website/po/templates/docs/2-medium.faq.pot =================================================================== --- translation/trunk/projects/website/po/templates/docs/2-medium.faq.pot 2011-07-13 13:42:07 UTC (rev 24890) +++ translation/trunk/projects/website/po/templates/docs/2-medium.faq.pot 2011-07-13 13:55:34 UTC (rev 24891) @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2011-06-21 08:18+0200\n" +"POT-Creation-Date: 2011-07-13 14:57+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -30,7 +30,7 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/faq.wml:15 /tmp/Lr_DWY6vt6.xml:1668 +#: /home/runa/tor/website/docs/en/faq.wml:15 /tmp/CtBqnqx2A7.xml:1668 msgid "<hr>" msgstr "" @@ -99,7 +99,7 @@ #. type: Content of: <div><div><ul><li> #: /home/runa/tor/website/docs/en/faq.wml:34 msgid "" -"<a href=\"#SSLcertfingerprint\">What are your SSL cerificate fingerprints?</" +"<a href=\"#SSLcertfingerprint\">What are your SSL certificate fingerprints?</" "a>" msgstr "" Modified: translation/trunk/projects/website/po/templates/donate/3-low.donate.pot =================================================================== --- translation/trunk/projects/website/po/templates/donate/3-low.donate.pot 2011-07-13 13:42:07 UTC (rev 24890) +++ translation/trunk/projects/website/po/templates/donate/3-low.donate.pot 2011-07-13 13:55:34 UTC (rev 24891) @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2011-06-21 08:19+0200\n" +"POT-Creation-Date: 2011-07-13 14:57+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -65,7 +65,7 @@ #: /home/runa/tor/website/donate/en/donate.wml:27 msgid "" "<a href=\"#cash\">checks, money orders, bank transfers, stock grants or " -"other more sophisticated transactions.</a>" +"other more sophisticated transactions</a>" msgstr "" #. type: Content of: <div><div><p> @@ -242,9 +242,9 @@ "\" name=\"cmd\" value=\"_donations\"> <input type=\"hidden\" name=\"business" "\" value=\"donations(a)torproject.org\"> <input type=\"hidden\" id=\"item_name" "\" name=\"item_name\" value=\"Donation to the Tor Project\"> <input type=" -"\"hidden\" name=\"return\" value=\"https://www.torproject.org/donate\"> " -"<input type=\"hidden\" name=\"cancel_return\" value=\"https://www.torproject." -"org/donate\">" +"\"hidden\" name=\"return\" value=\"https://www.torproject.org/donate/thankyou" +"\"> <input type=\"hidden\" name=\"cancel_return\" value=\"https://www." +"torproject.org/donate\">" msgstr "" #. BEGIN AMAZON @@ -277,10 +277,10 @@ "\"description\" value=\"Supporting Online Anonymity & Privacy\"> <input " "type=\"hidden\" name=\"amazonPaymentsAccountId\" value=" "\"XGSROLNTXRNC3N1P4TXKMNK14LN1D6SZUD8SN1\"> <input type=\"hidden\" name=" -"\"returnUrl\" value=\"https://www.torproject.org/donate/donate\"> <input " -"type=\"hidden\" name=\"processImmediate\" value=\"1\"> <input type=\"hidden" -"\" name=\"cobrandingStyle\" value=\"logo\"> <input type=\"hidden\" name=" -"\"abandonUrl\" value=\"https://www.torproject.org/donate/donate\">" +"\"returnUrl\" value=\"https://www.torproject.org/donate/donate/thankyou\"> " +"<input type=\"hidden\" name=\"processImmediate\" value=\"1\"> <input type=" +"\"hidden\" name=\"cobrandingStyle\" value=\"logo\"> <input type=\"hidden\" " +"name=\"abandonUrl\" value=\"https://www.torproject.org/donate/donate\">" msgstr "" #. type: Content of: <div><div><div><div> Added: translation/trunk/projects/website/po/templates/donate/3-low.thankyou.pot =================================================================== --- translation/trunk/projects/website/po/templates/donate/3-low.thankyou.pot (rev 0) +++ translation/trunk/projects/website/po/templates/donate/3-low.thankyou.pot 2011-07-13 13:55:34 UTC (rev 24891) @@ -0,0 +1,73 @@ +# SOME DESCRIPTIVE TITLE +# Copyright (C) YEAR The Tor Project, Inc. +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"POT-Creation-Date: 2011-07-13 14:57+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. type: Content of: <div><div> +#: /home/runa/tor/website/donate/en/thankyou.wml:9 +msgid "" +"<img class=\"thankyou_h1\" src=\"../images/thankyou_h1.jpg\" height=\"122\" " +"width=\"419\" alt=\"Thank You!\">" +msgstr "" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/donate/en/thankyou.wml:10 +msgid "" +"Your donation helps support online privacy<br>& censorship circumvention " +"around the globe!" +msgstr "" + +#. type: Content of: <div><div><div><table><tr><td> +#: /home/runa/tor/website/donate/en/thankyou.wml:17 +msgid "" +"<img class=\"thankyou_h2\" src=\"../images/thankyou_h2.png\" height=\"46\" " +"width=\"195\" alt=\"Keep In Touch!\">" +msgstr "" + +#. type: Content of: <div><div><div><table><tr><td><p> +#: /home/runa/tor/website/donate/en/thankyou.wml:18 +msgid "" +"Sign up for our <a " +"href=\"https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-news\">newsletter</a>" +msgstr "" + +#. type: Content of: <div><div><div><table><tr><td><form><p> +#: /home/runa/tor/website/donate/en/thankyou.wml:21 +msgid "" +"<label class=\"inactive\" for=\"email\">Enter your email " +"address:</label><br> <input type=\"text\" name=\"email\" id=\"email\" " +"size=\"25\" value=\"\"> <input id=\"submit\" type=\"submit\" " +"name=\"email-button\" value=\"GO\">" +msgstr "" + +#. type: Content of: <div><div><div><table><tr><td> +#: /home/runa/tor/website/donate/en/thankyou.wml:31 +msgid "" +"<img class=\"thankyou_h2\" src=\"../images/thankyou_h3.png\" height=\"46\" " +"width=\"142\" alt=\"Got Skills?\">" +msgstr "" + +#. type: Content of: <div><div><div><table><tr><td><p> +#: /home/runa/tor/website/donate/en/thankyou.wml:32 +msgid "Put them to good use" +msgstr "" + +#. type: Content of: <div><div><div><table><tr><td> +#: /home/runa/tor/website/donate/en/thankyou.wml:33 +msgid "" +"<a href=\"<page getinvolved/volunteer>\">Volunteer for The Tor Project " +"»</a>" +msgstr "" Modified: translation/trunk/projects/website/po/templates/download/1-high.download-easy.pot =================================================================== --- translation/trunk/projects/website/po/templates/download/1-high.download-easy.pot 2011-07-13 13:42:07 UTC (rev 24890) +++ translation/trunk/projects/website/po/templates/download/1-high.download-easy.pot 2011-07-13 13:55:34 UTC (rev 24891) @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2011-07-08 08:42+0200\n" +"POT-Creation-Date: 2011-07-13 14:56+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -153,9 +153,9 @@ "\" name=\"cmd\" value=\"_donations\"> <input type=\"hidden\" name=\"business" "\" value=\"donations(a)torproject.org\"> <input type=\"hidden\" id=\"item_name" "\" name=\"item_name\" value=\"Donation to the Tor Project\"> <input type=" -"\"hidden\" name=\"return\" value=\"https://www.torproject.org/donate\"> " -"<input type=\"hidden\" name=\"cancel_return\" value=\"https://www.torproject." -"org/donate\">" +"\"hidden\" name=\"return\" value=\"https://www.torproject.org/donate/thankyou" +"\"> <input type=\"hidden\" name=\"cancel_return\" value=\"https://www." +"torproject.org/download-easy\">" msgstr "" #. type: Content of: <div><div><table><tbody><tr><td><form><p> Modified: translation/trunk/projects/website/po/templates/download/3-low.download.pot =================================================================== --- translation/trunk/projects/website/po/templates/download/3-low.download.pot 2011-07-13 13:42:07 UTC (rev 24890) +++ translation/trunk/projects/website/po/templates/download/3-low.download.pot 2011-07-13 13:55:34 UTC (rev 24891) @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2011-07-08 08:42+0200\n" +"POT-Creation-Date: 2011-07-13 14:56+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -152,9 +152,9 @@ "\" name=\"cmd\" value=\"_donations\"> <input type=\"hidden\" name=\"business" "\" value=\"donations(a)torproject.org\"> <input type=\"hidden\" id=\"item_name" "\" name=\"item_name\" value=\"Donation to the Tor Project\"> <input type=" -"\"hidden\" name=\"return\" value=\"https://www.torproject.org/donate\"> " -"<input type=\"hidden\" name=\"cancel_return\" value=\"https://www.torproject." -"org/donate\">" +"\"hidden\" name=\"return\" value=\"https://www.torproject.org/donate/thankyou" +"\"> <input type=\"hidden\" name=\"cancel_return\" value=\"https://www." +"torproject.org/download\">" msgstr "" #. type: Content of: <div><div><table><tr><td><form><p> @@ -175,8 +175,8 @@ msgstr "" #. type: Content of: <div><div><table><tr><td><ul><li> -#: /home/runa/tor/website/download/en/download.wml:102 /tmp/lbSAEZiU0Z.xml:165 -#: /tmp/lbSAEZiU0Z.xml:203 +#: /home/runa/tor/website/download/en/download.wml:102 /tmp/eCkycGCH9H.xml:165 +#: /tmp/eCkycGCH9H.xml:203 msgid "" "The <strong>Tor Browser Bundle</strong> contains everything you need to " "safely browse the Internet. This package requires no installation. Just " @@ -204,12 +204,12 @@ #. type: Content of: <div><div><table><tr><td><ul><li> #: /home/runa/tor/website/download/en/download.wml:108 msgid "" -"The <strong>Expert Package</strong> contains just Tor and nothing else. " +"The <strong>Expert Bundle</strong> contains just Tor and nothing else. " "You'll need to configure Tor and all of your applications manually." msgstr "" #. type: Content of: <div><div><table><tr><td><p> -#: /home/runa/tor/website/download/en/download.wml:110 /tmp/lbSAEZiU0Z.xml:168 +#: /home/runa/tor/website/download/en/download.wml:110 /tmp/eCkycGCH9H.xml:168 msgid "" "There are two versions of each package, a stable and alpha release. Stable " "packages are released when we believe the features and code will not change " @@ -515,7 +515,7 @@ msgstr "" #. type: Content of: <div><div><div> -#: /home/runa/tor/website/download/en/download.wml:265 /tmp/lbSAEZiU0Z.xml:344 +#: /home/runa/tor/website/download/en/download.wml:265 /tmp/eCkycGCH9H.xml:344 msgid "<br>" msgstr ""

1 0

r24890: {website} updated wml, now with translated video and credit (website/trunk/docs/de)
by Runa Sandvik 13 Jul '11

13 Jul '11

Author: runa Date: 2011-07-13 13:42:07 +0000 (Wed, 13 Jul 2011) New Revision: 24890 Modified: website/trunk/docs/de/tor-doc-windows.wml Log: updated wml, now with translated video and credit Modified: website/trunk/docs/de/tor-doc-windows.wml =================================================================== --- website/trunk/docs/de/tor-doc-windows.wml 2011-07-13 13:41:32 UTC (rev 24889) +++ website/trunk/docs/de/tor-doc-windows.wml 2011-07-13 13:42:07 UTC (rev 24890) @@ -32,7 +32,7 @@ das in deine Sprache übersetzt ist, kennst, lass es uns wissen!</p> <div class="center"> - <p><video id="v1" src="https://media.torproject.org/video/2009-install-and-use-tor.ogv" autobuffer="true" controls="controls"></video></p> +<p>Das nachfolgende Video, wurde von <a href="http://www.sempervideo.de/">SemperVideo</a> erstellt.</p> <p><video id="v1" src="https://media.torproject.org/video/2011-install-and-use-tor-de.ogv" autobuffer="true" controls="controls"></video></p> </div> <hr> <a id="Installation"></a>

1 0

r24889: {website} update the script to include translated video and credit (website/trunk)
by Runa Sandvik 13 Jul '11

13 Jul '11

Author: runa Date: 2011-07-13 13:41:32 +0000 (Wed, 13 Jul 2011) New Revision: 24889 Modified: website/trunk/po2wml.sh Log: update the script to include translated video and credit Modified: website/trunk/po2wml.sh =================================================================== --- website/trunk/po2wml.sh 2011-07-09 11:40:31 UTC (rev 24888) +++ website/trunk/po2wml.sh 2011-07-13 13:41:32 UTC (rev 24889) @@ -321,7 +321,11 @@ # sure we include the German video if [ $wmlfile = "tor-doc-windows.wml" ] then - sed -i "s@src\=\"https://media.torproject.org/video/2009-install-and-use-tor.ogv\"@src\=\"https://media.torproject.org/video/2011-install-and-use-tor-de.mp4@" "$wmldir/$subdir/$lang/$wmlfile" + orig_video=`grep src=\"https:\/\/media.torproject.org\/video\/2009-install-and-use-tor.ogv\" "$wmldir/$subdir/$lang/$wmlfile"` + new_video=`echo "<p>Das nachfolgende Video, wurde von <a href=\"http://www.sempervideo.de/\">SemperVideo</a> erstellt.</p> $orig_video"` + + sed -i "s@$orig_video@$new_video@" "$wmldir/$subdir/$lang/$wmlfile" + sed -i "s@src\=\"https://media.torproject.org/video/2009-install-and-use-tor.ogv\"@src\=\"https://media.torproject.org/video/2011-install-and-use-tor-de.ogv\"@" "$wmldir/$subdir/$lang/$wmlfile" fi fi

1 0

[torbrowser/maint-2.2] enable addon update checking for windows tbb
by erinn＠torproject.org 13 Jul '11

13 Jul '11

commit efe17a37d519fd544c22ac534a5bbbccfc9d5a7e Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jul 13 10:05:07 2011 -0300 enable addon update checking for windows tbb --- build-scripts/config/windows-4.0.js | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-scripts/config/windows-4.0.js b/build-scripts/config/windows-4.0.js index fc73c6c..13fda1f 100644 --- a/build-scripts/config/windows-4.0.js +++ b/build-scripts/config/windows-4.0.js @@ -62,7 +62,7 @@ user_pref("extensions.bprivacy.donotaskforfolder", true); user_pref("extensions.bprivacy.donotaskonexit", true); user_pref("extensions.bprivacy.initiated", true); user_pref("extensions.checkCompatibility.4.*", false); -user_pref("extensions.checkUpdateSecurity", false); +user_pref("extensions.checkUpdateSecurity", true); user_pref("extensions.databaseSchema", 3); user_pref("extensions.enabledAddons", "https-everywhere@eff.org:0.9.9.development.4,{73a6fe31-595d-460b-a920-fcc0f8843232}:2.1.0.3,{d40f5e7b-d2cf-4856-b441-cc613eeffbe3}:1.50,{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}:1.3.3-alpha"); user_pref("extensions.enabledItems", "langpack-en-US@firefox.mozilla.org:,{73a6fe31-595d-460b-a920-fcc0f8843232}:1.9.9.57,{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}:1.2.4,{972ce4c6-7e08-4474-a285-3208198ce6fd}:3.5.8"); @@ -88,8 +88,8 @@ user_pref("extensions.torbutton.startup", true); user_pref("extensions.torbutton.tor_enabled", true); user_pref("extensions.torbutton.tor_memory_jar", true); user_pref("extensions.torbutton.tz_string", "UTC+00:00"); -user_pref("extensions.update.enabled", false); -user_pref("extensions.update.notifyUser", false); +user_pref("extensions.update.enabled", true); +user_pref("extensions.update.notifyUser", true); user_pref("general.appname.override", "Netscape"); user_pref("general.appversion.override", "5.0 (Windows; en-US)"); user_pref("general.buildID.override", "0");

1 0

[torbrowser/maint-2.2] eradicate polipo from the windows bundle
by erinn＠torproject.org 13 Jul '11

13 Jul '11

commit aee3d6e71cdd367b845b39aae851af3a4270f263 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jul 13 10:02:58 2011 -0300 eradicate polipo from the windows bundle --- build-scripts/config/torrc | 1 + build-scripts/config/vidalia.conf.ff | 3 --- build-scripts/windows.mk | 16 +--------------- 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/build-scripts/config/torrc b/build-scripts/config/torrc index 2d63da9..29154fb 100644 --- a/build-scripts/config/torrc +++ b/build-scripts/config/torrc @@ -8,4 +8,5 @@ GeoIPFile .\Data\Tor\geoip Log notice stdout # Bind to this address to listen to connections from SOCKS-speaking # applications. +SocksPort 9050 SocksListenAddress 127.0.0.1 diff --git a/build-scripts/config/vidalia.conf.ff b/build-scripts/config/vidalia.conf.ff index ef312a8..03ed00a 100644 --- a/build-scripts/config/vidalia.conf.ff +++ b/build-scripts/config/vidalia.conf.ff @@ -2,9 +2,6 @@ BrowserDirectory=FirefoxPortable BrowserExecutable=tbb-firefox.exe LanguageCode=en -ProxyExecutable=.\\App\\polipo.exe -ProxyExecutableArguments=-c .\\Data\\Polipo\\polipo.conf -RunProxyAtStart=true [Tor] ControlPort=9051 diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index bf15a48..1836741 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -41,7 +41,6 @@ WIX_LIB="/c/Program Files (x86)/Windows Installer XML v3.5/bin" ## Location of bundle components VIDALIA=$(FETCH_DIR)/vidalia-$(VIDALIA_VER) TOR=$(FETCH_DIR)/tor-$(TOR_VER) -POLIPO=$(FETCH_DIR)/polipo-$(POLIPO_VER) FIREFOX=$(FETCH_DIR)/FirefoxPortable-$(FIREFOX_VER) PIDGIN=$(FETCH_DIR)/PidginPortable-$(PIDGIN_VER) @@ -95,12 +94,6 @@ build-libevent: cd $(LIBEVENT_DIR) && make -j2 cd $(LIBEVENT_DIR) && make install -POLIPO_DIR=$(FETCH_DIR)/polipo-$(POLIPO_VER) -POLIPO_MAKEFILE=$(CONFIG_SRC)/polipo-Makefile -POLIPO_LDFLAGS="-Wl,--nxcompat -Wl,--dynamicbase" -build-polipo: - cd $(POLIPO_DIR) && LDFLAGS=$(POLIPO_LDFLAGS) make && PREFIX=$(FETCH_DIR)/built/ make install.binary - TOR_DIR=$(FETCH_DIR)/tor-$(TOR_VER) TOR_CFLAGS="-O -g -I$(BUILT_DIR)/include" TOR_LDFLAGS="-L$(BUILT_DIR)/lib" @@ -230,7 +223,6 @@ reallyclean: clean virus-scan: $(VIRUSSCAN) $(VIDALIA)/build/src/vidalia/vidalia.exe - $(VIRUSSCAN) $(COMPILED_BINS)/polipo.exe $(VIRUSSCAN) $(TOR)/src/or/tor.exe $(VIRUSSCAN) $(TOR)/src/tools/tor-resolve.exe @@ -253,7 +245,6 @@ directory-structure: mkdir -p $(APPDIR) mkdir -p $(DATADIR)/Tor mkdir -p $(DATADIR)/Vidalia - mkdir -p $(DATADIR)/Polipo mkdir -p $(DOCSDIR) ## Package up all the Vidalia and Tor pre-requisites @@ -265,7 +256,6 @@ install-binaries: cp $(OPENSSL_LIB)/ssleay32.dll $(APPDIR) cp $(OPENSSL_LIB)/libeay32.dll $(APPDIR) cp $(VIDALIA)/build/src/vidalia/vidalia.exe $(APPDIR) - cp $(COMPILED_BINS)/polipo.exe $(APPDIR) cp $(TOR)/src/or/tor.exe $(TOR)/src/tools/tor-resolve.exe $(APPDIR) ## Fixup @@ -275,12 +265,10 @@ install-docs: mkdir -p $(DOCSDIR)/Tor mkdir -p $(DOCSDIR)/Qt mkdir -p $(DOCSDIR)/MinGW - mkdir -p $(DOCSDIR)/Polipo cp $(VIDALIA)/LICENSE* $(VIDALIA)/CREDITS $(DOCSDIR)/Vidalia cp $(TOR)/LICENSE $(TOR)/README $(DOCSDIR)/Tor cp $(QT_LIB)/../LICENSE.GPL* $(QT_LIB)/../LICENSE.LGPL $(DOCSDIR)/Qt cp $(MING)/../msys/1.0/share/doc/MSYS/COPYING $(DOCSDIR)/MinGW - cp $(POLIPO)/COPYING $(POLIPO)/README.Windows $(DOCSDIR)/Polipo cp ../changelog.win-2.2 $(DOCSDIR)/changelog cp ../README.WIN-2.2 $(DOCSDIR)/README-TorBrowserBundle @@ -294,7 +282,7 @@ ifeq ($(USE_PIDGIN),1) cp -r $(PIDGIN) $(DEST)/PidginPortable endif -## Configure Firefox, FirefoxPortable, Vidalia, Polipo and Tor +## Configure Firefox, FirefoxPortable, Vidalia, and Tor configure-apps: mkdir -p $(DEST)/FirefoxPortable/Data/profile @@ -323,8 +311,6 @@ ifeq ($(USE_PIDGIN),1) else cp $(CONFIG_SRC)/vidalia.conf.ff $(DEST)/Data/Vidalia/vidalia.conf endif - ## Configure Polipo - cp $(CONFIG_SRC)/polipo.conf $(DEST)/Data/Polipo ## Configure Tor cp $(CONFIG_SRC)/torrc $(DEST)/Data/Tor cp $(TOR)/src/config/geoip $(DEST)/Data/Tor

1 0

[torbrowser/maint-2.2] bump all firefox versions to 5.0.1
by erinn＠torproject.org 13 Jul '11

13 Jul '11

commit 57cd4944d034a04a413c0394b8a11329e9d3d989 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jul 13 09:59:37 2011 -0300 bump all firefox versions to 5.0.1 --- README.LINUX-2.2 | 2 +- README.OSX-2.2 | 2 +- README.WIN-2.2 | 4 ++-- build-scripts/osx.mk | 4 ++-- build-scripts/versions.mk | 2 +- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 4 ++-- changelog.osx-2.2 | 6 ++++++ changelog.win-2.2 | 6 ++++++ 9 files changed, 22 insertions(+), 10 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index ffb5a3a..c871c74 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -6,7 +6,7 @@ Included applications Vidalia 0.2.12 (with Qt 4.6.2) Tor 0.2.2.30-rc (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-1.0.0d) -Firefox (Aurora) 5.0 +Firefox (Aurora) 5.0.1 \_ Torbutton 1.4.0 |_ NoScript 2.1.1.2 |_ HTTPS-Everywhere 1.0.0development.4 diff --git a/README.OSX-2.2 b/README.OSX-2.2 index 73661e0..88564a6 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -6,7 +6,7 @@ Included applications Vidalia 0.2.12 (with Qt 4.6.2) Tor 0.2.2.30-rc (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-1.0.0d) -Firefox (Aurora) 5.0 +Firefox (Aurora) 5.0.1 \_ Torbutton 1.4.0 |_ NoScript 2.1.1.2 |_ HTTPS-Everywhere 1.0.0development.4 diff --git a/README.WIN-2.2 b/README.WIN-2.2 index 0c16957..dbe8ffb 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -6,8 +6,8 @@ Included applications Vidalia 0.2.12 (with Qt 4.6.2) Tor 0.2.2.30-rc (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-1.0.0d) -FirefoxPortable 5.0 - \_ Firefox (Aurora) 5.0 +FirefoxPortable 5.0.1 + \_ Firefox (Aurora) 5.0.1 \_ Torbutton 1.4.0 |_ NoScript 2.1.1.2 |_ HTTPS-Everywhere 1.0.0development.4 diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index e8303f1..1a59db4 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -35,7 +35,7 @@ include $(PWD)/versions.mk ## Architecture -ARCH_TYPE=x86_64 +ARCH_TYPE=i386 ## Location of directory for source unpacking FETCH_DIR=$(PWD)/build-alpha-$(ARCH_TYPE) @@ -149,7 +149,7 @@ NAME=TorBrowser DISTDIR=tbbosx-alpha-dist ## Version and name of the compressed bundle (also used for source) -VERSION=$(RELEASE_VER)-1-alpha +VERSION=$(RELEASE_VER)-2-alpha DEFAULT_COMPRESSED_BASENAME=TorBrowser-$(VERSION)-osx-$(ARCH_TYPE)- IM_COMPRESSED_BASENAME=TorBrowser-IM-$(VERSION)- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 4dc8589..af23c30 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -3,7 +3,7 @@ RELEASE_VER=2.2.30 HTTPSEVERY_VER=1.0.0development.4 -FIREFOX_VER=5.0 +FIREFOX_VER=5.0.1 LIBEVENT_VER=2.0.12-stable LIBPNG_VER=1.4.3 NOSCRIPT_VER=2.1.1.2 diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 4100940..bf15a48 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -144,7 +144,7 @@ NAME="Tor Browser" DISTDIR=tbbwin-alpha-dist ## Version and name of the compressed bundle (also used for source) -VERSION=$(RELEASE_VER)-1-alpha +VERSION=$(RELEASE_VER)-2-alpha DEFAULT_COMPRESSED_BASENAME=tor-browser-$(VERSION) IM_COMPRESSED_BASENAME=tor-im-browser-$(VERSION) DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME) diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index ab000f5..f9119c5 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,12 +1,12 @@ Tor Browser Bundle (2.2.30-1) alpha; suite=linux * Update Tor to 0.2.2.30-rc - * Update Firefox to 5.0 + * Update Firefox to 5.0.1 * Update Torbutton to 1.4.0 * Update HTTPS Everywhere to 1.0.0development.4 * Update NoScript to 2.1.1.2 - -- Erinn Clark <erinn(a)torproject.org> Tue Jul 12 19:26:17 ART 2011 + -- Erinn Clark <erinn(a)torproject.org> Wed Jul 13 09:07:41 ART 2011 Tor Browser Bundle (2.2.29-1) alpha; suite=linux diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index b5452de..888aaf5 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,9 @@ +Tor Browser Bundle (2.2.30-2) alpha; suite=osx + + * Update Firefox to 5.0.1 + + - Erinn Clark <erinn(a)torproject.org> Wed Jul 13 09:07:41 ART 2011 + Tor Browser Bundle (2.2.30-1) alpha; suite=osx * Update Tor to 0.2.2.30-rc diff --git a/changelog.win-2.2 b/changelog.win-2.2 index ba6ce71..ee916bc 100644 --- a/changelog.win-2.2 +++ b/changelog.win-2.2 @@ -1,3 +1,9 @@ +Tor Browser Bundle (2.2.30-2) alpha; suite=windows + + * Update Firefox to 5.0.1 + + - Erinn Clark <erinn(a)torproject.org> Wed Jul 13 09:07:41 ART 2011 + Tor Browser Bundle (2.2.30-1) alpha; suite=windows * Update Tor to 0.2.2.30-rc

1 0

[metrics-web/master] Let users download votes from a given valid-after time.
by karsten＠torproject.org 13 Jul '11

13 Jul '11

commit b7f0ba813e9468c1635457a513a77496d62aed23 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jul 13 13:12:41 2011 +0200 Let users download votes from a given valid-after time. --- ChangeLog | 1 + etc/web.xml | 11 +++ src/org/torproject/ernie/web/VotesServlet.java | 110 ++++++++++++++++++++++++ 3 files changed, 122 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 94884cf..387e813 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ Metrics database and website change log: Changes in version 0.0.2 - 2011-??-?? + - Let users download votes from a given valid-after time. Changes in version 0.0.1 - 2011-06-08 - Initial release diff --git a/etc/web.xml b/etc/web.xml index 688e6f3..dbaa0a2 100644 --- a/etc/web.xml +++ b/etc/web.xml @@ -299,6 +299,17 @@ </servlet-mapping> <servlet> + <servlet-name>Votes</servlet-name> + <servlet-class> + org.torproject.ernie.web.VotesServlet + </servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>Votes</servlet-name> + <url-pattern>/votes</url-pattern> + </servlet-mapping> + + <servlet> <servlet-name>ErnieGeneratedFile</servlet-name> <servlet-class> org.torproject.ernie.web.ErnieGeneratedFileServlet diff --git a/src/org/torproject/ernie/web/VotesServlet.java b/src/org/torproject/ernie/web/VotesServlet.java new file mode 100644 index 0000000..3af9705 --- /dev/null +++ b/src/org/torproject/ernie/web/VotesServlet.java @@ -0,0 +1,110 @@ +package org.torproject.ernie.web; + +import java.io.*; +import java.sql.*; +import java.text.*; +import java.util.*; +import java.util.logging.*; + +import javax.naming.*; +import javax.servlet.*; +import javax.servlet.http.*; +import javax.sql.*; + +public class VotesServlet extends HttpServlet { + + private DataSource ds; + + private Logger logger; + + public void init() { + + /* Initialize logger. */ + this.logger = Logger.getLogger(VotesServlet.class.toString()); + + /* Look up data source. */ + try { + Context cxt = new InitialContext(); + this.ds = (DataSource) cxt.lookup("java:comp/env/jdbc/tordir"); + this.logger.info("Successfully looked up data source."); + } catch (NamingException e) { + this.logger.log(Level.WARNING, "Could not look up data source", e); + } + } + + public void doGet(HttpServletRequest request, + HttpServletResponse response) throws IOException, + ServletException { + + /* Check valid-after parameter. */ + String validAfterParameter = request.getParameter("valid-after"); + if (validAfterParameter == null || + validAfterParameter.length() != "yyyy-MM-dd-HH-mm-ss".length()) { + response.sendError(HttpServletResponse.SC_BAD_REQUEST); + return; + } + SimpleDateFormat parameterFormat = new SimpleDateFormat( + "yyyy-MM-dd-HH-mm-ss"); + parameterFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + long parsedTimestamp = -1L; + try { + parsedTimestamp = parameterFormat.parse(validAfterParameter). + getTime(); + } catch (ParseException e) { + response.sendError(HttpServletResponse.SC_BAD_REQUEST); + return; + } + if (parsedTimestamp < 0L) { + response.sendError(HttpServletResponse.SC_BAD_REQUEST); + return; + } + + /* Look up consensus in the database. */ + SimpleDateFormat databaseFormat = new SimpleDateFormat( + "yyyy-MM-dd HH:mm:ss"); + databaseFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + String databaseParameter = databaseFormat.format(parsedTimestamp); + List<byte[]> rawDescriptors = new ArrayList<byte[]>(); + try { + Connection conn = this.ds.getConnection(); + Statement statement = conn.createStatement(); + String query = "SELECT rawdesc FROM vote " + + "WHERE validafter = '" + databaseParameter + "'"; + ResultSet rs = statement.executeQuery(query); + while (rs.next()) { + rawDescriptors.add(rs.getBytes(1)); + } + rs.close(); + statement.close(); + conn.close(); + } catch (SQLException e) { + response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); + return; + } + + /* Write response. */ + if (rawDescriptors.size() == 0) { + response.sendError(HttpServletResponse.SC_NOT_FOUND); + return; + } + try { + response.setContentType("text/plain"); + int responseLength = 0; + for (byte[] rawDescriptor : rawDescriptors) { + responseLength += rawDescriptor.length; + } + response.setHeader("Content-Length", String.valueOf( + responseLength)); + response.setHeader("Content-Disposition", "inline; filename=\"" + + validAfterParameter + "-votes\""); + BufferedOutputStream output = new BufferedOutputStream( + response.getOutputStream()); + for (byte[] rawDescriptor : rawDescriptors) { + output.write(rawDescriptor); + } + } finally { + /* Nothing to do here. */ + } + } +} +

1 0