extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2025-06-30 14:30:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

massive name -> token work (#119)

Browse Source
This commit is contained in:
Michael Quigley
2022-11-30 12:10:00 -05:00
parent f54d315e34
commit 483babe813
15 changed files with 106 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
controller/unaccess.go
View File

@ -17,10 +17,10 @@ func newUnaccessHandler() *unaccessHandler {
}
func (h *unaccessHandler) Handle(params service.UnaccessParams, principal *rest_model_zrok.Principal) middleware.Responder {
frontendName := params.Body.FrontendName
svcName := params.Body.SvcName
feToken := params.Body.FrontendName
svcToken := params.Body.SvcName
envZId := params.Body.ZID
logrus.Infof("processing unaccess request for frontend '%v' (service '%v', environment '%v')", frontendName, svcName, envZId)
logrus.Infof("processing unaccess request for frontend '%v' (service '%v', environment '%v')", feToken, svcToken, envZId)
tx, err := str.Begin()
if err != nil {
@ -53,29 +53,29 @@ func (h *unaccessHandler) Handle(params service.UnaccessParams, principal *rest_
return service.NewUnaccessUnauthorized()
}
sfe, err := str.FindFrontendNamed(frontendName, tx)
sfe, err := str.FindFrontendNamed(feToken, tx)
if err != nil {
logrus.Error(err)
return service.NewUnaccessInternalServerError()
}
if sfe == nil || sfe.EnvironmentId != senv.Id {
logrus.Errorf("frontend named '%v' not found", frontendName)
logrus.Errorf("frontend named '%v' not found", feToken)
return service.NewUnaccessInternalServerError()
}
if err := str.DeleteFrontend(sfe.Id, tx); err != nil {
logrus.Errorf("error deleting frontend named '%v': %v", frontendName, err)
logrus.Errorf("error deleting frontend named '%v': %v", feToken, err)
return service.NewUnaccessNotFound()
}
if err := deleteServicePolicy(envZId, fmt.Sprintf("tags.zrokServiceName=\"%v\" and tags.zrokFrontendToken=\"%v\" and type=1", svcName, frontendName), edge); err != nil {
logrus.Errorf("error removing access to '%v' for '%v': %v", svcName, envZId, err)
if err := deleteServicePolicy(envZId, fmt.Sprintf("tags.zrokServiceToken=\"%v\" and tags.zrokFrontendToken=\"%v\" and type=1", svcToken, feToken), edge); err != nil {
logrus.Errorf("error removing access to '%v' for '%v': %v", svcToken, envZId, err)
return service.NewUnaccessInternalServerError()
}
if err := tx.Commit(); err != nil {
logrus.Errorf("error committing frontend '%v' delete: %v", frontendName, err)
logrus.Errorf("error committing frontend '%v' delete: %v", feToken, err)
return service.NewUnaccessInternalServerError()
}