rpcd: support "files" attribute in menu json files to make menu entries depend on...

[project/luci2/ui.git] / luci2 / src / rpcd / luci2.c

diff --git a/luci2/src/rpcd/luci2.c b/luci2/src/rpcd/luci2.c
index a736dd8..cc7423d 100644 (file)
--- a/luci2/src/rpcd/luci2.c
+++ b/luci2/src/rpcd/luci2.c
@@ -2205,7 +2205,7 @@ rpc_luci2_network_dev_list(struct ubus_context *ctx, struct ubus_object *obj,
        struct stat s;
        void *c, *t;
        bool wireless, bridge, tuntap;
-       int type;
+       int type, flags;
        DIR *d;
        FILE *f;
 
@@ -2230,6 +2230,18 @@ rpc_luci2_network_dev_list(struct ubus_context *ctx, struct ubus_object *obj,
 
                fclose(f);
 
+               snprintf(path, sizeof(path) - 1, "/sys/class/net/%s/flags", e->d_name);
+
+               if (stat(path, &s) || !S_ISREG(s.st_mode) || !(f = fopen(path, "r")))
+                       continue;
+
+               flags = 0;
+               memset(path, 0, sizeof(path));
+
+               if (fread(path, 1, sizeof(path) - 1, f) > 0)
+                       flags = strtoul(path, NULL, 16);
+
+               fclose(f);
 
                snprintf(path, sizeof(path) - 1,
                         "/sys/class/net/%s/wireless", e->d_name);
@@ -2255,6 +2267,7 @@ rpc_luci2_network_dev_list(struct ubus_context *ctx, struct ubus_object *obj,
 
                blobmsg_add_string(&buf, "device", e->d_name);
                blobmsg_add_u32(&buf, "type", type);
+               blobmsg_add_u8(&buf, "is_up", flags & 1);
                blobmsg_add_u8(&buf, "is_bridge", bridge);
                blobmsg_add_u8(&buf, "is_tuntap", tuntap);
                blobmsg_add_u8(&buf, "is_wireless", wireless);
@@ -2549,6 +2562,30 @@ menu_access(struct blob_attr *sid, struct blob_attr *acls, struct blob_buf *e)
        return rv;
 }
 
+static bool
+menu_files(struct blob_attr *files)
+{
+       int rem;
+       bool empty = true;
+       struct stat s;
+       struct blob_attr *file;
+
+       blobmsg_for_each_attr(file, files, rem)
+       {
+               empty = false;
+
+               if (blobmsg_type(file) != BLOBMSG_TYPE_STRING)
+                       continue;
+
+               if (stat(blobmsg_get_string(file), &s) || !S_ISREG(s.st_mode))
+                       continue;
+
+               return true;
+       }
+
+       return empty;
+}
+
 static int
 rpc_luci2_ui_menu(struct ubus_context *ctx, struct ubus_object *obj,
                   struct ubus_request_data *req, const char *method,
@@ -2560,7 +2597,7 @@ rpc_luci2_ui_menu(struct ubus_context *ctx, struct ubus_object *obj,
        struct blob_buf item = { 0 };
        struct blob_attr *entry, *attr;
        struct blob_attr *tb[__RPC_MENU_MAX];
-       bool access;
+       bool access, files;
        void *c, *d;
 
        blobmsg_parse(rpc_menu_policy, __RPC_MENU_MAX, tb,
@@ -2584,7 +2621,7 @@ rpc_luci2_ui_menu(struct ubus_context *ctx, struct ubus_object *obj,
 
                        blob_for_each_attr(entry, menu.head, rem)
                        {
-                               access = true;
+                               access = files = true;
 
                                blob_buf_init(&item, 0);
                                d = blobmsg_open_table(&item, blobmsg_name(entry));
@@ -2594,13 +2631,16 @@ rpc_luci2_ui_menu(struct ubus_context *ctx, struct ubus_object *obj,
                                        if (blob_id(attr) == BLOBMSG_TYPE_ARRAY &&
                                            !strcmp(blobmsg_name(attr), "acls"))
                                                access = menu_access(tb[RPC_MENU_SESSION], attr, &item);
+                                       else if (blob_id(attr) == BLOBMSG_TYPE_ARRAY &&
+                                                !strcmp(blobmsg_name(attr), "files"))
+                                               files = menu_files(attr);
                                        else
                                                blobmsg_add_blob(&item, attr);
                                }
 
                                blobmsg_close_table(&item, d);
 
-                               if (access)
+                               if (access && files)
                                        blob_for_each_attr(attr, item.head, rem2)
                                                blobmsg_add_blob(&buf, attr);