diff --git a/README.md b/README.md
index db019c9..aadf9c5 100644
--- a/README.md
+++ b/README.md
@@ -3,13 +3,14 @@ A (very) simple web server written in Lua for the ESP8266 running the NodeMCU fi
## Features
-* GET
+* GET, POST, PUT and minor changes to support other methods
* Multiple MIME types
* Error pages (404 and others)
* Server-side execution of Lua scripts
-* Query string argument parsing
+* Query string argument parsing with decoding of arguments
* Serving .gz compressed files
* HTTP Basic Authentication
+* Decoding of request bodies in both application/x-www-form-urlencoded and application/json (if cjson is available)
## How to use
@@ -130,7 +131,7 @@ A (very) simple web server written in Lua for the ESP8266 running the NodeMCU fi
## Not supported
-* Other methods: HEAD, POST, PUT, DELETE, TRACE, OPTIONS, CONNECT, PATCH
+* ~~Other methods: HEAD, POST, PUT, DELETE, TRACE, OPTIONS, CONNECT, PATCH~~
* Encryption
* Multiple users (HTTP Basic Authentication)
* Only protect certain directories (HTTP Basic Authentication)
diff --git a/http/args.lua b/http/args.lua
index c9310c4..f7a2790 100644
--- a/http/args.lua
+++ b/http/args.lua
@@ -1,4 +1,4 @@
-return function (connection, args)
+return function (connection, req, args)
connection:send("HTTP/1.0 200 OK\r\nContent-Type: text/html\r\nCache-Control: private, no-store\r\n\r\n")
connection:send('Arguments')
connection:send('')
diff --git a/http/file_list.lua b/http/file_list.lua
index 384d088..9e92a23 100644
--- a/http/file_list.lua
+++ b/http/file_list.lua
@@ -1,4 +1,4 @@
-return function (connection, args)
+return function (connection, req, args)
connection:send("HTTP/1.0 200 OK\r\nContent-Type: text/html\r\nCache-Control: private, no-store\r\n\r\n")
connection:send('Server File Listing')
connection:send('')
diff --git a/http/garage_door_opener.lua b/http/garage_door_opener.lua
index e5dc874..ca67617 100644
--- a/http/garage_door_opener.lua
+++ b/http/garage_door_opener.lua
@@ -21,7 +21,7 @@ local function pushTheButton(connection, pin)
end
-return function (connection, args)
+return function (connection, req, args)
print('Garage door button was pressed!', args.door)
if args.door == "1" then pushTheButton(connection, 1) -- GPIO1
elseif args.door == "2" then pushTheButton(connection, 2) -- GPIO2
diff --git a/http/index.html b/http/index.html
index ef81901..0db6ace 100644
--- a/http/index.html
+++ b/http/index.html
@@ -22,7 +22,7 @@
Index: This page (static)
Zipped: A compressed file (static)
Arguments: Parses arguments passed in the URL and prints them. (Lua)
- Post: A form that uses POST method, should error. (static)
+ Post: A form that uses POST method. Displays different content based on HTTP method. (Lua)
Garage door opener: Control GPIO lines via the server. (Lua)
NodeMCU info: Shows some basic NodeMCU(Lua)
List all server files: Displays a list of all the server files. (Lua)
diff --git a/http/node_info.lua b/http/node_info.lua
index fdd8868..86e55eb 100644
--- a/http/node_info.lua
+++ b/http/node_info.lua
@@ -7,7 +7,7 @@ local function sendAttr(connection, attr, val)
connection:send("".. attr .. ": " .. val .. "
\n")
end
-return function (connection, args)
+return function (connection, req, args)
collectgarbage()
sendHeader(connection)
connection:send('A Lua script sampleNode info
')
diff --git a/http/post.html b/http/post.html
deleted file mode 100644
index 508c755..0000000
--- a/http/post.html
+++ /dev/null
@@ -1,7 +0,0 @@
-
-Post
-Post
-This form uses POST method which is not supported by nodemcu-httpserver.
-You should get an error when you press submit.
-
-
diff --git a/http/post.lua b/http/post.lua
new file mode 100644
index 0000000..d1ac03d
--- /dev/null
+++ b/http/post.lua
@@ -0,0 +1,33 @@
+return function (connection, req, args)
+ connection:send("HTTP/1.0 200 OK\r\nContent-Type: text/html\r\nCache-Control: private, no-store\r\n\r\n")
+ connection:send('Arguments')
+ connection:send('')
+ connection:send('Arguments
')
+
+ local form = [===[
+
+ ]===]
+
+ if req.method == "GET" then
+ connection:send(form)
+ elseif req.method == "POST" then
+ local rd = req.getRequestData()
+ -- connection:send(cjson.encode(rd))
+ connection:send('Received the following values:
')
+ connection:send("\n")
+ for name, value in pairs(rd) do
+ connection:send('- ' .. name .. ': ' .. tostring(value) .. "
\n")
+ end
+
+ connection:send("
\n")
+ else
+ connection:send("NOT IMPLEMENTED")
+ end
+
+ connection:send('')
+end
diff --git a/httpserver-error.lua b/httpserver-error.lua
index 00e6bd8..b4dba56 100644
--- a/httpserver-error.lua
+++ b/httpserver-error.lua
@@ -2,7 +2,7 @@
-- Part of nodemcu-httpserver, handles sending error pages to client.
-- Author: Marcos Kirsch
-return function (connection, args)
+return function (connection, req, args)
local function sendHeader(connection, code, errorString, extraHeaders, mimeType)
connection:send("HTTP/1.0 " .. code .. " " .. errorString .. "\r\nServer: nodemcu-httpserver\r\nContent-Type: " .. mimeType .. "\r\n")
diff --git a/httpserver-request.lua b/httpserver-request.lua
index 3384667..121dbf8 100644
--- a/httpserver-request.lua
+++ b/httpserver-request.lua
@@ -12,17 +12,67 @@ local function uriToFilename(uri)
return "http/" .. string.sub(uri, 2, -1)
end
+local function hex_to_char(x)
+ return string.char(tonumber(x, 16))
+end
+
+local function uri_decode(input)
+ return input:gsub("%+", " "):gsub("%%(%x%x)", hex_to_char)
+end
+
local function parseArgs(args)
local r = {}; i=1
if args == nil or args == "" then return r end
for arg in string.gmatch(args, "([^&]+)") do
local name, value = string.match(arg, "(.*)=(.*)")
- if name ~= nil then r[name] = value end
+ if name ~= nil then r[name] = uri_decode(value) end
i = i + 1
end
return r
end
+local function parseFormData(body)
+ local data = {}
+ print("Parsing Form Data")
+ for kv in body.gmatch(body, "%s*&?([^=]+=[^&]+)") do
+ local key, value = string.match(kv, "(.*)=(.*)")
+
+ print("Parsed: " .. key .. " => " .. value)
+ data[key] = uri_decode(value)
+ end
+
+ return data
+end
+
+local function getRequestData(payload)
+ local requestData
+ return function ()
+ print("Getting Request Data")
+ if requestData then
+ return requestData
+ else
+ local mimeType = string.match(payload, "Content%-Type: (%S+)\r\n")
+ local body_start = payload:find("\r\n\r\n", 1, true)
+ local body = payload:sub(body_start, #payload)
+ payload = nil
+ collectgarbage()
+
+ -- print("mimeType = [" .. mimeType .. "]")
+
+ if mimeType == "application/json" then
+ print("JSON: " .. body)
+ requestData = cjson.decode(body)
+ elseif mimeType == "application/x-www-form-urlencoded" then
+ requestData = parseFormData(body)
+ else
+ requestData = {}
+ end
+
+ return requestData
+ end
+ end
+end
+
local function parseUri(uri)
local r = {}
local filename
@@ -60,5 +110,6 @@ return function (request)
_, i, r.method, r.request = line:find("^([A-Z]+) (.-) HTTP/[1-9]+.[0-9]+$")
r.methodIsValid = validateMethod(r.method)
r.uri = parseUri(r.request)
+ r.getRequestData = getRequestData(request)
return r
end
diff --git a/httpserver-static.lua b/httpserver-static.lua
index d3ac1bd..93ecc2a 100644
--- a/httpserver-static.lua
+++ b/httpserver-static.lua
@@ -2,7 +2,7 @@
-- Part of nodemcu-httpserver, handles sending static files to client.
-- Author: Marcos Kirsch
-return function (connection, args)
+return function (connection, req, args)
dofile("httpserver-header.lc")(connection, 200, args.ext)
--print("Begin sending:", args.file)
-- Send file in little chunks
diff --git a/httpserver.lua b/httpserver.lua
index b48ef2a..2b0376a 100644
--- a/httpserver.lua
+++ b/httpserver.lua
@@ -13,42 +13,54 @@ return function (port)
-- We do it in a separate thread because we need to yield when sending lots
-- of data in order to avoid overflowing the mcu's buffer.
local connectionThread
+
+ local allowStatic = {GET=true, HEAD=true, POST=false, PUT=false, DELETE=false, TRACE=false, OPTIONS=false, CONNECT=false, PATCH=false}
- local function onGet(connection, uri)
+ local function onRequest(connection, req)
collectgarbage()
+ local method = req.method
+ local uri = req.uri
local fileServeFunction = nil
+
+ print("Method: " .. method);
+
if #(uri.file) > 32 then
-- nodemcu-firmware cannot handle long filenames.
uri.args = {code = 400, errorString = "Bad Request"}
fileServeFunction = dofile("httpserver-error.lc")
else
local fileExists = file.open(uri.file, "r")
- file.close()
-
- if not fileExists then
- -- gzip check
- fileExists = file.open(uri.file .. ".gz", "r")
file.close()
+
+ if not fileExists then
+ -- gzip check
+ fileExists = file.open(uri.file .. ".gz", "r")
+ file.close()
- if fileExists then
- print("gzip variant exists, serving that one")
- uri.file = uri.file .. ".gz"
- uri.ext = uri.ext .. ".gz"
+ if fileExists then
+ print("gzip variant exists, serving that one")
+ uri.file = uri.file .. ".gz"
+ uri.ext = uri.ext .. ".gz"
+ end
end
- end
-
- if not fileExists then
+
+ if not fileExists then
uri.args = {code = 404, errorString = "Not Found"}
fileServeFunction = dofile("httpserver-error.lc")
elseif uri.isScript then
fileServeFunction = dofile(uri.file)
else
- uri.args = {file = uri.file, ext = uri.ext}
- fileServeFunction = dofile("httpserver-static.lc")
+ if allowStatic[method] then
+ uri.args = {file = uri.file, ext = uri.ext}
+ fileServeFunction = dofile("httpserver-static.lc")
+ else
+ uri.args = {code = 405, errorString = "Method not supported"}
+ fileServeFunction = dofile("httpserver-error.lc")
+ end
end
end
connectionThread = coroutine.create(fileServeFunction)
- coroutine.resume(connectionThread, connection, uri.args)
+ coroutine.resume(connectionThread, connection, req, uri.args)
end
local function onReceive(connection, payload)
@@ -64,8 +76,9 @@ return function (port)
auth = dofile("httpserver-basicauth.lc")
user = auth.authenticate(payload) -- authenticate returns nil on failed auth
end
- if user and req.methodIsValid and req.method == "GET" then
- onGet(connection, req.uri)
+
+ if user and req.methodIsValid and (req.method == "GET" or req.method == "POST" or req.method == "PUT") then
+ onRequest(connection, req)
else
local args = {}
local fileServeFunction = dofile("httpserver-error.lc")
@@ -77,7 +90,7 @@ return function (port)
args = {code = 400, errorString = "Bad Request"}
end
connectionThread = coroutine.create(fileServeFunction)
- coroutine.resume(connectionThread, connection, args)
+ coroutine.resume(connectionThread, connection, req, args)
end
end