May 2019 - tor-commits - lists.torproject.org

[tor/master] sendme: Add non fatal asserts for extra safety
by nickm＠torproject.org 22 May '19

22 May '19

commit 0cad83bea4019b3c448756d718f5b65718e81f6e Author: David Goulet <dgoulet(a)torproject.org> Date: Wed May 22 11:05:36 2019 -0400 sendme: Add non fatal asserts for extra safety Two non fatal asserts are added in this commit. First one is to see if the SENDME digest list kept on the circuit for validation ever grows bigger than the maximum number of expected SENDME on a circuit (currently 10). The second one is to know if we ever send more than one … [View More]SENDME at a time on a circuit. In theory, we shouldn't but if we ever do, the v1 implementation wouldn't work because we only keep one single cell digest (the previous cell to the SENDME) on the circuit/cpath. Thus, sending two SENDME consecutively will lead to a mismatch on the other side because the same cell digest would be use and thus the circuit would collapse. Finally, add an extra debug log in case we emit a v0 which also includes the consensus emit version in that case. Part of #30428 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/core/or/sendme.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/core/or/sendme.c b/src/core/or/sendme.c index bfbb65e85..98ed63994 100644 --- a/src/core/or/sendme.c +++ b/src/core/or/sendme.c @@ -64,6 +64,13 @@ pop_first_cell_digest(const circuit_t *circ) return NULL; } + /* More cell digest than the SENDME window is never suppose to happen. The + * cell should have been rejected before reaching this point due to its + * package_window down to 0 leading to a circuit close. Scream loudly but + * still pop the element so we don't memory leak. */ + tor_assert_nonfatal(smartlist_len(circ->sendme_last_digests) <= + CIRCWINDOW_START_MAX / CIRCWINDOW_INCREMENT); + circ_digest = smartlist_get(circ->sendme_last_digests, 0); smartlist_del_keeporder(circ->sendme_last_digests, 0); return circ_digest; @@ -290,6 +297,8 @@ send_circuit_level_sendme(circuit_t *circ, crypt_path_t *layer_hint, default: /* Unknown version, fallback to version 0 meaning no payload. */ payload_len = 0; + log_debug(LD_PROTOCOL, "Emitting SENDME version 0 cell. " + "Consensus emit version is %d", emit_version); break; } @@ -408,6 +417,7 @@ sendme_connection_edge_consider_sending(edge_connection_t *conn) void sendme_circuit_consider_sending(circuit_t *circ, crypt_path_t *layer_hint) { + bool sent_one_sendme = false; const uint8_t *digest; while ((layer_hint ? layer_hint->deliver_window : circ->deliver_window) <= @@ -423,6 +433,12 @@ sendme_circuit_consider_sending(circuit_t *circ, crypt_path_t *layer_hint) if (send_circuit_level_sendme(circ, layer_hint, digest) < 0) { return; /* The circuit's closed, don't continue */ } + /* Current implementation is not suppose to send multiple SENDME at once + * because this means we would use the same relay crypto digest for each + * SENDME leading to a mismatch on the other side and the circuit to + * collapse. Scream loudly if it ever happens so we can address it. */ + tor_assert_nonfatal(!sent_one_sendme); + sent_one_sendme = true; } } [View Less]

1 0

[translation/torbutton-securitylevelproperties] Update translations for torbutton-securitylevelproperties
by translation＠torproject.org 22 May '19

22 May '19

commit 11246d338b0006348ab1cd492e88d996a140630b Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 22 15:49:51 2019 +0000 Update translations for torbutton-securitylevelproperties --- ar/securitylevel.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ar/securitylevel.properties b/ar/securitylevel.properties index a1abde200..482e6ca94 100644 --- a/ar/securitylevel.properties +++ b/ar/securitylevel.properties @@ -5,13 +5,13 @@… [View More]

1 0

[translation/torbutton-browseronboardingproperties] Update translations for torbutton-browseronboardingproperties
by translation＠torproject.org 22 May '19

22 May '19

commit b14f4136dc7cdb34b439f44062c6342b5016d062 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 22 15:49:40 2019 +0000 Update translations for torbutton-browseronboardingproperties --- ar/browserOnboarding.properties | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ar/browserOnboarding.properties b/ar/browserOnboarding.properties index 7a5f3cf0d..5754cc991 100644 --- a/ar/browserOnboarding.properties +++ b/ar/… [View More]browserOnboarding.properties @@ -5,7 +5,7 @@ onboarding.tour-tor-welcome=مرحباً onboarding.tour-tor-welcome.title=انت مستعد. onboarding.tour-tor-welcome.description=متصفح تور (Tor Browser) يوفر اعلى معايير الخصوصيه و اﻷمان اثناء تصفحك للويب. انت اﻷن محمي من التتبع , المراقبه, و الحجب. هذا المؤهل السريع سيعرض لك كيف يتم ذلك. -onboarding.tour-tor-welcome.next-button=Go to Privacy +onboarding.tour-tor-welcome.next-button=الانتقال إلى الخصوصية onboarding.tour-tor-privacy=الخصوصية onboarding.tour-tor-privacy.title=المتلصصون و اكلواسعة اﻹنترنت @@ -21,7 +21,7 @@ onboarding.tour-tor-circuit-display=عرض الدائرة onboarding.tour-tor-circuit-display.title=شاهد مسارك onboarding.tour-tor-circuit-display.description=لكل مجال تقوم بزيارته، يتم ترحيل حركة المرور الخاصة بك وتشفيرها في دائرة عبر ثلاثة مرحلات Tor حول العالم. لا يعرف أي موقع على الويب المكان الذي تتصل منه. يمكنك طلب دائرة جديدة بالنقر فوق "دائرة جديدة لهذا الموقع" على شاشة عرض الدوائر لدينا. onboarding.tour-tor-circuit-display.button=رؤية المسار الخاص بي -onboarding.tour-tor-circuit-display.next-button=Go to Security +onboarding.tour-tor-circuit-display.next-button=الانتقال إلى الأمان onboarding.tour-tor-security=الأمان onboarding.tour-tor-security.title=اختر مدى خبرتك @@ -34,7 +34,7 @@ onboarding.tour-tor-expect-differences=نصائح التجربة onboarding.tour-tor-expect-differences.title=توقع بعض التغيرات onboarding.tour-tor-expect-differences.description=مع جميع ميزات الأمان والخصوصية التي يوفرها Tor، قد تكون تجربتك أثناء تصفح الإنترنت مختلفة بعض الشيء. قد تكون الأشياء أبطأ قليلاً، واعتمادًا على مستوى الأمان، قد لا تعمل بعض العناصر أو يتم تحميلها. قد يُطلب منك أيضًا إثبات أنك إنسان وليس روبوت. onboarding.tour-tor-expect-differences.button=انظر 'الأسئلة المتكررة' -onboarding.tour-tor-expect-differences.next-button=Go to Onion Services +onboarding.tour-tor-expect-differences.next-button=الانتقال إلى خدمات البصلة onboarding.tour-tor-onion-services=خدمات البصلة (Onion) onboarding.tour-tor-onion-services.title=كن محميا بشكل اضافي @@ -42,14 +42,14 @@ onboarding.tour-tor-onion-services.description=خدمات البصل هي الم onboarding.tour-tor-onion-services.button=قم بزيارة بصلة onboarding.tour-tor-onion-services.next-button=انتهاء -onboarding.overlay-icon-tooltip-updated2=See what's new\nin %S +onboarding.overlay-icon-tooltip-updated2=للاطلاع على ما الجديد\nفي %S onboarding.tour-tor-update.prefix-new=جديد onboarding.tour-tor-update.prefix-updated=تحديث -onboarding.tour-tor-toolbar=Toolbar +onboarding.tour-tor-toolbar=شريط الأدوات onboarding.tour-tor-toolbar-update-8.5.title=Toolbar layout onboarding.tour-tor-toolbar-update-8.5.description=We improved the browser toolbar layout. We moved the Torbutton icon after the URL bar, and we added a security level icon next to it. -onboarding.tour-tor-toolbar-update-8.5.next-button=Go to Security +onboarding.tour-tor-toolbar-update-8.5.next-button=الانتقال إلى الأمان onboarding.tour-tor-security-update-8.5.title=Security level experience onboarding.tour-tor-security-update-8.5.description=We improved how you see and set your security level. We replaced the security slider with a toolbar icon that makes your current level visible at all times. Click it to view details about your current level or to change your security settings. [View Less]

1 0

[translation/tba-torbrowserstringsdtd] Update translations for tba-torbrowserstringsdtd
by translation＠torproject.org 22 May '19

22 May '19

commit c1806b74d37abc4c0878463f2f8accf6bc40889b Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 22 15:47:45 2019 +0000 Update translations for tba-torbrowserstringsdtd --- ar/torbrowser_strings.dtd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ar/torbrowser_strings.dtd b/ar/torbrowser_strings.dtd index 4fbd64c3a..c65047424 100644 --- a/ar/torbrowser_strings.dtd +++ b/ar/torbrowser_strings.dtd @@ -24,23 +24,23 @@ <!… [View More]ENTITY firstrun_onionservices_message "خدمات اونيون هي مواقع تنتهي ب .onion و التي تمنحك مزيد من الحمايه للناشرين و الزائرين. و تتضمن حمايه اضافيه ضد الرقابه. خدمات اونيون تمكن اي شخص من تقديم الخدمات و المحتوى بشكل مجهول"> <!ENTITY firstrun_onionservices_next "الذهاب لإستكشاف"> -<!ENTITY tor_bootstrap_swipe_for_logs "Swipe to the left to see Tor logs"> +<!ENTITY tor_bootstrap_swipe_for_logs "اسحب إلى اليمين لرؤية سجلات Tor"> <!ENTITY tor_bootstrap_connect "اتصل"> <!ENTITY tor_bootstrap_starting_status "جاري الاتصال بشبكة تور..."> <!ENTITY pref_tor_network_title "الشبكة"> <!ENTITY pref_tor_select_a_bridge_title "اختر جسرا"> -<!ENTITY pref_tor_provide_a_bridge_title "Provide a Bridge"> +<!ENTITY pref_tor_provide_a_bridge_title "أدخل عنوان جسرٍ"> <!ENTITY pref_category_tor_network_summary "متصفح تور (Tor Browser) يصلك بشبكه تور التي يتم تشغيلها بواسطة الاف المتطوعين حول العالم! هل يمكن أن تساعدك تلك الخيارات\؟"> <!ENTITY pref_category_tor_bridge_summary "Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others."> <!ENTITY pref_choice_tor_bridges_enabled_title "Internet is censored here"> -<!ENTITY pref_choice_tor_bridges_enabled_summary "Tap to configure a bridge to connect to Tor"> +<!ENTITY pref_choice_tor_bridges_enabled_summary "اضغط لضبط جسر اتصال بـ Tor"> <!ENTITY pref_tor_bridges_provide_manual_button_title "أدخل عنوان جسرٍ أعرفه"> <!ENTITY pref_tor_bridges_provide_select_text_title "اختر جسرا"> -<!ENTITY pref_tor_bridges_provide_manual_text_title "Enter Bridge"> +<!ENTITY pref_tor_bridges_provide_manual_text_title "ادخل جسرًا"> <!ENTITY pref_tor_bridges_provide_manual_summary "أدخل معلومات جسر من مصدر موثوق."> <!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "العنوان:المنفذ"> <!ENTITY pref_tor_hint_type_one_per_line "Type one per line"> @@ -54,6 +54,6 @@ <!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges."> <!ENTITY pref_tor_network_using_a_provided_bridge "You\'re using &formatS; bridge."> -<!ENTITY tor_notify_user_about_error "An error occurred, please swipe for more information."> +<!ENTITY tor_notify_user_about_error "حدث خطأ. يرجى سحب الشاشة للمزيد من المعلومات."> <!ENTITY sync_not_supported "Sync is not currently supported in Tor Browser on Android"> [View Less]

1 0

[gettor/master] Fix typo in script
by hiro＠torproject.org 22 May '19

22 May '19

commit 9a1dfc44af1e7bbacc9c804f5764046af2420519 Author: hiro <hiro(a)torproject.org> Date: Wed May 22 17:46:53 2019 +0200 Fix typo in script --- scripts/add_lins_to_db | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/add_lins_to_db b/scripts/add_lins_to_db index b979498..ba0ce67 100755 --- a/scripts/add_lins_to_db +++ b/scripts/add_lins_to_db @@ -103,7 +103,7 @@ def main(): release_link = releases.get(k).replace("en-US", l) … [View More]

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 22 May '19

22 May '19

commit f8851bdb5355a4439a678da9826ac77a0136144b Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 22 15:46:43 2019 +0000 Update translations for tails-misc_completed --- fr.po | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/fr.po b/fr.po index 4ee4b42ae..2cf374777 100644 --- a/fr.po +++ b/fr.po @@ -30,9 +30,9 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" -… [View More]"POT-Creation-Date: 2019-05-18 08:53+0200\n" -"PO-Revision-Date: 2019-05-19 08:58+0000\n" -"Last-Translator: Curtis Baltimore <curtisbaltimore(a)protonmail.com>\n" +"POT-Creation-Date: 2019-05-18 19:31+0200\n" +"PO-Revision-Date: 2019-05-22 15:35+0000\n" +"Last-Translator: AO <ao(a)localizationlab.org>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -663,6 +663,11 @@ msgstr "Aucun conteneur de fichiers n’a été ajouté" msgid "No VeraCrypt devices detected" msgstr "Aucun périphérique VeraCrypt n’a été détecté" +#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:40 +#: ../config/chroot_local-includes/usr/share/applications/unlock-veracrypt-volumes.desktop.in.h:1 +msgid "Unlock VeraCrypt Volumes" +msgstr "Déverrouillage des volumes VeraCrypt" + #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:114 msgid "Container already added" msgstr "Le conteneur a déjà été ajouté" @@ -746,10 +751,6 @@ msgstr "Naviguer sur le Web sans anonymat" msgid "Unsafe Web Browser" msgstr "Navigateur Web non sécurisé" -#: ../config/chroot_local-includes/usr/share/applications/unlock-veracrypt-volumes.desktop.in.h:1 -msgid "Unlock VeraCrypt Volumes" -msgstr "Déverrouillage des volumes VeraCrypt" - #: ../config/chroot_local-includes/usr/share/applications/unlock-veracrypt-volumes.desktop.in.h:2 msgid "Mount VeraCrypt encrypted file containers and devices" msgstr "Monter des conteneurs de fichiers et des périphériques chiffrés avec VeraCrypt" @@ -782,33 +783,41 @@ msgid "" " ($(command_line))" msgstr "L’authentification est exigée pour supprimer un paquet de vos logiciels supplémentaires ($(command_line))" -#: ../config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/main.ui.in:61 +#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61 msgid "File Containers" msgstr "Conteneurs de fichiers" -#: ../config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/main.ui.in:80 +#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:80 msgid "_Add" msgstr "_Ajouter" -#: ../config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/main.ui.in:86 +#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:86 msgid "Add a file container" msgstr "Ajouter un conteneur de fichiers" -#: ../config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/main.ui.in:103 +#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:103 msgid "Partitions and Drives" msgstr "Partitions et disques" -#: ../config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/main.ui.in:121 +#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:121 msgid "" "This application is not affiliated with or endorsed by the VeraCrypt project" " or IDRIX." msgstr "Cette application n’est ni affiliée avec le projet VeraCrypt ou IDRIX ni sanctionnée par ces derniers." -#: ../config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/volume.ui.in:38 +#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:29 +msgid "_Open" +msgstr "_Ouvrir" + +#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:38 msgid "Lock this volume" msgstr "Verrouiller ce volume" -#: ../config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/volume.ui.in:61 +#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:52 +msgid "_Unlock" +msgstr "_Déverrouiller" + +#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:61 msgid "Detach this volume" msgstr "Détacher ce volume" [View Less]

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 22 May '19

22 May '19

commit c5c6e7fa2cf3f35b405f9acbff34fb29df8c4e8e Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 22 15:46:36 2019 +0000 Update translations for tails-misc --- fr.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fr.po b/fr.po index 32dbc5c44..2cf374777 100644 --- a/fr.po +++ b/fr.po @@ -31,8 +31,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-05-18 19:31+0200\n" -"PO-… [View More]

1 0

[gettor/master] Update email strings
by hiro＠torproject.org 22 May '19

22 May '19

commit f298d62476bf2995c3c448dfa402e906e9665184 Author: hiro <hiro(a)torproject.org> Date: Wed May 22 14:58:36 2019 +0200 Update email strings --- share/locale/en.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/share/locale/en.json b/share/locale/en.json index 2b735c0..3006c7c 100644 --- a/share/locale/en.json +++ b/share/locale/en.json @@ -1,8 +1,8 @@ { - "links_body": "You requested Tor Browser for {}.\n \nYou will need only one of the … [View More]links below to download the bundle. If a link does not work for you, try the next one.\n \n{}\n \n \n--\nGetTor", + "links_body": "You requested Tor Browser for {}.\n\nYou will need only one of the links below to download the bundle. If a link does not work for you, try the next one.\n\n{}\n\n \n--\nGetTor", "links_subject": "[GetTor] Links for your request", - "help_body": "GetTor Help Test. Please be kind.", - "help_subject": "GetTor Help Email Test", + "help_body": "This is how you can request a tor browser bundle link.\n\n Send an email to: gettor(a)torproject.org\n\nIn the body of the email only write: <operating system> <language>.\n\nWe only support windows, osx and linux as operating systems.\n\nAt the moment please only use en as language.\n\n", + "help_subject": "[GetTor] Help Email", "help_debug": "Log application errors to stdout", "help_config": "Custom config file location (optional)", "smtp_links_subject": "[GetTor] Links for your request", @@ -10,7 +10,7 @@ "smtp_help_subject": "[GetTor] Help", "smtp_unsupported_locale_subject": "[GetTor] Unsupported locale", "smtp_unsupported_locale_msg": "The locale you requested '{}' is not supported.", - "smtp_vlinks_msg": "You requested Tor Browser for {}.\n \nYou will need only one of the links below to download the bundle. If a link does not work for you, try the next one.\n \n{}\n \n \n--\nGetTor", - "smtp_mirrors_msg": "Hi! this is the GetTor robot.\n \nThank you for your request. Attached to this email you will find\nan updated list of mirrors of Tor Project's website.", - "smtp_help_msg": "Hi! This is the GetTor robot. I am here to help you download the\nlatest version of Tor Browser.\n \nPlease reply to this message with one of the options below:\n \nwindows\nlinux\nosx\nmirrors\n \nI will then send you the download instructions.\n \nIf you are unsure, just send a blank reply to this message." + "smtp_vlinks_msg": "You requested Tor Browser for {}.\n\nYou will need only one of the links below to download the bundle. If a link does not work for you, try the next one.\n\n{}\n\n \n--\nGetTor", + "smtp_mirrors_msg": "Hi! this is the GetTor robot.\n\nThank you for your request. Attached to this email you will find\nan updated list of mirrors of Tor Project's website.", + "smtp_help_msg": "Hi! This is the GetTor robot. I am here to help you download the\nlatest version of Tor Browser.\n\nPlease reply to this message with one of the options below:\n\nwindows\nlinux\nosx\nmirrors\n\nI will then send you the download instructions.\n\nIf you are unsure, just send a blank reply to this message." } [View Less]

1 0

[gettor/master] Update add_links_to_db script
by hiro＠torproject.org 22 May '19

22 May '19

commit d630e7a62e8207b0266535b3de0d15cfe9177595 Author: hiro <hiro(a)torproject.org> Date: Wed May 22 15:13:28 2019 +0200 Update add_links_to_db script --- scripts/add_lins_to_db | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/add_lins_to_db b/scripts/add_lins_to_db index 3b194af..55fe127 100755 --- a/scripts/add_lins_to_db +++ b/scripts/add_lins_to_db @@ -55,7 +55,7 @@ def main(): webFile = request.urlopen("https://www.torproject.org/projects/… [View More]

1 0

[gettor/master] Update db scripts and updates
by hiro＠torproject.org 22 May '19

22 May '19

commit bef9ab4e44e7c3f4d9239712089014649799327f Author: hiro <hiro(a)torproject.org> Date: Wed May 22 17:40:23 2019 +0200 Update db scripts and updates --- gettor/parse/email.py | 1 + gettor/services/email/sendmail.py | 2 +- gettor/utils/db.py | 4 ++-- scripts/add_lins_to_db | 2 +- scripts/create_db | 16 ++++++++-------- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/gettor/parse/email.py b/gettor/… [View More]parse/email.py index d79a375..6518946 100644 --- a/gettor/parse/email.py +++ b/gettor/parse/email.py @@ -209,6 +209,7 @@ class EmailParser(object): id=request['id'], command=request['command'], platform=request['platform'], + language=request['language'], service=request['service'], date=now_str, status="ONHOLD", diff --git a/gettor/services/email/sendmail.py b/gettor/services/email/sendmail.py index f18b335..a350909 100644 --- a/gettor/services/email/sendmail.py +++ b/gettor/services/email/sendmail.py @@ -164,7 +164,7 @@ class Sendmail(object): log.info("Getting links for {}.".format(platform)) links = yield self.conn.get_links( - platform=platform, status="ACTIVE" + platform=platform, language=language, status="ACTIVE" ) # build message diff --git a/gettor/utils/db.py b/gettor/utils/db.py index 99ae081..8d65f45 100644 --- a/gettor/utils/db.py +++ b/gettor/utils/db.py @@ -41,14 +41,14 @@ class SQLite3(object): log.msg("Database error: {}".format(error)) return None - def new_request(self, id, command, service, platform, date, status): + def new_request(self, id, command, service, platform, language, date, status): """ Perform a new request to the database """ query = "INSERT INTO requests VALUES(?, ?, ?, ?, ?, ?)" return self.dbpool.runQuery( - query, (id, command, platform, service, date, status) + query, (id, command, platform, language, service, date, status) ).addCallback(self.query_callback).addErrback(self.query_errback) def get_requests(self, status, command, service): diff --git a/scripts/add_lins_to_db b/scripts/add_lins_to_db index e8e89f2..b979498 100755 --- a/scripts/add_lins_to_db +++ b/scripts/add_lins_to_db @@ -102,7 +102,7 @@ def main(): for l in languages: release_link = releases.get(k).replace("en-US", l) c.execute( - "INSERT INTO links(link, platform, arch, version, provider, status)" + "INSERT INTO links(link, platform, language, arch, version, provider, status)" "VALUES ('%s', '%s', '64', '%s', '%s', 'ACTIVE')" %(providers.get(p) + release_link, k, version, p)) diff --git a/scripts/create_db b/scripts/create_db index d332c27..7f8cc11 100755 --- a/scripts/create_db +++ b/scripts/create_db @@ -83,15 +83,15 @@ def main(): c.execute("DROP TABLE IF EXISTS stats") c.execute( "CREATE TABLE requests(id TEXT, command TEXT, platform TEXT," - " service TEXT, date TEXT, status TEXT)" + " language TEXT, service TEXT, date TEXT, status TEXT)" ) c.execute( - "CREATE TABLE links(link TEXT, platform TEXT, arch TEXT," - " version TEXT, provider TEXT, status TEXT)" + "CREATE TABLE links(link TEXT, platform TEXT, language TEXT," + " arch TEXT, version TEXT, provider TEXT, status TEXT)" ) c.execute( - "CREATE TABLE stats(num_requests NUMBER, platform TEXT, " - "command TEXT, service TEXT, date TEXT)" + "CREATE TABLE stats(num_requests NUMBER, platform TEXT," + " language TEXT, command TEXT, service TEXT, date TEXT)" ) print("Database {} created.".format(abs_filename)) elif args.clear: @@ -116,17 +116,17 @@ def main(): c.execute("DROP TABLE IF EXISTS stats") c.execute( "CREATE TABLE requests(id TEXT, command TEXT, " - "platform TEXT, service TEXT, date TEXT, status TEXT," + "platform TEXT, language TEXT, service TEXT, date TEXT, status TEXT," "PRIMARY KEY(id, date))" ) c.execute( - "CREATE TABLE links(link TEXT, platform TEXT, " + "CREATE TABLE links(link TEXT, platform TEXT, language TEXT," "arch TEXT, version TEXT, provider TEXT, status TEXT," "PRIMARY KEY(platform, arch, version, provider, status))" ) c.execute( "CREATE TABLE stats(date TEXT PRIMARY KEY, " - "num_requests INTEGER, platform TEXT, command TEXT, " + "num_requests INTEGER, platform TEXT, language TEXT, command TEXT, " "service TEXT)" ) print("New database {} created.".format(abs_filename)) [View Less]

1 0