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

don't try to replace policies for deleted shares (#276)

Browse Source
This commit is contained in:
Michael Quigley 2023-03-28 15:05:51 -04:00
parent 31819b42ba
commit bd4ce22d97
No known key found for this signature in database
GPG Key ID: 9B60314A9DD20A62
3 changed files with 51 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
controller/limits/accountRelaxAction.go
View File

@ -33,24 +33,26 @@ func (a *accountRelaxAction) HandleAccount(acct *store.Account, _, _ int64, _ *B
} }
for _, shr := range shrs { for _, shr := range shrs {
if shr.ShareMode == "public" { if !shr.Deleted {
env, err := a.str.GetEnvironment(shr.EnvironmentId, trx) if shr.ShareMode == "public" {
if err != nil { env, err := a.str.GetEnvironment(shr.EnvironmentId, trx)
return errors.Wrap(err, "error finding environment") if err != nil {
} return errors.Wrap(err, "error finding environment")
}
fe, err := a.str.FindFrontendPubliclyNamed(*shr.FrontendSelection, trx) fe, err := a.str.FindFrontendPubliclyNamed(*shr.FrontendSelection, trx)
if err != nil { if err != nil {
return errors.Wrapf(err, "error finding frontend name '%v' for '%v'", *shr.FrontendSelection, shr.Token) return errors.Wrapf(err, "error finding frontend name '%v' for '%v'", *shr.FrontendSelection, shr.Token)
} }
if err := zrokEdgeSdk.CreateServicePolicyDial(env.ZId+"-"+shr.ZId+"-dial", shr.ZId, []string{fe.ZId}, zrokEdgeSdk.ZrokShareTags(shr.Token).SubTags, a.edge); err != nil { if err := zrokEdgeSdk.CreateServicePolicyDial(env.ZId+"-"+shr.ZId+"-dial", shr.ZId, []string{fe.ZId}, zrokEdgeSdk.ZrokShareTags(shr.Token).SubTags, a.edge); err != nil {
return errors.Wrapf(err, "error creating dial service policy for '%v'", shr.Token) return errors.Wrapf(err, "error creating dial service policy for '%v'", shr.Token)
} }
logrus.Infof("added dial service policy for '%v'", shr.Token) logrus.Infof("added dial service policy for '%v'", shr.Token)
} else if shr.ShareMode == "private" { } else if shr.ShareMode == "private" {
return errors.New("share relax for private share not implemented") return errors.New("share relax for private share not implemented")
}
} }
} }
} }

32
controller/limits/environmentRelaxAction.go
View File

@ -27,24 +27,26 @@ func (a *environmentRelaxAction) HandleEnvironment(env *store.Environment, rxByt
} }
for _, shr := range shrs { for _, shr := range shrs {
if shr.ShareMode == "public" { if !shr.Deleted {
env, err := a.str.GetEnvironment(shr.EnvironmentId, trx) if shr.ShareMode == "public" {
if err != nil { env, err := a.str.GetEnvironment(shr.EnvironmentId, trx)
return errors.Wrap(err, "error finding environment") if err != nil {
} return errors.Wrap(err, "error finding environment")
}
fe, err := a.str.FindFrontendPubliclyNamed(*shr.FrontendSelection, trx) fe, err := a.str.FindFrontendPubliclyNamed(*shr.FrontendSelection, trx)
if err != nil { if err != nil {
return errors.Wrapf(err, "error finding frontend name '%v' for '%v'", *shr.FrontendSelection, shr.Token) return errors.Wrapf(err, "error finding frontend name '%v' for '%v'", *shr.FrontendSelection, shr.Token)
} }
if err := zrokEdgeSdk.CreateServicePolicyDial(env.ZId+"-"+shr.ZId+"-dial", shr.ZId, []string{fe.ZId}, zrokEdgeSdk.ZrokShareTags(shr.Token).SubTags, a.edge); err != nil { if err := zrokEdgeSdk.CreateServicePolicyDial(env.ZId+"-"+shr.ZId+"-dial", shr.ZId, []string{fe.ZId}, zrokEdgeSdk.ZrokShareTags(shr.Token).SubTags, a.edge); err != nil {
return errors.Wrapf(err, "error creating dial service policy for '%v'", shr.Token) return errors.Wrapf(err, "error creating dial service policy for '%v'", shr.Token)
} }
logrus.Infof("added dial service policy for '%v'", shr.Token) logrus.Infof("added dial service policy for '%v'", shr.Token)
} else if shr.ShareMode == "private" { } else if shr.ShareMode == "private" {
return errors.New("share relax for private share not implemented") return errors.New("share relax for private share not implemented")
}
} }
} }

32
controller/limits/shareRelaxAction.go
View File

@ -21,24 +21,26 @@ func newShareRelaxAction(str *store.Store, edge *rest_management_api_client.Ziti
func (a *shareRelaxAction) HandleShare(shr *store.Share, rxBytes, txBytes int64, limit *BandwidthPerPeriod, trx *sqlx.Tx) error { func (a *shareRelaxAction) HandleShare(shr *store.Share, rxBytes, txBytes int64, limit *BandwidthPerPeriod, trx *sqlx.Tx) error {
logrus.Infof("relaxing '%v'", shr.Token) logrus.Infof("relaxing '%v'", shr.Token)
if shr.ShareMode == "public" { if !shr.Deleted {
env, err := a.str.GetEnvironment(shr.EnvironmentId, trx) if shr.ShareMode == "public" {
if err != nil { env, err := a.str.GetEnvironment(shr.EnvironmentId, trx)
return errors.Wrap(err, "error finding environment") if err != nil {
} return errors.Wrap(err, "error finding environment")
}
fe, err := a.str.FindFrontendPubliclyNamed(*shr.FrontendSelection, trx) fe, err := a.str.FindFrontendPubliclyNamed(*shr.FrontendSelection, trx)
if err != nil { if err != nil {
return errors.Wrapf(err, "error finding frontend name '%v' for '%v'", *shr.FrontendSelection, shr.Token) return errors.Wrapf(err, "error finding frontend name '%v' for '%v'", *shr.FrontendSelection, shr.Token)
} }
if err := zrokEdgeSdk.CreateServicePolicyDial(env.ZId+"-"+shr.ZId+"-dial", shr.ZId, []string{fe.ZId}, zrokEdgeSdk.ZrokShareTags(shr.Token).SubTags, a.edge); err != nil { if err := zrokEdgeSdk.CreateServicePolicyDial(env.ZId+"-"+shr.ZId+"-dial", shr.ZId, []string{fe.ZId}, zrokEdgeSdk.ZrokShareTags(shr.Token).SubTags, a.edge); err != nil {
return errors.Wrapf(err, "error creating dial service policy for '%v'", shr.Token) return errors.Wrapf(err, "error creating dial service policy for '%v'", shr.Token)
} }
logrus.Infof("added dial service policy for '%v'", shr.Token) logrus.Infof("added dial service policy for '%v'", shr.Token)
} else if shr.ShareMode == "private" { } else if shr.ShareMode == "private" {
return errors.New("share relax for private share not implemented") return errors.New("share relax for private share not implemented")
}
} }
return nil return nil