TMP

alan-turing-institute · Feb 29, 2024 · 84832ac · 84832ac
1 parent 626674e
commit 84832ac
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/apricot/ldap/read_only_ldap_server.py b/apricot/ldap/read_only_ldap_server.py
@@ -10,6 +10,7 @@
     LDAPSearchResultEntry,
 )
 from twisted.internet import defer
+from twisted.python import log
 
 
 class ReadOnlyLDAPServer(LDAPServer):
@@ -21,6 +22,7 @@ def getRootDSE(  # noqa: N802
         """
         Handle an LDAP Root RSE request
         """
+        log.msg(f"Calling getRootDSE with '{request.toWire() if request else 'NoRequest'}' (DN='{request.dn if hasattr(request, 'dn') else 'NoDN'}')")
         return super().getRootDSE(request, reply)
 
     def handle_LDAPAddRequest(  # noqa: N802
@@ -32,6 +34,7 @@ def handle_LDAPAddRequest(  # noqa: N802
         """
         Refuse to handle an LDAP add request
         """
+        log.msg(f"Calling LDAP add with '{request.toWire() if request else 'NoRequest'}' '{controls.toWire() if controls else 'NoControls'}' (DN='{request.dn if hasattr(request, 'dn') else 'NoDN'}')")
         id((request, controls, reply))  # ignore unused arguments
         msg = "ReadOnlyLDAPServer will not handle LDAP add requests"
         raise LDAPProtocolError(msg)
@@ -45,6 +48,7 @@ def handle_LDAPBindRequest(  # noqa: N802
         """
         Handle an LDAP bind request
         """
+        log.msg(f"Calling LDAP bind with '{request.toWire() if request else 'NoRequest'}' '{controls.toWire() if controls else 'NoControls'}' (DN='{request.dn if hasattr(request, 'dn') else 'NoDN'}')")
         return super().handle_LDAPBindRequest(request, controls, reply)
 
     def handle_LDAPCompareRequest(  # noqa: N802
@@ -56,6 +60,7 @@ def handle_LDAPCompareRequest(  # noqa: N802
         """
         Handle an LDAP compare request
         """
+        log.msg(f"Calling LDAP compare with '{request.toWire() if request else 'NoRequest'}' '{controls.toWire() if controls else 'NoControls'}' (DN='{request.dn if hasattr(request, 'dn') else 'NoDN'}')")
         return super().handle_LDAPCompareRequest(request, controls, reply)
 
     def handle_LDAPDelRequest(  # noqa: N802
@@ -67,6 +72,7 @@ def handle_LDAPDelRequest(  # noqa: N802
         """
         Refuse to handle an LDAP delete request
         """
+        log.msg(f"Calling LDAP del with '{request.toWire() if request else 'NoRequest'}' '{controls.toWire() if controls else 'NoControls'}' (DN='{request.dn if hasattr(request, 'dn') else 'NoDN'}')")
         id((request, controls, reply))  # ignore unused arguments
         msg = "ReadOnlyLDAPServer will not handle LDAP delete requests"
         raise LDAPProtocolError(msg)
@@ -80,6 +86,7 @@ def handle_LDAPExtendedRequest(  # noqa: N802
         """
         Handle an LDAP extended request
         """
+        log.msg(f"Calling LDAP extended with '{request.toWire() if request else 'NoRequest'}' '{controls.toWire() if controls else 'NoControls'}' (DN='{request.dn if hasattr(request, 'dn') else 'NoDN'}')")
         return super().handle_LDAPExtendedRequest(request, controls, reply)
 
     def handle_LDAPModifyDNRequest(  # noqa: N802
@@ -91,6 +98,7 @@ def handle_LDAPModifyDNRequest(  # noqa: N802
         """
         Refuse to handle an LDAP modify DN request
         """
+        log.msg(f"Calling LDAP modify DN with '{request.toWire() if request else 'NoRequest'}' '{controls.toWire() if controls else 'NoControls'}' (DN='{request.dn if hasattr(request, 'dn') else 'NoDN'}')")
         id((request, controls, reply))  # ignore unused arguments
         msg = "ReadOnlyLDAPServer will not handle LDAP modify DN requests"
         raise LDAPProtocolError(msg)
@@ -104,6 +112,7 @@ def handle_LDAPModifyRequest(  # noqa: N802
         """
         Refuse to handle an LDAP modify request
         """
+        log.msg(f"Calling LDAP modify with '{request.toWire() if request else 'NoRequest'}' '{controls.toWire() if controls else 'NoControls'}' (DN='{request.dn if hasattr(request, 'dn') else 'NoDN'}')")
         id((request, controls, reply))  # ignore unused arguments
         msg = "ReadOnlyLDAPServer will not handle LDAP modify requests"
         raise LDAPProtocolError(msg)
@@ -117,6 +126,7 @@ def handle_LDAPUnbindRequest(  # noqa: N802
         """
         Handle an LDAP unbind request
         """
+        log.msg(f"Calling LDAP unbind with '{request.toWire() if request else 'NoRequest'}' '{controls.toWire() if controls else 'NoControls'}' (DN='{request.dn if hasattr(request, 'dn') else 'NoDN'}')")
         super().handle_LDAPUnbindRequest(request, controls, reply)
 
     def handle_LDAPSearchRequest(  # noqa: N802
@@ -128,4 +138,5 @@ def handle_LDAPSearchRequest(  # noqa: N802
         """
         Handle an LDAP search request
         """
+        log.msg(f"Calling LDAP search with '{request.toWire() if request else 'NoRequest'}' '{controls.toWire() if controls else 'NoControls'}' (DN='{request.dn if hasattr(request, 'dn') else 'NoDN'}')")
         return super().handle_LDAPSearchRequest(request, controls, reply)