Mercurial Hosting > luan
annotate src/luan/modules/http/Http.luan @ 1546:2b4471d310b3
better time zone handling
| author | Franklin Schmidt <fschmidt@gmail.com> |
|---|---|
| date | Tue, 22 Sep 2020 21:41:22 -0600 |
| parents | a47021c3da1e |
| children | 153ea3b7afaf |
| rev | line source |
|---|---|
|
1353
8d95711f6615
replace java() with require "java"
Franklin Schmidt <fschmidt@gmail.com>
parents:
1347
diff
changeset
|
1 require "java" |
|
693
ca169567ce07
module URIs must now include ".luan"
Franklin Schmidt <fschmidt@gmail.com>
parents:
629
diff
changeset
|
2 local Luan = require "luan:Luan.luan" |
| 508 | 3 local error = Luan.error |
|
572
f1601a4ce1aa
fix stack when calling meta-methods
Franklin Schmidt <fschmidt@gmail.com>
parents:
568
diff
changeset
|
4 local ipairs = Luan.ipairs or error() |
|
f1601a4ce1aa
fix stack when calling meta-methods
Franklin Schmidt <fschmidt@gmail.com>
parents:
568
diff
changeset
|
5 local pairs = Luan.pairs or error() |
|
1152
21d157b153fe
change http parameters interface
Franklin Schmidt <fschmidt@gmail.com>
parents:
1150
diff
changeset
|
6 local type = Luan.type or error() |
|
693
ca169567ce07
module URIs must now include ".luan"
Franklin Schmidt <fschmidt@gmail.com>
parents:
629
diff
changeset
|
7 local Io = require "luan:Io.luan" |
|
ca169567ce07
module URIs must now include ".luan"
Franklin Schmidt <fschmidt@gmail.com>
parents:
629
diff
changeset
|
8 local Html = require "luan:Html.luan" |
|
ca169567ce07
module URIs must now include ".luan"
Franklin Schmidt <fschmidt@gmail.com>
parents:
629
diff
changeset
|
9 local Table = require "luan:Table.luan" |
| 580 | 10 local clear = Table.clear or error() |
|
1261
198d6af7330a
rename Luan.to_table to Table.java_to_table_shallow and Luan.to_luan to Table.java_to_table_deep
Franklin Schmidt <fschmidt@gmail.com>
parents:
1260
diff
changeset
|
11 local java_to_table_deep = Table.java_to_table_deep or error() |
|
693
ca169567ce07
module URIs must now include ".luan"
Franklin Schmidt <fschmidt@gmail.com>
parents:
629
diff
changeset
|
12 local Package = require "luan:Package.luan" |
|
ca169567ce07
module URIs must now include ".luan"
Franklin Schmidt <fschmidt@gmail.com>
parents:
629
diff
changeset
|
13 local String = require "luan:String.luan" |
|
1166
7ef40e1923b7
add back Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents:
1165
diff
changeset
|
14 local lower = String.lower or error() |
|
583
1368ca798ccc
add Http.uncache_site
Franklin Schmidt <fschmidt@gmail.com>
parents:
580
diff
changeset
|
15 local matches = String.matches or error() |
|
1263
382c444a6c77
add Http.eval_in_root and Http.handle_error
Franklin Schmidt <fschmidt@gmail.com>
parents:
1261
diff
changeset
|
16 local trim = String.trim or error() |
|
1546
2b4471d310b3
better time zone handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1438
diff
changeset
|
17 local Time = require "luan:Time.luan" |
|
2b4471d310b3
better time zone handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1438
diff
changeset
|
18 local time_format = Time.format or error() |
| 1280 | 19 local Boot = require "luan:Boot.luan" |
|
1259
e8020216dee7
add Luan.to_luan and fix multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1257
diff
changeset
|
20 local LuanJava = require "java:luan.Luan" |
|
1402
27efb1fcbcb5
move luan.lib to goodjava
Franklin Schmidt <fschmidt@gmail.com>
parents:
1383
diff
changeset
|
21 local Request = require "java:goodjava.webserver.Request" |
|
27efb1fcbcb5
move luan.lib to goodjava
Franklin Schmidt <fschmidt@gmail.com>
parents:
1383
diff
changeset
|
22 local Response = require "java:goodjava.webserver.Response" |
|
27efb1fcbcb5
move luan.lib to goodjava
Franklin Schmidt <fschmidt@gmail.com>
parents:
1383
diff
changeset
|
23 local ResponseOutputStream = require "java:goodjava.webserver.ResponseOutputStream" |
|
27efb1fcbcb5
move luan.lib to goodjava
Franklin Schmidt <fschmidt@gmail.com>
parents:
1383
diff
changeset
|
24 local Status = require "java:goodjava.webserver.Status" |
| 1160 | 25 local OutputStreamWriter = require "java:java.io.OutputStreamWriter" |
| 1163 | 26 local HashMap = require "java:java.util.HashMap" |
|
1263
382c444a6c77
add Http.eval_in_root and Http.handle_error
Franklin Schmidt <fschmidt@gmail.com>
parents:
1261
diff
changeset
|
27 local Logging = require "luan:logging/Logging.luan" |
|
382c444a6c77
add Http.eval_in_root and Http.handle_error
Franklin Schmidt <fschmidt@gmail.com>
parents:
1261
diff
changeset
|
28 local logger = Logging.logger "Http" |
|
320
fed1893821bf
remove global namespace
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
300
diff
changeset
|
29 |
|
1152
21d157b153fe
change http parameters interface
Franklin Schmidt <fschmidt@gmail.com>
parents:
1150
diff
changeset
|
30 |
|
1088
bae2d0c2576c
change module naming convention
Franklin Schmidt <fschmidt@gmail.com>
parents:
1082
diff
changeset
|
31 local Http = {} |
|
320
fed1893821bf
remove global namespace
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
300
diff
changeset
|
32 |
|
1261
198d6af7330a
rename Luan.to_table to Table.java_to_table_shallow and Luan.to_luan to Table.java_to_table_deep
Franklin Schmidt <fschmidt@gmail.com>
parents:
1260
diff
changeset
|
33 local old_java_to_table_shallow = Table.java_to_table_shallow or error() |
|
1259
e8020216dee7
add Luan.to_luan and fix multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1257
diff
changeset
|
34 |
|
1261
198d6af7330a
rename Luan.to_table to Table.java_to_table_shallow and Luan.to_luan to Table.java_to_table_deep
Franklin Schmidt <fschmidt@gmail.com>
parents:
1260
diff
changeset
|
35 local function java_to_table_shallow(obj) |
|
1259
e8020216dee7
add Luan.to_luan and fix multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1257
diff
changeset
|
36 if type(obj)=="java" and obj.instanceof(Request.MultipartFile) then |
|
e8020216dee7
add Luan.to_luan and fix multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1257
diff
changeset
|
37 return { |
|
e8020216dee7
add Luan.to_luan and fix multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1257
diff
changeset
|
38 filename = obj.filename |
|
e8020216dee7
add Luan.to_luan and fix multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1257
diff
changeset
|
39 content_type = obj.contentType |
|
e8020216dee7
add Luan.to_luan and fix multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1257
diff
changeset
|
40 content = obj.content |
|
e8020216dee7
add Luan.to_luan and fix multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1257
diff
changeset
|
41 } |
|
e8020216dee7
add Luan.to_luan and fix multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1257
diff
changeset
|
42 end |
|
1261
198d6af7330a
rename Luan.to_table to Table.java_to_table_shallow and Luan.to_luan to Table.java_to_table_deep
Franklin Schmidt <fschmidt@gmail.com>
parents:
1260
diff
changeset
|
43 return old_java_to_table_shallow(obj) |
|
1259
e8020216dee7
add Luan.to_luan and fix multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1257
diff
changeset
|
44 end |
|
e8020216dee7
add Luan.to_luan and fix multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1257
diff
changeset
|
45 |
| 1160 | 46 function Http.new_request(java) |
| 47 local this = {} | |
| 48 Http.request = this | |
| 49 if java == nil then | |
| 50 this.method = "GET" | |
| 1237 | 51 this.scheme = "http" |
| 1160 | 52 this.headers = {} |
| 53 this.parameters = {} | |
| 54 this.cookies = {} | |
| 55 else | |
| 56 this.java = java | |
|
1179
f9136432847e
add request.raw_head
Franklin Schmidt <fschmidt@gmail.com>
parents:
1171
diff
changeset
|
57 this.raw_head = java.rawHead or error() |
| 1437 | 58 this.body = java.body |
| 1160 | 59 this.method = java.method or error() |
| 60 this.raw_path = java.rawPath or error() | |
|
1371
4c5548a61d4f
add Request.originalPath
Franklin Schmidt <fschmidt@gmail.com>
parents:
1353
diff
changeset
|
61 this.original_path = java.originalPath or error() |
| 1160 | 62 this.path = java.path or error() |
| 63 this.protocol = java.protocol or error() | |
| 1237 | 64 this.scheme = java.scheme or error() |
|
1261
198d6af7330a
rename Luan.to_table to Table.java_to_table_shallow and Luan.to_luan to Table.java_to_table_deep
Franklin Schmidt <fschmidt@gmail.com>
parents:
1260
diff
changeset
|
65 this.headers = java_to_table_deep(java.headers) |
|
198d6af7330a
rename Luan.to_table to Table.java_to_table_shallow and Luan.to_luan to Table.java_to_table_deep
Franklin Schmidt <fschmidt@gmail.com>
parents:
1260
diff
changeset
|
66 this.parameters = java_to_table_deep(java.parameters,java_to_table_shallow) |
|
198d6af7330a
rename Luan.to_table to Table.java_to_table_shallow and Luan.to_luan to Table.java_to_table_deep
Franklin Schmidt <fschmidt@gmail.com>
parents:
1260
diff
changeset
|
67 this.cookies = java_to_table_deep(java.cookies) |
| 1160 | 68 end |
|
497
55f9f74f1e55
Http.request is now pure luan
Franklin Schmidt <fschmidt@gmail.com>
parents:
495
diff
changeset
|
69 |
| 499 | 70 function this.url() |
| 1160 | 71 return this.scheme.."://"..this.headers["host"]..this.raw_path |
|
497
55f9f74f1e55
Http.request is now pure luan
Franklin Schmidt <fschmidt@gmail.com>
parents:
495
diff
changeset
|
72 end |
|
55f9f74f1e55
Http.request is now pure luan
Franklin Schmidt <fschmidt@gmail.com>
parents:
495
diff
changeset
|
73 |
|
55f9f74f1e55
Http.request is now pure luan
Franklin Schmidt <fschmidt@gmail.com>
parents:
495
diff
changeset
|
74 return this |
|
55f9f74f1e55
Http.request is now pure luan
Franklin Schmidt <fschmidt@gmail.com>
parents:
495
diff
changeset
|
75 end |
|
55f9f74f1e55
Http.request is now pure luan
Franklin Schmidt <fschmidt@gmail.com>
parents:
495
diff
changeset
|
76 |
| 503 | 77 local STATUS = { |
| 1109 | 78 OK = 200 |
| 79 MOVED_PERMANENTLY = 301 | |
| 1160 | 80 FOUND = 302 |
|
1383
a3d0d1c2ce89
add NotFound to luanhost
Franklin Schmidt <fschmidt@gmail.com>
parents:
1371
diff
changeset
|
81 NOT_FOUND = 404 |
|
498
ee55be414a34
Http.response is now mostly luan
Franklin Schmidt <fschmidt@gmail.com>
parents:
497
diff
changeset
|
82 -- add more as needed |
|
ee55be414a34
Http.response is now mostly luan
Franklin Schmidt <fschmidt@gmail.com>
parents:
497
diff
changeset
|
83 } |
|
1088
bae2d0c2576c
change module naming convention
Franklin Schmidt <fschmidt@gmail.com>
parents:
1082
diff
changeset
|
84 Http.STATUS = STATUS |
|
498
ee55be414a34
Http.response is now mostly luan
Franklin Schmidt <fschmidt@gmail.com>
parents:
497
diff
changeset
|
85 |
| 1163 | 86 function Http.new_response() |
| 1160 | 87 local this = {} |
| 88 Http.response = this | |
|
498
ee55be414a34
Http.response is now mostly luan
Franklin Schmidt <fschmidt@gmail.com>
parents:
497
diff
changeset
|
89 |
| 1163 | 90 function this.reset() |
| 91 this.java = Response.new() | |
| 92 this.headers = {} | |
| 93 this.status = STATUS.OK | |
| 94 this.writer = nil | |
| 95 end | |
|
498
ee55be414a34
Http.response is now mostly luan
Franklin Schmidt <fschmidt@gmail.com>
parents:
497
diff
changeset
|
96 |
| 1163 | 97 this.reset() |
|
1153
1f4da56abd4f
change http cookies interface
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
98 |
| 1160 | 99 function this.send_redirect(location) |
| 100 this.status = STATUS.FOUND | |
| 101 this.headers["location"] = location | |
| 102 end | |
| 103 | |
| 1161 | 104 function this.send_error(status,msg) |
| 1163 | 105 this.reset() |
| 1161 | 106 this.status = status |
| 107 if msg ~= nil then | |
|
1165
668f29bc52ea
clean up content-type
Franklin Schmidt <fschmidt@gmail.com>
parents:
1164
diff
changeset
|
108 this.headers["content-type"] = "text/plain; charset=utf-8" |
| 1161 | 109 local writer = this.text_writer() |
| 110 writer.write(msg) | |
| 111 end | |
| 112 end | |
| 113 | |
| 1160 | 114 function this.set_cookie(name,value,attributes) |
| 1163 | 115 attributes = attributes or {} |
| 1213 | 116 attributes["Path"] = attributes["Path"] or "/" |
| 1163 | 117 local attrMap = HashMap.new() |
| 118 for attr_name, attr_value in pairs(attributes) do | |
| 1164 | 119 type(attr_name)=="string" or "cookie attribute name must be string" |
| 120 type(attr_value)=="string" or "cookie attribute value must be string" | |
| 1163 | 121 attrMap.put(attr_name,attr_value) |
| 122 end | |
| 123 this.java.setCookie(name,value,attrMap) | |
| 1160 | 124 end |
|
498
ee55be414a34
Http.response is now mostly luan
Franklin Schmidt <fschmidt@gmail.com>
parents:
497
diff
changeset
|
125 |
| 1160 | 126 function this.set_persistent_cookie(name,value,attributes) |
| 127 attributes = attributes or {} | |
| 128 attributes["Max-Age"] = "10000000" | |
| 129 this.set_cookie(name,value,attributes) | |
| 130 end | |
| 131 | |
| 132 function this.remove_cookie(name,attributes) | |
| 133 attributes = attributes or {} | |
| 134 attributes["Max-Age"] = "0" | |
| 135 this.set_cookie(name,"delete",attributes) | |
| 136 end | |
|
568
aa17ad66a370
fix http response headers
Franklin Schmidt <fschmidt@gmail.com>
parents:
509
diff
changeset
|
137 |
| 1160 | 138 function this.text_writer() |
| 1163 | 139 this.writer and "writer already set" |
| 1160 | 140 this.writer = ResponseOutputStream.new(this.java) |
| 141 this.writer = OutputStreamWriter.new(this.writer) | |
| 1280 | 142 return Boot.text_writer(this.writer) |
| 1160 | 143 end |
|
500
ab9c2afefb47
add response.binary_writer
Franklin Schmidt <fschmidt@gmail.com>
parents:
499
diff
changeset
|
144 |
| 1160 | 145 function this.binary_writer() |
| 1163 | 146 this.writer and "writer already set" |
| 1160 | 147 this.writer = ResponseOutputStream.new(this.java) |
| 1280 | 148 return Boot.binary_writer(this.writer) |
| 1160 | 149 end |
| 580 | 150 |
|
498
ee55be414a34
Http.response is now mostly luan
Franklin Schmidt <fschmidt@gmail.com>
parents:
497
diff
changeset
|
151 return this |
|
ee55be414a34
Http.response is now mostly luan
Franklin Schmidt <fschmidt@gmail.com>
parents:
497
diff
changeset
|
152 end |
|
ee55be414a34
Http.response is now mostly luan
Franklin Schmidt <fschmidt@gmail.com>
parents:
497
diff
changeset
|
153 |
| 1163 | 154 function Http.finish() -- called only from java |
| 155 local response = Http.response or error() | |
| 156 local java = response.java or error() | |
| 157 java.status = Status.getStatus(response.status) | |
| 158 for name, value in pairs(response.headers) do | |
| 1164 | 159 type(name)=="string" or "header name must be string" |
|
1166
7ef40e1923b7
add back Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents:
1165
diff
changeset
|
160 name = lower(name) |
|
1259
e8020216dee7
add Luan.to_luan and fix multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1257
diff
changeset
|
161 value = LuanJava.toJava(value) |
| 1163 | 162 java.headers.put(name,value) |
| 163 end | |
| 164 response.writer and response.writer.close() | |
| 165 return java | |
| 166 end | |
| 167 | |
| 1438 | 168 function Http.error_priority(e) |
|
1263
382c444a6c77
add Http.eval_in_root and Http.handle_error
Franklin Schmidt <fschmidt@gmail.com>
parents:
1261
diff
changeset
|
169 return "error" |
|
382c444a6c77
add Http.eval_in_root and Http.handle_error
Franklin Schmidt <fschmidt@gmail.com>
parents:
1261
diff
changeset
|
170 end |
|
382c444a6c77
add Http.eval_in_root and Http.handle_error
Franklin Schmidt <fschmidt@gmail.com>
parents:
1261
diff
changeset
|
171 |
|
382c444a6c77
add Http.eval_in_root and Http.handle_error
Franklin Schmidt <fschmidt@gmail.com>
parents:
1261
diff
changeset
|
172 function Http.handle_error(java_request,e) |
| 1438 | 173 Http.new_request(java_request) |
| 174 local call = Http.error_priority(e) | |
|
1263
382c444a6c77
add Http.eval_in_root and Http.handle_error
Franklin Schmidt <fschmidt@gmail.com>
parents:
1261
diff
changeset
|
175 local err = e.get_stack_trace_string() |
|
382c444a6c77
add Http.eval_in_root and Http.handle_error
Franklin Schmidt <fschmidt@gmail.com>
parents:
1261
diff
changeset
|
176 logger[call](err.."\n"..trim(java_request.rawHead).."\n") |
|
382c444a6c77
add Http.eval_in_root and Http.handle_error
Franklin Schmidt <fschmidt@gmail.com>
parents:
1261
diff
changeset
|
177 local msg = "Internel Server Error\n\n"..err |
|
382c444a6c77
add Http.eval_in_root and Http.handle_error
Franklin Schmidt <fschmidt@gmail.com>
parents:
1261
diff
changeset
|
178 return Response.errorResponse( Status.INTERNAL_SERVER_ERROR, msg ) |
|
382c444a6c77
add Http.eval_in_root and Http.handle_error
Franklin Schmidt <fschmidt@gmail.com>
parents:
1261
diff
changeset
|
179 end |
|
382c444a6c77
add Http.eval_in_root and Http.handle_error
Franklin Schmidt <fschmidt@gmail.com>
parents:
1261
diff
changeset
|
180 |
| 1315 | 181 Http.domain = nil -- set in domain specific cases |
| 182 | |
| 1414 | 183 Http.is_serving = false |
| 184 | |
|
1546
2b4471d310b3
better time zone handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1438
diff
changeset
|
185 function Http.format_date(date) |
|
2b4471d310b3
better time zone handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1438
diff
changeset
|
186 return time_format(date,"EEE, dd MMM yyyy HH:mm:ss 'GMT'","GMT") |
|
2b4471d310b3
better time zone handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1438
diff
changeset
|
187 end |
|
2b4471d310b3
better time zone handling
Franklin Schmidt <fschmidt@gmail.com>
parents:
1438
diff
changeset
|
188 |
|
1088
bae2d0c2576c
change module naming convention
Franklin Schmidt <fschmidt@gmail.com>
parents:
1082
diff
changeset
|
189 return Http |