Merge branch 'lextudio:main' into fixed_cache_leak

lextudio · Nov 12, 2024 · 3357df9 · 3357df9
2 parents fa36bd0 + e391ad5
commit 3357df9
Show file tree

Hide file tree

Showing 4 changed files with 71 additions and 7 deletions.
diff --git a/pysnmp/hlapi/v1arch/asyncio/cmdgen.py b/pysnmp/hlapi/v1arch/asyncio/cmdgen.py
@@ -705,10 +705,11 @@ async def walk_cmd(
     Examples
     --------
     >>> from pysnmp.hlapi.v1arch.asyncio import *
-    >>> g = await walk_cmd(SnmpEngine(),
+    >>> objects = walk_cmd(SnmpEngine(),
     ...             CommunityData('public'),
     ...             await UdpTransportTarget.create(('demo.pysnmp.com', 161)),
     ...             ObjectType(ObjectIdentity('SNMPv2-MIB', 'sysDescr')))
+    ... g = [item async for item in objects]
     >>> next(g)
     (None, 0, 0, [ObjectType(ObjectIdentity(ObjectName('1.3.6.1.2.1.1.1.0')), DisplayString('SunOS zeus.pysnmp.com 4.1.3_U1 1 sun4m'))])
     >>> g.send( [ ObjectType(ObjectIdentity('IF-MIB', 'ifInOctets')) ] )
@@ -902,11 +903,12 @@ async def bulk_walk_cmd(
     Examples
     --------
     >>> from pysnmp.hlapi.v1arch.asyncio import *
-    >>> g = await bulk_walk_cmd(SnmpEngine(),
+    >>> objects = bulk_walk_cmd(SnmpEngine(),
     ...             CommunityData('public'),
     ...             await UdpTransportTarget.create(('demo.pysnmp.com', 161)),
     ...             0, 25,
     ...             ObjectType(ObjectIdentity('SNMPv2-MIB', 'sysDescr')))
+    ... g = [item async for item in objects]
     >>> next(g)
     (None, 0, 0, [ObjectType(ObjectIdentity(ObjectName('1.3.6.1.2.1.1.1.0')), DisplayString('SunOS zeus.pysnmp.com 4.1.3_U1 1 sun4m'))])
     >>> g.send( [ ObjectType(ObjectIdentity('IF-MIB', 'ifInOctets')) ] )

diff --git a/pysnmp/hlapi/v3arch/asyncio/cmdgen.py b/pysnmp/hlapi/v3arch/asyncio/cmdgen.py
@@ -707,11 +707,12 @@ async def walk_cmd(
     Examples
     --------
     >>> from pysnmp.hlapi.v3arch.asyncio import *
-    >>> g = await walk_cmd(SnmpEngine(),
+    >>> objects = walk_cmd(SnmpEngine(),
     ...             CommunityData('public'),
     ...             await UdpTransportTarget.create(('demo.pysnmp.com', 161)),
     ...             ContextData(),
     ...             ObjectType(ObjectIdentity('SNMPv2-MIB', 'sysDescr')))
+    ... g = [item async for item in objects]
     >>> next(g)
     (None, 0, 0, [ObjectType(ObjectIdentity(ObjectName('1.3.6.1.2.1.1.1.0')), DisplayString('SunOS zeus.pysnmp.com 4.1.3_U1 1 sun4m'))])
     >>> g.send( [ ObjectType(ObjectIdentity('IF-MIB', 'ifInOctets')) ] )
@@ -910,12 +911,13 @@ async def bulk_walk_cmd(
     Examples
     --------
     >>> from pysnmp.hlapi.v3arch.asyncio import *
-    >>> g = await bulk_walk_cmd(SnmpEngine(),
+    >>> objects = bulk_walk_cmd(SnmpEngine(),
     ...             CommunityData('public'),
     ...             await UdpTransportTarget.create(('demo.pysnmp.com', 161)),
     ...             ContextData(),
     ...             0, 25,
     ...             ObjectType(ObjectIdentity('SNMPv2-MIB', 'sysDescr')))
+    ... g = [item async for item in objects]
     >>> next(g)
     (None, 0, 0, [ObjectType(ObjectIdentity(ObjectName('1.3.6.1.2.1.1.1.0')), DisplayString('SunOS zeus.pysnmp.com 4.1.3_U1 1 sun4m'))])
     >>> g.send( [ ObjectType(ObjectIdentity('IF-MIB', 'ifInOctets')) ] )

diff --git a/pysnmp/proto/mpmod/rfc3412.py b/pysnmp/proto/mpmod/rfc3412.py
@@ -661,11 +661,11 @@ def prepare_data_elements(
 
         # 7.2.5
         if msgFlags & 0x03 == 0x00:
-            securityLevel = 1
+            securityLevel = 1  # noAuthNoPriv
         elif (msgFlags & 0x03) == 0x01:
-            securityLevel = 2
+            securityLevel = 2  # authNoPriv
         elif (msgFlags & 0x03) == 0x03:
-            securityLevel = 3
+            securityLevel = 3  # authPriv
         else:
             (snmpInvalidMsgs,) = snmpEngine.get_mib_builder().import_symbols(
                 "__SNMP-MPD-MIB", "snmpInvalidMsgs"

diff --git a/tests/hlapi/v3arch/asyncio/agent/ntforg/test_v3-trap.py b/tests/hlapi/v3arch/asyncio/agent/ntforg/test_v3-trap.py
@@ -1,4 +1,5 @@
 import asyncio
+import socket
 import pytest
 
 
@@ -61,3 +62,62 @@ async def test_send_v3_trap_notification_invalid_user():
         snmpEngine.close_dispatcher()
         await asyncio.sleep(1)
         assert message_count == [0]
+
+
+hex_dump = """
+30 81 BC 02  01 03 30 11  02 04 61 03  A8 E3 02 03
+00 FF E3 04  01 03 02 01  03 04 3A 30  38 04 08 80
+00 00 00 01  02 03 04 02  01 01 02 04  05 35 84 3C
+04 0B 75 73  72 2D 6D 64  35 2D 64 65  73 04 0C 36
+04 72 CD 9B  57 02 49 45  C2 86 F6 04  08 00 00 00
+0C CB C9 9A  08 04 68 2B  7D 70 58 59  12 E1 9F CC
+A7 74 AD D7  1F 89 D4 BD  6B 8A D4 93  50 E5 31 82
+98 45 C5 2A  23 CA 0A D2  3B A0 CF 59  C4 96 58 D3
+CC 1A 8C 8F  87 82 FC 27  E4 AC 6B 54  8A 28 B9 D3
+FA CD 92 E6  62 0C FB 65  42 62 9E CE  76 34 A9 02
+3C CF 3A 05  7C 1F 3C B2  D3 0E B4 2F  8A 66 CB B4
+10 66 A8 F4  A9 E3 D8 3C  44 BE 28 52  AC 70 27
+"""
+# copied from snmptrap -d -v3 -l authPriv -u usr-md5-des -A authkey1 -X privkey1 -e 8000000001020304 localhost:1622 0 1.3.6.1.6.3.1.1.5.1 1.3.6.1.2.1.1.1.0 s "my system"
+
+
+def hex_dump_to_bytes(hex_dump):
+    # Split the hex dump into lines
+    lines = hex_dump.strip().split("\n")
+
+    # Extract the hex bytes from each line
+    hex_bytes = []
+    for line in lines:
+        # Skip the beginning of the line (offset) and drop the end of the line (non-hex characters)
+        hex_part = line.replace(" ", "")
+        hex_bytes.append(hex_part)
+
+    # Join all hex bytes into a single string
+    hex_string = "".join(hex_bytes)
+
+    # Convert the hex string to a byte array
+    return bytes.fromhex(hex_string)
+
+
+@pytest.mark.asyncio
+async def test_send_v3_trap_notification_raw():
+    async with ManagerContextManager() as (_, message_count):
+        raw_bytes = hex_dump_to_bytes(hex_dump)
+        sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+        sock.sendto(raw_bytes, ("localhost", MANAGER_PORT))
+        await asyncio.sleep(1)
+        assert message_count == [1]
+
+
+@pytest.mark.asyncio
+async def test_send_v3_trap_notification_invalid_msg_flags():
+    async with ManagerContextManager() as (_, message_count):
+        raw_bytes = bytearray(hex_dump_to_bytes(hex_dump))
+        assert raw_bytes[21] == 0x03  # check the original value
+        raw_bytes[
+            21
+        ] = 0x02  # manually changed line 2, "04  01 03" to "04  01 02" to make the message invalid
+        sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+        sock.sendto(raw_bytes, ("localhost", MANAGER_PORT))
+        await asyncio.sleep(1)
+        assert message_count == [0]