django-log-formatter-asim 1.1.0a2__py3-none-any.whl → 1.1.0a3__py3-none-any.whl

django_log_formatter_asim/events/authentication.py

@@ -51,6 +51,12 @@ class AuthenticationUser(TypedDict):
     """
     username: Optional[str]
     """
+    Email address for the user if one exists.
+
+    Defaults to the logged in Django User.email if not provided.
+    """
+    email: Optional[str]
+    """
     A unique identifier for this authentication session if one exists.
 
     Defaults to the Django Sessions session key if not provided.
@@ -128,8 +134,8 @@ def log_authentication(
 
     if "hostname" in server:
         log["DvcHostname"] = server["hostname"]
-    elif "SERVER_NAME" in request.META:
-        log["DvcHostname"] = request.META["SERVER_NAME"]
+    elif "HTTP_HOST" in request.META:
+        log["DvcHostname"] = request.get_host()
 
     if "ip_address" in client:
         log["SrcIpAddr"] = client["ip_address"]
@@ -138,7 +144,7 @@ def log_authentication(
 
     if "requested_url" in client:
         log["TargetUrl"] = client["requested_url"]
-    elif "SERVER_NAME" in request.META:
+    elif "HTTP_HOST" in request.META:
         log["TargetUrl"] = request.scheme + "://" + request.get_host() + request.get_full_path()
 
     if "role" in user:
@@ -150,9 +156,14 @@ def log_authentication(
         log["ActorSessionId"] = request.session.session_key
 
     if "username" in user:
-        log["ActorUsername"] = user["username"]
-    elif request.user.username:
-        log["ActorUsername"] = request.user.username
+        log["TargetUsername"] = user["username"]
+    elif hasattr(request, "user") and request.user.username:
+        log["TargetUsername"] = request.user.username
+
+    if "email" in user:
+        log["ActorUsername"] = user["email"]
+    elif hasattr(request, "user") and hasattr(request.user, "email") and request.user.email:
+        log["ActorUsername"] = request.user.email
 
     if result_details:
         log["EventResultDetails"] = result_details

django_log_formatter_asim/events/common.py

@@ -35,7 +35,7 @@ class Server(TypedDict):
     """
     A unique identifier for the server which serviced the Authentication event.
 
-    Defaults to the WSGI SERVER_NAME field if not provided.
+    Defaults to the WSGI HTTP_HOST field if not provided.
     """
     hostname: Optional[str]
     """Internet Protocol Address of the server serving this request."""

django_log_formatter_asim/events/file_activity.py

@@ -169,8 +169,8 @@ def log_file_activity(
 
     if "hostname" in server:
         log["DvcHostname"] = server["hostname"]
-    elif "SERVER_NAME" in request.META:
-        log["DvcHostname"] = request.META["SERVER_NAME"]
+    elif "HTTP_HOST" in request.META:
+        log["DvcHostname"] = request.get_host()
 
     if "ip_address" in client:
         log["SrcIpAddr"] = client["ip_address"]
@@ -179,13 +179,13 @@ def log_file_activity(
 
     if "requested_url" in client:
         log["TargetUrl"] = client["requested_url"]
-    elif "SERVER_NAME" in request.META:
+    elif "HTTP_HOST" in request.META:
         log["TargetUrl"] = request.scheme + "://" + request.get_host() + request.get_full_path()
 
     if "username" in user:
-        log["ActorUsername"] = user["username"]
+        log["TargetUsername"] = user["username"]
     elif request.user.username:
-        log["ActorUsername"] = request.user.username
+        log["TargetUsername"] = request.user.username
 
     if result_details:
         log["EventResultDetails"] = result_details

{django_log_formatter_asim-1.1.0a2.dist-info → django_log_formatter_asim-1.1.0a3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: django-log-formatter-asim
-Version: 1.1.0a2
+Version: 1.1.0a3
 Summary: Formats Django logs in ASIM format.
 License: MIT
 Author: Department for Business and Trade Platform Team

django_log_formatter_asim-1.1.0a3.dist-info/RECORD

@@ -0,0 +1,9 @@
+django_log_formatter_asim/__init__.py,sha256=LDQQch2GKY6LRj-KOME393FCiwjisQ49ATWBEqAP4ZA,7684
+django_log_formatter_asim/events/__init__.py,sha256=th8AEFNM-J5lNlO-d8Lk465jXqplE3IoTwj4DlscwYo,92
+django_log_formatter_asim/events/authentication.py,sha256=OxWztyvgaIXRZm-ake_OrxVXoH4NVMW1PaWZQi67UN8,6863
+django_log_formatter_asim/events/common.py,sha256=YJ_t6nXShoMwgqgezUzi1f5qA-8J5DcBJWTqwbdZehs,1358
+django_log_formatter_asim/events/file_activity.py,sha256=Re51ZOrcy1k62bORruPwCTdhuQqExbN_OtZ9UuCgDBE,6967
+django_log_formatter_asim-1.1.0a3.dist-info/LICENSE,sha256=dP79lN73--7LMApnankTGLqDbImXg8iYFqWgnExGkGk,1090
+django_log_formatter_asim-1.1.0a3.dist-info/METADATA,sha256=3ivJhQmrP7al1vvMKK-zQX2iBiLX56nek4sLCUR9E1A,5581
+django_log_formatter_asim-1.1.0a3.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+django_log_formatter_asim-1.1.0a3.dist-info/RECORD,,

django_log_formatter_asim-1.1.0a2.dist-info/RECORD

@@ -1,9 +0,0 @@
-django_log_formatter_asim/__init__.py,sha256=LDQQch2GKY6LRj-KOME393FCiwjisQ49ATWBEqAP4ZA,7684
-django_log_formatter_asim/events/__init__.py,sha256=th8AEFNM-J5lNlO-d8Lk465jXqplE3IoTwj4DlscwYo,92
-django_log_formatter_asim/events/authentication.py,sha256=OMAT4P8ZRmeEWngHTLvscGOXtRE8t39izZpdKNot2R8,6479
-django_log_formatter_asim/events/common.py,sha256=G6h4ftfrAzXBNd3EkhFQsMv5BdGW0XtdeBKJ43Ja70s,1360
-django_log_formatter_asim/events/file_activity.py,sha256=RPlzJm8TjdT3szx1wClULG29Sz9RNA16NQmUJwhxjTc,6978
-django_log_formatter_asim-1.1.0a2.dist-info/LICENSE,sha256=dP79lN73--7LMApnankTGLqDbImXg8iYFqWgnExGkGk,1090
-django_log_formatter_asim-1.1.0a2.dist-info/METADATA,sha256=fFVGcfHJ9wOQq19lqnulIV5PgvHc99m1Mt8aNuUSMS8,5581
-django_log_formatter_asim-1.1.0a2.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-django_log_formatter_asim-1.1.0a2.dist-info/RECORD,,