Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

problem: User-Id field in zap response is not populated #1711

Merged
merged 3 commits into from
Jul 21, 2017
Merged

problem: User-Id field in zap response is not populated #1711

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3073539
problem: User-Id field in zap response is not populated.
JustinAzoff Jul 21, 2017
aac8400
problem: zauth tests do not check User-Id metadata
JustinAzoff Jul 21, 2017
69ee323
problem: Older ZAP does not populate User-Id metadata
JustinAzoff Jul 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions src/zauth.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ typedef struct {
char *password; // PLAIN password, in clear text
char *client_key; // CURVE client public key in ASCII
char *principal; // GSSAPI client principal
char *user_id; // User-Id to return in the ZAP Response
} zap_request_t;


Expand All @@ -214,6 +215,7 @@ s_zap_request_destroy (zap_request_t **self_p)
freen (self->password);
freen (self->client_key);
freen (self->principal);
// self->user_id is a pointer to one of the above fields
freen (self);
*self_p = NULL;
}
Expand Down Expand Up @@ -293,7 +295,7 @@ s_zap_request_reply (zap_request_t *self, char *status_code, char *status_text,
assert (rc == 0);
rc = zmsg_addstr(msg, status_text);
assert (rc == 0);
rc = zmsg_addstr(msg, "");
rc = zmsg_addstr(msg, self->user_id ? self->user_id : "");
assert (rc == 0);
rc = zmsg_addmem(msg, metadata, metasize);
assert (rc == 0);
Expand Down Expand Up @@ -348,6 +350,7 @@ s_authenticate_plain (self_t *self, zap_request_t *request)
if (self->verbose)
zsys_info ("zauth: - allowed (PLAIN) username=%s password=%s",
request->username, request->password);
request->user_id = request->username;
return true;
}
else {
Expand Down Expand Up @@ -395,6 +398,7 @@ s_authenticate_curve (self_t *self, zap_request_t *request, unsigned char **meta

if (self->verbose)
zsys_info ("zauth: - allowed (CURVE) client_key=%s", request->client_key);
request->user_id = request->client_key;
return true;
}
}
Expand All @@ -410,6 +414,7 @@ s_authenticate_gssapi (self_t *self, zap_request_t *request)
if (self->verbose)
zsys_info ("zauth: - allowed (GSSAPI) principal=%s identity=%s",
request->principal, request->identity);
request->user_id = request->principal;
return true;
}

Expand Down Expand Up @@ -649,9 +654,20 @@ zauth_test (bool verbose)
zsock_set_plain_password (client, "Password");
zstr_sendx (auth, "PLAIN", TESTDIR "/password-file", NULL);
zsock_wait (auth);
success = s_can_connect (&server, &client, true);
success = s_can_connect (&server, &client, false);
assert (success);

#if (ZMQ_VERSION >= ZMQ_MAKE_VERSION (4, 1, 0))
// Test that the User-Id metadata is present
zframe_t *frame = zframe_recv (server);
assert (frame != NULL);
const char *user_id = zframe_meta (frame, "User-Id");
assert (user_id != NULL);
assert (streq (user_id, "admin"));
zframe_destroy (&frame);
#endif
s_renew_sockets(&server, &client);

zsock_set_plain_server (server, 1);
zsock_set_plain_username (client, "admin");
zsock_set_plain_password (client, "Bogus");
Expand Down Expand Up @@ -706,6 +722,9 @@ zauth_test (bool verbose)
const char *meta = zframe_meta (frame, "Hello");
assert (meta != NULL);
assert (streq (meta, "World!"));
const char *user_id = zframe_meta (frame, "User-Id");
assert (user_id != NULL);
assert (streq (user_id, zcert_public_txt(client_cert)));
zframe_destroy (&frame);
s_renew_sockets(&server, &client);
#endif
Expand Down