pyrad 2.5.2__tar.gz → 2.5.4__tar.gz

{pyrad-2.5.2 → pyrad-2.5.4}/CHANGES.rst

@@ -1,6 +1,12 @@
 Changelog
 =========
 
+2.5.4 - Feb 5, 2026
+-------------------
+
+* remove python2 leftovers
+* add support for Ascend-Data-Filter "delete" keyword
+
 2.5.2 - Jan 29, 2026
 --------------------
 

{pyrad-2.5.2 → pyrad-2.5.4}/LICENSE.txt

@@ -1,5 +1,5 @@
-Copyright 2020 Istvan Ruzman. All rights reserved.
-Copyright 2017-2026 Christian Giese. All rights reserved.
+Copyright 2026 Christian Giese, Istvan Ruzman and Stefan Lieberth. All rights reserved.
+Copyright 2002-2025 Christian Giese and Istvan Ruzman. All rights reserved.
 Copyright 2007-2008 Simplon. All rights reserved.
 Copyright 2002-2008 Wichert Akkerman. All rights reserved.
 

{pyrad-2.5.2/pyrad.egg-info → pyrad-2.5.4}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: pyrad
-Version: 2.5.2
+Version: 2.5.4
 Summary: RADIUS tools
-Author-email: Istvan Ruzman <istvan@ruzman.eu>, Christian Giese <gic@gicnet.de>, Stefan Lieberth <stefan@lieberth.net>
+Author-email: Christian Giese <gic@gicnet.de>, Istvan Ruzman <istvan@ruzman.eu>, Stefan Lieberth <stefan@lieberth.net>
 License: BSD-3-Clause
 Project-URL: Repository, https://github.com/pyradius/pyrad
 Project-URL: Documentation, https://pyradius-pyrad.readthedocs.io
@@ -23,10 +23,8 @@ Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 Requires-Dist: netaddr>=0.8.0
-Requires-Dist: six>=1.16.0
 Provides-Extra: test
 Requires-Dist: pytest>=8; extra == "test"
-Requires-Dist: mock; python_version < "3.10" and extra == "test"
 Provides-Extra: docs
 Requires-Dist: sphinx>=7.0; extra == "docs"
 Requires-Dist: sphinx-autodoc-typehints; extra == "docs"
@@ -59,18 +57,24 @@ pyrad is an implementation of a RADIUS client/server as described in RFC2865.
 It takes care of all the details like building RADIUS packets, sending
 them and decoding responses.
 
-Here is an example of doing a authentication request::
+Here is an example of doing a authentication request:
+
+.. code-block:: python
 
     from pyrad.client import Client
     from pyrad.dictionary import Dictionary
     import pyrad.packet
 
-    srv = Client(server="localhost", secret=b"Kah3choteereethiejeimaeziecumi",
-                 dict=Dictionary("dictionary"))
+    srv = Client(
+        server="localhost",
+        secret=b"Kah3choteereethiejeimaeziecumi",
+        dict=Dictionary("dictionary"),
+    )
 
     # create request
-    req = srv.CreateAuthPacket(code=pyrad.packet.AccessRequest,
-                               User_Name="wichert", NAS_Identifier="localhost")
+    req = srv.CreateAuthPacket(
+        code=pyrad.packet.AccessRequest, User_Name="wichert", NAS_Identifier="localhost"
+    )
     req["User-Password"] = req.PwCrypt("password")
 
     # send request
@@ -82,9 +86,8 @@ Here is an example of doing a authentication request::
         print("access denied")
 
     print("Attributes returned by server:")
-    for i in reply.keys():
-        print("%s: %s" % (i, reply[i]))
-
+    for key, val in reply.items():
+        print(f"{key}: {val}")
 
 
 Requirements & Installation

{pyrad-2.5.2 → pyrad-2.5.4}/README.rst

@@ -24,18 +24,24 @@ pyrad is an implementation of a RADIUS client/server as described in RFC2865.
 It takes care of all the details like building RADIUS packets, sending
 them and decoding responses.
 
-Here is an example of doing a authentication request::
+Here is an example of doing a authentication request:
+
+.. code-block:: python
 
     from pyrad.client import Client
     from pyrad.dictionary import Dictionary
     import pyrad.packet
 
-    srv = Client(server="localhost", secret=b"Kah3choteereethiejeimaeziecumi",
-                 dict=Dictionary("dictionary"))
+    srv = Client(
+        server="localhost",
+        secret=b"Kah3choteereethiejeimaeziecumi",
+        dict=Dictionary("dictionary"),
+    )
 
     # create request
-    req = srv.CreateAuthPacket(code=pyrad.packet.AccessRequest,
-                               User_Name="wichert", NAS_Identifier="localhost")
+    req = srv.CreateAuthPacket(
+        code=pyrad.packet.AccessRequest, User_Name="wichert", NAS_Identifier="localhost"
+    )
     req["User-Password"] = req.PwCrypt("password")
 
     # send request
@@ -47,9 +53,8 @@ Here is an example of doing a authentication request::
         print("access denied")
 
     print("Attributes returned by server:")
-    for i in reply.keys():
-        print("%s: %s" % (i, reply[i]))
-
+    for key, val in reply.items():
+        print(f"{key}: {val}")
 
 
 Requirements & Installation

{pyrad-2.5.2 → pyrad-2.5.4}/docs/source/conf.py

@@ -57,9 +57,9 @@ author = u'Christian Giese <gic@gicnet.de>, Istvan Ruzman <istvan@ruzman.eu> and
 # built documents.
 #
 # The short X.Y version.
-version = u'2.5.2'
+version = u'2.5.4'
 # The full version, including alpha/beta/rc tags.
-release = u'2.5.2'
+release = u'2.5.4'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -134,7 +134,7 @@ latex_elements = {
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
     (master_doc, 'pyrad.tex', u'pyrad Documentation',
-     u'Christian Giese and Istvan Ruzman', 'manual'),
+     u'Christian Giese, Istvan Ruzman and Stefan Lieberth', 'manual'),
 ]
 
 

{pyrad-2.5.2 → pyrad-2.5.4}/pyproject.toml

@@ -10,8 +10,8 @@ readme = "README.rst"
 license = { text = "BSD-3-Clause" }
 requires-python = ">=3.8"
 authors = [
-  { name = "Istvan Ruzman", email = "istvan@ruzman.eu" },
   { name = "Christian Giese", email = "gic@gicnet.de" },
+  { name = "Istvan Ruzman", email = "istvan@ruzman.eu" },
   { name = "Stefan Lieberth", email = "stefan@lieberth.net" },
 ]
 keywords = ["radius", "authentication", "AAA", "accounting", "authorization", "RADIUS"]
@@ -32,13 +32,11 @@ classifiers = [
 
 dependencies = [
   "netaddr>=0.8.0",
-  "six>=1.16.0",
 ]
 
 [project.optional-dependencies]
 test = [
   "pytest>=8",
-  "mock; python_version<'3.10'",
 ]
 docs = [
     "sphinx>=7.0",
@@ -56,7 +54,7 @@ include-package-data = true
 zip-safe = true
 
 [tool.pytest.ini_options]
-testpaths = ["tests"]
+testpaths = ["pyrad/tests"]
 addopts = "-ra"
 
 [tool.setuptools.dynamic]

{pyrad-2.5.2 → pyrad-2.5.4}/pyrad/__init__.py

@@ -41,6 +41,6 @@ __docformat__ = 'epytext en'
 __author__ = 'Christian Giese <gic@gicnet.de>, Istvan Ruzman <istvan@ruzman.eu> and Stefan Lieberth <stefan@lieberth.net>'
 __url__ = 'http://pyrad.readthedocs.io/en/latest/?badge=latest'
 __copyright__ = 'Copyright 2002-2026 Wichert Akkerman, Christian Giese, Istvan Ruzman and Stefan Lieberth. All rights reserved.'
-__version__ = '2.5.2'
+__version__ = '2.5.4'
 
 __all__ = ['client', 'dictionary', 'packet', 'server', 'tools', 'dictfile']

{pyrad-2.5.2 → pyrad-2.5.4}/pyrad/bidict.py

@@ -3,7 +3,7 @@
 # Bidirectional map
 
 
-class BiDict(object):
+class BiDict:
     def __init__(self):
         self.forward = {}
         self.backward = {}

{pyrad-2.5.2 → pyrad-2.5.4}/pyrad/client.py

@@ -9,7 +9,6 @@ import select
 import socket
 import time
 import struct
-import six
 from pyrad import host
 from pyrad import packet
 
@@ -35,7 +34,7 @@ class Client(host.Host):
     :type timeout: float
     """
     def __init__(self, server, authport=1812, acctport=1813,
-                 coaport=3799, secret=six.b(''), dict=None, retries=3, timeout=5, enforce_ma=False):
+                 coaport=3799, secret=b'', dict=None, retries=3, timeout=5, enforce_ma=False):
         """Constructor.
 
         :param   server: hostname or IP address of RADIUS server

{pyrad-2.5.2 → pyrad-2.5.4}/pyrad/dictfile.py

@@ -11,7 +11,7 @@ RADIUS $INCLUDE directives behind the scene.
 import os
 
 
-class _Node(object):
+class _Node:
     """Dictionary file node
 
     A single dictionary file.
@@ -36,7 +36,7 @@ class _Node(object):
         return self.lines[self.current - 1]
 
 
-class DictFile(object):
+class DictFile:
     """Dictionary file class
 
     An iterable file type that handles $INCLUDE
@@ -111,4 +111,3 @@ class DictFile(object):
                 else:
                     return line
         raise StopIteration
-    next = __next__  # BBB for python <3

{pyrad-2.5.2 → pyrad-2.5.4}/pyrad/dictionary.py

@@ -133,7 +133,7 @@ class Attribute(object):
                 self.values.Add(key, value)
 
 
-class Dictionary(object):
+class Dictionary:
     """RADIUS dictionary class.
     This class stores all information about vendors, attributes and their
     values as defined in RADIUS dictionary files.

{pyrad-2.5.2 → pyrad-2.5.4}/pyrad/host.py

@@ -4,7 +4,7 @@
 from pyrad import packet
 
 
-class Host(object):
+class Host:
     """Generic RADIUS capable host.
 
     :ivar     dict: RADIUS dictionary

{pyrad-2.5.2 → pyrad-2.5.4}/pyrad/packet.py

@@ -6,9 +6,9 @@
 
 from collections import OrderedDict
 from pyrad import tools
+import hashlib
 import hmac
 import struct
-import sys
 
 try:
     import secrets
@@ -18,24 +18,6 @@ except ImportError:
     random_generator = random.SystemRandom()
 
 
-def _hmac_md5(*args, **kwargs):
-    """Py3 hmac.new() wrapper with explicit MD5 digestmod."""
-    return hmac.new(*args, digestmod='MD5', **kwargs)
-
-
-if sys.version_info >= (3, 0):
-    hmac_new = _hmac_md5
-else:
-    hmac_new = hmac.new
-
-try:
-    import hashlib
-    md5_constructor = hashlib.md5
-except ImportError:
-    # BBB for python 2.4
-    import md5
-    md5_constructor = md5.new
-
 # Packet codes
 AccessRequest = 1
 AccessAccept = 2
@@ -145,7 +127,7 @@ class Packet(OrderedDict):
         return self.message_authenticator
 
     def _refresh_message_authenticator(self):
-        hmac_constructor = hmac_new(self.secret)
+        hmac_constructor = hmac.new(self.secret, digestmod='MD5')
 
         # Maintain a zero octets content for md5 and hmac calculation.
         self['Message-Authenticator'] = 16 * b'\00'
@@ -212,7 +194,7 @@ class Packet(OrderedDict):
         header = struct.pack('!BBH', self.code, self.id,
                              (20 + len(attr)))
 
-        hmac_constructor = hmac_new(key)
+        hmac_constructor = hmac.new(key, digestmod='MD5')
         hmac_constructor.update(header)
         if self.code in (AccountingRequest, DisconnectRequest,
                          CoARequest, AccountingResponse):
@@ -419,8 +401,8 @@ class Packet(OrderedDict):
         attr = self._PktEncodeAttributes()
         header = struct.pack('!BBH', self.code, self.id, (20 + len(attr)))
 
-        authenticator = md5_constructor(header[0:4] + self.authenticator
-                                        + attr + self.secret).digest()
+        authenticator = hashlib.md5(header[0:4] + self.authenticator
+                                    + attr + self.secret).digest()
 
         return header + authenticator + attr
 
@@ -440,8 +422,8 @@ class Packet(OrderedDict):
         # response attributes if any, followed by the shared secret.  The
         # resulting 16 octet MD5 hash value is stored in the Authenticator
         # field of the Accounting-Response packet.
-        hash = md5_constructor(rawreply[0:4] + self.authenticator +
-                               rawreply[20:] + self.secret).digest()
+        hash = hashlib.md5(rawreply[0:4] + self.authenticator +
+                           rawreply[20:] + self.secret).digest()
 
         if hash != rawreply[4:20]:
             return False
@@ -595,7 +577,7 @@ class Packet(OrderedDict):
         else:
             last = self.authenticator + salt
         while data:
-            hash = md5_constructor(self.secret + last).digest()
+            hash = hashlib.md5(self.secret + last).digest()
             for i in range(16):
                 result += bytes((hash[i] ^ data[i],))
 
@@ -707,11 +689,12 @@ class AuthPacket(Packet):
             header = struct.pack(
                 '!BBH16s', self.code, self.id, (20 + 18 + len(attr)), self.authenticator
             )
-            digest = hmac_new(
+            digest = hmac.new(
                 self.secret,
                 header
                 + attr
                 + struct.pack('!BB16s', 80, struct.calcsize('!BB16s'), b''),
+                digestmod='MD5'
             ).digest()
             return (
                 header
@@ -743,7 +726,7 @@ class AuthPacket(Packet):
 
         last = self.authenticator
         while buf:
-            hash = md5_constructor(self.secret + last).digest()
+            hash = hashlib.md5(self.secret + last).digest()
             for i in range(16):
                 pw += bytes((hash[i] ^ buf[i],))
             (last, buf) = (buf[:16], buf[16:])
@@ -787,7 +770,7 @@ class AuthPacket(Packet):
 
         last = self.authenticator
         while buf:
-            hash = md5_constructor(self.secret + last).digest()
+            hash = hashlib.md5(self.secret + last).digest()
             for i in range(16):
                 result += bytes((hash[i] ^ buf[i],))
             last = result[-16:]
@@ -820,7 +803,7 @@ class AuthPacket(Packet):
         challenge = self.authenticator
         if 'CHAP-Challenge' in self:
             challenge = self['CHAP-Challenge'][0]
-        return password == md5_constructor(chapid + userpwd + challenge).digest()
+        return password == hashlib.md5(chapid + userpwd + challenge).digest()
 
     def VerifyAuthRequest(self):
         """Verify request authenticator.
@@ -829,8 +812,8 @@ class AuthPacket(Packet):
         :rtype: boolean
         """
         assert (self.raw_packet)
-        hash = md5_constructor(self.raw_packet[0:4] + 16 * b'\x00' +
-                               self.raw_packet[20:] + self.secret).digest()
+        hash = hashlib.md5(self.raw_packet[0:4] + 16 * b'\x00' +
+                           self.raw_packet[20:] + self.secret).digest()
         return hash == self.authenticator
 
 
@@ -873,8 +856,8 @@ class AcctPacket(Packet):
         """
         assert (self.raw_packet)
 
-        hash = md5_constructor(self.raw_packet[0:4] + 16 * b'\x00' +
-                               self.raw_packet[20:] + self.secret).digest()
+        hash = hashlib.md5(self.raw_packet[0:4] + 16 * b'\x00' +
+                           self.raw_packet[20:] + self.secret).digest()
 
         return hash == self.authenticator
 
@@ -895,8 +878,8 @@ class AcctPacket(Packet):
 
         attr = self._PktEncodeAttributes()
         header = struct.pack('!BBH', self.code, self.id, (20 + len(attr)))
-        self.authenticator = md5_constructor(header[0:4] + 16 * b'\x00' +
-                                             attr + self.secret).digest()
+        self.authenticator = hashlib.md5(header[0:4] + 16 * b'\x00' +
+                                         attr + self.secret).digest()
 
         ans = header + self.authenticator + attr
 
@@ -941,8 +924,8 @@ class CoAPacket(Packet):
         :rtype: boolean
         """
         assert (self.raw_packet)
-        hash = md5_constructor(self.raw_packet[0:4] + 16 * b'\x00' +
-                               self.raw_packet[20:] + self.secret).digest()
+        hash = hashlib.md5(self.raw_packet[0:4] + 16 * b'\x00' +
+                           self.raw_packet[20:] + self.secret).digest()
         return hash == self.authenticator
 
     def RequestPacket(self):
@@ -960,14 +943,14 @@ class CoAPacket(Packet):
             self.id = self.CreateID()
 
         header = struct.pack('!BBH', self.code, self.id, (20 + len(attr)))
-        self.authenticator = md5_constructor(header[0:4] + 16 * b'\x00' +
-                                             attr + self.secret).digest()
+        self.authenticator = hashlib.md5(header[0:4] + 16 * b'\x00' +
+                                         attr + self.secret).digest()
 
         if self.message_authenticator:
             self._refresh_message_authenticator()
             attr = self._PktEncodeAttributes()
-            self.authenticator = md5_constructor(header[0:4] + 16 * b'\x00' +
-                                                 attr + self.secret).digest()
+            self.authenticator = hashlib.md5(header[0:4] + 16 * b'\x00' +
+                                             attr + self.secret).digest()
 
         return header + self.authenticator + attr
 

{pyrad-2.5.2 → pyrad-2.5.4}/pyrad/tests/test_packet.py

@@ -1,3 +1,4 @@
+import hashlib
 import hmac
 import os
 import struct
@@ -9,13 +10,6 @@ from collections import OrderedDict
 from pyrad import packet
 from pyrad.client import Client
 from pyrad.dictionary import Dictionary
-try:
-    import hashlib
-    md5_constructor = hashlib.md5
-except ImportError:
-    # BBB for python 2.4
-    import md5
-    md5_constructor = md5.new
 
 
 class UtilityTests(unittest.TestCase):
@@ -106,17 +100,17 @@ class PacketTests(unittest.TestCase):
                              request.id, (20 + len(attributes)))
 
         # Calculate the Message-Authenticator and update the attribute
-        hmac_constructor = hmac.new(request.secret, None, md5_constructor)
+        hmac_constructor = hmac.new(request.secret, None, hashlib.md5)
         hmac_constructor.update(header + request.authenticator + attributes)
         updated_message_authenticator = hmac_constructor.digest()
         attributes = attributes.replace(b'\x00' * 16,
                                         updated_message_authenticator)
 
         # Calculate the response authenticator
-        authenticator = md5_constructor(header
-                                        + request.authenticator
-                                        + attributes
-                                        + request.secret).digest()
+        authenticator = hashlib.md5(header
+                                    + request.authenticator
+                                    + attributes
+                                    + request.secret).digest()
 
         reply_bytes = header + authenticator + attributes
         return packet.AuthPacket(packet=reply_bytes, dict=self.dict)
@@ -554,7 +548,7 @@ class AuthPacketChapTests(unittest.TestCase):
     def testVerifyChapPasswd(self):
         chap_id = b'9'
         chap_challenge = b'987654321'
-        chap_password = chap_id + md5_constructor(
+        chap_password = chap_id + hashlib.md5(
                 chap_id + b'test_password' + chap_challenge).digest()
         pkt = self.client.CreateAuthPacket(
             code=packet.AccessChallenge,
@@ -677,3 +671,9 @@ class AcctPacketTests(unittest.TestCase):
 
         # Vendor unknown preserved
         self.assertEqual(pkt[(594, 1)], [b'UNKNOWN_PRODUCT'])
+
+        raw_no_authenticator = raw[:4] + b"\x00" * 16 + raw[20:]
+        rebuilt = pkt.RequestPacket()
+        rebuilt_no_authenticator = rebuilt[:4] + b"\x00" * 16 + rebuilt[20:]
+
+        self.assertEqual(raw_no_authenticator, rebuilt_no_authenticator)

{pyrad-2.5.2 → pyrad-2.5.4}/pyrad/tools.py

@@ -167,6 +167,9 @@ def EncodeAscendBinary(orig_str):
         "dportq":    b"\x00",
     }
 
+    if orig_str.strip() == "delete":
+        return 8 * b"\x00"
+
     for t in orig_str.split(" "):
         key, value = t.split("=")
         if key == "family" and value == "ipv6":

{pyrad-2.5.2 → pyrad-2.5.4/pyrad.egg-info}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: pyrad
-Version: 2.5.2
+Version: 2.5.4
 Summary: RADIUS tools
-Author-email: Istvan Ruzman <istvan@ruzman.eu>, Christian Giese <gic@gicnet.de>, Stefan Lieberth <stefan@lieberth.net>
+Author-email: Christian Giese <gic@gicnet.de>, Istvan Ruzman <istvan@ruzman.eu>, Stefan Lieberth <stefan@lieberth.net>
 License: BSD-3-Clause
 Project-URL: Repository, https://github.com/pyradius/pyrad
 Project-URL: Documentation, https://pyradius-pyrad.readthedocs.io
@@ -23,10 +23,8 @@ Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 Requires-Dist: netaddr>=0.8.0
-Requires-Dist: six>=1.16.0
 Provides-Extra: test
 Requires-Dist: pytest>=8; extra == "test"
-Requires-Dist: mock; python_version < "3.10" and extra == "test"
 Provides-Extra: docs
 Requires-Dist: sphinx>=7.0; extra == "docs"
 Requires-Dist: sphinx-autodoc-typehints; extra == "docs"
@@ -59,18 +57,24 @@ pyrad is an implementation of a RADIUS client/server as described in RFC2865.
 It takes care of all the details like building RADIUS packets, sending
 them and decoding responses.
 
-Here is an example of doing a authentication request::
+Here is an example of doing a authentication request:
+
+.. code-block:: python
 
     from pyrad.client import Client
     from pyrad.dictionary import Dictionary
     import pyrad.packet
 
-    srv = Client(server="localhost", secret=b"Kah3choteereethiejeimaeziecumi",
-                 dict=Dictionary("dictionary"))
+    srv = Client(
+        server="localhost",
+        secret=b"Kah3choteereethiejeimaeziecumi",
+        dict=Dictionary("dictionary"),
+    )
 
     # create request
-    req = srv.CreateAuthPacket(code=pyrad.packet.AccessRequest,
-                               User_Name="wichert", NAS_Identifier="localhost")
+    req = srv.CreateAuthPacket(
+        code=pyrad.packet.AccessRequest, User_Name="wichert", NAS_Identifier="localhost"
+    )
     req["User-Password"] = req.PwCrypt("password")
 
     # send request
@@ -82,9 +86,8 @@ Here is an example of doing a authentication request::
         print("access denied")
 
     print("Attributes returned by server:")
-    for i in reply.keys():
-        print("%s: %s" % (i, reply[i]))
-
+    for key, val in reply.items():
+        print(f"{key}: {val}")
 
 
 Requirements & Installation

{pyrad-2.5.2 → pyrad-2.5.4}/pyrad.egg-info/requires.txt

@@ -1,5 +1,4 @@
 netaddr>=0.8.0
-six>=1.16.0
 
 [docs]
 sphinx>=7.0
@@ -8,6 +7,3 @@ sphinx-rtd-theme>=2.0
 
 [test]
 pytest>=8
-
-[test:python_version < "3.10"]
-mock