From 0134ce1ce6d30d7b02f16080a223b0138bc1e801 Mon Sep 17 00:00:00 2001
From: master3395 <master3395@users.noreply.github.com>
Date: Mon, 19 Jan 2026 18:49:06 +0100
Subject: [PATCH] Add domain filtering to access log display

- Added domain filtering in getDataFromLogFile() to only show log entries for the requested domain
- Handles cases where vhost config hasn't been updated and multiple sub-domains log to the same file
- Filters out entries from other domains even if they're in the same log file
- Added error handling for malformed log entries
- Added fallback to master domain log file if child domain log file doesn't exist or is empty

This ensures that when viewing logs for a sub-domain, only that sub-domain's logs are displayed,
even if the vhost configuration still points to the master domain's log file (which needs to be fixed separately).
---
 websiteFunctions/website.py | 59 ++++++++++++++++++++++++++-----------
 1 file changed, 42 insertions(+), 17 deletions(-)

diff --git a/websiteFunctions/website.py b/websiteFunctions/website.py
index aa60e5473..85bf41825 100644
--- a/websiteFunctions/website.py
+++ b/websiteFunctions/website.py
@@ -4085,6 +4085,18 @@ context /cyberpanel_suspension_page.html {
                 {'status': 0, 'logstatus': 0,
                  'error_message': "Symlink attack."})
             return HttpResponse(final_json)
+        
+        # Check if log file exists, if not, try master domain's log file as fallback
+        # (for existing sub-domains that haven't been fixed yet)
+        if not os.path.exists(fileName) or os.path.getsize(fileName) == 0:
+            try:
+                child_domain = ChildDomains.objects.get(domain=self.domain)
+                master_domain = child_domain.master.domain
+                fallback_log_file = f"/home/{master_domain}/logs/{master_domain}.access_log" if logType == 1 else f"/home/{master_domain}/logs/{master_domain}.error_log"
+                if os.path.exists(fallback_log_file):
+                    fileName = fallback_log_file
+            except ChildDomains.DoesNotExist:
+                pass
 
         ## get Logs
         website = Websites.objects.get(domain=self.domain)
@@ -4106,25 +4118,38 @@ context /cyberpanel_suspension_page.html {
 
         for items in reversed(data):
             if len(items) > 10:
-                logData = items.split(" ")
-                domain = logData[5].strip('"')
-                ipAddress = logData[0].strip('"')
-                time = (logData[3]).strip("[").strip("]")
-                resource = logData[6].strip('"')
-                size = logData[9].replace('"', '')
+                try:
+                    logData = items.split(" ")
+                    if len(logData) < 10:
+                        continue
+                    
+                    log_domain = logData[5].strip('"')
+                    ipAddress = logData[0].strip('"')
+                    time = (logData[3]).strip("[").strip("]")
+                    resource = logData[6].strip('"')
+                    size = logData[9].replace('"', '')
+                    
+                    # Filter logs by domain: only show entries for the requested domain
+                    # This handles cases where vhost config hasn't been updated yet
+                    # and multiple sub-domains are logging to the same file
+                    if log_domain != self.domain and log_domain != f"www.{self.domain}":
+                        continue
 
-                dic = {'domain': domain,
-                       'ipAddress': ipAddress,
-                       'time': time,
-                       'resource': resource,
-                       'size': size,
-                       }
+                    dic = {'domain': log_domain,
+                           'ipAddress': ipAddress,
+                           'time': time,
+                           'resource': resource,
+                           'size': size,
+                           }
 
-                if checker == 0:
-                    json_data = json_data + json.dumps(dic)
-                    checker = 1
-                else:
-                    json_data = json_data + ',' + json.dumps(dic)
+                    if checker == 0:
+                        json_data = json_data + json.dumps(dic)
+                        checker = 1
+                    else:
+                        json_data = json_data + ',' + json.dumps(dic)
+                except (IndexError, ValueError) as e:
+                    # Skip malformed log entries
+                    continue
 
         json_data = json_data + ']'
         final_json = json.dumps({'status': 1, 'logstatus': 1, 'error_message': "None", "data": json_data})