Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions gvm/protocols/gmp/_gmp227.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class GMPv227(GMPv226[T]):
def get_protocol_version() -> tuple[int, int]:
return (22, 7)

def create_scanner( # type:ignore[override]
def create_scanner( # type: ignore[override]
self,
name: str,
host: str,
Expand Down Expand Up @@ -76,7 +76,7 @@ def create_scanner( # type:ignore[override]
)
)

def modify_scanner( # type:ignore[override]
def modify_scanner( # type: ignore[override]
self,
scanner_id: EntityID,
*,
Expand Down
1 change: 1 addition & 0 deletions gvm/transforms.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"""
Module for transforming responses
"""

from lxml import etree

from gvm.protocols.core import Response
Expand Down
24 changes: 8 additions & 16 deletions tests/connections/test_ssh_connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -154,16 +154,14 @@ def test_connect_no_known_hosts_file(self):
@patch("builtins.print")
def test_connect_adding_and_save_hostkey(self, _print_mock):
input_mock = MagicMock(spec=input)
key_io = StringIO(
"""-----BEGIN OPENSSH PRIVATE KEY-----
key_io = StringIO("""-----BEGIN OPENSSH PRIVATE KEY-----
b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
QyNTUxOQAAACB69SvZKJh/9VgSL0G27b5xVYa8nethH3IERbi0YqJDXwAAAKhjwAdrY8AH
awAAAAtzc2gtZWQyNTUxOQAAACB69SvZKJh/9VgSL0G27b5xVYa8nethH3IERbi0YqJDXw
AAAEA9tGQi2IrprbOSbDCF+RmAHd6meNSXBUQ2ekKXm4/8xnr1K9komH/1WBIvQbbtvnFV
hryd62EfcgRFuLRiokNfAAAAI2FsZXhfZ2F5bm9yQEFsZXhzLU1hY0Jvb2stQWlyLmxvY2
FsAQI=
-----END OPENSSH PRIVATE KEY-----"""
)
-----END OPENSSH PRIVATE KEY-----""")
key = paramiko.Ed25519Key.from_private_key(key_io)
key_type = key.get_name().replace("ssh-", "").upper()
hostname = "0.0.0.0"
Expand Down Expand Up @@ -205,16 +203,14 @@ def test_connect_adding_and_save_hostkey(self, _print_mock):
@patch("builtins.print")
def test_connect_adding_and_dont_save_hostkey(self, _print_mock):
input_mock = MagicMock(spec=input)
key_io = StringIO(
"""-----BEGIN OPENSSH PRIVATE KEY-----
key_io = StringIO("""-----BEGIN OPENSSH PRIVATE KEY-----
b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
QyNTUxOQAAACB69SvZKJh/9VgSL0G27b5xVYa8nethH3IERbi0YqJDXwAAAKhjwAdrY8AH
awAAAAtzc2gtZWQyNTUxOQAAACB69SvZKJh/9VgSL0G27b5xVYa8nethH3IERbi0YqJDXw
AAAEA9tGQi2IrprbOSbDCF+RmAHd6meNSXBUQ2ekKXm4/8xnr1K9komH/1WBIvQbbtvnFV
hryd62EfcgRFuLRiokNfAAAAI2FsZXhfZ2F5bm9yQEFsZXhzLU1hY0Jvb2stQWlyLmxvY2
FsAQI=
-----END OPENSSH PRIVATE KEY-----"""
)
-----END OPENSSH PRIVATE KEY-----""")
key = paramiko.Ed25519Key.from_private_key(key_io)
key_type = key.get_name().replace("ssh-", "").upper()
hostname = "0.0.0.0"
Expand Down Expand Up @@ -257,16 +253,14 @@ def test_connect_adding_and_dont_save_hostkey(self, _print_mock):
def test_connect_wrong_input(self):
input_mock = MagicMock(spec=input)
stdout_mock = StringIO()
key_io = StringIO(
"""-----BEGIN OPENSSH PRIVATE KEY-----
key_io = StringIO("""-----BEGIN OPENSSH PRIVATE KEY-----
b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
QyNTUxOQAAACB69SvZKJh/9VgSL0G27b5xVYa8nethH3IERbi0YqJDXwAAAKhjwAdrY8AH
awAAAAtzc2gtZWQyNTUxOQAAACB69SvZKJh/9VgSL0G27b5xVYa8nethH3IERbi0YqJDXw
AAAEA9tGQi2IrprbOSbDCF+RmAHd6meNSXBUQ2ekKXm4/8xnr1K9komH/1WBIvQbbtvnFV
hryd62EfcgRFuLRiokNfAAAAI2FsZXhfZ2F5bm9yQEFsZXhzLU1hY0Jvb2stQWlyLmxvY2
FsAQI=
-----END OPENSSH PRIVATE KEY-----"""
)
-----END OPENSSH PRIVATE KEY-----""")
key = paramiko.Ed25519Key.from_private_key(key_io)
hostname = "0.0.0.0"
key_type = key.get_name().replace("ssh-", "").upper()
Expand Down Expand Up @@ -309,16 +303,14 @@ def test_user_denies_auth(self):
input_mock = MagicMock(spec=input)
stdout_mock = StringIO()
exit_mock = MagicMock(side_effect=AbortException("Exit called"))
key_io = StringIO(
"""-----BEGIN OPENSSH PRIVATE KEY-----
key_io = StringIO("""-----BEGIN OPENSSH PRIVATE KEY-----
b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
QyNTUxOQAAACB69SvZKJh/9VgSL0G27b5xVYa8nethH3IERbi0YqJDXwAAAKhjwAdrY8AH
awAAAAtzc2gtZWQyNTUxOQAAACB69SvZKJh/9VgSL0G27b5xVYa8nethH3IERbi0YqJDXw
AAAEA9tGQi2IrprbOSbDCF+RmAHd6meNSXBUQ2ekKXm4/8xnr1K9komH/1WBIvQbbtvnFV
hryd62EfcgRFuLRiokNfAAAAI2FsZXhfZ2F5bm9yQEFsZXhzLU1hY0Jvb2stQWlyLmxvY2
FsAQI=
-----END OPENSSH PRIVATE KEY-----"""
)
-----END OPENSSH PRIVATE KEY-----""")
key = paramiko.Ed25519Key.from_private_key(key_io)
hostname = "0.0.0.0"
input_mock.return_value = "no"
Expand Down
Loading
Loading