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

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 24 Jul '13

24 Jul '13

commit e6c06d6ca481fb296a5ec059d602275bdbebb11e Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 24 15:47:05 2013 +0000 Update translations for torbirdy --- tr/torbirdy.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tr/torbirdy.properties b/tr/torbirdy.properties index c2954f7..b5d6003 100644 --- a/tr/torbirdy.properties +++ b/tr/torbirdy.properties @@ -9,7 +9,7 @@ torbirdy.disabled=TorBirdy: Pasif! torbirdy.email.prompt=TorBirdy gizliliğinizi korumak için Thunderbird'ün otomatik ayar sihirbazını pasifleştirdi.\n\n%S için önerilen güvenlik ayarları yapıldı.\n\nArtık diğer hesapların ayarlarını elle ayarlayabilirsiniz. -# torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing. +torbirdy.email.advanced=TorBirdy gelişmiş ayarlarını değiştirmeniz önerilmez.\n\nSadece ne yaptığınızı biliyorsanız devam edin. torbirdy.email.advanced.nextwarning=Bu uyarıyı sonraki sefer yine göster. torbirdy.email.advanced.title=TorBirdy Gelişmiş Ayarlar

1 0

[tor-browser-bundle/master] Fix NoScript and PDF.JS urls+hashes.
by mikeperry＠torproject.org 24 Jul '13

24 Jul '13

commit 3f83d43a323ba18479894f5c12e4c99ff80882f7 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Jul 24 10:56:56 2013 +0200 Fix NoScript and PDF.JS urls+hashes. PDF.JS seems to have dropped FF17-ESR support. :/ --- gitian/fetch-inputs.sh | 3 ++- gitian/versions | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 0a53c67..63e7f16 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -140,7 +140,8 @@ cd .. # Noscript and PDF.JS are magikal and special: wget -N https://addons.mozilla.org/firefox/downloads/latest/722/addon-722-latest.xpi -wget -N https://addons.mozilla.org/firefox/downloads/latest/352704/addon-352704-lat… +#wget -N https://addons.mozilla.org/firefox/downloads/latest/352704/addon-352704-lat… +wget -N https://addons.mozilla.org/firefox/downloads/file/201180/pdf_viewer-0.8.1-s… # So is mingw: if [ ! -f mingw-w64-svn-snapshot.zip ]; diff --git a/gitian/versions b/gitian/versions index 35d4486..480f63e 100755 --- a/gitian/versions +++ b/gitian/versions @@ -21,7 +21,8 @@ FIREFOX_LANG_VER=17.0.7esr ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz NOSCRIPT_PACKAGE=addon-722-latest.xpi -PDFJS_PACKAGE=addon-352704-latest.xpi +#PDFJS_PACKAGE=addon-352704-latest.xpi +PDFJS_PACKAGE=pdf_viewer-0.8.1-sm+fx+an.xpi TOOLCHAIN4_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MINGW_PACKAGE=mingw-w64-svn-snapshot.zip @@ -31,7 +32,7 @@ MSVCR100_PACKAGE=msvcr100.dll OPENSSL_HASH=f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=6d5d50dea791dd52caf41ea28199743591776ecd7dd88bcccfcfb7e8de32386d +NOSCRIPT_HASH=67a8b38894f5d695a4e07f2ce790d13c9f024da2a96956435037229114d0c940 PDFJS_HASH=2e3e6811f5294b24aafeba44e8206ddc81fb15e5934e5166a2c7df3a4405020b MINGW_HASH=457f11d29f6e95425d190711a73955fa54a98a2113ce2c2bfd76291be71e3e2b MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 24 Jul '13

24 Jul '13

commit ecba81d5950c6130d962ccbb9612d80a566c557e Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 24 10:45:14 2013 +0000 Update translations for tsum --- he/short-user-manual_he_noimg.xhtml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/he/short-user-manual_he_noimg.xhtml b/he/short-user-manual_he_noimg.xhtml index e36606c..cbadfbb 100644 --- a/he/short-user-manual_he_noimg.xhtml +++ b/he/short-user-manual_he_noimg.xhtml @@ -72,13 +72,13 @@ sub 2048R/EB399FD7 2003-10-16 אם Tor עדיין לא עובד, סביר כי ספק האינטרנט (ISP) שלכם חוסם את Tor. לעתים קרובות בעיה זו יכולה להיפתר בעזרת גשרי Tor, ממסרים נסתרים אשר אינם קלים לחסימה באותה הקלות. במידה ואתם צריכים עזרה בלהבין למדוע Tor לא יכול להתחבר, שלחו דוא״ל אל help(a)rt.torproject.org והכלילו את החלקים הרלוונטיים מתוך קובץ היומן. <h3 id="how-to-find-a-bridge">כיצד למצוא גשר</h3> - To use a bridge, you will first have to locate one; you can either browse to <a href="https://bridges.torproject.org/">bridges.torproject.org</a>, or you can send an email to bridges(a)torproject.org. If you do send an email, please make sure that you write get bridges in the body of the email. Without this, you will not get a reply. Note that you need to send this email from either a gmail.com or a yahoo.com address. - Configuring more than one bridge address will make your Tor connection more stable, in case some of the bridges become unreachable. There is no guarantee that the bridge you are using now will work tomorrow, so you should make a habit of updating your list of bridges every so often. + כדי להשתמש בגשר, עליכם תחילה לאתר אחד; באפשרותכם לעיין באתר <a href="https://bridges.torproject.org/">bridges.torproject.org</a>, או לשלוח דוא״ל אל bridges(a)torproject.org. היה ואתם אכן שולחים דוא״ל, אנא ודאו כי אתם רושמים get bridges בגוף הדוא״ל. בלי זה, אתם לא תקבלו משוב. קחו לצומת לבכם כי עליכם לשלוח את דוא״ל זה מתוך כתובת של אחד מאלה gmail.com או yahoo.com. + הגדרה של למעלה מכתובת גשר אחת תהפוך את החיבור שלך עם Tor ליציב יותר, במקרה שחלק מהגשרים הופכים לכאלו שאינם ברות השגה. אין אחריות כי הגשרים אשר בהם אתם משתמשים כעת יעבדו מחר, כך שעליכם ליצור הרגל לעדכון הרשימות הגשרים שלכם מפעם לפעם. <h3 id="how-to-use-a-bridge">כיצד להשתמש בגשר</h3> ברגע שהגדרת גשרים לשימוש, פתחו את לוח בקרה Vidalia, לחצו על הגדרות, רשת וסמנו את התיבה אשר אומרת ספק האינטרנט שלי חוסם חיבורים לרשת Tor. הזינו את הגשר בתיבה מטה, הקש אישור והתחילו את Tor שוב. <h3 id="how-to-use-an-open-proxy">כיצד להשתמש בפרוקסי פתוח</h3> - If using a bridge does not work, try configuring Tor to use any HTTPS or SOCKS proxy to get access to the Tor network. This means even if Tor is blocked by your local network, open proxies can be safely used to connect to the Tor Network and on to the uncensored Internet. - The steps below assume you have a functional Tor/Vidalia configuration, and you have found a list of HTTPS, SOCKS4, or SOCKS5 proxies. + במידה וניצול של גשר לא עובד, נסו להגדיר את Tor להשתמש בכל פרוקסי מטיפוס HTTPS או SOCKS על מנת לקבל גישה אל הרשת Tor. זאת אומרת כי אפילו אם Tor הינו חסום על ידי הרשת המקומית שלכם, חיבורי פרוקסי פתוחים יכוולים לשמשכם בבטחה להתחבר אל הרשת Tor וכן הלאה אל האינטרנט הלא מצונזר. + הצעדים מטה מניחים כי יש ברשותכם הגדרות Tor/Vidalia אשר מתפקדות כיאות, וכן גם כי מצאתם רשימת פרוקסי של HTTPS, SOCKS4, או SOCKS5. <ol style="list-style-type: decimal"> <li>פתחו את לוח בקרה Vidalia, לחצו על הגדרות.</li> <li>לחצו על רשת. בחרו אני עושה שימוש בשרת פרוקסי בכדי לגשת אל האינטרנט.</li>

1 0

[onionoo/master] Add fields parameter to reduce response size.
by karsten＠torproject.org 24 Jul '13

24 Jul '13

commit 1c1dfa4867f7694339afb0b79ded21ca47e3492a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Jul 23 00:13:25 2013 +0200 Add fields parameter to reduce response size. --- src/org/torproject/onionoo/ResourceServlet.java | 62 +++++++++++++++++++---- web/index.html | 18 +++++++ 2 files changed, 69 insertions(+), 11 deletions(-) diff --git a/src/org/torproject/onionoo/ResourceServlet.java b/src/org/torproject/onionoo/ResourceServlet.java index 47d4a93..0487ee0 100644 --- a/src/org/torproject/onionoo/ResourceServlet.java +++ b/src/org/torproject/onionoo/ResourceServlet.java @@ -383,7 +383,8 @@ public class ResourceServlet extends HttpServlet { * parameters. */ Set<String> knownParameters = new HashSet<String>(Arrays.asList(( "type,running,search,lookup,country,as,flag,first_seen_days," - + "last_seen_days,contact,order,limit,offset").split(","))); + + "last_seen_days,contact,order,limit,offset,fields"). + split(","))); for (String parameterKey : parameterMap.keySet()) { if (!knownParameters.contains(parameterKey)) { response.sendError(HttpServletResponse.SC_BAD_REQUEST); @@ -589,13 +590,24 @@ public class ResourceServlet extends HttpServlet { } } + /* Possibly include only a subset of fields in the response + * document. */ + String[] fields = null; + if (parameterMap.containsKey("fields")) { + fields = this.parseFieldsParameter(parameterMap.get("fields")); + if (fields == null) { + response.sendError(HttpServletResponse.SC_BAD_REQUEST); + return; + } + } + /* Set response headers and write the response. */ response.setHeader("Access-Control-Allow-Origin", "*"); response.setContentType("application/json"); response.setCharacterEncoding("utf-8"); PrintWriter pw = response.getWriter(); - this.writeRelays(orderedRelays, pw, resourceType); - this.writeBridges(orderedBridges, pw, resourceType); + this.writeRelays(orderedRelays, pw, resourceType, fields); + this.writeBridges(orderedBridges, pw, resourceType, fields); pw.flush(); pw.close(); } @@ -694,6 +706,15 @@ public class ResourceServlet extends HttpServlet { return parameter.split(" "); } + private static Pattern fieldsParameterPattern = + Pattern.compile("^[0-9a-zA-Z_,]*$"); + private String[] parseFieldsParameter(String parameter) { + if (!fieldsParameterPattern.matcher(parameter).matches()) { + return null; + } + return parameter.split(","); + } + private void filterByType(Map<String, String> filteredRelays, Map<String, String> filteredBridges, boolean relaysRequested) { if (relaysRequested) { @@ -922,7 +943,7 @@ public class ResourceServlet extends HttpServlet { } private void writeRelays(List<String> relays, PrintWriter pw, - String resourceType) { + String resourceType, String[] fields) { pw.write("{\"relays_published\":\"" + this.relaysPublishedString + "\",\n\"relays\":["); int written = 0; @@ -931,7 +952,7 @@ public class ResourceServlet extends HttpServlet { /* TODO This is a workaround for a bug; line shouldn't be null. */ continue; } - String lines = this.getFromSummaryLine(line, resourceType); + String lines = this.getFromSummaryLine(line, resourceType, fields); if (lines.length() > 0) { pw.print((written++ > 0 ? ",\n" : "\n") + lines); } @@ -940,7 +961,7 @@ public class ResourceServlet extends HttpServlet { } private void writeBridges(List<String> bridges, PrintWriter pw, - String resourceType) { + String resourceType, String[] fields) { pw.write("\"bridges_published\":\"" + this.bridgesPublishedString + "\",\n\"bridges\":["); int written = 0; @@ -949,7 +970,7 @@ public class ResourceServlet extends HttpServlet { /* TODO This is a workaround for a bug; line shouldn't be null. */ continue; } - String lines = this.getFromSummaryLine(line, resourceType); + String lines = this.getFromSummaryLine(line, resourceType, fields); if (lines.length() > 0) { pw.print((written++ > 0 ? ",\n" : "\n") + lines); } @@ -958,11 +979,11 @@ public class ResourceServlet extends HttpServlet { } private String getFromSummaryLine(String summaryLine, - String resourceType) { + String resourceType, String[] fields) { if (resourceType.equals("summary")) { return this.writeSummaryLine(summaryLine); } else if (resourceType.equals("details")) { - return this.writeDetailsLines(summaryLine); + return this.writeDetailsLines(summaryLine, fields); } else if (resourceType.equals("bandwidth")) { return this.writeBandwidthLines(summaryLine); } else if (resourceType.equals("weights")) { @@ -977,7 +998,7 @@ public class ResourceServlet extends HttpServlet { summaryLine.length() - 1) : summaryLine); } - private String writeDetailsLines(String summaryLine) { + private String writeDetailsLines(String summaryLine, String[] fields) { String fingerprint = null; if (summaryLine.contains("\"f\":\"")) { fingerprint = summaryLine.substring(summaryLine.indexOf( @@ -1000,12 +1021,27 @@ public class ResourceServlet extends HttpServlet { /* Skip version line. */ s.nextLine(); } + boolean includeLine = true; while (s.hasNextLine()) { String line = s.nextLine(); if (line.equals("}")) { sb.append("}\n"); break; - } else if (!line.startsWith("\"desc_published\":")) { + } else if (line.startsWith("\"desc_published\":")) { + continue; + } else if (fields != null) { + if (line.startsWith("\"")) { + includeLine = false; + for (String field : fields) { + if (line.startsWith("\"" + field + "\":")) { + sb.append(line + "\n"); + includeLine = true; + } + } + } else if (includeLine) { + sb.append(line + "\n"); + } + } else { sb.append(line + "\n"); } } @@ -1015,6 +1051,10 @@ public class ResourceServlet extends HttpServlet { detailsLines = detailsLines.substring(0, detailsLines.length() - 1); } + if (detailsLines.endsWith(",\n}")) { + detailsLines = detailsLines.substring(0, + detailsLines.length() - 3) + "\n}"; + } return detailsLines; } else { // TODO We should probably log that we didn't find a details diff --git a/web/index.html b/web/index.html index 2655975..abc124e 100755 --- a/web/index.html +++ b/web/index.html @@ -699,6 +699,24 @@ Comparisons are case-insensitive. Added on July 19, 2013. </td></tr> </table> +Response documents can be reduced in size by requesting only a subset +of contained fields. +<table border="0" cellpadding="4" cellspacing="0" summary=""> +<colgroup> +<col width="150"> +<col width="850"> +</colgroup> +<tr><td>fields</td><td>Comma-separated +list of fields that will be +included in the result. +So far, only top-level fields in relay or bridge objects of details +documents can be specified, e.g., nickname,hashed_fingerprint. +If the fields parameter is provided, all other fields which are not +contained in the provided list will be removed from the result. +Field names are case-insensitive. +Added on July 23, 2013. +</td></tr> +</table> Relay and/or bridge documents in the response can be ordered and limited by providing further parameters. If the same parameter is specified more than once, only the first

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 24 Jul '13

24 Jul '13

commit 113a634c37e251ad6645d94f1c5552652afc8c17 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 24 10:15:17 2013 +0000 Update translations for tsum --- he/short-user-manual_he_noimg.xhtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/he/short-user-manual_he_noimg.xhtml b/he/short-user-manual_he_noimg.xhtml index e02eafd..e36606c 100644 --- a/he/short-user-manual_he_noimg.xhtml +++ b/he/short-user-manual_he_noimg.xhtml @@ -56,10 +56,10 @@ sub 2048R/EB399FD7 2003-10-16 </code> </pre> הפלט אמור להציג "Good signature". משמעותה של חתימה רעה היא שיכול שמאן דהו התעסק עם החבילה. במידה ואתם רואים חתימה רעה, שלחו פרטים אודות המקום ממנו הורדתם את החבילה, כיצד אימתם את החתימה, וכן גם את הפלט מתוך GnuPG בדוא״ל אל help(a)rt.torproject.org. - Once you have verified the signature and seen the "Good signature" output, go ahead and extract the package archive. You should then see a directory similar to tor-browser_en-US. Inside that directory is another directory called Docs, which contains a file called changelog. You want to make sure that the version number on the top line of the changelog file matches the version number in the filename. + ברגע בו אימתם את היווכחותו של פלט של "חתימה טובה", המשיכו וחלצו את ארכיון החבילה. אתם צריכים לראות ספרייה אשר דומה לזו tor-browser_en-US. בתוך ספרייה זו יש ספרייה אחרת הקרויה Docs, אשר מכילה קובץ הקרוי changelog. אתם תרצו לברר כי אותו מספר גרסא אשר בשורה העליונה בקובץ changelog תואם את מספר הגרסא אשר בשם הקובץ. <h3 id="how-to-use-the-tor-browser-bundle">כיצד להשתמש באגודה Tor Browser Bundle</h3> לאחר הורדת Tor Browser Bundle וחילוץ החבילה, צריכה להיות לכם ספרייה עם מספר קבצים בתוכה. אחד מן הקבצים הינו בר-הרצה אשר קרוי "התחל דפדפן Tor" (או "start-tor-browser", תלוי במערכת ההפעלה שלכם). - When you start the Tor Browser Bundle, you will first see Vidalia start up and connect you to the Tor network. After that, you will see a browser confirming that you are now using Tor. This is done by displaying <a href="https://check.torproject.org/">https://check.torproject.org/</a>. You can now browse the Internet through Tor. + גאשר אתם מתחילים את Tor Browser Bundle, אתם תראו תחילה את Vidalia מתחילה וזו תחבר אתכם אל הרשת Tor. לאחר זאת, אתם תראו דפדפן אשר מוודא כי אתם משתמשים ברשת Tor. זה נעשה על ידי הצגת <a href="https://check.torproject.org/">https://check.torproject.org/</a>. כעת אתם יכולים לדפדף באינטרנט מבעד אל Tor. אנא קחו לתשומת לבכם כי נחוץ שתעשו שימוש בדפדפן אשר בא עם האגודה, ולא בדפדפן אחר שלכם.

1 0

[tor-browser-bundle/master] Bug #9084: Fetch, hash, and link in msvcr100.dll.
by mikeperry＠torproject.org 24 Jul '13

24 Jul '13

commit 8385c07328288ef4b7b3ed86b658af86aa3fd7c5 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Jul 24 10:29:45 2013 +0200 Bug #9084: Fetch, hash, and link in msvcr100.dll. --- gitian/descriptors/windows/gitian-firefox.yml | 4 ++++ gitian/fetch-inputs.sh | 4 ++-- gitian/versions | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index e0f59c9..3f1f1d2 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -28,6 +28,7 @@ files: - "i686-w64-mingw32-gcc" - "i686-w64-mingw32-g++" - "i686-w64-mingw32-ld" +- "msvcr100.dll" script: | INSTDIR="$HOME/install/FirefoxPortable/" export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 @@ -98,6 +99,8 @@ script: | #sudo mv /usr/bin/i686-w64-mingw32-ld /usr/bin/i686-w64-mingw32-ld.orig #sudo cp ~/build/bin/i686-w64-mingw32-ld /usr/bin/ # + export HOST_LDFLAGS=" " + export LDFLAGS="-lmsvcr100 -L/home/ubuntu/build/" make $MAKEOPTS -f client.mk build # make -C obj-* package INNER_MAKE_PACKAGE=true @@ -105,6 +108,7 @@ script: | cp -a /usr/lib/gcc/i686-w64-mingw32/4.6/libgcc_s_sjlj-1.dll $INSTDIR/App/Firefox/ cp -a /usr/lib/gcc/i686-w64-mingw32/4.6/libssp*.dll $INSTDIR/App/Firefox/ cp -a /usr/lib/gcc/i686-w64-mingw32/4.6/libstdc*dll $INSTDIR/App/Firefox/ + cp -a ~/build/msvcr100.dll $INSTDIR/App/Firefox/ # # XXX: What the hell are these three bytes anyways? sed 's/\x94\x0C\xE7\x6A\xB8\x0C\xE7\x6A\x08...\x04\xBA\xCB\x7E/\x94\x0c\xe7\x6a\xb8\x0c\xe7\x6a\x08\x23\x23\x23\x04\xba\xcb\x7e/M' -i $INSTDIR/App/Firefox/xul.dll diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 0526d37..0a53c67 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -109,7 +109,7 @@ do fi done -for i in TOOLCHAIN4 OSXSDK +for i in TOOLCHAIN4 OSXSDK MSVCR100 do PACKAGE="${i}_PACKAGE" URL="${MIRROR_URL}${!PACKAGE}" @@ -152,7 +152,7 @@ fi # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK is not signed at all) -for i in OPENSSL OSXSDK TOOLCHAIN4 NOSCRIPT PDFJS MINGW +for i in OPENSSL OSXSDK TOOLCHAIN4 NOSCRIPT PDFJS MINGW MSVCR100 do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/versions b/gitian/versions index 4f971e1..35d4486 100755 --- a/gitian/versions +++ b/gitian/versions @@ -25,6 +25,7 @@ PDFJS_PACKAGE=addon-352704-latest.xpi TOOLCHAIN4_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MINGW_PACKAGE=mingw-w64-svn-snapshot.zip +MSVCR100_PACKAGE=msvcr100.dll # Hashes for things with weak sigs or no sigs OPENSSL_HASH=f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3 @@ -33,6 +34,7 @@ TOOLCHAIN4_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=6d5d50dea791dd52caf41ea28199743591776ecd7dd88bcccfcfb7e8de32386d PDFJS_HASH=2e3e6811f5294b24aafeba44e8206ddc81fb15e5934e5166a2c7df3a4405020b MINGW_HASH=457f11d29f6e95425d190711a73955fa54a98a2113ce2c2bfd76291be71e3e2b +MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} TOOLCHAIN4_URL=https://mingw-and-ndk.googlecode.com/files/${TOOLCHAIN4_PACK…

1 0

[bridgedb/master] Add standard Python exclusions to the .gitignore.
by asn＠torproject.org 23 Jul '13

23 Jul '13

commit 0ad56883868c76e20f0b92b5c5445352cf7cfb46 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jul 4 22:32:13 2013 +0000 Add standard Python exclusions to the .gitignore. --- .gitignore | 50 +++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 43 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 27a404b..e74a354 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,49 @@ +# Python binary and object files +*.py[cod] + +# C extensions +*.so + +# Packages +*.egg +*.egg-info +dist +build +eggs +parts +bin +var +sdist +develop-eggs +.installed.cfg +lib +lib64 +MANIFEST + +# Installer logs +pip-log.txt +installed-files.txt + +# Unit test / coverage reports +.coverage +.tox +nosetests.xml + +# Translations +*.mo + # Editor stuff \#* .\#* *~ -# Python stuff -*.pyc -*.pyo +# Mr Developer +.mr.developer.cfg +.project +.pydevproject + +# PyCharm +.idea/* -# / -/build -/dist -/MANIFEST +# etags/ctags +TAGS

1 0

[bridgedb/master] Remove --install-prefix settings from setup.cfg.
by asn＠torproject.org 23 Jul '13

23 Jul '13

commit 567a030d2cdbacf6be5b8e4632b2cb2e2ba8db83 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Jul 5 01:44:41 2013 +0000 Remove --install-prefix settings from setup.cfg. * The default instructions in the README now say to use a virtualenv, and these are not compatible with that. --- setup.cfg | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/setup.cfg b/setup.cfg index 3d7c6df..827dab2 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,12 @@ -[install] -prefix=$HOME -install-data=$HOME + +## The following can be uncommented to specify the prefix dir for +## installation. They are left commented out because they are incompatible +## with the default README instructions for installing BridgeDB in a +## Python virtualenv. + +#[install] +#prefix=$HOME +#install-data=$HOME [compile_catalog] domain = bridgedb

1 0

[bridgedb/master] Update the README with deployment instructions.
by asn＠torproject.org 23 Jul '13

23 Jul '13

commit 8115774d7e2c2729a231f33200b91d8017cdc717 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Jul 5 01:40:49 2013 +0000 Update the README with deployment instructions. * CHANGED the README to markdown format. * ADD user friendly instructions at the top, so that anyone who is confused and looking for bridges or TBBs is pointed in the right direction. * ADD detailed maintainer instructions at the bottom, including sections on dependencies, using in a virtualenv, setup and configuration (this should probably still be updated more, as not all the the options in the testing CONFIG in lib/bridgedb/Main.py are in bridgedb.conf), enabling additional features, and running. --- README | 107 ------------------------------ README.md | 219 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 219 insertions(+), 107 deletions(-) diff --git a/README b/README deleted file mode 100644 index 4fdeff1..0000000 --- a/README +++ /dev/null @@ -1,107 +0,0 @@ -To set up: - - Install Python 2.4 or later. - - Install depdencencies. On Debian, you can do: - sudo apt-get install python-twisted python-openssl python-ipaddr \ - python-gpgme python-babel python-recaptcha python-beautifulsoup \ - python-mako - - If you use a virtualenv, we recommend you use pip 1.3.1 or later, else it - will download over http. You can install dependencies with: - pip install -r requirements.txt - Note that some dependencies (ipaddr) do not have SSL URLs in the pypi index - and will still download over http. - - To run unit tests, "python setup.py test" - - Set the prefix in setup.cfg, or comment out if using a virtualenv - - python setup.py install - - To generate translation files, run "python setup.py trans" - - Run "python setup.py install_data" to install them - - Edit bridgedb.conf; put it somewhere good. - - Make sure that the input files referred to in bridgedb.conf exist. - - You can make a self-signed certificate with - openssl req -x509 -new -nodes > cert - - Set up PYTHONPATH to include "~/lib/python2.6/site-packages/". - - To install Maxmind GeoIP - - Debian: apt-get install python-geoip - - Others: http://www.maxmind.com/app/python - - To enable recaptcha support - - set the options RECAPTCHA_ENABLED, RECAPTCHA_PUB_KEY, - and RECAPTCHA_PRIV_KEY in bridgedb.conf. - - A recaptcha.net account is required. - - Install these required packages: - - Debian: apt-get install python-recaptcha python-beautifulsoup - python-gpgme - - Python: pip install recaptcha-client BeautifulSoup pygpgme - - Others: http://pypi.python.org/pypi/recaptcha-client - http://pypi.python.org/pypi/BeautifulSoup - http://pypi.python.org/pypi/pygpgme - -To translate: - - extract all strings: - python setup.py extract_messages - a .pot file will be created in ./i18n/templates/bridgedb.pot - - init catalogs for each desired languages: - python setup.py init_catalog -l LANG - (where 'LANG' is the 2 or 4 letter country-code, eg. 'es') - - edit strings in ./i18n/LANG/bridgedb.po - - convert to binary format - python setup.py compile_catalog - - Don't forget to reinstall to update the templates!: - python setup.py install - -To run: - - Run "python -m TorBridgeDB bridgedb.conf" - - - When you have new lists of bridges, replace the old files and send the - process a sighup. - -To extract bucket files with unallocated bridges: - - - Edit the configuration file value 'FILE_BUCKETS' according to your needs. - For example, the following is a possible configuration: - - FILE_BUCKETS = { "name1": 10, "name2": 15, "foobar": 3 } - - This configuration for buckets would result in 3 files being created for - bridge distribution: name1-2010-07-17.brdgs, name2-2010-07-17.brdgs and - foobar-2010-07-17.brdgs. The first file would contain 10 bridges from - BridgeDB's 'unallocated' pool. The second file would contain 15 bridges - from the same pool and the third one similarly 3 bridges. These files can - then be handed out to trusted parties via mail or fed to other distribution - mechanisms such as twitter. - -To use with HTTPS: - - Just connect to the appropriate port. - -To use with email: - - Any mail sent to the email port with a subject or a single line _exactly_ - equal to "get bridges" will get answered, assuming the domain is okay. - -To indicate which bridges are blocked: - - Uncomment or add COUNTRY_BLOCK_FILE to your bridgedb.conf - - The syntax of the COUNTRY_BLOCK_FILE, 1 entry per line: - fingerprint <bridge fingerprint> country-code <country code> - - If this file is present, bridgedb will filter blocked bridges from responses - - For GeoIP support make sure to install Maxmind GeoIP - -To sign emails with gpg: - - Add these two options to your bridgedb.conf: - - EMAIL_GPG_SIGNING_ENABLED, EMAIL_GPG_SIGNING_KEY - - The former may be either True or False, and the latter must - point to the ascii-armored key file. The keyfile must not be - passphrase protected. - -To update the SQL schema: - - Install sqlite3: - - Debian: apt-get install sqlite3 - - Others: http://www.sqlite.org/download.html - - Run "sqlite3 path/to/bridgedist.db.sqlite" - - Enter the following commands at the prompt: sqlite> - CREATE TABLE BlockedBridges ( id INTEGER PRIMARY KEY NOT NULL, hex_key, blocking_country); - CREATE INDEX BlockedBridgesBlockingCountry on BlockedBridges(hex_key); - CREATE TABLE WarnedEmails ( email PRIMARY KEY NOT NULL, when_warned); - CREATE INDEX WarnedEmailsWasWarned on WarnedEmails ( email ); - REPLACE INTO Config VALUES ( 'schema-version', 2 ); - -Support - - Send your questions to aagbsn(a)torproject.org. diff --git a/README.md b/README.md new file mode 100644 index 0000000..9a50246 --- /dev/null +++ b/README.md @@ -0,0 +1,219 @@ +## BridgeDB +----------- + +BridgeDB is a collection of backend servers used to distribute +[Tor Bridges](https://www.torproject.org/docs/bridges). It currently consists +of a webserver with [an HTTPS interface](https://bridges.torproject.org), an +email responder, and an SQLite database. + +#### What are Tor Bridges? +[Tor Bridges](https://www.torproject.org/docs/bridges) are special Tor relays +which are not listed in the public relay directory. They are used to help +circumvent [censorship](https://ooni.torproject.org) by providing users with +connections to the public relays in the Tor network. + +Tor Bridges are different from normal relays in another important way: they +can run what are called *Pluggable* *Transports*. + +#### What's a Pluggable Transport? +A +[Pluggable Transport](https://www.torproject.org/docs/pluggable-transports.html.en) +is a program which is *pluggable* — meaning that it is meant to work with lots +of other anonymity and censorship circumvention software, not just Tor — and +is a *transport* — meaning that it transports your internet traffic, usually +in a way which makes it look different. For example, +[Obfsproxy](https://www.torproject.org/projects/obfsproxy.html.en) is a +Pluggable Transport which disguises your traffic by adding an obfuscating +layer of encryption. + +#### So how do I use this? +Well, probably, you don't. But if you're looking for bridges, you can use +[BridgeDB's web interface](https://bridges.torproject.org), which has +instructions on getting the Pluggable Transports Tor Browser Bundle, as well +as instructions for getting extra Bridges. + + +## Maintainer Setup + +### Dependencies and installation +BridgeDB requires the following OS-level dependencies: + + - Python>=2.6 + - OpenSSL>=1.0.1e + - [SQLite3](http://www.maxmind.com/app/python) + - [MaxMind GeoIP](https://www.maxmind.com/en/geolocation_landing) + - [python-setuptools](https://pypi.python.org/pypi/setuptools) + +As well as the following Python dependencies (from ./requirements.txt): + + Babel==0.9.6 + BeautifulSoup==3.2.1 + Mako==0.8.1 + MarkupSafe==0.18 + Twisted>=13.0.0 + argparse>=1.2.1 + distribute>=0.6.46 + ipaddr>=2.1.10 + pyOpenSSL>=0.13 + pygeoip>=0.2.6 + pygpgme==0.3 + recaptcha>=1.0rc1 + recaptcha-client>=1.0.6 + wsgiref>=0.1.2 + zope.interface>=4.0.5 + +### Deploying BridgeDB in a Python virtualenv + + - Install Python 2.6 or later, and other OS-level dependencies. On Debian, + you can do: + + sudo apt-get install python openssl sqlite3 tor-geoip + + - Install Pip 1.3.1 or later. Debian sid has this version, but if you're + tracking a different release, the easiest way to install a newer Pip is to + use the Pip development teams's + [getpip script](https://raw.github.com/pypa/pip/master/contrib/get-pip.py): + + wget https://raw.github.com/pypa/pip/master/contrib/get-pip.py + sudo python get-pip.py + + - Use Pip to install virtualenv and [virtualenvwrapper](https://virtualenvwrapper.readthedocs.org): + + sudo pip install --upgrade virtualenv virtualenvwrapper + + - Configure virtualenvwrapper and create a virtualenv for Bridgedb: + + WORKON_HOME=${HOME}/.virtualenvs + export WORKON_HOME + mkdir -p $WORKON_HOME + source $(which virtualenvwrapper.sh) + git clone https://git.torproject.org/bridgedb.git && cd bridgedb + mkvirtualenv -a $PWD -r requirements.txt --unzip-setuptools \ + --setuptools bridgedb + + From now on, to use BridgeDB's virtualenv, just do ```$ workon bridgedb``` + (after sourcing virtualenvwrapper.sh, as before). To exit the virtualenv + without exiting the shell, do ```$ deactivate```. + + - To run unit tests: + + python setup.py test + + - To install BridgeDB: + + python setup.py install + + +### Enabling additional features: + +#### Translations + - To extract all strings from BridgeDB's source: + + python setup.py extract_messages + + A .pot file will be created in ./i18n/templates/bridgedb.pot + - Initialise catalogs for each desired language: + + python setup.py init_catalog -l LANG + + where ```LANG``` is the 2 or 4 letter country-code, eg. 'es'. + - Edit strings in ./i18n/LANG/bridgedb.po, and then convert them to binary + format: + + python setup.py compile_catalog + + Don't forget to reinstall BridgeDB to update the templates! + + python setup.py install + + - To generate translation files, and then install them, do: + + python setup.py trans && python setup.py install_data + +#### Enabling HTTPS +Create a self-signed certificate with: + + openssl req -x509 -new -nodes > cert + +Or, place an existing certificate in the path specified in bridgedb.conf by +the ```HTTPS_CERT_FILE``` option, and a private key where ```HTTPS_KEY_FILE``` +points to. The defaults are 'cert' and 'privkey.pem', respectively. + +#### CAPTCHAs +To enable Captchas on the webserver interface, set the options in +bridgedb.conf: + + RECAPTCHA_ENABLED + RECAPTCHA_PUB_KEY + RECAPTCHA_PRIV_KEY + +A [recaptcha.net](https://www.google.com/recaptcha) account is required. + +#### GnuPG email signing +Add these two options to your bridgedb.conf: + + EMAIL_GPG_SIGNING_ENABLED + EMAIL_GPG_SIGNING_KEY + +The former may be either True or False, and the latter must point to the +ascii-armored private key file. The keyfile must not be passphrase protected. + +#### Preventing already-blocked bridges from being distributed +Uncomment or add ```COUNTRY_BLOCK_FILE``` to your bridgedb.conf. This file +should contain one bridge entry per line, in the format: + + fingerprint <bridge fingerprint> country-code <country code> + +If the ```COUNTRY_BLOCK_FILE``` file is present, bridgedb will filter blocked +bridges from the responses it gives to clients requesting bridges. + +#### Updating the SQL schema +Make sure that SQLite3 is installed. (You should have installed it already +during the setup and installation stage.) To update, do: + + sqlite3 path/to/bridgedist.db.sqlite + +Enter the following commands at the ```sqlite>``` prompt: + + CREATE TABLE BlockedBridges ( id INTEGER PRIMARY KEY NOT NULL, hex_key, blocking_country); + CREATE INDEX BlockedBridgesBlockingCountry on BlockedBridges(hex_key); + CREATE TABLE WarnedEmails ( email PRIMARY KEY NOT NULL, when_warned); + CREATE INDEX WarnedEmailsWasWarned on WarnedEmails ( email ); + REPLACE INTO Config VALUES ( 'schema-version', 2 ); + + +## Running BridgeDB +To run BridgeDB, simply make any necessary changes to bridgedb.conf, and do: + + python -m TorBridgeDB -c bridgedb.conf + +When you have new lists of bridges, replace the old files and send the process +a SIGHUP. + +Make sure that the files and directories referred to in bridgedb.conf +exist. However, many of them, if not found, will be touched on disk so that +attempts to read/write from/to them will not raise excessive errors. + +#### To extract bucket files of all unallocated bridges: +Edit the configuration file value ```FILE_BUCKETS``` according to your +needs. For example, the following is a possible configuration: + + FILE_BUCKETS = { "name1": 10, "name2": 15, "foobar": 3 } + +This configuration for buckets would result in 3 files being created for +bridge distribution: name1-2010-07-17.brdgs, name2-2010-07-17.brdgs and +foobar-2010-07-17.brdgs. The first file would contain 10 bridges from +BridgeDB's 'unallocated' pool. The second file would contain 15 bridges from +the same pool and the third one similarly 3 bridges. These files can then be +handed out to trusted parties via mail or fed to other distribution mechanisms +such as twitter. + +#### To use with HTTPS: +Just connect to the appropriate port. + +#### To use with email: +Any mail sent to the email port with a subject or a single line _exactly_ +equal to "get bridges" will get answered, assuming the domain is okay. + +### Support +Send your questions to aagbsn(a)torproject.org.

1 0

[bridgedb/master] Update requirements.txt file.
by asn＠torproject.org 23 Jul '13

23 Jul '13

commit 10cdd269ddd7bdf1154cd0210ea64d16f86bb0a9 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jul 4 22:48:29 2013 +0000 Update requirements.txt file. * ADD recaptcha package (this is needed in addition to recaptcha-client). * CHANGE BeautifulSoup, Babel, Mako, and MarkupSafe package specifications to specific versions which definitely work, and require only those those specific versions. (Older v2.x BeautifulSoup is a completely different library, for example, and debugging UnicodeDecodeErrors and fiddling with formatting everytime one of our dependency libraries upgrades doesn't sound like fun.) --- requirements.txt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index c36b786..1695106 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,12 +1,15 @@ -Babel>=0.9.6 -BeautifulSoup>=3.2.1 +Babel==0.9.6 +BeautifulSoup==3.2.1 +Mako==0.8.1 +MarkupSafe==0.18 Twisted>=13.0.0 argparse>=1.2.1 -distribute>=0.6.44 +distribute>=0.6.46 ipaddr>=2.1.10 pyOpenSSL>=0.13 pygeoip>=0.2.6 -pygpgme>=0.3 +pygpgme==0.3 +recaptcha>=1.0rc1 recaptcha-client>=1.0.6 wsgiref>=0.1.2 zope.interface>=4.0.5

1 0