feat(podkop): add show config feature
- Add new button to show config with masked sensitive data - Update init script with new command `show_config` - Implement `show_config` function to mask sensitive data - Update version in config file to 0.3.3 - Update proxy check logic for better error handling
This commit is contained in:
@@ -7,10 +7,28 @@
|
|||||||
|
|
||||||
return view.extend({
|
return view.extend({
|
||||||
async render() {
|
async render() {
|
||||||
|
document.getElementsByTagName('head')[0].insertAdjacentHTML('beforeend', `
|
||||||
|
<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate">
|
||||||
|
<meta http-equiv="Pragma" content="no-cache">
|
||||||
|
<meta http-equiv="Expires" content="0">
|
||||||
|
`);
|
||||||
|
|
||||||
var m, s, o;
|
var m, s, o;
|
||||||
|
|
||||||
m = new form.Map('podkop', _('Podkop configuration'), null, ['main', 'second']);
|
m = new form.Map('podkop', _('Podkop configuration'), null, ['main', 'second']);
|
||||||
|
|
||||||
|
m = new form.Map('podkop', _('Podkop'), null, ['main', 'second']);
|
||||||
|
L.uci.load('podkop').then(() => {
|
||||||
|
const version = L.uci.get('podkop', 'main', 'version') || '';
|
||||||
|
if (version) {
|
||||||
|
m.title = _('Podkop') + ' v' + version;
|
||||||
|
if (!window.location.search.includes('v=')) {
|
||||||
|
const newUrl = window.location.pathname + '?v=' + version;
|
||||||
|
window.history.replaceState(null, '', newUrl);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
s = m.section(form.TypedSection, 'main');
|
s = m.section(form.TypedSection, 'main');
|
||||||
s.anonymous = true;
|
s.anonymous = true;
|
||||||
|
|
||||||
@@ -552,6 +570,50 @@ return view.extend({
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
o = s.taboption('diagnostics', form.Button, '_show_config');
|
||||||
|
o.title = _('Show Config');
|
||||||
|
o.description = _('Show current podkop configuration with masked sensitive data');
|
||||||
|
o.inputtitle = _('Show Config');
|
||||||
|
o.inputstyle = 'apply';
|
||||||
|
o.onclick = function () {
|
||||||
|
return fs.exec('/etc/init.d/podkop', ['show_config'])
|
||||||
|
.then(function (res) {
|
||||||
|
const formattedOutput = formatDiagnosticOutput(res.stdout || _('No output'));
|
||||||
|
|
||||||
|
const modalElement = ui.showModal(_('Podkop Configuration'), [
|
||||||
|
E('div', { class: 'cbi-section' }, [
|
||||||
|
E('pre', { class: 'cbi-value-field' }, formattedOutput)
|
||||||
|
]),
|
||||||
|
E('div', { style: 'display: flex; justify-content: space-between; margin-top: 1em;' }, [
|
||||||
|
E('button', {
|
||||||
|
'class': 'btn cbi-button-save',
|
||||||
|
'click': function () {
|
||||||
|
const textarea = document.createElement('textarea');
|
||||||
|
textarea.value = '```\n' + formattedOutput + '\n```';
|
||||||
|
document.body.appendChild(textarea);
|
||||||
|
textarea.select();
|
||||||
|
try {
|
||||||
|
document.execCommand('copy');
|
||||||
|
ui.hideModal();
|
||||||
|
} catch (err) {
|
||||||
|
ui.addNotification(null, E('p', {}, _('Failed to copy: ') + err.message));
|
||||||
|
}
|
||||||
|
document.body.removeChild(textarea);
|
||||||
|
}
|
||||||
|
}, _('Copy to Clipboard')),
|
||||||
|
E('button', {
|
||||||
|
'class': 'btn cbi-button-neutral',
|
||||||
|
'click': ui.hideModal
|
||||||
|
}, _('Close'))
|
||||||
|
])
|
||||||
|
], 'large');
|
||||||
|
|
||||||
|
if (modalElement && modalElement.parentElement) {
|
||||||
|
modalElement.parentElement.classList.add('modal-overlay-large');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
o = s.taboption('diagnostics', form.Button, '_list_update');
|
o = s.taboption('diagnostics', form.Button, '_list_update');
|
||||||
o.title = _('Update lists');
|
o.title = _('Update lists');
|
||||||
o.description = _('Update all lists in config');
|
o.description = _('Update all lists in config');
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
config main 'main'
|
config main 'main'
|
||||||
|
option version '0.3.3'
|
||||||
option mode 'proxy'
|
option mode 'proxy'
|
||||||
#option interface ''
|
#option interface ''
|
||||||
option proxy_config_type ''
|
option proxy_config_type ''
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ script=$(readlink "$initscript")
|
|||||||
NAME="$(basename ${script:-$initscript})"
|
NAME="$(basename ${script:-$initscript})"
|
||||||
config_load "$NAME"
|
config_load "$NAME"
|
||||||
|
|
||||||
EXTRA_COMMANDS="list_update check_proxy check_nft check_github check_logs check_all check_three main"
|
EXTRA_COMMANDS="list_update check_proxy check_nft check_github check_logs check_all check_three main show_config"
|
||||||
EXTRA_HELP=" list_update Updating domain and subnet lists
|
EXTRA_HELP=" list_update Updating domain and subnet lists
|
||||||
sing_box_config_vless For test vless string
|
sing_box_config_vless For test vless string
|
||||||
check_proxy Check if sing-box proxy works correctly
|
check_proxy Check if sing-box proxy works correctly
|
||||||
@@ -16,7 +16,8 @@ EXTRA_HELP=" list_update Updating domain and subnet lists
|
|||||||
check_logs Show podkop logs from system journal
|
check_logs Show podkop logs from system journal
|
||||||
check_all Run all checks
|
check_all Run all checks
|
||||||
check_three Run check_proxy, check_nft and check_github
|
check_three Run check_proxy, check_nft and check_github
|
||||||
main Main function"
|
main Main function
|
||||||
|
show_config Show current configuration with masked sensitive data"
|
||||||
|
|
||||||
[ ! -L /usr/sbin/podkop ] && ln -s /etc/init.d/podkop /usr/sbin/podkop
|
[ ! -L /usr/sbin/podkop ] && ln -s /etc/init.d/podkop /usr/sbin/podkop
|
||||||
|
|
||||||
@@ -767,7 +768,7 @@ sing_box_config_vless() {
|
|||||||
get_param() {
|
get_param() {
|
||||||
local param="$1"
|
local param="$1"
|
||||||
local value=$(echo "$STRING" | sed -n "s/.*[?&]$param=\([^&?#]*\).*/\1/p")
|
local value=$(echo "$STRING" | sed -n "s/.*[?&]$param=\([^&?#]*\).*/\1/p")
|
||||||
value=$(echo "$value" | sed 's/%2F/\//g; s/%2C/,/g; s/%3D/=/g; s/%2B/+/g; s/%20/ /g' | tr -d '\n' | tr -d '\r')
|
value=$(uhttpd -d "$value" | tr -d '\n' | tr -d '\r')
|
||||||
echo "$value"
|
echo "$value"
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1309,18 +1310,31 @@ check_proxy() {
|
|||||||
|
|
||||||
nolog "Checking proxy connection..."
|
nolog "Checking proxy connection..."
|
||||||
|
|
||||||
|
|
||||||
for attempt in `seq 1 5`; do
|
for attempt in `seq 1 5`; do
|
||||||
response=$(sing-box tools fetch ifconfig.me -D /etc/sing-box 2>/dev/null)
|
response=$(sing-box tools fetch ifconfig.me -D /etc/sing-box 2>/dev/null)
|
||||||
if ! echo "$response" | grep -q "403 Forbidden"; then
|
if echo "$response" | grep -q "^<html\|403 Forbidden"; then
|
||||||
nolog "Proxy check completed successfully"
|
continue
|
||||||
#echo "$response" | sed 's/\([0-9]\+\)\.\([0-9]\+\)\.\([0-9]\+\)\.\([0-9]\+\)/XXX.\2.\3.\4/'
|
fi
|
||||||
echo "$response" | sed -n 's/^[0-9]\+\.[0-9]\+\.[0-9]\+\.\([0-9]\+\)$/X.X.X.\1/p'
|
if [[ $response =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
|
||||||
|
ip=$(echo "$response" | sed -n 's/^[0-9]\+\.[0-9]\+\.[0-9]\+\.\([0-9]\+\)$/X.X.X.\1/p')
|
||||||
|
nolog "$ip - should match proxy IP"
|
||||||
|
return 0
|
||||||
|
elif echo "$response" | grep -q "^[0-9a-fA-F:]*::[0-9a-fA-F:]*$\|^[0-9a-fA-F:]\+$"; then
|
||||||
|
ip=$(echo "$response" | sed 's/\([0-9a-fA-F]\+:[0-9a-fA-F]\+:[0-9a-fA-F]\+\):.*/\1:XXXX:XXXX:XXXX/')
|
||||||
|
nolog "$ip - should match proxy IP"
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
done
|
if [ $attempt -eq 5 ]; then
|
||||||
|
nolog "Failed to get valid IP address after 5 attempts"
|
||||||
nolog "Failed to get a non-403 response after 5 attempts"
|
if [ -z "$response" ]; then
|
||||||
|
nolog "Error: Empty response"
|
||||||
|
else
|
||||||
|
nolog "Error response: $response"
|
||||||
|
fi
|
||||||
return 1
|
return 1
|
||||||
|
fi
|
||||||
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
check_nft() {
|
check_nft() {
|
||||||
@@ -1406,3 +1420,30 @@ check_all() {
|
|||||||
|
|
||||||
check_three
|
check_three
|
||||||
}
|
}
|
||||||
|
|
||||||
|
show_config() {
|
||||||
|
nolog "Current podkop configuration:"
|
||||||
|
|
||||||
|
if [ ! -f /etc/config/podkop ]; then
|
||||||
|
nolog "Configuration file not found"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Создаем временный файл для обработанного конфига
|
||||||
|
tmp_config=$(mktemp)
|
||||||
|
|
||||||
|
# Копируем и маскируем конфиденциальные данные
|
||||||
|
cat /etc/config/podkop | sed \
|
||||||
|
-e 's/\(option proxy_string\).*/\1 '\''MASKED'\''/g' \
|
||||||
|
-e 's/\(option outbound_json\).*/\1 '\''MASKED'\''/g' \
|
||||||
|
-e 's/\(option second_proxy_string\).*/\1 '\''MASKED'\''/g' \
|
||||||
|
-e 's/\(option second_outbound_json\).*/\1 '\''MASKED'\''/g' \
|
||||||
|
-e 's/\(vless:\/\/[^@]*@\)/vless:\/\/MASKED@/g' \
|
||||||
|
-e 's/\(ss:\/\/[^@]*@\)/ss:\/\/MASKED@/g' \
|
||||||
|
-e 's/\(pbk=[^&]*\)/pbk=MASKED/g' \
|
||||||
|
-e 's/\(sid=[^&]*\)/sid=MASKED/g' \
|
||||||
|
> "$tmp_config"
|
||||||
|
|
||||||
|
cat "$tmp_config"
|
||||||
|
rm -f "$tmp_config"
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user