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

[stem/master] Add timezone to parsed datetimes
by atagar＠torproject.org 27 Oct '21

27 Oct '21

commit f8717b4bffd46c8c0ee7147f5b50927737b2b5e1 Author: Steven Engler <opara(a)cs.georgetown.edu> Date: Mon Oct 25 14:46:39 2021 -0400 Add timezone to parsed datetimes --- stem/control.py | 3 ++- stem/descriptor/__init__.py | 3 ++- stem/descriptor/extrainfo_descriptor.py | 2 +- stem/descriptor/networkstatus.py | 2 +- stem/descriptor/router_status_entry.py | 3 ++- stem/descriptor/tordnsel.py | 6 +++--- stem/response/events.py | 8 +++++--- stem/util/str_tools.py | 15 +++++++++++---- 8 files changed, 27 insertions(+), 15 deletions(-) diff --git a/stem/control.py b/stem/control.py index e162704b..40ca6bed 100644 --- a/stem/control.py +++ b/stem/control.py @@ -247,6 +247,7 @@ If you're fine with allowing your script to raise exceptions then this can be mo import asyncio import calendar import collections +import datetime import functools import inspect import io @@ -1537,7 +1538,7 @@ class Controller(BaseController): self.get_info('accounting/bytes-left'), ) - interval_end = stem.util.str_tools._parse_timestamp(interval_end) + interval_end = stem.util.str_tools._parse_timestamp(interval_end, datetime.timezone.utc) used_read, used_written = [int(val) for val in used.split(' ', 1)] left_read, left_written = [int(val) for val in left.split(' ', 1)] diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index c015d246..d928ff21 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -108,6 +108,7 @@ import base64 import codecs import collections import copy +import datetime import hashlib import io import os @@ -683,7 +684,7 @@ def _parse_timestamp_line(keyword: str, attribute: str) -> Callable[['stem.descr value = _value(keyword, entries) try: - setattr(descriptor, attribute, stem.util.str_tools._parse_timestamp(value)) + setattr(descriptor, attribute, stem.util.str_tools._parse_timestamp(value, datetime.timezone.utc)) except ValueError: raise ValueError("Timestamp on %s line wasn't parsable: %s %s" % (keyword, keyword, value)) diff --git a/stem/descriptor/extrainfo_descriptor.py b/stem/descriptor/extrainfo_descriptor.py index 8d9cbf30..ad08d361 100644 --- a/stem/descriptor/extrainfo_descriptor.py +++ b/stem/descriptor/extrainfo_descriptor.py @@ -239,7 +239,7 @@ def _parse_timestamp_and_interval(keyword: str, content: str) -> Tuple[datetime. raise ValueError("%s line's interval wasn't a number: %s" % (keyword, line)) try: - timestamp = stem.util.str_tools._parse_timestamp(timestamp_str) + timestamp = stem.util.str_tools._parse_timestamp(timestamp_str, datetime.timezone.utc) return timestamp, int(interval), remainder except ValueError: raise ValueError("%s line's timestamp wasn't parsable: %s" % (keyword, line)) diff --git a/stem/descriptor/networkstatus.py b/stem/descriptor/networkstatus.py index e8cf90eb..a69f501f 100644 --- a/stem/descriptor/networkstatus.py +++ b/stem/descriptor/networkstatus.py @@ -1962,7 +1962,7 @@ class BridgeNetworkStatusDocument(NetworkStatusDocument): published_line = published_line.split(' ', 1)[1].strip() try: - self.published = stem.util.str_tools._parse_timestamp(published_line) + self.published = stem.util.str_tools._parse_timestamp(published_line, datetime.timezone.utc) except ValueError: if validate: raise ValueError("Bridge network status document's 'published' time wasn't parsable: %s" % published_line) diff --git a/stem/descriptor/router_status_entry.py b/stem/descriptor/router_status_entry.py index aa94a703..eed34fac 100644 --- a/stem/descriptor/router_status_entry.py +++ b/stem/descriptor/router_status_entry.py @@ -22,6 +22,7 @@ sources... """ import binascii +import datetime import io import stem.exit_policy @@ -161,7 +162,7 @@ def _parse_r_line(descriptor: 'stem.descriptor.Descriptor', entries: ENTRY_TYPE) try: published = '%s %s' % (r_comp[3], r_comp[4]) - descriptor.published = stem.util.str_tools._parse_timestamp(published) + descriptor.published = stem.util.str_tools._parse_timestamp(published, datetime.timezone.utc) except ValueError: raise ValueError("Publication time time wasn't parsable: r %s" % value) diff --git a/stem/descriptor/tordnsel.py b/stem/descriptor/tordnsel.py index 32cf1863..ffb67578 100644 --- a/stem/descriptor/tordnsel.py +++ b/stem/descriptor/tordnsel.py @@ -98,13 +98,13 @@ class TorDNSEL(Descriptor): self.fingerprint = value elif keyword == 'Published': try: - self.published = stem.util.str_tools._parse_timestamp(value) + self.published = stem.util.str_tools._parse_timestamp(value, datetime.timezone.utc) except ValueError: if validate: raise ValueError("Published time wasn't parsable: %s" % value) elif keyword == 'LastStatus': try: - self.last_status = stem.util.str_tools._parse_timestamp(value) + self.last_status = stem.util.str_tools._parse_timestamp(value, datetime.timezone.utc) except ValueError: if validate: raise ValueError("LastStatus time wasn't parsable: %s" % value) @@ -119,7 +119,7 @@ class TorDNSEL(Descriptor): raise ValueError('Unexpected block content: %s' % block_content) try: - date = stem.util.str_tools._parse_timestamp(date_str) + date = stem.util.str_tools._parse_timestamp(date_str, datetime.timezone.utc) self.exit_addresses.append((address, date)) except ValueError: if validate: diff --git a/stem/response/events.py b/stem/response/events.py index 2b9b6dfd..a55771cc 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -221,12 +221,14 @@ class AddrMapEvent(Event): self.expiry = None else: try: - self.expiry = stem.util.str_tools._parse_timestamp(self.expiry) + # control-spec: "Expiry is expressed as the local time (rather than + # UTC). This is a bug, left in for backward compatibility" + self.expiry = stem.util.str_tools._parse_timestamp(self.expiry, None) except ValueError: raise stem.ProtocolError('Unable to parse date in ADDRMAP event: %s' % self) if self.utc_expiry is not None: - self.utc_expiry = stem.util.str_tools._parse_timestamp(self.utc_expiry) + self.utc_expiry = stem.util.str_tools._parse_timestamp(self.utc_expiry, datetime.timezone.utc) if self.cached is not None: if self.cached == 'YES': @@ -518,7 +520,7 @@ class ClientsSeenEvent(Event): def _parse(self) -> None: if self.start_time is not None: - self.start_time = stem.util.str_tools._parse_timestamp(self.start_time) + self.start_time = stem.util.str_tools._parse_timestamp(self.start_time, datetime.timezone.utc) if self.locales is not None: locale_to_count = {} diff --git a/stem/util/str_tools.py b/stem/util/str_tools.py index a9a34364..0012e96a 100644 --- a/stem/util/str_tools.py +++ b/stem/util/str_tools.py @@ -26,7 +26,7 @@ import sys import stem.util import stem.util.enum -from typing import List, Sequence, Tuple, Union, overload +from typing import List, Optional, Sequence, Tuple, Union, overload # label conversion tuples of the form... # (bits / bytes / seconds, short label, long label) @@ -481,7 +481,7 @@ def parse_short_time_label(label: str) -> int: raise ValueError('Non-numeric value in time entry: %s' % label) -def _parse_timestamp(entry: str) -> datetime.datetime: +def _parse_timestamp(entry: str, tz: Optional[datetime.timezone]) -> datetime.datetime: """ Parses the date and time that in format like like... @@ -490,6 +490,8 @@ def _parse_timestamp(entry: str) -> datetime.datetime: 2012-11-08 16:48:41 :param entry: timestamp to be parsed + :param tz: timezone of the entry (if **None**, the returned **datetime** will + be "naive") :returns: **datetime** for the time represented by the timestamp @@ -504,7 +506,12 @@ def _parse_timestamp(entry: str) -> datetime.datetime: except AttributeError: raise ValueError('Expected timestamp in format YYYY-MM-DD HH:MM:ss but got ' + entry) - return datetime.datetime(time[0], time[1], time[2], time[3], time[4], time[5]) + dt = datetime.datetime(time[0], time[1], time[2], time[3], time[4], time[5]) + + if tz != None: + dt.replace(tzinfo=tz) + + return dt def _parse_iso_timestamp(entry: str) -> 'datetime.datetime': @@ -541,7 +548,7 @@ def _parse_iso_timestamp(entry: str) -> 'datetime.datetime': else: raise ValueError("timestamp didn't contain delimeter 'T' between date and time") - timestamp = _parse_timestamp(timestamp_str) + timestamp = _parse_timestamp(timestamp_str, datetime.timezone.utc) return timestamp + datetime.timedelta(microseconds = int(microseconds))

1 0

[stem/master] Update to python 3.9
by atagar＠torproject.org 27 Oct '21

27 Oct '21

commit 56f3daa4c124dae3e050b76d531480f8e233cc59 Author: Linus Gasser <linus.gasser(a)epfl.ch> Date: Fri Oct 22 10:12:06 2021 +0200 Update to python 3.9 Closes #105 Since python 3.2: https://docs.python.org/3/library/stdtypes.html#int.from_bytes --- stem/descriptor/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index 3f10bc57..c015d246 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -1051,7 +1051,7 @@ class Descriptor(object): try: from cryptography.hazmat.backends import default_backend from cryptography.hazmat.primitives.serialization import load_der_public_key - from cryptography.utils import int_to_bytes, int_from_bytes + from cryptography.utils import int_to_bytes except ImportError: raise ValueError('Generating the signed digest requires the cryptography module') @@ -1060,7 +1060,7 @@ class Descriptor(object): public_exponent = key.public_numbers().e sig_as_bytes = _bytes_for_block(signature) - sig_as_long = int_from_bytes(sig_as_bytes, byteorder='big') # convert signature to an int + sig_as_long = int.from_bytes(sig_as_bytes, byteorder='big') # convert signature to an int blocksize = len(sig_as_bytes) # 256B for NetworkStatusDocuments, 128B for others # use the public exponent[e] & the modulus[n] to decrypt the int

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 27 Oct '21

27 Oct '21

commit 05ac2adaa3bf213a5bbcffe2ef189fe7da5cd099 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 26 22:47:49 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+cs.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contents+cs.po b/contents+cs.po index 72d1b1f984..5399cab59b 100644 --- a/contents+cs.po +++ b/contents+cs.po @@ -13,6 +13,7 @@ # erinm, 2021 # Lenka Šimečková <simeckova.lenka(a)seznam.cz>, 2021 # Fourdee Foureight, 2021 +# Ascii Wolf <mail(a)asciiwolf.com>, 2021 # msgid "" msgstr "" @@ -20,7 +21,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-10-26 15:31+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: Fourdee Foureight, 2021\n" +"Last-Translator: Ascii Wolf <mail(a)asciiwolf.com>, 2021\n" "Language-Team: Czech (https://www.transifex.com/otf/teams/1519/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -14325,7 +14326,7 @@ msgstr "Zavřít baner" #: lego/templates/banner.html:11 templates/banner.html:11 msgid "Privacy is a human right" -msgstr "Soukromí je lidksé právo" +msgstr "Soukromí je lidské právo" #: lego/templates/banner.html:15 templates/banner.html:15 msgid "Your donation will be matched by Friends of Tor, up to $150,000."

1 0

[translation/tor_outreach_md] https://gitweb.torproject.org/translation.git/commit/?h=tor_outreach_md
by translation＠torproject.org 27 Oct '21

27 Oct '21

commit 392d3064d4d27c86cc1fa49e0184403ee91d1d6f Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 26 22:47:42 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor_outreach_md --- tor-outreach2019-2020-cs.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tor-outreach2019-2020-cs.md b/tor-outreach2019-2020-cs.md index 8baac29af8..5c736e3ea0 100644 --- a/tor-outreach2019-2020-cs.md +++ b/tor-outreach2019-2020-cs.md @@ -2,7 +2,7 @@ # 1. TOR FOR PRIVACY -### Soukromí je lidksé právo +### Soukromí je lidské právo Like many of us, Aleisha spends most of her time online--connecting with friends, posting on social media, and browsing the web.

1 0

[translation/gettor-website-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=gettor-website-contentspot
by translation＠torproject.org 27 Oct '21

27 Oct '21

commit e13614b516760498f81e63b0bfe1cd6f49792296 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 26 22:45:23 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=gettor-website-cont… --- contents+cs.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contents+cs.po b/contents+cs.po index 578e2cd37c..9589c3ebb3 100644 --- a/contents+cs.po +++ b/contents+cs.po @@ -4,6 +4,7 @@ # Michal Stanke <mstanke(a)mozilla.cz>, 2021 # Ondrej Führer <transifex(a)fuhrer.cz>, 2021 # Fourdee Foureight, 2021 +# Ascii Wolf <mail(a)asciiwolf.com>, 2021 # msgid "" msgstr "" @@ -11,7 +12,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-10-22 09:52+CET\n" "PO-Revision-Date: 2021-03-24 14:33+0000\n" -"Last-Translator: Fourdee Foureight, 2021\n" +"Last-Translator: Ascii Wolf <mail(a)asciiwolf.com>, 2021\n" "Language-Team: Czech (https://www.transifex.com/otf/teams/1519/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -195,7 +196,7 @@ msgstr "Zavřít baner" #: lego/templates/banner.html:11 templates/banner.html:11 msgid "Privacy is a human right" -msgstr "Soukromí je lidksé právo" +msgstr "Soukromí je lidské právo" #: lego/templates/banner.html:15 templates/banner.html:15 msgid "Your donation will be matched by Friends of Tor, up to $150,000."

1 0

[translation/fenix-torbrowserstringsxml] https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstringsxml
by translation＠torproject.org 27 Oct '21

27 Oct '21

commit 65b4a56d38e4cb42fe788dde9b52aaa41bc145cf Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 26 22:45:20 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstr… --- cs/torbrowser_strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cs/torbrowser_strings.xml b/cs/torbrowser_strings.xml index 74da2b93a2..ec20779809 100644 --- a/cs/torbrowser_strings.xml +++ b/cs/torbrowser_strings.xml @@ -26,7 +26,7 @@ <string name="tor_onboarding_chosen_security_level_label">Aktuální úroveň zabezpečení: %s</string> <string name="tor_onboarding_security_settings_button">Otevřít nastavení bezpečnosti</string> <string name="tor_onboarding_donate_header">Podpořte projekt Tor a udržte ho v bezpečí</string> - <string name="tor_onboarding_donate_description">Tor je zdarma k použití díky darům od lidí jako ty.</string> + <string name="tor_onboarding_donate_description">Tor je zdarma k použití díky darům od lidí jako jste vy.</string> <string name="tor_onboarding_donate_button">Přispějte</string> <string name="tor_explore_privately">Prohlížejte v soukromí.</string>

1 0

[translation/abouttor-homepage] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage
by translation＠torproject.org 27 Oct '21

27 Oct '21

commit 6eb04a2eda5cd248939249e845343007fc3c1ee4 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 26 22:45:03 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage --- cs/aboutTor.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cs/aboutTor.dtd b/cs/aboutTor.dtd index 2d5dd753f5..0b7b586ac9 100644 --- a/cs/aboutTor.dtd +++ b/cs/aboutTor.dtd @@ -27,7 +27,7 @@ <!ENTITY aboutTor.newsletter.tagline "Nechte si posílat nejnovější informace o Toru."> <!ENTITY aboutTor.newsletter.link_text "Přihlaste se k odběru zpravodaje Toru."> -<!ENTITY aboutTor.donationBanner.freeToUse "Tor je zdarma k použití díky darům od lidí jako ty."> +<!ENTITY aboutTor.donationBanner.freeToUse "Tor je zdarma k použití díky darům od lidí jako jste vy."> <!ENTITY aboutTor.donationBanner.buttonA "Přispějte">  @@ -48,7 +48,7 @@ Thank you! --> <!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA"> -<!ENTITY aboutTor.yec.motto "Soukromí je lidksé právo"> +<!ENTITY aboutTor.yec.motto "Soukromí je lidské právo"> <!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but also format it like the name of an organization in whichever way that is appropriate for your locale.

1 0

[tor/main] scripts: Add -M option to git-list-tor-branches.sh
by dgoulet＠torproject.org 26 Oct '21

26 Oct '21

commit 5e1f64602bd11fc24c72f0617c362aa7ab79f0d8 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Oct 26 15:52:51 2021 -0400 scripts: Add -M option to git-list-tor-branches.sh Omit all "maint" branch. It is the opposite of -R that omits release branches. In other words, -M can be used to list all release branches. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- scripts/git/git-list-tor-branches.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/scripts/git/git-list-tor-branches.sh b/scripts/git/git-list-tor-branches.sh index 62547dcc5d..29e91dd1b6 100755 --- a/scripts/git/git-list-tor-branches.sh +++ b/scripts/git/git-list-tor-branches.sh @@ -8,7 +8,7 @@ SCRIPT_NAME=$(basename "$0") function usage() { - echo "$SCRIPT_NAME [-h] [-l|-s|-b|-m] [-R]" + echo "$SCRIPT_NAME [-h] [-l|-s|-b|-m] [-R|-M]" echo echo " arguments:" echo " -h: show this help text" @@ -20,6 +20,7 @@ function usage() echo " ( branch parent path suffix parent_suffix ) arrays" echo echo " -R: omit release branches." + echo " -M: omit maint branches." } # list : just a list of branch names. @@ -27,9 +28,10 @@ function usage() # suffix: write a list of suffixes. # merge: branch, upstream, path, suffix, upstream suffix. mode="list" +skip_maint_branches="no" skip_release_branches="no" -while getopts "hblmsR" opt ; do +while getopts "hblmsRM" opt ; do case "$opt" in h) usage exit 0 @@ -42,6 +44,8 @@ while getopts "hblmsR" opt ; do ;; m) mode="merge" ;; + M) skip_maint_branches="yes" + ;; R) skip_release_branches="yes" ;; *) echo "Unknown option" @@ -80,6 +84,9 @@ branch() { suffix="_${brname_nodots#maint-}" location="\$GIT_PATH/\$TOR_WKT_NAME/$brname" is_maint="yes" + if [[ "$skip_maint_branches" = "yes" ]]; then + return + fi elif [[ "$brname" =~ ^release- ]]; then suffix="_r${brname_nodots#release-}" location="\$GIT_PATH/\$TOR_WKT_NAME/$brname"

1 0

[tor/maint-0.3.5] ci: Missing source dir when parsing configure.ac version
by dgoulet＠torproject.org 26 Oct '21

26 Oct '21

commit 14385ce71e1d7bddc671d3805d3b7dcb17eeded9 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Oct 26 14:33:31 2021 -0400 ci: Missing source dir when parsing configure.ac version Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- scripts/ci/ci-driver.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh index 67a95a1f61..f99e45e6f2 100755 --- a/scripts/ci/ci-driver.sh +++ b/scripts/ci/ci-driver.sh @@ -287,7 +287,7 @@ fi ############################################################################# # Determine the version of Tor. -TOR_VERSION=$(grep -m 1 AC_INIT configure.ac | sed -e 's/.*\[//; s/\].*//;') +TOR_VERSION=$(grep -m 1 AC_INIT ${CI_SRCDIR}/configure.ac | sed -e 's/.*\[//; s/\].*//;') # Use variables like these when we need to behave differently depending on # Tor version. Only create the variables we need.

1 0

[tor/main] Merge branch 'maint-0.3.5' into maint-0.4.5
by dgoulet＠torproject.org 26 Oct '21

26 Oct '21

commit ae92a92453eb3a0248cb20b153fe35e8cdc608cc Merge: d4af7bdb26 14385ce71e Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Oct 26 14:33:49 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.5 scripts/ci/ci-driver.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0