48k.eu-mirror
/
ogclient
mirror of https://git.48k.eu/ogclient
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#1000 Fix HTTP request header length parsing 

OgClient miscalculates the body size of the request.

ogServer delimits HTTP headers with "\r\n\r\n" to comply with RFC 2616.
But ogClient searches for the first "\r\n" delimiter, hence, ogClient
stops at the first HTTP header field instead of at the end of the header.
Hence, it incorrectly assumes the body starts after the first "\r\n".

This commit updates ogClient to search for the "\r\n\r\n" delimiter.

Example:

POST /shell/run HTTP/1.1\r\n <-- ogClient considers body starts here (WRONG!)
Content-Length: 952\r\n
Content-Type: application/json\r\n
\r\n                         <-- Here is where the body starts
{"json-body":...}
more_events
Javier Sánchez Parra 2021-07-13 13:03:10 +02:00 committed by OpenGnSys Support Team
parent b5c3f58cc4
commit 7940887068
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ogClient.py
View File

@ -104,7 +104,7 @@ class ogClient:
request = restRequest() request = restRequest()
if not self.trailer: if not self.trailer:
header_len = self.data.find("\r\n") header_len = self.data.find("\r\n\r\n")
if header_len > 0: if header_len > 0:
# https://stackoverflow.com/questions/4685217/parse-raw-http-headers # https://stackoverflow.com/questions/4685217/parse-raw-http-headers
request_line, headers_alone = self.data.split('\n', 1) request_line, headers_alone = self.data.split('\n', 1)
@ -114,8 +114,9 @@ class ogClient:
self.content_len = int(headers['Content-Length']) self.content_len = int(headers['Content-Length'])
self.trailer = True self.trailer = True
# Add 2 because self.data.find("\r\n") does not count "\r\n" for the length # Add 4 because self.data.find("\r\n\r\n") does not count
self.header_len = header_len + 2 # "\r\n\r\n" for the length
self.header_len = header_len + 4
if self.trailer and (len(self.data) >= self.content_len + self.header_len): if self.trailer and (len(self.data) >= self.content_len + self.header_len):
request.parser(self.data) request.parser(self.data)