hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix REST API authentication errors

Browse Source 
The authentication errors were not sent as the connection was closed
immediately. The reason for this was the fact that if a client request
uploaded data with bad credentials, MaxScale would not send a response if
the connection was kept open. Closing the socket solved the hang but
caused confusing errors on the client side.

The libmicrohttpd library appears to require full processing of any data
uploaded by a client request before a request can be sent. With this
change, the clients receive proper authentication errors in all cases.
This commit is contained in:
Markus Mäkelä
2017-09-07 22:05:36 +03:00
parent 5abb30c357
commit 81a3ff6c27
2 changed files with 95 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
server/core/admin.cc
View File

@ -171,7 +171,7 @@ void close_client(void *cls,
delete client;
}
bool do_auth(MHD_Connection* connection, const char* url, const char* method)
bool Client::auth(MHD_Connection* connection, const char* url, const char* method)
{
bool rval = true;
@ -199,7 +199,6 @@ bool do_auth(MHD_Connection* connection, const char* url, const char* method)
"administrative privileges. Request: %s %s",
user, method, url);
}
send_auth_error(connection);
rval = false;
}
else
@ -211,6 +210,8 @@ bool do_auth(MHD_Connection* connection, const char* url, const char* method)
MXS_FREE(pw);
}
m_state = rval ? Client::OK : Client::FAILED;
return rval;
}
@ -224,26 +225,62 @@ int handle_client(void *cls,
void **con_cls)
{
if (!do_auth(connection, url, method))
{
return MHD_NO;
}
if (*con_cls == NULL)
{
if ((*con_cls = new (std::nothrow) Client(connection)) == NULL)
{
return MHD_NO;
}
else if (modifies_data(connection, method))
{
// The first call doesn't have any data
return MHD_YES;
}
}
Client* client = static_cast<Client*>(*con_cls);
return client->process(url, method, upload_data, upload_data_size);
Client::state state = client->get_state();
int rval = MHD_NO;
if (state != Client::CLOSED)
{
if (state == Client::INIT)
{
// First request, do authentication
if (!client->auth(connection, url, method))
{
rval = MHD_YES;
}
}
if (client->get_state() == Client::OK)
{
// Authentication was successful, start processing the request
if (state == Client::INIT && modifies_data(connection, method))
{
// The first call doesn't have any data
rval = MHD_YES;
}
else
{
rval = client->process(url, method, upload_data, upload_data_size);
}
}
else if (client->get_state() == Client::FAILED)
{
// Authentication has failed, an error will be sent to the client
rval = MHD_YES;
if (*upload_data_size)
{
// The client is uploading data, discard it so we can send the error
*upload_data_size = 0;
}
else if (state != Client::INIT)
{
// The client has finished uploading data, send an error and close the connection
send_auth_error(connection);
client->close();
}
}
}
return rval;
}
static bool host_to_sockaddr(const char* host, uint16_t port, struct sockaddr_storage* addr)