Skip to content

Fix for missing disconnect when using gmp version autodetection #659

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
BaaaZen wants to merge 2 commits into from
Closed

Fix for missing disconnect when using gmp version autodetection #659

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aac9134
Fix for missing disconnect when using gmp version autodetection
mirkohansen-rbt Jan 27, 2022
5742a30
Newline
BaaaZen Jan 27, 2022
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
17 changes: 10 additions & 7 deletions gvm/protocols/gmp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"""
from typing import Any, Optional, Callable, Union

from gvm.errors import GvmError
from gvm.errors import GvmClientError, GvmError

from gvm.protocols.base import GvmProtocol, GvmConnection

Expand All @@ -48,7 +48,7 @@ class Gmp(GvmProtocol):

from gvm.protocols.gmp import Gmp

with Gmp(connection) as gmp:
with Gmp(connection).supported_gmp as gmp:
# gmp can be an instance of gvm.protocols.gmpv208.Gmp,
# gvm.protocols.gmpv214.Gmp depending
# on the supported GMP version of the remote manager daemon
Expand Down Expand Up @@ -113,9 +113,12 @@ def determine_supported_gmp(self) -> SUPPORTED_GMP_VERSIONS:

return gmp_class(self._connection, transform=self._gmp_transform)

def __enter__(self):
gmp = self.determine_supported_gmp()

gmp.connect()
@property
def supported_gmp(self):
return self.determine_supported_gmp()

return gmp
def __enter__(self):
raise GvmClientError(
'You may not use Gmp for context directly. Please use property '
'supported_gmp instead.'
)