Alex-Devera/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2025-09-12 13:10:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix critical bugs in ObjectUtil.equals() and filterInbounds() functions (#3451)
Some checks are pending
Release 3X-UI / build (386) (push) Waiting to run
Details
Release 3X-UI / build (amd64) (push) Waiting to run
Details
Release 3X-UI / build (arm64) (push) Waiting to run
Details
Release 3X-UI / build (armv5) (push) Waiting to run
Details
Release 3X-UI / build (armv6) (push) Waiting to run
Details
Release 3X-UI / build (armv7) (push) Waiting to run
Details
Release 3X-UI / build (s390x) (push) Waiting to run
Details
Release 3X-UI / Build for Windows (push) Waiting to run
Details

Browse source 
* 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>
This commit is contained in:
Copilot 2025-09-11 11:48:30 +02:00 committed by GitHub
parent cbf316db31
commit 40b6d7707a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
web/assets/js/util/index.js
View file

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

2
web/html/inbounds.html
View file

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