mirror of
https://github.com/itdoginfo/podkop.git
synced 2025-12-06 11:36:50 +03:00
#99 Block mode
This commit is contained in:
@@ -37,7 +37,5 @@ sh <(wget -qO- https://raw.githubusercontent.com/itdoginfo/podkop/refs/heads/mai
|
||||
- [ ] IPv6. Только после наполнения Wiki
|
||||
|
||||
Рефактор
|
||||
- [ ] Handle для sing-box
|
||||
- [ ] Handle для dnsmasq
|
||||
- [ ] Unit тесты (BATS)
|
||||
- [ ] Интеграционые тесты бекенда (OpenWrt rootfs + BATS)
|
||||
|
||||
@@ -87,6 +87,7 @@ function createConfigSection(section, map, network) {
|
||||
o = s.taboption('basic', form.ListValue, 'mode', _('Connection Type'), _('Select between VPN and Proxy connection methods for traffic routing'));
|
||||
o.value('proxy', ('Proxy'));
|
||||
o.value('vpn', ('VPN'));
|
||||
o.value('block', ('Block'));
|
||||
o.ucisection = s.section;
|
||||
|
||||
o = s.taboption('basic', form.ListValue, 'proxy_config_type', _('Configuration Type'), _('Select how to configure the proxy'));
|
||||
|
||||
@@ -942,6 +942,9 @@ sing_box_outdound() {
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
"block")
|
||||
log "Block mode"
|
||||
;;
|
||||
*)
|
||||
log "Requires *vpn* or *proxy* value"
|
||||
return
|
||||
@@ -1461,6 +1464,32 @@ sing_box_rules() {
|
||||
local rule_set="$1"
|
||||
local outbound="$2"
|
||||
|
||||
config_get mode "$section" "mode"
|
||||
|
||||
if [[ "$mode" == "block" ]]; then
|
||||
# Action reject
|
||||
# Check if there is an rule with reject"
|
||||
local rule_exists=$(jq -r '.route.rules[] | select(.inbound == ["tproxy-in"] and .action == "reject")' "$SING_BOX_CONFIG")
|
||||
|
||||
if [[ -n "$rule_exists" ]]; then
|
||||
# If a rule for rejectexists, add a new rule_set to the existing rule
|
||||
jq \
|
||||
--arg rule_set "$rule_set" \
|
||||
'(.route.rules[] | select(.inbound == ["tproxy-in"] and .action == "reject") .rule_set) += [$rule_set]' \
|
||||
"$SING_BOX_CONFIG" > /tmp/sing-box-config-tmp.json && mv /tmp/sing-box-config-tmp.json "$SING_BOX_CONFIG"
|
||||
else
|
||||
# If there is no rule for reject, create a new one with rule_set
|
||||
jq \
|
||||
--arg rule_set "$rule_set" \
|
||||
'.route.rules += [{
|
||||
"inbound": ["tproxy-in"],
|
||||
"rule_set": [$rule_set],
|
||||
"action": "reject"
|
||||
}]' "$SING_BOX_CONFIG" > /tmp/sing-box-config-tmp.json && mv /tmp/sing-box-config-tmp.json "$SING_BOX_CONFIG"
|
||||
fi
|
||||
return
|
||||
else
|
||||
# Action route
|
||||
# Check if there is an outbound rule for "tproxy-in"
|
||||
local rule_exists=$(jq -r '.route.rules[] | select(.outbound == "'"$outbound"'" and .inbound == ["tproxy-in"])' "$SING_BOX_CONFIG")
|
||||
|
||||
@@ -1483,6 +1512,7 @@ sing_box_rules() {
|
||||
"action": "route"
|
||||
}]' "$SING_BOX_CONFIG" >/tmp/sing-box-config-tmp.json && mv /tmp/sing-box-config-tmp.json "$SING_BOX_CONFIG"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
sing_box_quic_reject() {
|
||||
|
||||
Reference in New Issue
Block a user