Skip to content

[Task] role request in route #348

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

Open
John-Lin wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

[Task] role request in route #348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
10c9ecf
refactoring
John-Lin Oct 12, 2018
6003abd
add role acl
John-Lin Oct 12, 2018
bcbc44c
role panic check
John-Lin Oct 12, 2018
b25b5ce
add filter
John-Lin Oct 17, 2018
e29dd5f
change test user role
John-Lin Oct 17, 2018
90863c9
typo
John-Lin Oct 17, 2018
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
345 changes: 266 additions & 79 deletions src/server/route.go
View file
Open in desktop

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions src/server/route_filter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ func validateTokenMiddleware(req *restful.Request, resp *restful.Response, chain
}

func rootRole(req *restful.Request, resp *restful.Response, chain *restful.FilterChain) {
role := req.Attribute("Role").(string)
if role == entity.RootRole {
role, ok := req.Attribute("Role").(string)
if ok && role == entity.RootRole {
chain.ProcessFilter(req, resp)
} else {
log.Printf("User has no root role: Forbidden")
log.Printf("User role: %s has no root role: Forbidden", role)
resp.WriteHeaderAndEntity(http.StatusForbidden,
response.ActionResponse{
Error: true,
Expand All @@ -66,11 +66,11 @@ func rootRole(req *restful.Request, resp *restful.Response, chain *restful.Filte
}

func userRole(req *restful.Request, resp *restful.Response, chain *restful.FilterChain) {
role := req.Attribute("Role").(string)
if role == entity.RootRole || role == entity.UserRole {
role, ok := req.Attribute("Role").(string)
if ok && role == entity.RootRole || role == entity.UserRole {
chain.ProcessFilter(req, resp)
} else {
log.Printf("User has no user role: Forbidden")
log.Printf("User role: %s has no root role: Forbidden", role)
resp.WriteHeaderAndEntity(http.StatusForbidden,
response.ActionResponse{
Error: true,
Expand All @@ -81,11 +81,11 @@ func userRole(req *restful.Request, resp *restful.Response, chain *restful.Filte
}

func guestRole(req *restful.Request, resp *restful.Response, chain *restful.FilterChain) {
role := req.Attribute("Role").(string)
if role == entity.RootRole || role == entity.UserRole || role == entity.GuestRole {
role, ok := req.Attribute("Role").(string)
if ok && role == entity.RootRole || role == entity.UserRole || role == entity.GuestRole {
chain.ProcessFilter(req, resp)
} else {
log.Printf("User has no guest role: Forbidden")
log.Printf("User role: %s has no root role: Forbidden", role)
resp.WriteHeaderAndEntity(http.StatusForbidden,
response.ActionResponse{
Error: true,
Expand Down
4 changes: 2 additions & 2 deletions tests/02-multiple-interface/credential
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"username":"testuser@linkernetworks.com",
"password":"p@ssw0rd"
"username":"admin@vortex.com",
"password":"password"
}
4 changes: 2 additions & 2 deletions tests/03-host-network/credential
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"username":"testuser@linkernetworks.com",
"password":"p@ssw0rd"
"username":"admin@vortex.com",
"password":"password"
}
4 changes: 2 additions & 2 deletions tests/04-storage-pod/credential
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"username":"testuser@linkernetworks.com",
"password":"p@ssw0rd"
"username":"admin@vortex.com",
"password":"password"
}
4 changes: 2 additions & 2 deletions tests/05-deployment/credential
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"username":"testuser@linkernetworks.com",
"password":"p@ssw0rd"
"username":"admin@vortex.com",
"password":"password"
}
4 changes: 2 additions & 2 deletions tests/06-app/credential
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"username":"testuser@linkernetworks.com",
"password":"p@ssw0rd"
"username":"admin@vortex.com",
"password":"password"
}
4 changes: 2 additions & 2 deletions tests/07-ovs/credential
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"username":"testuser@linkernetworks.com",
"password":"p@ssw0rd"
"username":"admin@vortex.com",
"password":"password"
}
4 changes: 2 additions & 2 deletions tests/99-delete-test-user/credential
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"username":"testuser@linkernetworks.com",
"password":"p@ssw0rd"
"username":"admin@vortex.com",
"password":"password"
}