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

OAuth2-based Macaroon acquisition #883

Merged
merged 9 commits into from Jan 11, 2019
Merged

OAuth2-based Macaroon acquisition #883

Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
eb8cd15
[Macaroons] WIP on implementing OAuth2 workflows.
bbockelm Nov 21, 2018
0650b14
WIP: checkpoint of OAuth2-based macaroon acquisition.
bbockelm Nov 30, 2018
07f7d53
Port unquote helper function into Macaroon library.
bbockelm Dec 18, 2018
2c4cc38
Allow Xrootd to respond back with an OAuth-style response.
bbockelm Dec 18, 2018
d689d1e
Finish implementation of token generator.
bbockelm Dec 18, 2018
170e6cf
Add helper script for generating macaroons.
bbockelm Dec 18, 2018
f135f5d
Make sure we null-terminate the request data.
bbockelm Dec 19, 2018
1fd600c
Improve HTTP status codes.
bbockelm Dec 19, 2018
9d26a5e
Correct key name versus OAuth standard.
bbockelm Dec 19, 2018
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
6 changes: 3 additions & 3 deletions src/XrdMacaroons/XrdMacaroonsHandler.cc
View file
Open in desktop
Expand Up @@ -160,7 +160,7 @@ Handler::MatchesPath(const char *verb, const char *path)
int Handler::ProcessOAuthConfig(XrdHttpExtReq &req) {
if (req.verb != "GET")
{
return req.SendSimpleResp(400, NULL, NULL, "Only GET is valid for oauth config.", 0);
return req.SendSimpleResp(405, NULL, NULL, "Only GET is valid for oauth config.", 0);
}
auto header = req.headers.find("Host");
if (header == req.headers.end())
Expand Down Expand Up @@ -193,7 +193,7 @@ int Handler::ProcessTokenRequest(XrdHttpExtReq &req)
{
if (req.verb != "POST")
{
return req.SendSimpleResp(400, NULL, NULL, "Only POST is valid for token request.", 0);
return req.SendSimpleResp(405, NULL, NULL, "Only POST is valid for token request.", 0);
}
auto header = req.headers.find("Content-Type");
if (header == req.headers.end())
Expand Down Expand Up @@ -519,7 +519,7 @@ Handler::GenerateMacaroonResponse(XrdHttpExtReq &req, const std::string &resourc
{
return req.SendSimpleResp(500, NULL, NULL, "Unable to create a new JSON validity object.", 0);
}
json_object_object_add(response_obj, "expire_in", expire_in_obj);
json_object_object_add(response_obj, "expires_in", expire_in_obj);

const char *macaroon_result = json_object_to_json_string_ext(response_obj, JSON_C_TO_STRING_PRETTY);
int retval = req.SendSimpleResp(200, NULL, NULL, macaroon_result, 0);
Expand Down