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

[tor/master] Merge remote-tracking branch 'tor-github/pr/1181' into maint-0.3.5
by teor＠torproject.org 30 Aug '19

30 Aug '19

commit 1132dc9f75d7e5cbda1c5a6ac91d82c420967c0e Merge: b66712d85 a9379d675 Author: teor <teor(a)torproject.org> Date: Fri Aug 30 23:24:05 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1181' into maint-0.3.5 changes/bug31003 | 4 ++++ src/feature/nodelist/routerlist.c | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-)

1 0

[tor/master] guard: Ignore marked for close circuit when changing state to open
by teor＠torproject.org 30 Aug '19

30 Aug '19

commit e3f3478032921a8b6af07a655fd2ea520d3ff463 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Jun 18 13:32:45 2019 -0400 guard: Ignore marked for close circuit when changing state to open When we consider all circuits in "waiting for guard" state to be promoted to an "open" state, we were considering all circuits, even the one marked for close. This ultiamtely triggers a "circuit_has_opened()" called on the circuit that is marked for close which then leads to possible undesirable behaviors within a subsystem. For instance, the HS subsystem would be unable to find the authentication key of the introduction point circuit leading to a BUG() warning and a duplicate mark for close on the circuit. This commit also adds a unit test to make sure we never select marked for close circuits when upgrading its guard state from waiting for guard to open. Fixes #30871 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket30871 | 6 ++++++ src/feature/client/entrynodes.c | 4 ++++ src/test/test_circuitbuild.c | 47 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+) diff --git a/changes/ticket30871 b/changes/ticket30871 new file mode 100644 index 000000000..81c076bb0 --- /dev/null +++ b/changes/ticket30871 @@ -0,0 +1,6 @@ + o Major bugfixes (circuit build, guard): + - When considering upgrading circuits from "waiting for guard" to "open", + always ignore the ones that are mark for close. Else, we can end up in + the situation where a subsystem is notified of that circuit opening but + still marked for close leading to undesirable behavior. Fixes bug 30871; + bugfix on 0.3.0.1-alpha. diff --git a/src/feature/client/entrynodes.c b/src/feature/client/entrynodes.c index e543289ce..d191f5836 100644 --- a/src/feature/client/entrynodes.c +++ b/src/feature/client/entrynodes.c @@ -2611,6 +2611,10 @@ entry_guards_upgrade_waiting_circuits(guard_selection_t *gs, entry_guard_t *guard = entry_guard_handle_get(state->guard); if (!guard || guard->in_selection != gs) continue; + if (TO_CIRCUIT(circ)->marked_for_close) { + /* Don't consider any marked for close circuits. */ + continue; + } smartlist_add(all_circuits, circ); } SMARTLIST_FOREACH_END(circ); diff --git a/src/test/test_circuitbuild.c b/src/test/test_circuitbuild.c index 275f1eced..538f20781 100644 --- a/src/test/test_circuitbuild.c +++ b/src/test/test_circuitbuild.c @@ -4,6 +4,8 @@ /* See LICENSE for licensing information */ #define CIRCUITBUILD_PRIVATE +#define CIRCUITLIST_PRIVATE +#define ENTRYNODES_PRIVATE #include "core/or/or.h" #include "test/test.h" @@ -13,7 +15,11 @@ #include "core/or/circuitbuild.h" #include "core/or/circuitlist.h" +#include "core/or/cpath_build_state_st.h" #include "core/or/extend_info_st.h" +#include "core/or/origin_circuit_st.h" + +#include "feature/client/entrynodes.h" /* Dummy nodes smartlist for testing */ static smartlist_t dummy_nodes; @@ -126,10 +132,51 @@ test_new_route_len_unhandled_exit(void *arg) UNMOCK(count_acceptable_nodes); } +static void +test_upgrade_from_guard_wait(void *arg) +{ + circuit_t *circ = NULL; + origin_circuit_t *orig_circ = NULL; + entry_guard_t *guard = NULL; + smartlist_t *list = NULL; + + (void) arg; + + circ = dummy_origin_circuit_new(0); + orig_circ = TO_ORIGIN_CIRCUIT(circ); + tt_assert(orig_circ); + + orig_circ->build_state = tor_malloc_zero(sizeof(cpath_build_state_t)); + + circuit_set_state(circ, CIRCUIT_STATE_GUARD_WAIT); + + /* Put it in guard wait state. */ + guard = tor_malloc_zero(sizeof(*guard)); + guard->in_selection = get_guard_selection_info(); + + orig_circ->guard_state = + circuit_guard_state_new(guard, GUARD_CIRC_STATE_WAITING_FOR_BETTER_GUARD, + NULL); + + /* Mark the circuit for close. */ + circuit_mark_for_close(circ, END_CIRC_REASON_TORPROTOCOL); + tt_int_op(circ->marked_for_close, OP_NE, 0); + + /* We shouldn't pick the mark for close circuit. */ + list = circuit_find_circuits_to_upgrade_from_guard_wait(); + tt_assert(!list); + + done: + circuit_free(circ); + entry_guard_free_(guard); +} + struct testcase_t circuitbuild_tests[] = { { "noexit", test_new_route_len_noexit, 0, NULL, NULL }, { "safe_exit", test_new_route_len_safe_exit, 0, NULL, NULL }, { "unsafe_exit", test_new_route_len_unsafe_exit, 0, NULL, NULL }, { "unhandled_exit", test_new_route_len_unhandled_exit, 0, NULL, NULL }, + { "upgrade_from_guard_wait", test_upgrade_from_guard_wait, TT_FORK, + NULL, NULL }, END_OF_TESTCASES };

1 0

[tor/master] Merge branch 'maint-0.4.1'
by teor＠torproject.org 30 Aug '19

30 Aug '19

commit 340698ba103f7eee9337f459376b7bc9a17a44c7 Merge: 88a8deb42 25e7fc5b7 Author: teor <teor(a)torproject.org> Date: Fri Aug 30 23:33:18 2019 +1000 Merge branch 'maint-0.4.1'

1 0

[tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1
by teor＠torproject.org 30 Aug '19

30 Aug '19

commit 25e7fc5b7a84c926f3acebd385e97d2679097bd6 Merge: ff905f8e1 a52a5e009 Author: teor <teor(a)torproject.org> Date: Fri Aug 30 23:33:10 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1

1 0

[gettor/master] Fix help stats aggregation
by hiro＠torproject.org 30 Aug '19

30 Aug '19

commit 892e88de2ebb8f389f9a4c01326f44c95ad6fefb Author: hiro <hiro(a)torproject.org> Date: Fri Aug 30 13:38:37 2019 +0200 Fix help stats aggregation --- gettor/services/email/sendmail.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gettor/services/email/sendmail.py b/gettor/services/email/sendmail.py index 82c3288..4350b3f 100644 --- a/gettor/services/email/sendmail.py +++ b/gettor/services/email/sendmail.py @@ -140,7 +140,8 @@ class Sendmail(object): ) yield self.conn.update_stats( - command="help", service="email" + command="help", , platform='', language='en', + service="email" ) yield self.conn.update_request(

1 0

[gettor/master] Remove unused code for twitter and xmpp
by hiro＠torproject.org 30 Aug '19

30 Aug '19

commit 1136236221c615901d4e6e81d6e893fa33309fc5 Author: hiro <hiro(a)torproject.org> Date: Fri Aug 30 13:59:58 2019 +0200 Remove unused code for twitter and xmpp --- gettor/services/twitter/twitter.py | 296 -------------------------------- gettor/services/xmpp/xmpp.py | 336 ------------------------------------- 2 files changed, 632 deletions(-) diff --git a/gettor/services/twitter/twitter.py b/gettor/services/twitter/twitter.py deleted file mode 100644 index fcdc353..0000000 --- a/gettor/services/twitter/twitter.py +++ /dev/null @@ -1,296 +0,0 @@ -# -*- coding: utf-8 -*- -# -# This file is part of GetTor. -# -# :authors: Israel Leiva <ilv(a)torproject.org> -# Based on BridgeDB Twitter distributor (PoC) by wfn -# - https://github.com/wfn/twidibot -# -# :copyright: (c) 2008-2015, The Tor Project, Inc. -# (c) 2015, Israel Leiva -# -# :license: This is Free Software. See LICENSE for license information. - -import os -import re -import tweepy -import logging -import gettext -import configparser - -import core -import utils -import blacklist - -""" -Twitter channel for distributing links to download Tor Browser. -Needs to be refactored to work with twisted and updates to twitter apis -""" - -OS = { - 'osx': 'Mac OS X', - 'linux': 'Linux', - 'windows': 'Windows' -} - - -class ConfigError(Exception): - pass - - -class InternalError(Exception): - pass - - -class GetTorStreamListener(tweepy.StreamListener): - """ Basic listener for Twitter's streaming API.""" - def __init__(self, bot): - self.bot = bot - super(GetTorStreamListener, self).__init__(self.bot.api) - - def on_direct_message(self, status): - """ Right now we only care about direct messages. """ - if status.direct_message['sender']['id_str'] != self.bot.bot_info.id_str: - self.bot.parse_request(status.direct_message) - - -class TwitterBot(object): - """ Receive and reply requests via Twitter. """ - def __init__(self, cfg=None): - """ Create new object by reading a configuration file. - - :param: cfg (string) the path of the configuration file. - """ - - default_cfg = 'twitter.cfg' - config = ConfigParser.ConfigParser() - - if cfg is None or not os.path.isfile(cfg): - cfg = default_cfg - - try: - with open(cfg) as f: - config.readfp(f) - except IOError: - raise ConfigError("File %s not found!" % cfg) - - try: - self.api_key = config.get('access_config', 'api_key') - self.api_secret = config.get('access_config', 'api_secret') - self.access_token = config.get('access_config', 'access_token') - self.token_secret = config.get('access_config', 'token_secret') - - self.mirrors = config.get('general', 'mirrors') - self.i18ndir = config.get('i18n', 'dir') - - logdir = config.get('log', 'dir') - logfile = os.path.join(logdir, 'twitter.log') - loglevel = config.get('log', 'level') - - blacklist_cfg = config.get('blacklist', 'cfg') - self.bl = blacklist.Blacklist(blacklist_cfg) - self.bl_max_request = config.get('blacklist', 'max_requests') - self.bl_max_request = int(self.bl_max_request) - self.bl_wait_time = config.get('blacklist', 'wait_time') - self.bl_wait_time = int(self.bl_wait_time) - - core_cfg = config.get('general', 'core_cfg') - self.core = core.Core(core_cfg) - - except ConfigParser.Error as e: - raise ConfigError("Configuration error: %s" % str(e)) - except blacklist.ConfigError as e: - raise InternalError("Blacklist error: %s" % str(e)) - except core.ConfigError as e: - raise InternalError("Core error: %s" % str(e)) - - # logging - log = logging.getLogger(__name__) - - logging_format = utils.get_logging_format() - date_format = utils.get_date_format() - formatter = logging.Formatter(logging_format, date_format) - - log.info('Redirecting Twitter logging to %s' % logfile) - logfileh = logging.FileHandler(logfile, mode='a+') - logfileh.setFormatter(formatter) - logfileh.setLevel(logging.getLevelName(loglevel)) - log.addHandler(logfileh) - - self.log = log - - def _is_blacklisted(self, username): - """Check if a user is blacklisted. - - :param: addr (string) the hashed username. - - :return: true is the username is blacklisted, false otherwise. - - """ - hashed_username = utils.get_sha256(username) - - try: - self.bl.is_blacklisted( - hashed_username, - 'Twitter', - self.bl_max_request, - self.bl_wait_time - ) - return False - except blacklist.BlacklistError as e: - return True - - def _get_msg(self, msgid, lc): - """Get message identified by msgid in a specific locale. - - Params: msgid: the identifier of a string. - lc: the locale. - - Return: a string containing the given message. - - """ - try: - t = gettext.translation(lc, self.i18ndir, languages=[lc]) - _ = t.ugettext - - msgstr = _(msgid) - return msgstr - except IOError as e: - raise ConfigError("%s" % str(e)) - - def parse_text(self, msg): - """ Parse the text part of a message. - - Split the message in words and look for patterns for locale, - operating system and mirrors requests. - - :param: msg (string) the message received. - - :return: request (list) 3-tuple with locale, os and type of request. - """ - - # core knows what OS are supported - supported_os = self.core.get_supported_os() - supported_lc = self.core.get_supported_lc() - - # default values - req = {} - req['lc'] = 'en' - req['os'] = None - req['type'] = 'help' - - found_lc = False - found_os = False - found_mirrors = False - - # analyze every word - words = re.split('\s+', msg.strip()) - for word in words: - # look for lc and os - if not found_lc: - for lc in supported_lc: - if re.match(lc, word, re.IGNORECASE): - found_lc = True - req['lc'] = lc - if not found_os: - for os in supported_os: - if re.match(os, word, re.IGNORECASE): - found_os = True - req['os'] = os - req['type'] = 'links' - # mirrors - if not found_mirrors: - if re.match("mirrors?", word, re.IGNORECASE): - found_mirrors = True - req['type'] = 'mirrors' - if (found_lc and found_os) or (found_lc and found_mirrors): - break - - return req - - def parse_request(self, dm): - """ Process the request received. - - Check if the user is not blacklisted and then check the body of - the message to find out what is asking. - - :param: dm (status.direct_message) the direct message object received - via Twitter API. - - """ - - sender_id = dm['sender']['id_str'] - msg = dm['text'].strip().lower() - bogus_req = False - req = None - status = '' - - try: - if self._is_blacklisted(str(sender_id)): - self.log.info('blacklist; none; none') - bogus_req = True - - if not bogus_req: - self.log.debug("Request seems legit, let's parse it") - # let's try to guess what the user is asking - req = self.parse_text(str(msg)) - - # possible options: links, mirrors, help - if req['type'] == 'links': - self.log.info('links; %s; %s' % (req['os'], req['lc'])) - links = self.core.get_links( - 'twitter', req['os'], req['lc'] - ) - - reply = self._get_msg('links', 'en') - reply = reply % (OS[req['os']], links) - - elif req['type'] == 'mirrors': - self.log.info('mirrors; none; %s' % req['lc']) - reply = self._get_msg('mirrors', 'en') - try: - with open(self.mirrors, "r") as list_mirrors: - mirrors = list_mirrors.read() - reply = reply % mirrors - - except IOError as e: - reply = self._get_msg('mirrors_unavailable', 'en') - - else: - self.log.info('help; none; %s' % req['lc']) - reply = self._get_msg('help', 'en') - - self.api.send_direct_message( - user_id=sender_id, - text=reply - ) - - except (core.ConfigError, core.InternalError) as e: - # if core failes, send the user an error message, but keep going - self.log.error("Something went wrong internally: %s" % str(e)) - reply = self._get_msg('internal_error', 'en') - - def start(self): - """ Start the bot for handling requests. - - Start a new Twitter bot. - """ - self.auth = tweepy.OAuthHandler( - self.api_key, - self.api_secret - ) - - self.auth.set_access_token( - self.access_token, - self.token_secret - ) - - self.api = tweepy.API(self.auth) - self.bot_info = self.api.me() - - stream = tweepy.Stream( - auth=self.api.auth, - listener=GetTorStreamListener(self) - ) - - stream.userstream() diff --git a/gettor/services/xmpp/xmpp.py b/gettor/services/xmpp/xmpp.py deleted file mode 100644 index cfcf8bf..0000000 --- a/gettor/services/xmpp/xmpp.py +++ /dev/null @@ -1,336 +0,0 @@ -# -*- coding: utf-8 -*- -# -# This file is part of GetTor, a Tor Browser distribution system. -# -# :authors: Israel Leiva <ilv(a)riseup.net> -# see also AUTHORS file -# -# :copyright: (c) 2008-2015, The Tor Project, Inc. -# (c) 2015, Israel Leiva -# -# :license: This is Free Software. See LICENSE for license information. - -import os -import re -import sys -import time -import gettext -import hashlib -import logging -import configparser - -from sleekxmpp import ClientXMPP -from sleekxmpp.xmlstream.stanzabase import JID -from sleekxmpp.exceptions import IqError, IqTimeout - -import core -import utils -import blacklist - - -""" -XMPP module for processing requests. -Needs to be refactored to work with twisted -""" - -OS = { - 'osx': 'Mac OS X', - 'linux': 'Linux', - 'windows': 'Windows' -} - - -class ConfigError(Exception): - pass - - -class InternalError(Exception): - pass - - -class Bot(ClientXMPP): - """XMPP bot. - - Handle messages and pass them to XMPP module for parsing. - - """ - - def __init__(self, jid, password, xmpp_obj): - ClientXMPP.__init__(self, jid, password) - - self.xmpp = xmpp_obj - self.add_event_handler("session_start", self.session_start) - self.add_event_handler("message", self.message) - - def session_start(self, event): - self.send_presence() - self.get_roster() - - try: - self.get_roster() - except IqError as err: - # error getting the roster - self.xmpp.log.error(err.iq['error']['condition']) - self.disconnect() - except IqTimeout: - # server is taking too long to respond - self.xmpp.log.error("Server is taking too long to respond") - self.disconnect() - - def message(self, msg): - if msg['type'] in ('chat', 'normal'): - msg_to_send = self.xmpp.parse_request(msg['from'], msg['body']) - if msg_to_send: - msg.reply(msg_to_send).send() - - -class XMPP(object): - """Receive and reply requests by XMPP. - - Public methods: - - parse_request(): parses a message and tries to figure out what the user - is asking for. - - Exceptions: - - ConfigError: Bad configuration. - InternalError: Something went wrong internally. - - """ - - def __init__(self, cfg=None): - """Create new object by reading a configuration file. - - :param: cfg (string) the path of the configuration file. - - """ - # define a set of default values - default_cfg = 'xmpp.cfg' - config = ConfigParser.ConfigParser() - - if cfg is None or not os.path.isfile(cfg): - cfg = default_cfg - - try: - with open(cfg) as f: - config.readfp(f) - except IOError: - raise ConfigError("File %s not found!" % cfg) - - try: - self.user = config.get('account', 'user') - self.password = config.get('account', 'password') - - self.mirrors = config.get('general', 'mirrors') - self.max_words = config.get('general', 'max_words') - self.max_words = int(self.max_words) - core_cfg = config.get('general', 'core_cfg') - self.core = core.Core(core_cfg) - self.i18ndir = config.get('i18n', 'dir') - - blacklist_cfg = config.get('blacklist', 'cfg') - self.bl = blacklist.Blacklist(blacklist_cfg) - self.bl_max_req = config.get('blacklist', 'max_requests') - self.bl_max_req = int(self.bl_max_req) - self.bl_wait_time = config.get('blacklist', 'wait_time') - self.bl_wait_time = int(self.bl_wait_time) - - logdir = config.get('log', 'dir') - logfile = os.path.join(logdir, 'xmpp.log') - loglevel = config.get('log', 'level') - - except ConfigParser.Error as e: - raise ConfigError("Configuration error: %s" % str(e)) - except blacklist.ConfigError as e: - raise InternalError("Blacklist error: %s" % str(e)) - except core.ConfigError as e: - raise InternalError("Core error: %s" % str(e)) - - # logging - log = logging.getLogger(__name__) - - logging_format = utils.get_logging_format() - date_format = utils.get_date_format() - formatter = logging.Formatter(logging_format, date_format) - - log.info('Redirecting XMPP logging to %s' % logfile) - logfileh = logging.FileHandler(logfile, mode='a+') - logfileh.setFormatter(formatter) - logfileh.setLevel(logging.getLevelName(loglevel)) - log.addHandler(logfileh) - - # stop logging on stdout from now on - log.propagate = False - self.log = log - - def start_bot(self): - """Start the bot for handling requests. - - Start a new sleekxmpp bot. - - """ - self.log.info("Starting the bot with account %s" % self.user) - xmpp = Bot(self.user, self.password, self) - xmpp.connect() - xmpp.process(block=True) - - def _is_blacklisted(self, account): - """Check if a user is blacklisted. - - :param: addr (string) the hashed address of the user. - - :return: true is the address is blacklisted, false otherwise. - - """ - anon_acc = utils.get_sha256(account) - - try: - self.bl.is_blacklisted( - anon_acc, 'XMPP', self.bl_max_req, self.bl_wait_time - ) - return False - except blacklist.BlacklistError as e: - return True - - def _get_msg(self, msgid, lc): - """Get message identified by msgid in a specific locale. - - :param: msgid (string) the identifier of a string. - :param: lc (string) the locale. - - :return: (string) the message from the .po file. - - """ - # obtain the content in the proper language - self.log.debug("Trying to get translated text") - try: - t = gettext.translation(lc, self.i18ndir, languages=[lc]) - _ = t.ugettext - - msgstr = _(msgid) - return msgstr - except IOError as e: - raise ConfigError("%s" % str(e)) - - def _parse_text(self, msg): - """Parse the text part of a message. - - Split the message in words and look for patterns for locale, - operating system and built-in pluggable transport info. - - :param: msg (string) the message received. - :param: core_obj (object) the object of gettor core module. - - :return: request (list) 4-tuple with locale, os, type of request - and pt info. - - """ - # core knows what OS are supported - supported_os = self.core.get_supported_os() - supported_lc = self.core.get_supported_lc() - - self.log.debug("Parsing text") - # default values - req = {} - req['lc'] = 'en' - req['os'] = None - req['type'] = 'help' - - found_lc = False - found_os = False - found_mirrors = False - - # analyze every word - for word in msg.split(' '): - # look for lc and os - if not found_lc: - for lc in supported_lc: - if re.match(lc, word, re.IGNORECASE): - found_lc = True - req['lc'] = lc - if not found_os: - for os in supported_os: - if re.match(os, word, re.IGNORECASE): - found_os = True - req['os'] = os - req['type'] = 'links' - # mirrors - if not found_mirrors: - if re.match("mirrors?", word, re.IGNORECASE): - found_mirrors = True - req['type'] = 'mirrors' - if (found_lc and found_os) or (found_lc and found_mirrors): - break - - return req - - def parse_request(self, account, msg): - """Process the request received. - - Check if the user is not blacklisted and then check the body of - the message to find out what is asking. - - :param: account (string) the account that did the request. - :param: msg (string) the body of the message sent to us. - - :return: (string/None) the message to be sent to the user via the - bot, or None if the user is blacklisted. - - """ - bogus_request = False - reply = '' - status = '' - req = None - - self.log.debug("Parsing request") - try: - if self._is_blacklisted(str(account)): - self.log.info('blacklist; none; none') - bogus_request = True - - # first let's find out how many words are in the message - # request shouldn't be longer than 3 words, but just in case - words = re.split('\s+', msg.strip()) - if len(words) > self.max_words: - bogus_request = True - self.log.info("Message way too long") - self.log.info('invalid; none; none') - reply = self._get_msg('message_error', 'en') - - if not bogus_request: - self.log.debug("Request seems legit, let's parse it") - # let's try to guess what the user is asking - req = self._parse_text(str(msg)) - - if req['type'] == 'help': - self.log.info('help; none; %s' % req['lc']) - reply = self._get_msg('help', 'en') - - elif req['type'] == 'mirrors': - self.log.info('mirrors; none; %s' % req['lc']) - reply = self._get_msg('mirrors', 'en') - try: - with open(self.mirrors, "r") as list_mirrors: - mirrors = list_mirrors.read() - reply = reply % mirrors - except IOError as e: - reply = self._get_msg('mirrors_unavailable', 'en') - - elif req['type'] == 'links': - self.log.info('links; %s; %s' % (req['os'], req['lc'])) - links = self.core.get_links( - "XMPP", - req['os'], - req['lc'] - ) - reply = self._get_msg('links', 'en') - reply = reply % (OS[req['os']], links) - - except (core.ConfigError, core.InternalError) as e: - # if core failes, send the user an error message, but keep going - self.log.error("Something went wrong internally: %s" % str(e)) - reply = self._get_msg('internal_error', req['lc']) - - finally: - return reply

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-1] fixup! Bug 4234: Use the Firefox Update Process for Tor Browser.
by gk＠torproject.org 30 Aug '19

30 Aug '19

commit f607d5bb45e536dc7094999252dc89c6bc84884b Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Aug 29 21:12:37 2019 -0400 fixup! Bug 4234: Use the Firefox Update Process for Tor Browser. --- browser/app/profile/firefox.js | 10 ++-------- toolkit/modules/UpdateUtils.jsm | 16 ++++++++++------ toolkit/mozapps/update/UpdateServiceStub.jsm | 4 ++++ 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index bb045fce1642..b0c42caa05a4 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -143,14 +143,8 @@ pref("app.update.download.promptMaxAttempts", 2); pref("app.update.elevation.promptMaxAttempts", 2); // If set to true, the Update Service will automatically download updates if the -// user can apply updates. This pref is no longer used on Windows, except as the -// default value to migrate to the new location that this data is now stored -// (which is in a file in the update directory). Because of this, this pref -// should no longer be used directly. Instead, getAppUpdateAutoEnabled and -// getAppUpdateAutoEnabled from UpdateUtils.jsm should be used. -#ifndef XP_WIN +// user can apply updates. pref("app.update.auto", true); -#endif // If set to true, the Update Service will present no UI for any event. pref("app.update.silent", false); @@ -178,7 +172,7 @@ pref("app.update.idletime", 60); pref("app.update.service.enabled", true); #endif -#ifdef XP_WIN +#ifdef MOZ_BITS_DOWNLOAD // If set to true, the Update Service will attempt to use Windows BITS to // download updates and will fallback to downloading internally if that fails. pref("app.update.BITS.enabled", true); diff --git a/toolkit/modules/UpdateUtils.jsm b/toolkit/modules/UpdateUtils.jsm index b267ebff48e8..e458dac76228 100644 --- a/toolkit/modules/UpdateUtils.jsm +++ b/toolkit/modules/UpdateUtils.jsm @@ -162,15 +162,17 @@ var UpdateUtils = { * downloads and installs updates. This corresponds to whether or not the user * has selected "Automatically install updates" in about:preferences. * - * On Windows, this setting is shared across all profiles for the installation + * On Windows (except in Tor Browser), this setting is shared across all profiles + * for the installation * and is read asynchrnously from the file. On other operating systems, this * setting is stored in a pref and is thus a per-profile setting. * * @return A Promise that resolves with a boolean. */ getAppUpdateAutoEnabled() { - if (AppConstants.platform != "win") { - // On platforms other than Windows the setting is stored in a preference. + if (AppConstants.TOR_BROWSER_UPDATE || (AppConstants.platform != "win")) { + // On platforms other than Windows and always in Tor Browser the setting + // is stored in a preference. let prefValue = Services.prefs.getBoolPref( PREF_APP_UPDATE_AUTO, DEFAULT_APP_UPDATE_AUTO @@ -241,7 +243,8 @@ var UpdateUtils = { * updates" and "Check for updates but let you choose to install them" options * in about:preferences. * - * On Windows, this setting is shared across all profiles for the installation + * On Windows (except in Tor Browser), this setting is shared across all profiles + * for the installation * and is written asynchrnously to the file. On other operating systems, this * setting is stored in a pref and is thus a per-profile setting. * @@ -257,8 +260,9 @@ var UpdateUtils = { * this operation simply sets a pref. */ setAppUpdateAutoEnabled(enabledValue) { - if (AppConstants.platform != "win") { - // Only in Windows do we store the update config in the update directory + if (AppConstants.TOR_BROWSER_UPDATE || (AppConstants.platform != "win")) { + // Only in Windows (but never for Tor Browser) do we store the update config + // in the update directory let prefValue = !!enabledValue; Services.prefs.setBoolPref(PREF_APP_UPDATE_AUTO, prefValue); maybeUpdateAutoConfigChanged(prefValue); diff --git a/toolkit/mozapps/update/UpdateServiceStub.jsm b/toolkit/mozapps/update/UpdateServiceStub.jsm index 0318e52cd6c5..f3fdc12f53e5 100644 --- a/toolkit/mozapps/update/UpdateServiceStub.jsm +++ b/toolkit/mozapps/update/UpdateServiceStub.jsm @@ -45,8 +45,12 @@ function UpdateServiceStub() { // contains the status file's path // We may need to migrate update data + // In Tor Browser we skip this because we do not use an update agent and we + // do not want to store any data outside of the browser installation directory. + // For more info, see https://bugzilla.mozilla.org/show_bug.cgi?id=1458314 if ( AppConstants.platform == "win" && + !AppConstants.TOR_BROWSER_UPDATE && !Services.prefs.getBoolPref(prefUpdateDirMigrated, false) ) { migrateUpdateDirectory();

1 0

[translation/torcheck] https://gitweb.torproject.org/translation.git/commit/?h=torcheck
by translation＠torproject.org 30 Aug '19

30 Aug '19

commit e0cbd290dc8aa10350668b8bd85f1e58345d12ef Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 30 11:23:41 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torcheck --- fa/torcheck.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fa/torcheck.po b/fa/torcheck.po index 2bb5fcce3..4e34b2121 100644 --- a/fa/torcheck.po +++ b/fa/torcheck.po @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2019-08-30 10:51+0000\n" +"PO-Revision-Date: 2019-08-30 10:57+0000\n" "Last-Translator: MYZJ\n" "Language-Team: Persian (http://www.transifex.com/otf/torproject/language/fa/)\n" "MIME-Version: 1.0\n" @@ -54,7 +54,7 @@ msgid "" "href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a" " href=\"https://support.torproject.org/#faq\">frequently asked " "questions</a>." -msgstr "اگر قصد دارید از یک کلاینت تور استفاده کنید، لطفاً به <a href=\"https://www.torproject.org/\">وب‌سایت تور</a> و مخصوصاً به قسمت<a href=\"https://support.torproject.org/#faq\">سوالات متداول</a> مراجعه کنید." +msgstr "اگر قصد دارید از یک کلاینت تور استفاده کنید، لطفاً به <a href=\"https://www.torproject.org/\">وب‌سایت تور</a> و به ویژه، بخش <a href=\"https://support.torproject.org/#faq\">پرسش های پرتکرار</a>مراجعه کنید." msgid "Sorry, your query failed or an unexpected response was received." msgstr "متاسفانه درخواست شما ناموفق بود و يا پاسخی غیر منتظره دريافت شد." @@ -66,7 +66,7 @@ msgid "This page is also available in the following languages:" msgstr "این صفحه همچنین در زبان‌های زیر قابل مشاهده است:" msgid "For more information about this exit relay, see:" -msgstr "برای اطلاعات بیشتر در مورد این رله کمکی خروجی، اینجا را ببینید:" +msgstr "برای آگاهی بیشتر در مورد این گره پایانی، اینجا را ببینید:" msgid "" "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, "

1 0

[community/master] Add color to pages in relay guide
by hiro＠torproject.org 30 Aug '19

30 Aug '19

commit 888f513552e6c9584bea2b8e00bbfd06572a99c7 Author: hiro <hiro(a)torproject.org> Date: Fri Aug 30 13:11:08 2019 +0200 Add color to pages in relay guide --- .../technical-setup/guard/centosrhel/contents.lr | 2 ++ .../technical-setup/guard/centosrhel/updates/contents.lr | 4 +++- .../technical-setup/guard/debianubuntu/contents.lr | 2 ++ .../technical-setup/guard/debianubuntu/updates/contents.lr | 10 ++++++---- .../relay-operations/technical-setup/guard/fedora/contents.lr | 4 +++- .../technical-setup/guard/fedora/updates/contents.lr | 2 ++ .../relay-operations/technical-setup/guard/freebsd/contents.lr | 6 ++++-- .../technical-setup/guard/freebsd/updates/contents.lr | 2 ++ 8 files changed, 24 insertions(+), 8 deletions(-) diff --git a/content/relay-operations/technical-setup/guard/centosrhel/contents.lr b/content/relay-operations/technical-setup/guard/centosrhel/contents.lr index 18eb67a..6914e5b 100644 --- a/content/relay-operations/technical-setup/guard/centosrhel/contents.lr +++ b/content/relay-operations/technical-setup/guard/centosrhel/contents.lr @@ -1,5 +1,7 @@ _model: page --- +color: primary +--- title: CentOS/RHEL --- body: diff --git a/content/relay-operations/technical-setup/guard/centosrhel/updates/contents.lr b/content/relay-operations/technical-setup/guard/centosrhel/updates/contents.lr index 543587d..24adef4 100644 --- a/content/relay-operations/technical-setup/guard/centosrhel/updates/contents.lr +++ b/content/relay-operations/technical-setup/guard/centosrhel/updates/contents.lr @@ -1,5 +1,7 @@ _model: page --- +color: primary +--- title: RPM Distributions --- body: @@ -46,7 +48,7 @@ Enable the following settings: Interval: Daily Skip Interactive Patches Agree with Licenses - Use delta rpms + Use delta rpms ``` Confirm your configuration with OK. diff --git a/content/relay-operations/technical-setup/guard/debianubuntu/contents.lr b/content/relay-operations/technical-setup/guard/debianubuntu/contents.lr index f203181..20b6619 100644 --- a/content/relay-operations/technical-setup/guard/debianubuntu/contents.lr +++ b/content/relay-operations/technical-setup/guard/debianubuntu/contents.lr @@ -1,5 +1,7 @@ _model: page --- +color: primary +--- title: Debian/Ubuntu --- body: diff --git a/content/relay-operations/technical-setup/guard/debianubuntu/updates/contents.lr b/content/relay-operations/technical-setup/guard/debianubuntu/updates/contents.lr index 7053759..0506f6c 100644 --- a/content/relay-operations/technical-setup/guard/debianubuntu/updates/contents.lr +++ b/content/relay-operations/technical-setup/guard/debianubuntu/updates/contents.lr @@ -1,5 +1,7 @@ _model: page --- +color: primary +--- title: Debian and Ubuntu --- _discoverable: no @@ -34,10 +36,10 @@ If you want to automatically reboot add the following at the the end of the file Create the file /etc/apt/apt.conf.d/20auto-upgrades with the following content - APT::Periodic::Update-Package-Lists "1"; - APT::Periodic::AutocleanInterval "5"; - APT::Periodic::Unattended-Upgrade "1"; - APT::Periodic::Verbose "1"; + APT::Periodic::Update-Package-Lists "1"; + APT::Periodic::AutocleanInterval "5"; + APT::Periodic::Unattended-Upgrade "1"; + APT::Periodic::Verbose "1"; ``` # 4. Test diff --git a/content/relay-operations/technical-setup/guard/fedora/contents.lr b/content/relay-operations/technical-setup/guard/fedora/contents.lr index 0e5f8ac..646fa22 100644 --- a/content/relay-operations/technical-setup/guard/fedora/contents.lr +++ b/content/relay-operations/technical-setup/guard/fedora/contents.lr @@ -1,5 +1,7 @@ _model: page --- +color: primary +--- title: Fedora --- body: @@ -46,4 +48,4 @@ subtitle: How to deploy a middle/Guard relay on Fedora --- _discoverable: yes --- -_slug: +_slug: diff --git a/content/relay-operations/technical-setup/guard/fedora/updates/contents.lr b/content/relay-operations/technical-setup/guard/fedora/updates/contents.lr index f8195b7..7f31083 100644 --- a/content/relay-operations/technical-setup/guard/fedora/updates/contents.lr +++ b/content/relay-operations/technical-setup/guard/fedora/updates/contents.lr @@ -4,6 +4,8 @@ title: Fedora --- subtitle: --- +color: primary +--- _slug: updates --- diff --git a/content/relay-operations/technical-setup/guard/freebsd/contents.lr b/content/relay-operations/technical-setup/guard/freebsd/contents.lr index 1685fed..9d96639 100644 --- a/content/relay-operations/technical-setup/guard/freebsd/contents.lr +++ b/content/relay-operations/technical-setup/guard/freebsd/contents.lr @@ -1,5 +1,7 @@ _model: page --- +color: primary +--- title: FreeBSD --- body: @@ -47,11 +49,11 @@ service tor start To get package updates faster after they have been build it is best to switch from the "quarterly" with "latest" repository. -Create the following folder: +Create the following folder: `mkdir -p /usr/local/etc/pkg/repos` -and create the file `/usr/local/etc/pkg/repos/FreeBSD.conf` with the following content: +and create the file `/usr/local/etc/pkg/repos/FreeBSD.conf` with the following content: ``` FreeBSD: { enabled: no } diff --git a/content/relay-operations/technical-setup/guard/freebsd/updates/contents.lr b/content/relay-operations/technical-setup/guard/freebsd/updates/contents.lr index ad9959f..86c1638 100644 --- a/content/relay-operations/technical-setup/guard/freebsd/updates/contents.lr +++ b/content/relay-operations/technical-setup/guard/freebsd/updates/contents.lr @@ -2,6 +2,8 @@ _model: page --- title: BSD* --- +color: primary +--- _slug: updates --- body:

1 0

[community/master] Add new section name
by hiro＠torproject.org 30 Aug '19

30 Aug '19

commit bc61b18756a80821cc2d22bada21ce91d47f7c07 Author: gus <gus(a)torproject.org> Date: Thu Aug 29 11:36:04 2019 -0400 Add new section name --- .../relay-operations/technical-setup/guard/debianubuntu/contents.lr | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/content/relay-operations/technical-setup/guard/debianubuntu/contents.lr b/content/relay-operations/technical-setup/guard/debianubuntu/contents.lr index c3e1f15..3942b8e 100644 --- a/content/relay-operations/technical-setup/guard/debianubuntu/contents.lr +++ b/content/relay-operations/technical-setup/guard/debianubuntu/contents.lr @@ -47,8 +47,10 @@ html: two-columns-page.html --- key: 1 --- -section: relay operations +section: Middle/Guard relay --- section_id: relay-operations --- subtitle: How to deploy a middle/Guard relay on Debian/Ubuntu +--- +_discoverable: no

1 0