Merge pull request #1314 from aparcar/acld

luci-app-attendedsysupgrade: lua code for acl.d

diff --combined applications/luci-app-attendedsysupgrade/luasrc/view/attendedsysupgrade.htm
index ea140c1,bc3fc6b..1e423b4
--- 1/applications/luci-app-attendedsysupgrade/luasrc/view/attendedsysupgrade.htm
--- 2/applications/luci-app-attendedsysupgrade/luasrc/view/attendedsysupgrade.htm
+++ b/applications/luci-app-attendedsysupgrade/luasrc/view/attendedsysupgrade.htm
@@@ -1,3 -1,78 +1,78 @@@
+ <%
+ -- all lua code provided by https://github.com/jow-/
+ -- thank you very much!
+ 
+     function apply_acls(filename, session)
+         local json = require "luci.jsonc"
+         local util = require "luci.util"
+         local fs   = require "nixio.fs"
+ 
+         local grants = { }
+ 
+         local acl = json.parse(fs.readfile(filename))
+         if type(acl) ~= "table" then
+             return
+         end
+ 
+         local group, perms
+         for group, perms in pairs(acl) do
+             local perm, scopes
+             for perm, scopes in pairs(perms) do
+                 if type(scopes) == "table" then
+                     local scope, objects
+                     for scope, objects in pairs(scopes) do
+                         if type(objects) == "table" then
+                             if not grants[scope] then
+                                 grants[scope] = { }
+                             end
+ 
+                             if next(objects) == 1 then
+                                 local _, object
+                                 for _, object in ipairs(objects) do
+                                     if not grants[scope][object] then
+                                         grants[scope][object] = { }
+                                     end
+                                     table.insert(grants[scope][object], perm)
+                                 end
+                             else
+                                 local object, funcs
+                                 for object, funcs in pairs(objects) do
+                                     if type(funcs) == "table" then
+                                         local _, func
+                                         for _, func in ipairs(funcs) do
+                                             if not grants[scope][object] then
+                                                 grants[scope][object] = { }
+                                             end
+                                             table.insert(grants[scope][object], func)
+                                         end
+                                     end
+                                 end
+                             end
+                         end
+                     end
+                 end
+             end
+         end
+ 
+         local _, scope, object, func
+         for scope, _ in pairs(grants) do
+             local objects = { }
+             for object, _ in pairs(_) do
+                 for _, func in ipairs(_) do
+                     table.insert(objects, { object, func })
+                 end
+             end
+ 
+             util.ubus("session", "grant", {
+                 ubus_rpc_session = session,
+                 scope = scope, objects = objects
+             })
+         end
+     end
+ 
+     apply_acls("/usr/share/rpcd/acl.d/attendedsysupgrade.json", luci.dispatcher.context.authsession)
+     apply_acls("/usr/share/rpcd/acl.d/packagelist.json", luci.dispatcher.context.authsession)
+ %>
  <%+header%>
  <h2 name="content"><%:Attended Sysupgrade%></h2>
  <div class="container">
@@@ -6,12 -81,6 +81,12 @@@
  </div>
  <input class="cbi-button" value="search for updates" onclick="update_request()" type="button" id="update_button">
  <div style="display: none" id="packages" class="alert-message success"></div>
 +<div class="cbi-value" id="update_packages_container" style="display: block">
 +      <label class="cbi-value-title" for="keep">search for package updates:</label>
 +      <div class="cbi-value-field">
 +              <input type="checkbox" name="update_packages" id="update_packages" />
 +      </div>
 +</div>
  <div class="cbi-value" id="keep_container" style="display: none">
        <label class="cbi-value-title" for="keep">keep settings:</label>
        <div class="cbi-value-field">
@@@ -21,7 -90,7 +96,7 @@@
  
  <script type="text/javascript">
  
 -latest_release = "";
 +latest_version = "";
  data = {};
  ubus_counter = 1
  origin = document.location.href.replace(location.pathname, "")
@@@ -75,9 -144,6 +150,9 @@@ function ubus_request_callback(response
                console.log(callback)
                if(typeof callback === "string") {
                        response_json = JSON.parse(response_object.responseText).result[1]
 +                      if (callback == "release") {
 +                              latest_version = response_json.release.version
 +                      }
                        data[callback] = response_json[callback]
                } else {
                        callback(response_object)
@@@ -92,8 -158,6 +167,8 @@@ function ubus_request_callback_uci(resp
                console.log(callback)
                response_json = JSON.parse(response_object.responseText).result[1].value
                data[callback] = response_json
 +
 +              document.getElementById("update_packages").checked = data.update_packages;
        } else {
                console.log(respons_object.responseText)
        }
@@@ -107,7 -171,6 +182,7 @@@ function setup() 
        ubus_request("system", "board", {}, "board_name");
        ubus_request("system", "board", {}, "model");
        ubus_request("uci", "get", { "config": "attendedsysupgrade", "section": "updateserver", "option": "url" }, "update_server")
 +      ubus_request("uci", "get", { "config": "attendedsysupgrade", "section": "updateclient", "option": "update_packages" }, "update_packages")
  }
  
  // shows notification if update is available
@@@ -119,7 -182,7 +194,7 @@@ function update_info(info_output) 
  function update_error(error_output) {
        document.getElementById("update_error").style.display = "block";
        document.getElementById("update_error").innerHTML = error_output;
 -      document.getElementById("update_info").style.display = "None";
 +      document.getElementById("update_info").style.display = "none";
  }
  
  // asks server for news updates, actually only based on relesae not packages
@@@ -128,9 -191,6 +203,9 @@@ function update_request() 
        request_dict = {}
        request_dict.version = data.release.version;
        request_dict.packages = data.packagelist;
 +      if (document.getElementById("update_packages").checked == 1) {
 +              request_dict.update_packages = 1
 +      }
        server_request(request_dict, "update-request", update_request_callback)
  }
  
@@@ -159,7 -219,7 +234,7 @@@ function update_request_callback(respon
                // bad request
                console.log(response_object.responseText)
                response_object_content = JSON.parse(response_object.responseText)
 -              update_error(response_object_content)
 +              update_error(response_object_content.error)
        } else if (response_object.status === 200) {
                // new release/updates
                response_object_content = JSON.parse(response_object.responseText)
@@@ -194,18 -254,16 +269,18 @@@ function update_request_200(response_co
                for (update in response_content.updates) {
                        info_output += "<b>" + update + "</b>: " + response_content.updates[update][1] + " to " + response_content.updates[update][0] + "</br>"
                }
 -              data.packages = response_content.packages
        }
 +      data.packages = response_content.packages
        update_info(info_output)
        document.getElementById("update_button").value = "request image";
 +      document.getElementById("update_packages_container").style.display = "none";
        document.getElementById("update_button").onclick = image_request;
  }
  
  // request the image, need merge with update_request
  function image_request() {
        console.log("image_request")
 +      document.getElementById("update_packages_container").style.display = "none";
        request_dict = {}
        request_dict.version = latest_version;
        request_dict.board = data.board_name