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

[XrdMacaroons] Fix default for macaroons.onmissing #945

Merged
merged 3 commits into from
Mar 26, 2019
Merged

[XrdMacaroons] Fix default for macaroons.onmissing #945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
55030e6
Set the `macaroons.onmissing` default.
bbockelm Mar 26, 2019
b85bccc
Interact with json-c appropriately for request.
bbockelm Mar 26, 2019
f3d16ff
Ensure we delete macaroon object after use.
bbockelm Mar 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/XrdMacaroons/XrdMacaroonsAuthz.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ Authz::Authz(XrdSysLogger *log, char const *config, XrdAccAuthorize *chain)
m_log(log, "macarons_"),
m_authz_behavior(static_cast<int>(Handler::AuthzBehavior::PASSTHROUGH))
{
Handler::AuthzBehavior behavior;
Handler::AuthzBehavior behavior(Handler::AuthzBehavior::PASSTHROUGH);
if (!Handler::Config(config, nullptr, &m_log, m_location, m_secret, m_max_duration, behavior))
{
throw std::runtime_error("Macaroon authorization config failed.");
Expand Down
21 changes: 18 additions & 3 deletions src/XrdMacaroons/XrdMacaroonsHandler.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,30 +366,44 @@ int Handler::ProcessReq(XrdHttpExtReq &req)
return req.SendSimpleResp(400, NULL, NULL, "Content-Length has invalid value.", 0);
}
//for (const auto &header : req.headers) { printf("** Request header: %s=%s\n", header.first.c_str(), header.second.c_str()); }

// request_data is not necessarily null-terminated; hence, we use the more advanced _ex variant
// of the tokener to avoid making a copy of the character buffer.
char *request_data;
if (req.BuffgetData(blen, &request_data, true) != blen)
{
return req.SendSimpleResp(400, NULL, NULL, "Missing or invalid body of request.", 0);
}
json_object *macaroon_req = json_tokener_parse(request_data);
if (!macaroon_req)
json_tokener *tokener = json_tokener_new();
if (!tokener)
{
return req.SendSimpleResp(500, NULL, NULL, "Internal error when allocating token parser.", 0);
}
json_object *macaroon_req = json_tokener_parse_ex(tokener, request_data, blen);
enum json_tokener_error err = json_tokener_get_error(tokener);
json_tokener_free(tokener);
if (err != json_tokener_success)
{
if (macaroon_req) json_object_put(macaroon_req);
return req.SendSimpleResp(400, NULL, NULL, "Invalid JSON serialization of macaroon request.", 0);
}
json_object *validity_obj;
if (!json_object_object_get_ex(macaroon_req, "validity", &validity_obj))
{
json_object_put(macaroon_req);
return req.SendSimpleResp(400, NULL, NULL, "JSON request does not include a `validity`", 0);
}
const char *validity_cstr = json_object_get_string(validity_obj);
if (!validity_cstr)
{
json_object_put(macaroon_req);
return req.SendSimpleResp(400, NULL, NULL, "validity key cannot be cast to a string", 0);
}
std::string validity_str(validity_cstr);
ssize_t validity = determine_validity(validity_str);
if (validity <= 0)
{
json_object_put(macaroon_req);
return req.SendSimpleResp(400, NULL, NULL, "Invalid ISO 8601 duration for validity key", 0);
}
json_object *caveats_obj;
Expand All @@ -412,7 +426,7 @@ int Handler::ProcessReq(XrdHttpExtReq &req)
}
}
}
json_object_put(caveats_obj);
json_object_put(macaroon_req);

return GenerateMacaroonResponse(req, req.resource, other_caveats, validity, false);
}
Expand Down Expand Up @@ -526,6 +540,7 @@ Handler::GenerateMacaroonResponse(XrdHttpExtReq &req, const std::string &resourc
printf("Returned macaroon_serialize code: %lu\n", (unsigned long)size_hint);
return req.SendSimpleResp(500, NULL, NULL, "Internal error serializing macaroon", 0);
}
macaroon_destroy(mac_with_date);

json_object *response_obj = json_object_new_object();
if (!response_obj)
Expand Down