jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

further hardening of asynchttpserver

Browse source
This commit is contained in:
Andreas Rumpf 2017-11-19 03:05:55 +01:00
commit c474fdea16
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/pure/asynchttpserver.nim
View file

@ -125,9 +125,9 @@ proc parseProtocol(protocol: string): tuple[orig: string, major, minor: int] =
raise newException(ValueError, "Invalid request protocol. Got: " & raise newException(ValueError, "Invalid request protocol. Got: " &
protocol) protocol)
result.orig = protocol result.orig = protocol
i.inc protocol.parseInt(result.major, i) i.inc protocol.parseSaturatedNatural(result.major, i)
i.inc # Skip . i.inc # Skip .
i.inc protocol.parseInt(result.minor, i) i.inc protocol.parseSaturatedNatural(result.minor, i)
proc sendStatus(client: AsyncSocket, status: string): Future[void] = proc sendStatus(client: AsyncSocket, status: string): Future[void] =
client.send("HTTP/1.1 " & status & "\c\L\c\L") client.send("HTTP/1.1 " & status & "\c\L\c\L")
@ -230,8 +230,7 @@ proc processRequest(server: AsyncHttpServer, req: FutureVar[Request],
# - Check for Content-length header # - Check for Content-length header
if request.headers.hasKey("Content-Length"): if request.headers.hasKey("Content-Length"):
var contentLength = 0 var contentLength = 0
if parseInt(request.headers["Content-Length"], if parseSaturatedNatural(request.headers["Content-Length"], contentLength) == 0:
contentLength) == 0:
await request.respond(Http400, "Bad Request. Invalid Content-Length.") await request.respond(Http400, "Bad Request. Invalid Content-Length.")
return return
else: else:
@ -254,9 +253,9 @@ proc processRequest(server: AsyncHttpServer, req: FutureVar[Request],
# Persistent connections # Persistent connections
if (request.protocol == HttpVer11 and if (request.protocol == HttpVer11 and
request.headers.getOrDefault("connection").normalize != "close") or cmpIgnoreCase(request.headers.getOrDefault("connection"), "close") != 0) or
(request.protocol == HttpVer10 and (request.protocol == HttpVer10 and
request.headers.getOrDefault("connection").normalize == "keep-alive"): cmpIgnoreCase(request.headers.getOrDefault("connection"), "keep-alive") == 0):
# In HTTP 1.1 we assume that connection is persistent. Unless connection # In HTTP 1.1 we assume that connection is persistent. Unless connection
# header states otherwise. # header states otherwise.
# In HTTP 1.0 we assume that the connection should not be persistent. # In HTTP 1.0 we assume that the connection should not be persistent.