Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-compat: apply permission constraints from dispatcher

Browse source 
Since template scopes aren't shared we cannot pass the writable state from
the map templates to the page footer.

Fixes: #3937
Fixes: ffd627f2a ("luci-compat: disable legacy cbi forms on insufficient ACLs")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2020-04-20 09:37:45 +02:00
parent c48a8d5813
commit fd24221d9e
2 changed files with 5 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/luci-compat/luasrc/view/cbi/footer.htm
View file

@ -19,15 +19,15 @@
end end
if display_apply then if display_apply then
%><input class="btn cbi-button cbi-button-apply" type="button" value="<%:Save & Apply%>" onclick="cbi_submit(this, 'cbi.apply')"<%=ifattr(not has_writeable_map, "disabled")%> /> <% %><input class="btn cbi-button cbi-button-apply" type="button" value="<%:Save & Apply%>" onclick="cbi_submit(this, 'cbi.apply')"<%=ifattr(not writable, "disabled")%> /> <%
end end
if display_save then if display_save then
%><input class="btn cbi-button cbi-button-save" type="submit" value="<%:Save%>"<%=ifattr(not has_writeable_map, "disabled")%> /> <% %><input class="btn cbi-button cbi-button-save" type="submit" value="<%:Save%>"<%=ifattr(not writable, "disabled")%> /> <%
end end
if display_reset then if display_reset then
%><input class="btn cbi-button cbi-button-reset" type="button" value="<%:Reset%>" onclick="location.href='<%=REQUEST_URI%>'"<%=ifattr(not has_writeable_map, "disabled")%> /> <% %><input class="btn cbi-button cbi-button-reset" type="button" value="<%:Reset%>" onclick="location.href='<%=REQUEST_URI%>'"<%=ifattr(not writable, "disabled")%> /> <%
end end
%></div><% %></div><%

22
modules/luci-compat/luasrc/view/cbi/map.htm
View file

@ -2,26 +2,8 @@
<div class="alert-message warning"><%=pcdata(msg)%></div> <div class="alert-message warning"><%=pcdata(msg)%></div>
<%- end end -%> <%- end end -%>
<% <% if readable then %>
local function has_access(config, level) <div class="cbi-map" id="cbi-<%=self.config%>"<%=ifattr(not writable, "style", "opacity:.6; pointer-events:none")%>>
local rv = luci.util.ubus("session", "access", {
ubus_rpc_session = luci.dispatcher.context.authsession,
scope = "uci",
object = config,
["function"] = level
})
return (type(rv) == "table" and rv.access == true) or false
end
local is_readable = has_access(self.config, "read")
local is_writable = has_access(self.config, "write")
has_writeable_map = has_writeable_map or is_writable
%>
<% if is_readable then %>
<div class="cbi-map" id="cbi-<%=self.config%>"<%=ifattr(not is_writable, "style", "opacity:.6; pointer-events:none")%>>
<% if self.title and #self.title > 0 then %> <% if self.title and #self.title > 0 then %>
<h2 name="content"><%=self.title%></h2> <h2 name="content"><%=self.title%></h2>
<% end %> <% end %>