blackroad-os/backroad
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(dataservices): unify access methods and abstract away redundant code [EE-5628] (#9115)

Browse Source
This commit is contained in:
andres-portainer
2023-06-22 18:28:07 -03:00
committed by GitHub
parent 4c6bbe9a2f
commit 4cc96b4b30
171 changed files with 714 additions and 1590 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/http/security/bouncer.go
View File

@@ -134,7 +134,7 @@ func (bouncer *RequestBouncer) AuthorizedEndpointOperation(r *http.Request, endp
return err
}
group, err := bouncer.dataStore.EndpointGroup().EndpointGroup(endpoint.GroupID)
group, err := bouncer.dataStore.EndpointGroup().Read(endpoint.GroupID)
if err != nil {
return err
}
@@ -217,7 +217,7 @@ func (bouncer *RequestBouncer) mwCheckPortainerAuthorizations(next http.Handler,
return
}
_, err = bouncer.dataStore.User().User(tokenData.ID)
_, err = bouncer.dataStore.User().Read(tokenData.ID)
if bouncer.dataStore.IsErrObjectNotFound(err) {
httperror.WriteError(w, http.StatusUnauthorized, "Unauthorized", httperrors.ErrUnauthorized)
return
@@ -288,7 +288,7 @@ func (bouncer *RequestBouncer) mwAuthenticateFirst(tokenLookups []tokenLookup, n
return
}
_, err := bouncer.dataStore.User().User(token.ID)
_, err := bouncer.dataStore.User().Read(token.ID)
if err != nil && bouncer.dataStore.IsErrObjectNotFound(err) {
httperror.WriteError(w, http.StatusUnauthorized, "Unauthorized", httperrors.ErrUnauthorized)
return