October 2014 - tor-commits - lists.torproject.org

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 17 Oct '14

17 Oct '14

commit be6aef014ac77f36dd638cc3c0eaaf645d82cd05 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 17 11:15:05 2014 +0000 Update translations for bridgedb --- tr/LC_MESSAGES/bridgedb.po | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/tr/LC_MESSAGES/bridgedb.po b/tr/LC_MESSAGES/bridgedb.po index b340984..c7d989b 100644 --- a/tr/LC_MESSAGES/bridgedb.po +++ b/tr/LC_MESSAGES/bridgedb.po @@ -4,6 +4,7 @@ # # Translators: # eromytsatiffird <driffitastymore(a)gmail.com>, 2014 +# Emir Sarı <bitigchi(a)openmailbox.org>, 2014 # Emre <conan(a)operamail.com>, 2013 # erg26 <ergungorler(a)gmail.com>, 2012 # Idil Yuksel <perfectionne(a)gmail.com>, 2014 @@ -17,8 +18,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2014-07-26 02:11+0000\n" -"PO-Revision-Date: 2014-10-15 17:11+0000\n" -"Last-Translator: Volkan Gezer <volkangezer(a)gmail.com>\n" +"PO-Revision-Date: 2014-10-17 11:14+0000\n" +"Last-Translator: Emir Sarı <bitigchi(a)openmailbox.org>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/torproject/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -44,18 +45,18 @@ msgstr "Üzgünüz. İsteğinizle ilgili bir hata oluştu." #: lib/bridgedb/strings.py:18 msgid "[This is an automated message; please do not reply.]" -msgstr "[Bu otomatik bir mesajdır; lütfen cevaplamayınız.]" +msgstr "[Bu otomatik bir mesajdır; lütfen yanıtlamayınız.]" #: lib/bridgedb/strings.py:20 msgid "Here are your bridges:" -msgstr "İşte bridgeleriniz:" +msgstr "İşte köprüleriniz:" #: lib/bridgedb/strings.py:22 #, python-format msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." -msgstr "Hız limitini aştınız. Lütfen yavaşlayın! Epostalar arasındaki minimum zaman %s saattir. Bu süre içinde göndereceğiniz epostalarınız yok sayılacaktır." +msgstr "Hız limitini aştınız. Lütfen yavaşlayın! E-postalar arasındaki minimum zaman %s saattir. Bu süre içinde göndereceğiniz e-postalarınız yok sayılacaktır." #: lib/bridgedb/strings.py:25 msgid "" @@ -93,7 +94,7 @@ msgstr "Açık Anahtarlar" msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" "for %s on %s at %s." -msgstr "Bu e-posta %s için %s tarihinde %s saatinde gökkuşakları,\nünikornlar ve pırıltılarla oluşturulmuştur." +msgstr "Bu e-posta %s için %s tarihinde %s saatinde gökkuşakları,\ntek boynuzlu atlar ve pırıltılarla oluşturulmuştur." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". @@ -129,11 +130,11 @@ msgid "" "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" "help to circumvent internet censorship in many cases.\n" "\n" -msgstr "Ek olarak BridgeDB %s hiçbir Eklenebilir Aktarıma sahip olmayan %s birçok düz\nvanilla köprüye sahiptir. İsimleri hoş olmayabilir ancak hala çoğu durumda sansürü\naşmaya yardım edebilirler.\n\n" +msgstr "Ek olarak BridgeDB %s hiçbir Eklenebilir Aktarıma sahip olmayan %s birçok düz\nözelliksiz köprüye sahiptir. Adları hoş olmayabilir ancak hala çoğu durumda sansürü\naşmaya yardım edebilirler.\n\n" #: lib/bridgedb/strings.py:76 msgid "What are bridges?" -msgstr "Bridges nedir?" +msgstr "Köprüler nedir?" #: lib/bridgedb/strings.py:77 #, python-format @@ -142,7 +143,7 @@ msgstr "%s Köprüler %s sansürü aşmanıza yardımcı olan Tor aynalarıdır. #: lib/bridgedb/strings.py:82 msgid "I need an alternative way of getting bridges!" -msgstr "Bridges edinmek için başka bir yola ihtiyacım var!" +msgstr "Köprüler edinmek için başka bir yola gereksinimim var!" #: lib/bridgedb/strings.py:83 #, python-format @@ -154,13 +155,13 @@ msgstr "Köprüleri almanın diğer bir yolu da %s adresine bir e-posta gönderm #: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" -msgstr "Bridgelerim çalışmıyor! Yardıma ihtiyacım var!" +msgstr "Köprülerim çalışmıyor! Yardım gerek!" #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:92 #, python-format msgid "If your Tor doesn't work, you should email %s." -msgstr "Tor'unuz çalışmıyorsa %s'a eposta göndermelisiniz. " +msgstr "Tor'unuz çalışmıyorsa %s'a e-posta göndermelisiniz. " #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor Browser". @@ -170,7 +171,7 @@ msgid "" "Try including as much info about your case as you can, including the list of\n" "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" "and any messages which Tor gave out, etc." -msgstr "Durumunuz hakkında mümkün olduğunca fazla bilgi içermeyi deneyin.\nÖrneğin kullanmaya çalıştığınız Eklenebilir Aktarımlar, Tor Taryıcı sürümünüz ve\nTor'un gösterdiği tüm hata iletileri vb." +msgstr "Durumunuz hakkında olabildiğince fazla bilgi içermeyi deneyin.\nÖrneğin kullanmaya çalıştığınız Eklenebilir Aktarımlar, Tor Tarayıcı sürümünüz ve\nTor'un gösterdiği tüm hata iletileri vb." #: lib/bridgedb/strings.py:103 msgid "Here are your bridge lines:" @@ -178,7 +179,7 @@ msgstr "İşte köprü çizgileriniz:" #: lib/bridgedb/strings.py:104 msgid "Get Bridges!" -msgstr "Köprüleri Al!" +msgstr "Köprüleri al!" #: lib/bridgedb/strings.py:108 msgid "Please select options for bridge type:" @@ -199,7 +200,7 @@ msgstr "Tarayıcınız resimleri düzgün görüntülemiyor." #: lib/bridgedb/strings.py:115 msgid "Enter the characters from the image above..." -msgstr "Yukardaki görüntüdeki karakterlerini giriniz..." +msgstr "Yukarıdaki görüntüdeki karakterlerini giriniz..." #: lib/bridgedb/strings.py:119 msgid "How to start using your bridges" @@ -211,7 +212,7 @@ msgstr "Köprülerinizi kullanmaya nasıl başlarsınız" msgid "" "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" "Browser download page %s to start Tor Browser." -msgstr "Tor Tarayıcı içerisine köprüleri girmek için Tor Tarayıcı'yı başlatmak üzere\n%s Tor Tarayıcı indirme sayfasındaki %s talimatları izleyin." +msgstr "Tor Tarayıcı içerisine köprüleri girmek için Tor Tarayıcı'yı başlatmak üzere\n%s Tor Tarayıcı indirme sayfasındaki %s yönergeleri izleyin." #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:125 @@ -225,7 +226,7 @@ msgstr "'Tor Ağ Ayarları' penceresi açıldığında, 'Yapılandır' tıklayı msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" -msgstr "İnternet Servis Sağlayıcınız (ISP) Tor ağına bağlantıyı blokluyor\nveya başka şekillerde sansür uyguluyor mu?" +msgstr "İnternet Servis Sağlayıcınız (ISP) Tor ağına bağlantıyı engelliyor\nveya başka şekillerde sansür uyguluyor mu?" #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:133 @@ -245,7 +246,7 @@ msgstr "Bu iletiyi görüntüler." #. "plain-ol'-vanilla" bridges. #: lib/bridgedb/strings.py:145 msgid "Request vanilla bridges." -msgstr "Vanilla köprüleri talep et." +msgstr "Özelliksiz köprüleri talep et." #: lib/bridgedb/strings.py:146 msgid "Request IPv6 bridges." @@ -254,7 +255,7 @@ msgstr "IPv6 köprüleri talep et." #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". #: lib/bridgedb/strings.py:148 msgid "Request a Pluggable Transport by TYPE." -msgstr "TYPE tarafından Eklenebilir bir Aktarım talep et." +msgstr "TYPE tarafından eklenebilir bir aktarım talep et." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". @@ -264,7 +265,7 @@ msgstr "BridgeDB'nin ortak bir GnuPG anahtar kopyasını al." #: lib/bridgedb/templates/base.html:92 msgid "Report a Bug" -msgstr "Bir Hata Bildir" +msgstr "Bir hata bildir" #: lib/bridgedb/templates/base.html:94 msgid "Source Code"

1 0

[translation/gettor_completed] Update translations for gettor_completed
by translation＠torproject.org 17 Oct '14

17 Oct '14

commit 8d1d976e61ed786a76faf110b2874141df2f9542 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 17 10:45:11 2014 +0000 Update translations for gettor_completed --- fr/gettor.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/gettor.po b/fr/gettor.po index 65434bf..3b756b5 100644 --- a/fr/gettor.po +++ b/fr/gettor.po @@ -19,7 +19,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2014-10-17 10:08+0000\n" +"PO-Revision-Date: 2014-10-17 10:44+0000\n" "Last-Translator: Couch1 <kotchwane(a)gmail.com>\n" "Language-Team: French (http://www.transifex.com/projects/p/torproject/language/fr/)\n" "MIME-Version: 1.0\n"

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 17 Oct '14

17 Oct '14

commit f253a8865134e5f85f0e2117dab0ad0e9500ff20 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 17 10:45:07 2014 +0000 Update translations for gettor --- fr/gettor.po | 2 +- sl_SI/gettor.po | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fr/gettor.po b/fr/gettor.po index 65434bf..3b756b5 100644 --- a/fr/gettor.po +++ b/fr/gettor.po @@ -19,7 +19,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2014-10-17 10:08+0000\n" +"PO-Revision-Date: 2014-10-17 10:44+0000\n" "Last-Translator: Couch1 <kotchwane(a)gmail.com>\n" "Language-Team: French (http://www.transifex.com/projects/p/torproject/language/fr/)\n" "MIME-Version: 1.0\n" diff --git a/sl_SI/gettor.po b/sl_SI/gettor.po index 04e8f3e..8473a24 100644 --- a/sl_SI/gettor.po +++ b/sl_SI/gettor.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2014-10-17 09:05+0000\n" +"PO-Revision-Date: 2014-10-17 10:44+0000\n" "Last-Translator: Dušan <dusan.k(a)zoho.com>\n" "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/projects/p/torproject/language/sl_SI/)\n" "MIME-Version: 1.0\n"

1 0

[translation/gettor_completed] Update translations for gettor_completed
by translation＠torproject.org 17 Oct '14

17 Oct '14

commit 0fda41d4a7a578deeb4b22ad66a6896486a4b75f Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 17 10:15:13 2014 +0000 Update translations for gettor_completed --- fr/gettor.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/fr/gettor.po b/fr/gettor.po index 3a03852..65434bf 100644 --- a/fr/gettor.po +++ b/fr/gettor.po @@ -4,6 +4,7 @@ # # Translators: # arpalord <arpalord(a)gmail.com>, 2011 +# Couch1 <kotchwane(a)gmail.com>, 2014 # freda <ecuriesduperche(a)free.fr>, 2011 # Jacob Appelbaum <jacob(a)appelbaum.net>, 2009 # Onizuka, 2013 @@ -18,8 +19,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2014-10-15 17:11+0000\n" -"Last-Translator: Théo\n" +"PO-Revision-Date: 2014-10-17 10:08+0000\n" +"Last-Translator: Couch1 <kotchwane(a)gmail.com>\n" "Language-Team: French (http://www.transifex.com/projects/p/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -47,7 +48,7 @@ msgid "" "We only process requests from email services that support \"DKIM\",\n" "which is an email feature that lets us verify that the address in the\n" "\"From\" line is actually the one who sent the mail." -msgstr "Nous ne traitons que les demandes provenant de services de messagerie prenant en charge \"DKIM\",\nqui est une fonction de messagerie électronique qui nous permet de vérifier que l'adresse dans la\nligne «De» est bien celui qui a envoyé le mail." +msgstr "Nous ne traitons que les demandes provenant de services de messagerie possédant la fonctionnalité \"DKIM\", qui nous permet de vérifer que l'adresse indiquée dans le champ \"De :\" d'un message est bien l'adresse réelle d'expédition." #: lib/gettor/i18n.py:39 msgid "" @@ -113,7 +114,7 @@ msgstr "Liste des langues supportées:" #: lib/gettor/i18n.py:78 msgid "Here is a list of all available languages:" -msgstr "Voici une liste de toutes les langues disponibles:" +msgstr "Voici une liste des langues disponibles :" #: lib/gettor/i18n.py:80 msgid ""

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 17 Oct '14

17 Oct '14

commit dd9236de5ac2a46193742a4dcaafbf9707c34c35 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 17 10:15:09 2014 +0000 Update translations for gettor --- fr/gettor.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/fr/gettor.po b/fr/gettor.po index 3a03852..65434bf 100644 --- a/fr/gettor.po +++ b/fr/gettor.po @@ -4,6 +4,7 @@ # # Translators: # arpalord <arpalord(a)gmail.com>, 2011 +# Couch1 <kotchwane(a)gmail.com>, 2014 # freda <ecuriesduperche(a)free.fr>, 2011 # Jacob Appelbaum <jacob(a)appelbaum.net>, 2009 # Onizuka, 2013 @@ -18,8 +19,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2014-10-15 17:11+0000\n" -"Last-Translator: Théo\n" +"PO-Revision-Date: 2014-10-17 10:08+0000\n" +"Last-Translator: Couch1 <kotchwane(a)gmail.com>\n" "Language-Team: French (http://www.transifex.com/projects/p/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -47,7 +48,7 @@ msgid "" "We only process requests from email services that support \"DKIM\",\n" "which is an email feature that lets us verify that the address in the\n" "\"From\" line is actually the one who sent the mail." -msgstr "Nous ne traitons que les demandes provenant de services de messagerie prenant en charge \"DKIM\",\nqui est une fonction de messagerie électronique qui nous permet de vérifier que l'adresse dans la\nligne «De» est bien celui qui a envoyé le mail." +msgstr "Nous ne traitons que les demandes provenant de services de messagerie possédant la fonctionnalité \"DKIM\", qui nous permet de vérifer que l'adresse indiquée dans le champ \"De :\" d'un message est bien l'adresse réelle d'expédition." #: lib/gettor/i18n.py:39 msgid "" @@ -113,7 +114,7 @@ msgstr "Liste des langues supportées:" #: lib/gettor/i18n.py:78 msgid "Here is a list of all available languages:" -msgstr "Voici une liste de toutes les langues disponibles:" +msgstr "Voici une liste des langues disponibles :" #: lib/gettor/i18n.py:80 msgid ""

1 0

[onionoo/master] Add qualified search terms.
by karsten＠torproject.org 17 Oct '14

17 Oct '14

commit f82b3425e81280edd2cccae004a63f9b1194191a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Oct 17 11:34:19 2014 +0200 Add qualified search terms. Implements #13422. --- .../torproject/onionoo/server/ResourceServlet.java | 55 +++++++++++++++----- .../torproject/onionoo/server/ResponseBuilder.java | 2 +- .../torproject/onionoo/ResourceServletTest.java | 45 ++++++++++++++++ web/protocol.html | 16 ++++-- 4 files changed, 100 insertions(+), 18 deletions(-) diff --git a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java index d527962..cd99dcb 100644 --- a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java +++ b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java @@ -4,9 +4,11 @@ package org.torproject.onionoo.server; import java.io.IOException; import java.io.PrintWriter; +import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; +import java.util.List; import java.util.Map; import java.util.Set; import java.util.regex.Pattern; @@ -59,6 +61,15 @@ public class ResourceServlet extends HttpServlet { CACHE_MAX_TIME = 45L * 60L * 1000L, CACHE_INTERVAL = 5L * 60L * 1000L; + private static Set<String> knownParameters = new HashSet<String>( + Arrays.asList(("type,running,search,lookup,fingerprint,country,as," + + "flag,first_seen_days,last_seen_days,contact,order,limit," + + "offset,fields,family").split(","))); + + private static Set<String> illegalSearchQualifiers = + new HashSet<String>(Arrays.asList(("search,fingerprint,order,limit," + + "offset,fields").split(","))); + public void doGet(HttpServletRequestWrapper request, HttpServletResponseWrapper response) throws IOException { @@ -126,10 +137,6 @@ public class ResourceServlet extends HttpServlet { /* Make sure that the request doesn't contain any unknown * parameters. */ - Set<String> knownParameters = new HashSet<String>(Arrays.asList(( - "type,running,search,lookup,fingerprint,country,as,flag," - + "first_seen_days,last_seen_days,contact,order,limit,offset," - + "fields,family").split(","))); for (String parameterKey : parameterMap.keySet()) { if (!knownParameters.contains(parameterKey)) { response.sendError(HttpServletResponse.SC_BAD_REQUEST); @@ -138,6 +145,34 @@ public class ResourceServlet extends HttpServlet { } /* Filter relays and bridges matching the request. */ + if (parameterMap.containsKey("search")) { + String[] searchTerms = this.parseSearchParameters( + parameterMap.get("search")); + if (searchTerms == null) { + response.sendError(HttpServletResponse.SC_BAD_REQUEST); + return; + } + List<String> unqualifiedSearchTerms = new ArrayList<String>(); + for (String searchTerm : searchTerms) { + if (searchTerm.contains(":") && !searchTerm.startsWith("[")) { + String[] parts = searchTerm.split(":", 2); + String parameterKey = parts[0]; + if (!knownParameters.contains(parameterKey) || + illegalSearchQualifiers.contains(parameterKey)) { + response.sendError(HttpServletResponse.SC_BAD_REQUEST); + return; + } + if (!parameterMap.containsKey(parameterKey)) { + String parameterValue = parts[1]; + parameterMap.put(parameterKey, parameterValue); + } + } else { + unqualifiedSearchTerms.add(searchTerm); + } + } + rh.setSearch(unqualifiedSearchTerms.toArray( + new String[unqualifiedSearchTerms.size()])); + } if (parameterMap.containsKey("type")) { String typeParameterValue = parameterMap.get("type").toLowerCase(); boolean relaysRequested = true; @@ -161,15 +196,6 @@ public class ResourceServlet extends HttpServlet { } rh.setRunning(runningRequested ? "true" : "false"); } - if (parameterMap.containsKey("search")) { - String[] searchTerms = this.parseSearchParameters( - parameterMap.get("search")); - if (searchTerms == null) { - response.sendError(HttpServletResponse.SC_BAD_REQUEST); - return; - } - rh.setSearch(searchTerms); - } if (parameterMap.containsKey("lookup")) { String lookupParameter = this.parseFingerprintParameter( parameterMap.get("lookup")); @@ -334,7 +360,8 @@ public class ResourceServlet extends HttpServlet { private static Pattern searchParameterPattern = Pattern.compile("^\\$?[0-9a-fA-F]{1,40}$|" /* Fingerprint. */ + "^[0-9a-zA-Z\\.]{1,19}$|" /* Nickname or IPv4 address. */ - + "^\\[[0-9a-fA-F:\\.]{1,39}\\]?$"); /* IPv6 address. */ + + "^\\[[0-9a-fA-F:\\.]{1,39}\\]?$|" /* IPv6 address. */ + + "^[a-zA-Z_]+:[0-9a-zA-Z_,-]+$" /* Qualified search term. */); private String[] parseSearchParameters(String parameter) { String[] searchParameters; if (parameter.contains(" ")) { diff --git a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java index e7606af..2660c26 100644 --- a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java +++ b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java @@ -69,7 +69,7 @@ public class ResponseBuilder { return this.charsWritten; } - private static final String PROTOCOL_VERSION = "1.1"; + private static final String PROTOCOL_VERSION = "1.2"; private static final String NEXT_MAJOR_VERSION_SCHEDULED = "2014-11-15"; diff --git a/src/test/java/org/torproject/onionoo/ResourceServletTest.java b/src/test/java/org/torproject/onionoo/ResourceServletTest.java index cf46e9f..11068dc 100644 --- a/src/test/java/org/torproject/onionoo/ResourceServletTest.java +++ b/src/test/java/org/torproject/onionoo/ResourceServletTest.java @@ -732,6 +732,51 @@ public class ResourceServletTest { } @Test() + public void testSearchTypeRelay() { + this.assertSummaryDocument("/summary?search=type:relay", 3, null, 0, + null); + } + + @Test() + public void testSearchTypeRelayTorkaZ() { + this.assertSummaryDocument("/summary?search=type:relay TorkaZ", 1, + new String[] { "TorkaZ" }, 0, null); + } + + @Test() + public void testSearchTorkaZTypeRelay() { + this.assertSummaryDocument("/summary?search=TorkaZ type:relay", 1, + new String[] { "TorkaZ" }, 0, null); + } + + @Test() + public void testSearchTypeRelayTypeDirectory() { + this.assertSummaryDocument( + "/summary?search=type:relay type:directory", 3, null, 0, null); + } + + @Test() + public void testSearchTypeDirectoryTypeRelay() { + this.assertErrorStatusCode( + "/summary?search=type:directory type:relay", 400); + } + + @Test() + public void testSearchFooBar() { + this.assertErrorStatusCode("/summary?search=foo:bar", 400); + } + + @Test() + public void testSearchSearchTorkaZ() { + this.assertErrorStatusCode("/summary?search=search:TorkaZ", 400); + } + + @Test() + public void testSearchLimitOne() { + this.assertErrorStatusCode("/summary?search=limit:1", 400); + } + + @Test() public void testLookupFingerprint() { this.assertSummaryDocument( "/summary?lookup=000C5F55BD4814B917CC474BD537F1A3B33CCE2A", 1, diff --git a/web/protocol.html b/web/protocol.html index bac080f..21ab963 100644 --- a/web/protocol.html +++ b/web/protocol.html @@ -163,6 +163,8 @@ scheduled to be deployed in the next months: 2014.</li> <li>1.1: Added optional "next_major_version_scheduled" field on September 16, 2014.</li> +<li>1.2: Added qualified search terms to "search" +parameter on October 17, 2014.</li> </ul> </div>  @@ -266,10 +268,11 @@ Parameter values are case-insensitive. <li> search -Return only relays with the parameter value +Return only (1) relays with the parameter value matching (part of a) nickname, (possibly $-prefixed) beginning of a -fingerprint, or beginning of an IP address, and bridges with (part of a) -nickname or (possibly $-prefixed) beginning of a hashed fingerprint. +fingerprint, or beginning of an IP address, (2) bridges with (part of a) +nickname or (possibly $-prefixed) beginning of a hashed fingerprint, and +(3) relays and/or bridges matching a given qualified search term. Searches by relay IP address include all known addresses used for onion routing and for exiting to the Internet. Searches for beginnings of IP addresses are performed on textual @@ -281,6 +284,13 @@ of all relays and bridges matching all search terms will be returned. Full fingerprints should always be hashed using SHA-1, regardless of searching for a relay or a bridge, in order to not accidentally leak non-hashed bridge fingerprints in the URL. + +Qualified search terms have the form "key:value" (without double quotes) +with "key" being one of the parameters listed here except for "search", +"fingerprint", "order", "limit", "offset", and "fields", and "value" being +the string that will internally be passed to that parameter. +(Qualified search terms were added on October 17, 2014.) + </li>

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 17 Oct '14

17 Oct '14

commit 946ce96605bb29f3d576874b574c40ba138240d6 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 17 09:15:13 2014 +0000 Update translations for gettor --- sl_SI/gettor.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sl_SI/gettor.po b/sl_SI/gettor.po index 482ac6b..04e8f3e 100644 --- a/sl_SI/gettor.po +++ b/sl_SI/gettor.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2014-10-17 08:44+0000\n" +"PO-Revision-Date: 2014-10-17 09:05+0000\n" "Last-Translator: Dušan <dusan.k(a)zoho.com>\n" "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/projects/p/torproject/language/sl_SI/)\n" "MIME-Version: 1.0\n" @@ -426,21 +426,21 @@ msgstr "" msgid "" "source:\n" "The Tor source code, for experts. Most users do not want this package." -msgstr "" +msgstr "izvor:\nTorova izvorna koda za strokovnjake. Večina uporabnikov ne želi tega paketa." #: lib/gettor/i18n.py:269 msgid "" "FREQUENTLY ASKED QUESTIONS\n" "==========================" -msgstr "" +msgstr "POGOSTA VPRAŠANJA\n==========================" #: lib/gettor/i18n.py:272 msgid "What is Tor?" -msgstr "" +msgstr "Kaj je Tor?" #: lib/gettor/i18n.py:274 msgid "The name \"Tor\" can refer to several different components." -msgstr "" +msgstr "Ime \"Tor\" se lahko nanaša na več različnih komponent." #: lib/gettor/i18n.py:276 msgid "" @@ -476,11 +476,11 @@ msgid "" "operating system is Microsoft Windows, you should request \"windows\". Here\n" "is a short explanation of all packages to request and what operating \n" "systems there are suitable for:" -msgstr "" +msgstr "To je odvisno od vašega operacijskega sistema. Npr. če je vaš\nOS Microsoft Windows zahtevajte \"windows\". Tu je\nkratka razlaga vseh zahtevanih paketov za kateri operacijski\nsistem\nso primerni:" #: lib/gettor/i18n.py:299 msgid "How do I extract the file(s) you sent me?" -msgstr "Kako naj razpakiram datoteke, ki ste jih poslali?" +msgstr "Kako naj razpakiram datoteko(e), ki ste jih poslali?" #: lib/gettor/i18n.py:301 msgid "QUESTION:" @@ -500,4 +500,4 @@ msgid "" " https://www.oignon.net/dist/torbrowser/\n" " https://tor.beme-it.de/dist/torbrowser/\n" " https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/" -msgstr "" +msgstr "Žal, toda zahtevani paket (%s) je prevelik za vašega\nponudnika, da sprejme priponko. Uporabite drugega, ki omogoča\nvečje e-poštne priponke. Ali poskusite sledeče zrcalne:\n\nhttps://www.oignon.net/dist/torbrowser/\nhttps://tor.beme-it.de…"

1 0

r26983: {website} stop advertising browser hacker and extension developer but (website/trunk/about/en)
by Roger Dingledine 17 Oct '14

17 Oct '14

Author: arma Date: 2014-10-17 08:56:55 +0000 (Fri, 17 Oct 2014) New Revision: 26983 Modified: website/trunk/about/en/sidenav.wmi Log: stop advertising browser hacker and extension developer but link to the project coordinator spot, since hey who knows maybe we'll hear from a great one. Modified: website/trunk/about/en/sidenav.wmi =================================================================== --- website/trunk/about/en/sidenav.wmi 2014-10-17 08:51:27 UTC (rev 26982) +++ website/trunk/about/en/sidenav.wmi 2014-10-17 08:56:55 UTC (rev 26983) @@ -44,11 +44,8 @@ {'url' => 'about/jobs', 'txt' => 'Jobs', 'subelements' => [ - {'url' => 'about/jobs-browserhacker', - 'txt' => 'Browser Hacker', - }, - {'url' => 'about/jobs-extdev', - 'txt' => 'Extension Developer', + {'url' => 'about/jobs-projectcoordinator', + 'txt' => 'Project coordinator', }] },

1 0

r26982: {website} More tordnsel/dist to /dist/tordnsel (website/trunk)
by Peter Palfrader 17 Oct '14

17 Oct '14

Author: weasel Date: 2014-10-17 08:51:27 +0000 (Fri, 17 Oct 2014) New Revision: 26982 Modified: website/trunk/.htaccess Log: More tordnsel/dist to /dist/tordnsel Modified: website/trunk/.htaccess =================================================================== --- website/trunk/.htaccess 2014-10-17 08:51:07 UTC (rev 26981) +++ website/trunk/.htaccess 2014-10-17 08:51:27 UTC (rev 26982) @@ -17,6 +17,9 @@ #RewriteRule ^torbrowser/$ /projects/torbrowser.html.en [R=301,L] RewriteRule ^torbrowser(.*) /projects/torbrowser.html.en [R=301,L] +# tordnsel +RewriteRule ^tordnsel/dist/(.*) /dist/tordnsel/$1 [R=301,L] + # Overview RewriteRule ^overview(.*) /about/overview$1 [R=301,L]

1 0

r26981: {} get rid of the translated, but rotted, manpages. nobody was (website/trunk/docs)
by Roger Dingledine 17 Oct '14

17 Oct '14

Author: arma Date: 2014-10-17 08:51:07 +0000 (Fri, 17 Oct 2014) New Revision: 26981 Removed: website/trunk/docs/manpages/ Log: get rid of the translated, but rotted, manpages. nobody was linking to them, or even knowing about them, and it's been a really long time now.

1 0