zhao/openwrt_helloworld
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

luci-app-homeproxy: sync upstream

Browse Source 
last commit: 383c02fa49
This commit is contained in:
gitea-action 2025-02-06 18:00:28 +08:00
parent 6d32f1ad03
commit 5489bcd3fd
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
luci-app-homeproxy/htdocs/luci-static/resources/view/homeproxy/client.js
View File

@ -215,7 +215,7 @@ return view.extend({
let ipv6_support = this.map.lookupOption('ipv6_support', section_id)[0].formvalue(section_id); let ipv6_support = this.map.lookupOption('ipv6_support', section_id)[0].formvalue(section_id);
try { try {
let url = new URL(value); let url = new URL(value.replace(/^.*:\/\//, 'http://'));
if (stubValidator.apply('hostname', url.hostname)) if (stubValidator.apply('hostname', url.hostname))
return true; return true;
else if (stubValidator.apply('ip4addr', url.hostname)) else if (stubValidator.apply('ip4addr', url.hostname))
@ -249,7 +249,7 @@ return view.extend({
return _('Expecting: %s').format(_('non-empty value')); return _('Expecting: %s').format(_('non-empty value'));
try { try {
let url = new URL(value); let url = new URL(value.replace(/^.*:\/\//, 'http://'));
if (stubValidator.apply('hostname', url.hostname)) if (stubValidator.apply('hostname', url.hostname))
return true; return true;
else if (stubValidator.apply('ip4addr', url.hostname)) else if (stubValidator.apply('ip4addr', url.hostname))
@ -831,7 +831,7 @@ return view.extend({
return _('Expecting: %s').format(_('non-empty value')); return _('Expecting: %s').format(_('non-empty value'));
try { try {
let url = new URL(value); let url = new URL(value.replace(/^.*:\/\//, 'http://'));
if (stubValidator.apply('hostname', url.hostname)) if (stubValidator.apply('hostname', url.hostname))
return true; return true;
else if (stubValidator.apply('ip4addr', url.hostname)) else if (stubValidator.apply('ip4addr', url.hostname))

4
luci-app-homeproxy/root/etc/homeproxy/scripts/update_subscriptions.uc
View File

@ -574,7 +574,7 @@ function main() {
if (main_node === 'urltest') { if (main_node === 'urltest') {
main_urltest_nodes = filter(uci.get(uciconfig, ucimain, 'main_urltest_nodes'), (v) => { main_urltest_nodes = filter(uci.get(uciconfig, ucimain, 'main_urltest_nodes'), (v) => {
if (!uci.get(uciconfig, v)) { if (!uci.get(uciconfig, v)) {
log(sprintf('Node %s is gone, removing from urltest list.', node)); log(sprintf('Node %s is gone, removing from urltest list.', v));
return false; return false;
} }
return true; return true;
@ -594,7 +594,7 @@ function main() {
if (main_udp_node === 'urltest') { if (main_udp_node === 'urltest') {
main_udp_urltest_nodes = filter(uci.get(uciconfig, ucimain, 'main_udp_urltest_nodes'), (v) => { main_udp_urltest_nodes = filter(uci.get(uciconfig, ucimain, 'main_udp_urltest_nodes'), (v) => {
if (!uci.get(uciconfig, v)) { if (!uci.get(uciconfig, v)) {
log(sprintf('Node %s is gone, removing from urltest list.', node)); log(sprintf('Node %s is gone, removing from urltest list.', v));
return false; return false;
} }
return true; return true;