Skip to content

FIX: Hotfixes epic bugathon 02 ISSUE: user auth issues, api error response , cluster soft delete #486

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

Merged
merged 3 commits into from
May 27, 2021
Merged

FIX: Hotfixes epic bugathon 02 ISSUE: user auth issues, api error response , cluster soft delete #486

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
69c5bb3
user auth api error response for structured
vikramdevtron May 26, 2021
9b29c98
cluster listing soft delete items excludes
vikramdevtron May 26, 2021
cea45b0
environment autocomplete api added auth disable functionality
vikramdevtron May 27, 2021
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
18 changes: 17 additions & 1 deletion api/restHandler/EnvironmentRestHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,11 +257,27 @@ func (impl EnvironmentRestHandlerImpl) GetEnvironmentListForAutocomplete(w http.
writeJsonResp(w, err, nil, http.StatusInternalServerError)
return
}

v := r.URL.Query()
authEnabled := true
auth := v.Get("auth")
if len(auth) > 0 {
authEnabled, err = strconv.ParseBool(auth)
if err != nil {
authEnabled = true
err = nil
//ignore error, apply rbac by default
}
}
token := r.Header.Get("token")
// RBAC enforcer applying
var grantedEnvironment []request.EnvironmentBean
for _, item := range environments {
if ok := impl.enforcer.Enforce(token, rbac.ResourceGlobalEnvironment, rbac.ActionGet, strings.ToLower(item.Environment)); ok {
if authEnabled == true {
if ok := impl.enforcer.Enforce(token, rbac.ResourceGlobalEnvironment, rbac.ActionGet, strings.ToLower(item.Environment)); ok {
grantedEnvironment = append(grantedEnvironment, item)
}
} else {
grantedEnvironment = append(grantedEnvironment, item)
}
}
Expand Down
5 changes: 2 additions & 3 deletions api/restHandler/UserAuthHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import (
"github.com/devtron-labs/devtron/pkg/sso"
"github.com/devtron-labs/devtron/pkg/user"
"github.com/devtron-labs/devtron/util/rbac"
"github.com/devtron-labs/devtron/util/response"
"github.com/gorilla/mux"
"github.com/nats-io/stan"
"go.uber.org/zap"
Expand Down Expand Up @@ -148,7 +147,7 @@ func (handler UserAuthHandlerImpl) AddPolicy(w http.ResponseWriter, r *http.Requ
// RBAC enforcer applying
token := r.Header.Get("token")
if ok := handler.enforcer.Enforce(token, rbac.ResourceAdmin, rbac.ActionCreate, string(userId)); !ok {
response.WriteResponse(http.StatusForbidden, "FORBIDDEN", w, errors.New("unauthorized"))
writeJsonResp(w, errors.New("unauthorized"), nil, http.StatusForbidden)
return
}
//RBAC enforcer Ends
Expand Down Expand Up @@ -188,7 +187,7 @@ func (handler UserAuthHandlerImpl) RemovePolicy(w http.ResponseWriter, r *http.R
// RBAC enforcer applying
token := r.Header.Get("token")
if ok := handler.enforcer.Enforce(token, rbac.ResourceAdmin, rbac.ActionDelete, userId); !ok {
response.WriteResponse(http.StatusForbidden, "FORBIDDEN", w, errors.New("unauthorized"))
writeJsonResp(w, errors.New("unauthorized"), nil, http.StatusForbidden)
return
}
//RBAC enforcer Ends
Expand Down
24 changes: 12 additions & 12 deletions api/restHandler/UserRestHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,14 +184,14 @@ func (handler UserRestHandlerImpl) UpdateUser(w http.ResponseWriter, r *http.Req
for _, filter := range userInfo.RoleFilters {
if len(filter.Team) > 0 {
if ok := handler.enforcer.Enforce(token, rbac.ResourceUser, rbac.ActionUpdate, strings.ToLower(filter.Team)); !ok {
response.WriteResponse(http.StatusForbidden, "FORBIDDEN", w, errors.New("unauthorized"))
writeJsonResp(w, errors.New("unauthorized"), nil, http.StatusForbidden)
return
}
}
}
} else {
if ok := handler.enforcer.Enforce(token, rbac.ResourceUser, rbac.ActionUpdate, "*"); !ok {
response.WriteResponse(http.StatusForbidden, "FORBIDDEN", w, errors.New("unauthorized"))
writeJsonResp(w, errors.New("unauthorized"), nil, http.StatusForbidden)
return
}
}
Expand Down Expand Up @@ -290,7 +290,7 @@ func (handler UserRestHandlerImpl) GetById(w http.ResponseWriter, r *http.Reques
authPass = true
}
if authPass == false {
response.WriteResponse(http.StatusForbidden, "FORBIDDEN", w, errors.New("unauthorized"))
writeJsonResp(w, errors.New("unauthorized"), nil, http.StatusForbidden)
return
}
}
Expand Down Expand Up @@ -372,7 +372,7 @@ func (handler UserRestHandlerImpl) GetUserByEmail(w http.ResponseWriter, r *http
for _, filter := range res.RoleFilters {
if len(filter.Team) > 0 {
if ok := handler.enforcer.Enforce(token, rbac.ResourceUser, rbac.ActionGet, strings.ToLower(filter.Team)); !ok {
response.WriteResponse(http.StatusForbidden, "FORBIDDEN", w, errors.New("unauthorized"))
writeJsonResp(w, errors.New("unauthorized"), nil, http.StatusForbidden)
return
}
}
Expand Down Expand Up @@ -410,14 +410,14 @@ func (handler UserRestHandlerImpl) DeleteUser(w http.ResponseWriter, r *http.Req
for _, filter := range user.RoleFilters {
if len(filter.Team) > 0 {
if ok := handler.enforcer.Enforce(token, rbac.ResourceUser, rbac.ActionDelete, strings.ToLower(filter.Team)); !ok {
response.WriteResponse(http.StatusForbidden, "FORBIDDEN", w, errors.New("unauthorized"))
writeJsonResp(w, errors.New("unauthorized"), nil, http.StatusForbidden)
return
}
}
}
} else {
if ok := handler.enforcer.Enforce(token, rbac.ResourceUser, rbac.ActionDelete, ""); !ok {
response.WriteResponse(http.StatusForbidden, "FORBIDDEN", w, errors.New("unauthorized"))
writeJsonResp(w, errors.New("unauthorized"), nil, http.StatusForbidden)
return
}
}
Expand Down Expand Up @@ -456,7 +456,7 @@ func (handler UserRestHandlerImpl) FetchRoleGroupById(w http.ResponseWriter, r *
for _, filter := range res.RoleFilters {
if len(filter.Team) > 0 {
if ok := handler.enforcer.Enforce(token, rbac.ResourceUser, rbac.ActionGet, strings.ToLower(filter.Team)); !ok {
response.WriteResponse(http.StatusForbidden, "FORBIDDEN", w, errors.New("unauthorized"))
writeJsonResp(w, errors.New("unauthorized"), nil, http.StatusForbidden)
return
}
}
Expand Down Expand Up @@ -490,14 +490,14 @@ func (handler UserRestHandlerImpl) CreateRoleGroup(w http.ResponseWriter, r *htt
for _, filter := range request.RoleFilters {
if len(filter.Team) > 0 {
if ok := handler.enforcer.Enforce(token, rbac.ResourceUser, rbac.ActionCreate, strings.ToLower(filter.Team)); !ok {
response.WriteResponse(http.StatusForbidden, "FORBIDDEN", w, errors.New("unauthorized"))
writeJsonResp(w, errors.New("unauthorized"), nil, http.StatusForbidden)
return
}
}
}
} else {
if ok := handler.enforcer.Enforce(token, rbac.ResourceUser, rbac.ActionCreate, "*"); !ok {
response.WriteResponse(http.StatusForbidden, "FORBIDDEN", w, errors.New("unauthorized"))
writeJsonResp(w, errors.New("unauthorized"), nil, http.StatusForbidden)
return
}
}
Expand Down Expand Up @@ -545,14 +545,14 @@ func (handler UserRestHandlerImpl) UpdateRoleGroup(w http.ResponseWriter, r *htt
for _, filter := range request.RoleFilters {
if len(filter.Team) > 0 {
if ok := handler.enforcer.Enforce(token, rbac.ResourceUser, rbac.ActionUpdate, strings.ToLower(filter.Team)); !ok {
response.WriteResponse(http.StatusForbidden, "FORBIDDEN", w, errors.New("unauthorized"))
writeJsonResp(w, errors.New("unauthorized"), nil, http.StatusForbidden)
return
}
}
}
} else {
if ok := handler.enforcer.Enforce(token, rbac.ResourceUser, rbac.ActionUpdate, "*"); !ok {
response.WriteResponse(http.StatusForbidden, "FORBIDDEN", w, errors.New("unauthorized"))
writeJsonResp(w, errors.New("unauthorized"), nil, http.StatusForbidden)
return
}
}
Expand Down Expand Up @@ -635,7 +635,7 @@ func (handler UserRestHandlerImpl) DeleteRoleGroup(w http.ResponseWriter, r *htt
for _, filter := range userGroup.RoleFilters {
if len(filter.Team) > 0 {
if ok := handler.enforcer.Enforce(token, rbac.ResourceUser, rbac.ActionDelete, strings.ToLower(filter.Team)); !ok {
response.WriteResponse(http.StatusForbidden, "FORBIDDEN", w, errors.New("unauthorized"))
writeJsonResp(w, errors.New("unauthorized"), nil, http.StatusForbidden)
return
}
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/cluster/ClusterService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ func (impl ClusterServiceImpl) FindOneActive(clusterName string) (*ClusterBean,
}

func (impl ClusterServiceImpl) FindAll() ([]*ClusterBean, error) {
model, err := impl.clusterRepository.FindAll()
model, err := impl.clusterRepository.FindAllActive()
if err != nil {
return nil, err
}
Expand Down