diff options
Diffstat (limited to 'deluge/core')
| -rw-r--r-- | deluge/core/core.py | 3 | ||||
| -rw-r--r-- | deluge/core/preferencesmanager.py | 5 | ||||
| -rw-r--r-- | deluge/core/rpcserver.py | 9 |
3 files changed, 15 insertions, 2 deletions
diff --git a/deluge/core/core.py b/deluge/core/core.py index e2130f5..e621a45 100644 --- a/deluge/core/core.py +++ b/deluge/core/core.py @@ -373,8 +373,9 @@ class Core(component.Component): def get_new_release(self): log.debug('get_new_release') try: + # Use HTTPS URL to avoid potential spoofing of release page. self.new_release = ( - urlopen('http://download.deluge-torrent.org/version-2.0') + urlopen('https://ftp.osuosl.org/pub/deluge/version-2.0') .read() .decode() .strip() diff --git a/deluge/core/preferencesmanager.py b/deluge/core/preferencesmanager.py index 7e5c207..4dbf4d1 100644 --- a/deluge/core/preferencesmanager.py +++ b/deluge/core/preferencesmanager.py @@ -200,7 +200,10 @@ class PreferencesManager(component.Component): def __set_listen_on(self): """Set the ports and interface address to listen for incoming connections on.""" if self.config['random_port']: - if not self.config['listen_random_port']: + if ( + not self.config['listen_reuse_port'] + or not self.config['listen_random_port'] + ): self.config['listen_random_port'] = random.randrange(49152, 65525) listen_ports = [ self.config['listen_random_port'] diff --git a/deluge/core/rpcserver.py b/deluge/core/rpcserver.py index d84ac3a..bfaeacc 100644 --- a/deluge/core/rpcserver.py +++ b/deluge/core/rpcserver.py @@ -28,6 +28,7 @@ from deluge.core.authmanager import ( ) from deluge.crypto_utils import check_ssl_keys, get_context_factory from deluge.error import ( + BadLoginError, DelugeError, IncompatibleClient, NotAuthorizedError, @@ -281,6 +282,14 @@ class DelugeRPCProtocol(DelugeTransferProtocol): send_error() if not isinstance(ex, _ClientSideRecreateError): log.exception(ex) + if isinstance(ex, BadLoginError): + peer = self.transport.getPeer() + log.error( + 'Deluge client authentication error made from: %s:%s (%s)', + peer.host, + peer.port, + str(ex), + ) else: self.sendData((RPC_RESPONSE, request_id, (ret))) if not ret: |