fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve HTTP error logging

Browse source
This commit is contained in:
Ben Gräf 2018-08-24 22:35:59 +02:00
parent 4bf6a07f9c
commit 23febd7c0f
2 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/cc/Httpd.cpp
View file

@ -96,19 +96,19 @@ std::string Httpd::readFile(const std::string &fileName)
unsigned Httpd::tokenAuth(struct MHD_Connection* connection, const std::string& clientIp) unsigned Httpd::tokenAuth(struct MHD_Connection* connection, const std::string& clientIp)
{ {
if (!m_options->ccToken()) { if (!m_options->ccToken()) {
LOG_WARN("[%s] AccessToken not set. Access Granted!", clientIp.c_str()); LOG_WARN("[%s] 200 OK - WARNING AccessToken not set!", clientIp.c_str());
return MHD_HTTP_OK; return MHD_HTTP_OK;
} }
const char* header = MHD_lookup_connection_value(connection, MHD_HEADER_KIND, MHD_HTTP_HEADER_AUTHORIZATION); const char* header = MHD_lookup_connection_value(connection, MHD_HEADER_KIND, MHD_HTTP_HEADER_AUTHORIZATION);
if (m_options->ccToken() && !header) { if (m_options->ccToken() && !header) {
LOG_WARN("[%s] No auth header. Access Forbidden!", clientIp.c_str()); LOG_WARN("[%s] 401 UNAUTHORIZED", clientIp.c_str());
return MHD_HTTP_UNAUTHORIZED; return MHD_HTTP_UNAUTHORIZED;
} }
const size_t size = strlen(header); const size_t size = strlen(header);
if (size < 8 || strlen(m_options->ccToken()) != size - 7 || memcmp("Bearer ", header, 7) != 0) { if (size < 8 || strlen(m_options->ccToken()) != size - 7 || memcmp("Bearer ", header, 7) != 0) {
LOG_ERR("[%s] AccessToken wrong. Access Forbidden!", clientIp.c_str()); LOG_ERR("[%s] 403 FORBIDDEN - AccessToken wrong!", clientIp.c_str());
return MHD_HTTP_FORBIDDEN; return MHD_HTTP_FORBIDDEN;
} }
@ -124,7 +124,7 @@ unsigned Httpd::basicAuth(struct MHD_Connection* connection, const std::string&
"Please configure admin user and pass to view this Page." "Please configure admin user and pass to view this Page."
"</body><html\\>"); "</body><html\\>");
LOG_WARN("[%s] Admin user/password not set. Access Forbidden!", clientIp.c_str()); LOG_ERR("[%s] 403 FORBIDDEN - Admin user/password not set!", clientIp.c_str());
result = MHD_HTTP_FORBIDDEN; result = MHD_HTTP_FORBIDDEN;
} }
else { else {
@ -137,7 +137,7 @@ unsigned Httpd::basicAuth(struct MHD_Connection* connection, const std::string&
if (user == nullptr || strcmp(user, m_options->ccAdminUser()) != 0 || if (user == nullptr || strcmp(user, m_options->ccAdminUser()) != 0 ||
pass == nullptr || strcmp(pass, m_options->ccAdminPass()) != 0) { pass == nullptr || strcmp(pass, m_options->ccAdminPass()) != 0) {
LOG_ERR("[%s] Admin user/password wrong. Access Forbidden!", clientIp.c_str()); LOG_ERR("[%s] 403 FORBIDDEN - Admin user/password wrong!", clientIp.c_str());
result = MHD_HTTP_UNAUTHORIZED; result = MHD_HTTP_UNAUTHORIZED;
} }
@ -149,7 +149,7 @@ unsigned Httpd::basicAuth(struct MHD_Connection* connection, const std::string&
free(pass); free(pass);
} }
} else { } else {
LOG_WARN("[%s] No auth header. Access Forbidden!", clientIp.c_str()); LOG_WARN("[%s] 401 UNAUTHORIZED", clientIp.c_str());
result = MHD_HTTP_UNAUTHORIZED; result = MHD_HTTP_UNAUTHORIZED;
} }
} }
@ -199,7 +199,7 @@ int Httpd::handler(void* httpd, MHD_Connection* connection, const char* url, con
} }
if (strcmp(method, MHD_HTTP_METHOD_GET) != 0 && strcmp(method, MHD_HTTP_METHOD_POST) != 0) { if (strcmp(method, MHD_HTTP_METHOD_GET) != 0 && strcmp(method, MHD_HTTP_METHOD_POST) != 0) {
LOG_ERR("[%s] HTTP_METHOD_NOT_ALLOWED (%s)", clientIp.c_str(), method); LOG_ERR("[%s] 405 METHOD NOT ALLOWED (%s)", clientIp.c_str(), method);
return sendResponse(connection, MHD_HTTP_METHOD_NOT_ALLOWED, nullptr, CONTENT_TYPE_HTML); return sendResponse(connection, MHD_HTTP_METHOD_NOT_ALLOWED, nullptr, CONTENT_TYPE_HTML);
} }
@ -225,8 +225,6 @@ int Httpd::handler(void* httpd, MHD_Connection* connection, const char* url, con
} else { } else {
return handlePOST(static_cast<Httpd*>(httpd), connection, clientIp, url, upload_data, upload_data_size, con_cls); return handlePOST(static_cast<Httpd*>(httpd), connection, clientIp, url, upload_data, upload_data_size, con_cls);
} }
return MHD_NO;
} }
int Httpd::handleGET(const Httpd* httpd, struct MHD_Connection* connection, const std::string& clientIp, const char* urlPtr) int Httpd::handleGET(const Httpd* httpd, struct MHD_Connection* connection, const std::string& clientIp, const char* urlPtr)

9
src/cc/Service.cpp
View file

@ -90,11 +90,12 @@ unsigned Service::handleGET(const Options* options, const std::string& url, cons
} else if (url.rfind("/admin/getClientLog", 0) == 0) { } else if (url.rfind("/admin/getClientLog", 0) == 0) {
resultCode = getClientLog(clientId, resp); resultCode = getClientLog(clientId, resp);
} else { } else {
LOG_WARN("[%s] METHOD_NOT_FOUND (%s)", clientIp.c_str(), url.c_str()); LOG_WARN("[%s] 404 NOT FOUND (%s)", clientIp.c_str(), url.c_str());
} }
} }
else { else {
LOG_ERR("[%s] Request does not contain clientId: %s", clientIp.c_str(), url.c_str()); resultCode = MHD_HTTP_BAD_REQUEST;
LOG_ERR("[%s] 400 BAD REQUEST - Request does not contain clientId (%s)", clientIp.c_str(), url.c_str());
} }
} }
@ -128,13 +129,13 @@ unsigned Service::handlePOST(const Options* options, const std::string& url, con
} else if (url.rfind("/admin/setClientCommand", 0) == 0) { } else if (url.rfind("/admin/setClientCommand", 0) == 0) {
resultCode = setClientCommand(clientId, data, resp); resultCode = setClientCommand(clientId, data, resp);
} else { } else {
LOG_WARN("[%s] METHOD_NOT_FOUND (%s)", clientIp.c_str(), url.c_str()); LOG_WARN("[%s] 400 BAD REQUEST - Request does not contain clientId (%s)", clientIp.c_str(), url.c_str());
} }
} else { } else {
if (url.rfind("/admin/resetClientStatusList", 0) == 0) { if (url.rfind("/admin/resetClientStatusList", 0) == 0) {
resultCode = resetClientStatusList(data, resp); resultCode = resetClientStatusList(data, resp);
} else { } else {
LOG_WARN("[%s] METHOD_NOT_FOUND (%s)", clientIp.c_str(), url.c_str()); LOG_WARN("[%s] 404 NOT FOUND (%s)", clientIp.c_str(), url.c_str());
} }
} }