Some bugfixes for Notes/Overrides (#759)

* Fix: severity values of '0' have not been passed to gvmd

* Fix: Check port in overrides/notes like in [gvmd](greenbone/gvmd@56ab13b)

Author: y0urself

gvm/protocols/gmpv208/entities/notes.py

@@ -89,7 +89,7 @@ def create_note(
         if result_id:
             cmd.add_element("result", attrs={"id": result_id})
 
-        if severity:
+        if severity is not None:
             cmd.add_element("severity", str(severity))
 
         if task_id:
@@ -259,7 +259,7 @@ def modify_note(
         if result_id:
             cmd.add_element("result", attrs={"id": result_id})
 
-        if severity:
+        if severity is not None:
             cmd.add_element("severity", str(severity))
 
         if task_id:

gvm/protocols/gmpv208/entities/overrides.py

@@ -92,10 +92,10 @@ def create_override(
         if result_id:
             cmd.add_element("result", attrs={"id": result_id})
 
-        if severity:
+        if severity is not None:
             cmd.add_element("severity", str(severity))
 
-        if new_severity:
+        if new_severity is not None:
             cmd.add_element("new_severity", str(new_severity))
 
         if task_id:
@@ -281,10 +281,10 @@ def modify_override(
         if result_id:
             cmd.add_element("result", attrs={"id": result_id})
 
-        if severity:
+        if severity is not None:
             cmd.add_element("severity", str(severity))
 
-        if new_severity:
+        if new_severity is not None:
             cmd.add_element("new_severity", str(new_severity))
 
         if task_id:

gvm/protocols/gmpv214/entities/notes.py

@@ -89,7 +89,7 @@ def create_note(
         if result_id:
             cmd.add_element("result", attrs={"id": result_id})
 
-        if severity:
+        if severity is not None:
             cmd.add_element("severity", str(severity))
 
         if task_id:
@@ -165,7 +165,7 @@ def modify_note(
         if result_id:
             cmd.add_element("result", attrs={"id": result_id})
 
-        if severity:
+        if severity is not None:
             cmd.add_element("severity", str(severity))
 
         if task_id:

gvm/protocols/gmpv214/entities/overrides.py

@@ -94,10 +94,10 @@ def create_override(
         if result_id:
             cmd.add_element("result", attrs={"id": result_id})
 
-        if severity:
+        if severity is not None:
             cmd.add_element("severity", str(severity))
 
-        if new_severity:
+        if new_severity is not None:
             cmd.add_element("new_severity", str(new_severity))
 
         if task_id:
@@ -184,10 +184,10 @@ def modify_override(
         if result_id:
             cmd.add_element("result", attrs={"id": result_id})
 
-        if severity:
+        if severity is not None:
             cmd.add_element("severity", str(severity))
 
-        if new_severity:
+        if new_severity is not None:
             cmd.add_element("new_severity", str(new_severity))
 
         if task_id:

gvm/utils.py

@@ -19,6 +19,7 @@
 # pylint: disable=arguments-differ, redefined-builtin
 
 import base64
+import re
 import warnings
 import logging
 
@@ -103,10 +104,9 @@ def is_list_like(value: Any) -> bool:
 
 
 def check_port(value: str) -> bool:
-    try:
-        port, type = value.split('/', maxsplit=1)
-        if port.isdigit() and type:
-            return True
-        return False
-    except ValueError:
-        return False
+    pattern = re.compile(
+        r"^(cpe:[^\s]+|(general|[1-9][0-9]{0,4})/[0-9A-Za-z]+)$"
+    )
+    if pattern.fullmatch(value):
+        return True
+    return False

tests/utils/test_check_port.py

@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 2022 Greenbone Networks GmbH
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import unittest
+
+from gvm.utils import check_port
+
+
+class TestCheckPort(unittest.TestCase):
+    def test_port_cpe(self):
+        self.assertTrue(check_port("cpe:meh:moo*"))
+
+    def test_port_cpe_fail(self):
+        self.assertFalse(check_port("cpe:meh haha"))
+
+    def test_port_general(self):
+        self.assertTrue(check_port("general/tcp"))
+
+    def test_ports(self):
+        self.assertTrue(check_port("1/tcp"))
+        self.assertTrue(check_port("12/tcp"))
+        self.assertTrue(check_port("123/tcp"))
+        self.assertTrue(check_port("1234/tcp"))
+        self.assertTrue(check_port("12345/tcp"))
+        self.assertTrue(check_port("1/udp"))
+        self.assertTrue(check_port("12/udp"))
+
+    def test_ports_fail(self):
+        self.assertFalse(check_port("1"))
+        self.assertFalse(check_port("1//udp"))
+        self.assertFalse(check_port("1/12/tcp"))
+        self.assertFalse(check_port("tcp"))
+        self.assertFalse(check_port("general"))
+        self.assertFalse(check_port("lol"))