Compare commits

...

7 Commits

Author SHA1 Message Date
Jakob Olsson
f17b62a6e9 owsd: update pkg to include vhost memory managment update 2019-07-02 14:47:15 +02:00
Jakob Olsson
7873c4d0e0 owsd: update pkg to include owsd lws 3.1.0 and vhost changes 2019-07-02 10:41:02 +02:00
Jakob Olsson
ae507cdfa1 owsd: update pkg hash to include preliminary vhost fixes 2019-06-19 12:30:48 +02:00
Jakob Olsson
3e6addc495 owsd: let list origin '*' be equivalent of whitelist_all_origins 2019-06-19 12:27:35 +02:00
Jakob Olsson
7e3e64cd1b owsd: let init.d script parse whitelist_all_origins and pass -O flag 2019-06-19 12:00:17 +02:00
Jakob Olsson
27e5d08b05 owsd: update pkg for teardown change 2019-06-05 13:59:25 +02:00
Jakob Olsson
27f412c2dc owsd: update pkg to include change for lws 3.1.0 2019-06-05 13:07:27 +02:00
2 changed files with 17 additions and 2 deletions

View File

@@ -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

View File

@@ -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}"