diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-05-26 09:08:49 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-05-26 09:08:49 +0100 |
commit | 720452fca3cdf447b4c65bc3bb363032a983309e (patch) | |
tree | babdd1cb196da2b5da2e481505e2e492cb4fe458 /dev-python/paramiko/files/paramiko-3.2.0-disable-server.patch | |
parent | 5923f7107d7596f9ecb6a86b451105462668601c (diff) |
gentoo auto-resync : 26:05:2023 - 09:08:49
Diffstat (limited to 'dev-python/paramiko/files/paramiko-3.2.0-disable-server.patch')
-rw-r--r-- | dev-python/paramiko/files/paramiko-3.2.0-disable-server.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/dev-python/paramiko/files/paramiko-3.2.0-disable-server.patch b/dev-python/paramiko/files/paramiko-3.2.0-disable-server.patch new file mode 100644 index 000000000000..942f5161ee6f --- /dev/null +++ b/dev-python/paramiko/files/paramiko-3.2.0-disable-server.patch @@ -0,0 +1,58 @@ +From a47e9bdc80224c9ceafcea6da5cea1539ddfbd4d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> +Date: Fri, 26 May 2023 06:05:13 +0200 +Subject: [PATCH 3/3] Disable server component due to security issues + +--- + paramiko/transport.py | 4 ++++ + tests/conftest.py | 5 +++++ + 2 files changed, 9 insertions(+) + +diff --git a/paramiko/transport.py b/paramiko/transport.py +index 8785d6bb..803d07d1 100644 +--- a/paramiko/transport.py ++++ b/paramiko/transport.py +@@ -120,6 +120,8 @@ from paramiko.util import ( + ) + + ++SERVER_DISABLED_BY_GENTOO = True ++ + # for thread cleanup + _active_threads = [] + +@@ -768,6 +770,8 @@ class Transport(threading.Thread, ClosingContextManager): + `.SSHException` -- if negotiation fails (and no ``event`` was + passed in) + """ ++ if SERVER_DISABLED_BY_GENTOO: ++ raise Exception("Disabled by Gentoo for security reasons. Enable with 'server' USE flag") + if server is None: + server = ServerInterface() + self.server_mode = True +diff --git a/tests/conftest.py b/tests/conftest.py +index 7546aae4..804a289e 100644 +--- a/tests/conftest.py ++++ b/tests/conftest.py +@@ -16,6 +16,7 @@ from paramiko import ( + Ed25519Key, + ECDSAKey, + PKey, ++ transport, + ) + + from ._loop import LoopSocket +@@ -23,6 +24,10 @@ from ._stub_sftp import StubServer, StubSFTPServer + from ._util import _support + + ++# We need the server component for testing ++transport.SERVER_DISABLED_BY_GENTOO = False ++ ++ + # Perform logging by default; pytest will capture and thus hide it normally, + # presenting it on error/failure. (But also allow turning it off when doing + # very pinpoint debugging - e.g. using breakpoints, so you don't want output +-- +2.40.1 + |