Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Option to allow the request body to be processed outside the asynchttpserver library. #13147

Merged
merged 12 commits into from
Feb 4, 2020
Merged

Option to allow the request body to be processed outside the asynchttpserver library. #13147

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4fdbf8f
llow the request body to be processed outside the asynchttpserver lib…
mrhdias Jan 14, 2020
36e708f
Minor fix suggested by Araq
mrhdias Jan 14, 2020
6437c7a
No "req.contentLength" required.
mrhdias Jan 15, 2020
5c8dbf0
Now, request body is a FutureStream
mrhdias Jan 29, 2020
f458d0c
Update lib/pure/asynchttpserver.nim
mrhdias Jan 30, 2020
83cc79c
Added the modifications suggested by Araq.
mrhdias Jan 30, 2020
c110f90
The ".since" annotation has been added.
mrhdias Feb 3, 2020
a8ac8a5
The Error: invalid pragma: since: (1, 1) has been fixed.
mrhdias Feb 3, 2020
2dfcae4
The ".since" pragma has been removed from the code.
mrhdias Feb 4, 2020
dbc527e
Checking versions for compatibility.
mrhdias Feb 4, 2020
7ca4441
Added a entry in library changes for asynchttpserver.
mrhdias Feb 4, 2020
e5a2aed
The default value of chunkSize was increased to 8*1024.
mrhdias Feb 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions lib/pure/asynchttpserver.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,20 +52,23 @@ type
url*: Uri
hostname*: string ## The hostname of the client that made the request.
body*: string
contentLength*: int

AsyncHttpServer* = ref object
socket: AsyncSocket
reuseAddr: bool
reusePort: bool
maxBody: int ## The maximum content-length that will be read for the body.
handleBody: bool ## if false leave the body for the developer to do whatever he wants with it.

proc newAsyncHttpServer*(reuseAddr = true, reusePort = false,
maxBody = 8388608): AsyncHttpServer =
maxBody = 8388608, handleBody = true): AsyncHttpServer =
## Creates a new ``AsyncHttpServer`` instance.
new result
result.reuseAddr = reuseAddr
result.reusePort = reusePort
result.maxBody = maxBody
result.handleBody = handleBody

proc addHeaders(msg: var string, headers: HttpHeaders) =
for k, v in headers:
Expand Down Expand Up @@ -146,6 +149,7 @@ proc processRequest(
# \n
request.headers.clear()
request.body = ""
request.contentLength = 0
request.hostname.shallowCopy(address)
assert client != nil
request.client = client
Expand Down Expand Up @@ -243,10 +247,14 @@ proc processRequest(
if contentLength > server.maxBody:
await request.respondError(Http413)
return false
request.body = await client.recv(contentLength)
if request.body.len != contentLength:
await request.respond(Http400, "Bad Request. Content-Length does not match actual.")
return true

request.contentLength = contentLength
if server.handleBody == true: # if false leave the body for the developer to do whatever he wants with it.
mrhdias marked this conversation as resolved.
Show resolved Hide resolved
request.body = await client.recv(contentLength)
if request.body.len != contentLength:
await request.respond(Http400, "Bad Request. Content-Length does not match actual.")
return true

elif request.reqMethod == HttpPost:
await request.respond(Http411, "Content-Length required.")
return true
Expand Down