Scrapy, a fast high-level web crawling & scraping framework for Python.
Generate only password, encode username/password only on login
Henrique Courae57a629efc08
diff --git a/scrapy/extensions/telnet.py b/scrapy/extensions/telnet.pyindex 3d0afeffb..6df435cef 100644--- a/scrapy/extensions/telnet.py+++ b/scrapy/extensions/telnet.py@@ -53,20 +53,14 @@ class TelnetConsole(protocol.ServerFactory):self.portrange = [int(x) for x in crawler.settings.getlist('TELNETCONSOLE_PORT')]self.host = crawler.settings['TELNETCONSOLE_HOST']- username = crawler.settings.get('TELNETCONSOLE_USERNAME', None)- if username:- self.username = username.encode('utf8')- else:- self.username = binascii.hexlify(os.urandom(8))-- password = crawler.settings.get('TELNETCONSOLE_PASSWORD', None)- if password:- self.password = password.encode('utf8')- else:- self.password = binascii.hexlify(os.urandom(8))-- logger.info('Telnet Username: %s' % self.username)- logger.info('Telnet Password: %s' % self.password)+ self.username = crawler.settings['TELNETCONSOLE_USERNAME']+ self.password = crawler.settings['TELNETCONSOLE_PASSWORD']++ if not self.password:+ self.password = binascii.hexlify(os.urandom(8)).decode('utf8')+ logger.info('Telnet Username: %s', self.username)+ logger.info('Telnet Password: %s', self.password)+self.crawler.signals.connect(self.start_listening, signals.engine_started)self.crawler.signals.connect(self.stop_listening, signals.engine_stopped)@@ -89,8 +83,8 @@ class TelnetConsole(protocol.ServerFactory):"""An implementation of IPortal"""@defersdef login(self_, credentials, mind, *interfaces):- if not (credentials.username == self.username and- credentials.checkPassword(self.password)):+ if not (credentials.username == self.username.encode('utf8') and+ credentials.checkPassword(self.password.encode('utf8'))):raise ValueError("Invalid credentials")protocol = telnet.TelnetBootstrapProtocol(diff --git a/scrapy/settings/default_settings.py b/scrapy/settings/default_settings.pyindex ca004aedd..3734a0a58 100644--- a/scrapy/settings/default_settings.py+++ b/scrapy/settings/default_settings.py@@ -277,6 +277,8 @@ USER_AGENT = 'Scrapy/%s (+https://scrapy.org)' % import_module('scrapy').__versiTELNETCONSOLE_ENABLED = 1TELNETCONSOLE_PORT = [6023, 6073]TELNETCONSOLE_HOST = '127.0.0.1'+TELNETCONSOLE_USERNAME = 'scrapy'+TELNETCONSOLE_PASSWORD = NoneSPIDER_CONTRACTS = {}SPIDER_CONTRACTS_BASE = {diff --git a/tests/test_extension_telnet.py b/tests/test_extension_telnet.pyindex ffea1c463..487c7c29f 100644--- a/tests/test_extension_telnet.py+++ b/tests/test_extension_telnet.py@@ -41,7 +41,10 @@ class TelnetExtensionTest(unittest.TestCase):@defer.inlineCallbacksdef test_good_credentials(self):console, portal = self._get_console_and_portal()- creds = credentials.UsernamePassword(console.username, console.password)+ creds = credentials.UsernamePassword(+ console.username.encode('utf8'),+ console.password.encode('utf8')+ )d = portal.login(creds, None, ITelnetProtocol)yield dconsole.stop_listening()