mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2026-01-06 14:33:17 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

[bugfix] Fix existing perm adoption (#3651)

Browse source 
* [bugfix] Fix existing perm adoption

* go fmt

* test, small log fix
This commit is contained in:
tobi 2025-01-18 17:55:27 +00:00 • committed by GitHub
commit 634d4f408f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 225 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

94
internal/subscriptions/domainperms.go
View file

@ -317,7 +317,7 @@ func (s *Subscriptions) ProcessDomainPermissionSubscription(
// Iterate through wantedPerms and
// create (or dry create) each one.
for _, wantedPerm := range wantedPerms {
l = l.WithField("domain", wantedPerm.GetDomain())
l := l.WithField("domain", wantedPerm.GetDomain())
created, err := s.processDomainPermission(
ctx, l,
wantedPerm,
@ -486,26 +486,53 @@ func (s *Subscriptions) processDomainPermission(
// side effects of permission.
err = s.state.AdminActions.Run(ctx, action, actionF)
case existingPerm.GetSubscriptionID() != "" || *permSub.AdoptOrphans:
// Perm exists but we should adopt/take
// it by copying over desired fields.
existingPerm.SetCreatedByAccountID(wantedPerm.GetCreatedByAccountID())
existingPerm.SetCreatedByAccount(wantedPerm.GetCreatedByAccount())
existingPerm.SetSubscriptionID(permSub.ID)
existingPerm.SetObfuscate(wantedPerm.GetObfuscate())
existingPerm.SetPrivateComment(wantedPerm.GetPrivateComment())
existingPerm.SetPublicComment(wantedPerm.GetPublicComment())
switch p := existingPerm.(type) {
case *gtsmodel.DomainBlock:
err = s.state.DB.UpdateDomainBlock(ctx, p)
case *gtsmodel.DomainAllow:
err = s.state.DB.UpdateDomainAllow(ctx, p)
case existingPerm.IsOrphan():
// Perm already exists, but it's not managed
// by a subscription, ie., it's an orphan.
if !*permSub.AdoptOrphans {
l.Debug("permission exists as an orphan that we shouldn't adopt, skipping")
return false, nil
}
// Orphan is adoptable, so adopt
// it by rewriting some fields.
//
// TODO: preserve previous private
// + public comment in some way.
l.Debug("adopting orphan permission")
err = s.adoptPerm(
ctx,
existingPerm,
permSub,
wantedPerm.GetObfuscate(),
permSub.URI,
wantedPerm.GetPublicComment(),
)
case existingPerm.GetSubscriptionID() != permSub.ID:
// Perm already exists, and is managed
// by a lower-priority subscription.
// Take it for ourselves.
//
// TODO: preserve previous private
// + public comment in some way.
l.Debug("taking over permission from lower-priority subscription")
err = s.adoptPerm(
ctx,
existingPerm,
permSub,
wantedPerm.GetObfuscate(),
permSub.URI,
wantedPerm.GetPublicComment(),
)
default:
// Perm exists but we should leave it alone.
l.Debug("domain is covered by a higher-priority subscription, skipping")
// Perm exists and is managed by us.
//
// TODO: update public/private comment
// from latest version if it's changed.
l.Debug("permission already exists and is managed by this subscription, skipping")
return false, nil
}
if err != nil && !errors.Is(err, db.ErrAlreadyExists) {
@ -829,3 +856,34 @@ func (s *Subscriptions) existingCovered(
return
}
func (s *Subscriptions) adoptPerm(
ctx context.Context,
perm gtsmodel.DomainPermission,
permSub *gtsmodel.DomainPermissionSubscription,
obfuscate *bool,
privateComment string,
publicComment string,
) error {
// Set to our sub ID + this subs's
// account as we're managing it now.
perm.SetSubscriptionID(permSub.ID)
perm.SetCreatedByAccountID(permSub.CreatedByAccount.ID)
perm.SetCreatedByAccount(permSub.CreatedByAccount)
// Set new metadata on the perm.
perm.SetObfuscate(obfuscate)
perm.SetPrivateComment(privateComment)
perm.SetPublicComment(publicComment)
// Update the perm in the db.
var err error
switch p := perm.(type) {
case *gtsmodel.DomainBlock:
err = s.state.DB.UpdateDomainBlock(ctx, p)
case *gtsmodel.DomainAllow:
err = s.state.DB.UpdateDomainAllow(ctx, p)
}
return err
}