April 2015 - tor-commits - lists.torproject.org

[tor-messenger-build/master] Add Tor Browser Windows installer files
by boklm＠torproject.org 26 Apr '15

26 Apr '15

commit fd7b0fdd707c4d2ffa55252b5a980e058d3b397e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 24 17:55:41 2015 +0200 Add Tor Browser Windows installer files From https://github.com/moba/tbb-windows-installer.git --- projects/tor-messenger/tor-messenger.ico | Bin 0 -> 23934 bytes projects/tor-messenger/tor-messenger.nsi | 167 ++++++++++++++++++++++++++++++ 2 files changed, 167 insertions(+) diff --git a/projects/tor-messenger/tor-messenger.ico b/projects/tor-messenger/tor-messenger.ico new file mode 100644 index 0000000..cce2759 Binary files /dev/null and b/projects/tor-messenger/tor-messenger.ico differ diff --git a/projects/tor-messenger/tor-messenger.nsi b/projects/tor-messenger/tor-messenger.nsi new file mode 100644 index 0000000..e1862d1 --- /dev/null +++ b/projects/tor-messenger/tor-messenger.nsi @@ -0,0 +1,167 @@ +;NSIS Installer for Tor Browser Bundle +;Written by Moritz Bartl +;released under Public Domain + +;-------------------------------- +;Modern" UI + + !include "MUI2.nsh" + +;-------------------------------- +;General + + ; location of Tor Browser bundle to put into installer + !define TBBSOURCE ".\Tor Browser\" + + Name "Tor Browser" + OutFile "torbrowser-install.exe" + + ;Default installation folder + InstallDir "$DESKTOP\Tor Browser" + + ;Best (but slowest) compression + SetCompressor /SOLID lzma + SetCompressorDictSize 32 + + ;Request application privileges for Windows Vista + RequestExecutionLevel user + +;-------------------------------- +;Interface Configuration + + !define MUI_ICON "torbrowser.ico" + !define MUI_ABORTWARNING + +;-------------------------------- +;Modern UI settings + !define MUI_FINISHPAGE_NOREBOOTSUPPORT ; we don't require a reboot + !define MUI_FINISHPAGE_RUN + !define MUI_FINISHPAGE_RUN_FUNCTION "StartTorBrowser" + !define MUI_FINISHPAGE_SHOWREADME ; misuse for option to create shortcut; less ugly than MUI_PAGE_COMPONENTS + !define MUI_FINISHPAGE_SHOWREADME_TEXT "&Add Start Menu && Desktop shortcuts" + !define MUI_FINISHPAGE_SHOWREADME_FUNCTION "CreateShortCuts" +;-------------------------------- +;Pages + + !define MUI_PAGE_CUSTOMFUNCTION_LEAVE CheckIfTargetDirectoryExists + !insertmacro MUI_PAGE_DIRECTORY + !insertmacro MUI_PAGE_INSTFILES + !insertmacro MUI_PAGE_FINISH + +;-------------------------------- +;Languages + + !insertmacro MUI_LANGUAGE "English" ;first language is the default language + !insertmacro MUI_LANGUAGE "French" + !insertmacro MUI_LANGUAGE "German" + !insertmacro MUI_LANGUAGE "Spanish" + !insertmacro MUI_LANGUAGE "SpanishInternational" + !insertmacro MUI_LANGUAGE "SimpChinese" + !insertmacro MUI_LANGUAGE "TradChinese" + !insertmacro MUI_LANGUAGE "Japanese" + !insertmacro MUI_LANGUAGE "Korean" + !insertmacro MUI_LANGUAGE "Italian" + !insertmacro MUI_LANGUAGE "Dutch" + !insertmacro MUI_LANGUAGE "Danish" + !insertmacro MUI_LANGUAGE "Swedish" + !insertmacro MUI_LANGUAGE "Norwegian" + !insertmacro MUI_LANGUAGE "NorwegianNynorsk" + !insertmacro MUI_LANGUAGE "Finnish" + !insertmacro MUI_LANGUAGE "Greek" + !insertmacro MUI_LANGUAGE "Russian" + !insertmacro MUI_LANGUAGE "Portuguese" + !insertmacro MUI_LANGUAGE "PortugueseBR" + !insertmacro MUI_LANGUAGE "Polish" + !insertmacro MUI_LANGUAGE "Ukrainian" + !insertmacro MUI_LANGUAGE "Czech" + !insertmacro MUI_LANGUAGE "Slovak" + !insertmacro MUI_LANGUAGE "Croatian" + !insertmacro MUI_LANGUAGE "Bulgarian" + !insertmacro MUI_LANGUAGE "Hungarian" + !insertmacro MUI_LANGUAGE "Thai" + !insertmacro MUI_LANGUAGE "Romanian" + !insertmacro MUI_LANGUAGE "Latvian" + !insertmacro MUI_LANGUAGE "Macedonian" + !insertmacro MUI_LANGUAGE "Estonian" + !insertmacro MUI_LANGUAGE "Turkish" + !insertmacro MUI_LANGUAGE "Lithuanian" + !insertmacro MUI_LANGUAGE "Slovenian" + !insertmacro MUI_LANGUAGE "Serbian" + !insertmacro MUI_LANGUAGE "SerbianLatin" + !insertmacro MUI_LANGUAGE "Arabic" + !insertmacro MUI_LANGUAGE "Farsi" + !insertmacro MUI_LANGUAGE "Hebrew" + !insertmacro MUI_LANGUAGE "Indonesian" + !insertmacro MUI_LANGUAGE "Mongolian" + !insertmacro MUI_LANGUAGE "Luxembourgish" + !insertmacro MUI_LANGUAGE "Albanian" + !insertmacro MUI_LANGUAGE "Breton" + !insertmacro MUI_LANGUAGE "Belarusian" + !insertmacro MUI_LANGUAGE "Icelandic" + !insertmacro MUI_LANGUAGE "Malay" + !insertmacro MUI_LANGUAGE "Bosnian" + !insertmacro MUI_LANGUAGE "Kurdish" + !insertmacro MUI_LANGUAGE "Irish" + !insertmacro MUI_LANGUAGE "Uzbek" + !insertmacro MUI_LANGUAGE "Galician" + !insertmacro MUI_LANGUAGE "Afrikaans" + !insertmacro MUI_LANGUAGE "Catalan" + !insertmacro MUI_LANGUAGE "Esperanto" + +;-------------------------------- +;Multi Language support: Read strings from separate file + +; !include torbrowser-langstrings.nsi + +;-------------------------------- +;Reserve Files + + ;If you are using solid compression, files that are required before + ;the actual installation should be stored first in the data block, + ;because this will make your installer start faster. + + !insertmacro MUI_RESERVEFILE_LANGDLL + +;-------------------------------- +;Installer Sections + +Section "Tor Browser Bundle" SecTBB + + SetOutPath "$INSTDIR" + File /r "${TBBSOURCE}\*.*" + SetOutPath "$INSTDIR\Browser" + CreateShortCut "$INSTDIR\Start Tor Browser.lnk" "$INSTDIR\Browser\firefox.exe" + +SectionEnd + +Function CreateShortcuts + + CreateShortCut "$SMPROGRAMS\Start Tor Browser.lnk" "$INSTDIR\Browser\firefox.exe" + CreateShortCut "$DESKTOP\Start Tor Browser.lnk" "$INSTDIR\Browser\firefox.exe" + +FunctionEnd +;-------------------------------- +;Installer Functions + +Function .onInit + + !insertmacro MUI_LANGDLL_DISPLAY + +FunctionEnd + +;-------------------------------- +;Helper Functions + +Function CheckIfTargetDirectoryExists +${If} ${FileExists} "$INSTDIR\*.*" + MessageBox MB_YESNO "The destination directory already exists. You can try to upgrade the Tor Browser Bundle, but if you run into any problems, use a new directory instead. Continue?" IDYES NoAbort + Abort + NoAbort: +${EndIf} +FunctionEnd + + +Function StartTorBrowser +ExecShell "open" "$INSTDIR/Start Tor Browser.lnk" +FunctionEnd +

1 0

[stem/master] Fix handling for HS_DESC_CONTENT without descriptors
by atagar＠torproject.org 26 Apr '15

26 Apr '15

commit da4550ddf5b4d29d05876c15dbda52713817984e Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Apr 25 18:38:07 2015 -0700 Fix handling for HS_DESC_CONTENT without descriptors When you issue a HSFETCH for something that doesn't exist tor provides a HS_DESC_CONTENT without a descriptor. This is great, but we didn't properly handle it. Also, we didn't strip the 'OK' at the end before attempting to parse the descriptor content. --- stem/response/events.py | 10 +++++++--- test/unit/response/events.py | 17 +++++++++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/stem/response/events.py b/stem/response/events.py index 47d6a0f..438d1e5 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -691,9 +691,13 @@ class HSDescContentEvent(Event): except stem.ProtocolError: raise stem.ProtocolError("HS_DESC_CONTENT's directory doesn't match a ServerSpec: %s" % self) - self.descriptor = list(stem.descriptor.hidden_service_descriptor._parse_file( - io.BytesIO(str_tools._to_bytes('\n'.join(str(self).splitlines()[1:]))), - ))[0] + # skip the first line (our positional arguments) and last ('OK') + + desc_content = str_tools._to_bytes('\n'.join(str(self).splitlines()[1:-1])) + self.descriptor = None + + if desc_content: + self.descriptor = list(stem.descriptor.hidden_service_descriptor._parse_file(io.BytesIO(desc_content)))[0] class LogEvent(Event): diff --git a/test/unit/response/events.py b/test/unit/response/events.py index 2797a02..756e531 100644 --- a/test/unit/response/events.py +++ b/test/unit/response/events.py @@ -274,6 +274,13 @@ nHIs1lSrV7Ux2WQ3qSVj505fTGSCmaQRBX726ZlTPW0= 650 OK """ +HS_DESC_CONTENT_EMPTY_EVENT = """\ +650+HS_DESC_CONTENT 3g2upl4pq6kufc4n 255tjwttk3wi7r2df57nuprs72j2daa3 $D7A0C3262724F2BC9646F6836E967A2777A3AF83~tsunaminitor + +. +650 OK +""" + # NEWCONSENSUS event from v0.2.1.30. NEWCONSENSUS_EVENT = """650+NEWCONSENSUS @@ -886,6 +893,16 @@ class TestEvents(unittest.TestCase): self.assertEqual(3, len(desc.introduction_points())) self.assertTrue('s9Z0zWHsoPu' in desc.signature) + event = _get_event(HS_DESC_CONTENT_EMPTY_EVENT) + + self.assertTrue(isinstance(event, stem.response.events.HSDescContentEvent)) + self.assertEqual('3g2upl4pq6kufc4n', event.address) + self.assertEqual('255tjwttk3wi7r2df57nuprs72j2daa3', event.descriptor_id) + self.assertEqual('$D7A0C3262724F2BC9646F6836E967A2777A3AF83~tsunaminitor', event.directory) + self.assertEqual('D7A0C3262724F2BC9646F6836E967A2777A3AF83', event.directory_fingerprint) + self.assertEqual('tsunaminitor', event.directory_nickname) + self.assertEqual(None, event.descriptor) + def test_newdesc_event(self): event = _get_event(NEWDESC_SINGLE) expected_relays = (('B3FA3110CC6F42443F039220C134CBD2FC4F0493', 'Sakura'),)

1 0

[stem/master] Support for fetching hidden service descriptors
by atagar＠torproject.org 26 Apr '15

26 Apr '15

commit 8a90aa4d0b67efd40c911caf53b15f73b1b94b70 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Apr 25 20:03:06 2015 -0700 Support for fetching hidden service descriptors Hazaa, HSFETCH was merged! Add a Controller method to take advantage of it so we can now provide hidden service descriptors. --- docs/change_log.rst | 1 + stem/control.py | 100 ++++++++++++++++++++++++++++++++++++-- stem/interpreter/settings.cfg | 6 +++ stem/response/events.py | 2 +- stem/util/tor_tools.py | 19 ++++++++ stem/version.py | 4 ++ test/integ/control/controller.py | 31 ++++++++++++ test/unit/response/events.py | 2 +- 8 files changed, 159 insertions(+), 6 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 47f2a49..4e2bf98 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -51,6 +51,7 @@ conversion (:trac:`14075`). * **Controller** + * Added :func:`~stem.control.Controller.get_hidden_service_descriptor` and `support for HS_DESC_CONTENT events <api/response.html#stem.response.events.HSDescContentEvent>`_ (:trac:`14847`, :spec:`aaf2434`) * :func:`~stem.process.launch_tor_with_config` avoids writing a temporary torrc to disk if able (:trac:`13865`) * :class:`~stem.response.events.CircuitEvent` support for the new SOCKS_USERNAME and SOCKS_PASSWORD arguments (:trac:`14555`, :spec:`2975974`) * The 'strict' argument of :func:`~stem.exit_policy.ExitPolicy.can_exit_to` didn't behave as documented (:trac:`14314`) diff --git a/stem/control.py b/stem/control.py index a688d21..48171d0 100644 --- a/stem/control.py +++ b/stem/control.py @@ -88,6 +88,7 @@ If you're fine with allowing your script to raise exceptions then this can be mo |- get_server_descriptors - provides all currently available server descriptors |- get_network_status - querying the router status entry for a relay |- get_network_statuses - provides all preently available router status entries + |- get_hidden_service_descriptor - queries the given hidden service descriptor | |- get_conf - gets the value of a configuration option |- get_conf_map - gets the values of multiple configuration options @@ -1823,6 +1824,99 @@ class Controller(BaseController): for desc in desc_iterator: yield desc + @with_default() + def get_hidden_service_descriptor(self, address, default = UNDEFINED, servers = None, await_result = True): + """ + get_hidden_service_descriptor(address, default = UNDEFINED, servers = None, await_result = True) + + Provides the descriptor for a hidden service. The **address** is the + '.onion' address of the hidden service (for instance 3g2upl4pq6kufc4m.onion + for DuckDuckGo). + + If **await_result** is **True** then this blocks until we either receive + the descriptor or the request fails. If **False** this returns right away. + + .. versionadded:: 1.4.0 + + :param str address: address of the hidden service descriptor, the '.onion' suffix is optional + :param object default: response if the query fails + :param list servers: requrest the descriptor from these specific servers + + :returns: :class:`~stem.descriptor.hidden_service_descriptor.HiddenServiceDescriptor` + for the given service if **await_result** is **True**, or **None** otherwise + + :raises: + * :class:`stem.DescriptorUnavailable` if **await_result** is **True** and + unable to provide a descriptor for the given service + * :class:`stem.ControllerError` if unable to query the descriptor + * **ValueError** if **address** doesn't conform with the pattern of a + hidden service address + + An exception is only raised if we weren't provided a default response. + """ + + if address.endswith('.onion'): + address = address[:-6] + + if not stem.util.tor_tools.is_valid_hidden_service_address(address): + raise ValueError("'%s.onion' isn't a valid hidden service address" % address) + + # TODO: Uncomment the below when tor makes its 0.2.7.1 release. + # if self.get_version() < stem.version.Requirement.HSFETCH: + # raise stem.UnsatisfiableRequest(message = 'HSFETCH was added in tor version %s' % stem.version.Requirement.HSFETCH) + + hs_desc_queue, hs_desc_listener = queue.Queue(), None + hs_desc_content_queue, hs_desc_content_listener = queue.Queue(), None + + if await_result: + def hs_desc_listener(event): + hs_desc_queue.put(event) + + def hs_desc_content_listener(event): + hs_desc_content_queue.put(event) + + self.add_event_listener(hs_desc_listener, EventType.HS_DESC) + self.add_event_listener(hs_desc_content_listener, EventType.HS_DESC_CONTENT) + + try: + request = 'HSFETCH %s' % address + + if servers: + request += ' '.join(['SERVER=%s' % s for s in servers]) + + response = self.msg(request) + stem.response.convert('SINGLELINE', response) + + if not response.is_ok(): + raise stem.ProtocolError('HSFETCH returned unexpected response code: %s' % response.code) + + if not await_result: + return None # not waiting, so nothing to provide back + else: + while True: + event = hs_desc_content_queue.get() + + if event.address == address: + if event.descriptor: + return event.descriptor + else: + # no descriptor, looking through HS_DESC to figure out why + + while True: + event = hs_desc_queue.get() + + if event.address == address and event.action == stem.HSDescAction.FAILED: + if event.reason == stem.HSDescReason.NOT_FOUND: + raise stem.DescriptorUnavailable('No running hidden service at %s.onion' % address) + else: + raise stem.DescriptorUnavailable('Unable to retrieve the descriptor for %s.onion (retrieved from %s): %s' % (address, event.directory_fingerprint, event.reason)) + finally: + if hs_desc_listener: + self.remove_event_listener(hs_desc_listener) + + if hs_desc_content_listener: + self.remove_event_listener(hs_desc_content_listener) + def get_conf(self, param, default = UNDEFINED, multiple = False): """ Queries the current value for a configuration option. Some configuration @@ -2818,11 +2912,9 @@ class Controller(BaseController): # to build. This is icky, but we can't reliably do this via polling since # we then can't get the failure if it can't be created. - circ_queue, circ_listener = None, None + circ_queue, circ_listener = queue.Queue(), None if await_build: - circ_queue = queue.Queue() - def circ_listener(event): circ_queue.put(event) @@ -3152,7 +3244,7 @@ class Controller(BaseController): """ if self.get_version() < stem.version.Requirement.DROPGUARDS: - raise stem.UnsatisfiableRequest('DROPGUARDS was added in tor version %s' % stem.version.Requirement.DROPGUARDS) + raise stem.UnsatisfiableRequest(message = 'DROPGUARDS was added in tor version %s' % stem.version.Requirement.DROPGUARDS) self.msg('DROPGUARDS') diff --git a/stem/interpreter/settings.cfg b/stem/interpreter/settings.cfg index 290e646..696ff3f 100644 --- a/stem/interpreter/settings.cfg +++ b/stem/interpreter/settings.cfg @@ -81,6 +81,7 @@ help.general | ATTACHSTREAM - associates an application's stream with a tor circuit | REDIRECTSTREAM - sets a stream's destination | CLOSESTREAM - closes the given stream +| HSFETCH - retrieve a hidden service descriptor, providing it in a HS_DESC_CONTENT event | RESOLVE - issues an asynchronous dns or rdns request over tor | TAKEOWNERSHIP - instructs tor to quit when this control connection is closed | PROTOCOLINFO - queries version and controller authentication information @@ -112,6 +113,7 @@ help.usage CLOSECIRCUIT => CLOSECIRCUIT CircuitID [IfUnused] help.usage ATTACHSTREAM => ATTACHSTREAM StreamID CircuitID [HOP=HopNum] help.usage REDIRECTSTREAM => REDIRECTSTREAM StreamID Address [Port] help.usage CLOSESTREAM => CLOSESTREAM StreamID Reason [Flag] +help.usage HSFETCH => HSFETCH (HSAddress/v2-DescId) [SERVER=Server]... help.usage RESOLVE => RESOLVE [mode=reverse] address help.usage TAKEOWNERSHIP => TAKEOWNERSHIP help.usage PROTOCOLINFO => PROTOCOLINFO [ProtocolVersion] @@ -245,6 +247,10 @@ help.description.closestream |Closes the given stream, the reason being an integer matching a reason as |per section 6.3 of the tor-spec. +help.description.hsfetch +|Retrieves the descriptor for a hidden service. This is an asynchronous +|request, with the descriptor provided by a HS_DESC_CONTENT event. + help.description.resolve |Performs IPv4 DNS resolution over tor, doing a reverse lookup instead if |"mode=reverse" is included. This request is processed in the background and diff --git a/stem/response/events.py b/stem/response/events.py index 438d1e5..e03f269 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -674,7 +674,7 @@ class HSDescContentEvent(Event): :var stem.descriptor.hidden_service_descriptor.HiddenServiceDescriptor descriptor: descriptor that was retrieved """ - # TODO: Double check that this version is correct when #14847 is merged, then add to stem.version.Requirement. + # TODO: Uncomment the below when tor makes its 0.2.7.1 release. # _VERSION_ADDED = stem.version.Requirement.EVENT_HS_DESC_CONTENT _POSITIONAL_ARGS = ('address', 'descriptor_id', 'directory') diff --git a/stem/util/tor_tools.py b/stem/util/tor_tools.py index 333fddc..01c29ee 100644 --- a/stem/util/tor_tools.py +++ b/stem/util/tor_tools.py @@ -15,6 +15,7 @@ Miscellaneous utility functions for working with tor. is_valid_circuit_id - checks if a string is a valid tor circuit id is_valid_stream_id - checks if a string is a valid tor stream id is_valid_connection_id - checks if a string is a valid tor connection id + is_valid_hidden_service_address - checks if a string is a valid hidden service address is_hex_digits - checks if a string is only made up of hex digits """ @@ -36,6 +37,10 @@ import re NICKNAME_PATTERN = re.compile('^[a-zA-Z0-9]{1,19}$') CIRC_ID_PATTERN = re.compile('^[a-zA-Z0-9]{1,16}$') +# Hidden service addresses are sixteen base32 characters. + +HS_ADDRESS_PATTERN = re.compile('^[a-z2-7]{16}$') + def is_valid_fingerprint(entry, check_prefix = False): """ @@ -111,6 +116,20 @@ def is_valid_connection_id(entry): return is_valid_circuit_id(entry) +def is_valid_hidden_service_address(entry): + """ + Checks if a string is a valid format for being a hidden service address (not + including the '.onion' suffix). + + :returns: **True** if the string could be a hidden service address, **False** otherwise + """ + + try: + return bool(HS_ADDRESS_PATTERN.match(entry)) + except TypeError: + return False + + def is_hex_digits(entry, count): """ Checks if a string is the given number of hex digits. Digits represented by diff --git a/stem/version.py b/stem/version.py index 0e451b5..2289a3d 100644 --- a/stem/version.py +++ b/stem/version.py @@ -38,6 +38,7 @@ easily parsed and compared, for instance... **EVENT_CONF_CHANGED** CONF_CHANGED events **EVENT_DESCCHANGED** DESCCHANGED events **EVENT_GUARD** GUARD events + **EVENT_HS_DESC_CONTENT** HS_DESC_CONTENT events **EVENT_NEWCONSENSUS** NEWCONSENSUS events **EVENT_NS** NS events **EVENT_SIGNAL** SIGNAL events @@ -53,6 +54,7 @@ easily parsed and compared, for instance... **FEATURE_EXTENDED_EVENTS** 'EXTENDED_EVENTS' optional feature **FEATURE_VERBOSE_NAMES** 'VERBOSE_NAMES' optional feature **GETINFO_CONFIG_TEXT** 'GETINFO config-text' query + **HSFETCH** HSFETCH requests **LOADCONF** LOADCONF requests **MICRODESCRIPTOR_IS_DEFAULT** Tor gets microdescriptors by default rather than server descriptors **TAKEOWNERSHIP** TAKEOWNERSHIP requests @@ -343,6 +345,7 @@ Requirement = stem.util.enum.Enum( ('EVENT_CONF_CHANGED', Version('0.2.3.3-alpha')), ('EVENT_DESCCHANGED', Version('0.1.2.2-alpha')), ('EVENT_GUARD', Version('0.1.2.5-alpha')), + ('EVENT_HS_DESC_CONTENT', Version('0.2.7.1-alpha')), ('EVENT_NS', Version('0.1.2.3-alpha')), ('EVENT_NEWCONSENSUS', Version('0.2.1.13-alpha')), ('EVENT_SIGNAL', Version('0.2.3.1-alpha')), @@ -358,6 +361,7 @@ Requirement = stem.util.enum.Enum( ('FEATURE_EXTENDED_EVENTS', Version('0.2.2.1-alpha')), ('FEATURE_VERBOSE_NAMES', Version('0.2.2.1-alpha')), ('GETINFO_CONFIG_TEXT', Version('0.2.2.7-alpha')), + ('HSFETCH', Version('0.2.7.1-alpha')), ('LOADCONF', Version('0.2.1.1')), ('MICRODESCRIPTOR_IS_DEFAULT', Version('0.2.3.3')), ('TAKEOWNERSHIP', Version('0.2.2.28-beta')), diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index f5eef33..01480ba 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -1130,6 +1130,37 @@ class TestController(unittest.TestCase): if count > 10: break + # TODO: Uncomment the below when tor makes its 0.2.7.1 release. + # @require_version(Requirement.HSFETCH) + + @require_controller + @require_online + def test_get_hidden_service_descriptor(self): + """ + Fetches a few descriptors via the get_hidden_service_descriptor() method. + """ + + runner = test.runner.get_runner() + + with runner.get_tor_controller() as controller: + # fetch the descriptor for DuckDuckGo + + desc = controller.get_hidden_service_descriptor('3g2upl4pq6kufc4m.onion') + self.assertTrue('MIGJAoGBAJ' in desc.permanent_key) + + # try to fetch something that doesn't exist + + try: + desc = controller.get_hidden_service_descriptor('m4cfuk6qp4lpu2g3') + self.fail("Didn't expect m4cfuk6qp4lpu2g3.onion to exist, but provided: %s" % desc) + except stem.DescriptorUnavailable as exc: + self.assertEqual('No running hidden service at m4cfuk6qp4lpu2g3.onion', str(exc)) + + # ... but shouldn't fail if we have a default argument or aren't awaiting the descriptor + + self.assertEqual('pop goes the weasel', controller.get_hidden_service_descriptor('m4cfuk6qp4lpu2g5', 'pop goes the weasel')) + self.assertEqual(None, controller.get_hidden_service_descriptor('m4cfuk6qp4lpu2g5', await_result = False)) + @require_controller @require_online @require_version(Requirement.EXTENDCIRCUIT_PATH_OPTIONAL) diff --git a/test/unit/response/events.py b/test/unit/response/events.py index 756e531..e5ddc1a 100644 --- a/test/unit/response/events.py +++ b/test/unit/response/events.py @@ -206,7 +206,7 @@ HS_DESC_FAILED = '650 HS_DESC FAILED ajhb7kljbiru65qo NO_AUTH \ $67B2BDA4264D8A189D9270E28B1D30A262838243 \ b3oeducbhjmbqmgw2i3jtz4fekkrinwj REASON=NOT_FOUND' -# HS_DESC_CONTENT is unreleased (plan is tor 0.2.7.1-alpha, #14847) +# HS_DESC_CONTENT from 0.2.7.1 HS_DESC_CONTENT_EVENT = """\ 650+HS_DESC_CONTENT facebookcorewwwi riwvyw6njgvs4koel4heqs7w4bssnmlw $8A30C9E8F5954EE286D29BD65CADEA6991200804~YorkshireTOR

1 0

[tor-messenger-build/master] Rename accountcreation.patch to top-protocols.patch
by sukhbir＠torproject.org 25 Apr '15

25 Apr '15

commit f4dd3e5f03418524758ab00b939911b01b3a1278 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Apr 25 09:52:00 2015 -0400 Rename accountcreation.patch to top-protocols.patch --- projects/instantbird/accountcreation.patch | 26 -------------------------- projects/instantbird/config | 2 +- projects/instantbird/top-protocols.patch | 26 ++++++++++++++++++++++++++ 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/projects/instantbird/accountcreation.patch b/projects/instantbird/accountcreation.patch deleted file mode 100644 index c6c58a5..0000000 --- a/projects/instantbird/accountcreation.patch +++ /dev/null @@ -1,26 +0,0 @@ -# HG changeset patch -# User Sukhbir Singh <sukhbir(a)torproject.org> -# Date 1414029949 -19800 -# Thu Oct 23 07:35:49 2014 +0530 -# Node ID 947732f86131ec2882340344ba0c29cc9943de48 -# Parent 1d142c56cdf63cb3b0bcab81607c72c4b8a04599 -Redesign the account creation protocol screen (closes #13323) - -diff --git a/im/locales/en-US/chrome/instantbird/accountWizard.properties b/im/locales/en-US/chrome/instantbird/accountWizard.properties ---- a/im/locales/en-US/chrome/instantbird/accountWizard.properties -+++ b/im/locales/en-US/chrome/instantbird/accountWizard.properties -@@ -8,11 +8,13 @@ - # Exceeding 4 protocols may cause scrolling. A list of the - # available protocols can be found at - # https://wiki.instantbird.org/Protocol_Identifiers --topProtocol.list=prpl-gtalk,prpl-facebook,prpl-twitter,prpl-aim,prpl-msn,prpl-yahoo -+topProtocol.list=prpl-irc,prpl-jabber,prpl-gtalk,prpl-facebook - - # LOCALIZATION NOTE - # These are the descriptions of the top protocols specified above. - # A description should be provided for each protocol ID listed above. -+topProtocol.prpl-irc.description=Connect to your favourite IRC network -+topProtocol.prpl-jabber.description=Chat with friends using XMPP - topProtocol.prpl-gtalk.description=Talk to your Gmail contacts - topProtocol.prpl-facebook.description=Communicate with Facebook friends - topProtocol.prpl-twitter.description=Stay up to date with your Twitter timeline diff --git a/projects/instantbird/config b/projects/instantbird/config index ca653ff..c9593c9 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -61,7 +61,7 @@ input_files: - filename: irc.patch - filename: xmpp.patch - filename: gtalk-resource.patch - - filename: accountcreation.patch + - filename: top-protocols.patch - filename: disable-links.patch - filename: account-picture.patch - filename: show-traffic-tor.patch diff --git a/projects/instantbird/top-protocols.patch b/projects/instantbird/top-protocols.patch new file mode 100644 index 0000000..c6c58a5 --- /dev/null +++ b/projects/instantbird/top-protocols.patch @@ -0,0 +1,26 @@ +# HG changeset patch +# User Sukhbir Singh <sukhbir(a)torproject.org> +# Date 1414029949 -19800 +# Thu Oct 23 07:35:49 2014 +0530 +# Node ID 947732f86131ec2882340344ba0c29cc9943de48 +# Parent 1d142c56cdf63cb3b0bcab81607c72c4b8a04599 +Redesign the account creation protocol screen (closes #13323) + +diff --git a/im/locales/en-US/chrome/instantbird/accountWizard.properties b/im/locales/en-US/chrome/instantbird/accountWizard.properties +--- a/im/locales/en-US/chrome/instantbird/accountWizard.properties ++++ b/im/locales/en-US/chrome/instantbird/accountWizard.properties +@@ -8,11 +8,13 @@ + # Exceeding 4 protocols may cause scrolling. A list of the + # available protocols can be found at + # https://wiki.instantbird.org/Protocol_Identifiers +-topProtocol.list=prpl-gtalk,prpl-facebook,prpl-twitter,prpl-aim,prpl-msn,prpl-yahoo ++topProtocol.list=prpl-irc,prpl-jabber,prpl-gtalk,prpl-facebook + + # LOCALIZATION NOTE + # These are the descriptions of the top protocols specified above. + # A description should be provided for each protocol ID listed above. ++topProtocol.prpl-irc.description=Connect to your favourite IRC network ++topProtocol.prpl-jabber.description=Chat with friends using XMPP + topProtocol.prpl-gtalk.description=Talk to your Gmail contacts + topProtocol.prpl-facebook.description=Communicate with Facebook friends + topProtocol.prpl-twitter.description=Stay up to date with your Twitter timeline

1 0

[tor-messenger-build/master] And also update the config file
by sukhbir＠torproject.org 25 Apr '15

25 Apr '15

commit 554f5a72bab934feb9495ff41e34cda63512c8de Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Apr 25 09:46:16 2015 -0400 And also update the config file --- projects/instantbird/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/instantbird/config b/projects/instantbird/config index 9e1565e..ca653ff 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -66,7 +66,7 @@ input_files: - filename: account-picture.patch - filename: show-traffic-tor.patch - filename: theme-extension-update.patch - - filename: installer.patch + - filename: cert-installer.patch - filename: cert_override.txt - filename: ctcp-time.patch - filename: ctcp-ping.patch

1 0

[tor-messenger-build/master] installer.patch is for cert_override.txt
by sukhbir＠torproject.org 25 Apr '15

25 Apr '15

commit cc71b2eee5941e20f02e7dc735532c0a33712d13 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Apr 25 09:45:26 2015 -0400 installer.patch is for cert_override.txt --- projects/instantbird/cert-installer.patch | 39 +++++++++++++++++++++++++++++ projects/instantbird/installer.patch | 39 ----------------------------- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/projects/instantbird/cert-installer.patch b/projects/instantbird/cert-installer.patch new file mode 100644 index 0000000..3ba7e32 --- /dev/null +++ b/projects/instantbird/cert-installer.patch @@ -0,0 +1,39 @@ +diff --git a/im/app/profile/Makefile.in b/im/app/profile/Makefile.in +index 4f48e97..4e02fdf 100644 +--- a/im/app/profile/Makefile.in ++++ b/im/app/profile/Makefile.in +@@ -15,6 +15,7 @@ include $(topsrcdir)/config/rules.mk + FILES := \ + mimeTypes.rdf \ + localstore.rdf \ ++ cert_override.txt \ + $(NULL) + + libs:: $(FILES) +diff --git a/im/installer/Makefile.in b/im/installer/Makefile.in +index 0234b21..5d20e62 100644 +--- a/im/installer/Makefile.in ++++ b/im/installer/Makefile.in +@@ -113,7 +113,9 @@ MOZ_PKG_MAC_ICON=branding/disk.icns + MOZ_PKG_MAC_EXTRA=--symlink "/Applications:/ " + endif + +-NON_OMNIJAR_FILES = ++NON_OMNIJAR_FILES = \ ++ defaults/profile/cert_override.txt \ ++ $(NULL) + + ifndef LIBXUL_SDK + INSTALL_SDK = 1 +diff --git a/im/installer/package-manifest.in b/im/installer/package-manifest.in +index edf01b1..78db5e4 100644 +--- a/im/installer/package-manifest.in ++++ b/im/installer/package-manifest.in +@@ -155,6 +155,7 @@ + @RESPATH@/defaults/profile/localstore.rdf + @RESPATH@/defaults/profile/prefs.js + @RESPATH@/defaults/profile/mimeTypes.rdf ++@RESPATH@/defaults/profile/cert_override.txt + + #ifdef XP_MACOSX + @RESPATH@/components/ibDockBadge.js diff --git a/projects/instantbird/installer.patch b/projects/instantbird/installer.patch deleted file mode 100644 index 3ba7e32..0000000 --- a/projects/instantbird/installer.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/im/app/profile/Makefile.in b/im/app/profile/Makefile.in -index 4f48e97..4e02fdf 100644 ---- a/im/app/profile/Makefile.in -+++ b/im/app/profile/Makefile.in -@@ -15,6 +15,7 @@ include $(topsrcdir)/config/rules.mk - FILES := \ - mimeTypes.rdf \ - localstore.rdf \ -+ cert_override.txt \ - $(NULL) - - libs:: $(FILES) -diff --git a/im/installer/Makefile.in b/im/installer/Makefile.in -index 0234b21..5d20e62 100644 ---- a/im/installer/Makefile.in -+++ b/im/installer/Makefile.in -@@ -113,7 +113,9 @@ MOZ_PKG_MAC_ICON=branding/disk.icns - MOZ_PKG_MAC_EXTRA=--symlink "/Applications:/ " - endif - --NON_OMNIJAR_FILES = -+NON_OMNIJAR_FILES = \ -+ defaults/profile/cert_override.txt \ -+ $(NULL) - - ifndef LIBXUL_SDK - INSTALL_SDK = 1 -diff --git a/im/installer/package-manifest.in b/im/installer/package-manifest.in -index edf01b1..78db5e4 100644 ---- a/im/installer/package-manifest.in -+++ b/im/installer/package-manifest.in -@@ -155,6 +155,7 @@ - @RESPATH@/defaults/profile/localstore.rdf - @RESPATH@/defaults/profile/prefs.js - @RESPATH@/defaults/profile/mimeTypes.rdf -+@RESPATH@/defaults/profile/cert_override.txt - - #ifdef XP_MACOSX - @RESPATH@/components/ibDockBadge.js

1 0

[tor-messenger-build/master] Make the patch names more descriptive
by sukhbir＠torproject.org 25 Apr '15

25 Apr '15

commit ac0645aaadd50e4e8cf6ea5a55296878be4d7e93 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Apr 25 09:42:16 2015 -0400 Make the patch names more descriptive --- projects/instantbird/account-picture.patch | 30 +++++++++++++++++++++++++++ projects/instantbird/config | 6 +++--- projects/instantbird/disable-links.patch | 22 ++++++++++++++++++++ projects/instantbird/links.patch | 22 -------------------- projects/instantbird/picture.patch | 30 --------------------------- projects/instantbird/show-traffic-tor.patch | 25 ++++++++++++++++++++++ projects/instantbird/trafficinfo.patch | 25 ---------------------- 7 files changed, 80 insertions(+), 80 deletions(-) diff --git a/projects/instantbird/account-picture.patch b/projects/instantbird/account-picture.patch new file mode 100644 index 0000000..14a3ed3 --- /dev/null +++ b/projects/instantbird/account-picture.patch @@ -0,0 +1,30 @@ +# HG changeset patch +# User Sukhbir Singh <sukhbir(a)torproject.org> +# Date 1415618519 18000 +# Node ID 6193b9d64e63818366e61126625727543fb81d3f +# Parent 09d259c6155857eda3d4488c68a4a9d8d851138f +Disable the account picture dialog + +diff --git a/im/content/blist.xul b/im/content/blist.xul +--- a/im/content/blist.xul ++++ b/im/content/blist.xul +@@ -109,18 +109,17 @@ + </menupopup> + </popupset> + + <toolbox id="mainToolbox"> + <toolbar id="statusArea"> + <stack id="statusImageStack"> +  + <box id="userIconHolder"> +- <image id="userIcon" role="button" popup="changeUserIconPanel" +- aria-label="&userIcon.label;" tooltiptext="&userIcon.label;"/> ++ <image id="userIcon" role="button"/> + </box> + <panel id="changeUserIconPanel" + type="arrow" align="center" + onpopupshowing="buddyList.updateUserIconPanelItems();" + onpopuphiding="buddyList.stopWebcamStream();"> + <deck id="userIconPanel"> + <vbox class="userIconPanelMenu"> + <stack id="userIconPanelStack" flex="1"> diff --git a/projects/instantbird/config b/projects/instantbird/config index 6911882..9e1565e 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -62,9 +62,9 @@ input_files: - filename: xmpp.patch - filename: gtalk-resource.patch - filename: accountcreation.patch - - filename: links.patch - - filename: picture.patch - - filename: trafficinfo.patch + - filename: disable-links.patch + - filename: account-picture.patch + - filename: show-traffic-tor.patch - filename: theme-extension-update.patch - filename: installer.patch - filename: cert_override.txt diff --git a/projects/instantbird/disable-links.patch b/projects/instantbird/disable-links.patch new file mode 100644 index 0000000..d90b0a7 --- /dev/null +++ b/projects/instantbird/disable-links.patch @@ -0,0 +1,22 @@ +# HG changeset patch +# User Sukhbir Singh <sukhbir(a)torproject.org> +# Date 1415125946 -19800 +# Wed Nov 05 00:02:26 2014 +0530 +# Node ID fe384d60035532dd4b81248a345525359ea2f98f +# Parent 947732f86131ec2882340344ba0c29cc9943de48 +Remove formatting for URLs in chat window + +diff --git a/chat/modules/imContentSink.jsm b/chat/modules/imContentSink.jsm +--- a/chat/modules/imContentSink.jsm ++++ b/chat/modules/imContentSink.jsm +@@ -58,10 +58,6 @@ + attrs: { }, + + tags: { +- 'a': { +- 'title': true, +- 'href': kAllowedURLs +- }, + 'br': true, + 'p': true + }, diff --git a/projects/instantbird/links.patch b/projects/instantbird/links.patch deleted file mode 100644 index d90b0a7..0000000 --- a/projects/instantbird/links.patch +++ /dev/null @@ -1,22 +0,0 @@ -# HG changeset patch -# User Sukhbir Singh <sukhbir(a)torproject.org> -# Date 1415125946 -19800 -# Wed Nov 05 00:02:26 2014 +0530 -# Node ID fe384d60035532dd4b81248a345525359ea2f98f -# Parent 947732f86131ec2882340344ba0c29cc9943de48 -Remove formatting for URLs in chat window - -diff --git a/chat/modules/imContentSink.jsm b/chat/modules/imContentSink.jsm ---- a/chat/modules/imContentSink.jsm -+++ b/chat/modules/imContentSink.jsm -@@ -58,10 +58,6 @@ - attrs: { }, - - tags: { -- 'a': { -- 'title': true, -- 'href': kAllowedURLs -- }, - 'br': true, - 'p': true - }, diff --git a/projects/instantbird/picture.patch b/projects/instantbird/picture.patch deleted file mode 100644 index 14a3ed3..0000000 --- a/projects/instantbird/picture.patch +++ /dev/null @@ -1,30 +0,0 @@ -# HG changeset patch -# User Sukhbir Singh <sukhbir(a)torproject.org> -# Date 1415618519 18000 -# Node ID 6193b9d64e63818366e61126625727543fb81d3f -# Parent 09d259c6155857eda3d4488c68a4a9d8d851138f -Disable the account picture dialog - -diff --git a/im/content/blist.xul b/im/content/blist.xul ---- a/im/content/blist.xul -+++ b/im/content/blist.xul -@@ -109,18 +109,17 @@ - </menupopup> - </popupset> - - <toolbox id="mainToolbox"> - <toolbar id="statusArea"> - <stack id="statusImageStack"> -  - <box id="userIconHolder"> -- <image id="userIcon" role="button" popup="changeUserIconPanel" -- aria-label="&userIcon.label;" tooltiptext="&userIcon.label;"/> -+ <image id="userIcon" role="button"/> - </box> - <panel id="changeUserIconPanel" - type="arrow" align="center" - onpopupshowing="buddyList.updateUserIconPanelItems();" - onpopuphiding="buddyList.stopWebcamStream();"> - <deck id="userIconPanel"> - <vbox class="userIconPanelMenu"> - <stack id="userIconPanelStack" flex="1"> diff --git a/projects/instantbird/show-traffic-tor.patch b/projects/instantbird/show-traffic-tor.patch new file mode 100644 index 0000000..c571b79 --- /dev/null +++ b/projects/instantbird/show-traffic-tor.patch @@ -0,0 +1,25 @@ +diff --git a/im/content/accountWizard.xul b/im/content/accountWizard.xul +index 5fa5b82..46447ff 100644 +--- a/im/content/accountWizard.xul ++++ b/im/content/accountWizard.xul +@@ -39,6 +39,8 @@ + <description class="top-proto-description" value="&accountProtocolShowMore.description;"/> + </richlistitem> + </richlistbox> ++ <separator class="thin"/> ++ <description>&accountProtocolInfo.label3;</description> + </wizardpage> + + <wizardpage id="accountprotocol" pageid="accountprotocol" next="accountusername" +diff --git a/im/locales/en-US/chrome/instantbird/accountWizard.dtd b/im/locales/en-US/chrome/instantbird/accountWizard.dtd +index 43d0f19..5492985 100644 +--- a/im/locales/en-US/chrome/instantbird/accountWizard.dtd ++++ b/im/locales/en-US/chrome/instantbird/accountWizard.dtd +@@ -6,6 +6,7 @@ + + <!ENTITY accountProtocolTitle.label "Protocol"> + <!ENTITY accountProtocolInfo.label2 "Please choose the protocol of your IM account."> ++<!ENTITY accountProtocolInfo.label3 "All traffic will be routed over the Tor network."> + <!ENTITY accountProtocolGetMore.label "Get more…"> + <!ENTITY accountProtocolShowMore.label "Show all protocols"> + <!ENTITY accountProtocolShowMore.description "Choose from the full list of protocols"> diff --git a/projects/instantbird/trafficinfo.patch b/projects/instantbird/trafficinfo.patch deleted file mode 100644 index c571b79..0000000 --- a/projects/instantbird/trafficinfo.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/im/content/accountWizard.xul b/im/content/accountWizard.xul -index 5fa5b82..46447ff 100644 ---- a/im/content/accountWizard.xul -+++ b/im/content/accountWizard.xul -@@ -39,6 +39,8 @@ - <description class="top-proto-description" value="&accountProtocolShowMore.description;"/> - </richlistitem> - </richlistbox> -+ <separator class="thin"/> -+ <description>&accountProtocolInfo.label3;</description> - </wizardpage> - - <wizardpage id="accountprotocol" pageid="accountprotocol" next="accountusername" -diff --git a/im/locales/en-US/chrome/instantbird/accountWizard.dtd b/im/locales/en-US/chrome/instantbird/accountWizard.dtd -index 43d0f19..5492985 100644 ---- a/im/locales/en-US/chrome/instantbird/accountWizard.dtd -+++ b/im/locales/en-US/chrome/instantbird/accountWizard.dtd -@@ -6,6 +6,7 @@ - - <!ENTITY accountProtocolTitle.label "Protocol"> - <!ENTITY accountProtocolInfo.label2 "Please choose the protocol of your IM account."> -+<!ENTITY accountProtocolInfo.label3 "All traffic will be routed over the Tor network."> - <!ENTITY accountProtocolGetMore.label "Get more…"> - <!ENTITY accountProtocolShowMore.label "Show all protocols"> - <!ENTITY accountProtocolShowMore.description "Choose from the full list of protocols">

1 0

[tor-messenger-build/master] Set Instantbird version to stable (1.5)
by sukhbir＠torproject.org 25 Apr '15

25 Apr '15

commit 964155070646a308d7b472445ad4fd7c75d56007 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Apr 25 09:34:14 2015 -0400 Set Instantbird version to stable (1.5) --- projects/instantbird/config | 1 + projects/instantbird/version.patch | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/projects/instantbird/config b/projects/instantbird/config index d8f2b38..6911882 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -70,6 +70,7 @@ input_files: - filename: cert_override.txt - filename: ctcp-time.patch - filename: ctcp-ping.patch + - filename: version.patch - filename: branding/name.patch - filename: branding/default.png - filename: branding/default16.png diff --git a/projects/instantbird/version.patch b/projects/instantbird/version.patch new file mode 100644 index 0000000..a47cde1 --- /dev/null +++ b/projects/instantbird/version.patch @@ -0,0 +1,7 @@ +diff --git a/im/config/version.txt b/im/config/version.txt +index 57b62cb..c239c60 100644 +--- a/im/config/version.txt ++++ b/im/config/version.txt +@@ -1 +1 @@ +-1.6a1pre ++1.5

1 0

[tor-messenger-build/master] Add patch for disabling CTCP ping (#15161)
by sukhbir＠torproject.org 25 Apr '15

25 Apr '15

commit f178822e46362ae8be523493da678ff239c8c1a4 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Apr 25 09:30:18 2015 -0400 Add patch for disabling CTCP ping (#15161) --- projects/instantbird/config | 1 + projects/instantbird/ctcp-ping.patch | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/projects/instantbird/config b/projects/instantbird/config index f0c81a9..d8f2b38 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -69,6 +69,7 @@ input_files: - filename: installer.patch - filename: cert_override.txt - filename: ctcp-time.patch + - filename: ctcp-ping.patch - filename: branding/name.patch - filename: branding/default.png - filename: branding/default16.png diff --git a/projects/instantbird/ctcp-ping.patch b/projects/instantbird/ctcp-ping.patch new file mode 100644 index 0000000..fb09179 --- /dev/null +++ b/projects/instantbird/ctcp-ping.patch @@ -0,0 +1,25 @@ +diff --git a/chat/protocols/irc/ircCTCP.jsm b/chat/protocols/irc/ircCTCP.jsm +index 5722479..4c2d5bf 100644 +--- a/chat/protocols/irc/ircCTCP.jsm ++++ b/chat/protocols/irc/ircCTCP.jsm +@@ -167,19 +167,7 @@ var ctcpBase = { + }, + + // Used to measure the delay of the IRC network between clients. +- "PING": function(aMessage) { +- // PING timestamp +- if (aMessage.command == "PRIVMSG") { +- // Received PING request, send PING response. +- this.LOG("Received PING request from " + aMessage.origin + +- ". Sending PING response: \"" + aMessage.ctcp.param + "\"."); +- this.sendCTCPMessage(aMessage.origin, true, "PING", +- aMessage.ctcp.param); +- return true; +- } +- else +- return this.handlePingReply(aMessage.origin, aMessage.ctcp.param); +- }, ++ // "PING": function(aMessage) { + + // These are commented out since CLIENTINFO automatically returns the + // supported CTCP parameters and this is not supported.

1 0

[tor-messenger-build/master] Remove redundant whitespace in ctcp-time.patch
by sukhbir＠torproject.org 25 Apr '15

25 Apr '15

commit 0cf962f5d21226d95d274a8cd2ea9080c7155f1b Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Apr 25 06:29:22 2015 -0400 Remove redundant whitespace in ctcp-time.patch --- projects/instantbird/ctcp-time.patch | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/projects/instantbird/ctcp-time.patch b/projects/instantbird/ctcp-time.patch index 749cd36..20572e0 100644 --- a/projects/instantbird/ctcp-time.patch +++ b/projects/instantbird/ctcp-time.patch @@ -1,5 +1,5 @@ diff --git a/chat/protocols/irc/ircCTCP.jsm b/chat/protocols/irc/ircCTCP.jsm -index 5722479..642fad3 100644 +index 5722479..6b82caa 100644 --- a/chat/protocols/irc/ircCTCP.jsm +++ b/chat/protocols/irc/ircCTCP.jsm @@ -195,7 +195,7 @@ var ctcpBase = { @@ -11,11 +11,3 @@ index 5722479..642fad3 100644 this.LOG("Received TIME request from " + aMessage.origin + ". Sending TIME response: \"" + now + "\"."); this.sendCTCPMessage(aMessage.origin, true, "TIME", ":" + now); -@@ -230,6 +230,7 @@ var ctcpBase = { - this.sendCTCPMessage(aMessage.origin, true, "VERSION", version); - } - else if (aMessage.command == "NOTICE" && aMessage.ctcp.param.length) { -+ - // VERSION #:#:# - // Received VERSION response, display to the user. - let response = _("ctcp.version", aMessage.origin,

1 0