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

Use configured principal name

Browse Source 
The default principal name was used instead of the configured one.
This commit is contained in:
Markus Mäkelä
2016-12-22 16:53:36 +02:00
parent 5664321df0
commit b9b3bfaa78
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.c
View File

@ -317,15 +317,14 @@ static gss_name_t server_name = GSS_C_NO_NAME;
* @param len Length of the token * @param len Length of the token
* @return True if client token is valid * @return True if client token is valid
*/ */
static bool validate_gssapi_token(uint8_t* token, size_t len) static bool validate_gssapi_token(char* principal, uint8_t* token, size_t len)
{ {
OM_uint32 major = 0, minor = 0; OM_uint32 major = 0, minor = 0;
gss_buffer_desc server_buf = {0, 0}; gss_buffer_desc server_buf = {0, 0};
gss_cred_id_t credentials; gss_cred_id_t credentials;
/** TODO: Make this configurable */ server_buf.value = (void*)principal;
server_buf.value = (void*)default_princ_name; server_buf.length = strlen(principal) + 1;
server_buf.length = sizeof(default_princ_name);
major = gss_import_name(&minor, &server_buf, GSS_C_NT_USER_NAME, &server_name); major = gss_import_name(&minor, &server_buf, GSS_C_NT_USER_NAME, &server_name);
@ -453,7 +452,7 @@ int gssapi_auth_authenticate(DCB *dcb)
MYSQL_session *ses = (MYSQL_session*)dcb->data; MYSQL_session *ses = (MYSQL_session*)dcb->data;
if (validate_gssapi_token(ses->auth_token, ses->auth_token_len) && if (validate_gssapi_token(instance->principal_name, ses->auth_token, ses->auth_token_len) &&
validate_user(auth, dcb, ses)) validate_user(auth, dcb, ses))
{ {
rval = MXS_AUTH_SUCCEEDED; rval = MXS_AUTH_SUCCEEDED;