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

debug logging in unshareHandler

Browse Source
This commit is contained in:
Michael Quigley 2025-06-20 10:02:50 -04:00
parent 1ac77fa5b9
commit 6aed5d270d
No known key found for this signature in database
GPG Key ID: 9B60314A9DD20A62
3 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
controller/store/environment.go
View File

@ -1,6 +1,8 @@
package store
import (
"fmt"
"github.com/jmoiron/sqlx"
"github.com/pkg/errors"
)
@ -82,3 +84,8 @@ func (str *Store) DeleteEnvironment(id int, tx *sqlx.Tx) error {
}
return nil
}
func (env *Environment) String() string {
return fmt.Sprintf("Environment{Id: %d, AccountId: %v, Description: %q, Host: %q, Address: %q, ZId: %q, CreatedAt: %v, UpdatedAt: %v, Deleted: %t}",
env.Id, env.AccountId, env.Description, env.Host, env.Address, env.ZId, env.CreatedAt, env.UpdatedAt, env.Deleted)
}

7
controller/store/share.go
View File

@ -1,6 +1,8 @@
package store
import (
"fmt"
"github.com/jmoiron/sqlx"
"github.com/pkg/errors"
)
@ -148,3 +150,8 @@ func (str *Store) DeleteShare(id int, tx *sqlx.Tx) error {
}
return nil
}
func (shr *Share) String() string {
return fmt.Sprintf("Share{Id: %d, EnvironmentId: %d, ZId: %q, Token: %q, ShareMode: %q, BackendMode: %q, FrontendSelection: %v, FrontendEndpoint: %v, BackendProxyEndpoint: %v, Reserved: %t, UniqueName: %t, PermissionMode: %q, CreatedAt: %v, UpdatedAt: %v, Deleted: %t}",
shr.Id, shr.EnvironmentId, shr.ZId, shr.Token, shr.ShareMode, shr.BackendMode, shr.FrontendSelection, shr.FrontendEndpoint, shr.BackendProxyEndpoint, shr.Reserved, shr.UniqueName, shr.PermissionMode, shr.CreatedAt, shr.UpdatedAt, shr.Deleted)
}

11
controller/unshare.go
View File

@ -3,6 +3,8 @@ package controller
import (
"context"
"fmt"
"time"
"github.com/go-openapi/runtime/middleware"
"github.com/openziti/edge-api/rest_management_api_client"
edge_service "github.com/openziti/edge-api/rest_management_api_client/service"
@ -12,7 +14,6 @@ import (
"github.com/openziti/zrok/rest_server_zrok/operations/share"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"time"
)
type unshareHandler struct{}
@ -22,6 +23,8 @@ func newUnshareHandler() *unshareHandler {
}
func (h *unshareHandler) Handle(params share.UnshareParams, principal *rest_model_zrok.Principal) middleware.Responder {
logrus.Infof("envZId='%v', shareToken='%v', reserved='%v'", params.Body.EnvZID, params.Body.ShareToken, params.Body.Reserved)
tx, err := str.Begin()
if err != nil {
logrus.Errorf("error starting transaction for '%v': %v", principal.Email, err)
@ -56,6 +59,7 @@ func (h *unshareHandler) Handle(params share.UnshareParams, principal *rest_mode
logrus.Errorf("error finding environments for account '%v': %v", principal.Email, err)
return share.NewUnshareNotFound()
}
logrus.Infof("environment = %v", senv.String())
var sshr *store.Share
if shrs, err := str.FindSharesForEnvironment(senv.Id, tx); err == nil {
@ -73,11 +77,14 @@ func (h *unshareHandler) Handle(params share.UnshareParams, principal *rest_mode
logrus.Errorf("error finding shares for account '%v': %v", principal.Email, err)
return share.NewUnshareInternalServerError()
}
logrus.Infof("share = %v", sshr.String())
if sshr.Reserved == params.Body.Reserved {
logrus.Info("share reserved matches requested reserved")
// single tag-based share deallocator; should work regardless of sharing mode
h.deallocateResources(senv, shrToken, shrZId, edge)
logrus.Debugf("deallocated share '%v'", shrToken)
logrus.Infof("deallocated share '%v'", shrToken)
if err := str.DeleteAccessGrantsForShare(sshr.Id, tx); err != nil {
logrus.Errorf("error deleting access grants for share '%v': %v", shrToken, err)