github/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2026-04-15 01:41:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use id to access orgs (#1873)

Browse Source 
closes #1743 

fixes: setting secrets for own user namespace

- create org in database
- use orgID for org related APIs

Co-authored-by: 6543 <6543@obermui.de>
This commit is contained in:
Anbraten
2023-07-21 19:45:32 +02:00
committed by GitHub
parent aec2051071
commit e5d5ec8b47
51 changed files with 1261 additions and 392 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
server/cache/membership.go vendored
View File

@@ -16,6 +16,7 @@ package cache
import (
"context"
"fmt"
"time"
"github.com/woodpecker-ci/woodpecker/server/forge"
@@ -27,37 +28,37 @@ import (
// MembershipService is a service to check for user membership.
type MembershipService interface {
// Get returns if the user is a member of the organization.
Get(ctx context.Context, u *model.User, name string) (*model.OrgPerm, error)
Get(ctx context.Context, u *model.User, org string) (*model.OrgPerm, error)
}
type membershipCache struct {
Forge forge.Forge
Cache *ttlcache.Cache[string, *model.OrgPerm]
TTL time.Duration
forge forge.Forge
cache *ttlcache.Cache[string, *model.OrgPerm]
ttl time.Duration
}
// NewMembershipService creates a new membership service.
func NewMembershipService(f forge.Forge) MembershipService {
return &membershipCache{
TTL: 10 * time.Minute,
Forge: f,
Cache: ttlcache.New(ttlcache.WithDisableTouchOnHit[string, *model.OrgPerm]()),
ttl: 10 * time.Minute,
forge: f,
cache: ttlcache.New(ttlcache.WithDisableTouchOnHit[string, *model.OrgPerm]()),
}
}
// Get returns if the user is a member of the organization.
func (c *membershipCache) Get(ctx context.Context, u *model.User, name string) (*model.OrgPerm, error) {
key := u.Login + "/" + name
func (c *membershipCache) Get(ctx context.Context, u *model.User, org string) (*model.OrgPerm, error) {
key := fmt.Sprintf("%s-%s", u.ForgeRemoteID, org)
// Error can be safely ignored, as cache can only return error from loaders.
item, _ := c.Cache.Get(key)
item, _ := c.cache.Get(key)
if item != nil && !item.IsExpired() {
return item.Value(), nil
}
perm, err := c.Forge.OrgMembership(ctx, u, name)
perm, err := c.forge.OrgMembership(ctx, u, org)
if err != nil {
return nil, err
}
c.Cache.Set(key, perm, c.TTL)
c.cache.Set(key, perm, c.ttl)
return perm, nil
}