Skip to content

Commit

Permalink
Merge pull request #1488 from habitat-sh/eeyun/rbac_fix
Browse files Browse the repository at this point in the history
Alters minimum requirement for listing user role to member
  • Loading branch information
eeyun authored Aug 13, 2020
2 parents 6ad6d92 + be690f3 commit 1fd95fb
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 1 deletion.
2 changes: 1 addition & 1 deletion components/builder-api/src/server/resources/origins.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1180,7 +1180,7 @@ fn get_origin_member_role(req: HttpRequest,
-> HttpResponse {
let (origin, username) = path.into_inner();

if let Err(err) = authorize_session(&req, Some(&origin), None) {
if let Err(err) = authorize_session(&req, Some(&origin), Some(OriginMemberRole::Member)) {
return err.into();
}

Expand Down
24 changes: 24 additions & 0 deletions test/builder-api/src/roles.js
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,18 @@ describe("Origin Roles API", function () {
done(err);
});
});
it("user with readonly_member role not authorized to query role of other origin members", function (done) {
request
.get("/depot/origins/rcpd/users/bobo/role")
.type("application/json")
.accept("application/json")
.set("Authorization", global.lkennedyBearer)
.expect(403)
.end(function (err, res) {
expect(res.text).to.be.empty;
done(err);
});
});
it("user not authorized to query role of members in other origins", function (done) {
request
.get("/depot/origins/rcpd/users/lkennedy/role")
Expand Down Expand Up @@ -830,6 +842,18 @@ describe("Origin Roles API", function () {
done(err);
});
});
it("user with member role authorized to query role of other origin members", function (done) {
request
.get("/depot/origins/rcpd/users/bobo/role")
.type("application/json")
.accept("application/json")
.set("Authorization", global.lkennedyBearer)
.expect(200)
.end(function (err, res) {
expect(res.text).to.equal('{"role":"owner"}');
done(err);
});
});
});
describe("Package visibility and non origin member searches", function () {
it("non origin member cannot see latest release of a package when its private", function (done) {
Expand Down

0 comments on commit 1fd95fb

Please sign in to comment.