December 2016 - tor-commits - lists.torproject.org

[translation/tails-greeter-2_completed] Update translations for tails-greeter-2_completed
by translation＠torproject.org 14 Dec '16

14 Dec '16

commit 4e2c18a678770d2ca865333dc4e6a2a96ef9d102 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 14 19:18:18 2016 +0000 Update translations for tails-greeter-2_completed --- de/de.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/de/de.po b/de/de.po index b8289a4..500bc73 100644 --- a/de/de.po +++ b/de/de.po @@ -65,7 +65,7 @@ msgstr "" #. This string will never be displayed in the 1st version of the greeter. #: ../data/greeter.ui.h:12 msgid "Microsoft Windows 10 camouflage" -msgstr "Microsoft Windows 10-Tarnung" +msgstr "Microsoft-Windows-10-Tarnung" #: ../data/greeter.ui.h:13 msgid "MAC Address Spoofing" @@ -193,7 +193,7 @@ msgstr "Direkt mit dem Tor-Netzwerk verbinden (Vorgabe)" #: ../data/greeter.ui.h:39 msgid "Configure a Tor bridge, firewall, or proxy settings" msgstr "" -"Eine Tor Brücke, Firewall der Vermittlungsservereinstellungen (Proxy) " +"Eine Tor-Brücke, Firewall der Vermittlungsservereinstellungen (Proxy) " "konfigurieren." #: ../data/greeter.ui.h:40 @@ -207,7 +207,7 @@ msgid "" msgstr "" "Die Standardeinstellungen sind in den meisten Situationen sicher. Um " "benutzerdefinierte Einstellungen vorzunehmen, drücken Sie unten auf die " -"Schaltfläche \"+\"." +"Schaltfläche »+«." #: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:717 msgid "Off (default)" @@ -247,14 +247,14 @@ msgstr "Zurück" #: ../tailsgreeter/gui.py:652 msgid "Unlocking…" -msgstr "Wird entsperrt…" +msgstr "Wird entsperrt …" #: ../tailsgreeter/gui.py:680 msgid "" "You will configure the Tor bridge and local proxy later on after connecting " "to a network." msgstr "" -"Die Tor Brücke und den lokalen Vermittlungsserver (Proxy) später nach dem " +"Die Tor-Brücke und den lokalen Vermittlungsserver (Proxy) später nach dem " "Verbinden mit dem Netzwerk konfigurieren." #: ../tailsgreeter/gui.py:720

1 0

[translation/tails-greeter-2] Update translations for tails-greeter-2
by translation＠torproject.org 14 Dec '16

14 Dec '16

commit 8a3354eab9346f6b10a34499478d4187a5d204c7 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 14 19:18:15 2016 +0000 Update translations for tails-greeter-2 --- de/de.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/de/de.po b/de/de.po index b8289a4..500bc73 100644 --- a/de/de.po +++ b/de/de.po @@ -65,7 +65,7 @@ msgstr "" #. This string will never be displayed in the 1st version of the greeter. #: ../data/greeter.ui.h:12 msgid "Microsoft Windows 10 camouflage" -msgstr "Microsoft Windows 10-Tarnung" +msgstr "Microsoft-Windows-10-Tarnung" #: ../data/greeter.ui.h:13 msgid "MAC Address Spoofing" @@ -193,7 +193,7 @@ msgstr "Direkt mit dem Tor-Netzwerk verbinden (Vorgabe)" #: ../data/greeter.ui.h:39 msgid "Configure a Tor bridge, firewall, or proxy settings" msgstr "" -"Eine Tor Brücke, Firewall der Vermittlungsservereinstellungen (Proxy) " +"Eine Tor-Brücke, Firewall der Vermittlungsservereinstellungen (Proxy) " "konfigurieren." #: ../data/greeter.ui.h:40 @@ -207,7 +207,7 @@ msgid "" msgstr "" "Die Standardeinstellungen sind in den meisten Situationen sicher. Um " "benutzerdefinierte Einstellungen vorzunehmen, drücken Sie unten auf die " -"Schaltfläche \"+\"." +"Schaltfläche »+«." #: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:717 msgid "Off (default)" @@ -247,14 +247,14 @@ msgstr "Zurück" #: ../tailsgreeter/gui.py:652 msgid "Unlocking…" -msgstr "Wird entsperrt…" +msgstr "Wird entsperrt …" #: ../tailsgreeter/gui.py:680 msgid "" "You will configure the Tor bridge and local proxy later on after connecting " "to a network." msgstr "" -"Die Tor Brücke und den lokalen Vermittlungsserver (Proxy) später nach dem " +"Die Tor-Brücke und den lokalen Vermittlungsserver (Proxy) später nach dem " "Verbinden mit dem Netzwerk konfigurieren." #: ../tailsgreeter/gui.py:720

1 0

[translation/torbutton-abouttorproperties_completed] Update translations for torbutton-abouttorproperties_completed
by translation＠torproject.org 14 Dec '16

14 Dec '16

commit 695ff419c37c791bd376d7fd5b377a464b8d294d Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 14 19:17:13 2016 +0000 Update translations for torbutton-abouttorproperties_completed --- de/abouttor.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/abouttor.properties b/de/abouttor.properties index b5b2fd3..3c47ca8 100644 --- a/de/abouttor.properties +++ b/de/abouttor.properties @@ -16,7 +16,7 @@ aboutTor.searchDC.search.link=https://search.disconnect.me/ aboutTor.donationBanner.donate=Bitte spenden Sie! aboutTor.donationBanner.heart=Tor ist am Herz der Internetfreiheit -aboutTor.donationBanner.tagline1=Millionen von Menschen verlassen sich auf Tor für Online-Sicherheit & Datenschutz +aboutTor.donationBanner.tagline1=Millionen von Menschen verlassen sich auf Tor für Sicherheit & Datenschutz im Netz aboutTor.donationBanner.tagline2=Ein Netzwerk von Menschen, die Menschen schützen aboutTor.donationBanner.tagline3=Überwachung = Unterdrückung aboutTor.donationBanner.tagline4=Schutz von Journalisten, Aktivisten und Hinweisgebern seit 2006

1 0

[translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties
by translation＠torproject.org 14 Dec '16

14 Dec '16

commit 3768a0e86f8be0253548adbc11cb4a4053be581f Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 14 19:17:08 2016 +0000 Update translations for torbutton-abouttorproperties --- de/abouttor.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/abouttor.properties b/de/abouttor.properties index b5b2fd3..3c47ca8 100644 --- a/de/abouttor.properties +++ b/de/abouttor.properties @@ -16,7 +16,7 @@ aboutTor.searchDC.search.link=https://search.disconnect.me/ aboutTor.donationBanner.donate=Bitte spenden Sie! aboutTor.donationBanner.heart=Tor ist am Herz der Internetfreiheit -aboutTor.donationBanner.tagline1=Millionen von Menschen verlassen sich auf Tor für Online-Sicherheit & Datenschutz +aboutTor.donationBanner.tagline1=Millionen von Menschen verlassen sich auf Tor für Sicherheit & Datenschutz im Netz aboutTor.donationBanner.tagline2=Ein Netzwerk von Menschen, die Menschen schützen aboutTor.donationBanner.tagline3=Überwachung = Unterdrückung aboutTor.donationBanner.tagline4=Schutz von Journalisten, Aktivisten und Hinweisgebern seit 2006

1 0

[tor-ramdisk/master] Bumps for amd64 and x86
by blueness＠torproject.org 14 Dec '16

14 Dec '16

commit 81276b28eb5872ba318c628348d4dc1b416efc56 Author: Anthony G. Basile <blueness(a)gentoo.org> Date: Wed Dec 14 12:57:46 2016 -0500 Bumps for amd64 and x86 tor-0.2.8.11 --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 52f593e..2aa48e0 100755 --- a/build.sh +++ b/build.sh @@ -1,6 +1,6 @@ #!/bin/bash -TOR=tor-0.2.8.10 +TOR=tor-0.2.8.11 BUSYBOX=busybox-1.25.1 NTPD=openntpd-6.0p1 OPENSSH=openssh-7.3p1

1 0

[trac-email/master] Add quick fix to else case
by hiro＠torproject.org 14 Dec '16

14 Dec '16

commit ebce28f2f7bdaf3933550aed8d3852487034bef1 Author: hiromipaw <hiro(a)torproject.org> Date: Wed Dec 14 15:37:46 2016 +0100 Add quick fix to else case --- notify.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/notify.py b/notify.py index cf0bae0..0ae60b7 100755 --- a/notify.py +++ b/notify.py @@ -22,7 +22,9 @@ def verify_email_signature(message, user): k = row[0] u = row[1].strip() if k == verified.fingerprint and u == user: - return verified + return True + else: + return False def get_message_body(message): if message.is_multipart():

1 0

[trac-email/master] Polish script
by hiro＠torproject.org 14 Dec '16

14 Dec '16

commit d3ce4bca377b5f6a06173e1bbc8176752112f832 Author: hiromipaw <hiro(a)torproject.org> Date: Wed Dec 14 15:34:46 2016 +0100 Polish script --- notify.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/notify.py b/notify.py index 5d8f886..cf0bae0 100755 --- a/notify.py +++ b/notify.py @@ -14,14 +14,15 @@ def read_message(): def verify_email_signature(message, user): gpg = gnupg.GPG(gnupghome='/home/tracadm/.gnupg') verified = gpg.verify(message) - if verified.trust_level is not None and verified.trust_level >= verified.TRUST_UNDEFINED: + + if verified.trust_level is not None and verified.trust_level >= 0 and verified.key_status is None: with open('/home/tracadm/bin/map', 'rb') as csvfile: keysreader = csv.reader(csvfile, delimiter=' ') for row in keysreader: k = row[0] u = row[1].strip() if k == verified.fingerprint and u == user: - return True + return verified def get_message_body(message): if message.is_multipart(): @@ -86,13 +87,16 @@ with open('/home/tracadm/log/test.log', 'w') as f: user = msg['From'].split('@')[0] verified = verify_email_signature(msg.as_string(), user) + if verified: + f.write('GPG verified\n') + # Find or create ticket - f.write('GPG verified') tkt = find_or_create_ticket(msg, env) + if tkt: f.write(str(tkt)) else: - f.write('Could not create Ticket. I should send an email back I suppose') + f.write('Could not create Ticket. I should send an email back I suppose \n') else: - f.write('Could not verify GPG. I should send an email back I suppose') + f.write('Could not verify GPG. I should send an email back I suppose \n')

1 0

[trac-email/master] Cleaning up script and improving gnupg management
by hiro＠torproject.org 14 Dec '16

14 Dec '16

commit 853db909039a1c4851ebdaf78f89bf3e4ce2efa2 Author: hiromipaw <hiro(a)torproject.org> Date: Tue Dec 13 18:22:48 2016 +0100 Cleaning up script and improving gnupg management --- notify.py | 79 +++++++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 49 insertions(+), 30 deletions(-) diff --git a/notify.py b/notify.py index 189ca12..5d8f886 100755 --- a/notify.py +++ b/notify.py @@ -2,6 +2,7 @@ import sys import email import re import gnupg +import csv from trac.env import Environment from trac.ticket.model import Ticket from trac.perm import IPermissionRequestor, PermissionCache, PermissionSystem @@ -10,37 +11,50 @@ def read_message(): full_msg = sys.stdin.read() return email.message_from_string("".join(full_msg)) -def verify_email_signature(message): +def verify_email_signature(message, user): gpg = gnupg.GPG(gnupghome='/home/tracadm/.gnupg') - return gpg.verify(message) + verified = gpg.verify(message) + if verified.trust_level is not None and verified.trust_level >= verified.TRUST_UNDEFINED: + with open('/home/tracadm/bin/map', 'rb') as csvfile: + keysreader = csv.reader(csvfile, delimiter=' ') + for row in keysreader: + k = row[0] + u = row[1].strip() + if k == verified.fingerprint and u == user: + return True def get_message_body(message): - body = "" if message.is_multipart(): + body = '' for payload in message.get_payload(): - body.join(payload.get_payload()) - else: - body.join(message.get_payload()) + body = body.join(payload.get_payload()) + return body.split('-----BEGIN PGP SIGNATURE-----')[0] - return body + else: + return message.get_payload().split('-----BEGIN PGP SIGNATURE-----')[0] def verify_user_permissions(env, user, permission): ps = PermissionSystem(env) permissions_list = ps.get_user_permissions(user) return permissions_list[permission] -def find_or_create_ticket(message, body, env): +def find_or_create_ticket(message, env): # Find the ticket ID if exists summary = message['Subject'] ticket_id = re.search('#(.+?) ', summary) + # Get the message body + body = ''.join(get_message_body(message)) reporter = message['From'] if ticket_id: t_id = ticket_id.group(1) tkt = Ticket(env, int(t_id)) if verify_user_permissions(env, reporter, 'TICKET_MODIFY'): - tkt.save_changes(comment=body) + if tkt.save_changes(comment=body): + return tkt + else: + return False else: if verify_user_permissions(env, reporter, 'TICKET_CREATE'): summary = message['Subject'] @@ -54,26 +68,31 @@ def find_or_create_ticket(message, body, env): tkt['description'] = body tkt['status'] = 'new' tkt['priority'] = 'medium' - tkt.insert() + if tkt.insert(): + return tkt + else: + return False # Open logs file -f = open('/home/tracadm/log/test.log', 'w') - -# Define the current trac environment -env = Environment('/current') - -# Build email message -msg = read_message() - -# Get the message body -body = msg.get_payload() - -verified = verify_email_signature(body) - -if verified.trust_level is not None and verified.trust_level >= verified.TRUST_FULLY: - - # Find or create ticket - find_or_create_ticket(msg, body, env) - -# Close log file -f.close +with open('/home/tracadm/log/test.log', 'w') as f: + + # Define the current trac environment + env = Environment('/current') + + # Build email message + msg = read_message() + + # Read user from email + user = msg['From'].split('@')[0] + + verified = verify_email_signature(msg.as_string(), user) + if verified: + # Find or create ticket + f.write('GPG verified') + tkt = find_or_create_ticket(msg, env) + if tkt: + f.write(str(tkt)) + else: + f.write('Could not create Ticket. I should send an email back I suppose') + else: + f.write('Could not verify GPG. I should send an email back I suppose')

1 0

[trac-email/master] Merge branch 'master' of ssh://git-rw.torproject.org/admin/trac/trac-email
by hiro＠torproject.org 14 Dec '16

14 Dec '16

commit 0981c44b54f35ee673af698b02963b277493c096 Merge: 853db90 0e500de Author: hiromipaw <hiro(a)torproject.org> Date: Wed Dec 14 15:30:49 2016 +0100 Merge branch 'master' of ssh://git-rw.torproject.org/admin/trac/trac-email map | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+)

1 0

[trac-email/master] Remove not necessary file
by hiro＠torproject.org 14 Dec '16

14 Dec '16

commit 7b0416e2a9c83868a5fcf3e43dbb38787bfba933 Author: hiromipaw <hiro(a)torproject.org> Date: Wed Dec 14 15:31:40 2016 +0100 Remove not necessary file --- map | 76 --------------------------------------------------------------------- 1 file changed, 76 deletions(-) diff --git a/map b/map deleted file mode 100755 index 25dee15..0000000 --- a/map +++ /dev/null @@ -1,76 +0,0 @@ -25FC1614B8F87B52FF2F99B962AF4031C82E0039 weasel -B1172656DFF983C3042BC699EB5A896A28988BF5 arma -B35BF85BF19489D04E28C33C21194EBB165733EA nickm -6D3111D4E0313392FE8BEDD40800D6BBDF3DCEE6 sebastian -0CC8157C2578EEE92B0745D64EFD4FDC3F46D41E karsten -C963C21D63564E2B10BB335B29846B3C683686CC mikeperry -7473902BD5CE11AD85E6FF4B7220E0935E2A64A6 sjm217 -8738A680B84B3031A630F2DB416F061063FEE659 erinn -8C4CD511095E982EB0EFBFA21E8BF34923291265 linus -8B73B5C337F84D208FF7B08BE15FE5C8792FB138 runa -68278CC5DD2D1E85C4E45AD90445B7AB9ABBEEC6 atagar -30BF6A782013DCFA5985E2559D314A9A757465BC pde -FD9A6AA28193A9F03D4BF4ADC11B36DC9C7DD150 schoen -13C81580203AE18BB7C0424E09CC7F5315F271D9 asn -F808881CCDEE45FD37E968969768FD3CC48815F2 jvoisin -FB5D71D53650DE057267186385E9B0FB288D35CE n8fr8 -AD1AB35C674DF572FBCE8B0A6BC758CBC11F6276 dcf -46E5EF37DE264EA68DCF53EAE3A21297150FE210 art -91D43A5B1016CEB6D35265AE2C4B239DD876C9F6 aagbsn -A6C7B88B9583046A11C5403E0B00FB6CEBE2D002 dererk -0A6A58A14B5946ABDE18E207A3ADB67A2CDB8B35 isis -4263006A4506740FAD871430BAEBA2D7456CAD51 wseltzer -B59378C9DDEB2DFE2E29FF59D1D8B7B16BFEF7CE andrea -B181A46C9A32C67811871EE65000F2608D62BB1E hiviah -B369E7A218FECEADEB968C73CF7089E3D7FDC0D0 phw -5AE307277236D446F0DCBB8B08FD25A82EE24BFF dtauerbach -E4ACD3975427A5BA8450A1BEB01C8B006DA77FAA sukhbir -F711FA29D61F88CE6879BAD0D91A345E56B01B25 brade -2602B0DD0EB238CCE037196A0E36124F8E990F6E mcs -0603CCFD91865C17E88D4C798382C95C29023DF9 lunar -5C17616361BD9F92422AC08BB4D25A1E99999697 micah -1FEDFAD9D82C52A53BABDC799384FA6EF52D4BBA blueness -4797E7E1069D84AC4040797A5E3A93B4D4DDCD8B arlo -CE1782624600EE98764C6D9CCB8FC772D1AA1D30 sysrqb -8EDB1FD7C431791768C1C5BB34F31DCDDF3E7BB8 vmon -A405E58AB3725B396ED1B85C1318EFAC5FBBDBCE infinity0 -726824BE9D8D5CF009C5F039FF9D1C57779FB883 colin -35CD74C24A9B15A19E1A81A194373AA94B7C3223 gk -C9B8CAC3318B9A9E488359612067001B1B678A63 boklm -BDE7D5083BB35EDC7A66BD97388CE229FAC78CF7 yan -B74417EDDF22AC9F9E90F49142E86A2A11F48D36 dgoulet -879BDA5BF6B27B6127450A2503CF4A0AB3C79A63 griffin -E745A4CC726A94229B2B2DEE58C4B928A3E218F6 nima -06EA89416961993CC56ABADADC946AF05D9742E7 nickhopper -9EB1A490C73CC5D44DFB3E47BFBD1C7B8A6EC81A yawning -309EBFBA9218CBA7EE53F6F8BEDFC9BE6510B8E9 huseby -503192278D46F1EF2F3825AC815D488692B85107 pepijn -3459F9589F592CADCB07B4A384D8CC2ACB9DECA3 al -556DD043A29D0C4373872126D52512191CA14FA7 eyv -60D85B8D9A1CD2D1355EBE9F65B3F094EA3E4D61 qbi -4777535FE5471562626077B58CBF9A322861A790 hacim -8ACD146EA94CEB12E4EA691566A109189B79658F tom -E3E238BB9AE1D0226B400CAD3CBF8C99F1FAF31D jsha -53927C25AAF14FBBCAFABDA3A456E2CE540BFC0E ilv -D53C3CA4A351BB2519B13E48F6FB25C32656DE20 gacar -EFB18323F05613717A7CFB6993C1C1760B47D56D sina -8F2AF9B6D4A14D03FDF1B2983224499415064C7B isabela -20B24CEFE6AFD6150B6A6F18D752F538C0D38C3A arthuredelstein -7C91C7C864A1CA45350E026ECD3AAD80EBBEF554 kate -4961E37F7CD50B0363E8DB24B9BF49229DB63524 amoghbl1 -9032CAE4CBFA933A5A2145D5FF97C53F183C045D special -7DE3CA8649E4A77CC2CA6CDC65791E7E0DB60F11 andz -2DA81D01455C3A0032198850F305447AF806D46B juga -2ACA8DD4444E358FB72E8C3C7196690D9E03CDFD cristobal -128228D61284595570B280FAAD97364FC20BEC80 kernelcorn -28BC839890D4599EC00FD544FB16E10EC13C40E5 serene -9C64F9DA7A501361533ECA8A325DAA60 usura -977A04EC512A9D0DB4A56E0ECDCAE8ED6842C592 legind -FBF0E7DB1433018EE52D0DDA9FC34089CBE83CA3 alison -B788B36768B69B4DD8E1F69E75256C22E303259C iwakeh -C8556CED5D90A0C529F64D43450CBA7F968F094B teor -A8F7BA5041E133339CBA169676D58093F540ABCD irl -FA0AC9BE2881B3479F4FC0D7BE70F8265ED28FA2 linda -4F95A91F7B3487230BC9CCF5B5FB9E3E3661A436 peterh -E7CC8108A3A5285B84F3EC1714F617266D4EEB80 bwheeler -6864C734AD972957FE938866A38425F1767BB67C hiro

1 0