February 2020 - tor-commits - lists.torproject.org

[translation/bridgedb_completed] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed
by translation＠torproject.org 14 Feb '20

14 Feb '20

commit a38361318e430cdc30e8de88a0014fd8c64f2014 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 14 09:45:23 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed --- tr/LC_MESSAGES/bridgedb.po | 61 ++++++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/tr/LC_MESSAGES/bridgedb.po b/tr/LC_MESSAGES/bridgedb.po index db61767680..6a85501234 100644 --- a/tr/LC_MESSAGES/bridgedb.po +++ b/tr/LC_MESSAGES/bridgedb.po @@ -1,11 +1,11 @@ # Translations template for bridgedb. -# Copyright (C) 2019 'The Tor Project, Inc.' +# Copyright (C) 2020 'The Tor Project, Inc.' # This file is distributed under the same license as the bridgedb project. # # Translators: # Bullgeschichte <bullgeschichte(a)riseup.net>, 2015 # eromytsatiffird <driffitastymore(a)gmail.com>, 2014 -# Emir Sarı <bitigchi(a)openmailbox.org>, 2014 +# Emir Sarı <bitigchi(a)me.com>, 2014 # Emre <conan(a)operamail.com>, 2013 # erg26 <ergungorler(a)gmail.com>, 2012 # erg26 <ergungorler(a)gmail.com>, 2012 @@ -18,6 +18,7 @@ # Idil Yuksel <idilyuksel(a)hotmail.com>, 2014 # Sercan Altundaş <>, 2012 # ozkansib <s.ozkan(a)gyte.edu.tr>, 2014 +# T. E. Kalayci <tekrei(a)gmail.com>, 2020 # Tekel Bira <psycookie(a)gmail.com>, 2012 # Volkan Gezer <volkangezer(a)gmail.com>, 2014-2016 # zeki <zeki.ozguryazilim(a)gmail.com>, 2014 @@ -26,9 +27,9 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" -"POT-Creation-Date: 2019-10-19 14:51-0700\n" -"PO-Revision-Date: 2019-10-22 06:14+0000\n" -"Last-Translator: Kaya Zeren <kayazeren(a)gmail.com>\n" +"POT-Creation-Date: 2020-02-04 10:59-0800\n" +"PO-Revision-Date: 2020-02-14 09:24+0000\n" +"Last-Translator: T. E. Kalayci <tekrei(a)gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -301,62 +302,64 @@ msgstr "%s Köprüler %s İnternet kısıtlamalarını aşmanıza yardımcı ola msgid "I need an alternative way of getting bridges!" msgstr "Köprüleri edinmek için başka bir yola gerek duyuyorum!" -#: bridgedb/strings.py:108 +#. TRANSLATORS: Please DO NOT translate "get transport obfs4". +#: bridgedb/strings.py:109 #, python-format msgid "" -"Another way to get bridges is to send an email to %s. Please note that you must\n" -"send the email using an address from one of the following email providers:\n" -"%s or %s." -msgstr "Köprüleri almanın diğer bir yolu da %s adresine bir e-posta göndermektir.\nLütfen e-postanın aşağıdaki e-posta hizmeti sağlayıcıların birinden alınmış bir\nadresten gönderilmesi gerektiğini unutmayın:\n%s ya da %s." +"Another way to get bridges is to send an email to %s. Leave the email subject\n" +"empty and write \"get transport obfs4\" in the email's message body. Please note\n" +"that you must send the email using an address from one of the following email\n" +"providers: %s or %s." +msgstr "" -#: bridgedb/strings.py:115 +#: bridgedb/strings.py:117 msgid "My bridges don't work! I need help!" msgstr "Köprülerim çalışmıyor! Yardım gerek!" #. TRANSLATORS: Please DO NOT translate "Tor Browser". #. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and #. "Support Portal", respectively. -#: bridgedb/strings.py:119 +#: bridgedb/strings.py:121 #, python-format msgid "" "If your Tor Browser cannot connect, please take a look at the %s and our %s." msgstr "Tor Browser bağlantı kuramıyorsa lütfen %s ve %s bölümlerine bakın." -#: bridgedb/strings.py:123 +#: bridgedb/strings.py:125 msgid "Here are your bridge lines:" msgstr "İşte köprü satırlarınız:" -#: bridgedb/strings.py:124 +#: bridgedb/strings.py:126 msgid "Get Bridges!" msgstr "Köprüleri Al!" -#: bridgedb/strings.py:128 +#: bridgedb/strings.py:130 msgid "Please select options for bridge type:" msgstr "Lütfen köprü türü seçeneklerini belirleyin:" -#: bridgedb/strings.py:129 +#: bridgedb/strings.py:131 msgid "Do you need IPv6 addresses?" msgstr "IPv6 adresleri gerekli mi?" -#: bridgedb/strings.py:130 +#: bridgedb/strings.py:132 #, python-format msgid "Do you need a %s?" msgstr "%s gerekli mi?" -#: bridgedb/strings.py:134 +#: bridgedb/strings.py:136 msgid "Your browser is not displaying images properly." msgstr "Tarayıcınız görselleri düzgün görüntülemiyor." -#: bridgedb/strings.py:135 +#: bridgedb/strings.py:137 msgid "Enter the characters from the image above..." msgstr "Yukarıdaki görselde bulunan karakterleri yazın..." -#: bridgedb/strings.py:139 +#: bridgedb/strings.py:141 msgid "How to start using your bridges" msgstr "Köprülerinizi nasıl kullanabilirsiniz" #. TRANSLATORS: Please DO NOT translate "Tor Browser". -#: bridgedb/strings.py:141 +#: bridgedb/strings.py:143 #, python-format msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" @@ -365,21 +368,21 @@ msgid "" msgstr "Tor Browser üzerine köprüler eklemek için\n%s Tor Browser indirme sayfasına %s\ngidin ve Tor Browser indirme ve başlatma yönergelerini izleyin." #. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:146 +#: bridgedb/strings.py:148 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" msgstr "'Tor Ağı Ayarları' penceresi açıldığında, 'Ayarla' üzerine tıklayın ve şu soru soruluncaya\ndek yardımcıyı izleyin:" #. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:150 +#: bridgedb/strings.py:152 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" msgstr "İnternet Hizmeti Sağlayıcınız (ISS) Tor ağına olan bağlantıları engelliyor\nya da başka şekillerde bir sansür uyguluyor mu?" #. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:154 +#: bridgedb/strings.py:156 msgid "" "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" @@ -387,28 +390,28 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "'Evet' seçip ardından 'İleri' üzerine tıklayın. Yeni köprülerinizi ayarlamak için köprü\nsatırlarını kopyalayarak metin kutusuna yapıştırın.\n'Bağlan' üzerine tıkladığınızda artık hazırsınız! Sorun yaşıyorsanız, daha fazla yardım almak için 'Tor Ağı Ayarları' yardımcısındaki 'Yardım' düğmesine tıklamayı deneyin." -#: bridgedb/strings.py:162 +#: bridgedb/strings.py:164 msgid "Displays this message." msgstr "Bu iletiyi görüntüler." #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the #. same non-Pluggable Transport bridges described above as being #. "plain-ol'-vanilla" bridges. -#: bridgedb/strings.py:166 +#: bridgedb/strings.py:168 msgid "Request vanilla bridges." msgstr "Normal köprü isteğinde bulun." -#: bridgedb/strings.py:167 +#: bridgedb/strings.py:169 msgid "Request IPv6 bridges." msgstr "IPv6 köprüsü isteğinde bulun." #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: bridgedb/strings.py:169 +#: bridgedb/strings.py:171 msgid "Request a Pluggable Transport by TYPE." msgstr "TYPE uyumlu bir Değiştirilebilir Taşıyıcı isteğinde bulun." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: bridgedb/strings.py:172 +#: bridgedb/strings.py:174 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "Herkese açık BridgeDB GnuPG anahtarının bir kopyasını al."

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 14 Feb '20

14 Feb '20

commit 8171c324a6f3591acc008efe08a76c5d3906ac9b Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 14 09:45:16 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- tr/LC_MESSAGES/bridgedb.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tr/LC_MESSAGES/bridgedb.po b/tr/LC_MESSAGES/bridgedb.po index 58237257a2..1564daa7bd 100644 --- a/tr/LC_MESSAGES/bridgedb.po +++ b/tr/LC_MESSAGES/bridgedb.po @@ -18,6 +18,7 @@ # Idil Yuksel <idilyuksel(a)hotmail.com>, 2014 # Sercan Altundaş <>, 2012 # ozkansib <s.ozkan(a)gyte.edu.tr>, 2014 +# T. E. Kalayci <tekrei(a)gmail.com>, 2020 # Tekel Bira <psycookie(a)gmail.com>, 2012 # Volkan Gezer <volkangezer(a)gmail.com>, 2014-2016 # zeki <zeki.ozguryazilim(a)gmail.com>, 2014 @@ -27,8 +28,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2020-02-04 10:59-0800\n" -"PO-Revision-Date: 2020-02-05 01:11+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2020-02-14 09:24+0000\n" +"Last-Translator: T. E. Kalayci <tekrei(a)gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -309,7 +310,7 @@ msgid "" "empty and write \"get transport obfs4\" in the email's message body. Please note\n" "that you must send the email using an address from one of the following email\n" "providers: %s or %s." -msgstr "" +msgstr "Köprüleri almanın diğer bir yolu da %s adresine bir e-posta göndermektir. E-posta\nkonusunu boş bırakıp gövdesine \"get transport obfs4\" yazın. Lütfen e-postanın \naşağıdaki e-posta hizmeti sağlayıcıların birinden alınmış bir adresten gönderilmesi \ngerektiğini unutmayın: %s ya da %s." #: bridgedb/strings.py:117 msgid "My bridges don't work! I need help!"

1 0

[metrics-web/master] Introduce the term "server" in the glossary.
by karsten＠torproject.org 14 Feb '20

14 Feb '20

commit cc60eede3ee8c2f47612414a847b9fc25b8f8c54 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Jan 23 09:07:35 2020 +0100 Introduce the term "server" in the glossary. On the metrics website we're using the term "server" for both relays and bridges and the term "node" for both clients and servers. Fixes #26068. --- src/main/resources/web/jsps/glossary.jsp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/resources/web/jsps/glossary.jsp b/src/main/resources/web/jsps/glossary.jsp index b508c53..eaee46e 100644 --- a/src/main/resources/web/jsps/glossary.jsp +++ b/src/main/resources/web/jsps/glossary.jsp @@ -29,7 +29,7 @@ claims to have handled on behalf of <a href="#client">clients</a>. <a href="#bridge">bridge:</a> a - <a href="#relay">relay</a> whose + <a href="#server">server</a> in the Tor network whose existence is non-public and which can therefore provide access for blocked <a href="#client">clients</a>, often in combination with <a href="#pluggable-transport">pluggable transports</a>, which registers @@ -91,8 +91,8 @@ and used by <a href="#client">clients</a> to circumvent transport-level blockings (for example, by ISPs or governments). - <a href="#relay">relay:</a> a publicly-listed node in - the Tor + <a href="#relay">relay:</a> a publicly-listed + <a href="#server">server</a> in the Tor network that forwards traffic on behalf of <a href="#client">clients</a>, and that registers itself with the <a href="#directory-authority">directory authorities</a>. @@ -111,6 +111,11 @@ party builds a three-hop circuit, meeting at the rendezvous point. + <a href="#server">server:</a> a node in the Tor + network, either a <a href="#relay">relay</a> or a + <a href="#bridge">bridge</a>, that forwards traffic on behalf of + <a href="#client">clients</a>. + </div> <jsp:include page="bottom.jsp"/>

1 0

[chutney/master] networks/mixed: Update for HSv3
by teor＠torproject.org 14 Feb '20

14 Feb '20

commit 87d0fe04d5ff8bc29f20b093eb084ce8753be98f Author: teor <teor(a)torproject.org> Date: Fri Feb 14 13:48:55 2020 +1000 networks/mixed: Update for HSv3 Update mixed networks, now that all supported tor versions can run v3 Onion Services. Also make the networks slightly smaller: they only need 6 relays, not 8. (The minimum is 5.) Preparation for 33232. --- networks/mixed | 2 +- networks/mixed+hs-v2 | 2 +- networks/mixed+hs-v23 | 12 +++++------- networks/mixed+hs-v3 | 6 +++--- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/networks/mixed b/networks/mixed index a0c126e..488d91d 100644 --- a/networks/mixed +++ b/networks/mixed @@ -10,7 +10,7 @@ Client = Node(tag="c", client=1, torrc="client.tmpl") OldClient = Node(tag="cOLD", client=1, torrc="client.tmpl", tor=OLD_TOR) NODES = Authority.getN(2) + OldAuthority.getN(2) + \ - Relay.getN(2) + OldRelay.getN(2) + \ + Relay.getN(1) + OldRelay.getN(1) + \ Client.getN(2) + OldClient.getN(2) ConfigureNodes(NODES) diff --git a/networks/mixed+hs-v2 b/networks/mixed+hs-v2 index 5d901ed..e915e90 100644 --- a/networks/mixed+hs-v2 +++ b/networks/mixed+hs-v2 @@ -12,7 +12,7 @@ HSv2 = Node(tag="h", hs=1, torrc="hs.tmpl") OldHSv2 = Node(tag="hOLD", hs=1, torrc="hs.tmpl", tor=OLD_TOR) NODES = Authority.getN(2) + OldAuthority.getN(2) + \ - Relay.getN(2) + OldRelay.getN(2) + \ + Relay.getN(1) + OldRelay.getN(1) + \ Client.getN(1) + OldClient.getN(1) + \ HSv2.getN(1) + OldHSv2.getN(1) diff --git a/networks/mixed+hs-v23 b/networks/mixed+hs-v23 index fd180bf..992e99a 100644 --- a/networks/mixed+hs-v23 +++ b/networks/mixed+hs-v23 @@ -10,15 +10,13 @@ Client = Node(tag="c", client=1, torrc="client.tmpl") OldClient = Node(tag="cOLD", client=1, torrc="client.tmpl", tor=OLD_TOR) HSv2 = Node(tag="h", hs=1, torrc="hs.tmpl") OldHSv2 = Node(tag="hOLD", hs=1, torrc="hs.tmpl", tor=OLD_TOR) -# Old tor versions don't have HSv3 support yet -# And chutney doesn't know how to tell old clients to avoid v3 services -# See 23498 -#HSv3 = Node(tag="h", hs=1, torrc="hs-v3.tmpl") +HSv3 = Node(tag="h", hs=1, torrc="hs-v3.tmpl") +OldHSv3 = Node(tag="hOLD", hs=1, torrc="hs-v3.tmpl", tor=OLD_TOR) NODES = Authority.getN(2) + OldAuthority.getN(2) + \ - Relay.getN(2) + OldRelay.getN(2) + \ + Relay.getN(1) + OldRelay.getN(1) + \ Client.getN(1) + OldClient.getN(1) + \ - HSv2.getN(1) + OldHSv2.getN(1) -# HSv3.getN(1) + HSv2.getN(1) + OldHSv2.getN(1) + \ + HSv3.getN(1) + OldHSv3.getN(1) ConfigureNodes(NODES) diff --git a/networks/mixed+hs-v3 b/networks/mixed+hs-v3 index e2e9aa5..b1dcce7 100644 --- a/networks/mixed+hs-v3 +++ b/networks/mixed+hs-v3 @@ -8,12 +8,12 @@ OldRelay = Node(tag="rOLD", relay=1, exit=1, torrc="relay.tmpl", tor=OLD_TOR) Client = Node(tag="c", client=1, torrc="client.tmpl") OldClient = Node(tag="cOLD", client=1, torrc="client.tmpl", tor=OLD_TOR) -# Old tor versions don't have HSv3 support yet HSv3 = Node(tag="h", hs=1, torrc="hs-v3.tmpl") +OldHSv3 = Node(tag="hOLD", hs=1, torrc="hs-v3.tmpl", tor=OLD_TOR) NODES = Authority.getN(2) + OldAuthority.getN(2) + \ - Relay.getN(2) + OldRelay.getN(2) + \ + Relay.getN(1) + OldRelay.getN(1) + \ Client.getN(1) + OldClient.getN(1) + \ - HSv3.getN(1) + HSv3.getN(1) + OldHSv3.getN(1) ConfigureNodes(NODES)

1 0

[chutney/master] networks: Add an extra relay to client-ipv6-only*
by teor＠torproject.org 14 Feb '20

14 Feb '20

commit 53d229d9d9b02eae81e036a8e990e9f2fb01347f Author: teor <teor(a)torproject.org> Date: Fri Feb 14 13:13:49 2020 +1000 networks: Add an extra relay to client-ipv6-only* We need 5 relays in these networks, to avoid path building warnings on some nodes. Cleanup after Tor's 33280. --- networks/client-ipv6-only | 2 +- networks/client-ipv6-only-md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/networks/client-ipv6-only b/networks/client-ipv6-only index 305a4a5..5349c72 100644 --- a/networks/client-ipv6-only +++ b/networks/client-ipv6-only @@ -17,6 +17,6 @@ Client6 = Node(tag="c", client=1, torrc="client-only-v6.tmpl") # The minimum number of authorities/relays/exits is 3, the minimum path length # But for some reason, Tor wants 4 "acceptable routers" (Tor bug #20071) -NODES = Authority6.getN(3) + ExitRelay6.getN(1) + HS.getN(1) + Client6.getN(1) +NODES = Authority6.getN(3) + ExitRelay6.getN(2) + HS.getN(1) + Client6.getN(1) ConfigureNodes(NODES) diff --git a/networks/client-ipv6-only-md b/networks/client-ipv6-only-md index 77b5bbe..ff7a664 100644 --- a/networks/client-ipv6-only-md +++ b/networks/client-ipv6-only-md @@ -17,6 +17,6 @@ Client6 = Node(tag="c", client=1, torrc="client-only-v6-md.tmpl") # The minimum number of authorities/relays/exits is 3, the minimum path length # But for some reason, Tor wants 4 "acceptable routers" (Tor bug #20071) -NODES = Authority6.getN(3) + ExitRelay6.getN(1) + HS.getN(1) + Client6.getN(1) +NODES = Authority6.getN(3) + ExitRelay6.getN(2) + HS.getN(1) + Client6.getN(1) ConfigureNodes(NODES)

1 0

[chutney/master] warnings: Also ignore duplicate IPv6Exit options
by teor＠torproject.org 14 Feb '20

14 Feb '20

commit 2cbfa9af167c34bf8a0251ae55321ed5b28e627d Author: teor <teor(a)torproject.org> Date: Fri Feb 14 13:05:00 2020 +1000 warnings: Also ignore duplicate IPv6Exit options Cleanup after Tor's 33280. --- tools/ignore.warnings | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/ignore.warnings b/tools/ignore.warnings index dc8ce96..872db6f 100644 --- a/tools/ignore.warnings +++ b/tools/ignore.warnings @@ -46,6 +46,7 @@ Not enough info to publish pending .* consensus # Necessary to make IPv4 and IPv6 exit templates work Option 'ExitPolicyRejectPrivate' used more than once Option 'ExitRelay' used more than once +Option 'IPv6Exit' used more than once # We ignore consensus failure warnings Received http status code 404 .* from server .* while fetching # Tor Bug 21525

1 0

[tor/master] mainloop: Explain local connections better
by teor＠torproject.org 14 Feb '20

14 Feb '20

commit 98899f20ad22e97c03235cfe13ff1fe416a15509 Author: teor <teor(a)torproject.org> Date: Fri Feb 14 10:13:00 2020 +1000 mainloop: Explain local connections better Some connections aren't counted for statistics or accounting, because they have been specifically configured by the user to local addresses. Comment-only change. Closes 33201. --- src/core/mainloop/connection.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c index 4a2dc21f1..48f31922d 100644 --- a/src/core/mainloop/connection.c +++ b/src/core/mainloop/connection.c @@ -3345,8 +3345,17 @@ record_num_bytes_transferred_impl(connection_t *conn, rep_hist_note_dir_bytes_written(num_written, now); } + /* Linked connections and internal IPs aren't counted for statistics or + * accounting: + * - counting linked connections would double-count BEGINDIR bytes, because + * they are sent as Dir bytes on the linked connection, and OR bytes on + * the OR connection; + * - relays and clients don't connect to internal IPs, unless specifically + * configured to do so. If they are configured that way, we don't count + * internal bytes. + */ if (!connection_is_rate_limited(conn)) - return; /* local IPs are free */ + return; if (conn->type == CONN_TYPE_OR) rep_hist_note_or_conn_bytes(conn->global_identifier, num_read,

1 0

[gettor/master] Remove completed gettor requests from database
by cohosh＠torproject.org 13 Feb '20

13 Feb '20

commit c2930fe339d0be0deceb4120e771bc4f24f28770 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Fri Jan 31 17:15:56 2020 -0500 Remove completed gettor requests from database This will remove gettor requests from the requests database when they are completed (rather than changing the status to 'SENT'). There's no need to keep this information around, and we don't want to store hashed email addresses as identifiers long term. --- gettor/services/email/sendmail.py | 10 ++++------ gettor/utils/db.py | 9 ++++----- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/gettor/services/email/sendmail.py b/gettor/services/email/sendmail.py index 8d895d7..3f4cfed 100644 --- a/gettor/services/email/sendmail.py +++ b/gettor/services/email/sendmail.py @@ -191,9 +191,8 @@ class Sendmail(object): service="email" ) - yield self.conn.update_request( - id=id, hid=hid.hexdigest(), status="SENT", - service="email", date=date + yield self.conn.remove_request( + id=id, service="email", date=date ) except SMTPError as e: @@ -245,9 +244,8 @@ class Sendmail(object): service="email" ) - yield self.conn.update_request( - id=id, hid=hid.hexdigest(), status="SENT", - service="email", date=date + yield self.conn.remove_request( + id=id, service="email", date=date ) except SMTPError as e: diff --git a/gettor/utils/db.py b/gettor/utils/db.py index 1ccdf8e..0ca11aa 100644 --- a/gettor/utils/db.py +++ b/gettor/utils/db.py @@ -72,15 +72,14 @@ class SQLite3(object): query, (id, service) ).addCallback(self.query_callback).addErrback(self.query_errback) - def update_request(self, id, hid, status, service, date): + def remove_request(self, id, service, date): """ - Update request record in the database + Removes completed request record from the database """ - query = "UPDATE requests SET id=?, status=? WHERE id=? AND "\ - "service=? AND date=?" + query = "DELETE FROM requests WHERE id=? AND service=? AND date=?" return self.dbpool.runQuery( - query, (hid, status, id, service, date) + query, (id, service, date) ).addCallback(self.query_callback).addErrback(self.query_errback) def update_stats(self, command, service, platform=None, language='en'):

1 0

[gettor/master] Removed unused imports
by cohosh＠torproject.org 13 Feb '20

13 Feb '20

commit 40589f08d69c392b0f4e9649995fdc1157d24997 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Fri Feb 7 17:07:11 2020 -0500 Removed unused imports --- gettor/parse/email.py | 2 -- gettor/parse/twitter.py | 1 - gettor/services/email/sendmail.py | 3 --- gettor/services/twitter/twitterdm.py | 1 - gettor/utils/blacklist.py | 2 -- gettor/utils/commons.py | 1 - gettor/utils/options.py | 2 -- gettor/utils/settings.py | 4 ---- gettor/utils/strings.py | 1 - gettor/web/http.py | 1 - 10 files changed, 18 deletions(-) diff --git a/gettor/parse/email.py b/gettor/parse/email.py index 874b1cd..9084cb7 100644 --- a/gettor/parse/email.py +++ b/gettor/parse/email.py @@ -24,10 +24,8 @@ from email.utils import parseaddr from twisted.python import log from twisted.internet import defer -from twisted.enterprise import adbapi from ..utils.db import SQLite3 -from ..utils import strings from ..utils import validate_email class AddressError(Exception): diff --git a/gettor/parse/twitter.py b/gettor/parse/twitter.py index 4f3ee9f..645bf47 100644 --- a/gettor/parse/twitter.py +++ b/gettor/parse/twitter.py @@ -21,7 +21,6 @@ import configparser from twisted.python import log from twisted.internet import defer -from twisted.enterprise import adbapi from ..utils.db import SQLite3 from ..utils import strings diff --git a/gettor/services/email/sendmail.py b/gettor/services/email/sendmail.py index 3f4cfed..9d97567 100644 --- a/gettor/services/email/sendmail.py +++ b/gettor/services/email/sendmail.py @@ -12,12 +12,9 @@ from __future__ import absolute_import -import gettext import hashlib import configparser -from email import encoders -from email import mime from email.mime.text import MIMEText from twisted.internet import defer diff --git a/gettor/services/twitter/twitterdm.py b/gettor/services/twitter/twitterdm.py index 629fa5f..5f143ca 100644 --- a/gettor/services/twitter/twitterdm.py +++ b/gettor/services/twitter/twitterdm.py @@ -12,7 +12,6 @@ from __future__ import absolute_import -import gettext import hashlib import json import time diff --git a/gettor/utils/blacklist.py b/gettor/utils/blacklist.py index 0223fc3..06ba55d 100644 --- a/gettor/utils/blacklist.py +++ b/gettor/utils/blacklist.py @@ -11,9 +11,7 @@ # :license: This is Free Software. See LICENSE for license information. import os -import time import logging -import sqlite3 import datetime import configparser diff --git a/gettor/utils/commons.py b/gettor/utils/commons.py index 212c4bb..b769efc 100644 --- a/gettor/utils/commons.py +++ b/gettor/utils/commons.py @@ -11,7 +11,6 @@ # :license: This is Free Software. See LICENSE for license information. from twisted.logger import Logger -from twisted.enterprise import adbapi from twisted.application import internet # Define an application logger diff --git a/gettor/utils/options.py b/gettor/utils/options.py index 6f8d693..0f3d4af 100644 --- a/gettor/utils/options.py +++ b/gettor/utils/options.py @@ -9,8 +9,6 @@ the Tor Browser. :license: see included LICENSE for information """ -import argparse - from .settings import Settings from . import strings diff --git a/gettor/utils/settings.py b/gettor/utils/settings.py index 4583b6a..68f2145 100644 --- a/gettor/utils/settings.py +++ b/gettor/utils/settings.py @@ -12,10 +12,6 @@ the Tor Browser. import json import os -import platform -import locale - -from twisted.python import log from . import strings diff --git a/gettor/utils/strings.py b/gettor/utils/strings.py index 1538fe4..2471ef5 100644 --- a/gettor/utils/strings.py +++ b/gettor/utils/strings.py @@ -11,7 +11,6 @@ the Tor Browser. """ import json -import locale import os import inspect diff --git a/gettor/web/http.py b/gettor/web/http.py index 067aef8..2801db0 100644 --- a/gettor/web/http.py +++ b/gettor/web/http.py @@ -20,7 +20,6 @@ import configparser from time import gmtime, strftime import core -import utils """ GetTor RESTful API

1 0

[gettor/master] Add tests for database functions
by cohosh＠torproject.org 13 Feb '20

13 Feb '20

commit 3d6fb34e712f97d646b7502e62f6b6aba8a5382c Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Mon Feb 10 09:52:48 2020 -0500 Add tests for database functions --- tests/test_db.py | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/tests/test_db.py b/tests/test_db.py new file mode 100644 index 0000000..d663d89 --- /dev/null +++ b/tests/test_db.py @@ -0,0 +1,67 @@ +#!/usr/bin/env python3 +import pytest +from datetime import datetime +from twisted.trial import unittest + +from . import conftests + +class DatabaseTests(unittest.TestCase): + + # Fail any tests which take longer than 15 seconds. + timeout = 15 + def setUp(self): + self.settings = conftests.options.parse_settings("en","tests/test.conf.json") + print(self.settings.get("dbname")) + self.db = conftests.SQLite3(self.settings.get("dbname")) + + def tearDown(self): + print("tearDown()") + + def add_dummy_requests(self, num): + now_str = datetime.now().strftime("%Y%m%d") + for i in (0, num): + self.db.new_request( + id='testid', + command='links', + platform='linux', + language='en', + service='email', + date=now_str, + status="ONHOLD", + ) + + def test_stored_locales(self): + locales = self.db.get_locales() + self.assertIn('en-US', locales) + + def test_requests(self): + now_str = datetime.now().strftime("%Y%m%d") + self.add_dummy_requests(2) + num = self.db.get_num_requests("testid", "email") + self.assertEqual(num, 2) + + requests = self.db.get_requests("ONHOLD", "links", "email") + for request in requests: + print(request) + self.assertEqual(request[1], "links") + self.assertEqual(request[4], "email") + self.assertEqual(request[5], now_str) + self.assertEqual(request[6], "ONHOLD") + self.assertEqual(len(requests), 2) + + self.db.remove_request("testid", "email", now_str) + num = self.db.get_num_requests("testid", "email") + self.assertEqual(num, 0) + + def test_links(self): + links = self.db.get_links("linux", "en-US", "ACTIVE") + self.assertEqual(len(links), 2) # Right now we have github and gitlab + + for link in links: + self.assertEqual(link[1], "linux") + self.assertEqual(link[2], "en-US") + self.assertEqual(link[6], "ACTIVE") + self.assertIn(link[5], ["github", "gitlab"]) + +if __name__ == "__main__": + unittest.main()

1 0