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

luci-app-commands: Allow executing without downloading on public links

Browse source 
Signed-off-by: t123yh <t123yh@outlook.com>
This commit is contained in:
t123yh 2016-08-03 18:19:04 +08:00 committed by Jo-Philipp Wich
parent 60d43a8f03
commit f113f1afa7
5 changed files with 150 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
applications/luci-app-commands/luasrc/controller/commands.lua
View file

@ -153,7 +153,7 @@ local function parse_cmdline(cmdid, args)
end
end
function action_run(...)
function execute_command(callback, ...)
local fs = require "nixio.fs"
local argv = parse_cmdline(...)
if argv then
@ -169,8 +169,8 @@ function action_run(...)
local binary = not not (stdout:match("[%z\1-\8\14-\31]"))
luci.http.prepare_content("application/json")
luci.http.write_json({
callback({
ok = true,
command = table.concat(argv, " "),
stdout = not binary and stdout,
stderr = stderr,
@ -178,10 +178,41 @@ function action_run(...)
binary = binary
})
else
luci.http.status(404, "No such command")
callback({
ok = false,
code = 404,
reason = "No such command"
})
end
end
function return_json(result)
if result.ok then
luci.http.prepare_content("application/json")
luci.http.write_json(result)
else
luci.http.status(result.code, result.reason)
end
end
function action_run(...)
execute_command(return_json, ...)
end
function return_html(result)
if result.ok then
require("luci.template")
luci.template.render("commands_public", {
exitcode = result.exitcode,
stdout = result.stdout,
stderr = result.stderr
})
else
luci.http.status(result.code, result.reason)
end
end
function action_download(...)
local fs = require "nixio.fs"
local argv = parse_cmdline(...)
@ -214,14 +245,24 @@ function action_download(...)
end
end
function action_public(cmdid, args)
local disp = false
if string.sub(cmdid, -1) == "s" then
disp = true
cmdid = string.sub(cmdid, 1, -2)
end
local uci = require "luci.model.uci".cursor()
if cmdid and
uci:get("luci", cmdid) == "command" and
uci:get("luci", cmdid, "public") == "1"
then
if disp then
execute_command(return_html, cmdid, args)
else
action_download(cmdid, args)
end
else
luci.http.status(403, "Access to command denied")
end
end
end

13
applications/luci-app-commands/luasrc/view/commands.htm
View file

@ -108,16 +108,19 @@
if (legend && output)
{
var link = location.protocol + '//' + location.hostname +
var prefix = location.protocol + '//' + location.hostname +
(location.port ? ':' + location.port : '') +
location.pathname.split(';')[0] + 'command/' +
id + (args ? '/' + args : '');
location.pathname.split(';')[0] + 'command/';
var suffix = (args ? '/' + args : '');
var link = prefix + id + suffix;
var link_nodownload = prefix + id + "s" + suffix;
legend.style.display = 'none';
output.parentNode.style.display = 'block';
output.innerHTML = String.format(
'<div class="alert-message"><%:Access command with%> <a href="%s">%s</a></div>',
link, link
'<div class="alert-message"><p><%:Download execution result%> <a href="%s">%s</a></p><p><%:Or display result%> <a href="%s">%s</a></p></div>',
link, link, link_nodownload, link_nodownload
);
location.hash = '#output';

50
applications/luci-app-commands/luasrc/view/commands_public.htm Normal file
View file

@ -0,0 +1,50 @@
<%#
Copyright 2016 t123yh <t123yh@outlook.com>
Licensed to the public under the Apache License 2.0.
-%>
<% css = [[
.alert-success {
color: #3c763d;
background-color: #dff0d8;
border-color: #d6e9c6;
}
.alert {
padding: 15px;
margin-bottom: 20px;
border: 1px solid transparent;
border-radius: 4px;
}
.alert-warning {
color: #8a6d3b;
background-color: #fcf8e3;
border-color: #faebcc;
}
]] -%>
<%+header%>
<% if exitcode == 0 then %>
<div class="alert alert-success" role="alert"> <%:Command executed successfully.%> </div>
<% else %>
<div class="alert alert-warning" role="alert"> <%:Command exited with status code %> <%= exitcode %> </div>
<% end %>
<% if stdout ~= "" then %>
<h3><%:Standard Output%></h3>
<pre><%= stdout %></pre>
<% end %>
<% if stderr ~= "" then %>
<h3><%:Standard Error%></h3>
<pre><%= stderr %></pre>
<% end %>
<script>
<%# Display top bar on mobile devices -%>
document.getElementsByClassName('brand')[0].style.setProperty("display", "block", "important");
</script>
<%+footer%>

21
applications/luci-app-commands/po/en/commands.po
View file

@ -11,9 +11,6 @@ msgstr ""
msgid "A short textual description of the configured command"
msgstr "A short textual description of the configured command"
msgid "Access command with"
msgstr "Access command with"
msgid ""
"Allow executing the command and downloading its output without prior "
"authentication"
@ -93,3 +90,21 @@ msgstr ""
msgid "Waiting for command to complete..."
msgstr "Waiting for command to complete..."
msgid "Command executed successfully."
msgstr "Command executed successfully."
msgid "Command exited with status code "
msgstr "Command exited with status code "
msgid "Standard Output"
msgstr "Standard Output"
msgid "Standard Error"
msgstr "Standard Error"
msgid "Download execution result"
msgstr "Download execution result"
msgid "Or display result"
msgstr "Or display result"

21
applications/luci-app-commands/po/zh-cn/commands.po
View file

@ -14,9 +14,6 @@ msgstr ""
msgid "A short textual description of the configured command"
msgstr "简短描述命令用途"
msgid "Access command with"
msgstr "访问命令"
msgid ""
"Allow executing the command and downloading its output without prior "
"authentication"
@ -92,3 +89,21 @@ msgstr "此页面允许您配置自定义Shell命令，并可以从Web界面调
msgid "Waiting for command to complete..."
msgstr "等待命令执行完成... ..."
msgid "Command executed successfully."
msgstr "命令成功执行。"
msgid "Command exited with status code "
msgstr "命令退出，状态码："
msgid "Standard Output"
msgstr "标准输出流"
msgid "Standard Error"
msgstr "标准错误流"
msgid "Download execution result"
msgstr "下载执行结果"
msgid "Or display result"
msgstr "显示执行结果"