Mercurial Hosting > luan
annotate src/luan/modules/http/tools/Shell.luan @ 1293:007ceb8dcf89
minor
author | Franklin Schmidt <fschmidt@gmail.com> |
---|---|
date | Sun, 06 Jan 2019 14:09:24 -0700 |
parents | 5ba660381bd5 |
children | 9dca1e912658 |
rev | line source |
---|---|
693
ca169567ce07
module URIs must now include ".luan"
Franklin Schmidt <fschmidt@gmail.com>
parents:
609
diff
changeset
|
1 local Luan = require "luan:Luan.luan" |
554
18504c41b0be
move debug() to Io and remove Debug module;
Franklin Schmidt <fschmidt@gmail.com>
parents:
506
diff
changeset
|
2 local error = Luan.error |
18504c41b0be
move debug() to Io and remove Debug module;
Franklin Schmidt <fschmidt@gmail.com>
parents:
506
diff
changeset
|
3 local load = Luan.load or error() |
1159
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
4 local to_string = Luan.to_string or error() |
554
18504c41b0be
move debug() to Io and remove Debug module;
Franklin Schmidt <fschmidt@gmail.com>
parents:
506
diff
changeset
|
5 local try = Luan.try or error() |
1159
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
6 local String = require "luan:String.luan" |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
7 local concat = String.concat or error() |
1277 | 8 local Table = require "luan:Table.luan" |
9 local pack = Table.pack or error() | |
10 local unpack = Table.unpack or error() | |
1159
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
11 local Time = require "luan:Time.luan" |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
12 local Thread = require "luan:Thread.luan" |
693
ca169567ce07
module URIs must now include ".luan"
Franklin Schmidt <fschmidt@gmail.com>
parents:
609
diff
changeset
|
13 local Io = require "luan:Io.luan" |
554
18504c41b0be
move debug() to Io and remove Debug module;
Franklin Schmidt <fschmidt@gmail.com>
parents:
506
diff
changeset
|
14 local print = Io.print or error() |
693
ca169567ce07
module URIs must now include ".luan"
Franklin Schmidt <fschmidt@gmail.com>
parents:
609
diff
changeset
|
15 local Http = require "luan:http/Http.luan" |
1159
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
16 local Logging = require "luan:logging/Logging.luan" |
1218 | 17 local logger = Logging.logger "Shell" |
560
2f39468680be
remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents:
554
diff
changeset
|
18 |
139
3b384dc5ca91
replace WebShell.java with web_shell.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff
changeset
|
19 |
1218 | 20 local Shell = {} |
503 | 21 |
1159
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
22 local forever = Time.period{days=1000000} |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
23 local count = 0 |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
24 local new_session = Thread.global_callable("shell.new_session",forever,{next=function() |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
25 count = count + 1 |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
26 return to_string(count) |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
27 end}).next |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
28 |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
29 local history = "" |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
30 local env = {} |
1218 | 31 Shell.env = env |
1159
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
32 |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
33 local fns = {} |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
34 |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
35 function fns.history() |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
36 return history |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
37 end |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
38 |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
39 function fns.run(cmd) |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
40 Io.stdout = {} |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
41 Io.stdout.write = function(...) |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
42 history = concat(history,...) |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
43 end |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
44 print( "% "..cmd ) |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
45 try { |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
46 function() |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
47 local line |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
48 try { |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
49 function() |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
50 line = load("return "..cmd,"<web_shell>",env) |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
51 end |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
52 catch = function(e) |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
53 line = load(cmd,"<web_shell>",env) |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
54 end |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
55 } |
1277 | 56 local rtn = pack( line() ) |
57 if rtn.n > 0 then | |
58 print( unpack(rtn) ) | |
59 end | |
1159
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
60 end |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
61 catch = function(e) |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
62 Io.print_to(Io.stderr,e) |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
63 print(e) |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
64 end |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
65 } |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
66 end |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
67 |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
68 local timeout = Time.period{hours=10} |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
69 |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
70 local function get_session(session_id) |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
71 return Thread.global_callable("shell.session"..session_id,timeout,fns) |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
72 end |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
73 |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
74 local function remove_session(session_id) |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
75 return Thread.remove_global_callable("shell.session"..session_id) |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
76 end |
139
3b384dc5ca91
replace WebShell.java with web_shell.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff
changeset
|
77 |
1218 | 78 function Shell.respond() |
1245 | 79 local session_id = Http.request.cookies["session"] |
1159
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
80 if session_id == nil then |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
81 session_id = new_session() |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
82 Http.response.set_cookie("session",session_id) |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
83 end |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
84 local session = get_session(session_id) |
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
85 |
1152
21d157b153fe
change http parameters interface
Franklin Schmidt <fschmidt@gmail.com>
parents:
1088
diff
changeset
|
86 if Http.request.parameters.clear ~= nil then |
1159
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
87 remove_session(session_id) |
609
24b05963ba62
shell "clear" button now clears the session
Franklin Schmidt <fschmidt@gmail.com>
parents:
560
diff
changeset
|
88 Http.response.send_redirect(Http.request.path) -- reload page |
24b05963ba62
shell "clear" button now clears the session
Franklin Schmidt <fschmidt@gmail.com>
parents:
560
diff
changeset
|
89 return |
139
3b384dc5ca91
replace WebShell.java with web_shell.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff
changeset
|
90 else |
1152
21d157b153fe
change http parameters interface
Franklin Schmidt <fschmidt@gmail.com>
parents:
1088
diff
changeset
|
91 local cmd = Http.request.parameters.cmd |
139
3b384dc5ca91
replace WebShell.java with web_shell.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff
changeset
|
92 if cmd ~= nil then |
1159
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
93 session.run(cmd) |
139
3b384dc5ca91
replace WebShell.java with web_shell.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff
changeset
|
94 end |
3b384dc5ca91
replace WebShell.java with web_shell.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff
changeset
|
95 end |
3b384dc5ca91
replace WebShell.java with web_shell.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff
changeset
|
96 |
325
78a6a71afbfd
use SimplyHTML
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
321
diff
changeset
|
97 Io.stdout = Http.response.text_writer() |
391
2f5cc9c2cbf0
replace Html.simply_html_page with simply_html_head and simply_html_body_bottom
Franklin Schmidt <fschmidt@gmail.com>
parents:
347
diff
changeset
|
98 %> |
1216 | 99 <!doctype html> |
391
2f5cc9c2cbf0
replace Html.simply_html_page with simply_html_head and simply_html_body_bottom
Franklin Schmidt <fschmidt@gmail.com>
parents:
347
diff
changeset
|
100 <html> |
2f5cc9c2cbf0
replace Html.simply_html_page with simply_html_head and simply_html_body_bottom
Franklin Schmidt <fschmidt@gmail.com>
parents:
347
diff
changeset
|
101 <head> |
2f5cc9c2cbf0
replace Html.simply_html_page with simply_html_head and simply_html_body_bottom
Franklin Schmidt <fschmidt@gmail.com>
parents:
347
diff
changeset
|
102 <title>Luan Shell</title> |
560
2f39468680be
remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents:
554
diff
changeset
|
103 <style> |
2f39468680be
remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents:
554
diff
changeset
|
104 body { |
1293 | 105 font-family: sans-serif; |
560
2f39468680be
remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents:
554
diff
changeset
|
106 margin: 2em 5% 0 5%; |
2f39468680be
remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents:
554
diff
changeset
|
107 } |
2f39468680be
remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents:
554
diff
changeset
|
108 pre { |
2f39468680be
remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents:
554
diff
changeset
|
109 font: inherit; |
2f39468680be
remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents:
554
diff
changeset
|
110 } |
2f39468680be
remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents:
554
diff
changeset
|
111 input[type="text"] { |
2f39468680be
remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents:
554
diff
changeset
|
112 font: inherit; |
2f39468680be
remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents:
554
diff
changeset
|
113 padding: .5em .8em; |
2f39468680be
remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents:
554
diff
changeset
|
114 border-radius: 8px; |
2f39468680be
remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents:
554
diff
changeset
|
115 border-style: groove; |
2f39468680be
remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents:
554
diff
changeset
|
116 } |
2f39468680be
remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents:
554
diff
changeset
|
117 input[type="text"]:focus { |
2f39468680be
remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents:
554
diff
changeset
|
118 border-color: #66afe9; |
2f39468680be
remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents:
554
diff
changeset
|
119 outline: none; |
2f39468680be
remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents:
554
diff
changeset
|
120 } |
2f39468680be
remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents:
554
diff
changeset
|
121 input[type="submit"] { |
2f39468680be
remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents:
554
diff
changeset
|
122 color: white; |
2f39468680be
remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents:
554
diff
changeset
|
123 background: #337ab7; |
2f39468680be
remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents:
554
diff
changeset
|
124 border-color: #337ab7; |
2f39468680be
remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents:
554
diff
changeset
|
125 font: inherit; |
2f39468680be
remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents:
554
diff
changeset
|
126 padding: .5em; |
2f39468680be
remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents:
554
diff
changeset
|
127 border-radius: 4px; |
2f39468680be
remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents:
554
diff
changeset
|
128 } |
2f39468680be
remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents:
554
diff
changeset
|
129 input[type="submit"]:hover { |
2f39468680be
remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents:
554
diff
changeset
|
130 background: #236aa7 !important; |
2f39468680be
remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents:
554
diff
changeset
|
131 } |
2f39468680be
remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents:
554
diff
changeset
|
132 </style> |
391
2f5cc9c2cbf0
replace Html.simply_html_page with simply_html_head and simply_html_body_bottom
Franklin Schmidt <fschmidt@gmail.com>
parents:
347
diff
changeset
|
133 </head> |
2f5cc9c2cbf0
replace Html.simply_html_page with simply_html_head and simply_html_body_bottom
Franklin Schmidt <fschmidt@gmail.com>
parents:
347
diff
changeset
|
134 <body> |
560
2f39468680be
remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents:
554
diff
changeset
|
135 <h2>Luan Shell</h2> |
2f39468680be
remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents:
554
diff
changeset
|
136 <p>This is a command shell. Enter commands below.</p> |
1159
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
137 <pre><%= session.history() %></pre> |
1245 | 138 <form method='post'> |
560
2f39468680be
remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents:
554
diff
changeset
|
139 % <input type="text" name='cmd' size="80" autofocus> |
2f39468680be
remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents:
554
diff
changeset
|
140 <input type="submit" value="run"> |
2f39468680be
remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents:
554
diff
changeset
|
141 <input type="submit" name="clear" value="clear"> |
2f39468680be
remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents:
554
diff
changeset
|
142 </form> |
391
2f5cc9c2cbf0
replace Html.simply_html_page with simply_html_head and simply_html_body_bottom
Franklin Schmidt <fschmidt@gmail.com>
parents:
347
diff
changeset
|
143 </body> |
2f5cc9c2cbf0
replace Html.simply_html_page with simply_html_head and simply_html_body_bottom
Franklin Schmidt <fschmidt@gmail.com>
parents:
347
diff
changeset
|
144 </html> |
2f5cc9c2cbf0
replace Html.simply_html_page with simply_html_head and simply_html_body_bottom
Franklin Schmidt <fschmidt@gmail.com>
parents:
347
diff
changeset
|
145 <% |
139
3b384dc5ca91
replace WebShell.java with web_shell.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff
changeset
|
146 end |
503 | 147 |
1218 | 148 return Shell |