From 092f2b181848d4575f4317267866dade7312c542 Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Thu, 3 Dec 2020 19:20:59 +0000
Subject: Be more specific when a HTTP parser error happens.
---
src/modules/m_httpd.cpp | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
(limited to 'src/modules/m_httpd.cpp')
diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp
index 330e98c6a..b4e221e62 100644
--- a/src/modules/m_httpd.cpp
+++ b/src/modules/m_httpd.cpp
@@ -264,14 +264,14 @@ class HttpServerSocket : public BufferedSocket, public Timer, public insp::intru
Close();
}
- void SendHTTPError(unsigned int response)
+ void SendHTTPError(unsigned int response, const char* errstr = NULL)
{
static HTTPHeaders empty;
std::string data = InspIRCd::Format(
""
"Error %u
%s
"
"Powered by InspIRCd",
- response, http_status_str((http_status)response));
+ response, errstr ? errstr : http_status_str((http_status)response));
Page(data, response, &empty);
}
@@ -303,8 +303,10 @@ class HttpServerSocket : public BufferedSocket, public Timer, public insp::intru
if (parser.upgrade || HTTP_PARSER_ERRNO(&parser))
return;
http_parser_execute(&parser, &parser_settings, recvq.data(), recvq.size());
- if (parser.upgrade || HTTP_PARSER_ERRNO(&parser))
+ if (parser.upgrade)
SendHTTPError(status_code ? status_code : 400);
+ else if (HTTP_PARSER_ERRNO(&parser))
+ SendHTTPError(status_code ? status_code : 400, http_errno_description((http_errno)parser.http_errno));
}
void ServeData()
--
cgit v1.3.1-10-gc9f91