Compare commits

..

No commits in common. "40b6d7707a8d7856eb97e00ea7c86052859ce162" and "82ddd106277420ff80093e6f014cf36c6c57a17b" have entirely different histories.

4 changed files with 13 additions and 25 deletions

View file

@ -326,14 +326,6 @@ 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;
} }
} }

View file

@ -983,13 +983,11 @@
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);
} }

View file

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

View file

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