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

Fix HTTPD protocol authentication

Browse Source 
The HTTPD protocol mistakenly assumed that the `authenticator` parameter
of a listener would be NULL if the default authenticator is used.

Recent changes modified it so that the value is never NULL and
`NullAuthDeny` would be used for protocols which did not implement the
auth_default entry point.
This commit is contained in:
Markus Makela 2016-10-24 11:04:26 +03:00
parent db2cccbd8f
commit cff90ffee8
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/core/service.c
View File

@ -272,7 +272,7 @@ serviceStartPort(SERVICE *service, SERV_LISTENER *port)
memcpy(&(port->listener->func), funcs, sizeof(GWPROTOCOL));
const char *authenticator_name = "NullAuth";
const char *authenticator_name = "NullAuthDeny";
if (port->authenticator)
{

9
server/modules/protocol/HTTPD/httpd.c
View File

@ -215,9 +215,10 @@ static int httpd_read_event(DCB* dcb)
}
}
/** If listener->authenticator is NULL, it means we're using the default
* authenticator and we don't need to check the user credentials. */
bool auth_ok = dcb->listener->authenticator == 0;
/** If listener->authenticator is the default authenticator, it means that
* we don't need to check the user credentials. All other authenticators
* cause a 401 Unauthorized to be returned on the first try. */
bool auth_ok = strcmp(httpd_default_auth(), dcb->listener->authenticator) == 0;
/**
* Get the request headers
@ -254,7 +255,7 @@ static int httpd_read_event(DCB* dcb)
/** The freeing entry point is called automatically when
* the client DCB is closed */
dcb->authfunc.extract(dcb, auth_data);
auth_ok = dcb->authfunc.authenticate(dcb) == 0;
auth_ok = dcb->authfunc.authenticate(dcb) == MXS_AUTH_SUCCEEDED;
gwbuf_free(auth_data);
}
}