Commit graph

86 commits

Author SHA1 Message Date
Jakob Olsson
b355f5e8f8 owsd: update package hash to include acl changes 2018-11-26 11:24:03 +01:00
Sukru Senli
8363a9d567 owsd: remove ubusx_acl list by default 2018-10-02 15:45:51 +02:00
Sukru Senli
d4aa675a7a iopsys: point to new iopsys git repositories 2018-09-23 11:19:23 +02:00
Sukru Senli
1f7018969b owsd: revert ubusx_acl support 2018-08-24 12:11:21 +02:00
Ionuț-Alex Oprea
9d501b2185 Update feed [ feed_inteno_packages ] package [ owsd ]
-------------------------------------------------------------------------------
* 372743e Revert "use mac as ubusx event prefix refs #15472"
-------------------------------------------------------------------------------
commit 372743e4c905c9d51988742442b375f0b2bab8db
Author: Ionuț-Alex Oprea <ionutalexoprea@gmail.com>
Date: 2018-07-25 16:51:46 +0200

    Revert "use mac as ubusx event prefix refs #15472"

    This reverts commit ddaaafa5cd5a6b4fbeb554afd03e982559ceab88.

Base directory -> /
 src/local_stub.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
-------------------------------------------------------------------------------
2018-07-25 17:02:22 +02:00
Ionuț-Alex Oprea
08c0aae9a5 Update feed [ feed_inteno_packages ] package [ owsd ]
-------------------------------------------------------------------------------
* ddaaafa use mac as ubusx event prefix refs #15472
* 1c99f70 use mac as ubusx object prefix refs #15472
* 5f2da35 add cmdline parameter to control the ubusx prefix type refs #15472
* db5477b wsubus: match origin case insensitively refs #15501
* 19a429e prepare for: ubusx object prefix change from ip to mac refs #15472
-------------------------------------------------------------------------------
commit ddaaafa5cd5a6b4fbeb554afd03e982559ceab88
Author: Ionuț-Alex Oprea <ionutalexoprea@gmail.com>
Date: 2018-07-24 16:41:15 +0200

    use mac as ubusx event prefix refs #15472

Base directory -> /
 src/local_stub.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
-------------------------------------------------------------------------------
commit 1c99f70271531871468ebe538b516152092c9d4f
Author: Ionuț-Alex Oprea <ionutalexoprea@gmail.com>
Date: 2018-07-24 16:29:14 +0200

    use mac as ubusx object prefix refs #15472

Base directory -> /
 src/local_stub.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
-------------------------------------------------------------------------------
commit 5f2da3522ceb95c44f200d6ffa24d62eb31d0fed
Author: Ionuț-Alex Oprea <ionutalexoprea@gmail.com>
Date: 2018-07-24 16:19:12 +0200

    add cmdline parameter to control the ubusx prefix type refs #15472

Base directory -> /
 src/local_stub.c    | 11 +++++++++++
 src/main.c          |  9 +++++++++
 src/wsubus_client.h |  1 +
 3 files changed, 21 insertions(+)
-------------------------------------------------------------------------------
commit db5477ba0ef4596b4b68c73a16c042f6d8400474
Author: Reidar Cederqvist <reidar.cederqvist@gmail.com>
Date: 2018-07-23 14:25:47 +0200

    wsubus: match origin case insensitively refs #15501

Base directory -> /
 src/wsubus.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
-------------------------------------------------------------------------------
commit 19a429e78c025c03ec11fb20229c389e453a8825
Author: Ionuț-Alex Oprea <ionutalexoprea@gmail.com>
Date: 2018-07-20 15:32:37 +0200

    prepare for: ubusx object prefix change from ip to mac refs #15472

    	The ubus objects that belong to other routers and are published
    through ubusx have a prefix to identify the remote router.
    This is normally the ip, for example:
    	192.168.1.201/router.system
    This commit adds a function that can change this prefix to the
    corresponding mac(as seen in the dhcp leases), for example:
    	06:22:07:67:75:9a/router.system

    	Note that this commit does not enable this functionality,
    only adds it.

Base directory -> /
 src/local_stub.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)
-------------------------------------------------------------------------------
2018-07-24 16:44:04 +02:00
Ionuț-Alex Oprea
45dd7acb3d owsd: use mac as ubusx object prefix refs #15472 2018-07-24 16:43:19 +02:00
Sukru Senli
8febdc5117 owsd: fix the copyright header in the Makefile 2018-06-13 13:30:33 +02:00
Ionuț-Alex Oprea
86dd2c0994 owsd config: add ubusx_acl example 2018-06-07 14:23:00 +02:00
Ionuț-Alex Oprea
1d78413c74 Update feed [ feed_inteno_packages ] package [ owsd ]
-------------------------------------------------------------------------------
*   f0147e7 Merge branch 'ubusx_acl' into devel
|\
| * d13aeee fix checkpatch.pl warnings and errors
| * 6eac202 replace avl_strcmp with ubus_object_path_compare: proper comparison for object that end with *
| * d092c9e replace printf with lwsl_notice
| * ce1b001 fix compile warnings: type cast
| * a58a5de implement ubusx_acl__add_object to the avl tree
| * b45d846 ubusx_acl: if option is not used, allow all objects bu default
| * 6a4240c add include ubusx_acl.h in main.c
| * 18450f3 add ubusx_acl__add_objects method
| * 60158a8 add the -X option: ubusx acl
| * 2d98397 add the avl tree to keep the object names
| * c3afdb3 add ubusx_acl to makefile
| * 292b619 initial add ubusx_acl files
| * 7f7752e call the ubusx_acl methods
|/
* aed9de1 Create new vhost on -i if iface already defined
-------------------------------------------------------------------------------
commit f0147e754b1018ef51b96ec21f40b921a30e6a6e
Author: Ionuț-Alex Oprea <ionutalexoprea@gmail.com>
Date: 2018-06-05 16:15:32 +0200

    Merge branch 'ubusx_acl' into devel

Base directory -> /
 CMakeLists.txt      |   1 +
 src/main.c          |  11 ++++
 src/rpc_list_ubus.h |   6 ++
 src/ubusx_acl.c     | 159 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/ubusx_acl.h     |  36 ++++++++++++
 5 files changed, 213 insertions(+)
-------------------------------------------------------------------------------
commit d13aeee31979200f801e203dda58c0c7624ede9e
Author: Ionuț-Alex Oprea <ionutalexoprea@gmail.com>
Date: 2018-06-05 16:13:17 +0200

    fix checkpatch.pl warnings and errors

Base directory -> /
 src/main.c          |  2 +-
 src/rpc_list_ubus.h |  5 +++--
 src/ubusx_acl.c     | 25 +++++++++++++------------
 src/ubusx_acl.h     |  4 ++--
 4 files changed, 19 insertions(+), 17 deletions(-)
-------------------------------------------------------------------------------
commit 6eac202a77a9f3d2288e37ad82624075507c03cf
Author: Ionuț-Alex Oprea <ionutalexoprea@gmail.com>
Date: 2018-06-05 15:59:40 +0200

    replace avl_strcmp with ubus_object_path_compare: proper comparison for
    object that end with *

Base directory -> /
 src/ubusx_acl.c | 33 +++++++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)
-------------------------------------------------------------------------------
commit d092c9e1832c5c225adc708f027811319a06486a
Author: Ionuț-Alex Oprea <ionutalexoprea@gmail.com>
Date: 2018-06-05 15:27:58 +0200

    replace printf with lwsl_notice

Base directory -> /
 src/ubusx_acl.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)
-------------------------------------------------------------------------------
commit ce1b00135b25d8020813830df52c70aff674944a
Author: Ionuț-Alex Oprea <ionutalexoprea@gmail.com>
Date: 2018-06-05 13:54:53 +0200

    fix compile warnings: type cast

Base directory -> /
 src/ubusx_acl.c | 6 +++---
 src/ubusx_acl.h | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)
-------------------------------------------------------------------------------
commit a58a5de270f1cf360f894fad875cba359ebe3fa3
Author: Ionuț-Alex Oprea <ionutalexoprea@gmail.com>
Date: 2018-06-05 13:49:43 +0200

    implement ubusx_acl__add_object to the avl tree

Base directory -> /
 src/ubusx_acl.c | 28 ++++++++++++++++++++++++----
 src/ubusx_acl.h |  2 +-
 2 files changed, 25 insertions(+), 5 deletions(-)
-------------------------------------------------------------------------------
commit b45d84696d8a77ede69c0176fa12c02b2fbf0890
Author: Ionuț-Alex Oprea <ionutalexoprea@gmail.com>
Date: 2018-06-05 12:00:44 +0200

    ubusx_acl: if option is not used, allow all objects bu default

Base directory -> /
 src/ubusx_acl.c | 4 ++++
 1 file changed, 4 insertions(+)
-------------------------------------------------------------------------------
commit 6a4240c5c9b9eb74ac0c2b864db1ffbd01b7d0b1
Author: Ionuț-Alex Oprea <ionutalexoprea@gmail.com>
Date: 2018-06-05 11:35:41 +0200

    add include ubusx_acl.h in main.c

Base directory -> /
 src/main.c | 1 +
 1 file changed, 1 insertion(+)
-------------------------------------------------------------------------------
commit 18450f3548a8b9f71c597ab73b544bfa144a552c
Author: Ionuț-Alex Oprea <ionutalexoprea@gmail.com>
Date: 2018-06-05 11:31:13 +0200

    add ubusx_acl__add_objects method

Base directory -> /
 src/main.c      |  1 +
 src/ubusx_acl.c | 18 ++++++++++++++++++
 src/ubusx_acl.h |  1 +
 3 files changed, 20 insertions(+)
-------------------------------------------------------------------------------
commit 60158a8c5a14a0dc18eb94d55584cbf174f57b5f
Author: Ionuț-Alex Oprea <ionutalexoprea@gmail.com>
Date: 2018-06-05 10:26:23 +0200

    add the -X option: ubusx acl

Base directory -> /
 src/main.c | 9 +++++++++
 1 file changed, 9 insertions(+)
-------------------------------------------------------------------------------
commit 2d98397f786954935946ceec29550e29a6e6e445
Author: Ionuț-Alex Oprea <ionutalexoprea@gmail.com>
Date: 2018-06-04 15:15:36 +0200

    add the avl tree to keep the object names

Base directory -> /
 src/ubusx_acl.c | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)
-------------------------------------------------------------------------------
commit c3afdb3a6f5df1c7b8f23eafa7e86455a71851c5
Author: Ionuț-Alex Oprea <ionutalexoprea@gmail.com>
Date: 2018-05-30 16:57:42 +0200

    add ubusx_acl to makefile

Base directory -> /
 CMakeLists.txt  | 1 +
 src/ubusx_acl.c | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
-------------------------------------------------------------------------------
commit 292b61900a1e6b73d1fb6b205f627b69fb5c1b93
Author: Ionuț-Alex Oprea <ionutalexoprea@gmail.com>
Date: 2018-05-30 16:32:30 +0200

    initial add ubusx_acl files

Base directory -> /
 src/ubusx_acl.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 src/ubusx_acl.h | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 86 insertions(+)
-------------------------------------------------------------------------------
commit 7f7752eba0f65ac53cbdacf44c416a989e768f7d
Author: Ionuț-Alex Oprea <ionutalexoprea@gmail.com>
Date: 2018-05-30 16:30:54 +0200

    call the ubusx_acl methods

Base directory -> /
 src/rpc_list_ubus.h | 5 +++++
 1 file changed, 5 insertions(+)
-------------------------------------------------------------------------------
commit aed9de16f49d94bd5abf10a3038fd9a1712cec19
Author: Matija Amidzic <matija.amidzic@sartura.hr>
Date: 2018-02-27 11:27:44 +0100

    Create new vhost on -i if iface already defined

    New lws virtual host will now be created if option -i is specified multiple
    times on the same port(vhost). New vhost will have the same port and label
    as previous vhost.

    Signed-off-by: Matija Amidzic <matija.amidzic@sartura.hr>

Base directory -> /
 src/main.c | 75 +++++++++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 52 insertions(+), 23 deletions(-)
-------------------------------------------------------------------------------
2018-06-05 16:26:26 +02:00
Ionuț-Alex Oprea
a9754642bd add "list ubusx_acl" option 2018-06-05 16:19:18 +02:00
Sukru Senli
dae658ecef owsd: do not install uci-default script 2018-04-17 16:08:13 +02:00
Reidar Cederqvist
43e9bd1e6f owd: if ipv6 and linklocal is on, listen on ipv6 link local address 2018-02-13 12:04:54 +01:00
Sukru Senli
35aa491288 owsd: remove redirect from global config 2018-02-10 14:42:06 +01:00
Sukru Senli
c2b14d454a Update feed [ feed_inteno_packages ] package [ owsd ]
-------------------------------------------------------------------------------
* fa25ad0 owsd now doesn't exit on invalid interface
-------------------------------------------------------------------------------
commit fa25ad0b5af3c9a5c16124a9f699dae3be7b68dd
Author: Matija Amidzic <matija.amidzic@sartura.hr>
Date: 2018-02-05 09:08:38 +0100

    owsd now doesn't exit on invalid interface

    if a non existing interface is provided in the command line arguments, owsd
    will ignore it now and continue working

    Signed-off-by: Matija Amidzic <matija.amidzic@sartura.hr>

Base directory -> /
 src/main.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
-------------------------------------------------------------------------------
2018-02-06 16:47:25 +01:00
Reidar Cederqvist
db55cfc74a owsd/questd: move uproxyd startup from questd to owsd init.d script 2018-01-12 16:18:10 +01:00
Ionut-Alex Oprea
8e075dd746 Update feed [ feed_inteno_packages ] package [ owsd ]
-------------------------------------------------------------------------------
* 1a815ef rewrite jsonrpc__req_ubuslist and jsonrpc_req_ubuslisten with json-c json_object refs #13595
-------------------------------------------------------------------------------
commit 1a815efff25ae4d52bfee67cc4642eb4627f1388
Author: Ionut-Alex Oprea <ionutalexoprea@gmail.com>
Date: 2017-12-13 10:32:10 +0100

    rewrite jsonrpc__req_ubuslist and jsonrpc_req_ubuslisten with json-c
    json_object refs #13595

Base directory -> /
 src/util_jsonrpc.c | 125 ++++++++++++++++++++++++++++-------------------------
 src/ws_ubusproxy.c |   4 ++
 2 files changed, 69 insertions(+), 60 deletions(-)
-------------------------------------------------------------------------------
2018-01-08 19:27:40 +01:00
Ionut-Alex Oprea
0929485a45 owsd: update to newer version 2018-01-08 19:27:40 +01:00
Reidar Cederqvist
e6c4ac12d4 owsd: fix broken dependencies 2018-01-08 19:27:40 +01:00
Reidar Cederqvist
6d865ed960 OWSD build system compatible with openWRT build system 2018-01-08 19:27:40 +01:00
Ionut-Alex Oprea
296696a586 update owsd version 2018-01-08 19:27:40 +01:00
Ionut-Alex Oprea
31d25714bf update ubusproxy peer comment 2018-01-08 19:27:40 +01:00
Reidar Cederqvist
b29f8a9406 owsd: update config and init.d files to work with ubusproxy 2018-01-08 19:27:40 +01:00
Ionut-Alex Oprea
7dd5cf1864 owsd: update to latest version 2018-01-08 19:27:40 +01:00
Ionut-Alex Oprea
c7b863e916 owsd: config: fix typos and add missing ca option in /etc/config/owsd 2018-01-08 19:27:40 +01:00
Sukru Senli
74df26fb32 owsd: handle owsd acl in owsd init script and configure rpcd accordingly 2018-01-08 19:27:40 +01:00
Denis Osvald
44e10992bf Update feed [ feed_inteno_packages ] package [ owsd ]
-------------------------------------------------------------------------------
* 20fef42 make HTTP caching configurable and off-by-default
-------------------------------------------------------------------------------

-------------------------------------------------------------------------------
commit 20fef420d1796b47fb056e98113592471011a9de
Author: Denis Osvald <denis.osvald@sartura.hr>
Date: 2017-02-10 13:53:44 +0100

    make HTTP caching configurable and off-by-default

    Signed-off-by: Denis Osvald <denis.osvald@sartura.hr>

Base directory -> /
 src/main.c | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)
-------------------------------------------------------------------------------

Signed-off-by: Denis Osvald <denis.osvald@sartura.hr>
2018-01-08 19:27:40 +01:00
Denis Osvald
1e5d155104 owsd: to version with proxy features and SSL auth
Signed-off-by: Denis Osvald <denis.osvald@sartura.hr>
2018-01-08 19:27:40 +01:00
Denis Osvald
3fd5294345 update owsd default config file with commented-out proxy options
Signed-off-by: Denis Osvald <denis.osvald@sartura.hr>
2018-01-08 19:27:40 +01:00
Denis Osvald
357ef23c0d install /etc/config/owsd as ocnfig file to preserve it
Signed-off-by: Denis Osvald <denis.osvald@sartura.hr>
2018-01-08 19:27:40 +01:00
Denis Osvald
b3810ba716 update owsd init script with new options
Signed-off-by: Denis Osvald <denis.osvald@sartura.hr>
2018-01-08 19:27:40 +01:00
Denis Osvald
5f729b9eea owsd: update to version with client proxy
New version adds option -C to owsd, with respective option in config:

config owsd 'global'
	...
	list ubusproxy 'http://url1/'
	list ubusproxy 'http://url12/'
	...

Patch is removed since it's obsoleted in this version

Signed-off-by: Denis Osvald <denis.osvald@sartura.hr>
2018-01-08 19:27:40 +01:00
Sukru Senli
2f8768beaa owsd: wan https commented out 2018-01-08 19:27:40 +01:00
Denis Osvald
2bef8c073c owsd: update to latest version, tweaks debug output
Signed-off-by: Denis Osvald <denis.osvald@sartura.hr>
2018-01-08 19:27:40 +01:00
Denis Osvald
3f80217975 owsd: fix origin whitelisting on https port 443
Signed-off-by: Denis Osvald <denis.osvald@sartura.hr>
2018-01-08 19:27:40 +01:00
Denis Osvald
b38c7fda35 owsd: temporarily raise max vhosts to 30 until refactor
Signed-off-by: Denis Osvald <denis.osvald@sartura.hr>
2018-01-08 19:27:40 +01:00
Denis Osvald
486112e022 libwebsockets, owsd: update to latest, addresses HTTP pipelining
Signed-off-by: Denis Osvald <denis.osvald@sartura.hr>
2018-01-08 19:27:40 +01:00
Sukru Senli
0d6a3fca83 owsd: auto populate for port 80 and 8080 2018-01-08 19:27:40 +01:00
Sukru Senli
74c70ba559 owsd: auto populate interfaces to listen on 2018-01-08 19:27:40 +01:00
Sukru Senli
1dccf9f8bf owsd: change url to http 2018-01-08 19:27:40 +01:00
Jonas Höglund
bbcaeda58d Update feed [ feed_inteno_packages ] package [ owsd ]
-------------------------------------------------------------------------------
* 841c0ef Fix compile error on openwrt master
-------------------------------------------------------------------------------
commit 841c0ef39de130dfda93bec6badea2255d26a528
Author: Jonas Höglund <jonas.hoglund@embeddednation.com>
Date: 2016-09-22 14:58:40 +0200

    Fix compile error on openwrt master

Base directory -> /
 src/ws_http_serve.c | 1 +
 1 file changed, 1 insertion(+)
-------------------------------------------------------------------------------
2018-01-08 19:27:40 +01:00
Denis Osvald
3419b149b8 owsd: update to latest, modify initscript to pass listen label
Signed-off-by: Denis Osvald <denis.osvald@sartura.hr>
2018-01-08 19:27:40 +01:00
Sukru Senli
9986a37299 owsd: listen on wan6 interface 2018-01-08 19:27:40 +01:00
Sukru Senli
6d7fe87ed3 owsd: whitelist dhcp domains only if set to 1 2018-01-08 19:27:40 +01:00
Denis Osvald
7fcbcd3930 owsd: add new localhost section
Signed-off-by: Denis Osvald <denis.osvald@sartura.hr>
2018-01-08 19:27:40 +01:00
Denis Osvald
31f43a3194 owsd: separate listening ports for ipv4 and ipv6, #10027
Signed-off-by: Denis Osvald <denis.osvald@sartura.hr>
2018-01-08 19:27:40 +01:00
Denis Osvald
554c997dd8 Update feed [ feed_inteno_packages ] package [ owsd ]
-------------------------------------------------------------------------------
* 6dd1429 raise max number of listen sockets to 10
* a6533b7 fix check for max number of listen sockets
-------------------------------------------------------------------------------
commit 6dd142943bc68e0e4b1f4a002ce7f281c1678813
Author: Denis Osvald <denis.osvald@sartura.hr>
Date: 2016-09-02 16:34:03 +0200

    raise max number of listen sockets to 10

    Signed-off-by: Denis Osvald <denis.osvald@sartura.hr>

Base directory -> /
 src/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
-------------------------------------------------------------------------------
commit a6533b794c27830dfc8a7dd3531e2344f258461c
Author: Denis Osvald <denis.osvald@sartura.hr>
Date: 2016-09-02 16:33:44 +0200

    fix check for max number of listen sockets

    Signed-off-by: Denis Osvald <denis.osvald@sartura.hr>

Base directory -> /
 src/main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
-------------------------------------------------------------------------------

Signed-off-by: Denis Osvald <denis.osvald@sartura.hr>
2018-01-08 19:27:40 +01:00
Alex Oprea
31d8c188df Revert "use procd reload scripts instead of hotplug"
This reverts commit c02d4886a213903ad890e09eadd9575ea569c68d.
2018-01-08 19:27:40 +01:00
Sukru Senli
27ac0cd984 owsd: whitelist localhost 2018-01-08 19:27:40 +01:00
Denis Osvald
74a9f4c75c use procd reload scripts instead of hotplug
Signed-off-by: Denis Osvald <denis.osvald@sartura.hr>
2018-01-08 19:27:40 +01:00