diff --git a/obuspa/Makefile b/obuspa/Makefile index 769f49181..780a8ecd9 100644 --- a/obuspa/Makefile +++ b/obuspa/Makefile @@ -5,13 +5,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=obuspa -PKG_VERSION:=7.0.5.5.5 +PKG_VERSION:=7.0.5.5.6 LOCAL_DEV:=0 ifneq ($(LOCAL_DEV),1) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/obuspa.git -PKG_SOURCE_VERSION:=3d556e0956b1660a190104a5a944b8b89e50288b +PKG_SOURCE_VERSION:=029bda806b6e0f725a6596337433d0bfbfcb75e5 PKG_MAINTAINER:=Vivek Dutta PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_MIRROR_HASH:=skip @@ -32,7 +32,7 @@ define Package/obuspa SUBMENU:=TRx69 TITLE:=USP agent MENU:=1 - DEPENDS:=+libopenssl +libuci +libblobmsg-json +libcurl +libsqlite3 +libubox +libubus +libmosquitto-ssl +libwebsockets-openssl + DEPENDS:=+libopenssl +libuci +libblobmsg-json +libcurl +libsqlite3 +libubox +libubus +libmosquitto-ssl +libwebsockets-openssl +ca-certificates endef define Package/obuspa/description diff --git a/obuspa/files/etc/config/obuspa b/obuspa/files/etc/config/obuspa index 2702055e6..e82dcc561 100644 --- a/obuspa/files/etc/config/obuspa +++ b/obuspa/files/etc/config/obuspa @@ -7,7 +7,7 @@ config obuspa 'global' option db_file '/etc/obuspa/usp.db' option role_file '/etc/obuspa/roles.json' option dm_caching_exclude '/etc/obuspa/dmcaching_exclude.json' - #option trust_cert '/etc/obuspa/rootCA.pem' + #option trust_cert '/etc/ssl/cert.pem' #option client_cert '/etc/obuspa/client.pem' #option log_dest '/tmp/obuspa.log' diff --git a/obuspa/files/etc/obuspa/roles.json b/obuspa/files/etc/obuspa/roles.json index 2e773420c..a1623dfe1 100644 --- a/obuspa/files/etc/obuspa/roles.json +++ b/obuspa/files/etc/obuspa/roles.json @@ -82,6 +82,17 @@ "PERMIT_SUBS_EVT_OPER_COMP" ] }, + { + "object": "Device.SelfTestDiagnostics()", + "perm": [ + "PERMIT_GET", + "PERMIT_GET_INST", + "PERMIT_OBJ_INFO", + "PERMIT_CMD_INFO", + "PERMIT_OPER", + "PERMIT_SUBS_EVT_OPER_COMP" + ] + }, { "object": "Device.FactoryReset()", "perm": [ @@ -570,8 +581,7 @@ { "object": "Device.", "perm": [ - "PERMIT_NONE", - "PERMIT_SUBS_EVT_OPER_COMP" + "PERMIT_NONE" ] }, { @@ -584,66 +594,6 @@ "PERMIT_SUBS_EVT_OPER_COMP" ] }, - { - "object":"Device.Time.", - "perm": [ - "PERMIT_GET", - "PERMIT_GET_INST", - "PERMIT_OBJ_INFO", - "PERMIT_CMD_INFO", - "PERMIT_SUBS_EVT_OPER_COMP" - ] - }, - { - "object":"Device.UPnP.", - "perm": [ - "PERMIT_GET", - "PERMIT_GET_INST", - "PERMIT_OBJ_INFO", - "PERMIT_CMD_INFO", - "PERMIT_SUBS_EVT_OPER_COMP" - ] - }, - { - "object":"Device.Bridging.", - "perm": [ - "PERMIT_GET", - "PERMIT_GET_INST", - "PERMIT_OBJ_INFO", - "PERMIT_CMD_INFO", - "PERMIT_SUBS_EVT_OPER_COMP" - ] - }, - { - "object":"Device.Ethernet.", - "perm": [ - "PERMIT_GET", - "PERMIT_GET_INST", - "PERMIT_OBJ_INFO", - "PERMIT_CMD_INFO", - "PERMIT_SUBS_EVT_OPER_COMP" - ] - }, - { - "object":"Device.DHCPv4.", - "perm": [ - "PERMIT_GET", - "PERMIT_GET_INST", - "PERMIT_OBJ_INFO", - "PERMIT_CMD_INFO", - "PERMIT_SUBS_EVT_OPER_COMP" - ] - }, - { - "object":"Device.DHCPv6.", - "perm": [ - "PERMIT_GET", - "PERMIT_GET_INST", - "PERMIT_OBJ_INFO", - "PERMIT_CMD_INFO", - "PERMIT_SUBS_EVT_OPER_COMP" - ] - }, { "object":"Device.Hosts.", "perm": [ @@ -654,37 +604,6 @@ "PERMIT_SUBS_EVT_OPER_COMP" ] }, - { - "object":"Device.NAT.", - "perm": [ - "PERMIT_GET", - "PERMIT_GET_INST", - "PERMIT_OBJ_INFO", - "PERMIT_CMD_INFO", - "PERMIT_SUBS_VAL_CHANGE", - "PERMIT_SUBS_EVT_OPER_COMP" - ] - }, - { - "object":"Device.PPP.", - "perm": [ - "PERMIT_GET", - "PERMIT_GET_INST", - "PERMIT_OBJ_INFO", - "PERMIT_CMD_INFO", - "PERMIT_SUBS_EVT_OPER_COMP" - ] - }, - { - "object":"Device.Routing.", - "perm": [ - "PERMIT_GET", - "PERMIT_GET_INST", - "PERMIT_OBJ_INFO", - "PERMIT_CMD_INFO", - "PERMIT_SUBS_EVT_OPER_COMP" - ] - }, { "object":"Device.IEEE1905.", "perm": [ @@ -695,16 +614,6 @@ "PERMIT_SUBS_EVT_OPER_COMP" ] }, - { - "object":"Device.InterfaceStack.", - "perm": [ - "PERMIT_GET", - "PERMIT_GET_INST", - "PERMIT_OBJ_INFO", - "PERMIT_CMD_INFO", - "PERMIT_SUBS_EVT_OPER_COMP" - ] - }, { "object":"Device.DynamicDNS.", "perm": [ @@ -715,56 +624,6 @@ "PERMIT_SUBS_EVT_OPER_COMP" ] }, - { - "object":"Device.LANConfigSecurity.", - "perm": [ - "PERMIT_GET", - "PERMIT_GET_INST", - "PERMIT_OBJ_INFO", - "PERMIT_CMD_INFO", - "PERMIT_SUBS_EVT_OPER_COMP" - ] - }, - { - "object":"Device.Security.", - "perm": [ - "PERMIT_GET", - "PERMIT_GET_INST", - "PERMIT_OBJ_INFO", - "PERMIT_CMD_INFO", - "PERMIT_SUBS_EVT_OPER_COMP" - ] - }, - { - "object":"Device.RouterAdvertisement.", - "perm": [ - "PERMIT_GET", - "PERMIT_GET_INST", - "PERMIT_OBJ_INFO", - "PERMIT_CMD_INFO", - "PERMIT_SUBS_EVT_OPER_COMP" - ] - }, - { - "object":"Device.Services.", - "perm": [ - "PERMIT_GET", - "PERMIT_GET_INST", - "PERMIT_OBJ_INFO", - "PERMIT_CMD_INFO", - "PERMIT_SUBS_EVT_OPER_COMP" - ] - }, - { - "object":"Device.UserInterface.", - "perm": [ - "PERMIT_GET", - "PERMIT_GET_INST", - "PERMIT_OBJ_INFO", - "PERMIT_CMD_INFO", - "PERMIT_SUBS_EVT_OPER_COMP" - ] - }, { "object":"Device.PeriodicStatistics.", "perm": [ @@ -801,30 +660,16 @@ ] }, { - "object": "Device.DNS.", + "object": "Device.WiFi.AccessPoint.{i}.WPS.InitiateWPSPBC()", "perm": [ - "PERMIT_GET", - "PERMIT_GET_INST", - "PERMIT_OBJ_INFO", - "PERMIT_CMD_INFO", "PERMIT_OPER", - "PERMIT_SUBS_VAL_CHANGE", - "PERMIT_SUBS_OBJ_ADD", - "PERMIT_SUBS_OBJ_DEL", "PERMIT_SUBS_EVT_OPER_COMP" ] }, { - "object": "Device.IP.", + "object": "Device.WiFi.DataElements.Network.SetSSID()", "perm": [ - "PERMIT_GET", - "PERMIT_GET_INST", - "PERMIT_OBJ_INFO", - "PERMIT_CMD_INFO", "PERMIT_OPER", - "PERMIT_SUBS_VAL_CHANGE", - "PERMIT_SUBS_OBJ_ADD", - "PERMIT_SUBS_OBJ_DEL", "PERMIT_SUBS_EVT_OPER_COMP" ] }