mirror of
https://dev.iopsys.eu/feed/iopsys.git
synced 2025-12-24 19:14:05 +08:00
Compare commits
7 Commits
mapcext
...
openwrt_up
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f17b62a6e9 | ||
|
|
7873c4d0e0 | ||
|
|
ae507cdfa1 | ||
|
|
3e6addc495 | ||
|
|
7e3e64cd1b | ||
|
|
27e5d08b05 | ||
|
|
27f412c2dc |
@@ -10,7 +10,7 @@ PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE_PROTO=git
|
||||
PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/owsd.git
|
||||
PKG_SOURCE_VERSION:=f1d6bff1971640006b3137b342fafa1c40cfb835
|
||||
PKG_SOURCE_VERSION:=da5bcdbaa96d01e878d921c90c34a04bbdfca973
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
|
||||
PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}
|
||||
PKG_INSTALL:=1
|
||||
|
||||
@@ -150,6 +150,7 @@ validate_owsd_iface() {
|
||||
'origin:list(string)' \
|
||||
'whitelist_interface_as_origin:bool:0' \
|
||||
'whitelist_dhcp_domains:bool:0' \
|
||||
'whitelist_all_origins:bool:0' \
|
||||
'ipv6:bool:1' \
|
||||
'ipv6only:bool:0' \
|
||||
'linklocal:bool:0' \
|
||||
@@ -163,7 +164,7 @@ validate_owsd_iface() {
|
||||
}
|
||||
|
||||
parse_owsd_iface() {
|
||||
local port interface whitelist_interface_as_origin whitelist_dhcp_domains ipv6 ipv6only linklocal
|
||||
local port interface whitelist_interface_as_origin whitelist_dhcp_domains whitelist_all_origins ipv6 ipv6only linklocal
|
||||
local cert key ca
|
||||
local restrict_to_user
|
||||
local ubusx_acl
|
||||
@@ -191,9 +192,23 @@ parse_owsd_iface() {
|
||||
|
||||
}
|
||||
|
||||
origin_whitelist_all() {
|
||||
[ "$1" = "*" ] && echo "true"
|
||||
}
|
||||
|
||||
append_whitelists () {
|
||||
config_list_foreach "$1" "origin" append_origin
|
||||
|
||||
whitelist=$(config_list_foreach "$1" "origin" origin_whitelist_all)
|
||||
|
||||
[ -n "$whitelist" ] && whitelist_all_origins=1
|
||||
|
||||
if [ "$whitelist_all_origins" -eq 1 ]; then
|
||||
procd_append_param command -O
|
||||
whitelist_dhcp_domains=1
|
||||
whitelist_interface_as_origin=1
|
||||
fi
|
||||
|
||||
if [ "$whitelist_dhcp_domains" -eq 1 ]; then
|
||||
for domain in $DHCP_DOMAINS; do
|
||||
append_origin_parts "${http}" "${domain}" "${port}"
|
||||
|
||||
Reference in New Issue
Block a user