summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* iwinfo: add WPA3 supportJo-Philipp Wich2019-09-091-10/+10
| | | | Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* file: refactor message parsing and permission checkingJo-Philipp Wich2019-09-081-80/+43
| | | | | | | | | | | | | | Refactor rpc_check_path() and wrap it with a macro to allow passing different policies and permission names. This allows using the function for non-read operations and simplifies the message parsing code there. Also change the stat and list methods to require "list" instead of "read" permissions which is useful to allow browing the filesystem without allowing read access to all files. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* iwinfo: expose all rate info fields in assoclist replyJo-Philipp Wich2019-09-041-8/+22
| | | | Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* sys: fix symbol redeclarationJo-Philipp Wich2019-09-041-2/+2
| | | | | Fixes: 27c24c7 ("rpcd: sys: actually move timespec declaration") Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* rpcd: sys: actually move timespec declarationJo-Philipp Wich2019-09-031-1/+1
| | | | | | | | Move the timespec declaration to the function header, as mentioned in commit "rpcd: Switch to nanosleep". Fixes: 604db20 ("rpcd: Switch to nanosleep") Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* file: add remove operationJo-Philipp Wich2019-09-031-6/+88
| | | | Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* rpcd: Switch to nanosleepRosen Penev2019-09-031-1/+2
| | | | | | | | | | | | usleep has been deprecated by POSIX.1-2001 and removed in POSIX.1-2008. Fixes compilation when libc does not include usleep (optional with uClibc-ng). nanosleep also has the advantage of being more accurate. Signed-off-by: Rosen Penev <rosenp@gmail.com> [move timespec definition to the top of the function] Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* file: add path based read/write/exec ACL checksJo-Philipp Wich2019-09-011-20/+156
| | | | | | | | | | | | | | | | | | | | | | | | Introduce ACL checks to verify that the requested path may be read, written or executed. This allows to restrict ubus file commands to specific paths. To setup the required ACLs, the following ubus command may be used on the command line: ubus call session grant '{ "ubus_rpc_session": "d41d8cd98f00b204e9800998ecf8427e", "scope": "file", "objects": [ [ "/etc", "read" ], [ "/etc/*", "write" ], [ "/sbin/sysupgrade", "exec" ] ] }' The "read", "list", "stat" and "md5" procedures require "read" permissions, the "write" procedure requires "write" permission and the "exec" procedure requires "exec" permissions. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* file: add stat() information to directory listingsJo-Philipp Wich2019-09-011-24/+41
| | | | Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* Fix possible linker errors by using CMake find_library macroPetr Štetiar2019-06-051-4/+9
| | | | | | | | | | Fixes following errors while compiling natively on x86: cc -fPIC -shared -o rpcsys.so sys.c.o -lubox -lubus ld: cannot find -lubox ld: cannot find -lubus Signed-off-by: Petr Štetiar <ynezz@true.cz>
* session: handle NULL return values of crypt()Jo-Philipp Wich2019-05-221-1/+1
| | | | | | | | | | | | The crypt() function may return NULL with errno ENOSYS when an attempt was made to crypt the plaintext password using a salt requesting an unsupported cipher. Avoid triggering segmentation faults in the subsequent strcmp() operation by checking for a non-NULL hash value. Fixes: FS#2291 Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* iwinfo: add mesh infos in assoclist.Daniel Danzberger2019-03-051-0/+7
| | | | Signed-off-by: Daniel Danzberger <daniel@dd-wrt.com>
* iwinfo: add survey.Daniel Danzberger2019-03-051-0/+40
| | | | Signed-off-by: Daniel Danzberger <daniel@dd-wrt.com>
* iwinfo: show more stats from assoclist.Daniel Danzberger2019-03-051-0/+16
| | | | Signed-off-by: Daniel Danzberger <daniel@dd-wrt.com>
* file: avoid closing stdio descriptors in rpc_file_exec_runJo-Philipp Wich2018-12-211-5/+12
| | | | Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* file: patch process stdin to /dev/nullJo-Philipp Wich2018-12-211-1/+8
| | | | | | | | This prevents broken pipe errors in executed child processes that attempt to access stdin. Suggested-by: Vytautas Virvičius <vy.virvicius@gmail.com> Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* file: remove unused members from struct rpc_file_exec_contextJo-Philipp Wich2018-12-211-4/+0
| | | | Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* file: rpc_file_exec_run: fix potential memory leak and integer overflowJo-Philipp Wich2018-12-211-4/+16
| | | | | | | | | | | - Store the realloc result in a separate pointer so that we can free the original on allocation failure - Use an explicit uint8_t for the argument vector length instead of "char" which might be signed or unsigned, depending on the arch - Bail out with an invalid argument error if the argument vector exceeds 255 items Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* file: access exec timeout via daemon ops structureJo-Philipp Wich2018-11-281-1/+5
| | | | | | | | Since the plugin is not linked, but dlopen()'d with RTLD_LOCAL, we cannot access global rpcd variables but need to access them via the common ops structure symbol. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* plugin: store pointer to exec timeout value in the ops structureJo-Philipp Wich2018-11-282-0/+2
| | | | | | | | This is required for plugins that need access to the configured execution timeout. The global variable cannot be used as-is since we dlopen() with RTLD_LOCAL. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* treewide: rename exec_timeout to rpc_exec_timeoutJo-Philipp Wich2018-11-284-6/+6
| | | | | | Rename the extern int to denote a global symbol. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* main: fix logic bug when not specifying a timeout optionJo-Philipp Wich2018-11-221-4/+2
| | | | Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* file: use global exec timeout instead of own hardcoded limitJo-Philipp Wich2018-11-221-2/+1
| | | | Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* exec: increase maximum execution time to 120sJo-Philipp Wich2018-11-223-3/+19
| | | | | | | Increase the maximum possible execution time to 120 seconds and add a new command line flag `-t` which allows overwriting the default value. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* uci: tighten uci reorder operation error handlingJo-Philipp Wich2018-08-091-3/+15
| | | | | - Return UBUS_STATUS_INVALID_ARGUMENT for invalid section names - Return UBUS_STATUS_NOT_FOUND if a section name could not be resolved
* uci: tighten uci delete operation error handlingJo-Philipp Wich2018-08-091-10/+33
| | | | | | | - Return UBUS_STATUS_NOT_FOUND if no object could be resolved for delete - Return UBUS_STATUS_INVALID_ARGUMENT for invalid section names or types Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* uci: tighten uci set operation error handlingJo-Philipp Wich2018-08-091-14/+45
| | | | | | | - Return UBUS_STATUS_NOT_FOUND if no section could be resolved for set - Return UBUS_STATUS_INVALID_ARGUMENT if unserializable values are found Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* uci: tighten uci add operation error handlingJo-Philipp Wich2018-08-091-9/+40
| | | | | | | - Return UBUS_STATUS_INVALID_ARGUMENT for invalid section or option names - Return UBUS_STATUS_NOT_FOUND if a section name could not be resolved Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* uci: reject invalid section and option namesJo-Philipp Wich2018-08-081-0/+74
| | | | | | | | | | | | The invoked libuci functions do not reliably check their arguments, causing malformed section and option names to end up in the delta file, letting the uci cli and other components to segfault when processung such invalid entries. In order to prevent that, manually test received values before passing them on to libuci. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* uci: fix memory leak in rpc_uci_replace_savedir()Jo-Philipp Wich2018-05-131-1/+5
| | | | | | | | | | | | The rpc_uci_replace_savedir() function did not take into account that libuci uci_set_savedir() does an additional implicit uci_strdup() of the directory path string when appending a new delta directory item. Due to this oversight, only the struct uci_element items got freed, but not the duplicated path string, leading to leaking memory when invoking the uci api with session id argument. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* exec: close stdout and stderr streams on child signalJo-Philipp Wich2018-05-081-0/+6
| | | | | | | This prevents timing out ubus call when the child invokes further detached childs inheriting stdio descriptors. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* uci: use correct sort index when reordering sectionsJo-Philipp Wich2018-04-281-1/+1
| | | | | | | | | When reordering, the section indexes must be 0-based while the current implementation incorrectly numbers starting with 1. Fix this by start numbering ther sections with index 0. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* uci: fix memory leak in rpc_uci_apply_timeout()Jo-Philipp Wich2018-04-201-0/+2
| | | | Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* uci: switch to proper save directory on apply/rollbackJo-Philipp Wich2018-04-201-35/+49
| | | | | | | | | | | | | | | The existing code failed to set the uci cursor save directory to the current session path, causing the apply routine to either fail or to merge settings from unrelated neighboring sessions, potentially leaking data. Solve the issue by switching the uci cursor save directory to the session directory before performing the actual apply actions. Additionally set the save directory path to "/dev/null" during rollback, to avoid merging unrelated system wide uci changes when restoring configs from the snapshot directory. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* uci: add rpc_uci_replace_savedir() helperJo-Philipp Wich2018-04-191-7/+19
| | | | | | | The rpc_uci_replace_savedir() function removes all configured save directories from the uci cursor instance and adds the given path argument as sole item. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* session: ignore non-string username attribute upon restoreJo-Philipp Wich2018-03-151-0/+3
| | | | | | | | | | When restoring session information from blob data, only consider the embedded username attribute if it is a string value. Other types may cause invalid memory accesses when attempting to strcmp() the attribute value. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* session: support reclaiming pending apply sessionJo-Philipp Wich2018-03-153-2/+38
| | | | | | | | | | | Reclaim the pending apply session upon login when the username matches the current login. This is required to support apply-confirm-rollback workflow for ubus browser clients, since changing IPs requires re-login to the device due to cross domain restrictions. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* session: remove redundant key attribute to rpc_session_set()Jo-Philipp Wich2018-03-151-5/+5
| | | | | | | | | | The given const char *key was used to look up the blob attribute, while the blob attributes internal name was used to store it in the avl tree. This leads to confusion and potential memory leaks when the given key name does not match the blob attributes internal name. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* uci: fix session delta isolationJo-Philipp Wich2018-03-151-0/+7
| | | | | | | | | | | The libuci `uci_set_savedir()` function does not replace, but appends the requested delta directory to the search path, this causes information leaks between sessions. Due to a lack of an official api for this, clear the uci contexts private delta path before setting the save directory. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* sys: packagelist: allow listing all packagesDaniel Golle2017-12-061-2/+19
| | | | | | | Introduce optional boolean attribute 'all' to allow listing all installed packages instead of only the user-selected ones. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
* sys: fix passwd pathRoman Yeryomin2017-11-281-2/+3
| | | | Signed-off-by: Roman Yeryomin <roman@advem.lv>
* sys: fix memory leak in packagelistDaniel Golle2017-11-121-0/+1
| | | | | | Fixes commit 4e483312b0. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
* sys: add packagelist methodDaniel Golle2017-11-121-0/+79
| | | | | | | | | Add method to list installed software packages directly from /usr/lib/opkg/status (ie. no need to have opkg installed). ubus call rpc-sys packagelist Signed-off-by: Daniel Golle <daniel@makrotopia.org>
* plugin: use RTLD_LOCAL instead of RTLD_GLOBAL when loading libraryRafał Miłecki2017-11-091-1/+1
| | | | | | | | | | | | | | | RTLD_GLOBAL was used to allow plugins use each other symbols but this facility was (most likely) never used and is a bad design anyway. If there is a common code it should just go to a library. Using RTLD_LOCAL on the other hand saves us from conflicting symbols used by different plugins. An example can be iwinfo plugin using libnl. If there appears to be another plugin using incompatible netlink implementation this will result in a problem. Both plugins will start using the same libnl which will break one of them. Signed-off-by: Rafał Miłecki <rafal@milecki.pl> Acked-by: Jo-Philipp Wich <jo@mein.io>
* cmake: Find libubox/blobmsg_json.hFlorian Fainelli2016-12-111-0/+3
| | | | | | | | Add a CMake FIND_PATH and INCLUDE_DIRECTORIES searching for blobmsg_json.h. Some external toolchains which do not include standard locations would fail to find the header otherwise. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
* sys: Check return values of chdir and writeFlorian Fainelli2016-12-111-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | Fixes the following warnings: rpcd/sys.c: In function 'rpc_cgi_password_set': rpcd/sys.c:116:8: error: ignoring return value of 'chdir', declared with attribute warn_unused_result [-Werror=unused-result] chdir("/"); ^ rpcd/sys.c:125:8: error: ignoring return value of 'write', declared with attribute warn_unused_result [-Werror=unused-result] write(fds[1], blobmsg_data(tb[RPC_P_PASSWORD]), ^ rpcd/sys.c:127:8: error: ignoring return value of 'write', declared with attribute warn_unused_result [-Werror=unused-result] write(fds[1], "\n", 1); ^ rpcd/sys.c:131:8: error: ignoring return value of 'write', declared with attribute warn_unused_result [-Werror=unused-result] write(fds[1], blobmsg_data(tb[RPC_P_PASSWORD]), ^ rpcd/sys.c:133:8: error: ignoring return value of 'write', declared with attribute warn_unused_result [-Werror=unused-result] write(fds[1], "\n", 1); ^ cc1: all warnings being treated as errors Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
* cmake: Find libubus.hFlorian Fainelli2016-07-271-0/+3
| | | | | | | | Add a CMake FIND_PATH and INCLUDE_DIRECTORIES searching for libubus.h. Some external toolchains which do not include standard locations would fail to find the header otherwise. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
* iwinfo: expose available HT ratesJo-Philipp Wich2016-06-301-0/+36
| | | | Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* iwinfo: zero out ccode buffer since library doesn'tDenis Osvald2016-06-051-1/+1
| | | | | | | | | | | Making an ubus call iwinfo countrylist '{"device":"radio0"}' will result in some entries having garbage uninitialized stack bytes in the "code" fields. With this patch we zero-initialize the buffer that libiwinfo writes to, making it NUL-terminated so that behavior doesn't happen anymore. Signed-off-by: Denis Osvald <denis.osvald@sartura.hr>
* file: add myself in Copyright headerLuka Perkov2016-04-121-0/+1
| | | | Signed-off-by: Luka Perkov <luka@openwrt.org>