Fix critical bugs in ObjectUtil.equals() and filterInbounds() functions (#3451)

* Initial plan

* Fix ObjectUtil.equals asymmetric comparison and filterInbounds null pointer bugs

Co-authored-by: MHSanaei <33454419+MHSanaei@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: MHSanaei <33454419+MHSanaei@users.noreply.github.com>

web/assets/js/util/index.js

@@ -326,6 +326,14 @@ class ObjectUtil {
                 return false;
             }
         }
+        for (const key in b) {
+            if (!b.hasOwnProperty(key)) {
+                continue;
+            }
+            if (!a.hasOwnProperty(key)) {
+                return false;
+            }
+        }
         return true;
     }
 }

web/html/inbounds.html

@@ -983,11 +983,13 @@
                             const list = this.clientCount[inbound.id][this.filterBy];
                             if (list.length > 0) {
                                 const filteredSettings = { "clients": [] };
-                                inboundSettings.clients.forEach(client => {
+                                if (inboundSettings.clients) {
-                                    if (list.includes(client.email)) {
+                                    inboundSettings.clients.forEach(client => {
-                                        filteredSettings.clients.push(client);
+                                        if (list.includes(client.email)) {
-                                    }
+                                            filteredSettings.clients.push(client);
-                                });
+                                        }
+                                    });
+                                }
                                 newInbound.settings = Inbound.Settings.fromJson(inbound.protocol, filteredSettings);
                                 this.searchedInbounds.push(newInbound);
                             }

web/html/xray.html

@@ -351,7 +351,7 @@
           { label: '🇨🇳 China', value: 'geosite:cn' },
           { label: '🇨🇳 .cn', value: 'regexp:.*\\.cn$' },
           { label: '🇷🇺 Russia', value: 'ext:geosite_RU.dat:ru-available-only-inside' },
-          { label: '🇷🇺 .ru', value: 'regexp:.*\\.ru' },
+          { label: '🇷🇺 .ru', value: 'regexp:.*\\.ru$' },
           { label: '🇷🇺 .su', value: 'regexp:.*\\.su$' },
           { label: '🇷🇺 .рф', value: 'regexp:.*\\.xn--p1ai$' },
           { label: '🇻🇳 .vn', value: 'regexp:.*\\.vn$' },

web/job/check_client_ip_job.go

@@ -40,17 +40,19 @@ func (j *CheckClientIpJob) Run() {
 	f2bInstalled := j.checkFail2BanInstalled()
 	isAccessLogAvailable := j.checkAccessLogAvailable(iplimitActive)
 
-	if iplimitActive {
+	if isAccessLogAvailable {
 		if runtime.GOOS == "windows" {
-			if isAccessLogAvailable {
+			if iplimitActive {
 				shouldClearAccessLog = j.processLogFile()
 			}
 		} else {
-			if f2bInstalled && isAccessLogAvailable {
+			if iplimitActive {
-				shouldClearAccessLog = j.processLogFile()
+				if f2bInstalled {
-			} else {
+					shouldClearAccessLog = j.processLogFile()
-				if !f2bInstalled {
+				} else {
-					logger.Warning("[LimitIP] Fail2Ban is not installed, Please install Fail2Ban from the x-ui bash menu.")
+					if !f2bInstalled {
+						logger.Warning("[LimitIP] Fail2Ban is not installed, Please install Fail2Ban from the x-ui bash menu.")
+					}
 				}
 			}
 		}