AuthN: Remove embedded oauth server (#83146)
* AuthN: Remove embedded oauth server * Restore main * go mod tidy * Fix problem * Remove permission intersection * Fix test and lint * Fix TestData test * Revert to origin/main * Update go.mod * Update go.mod * Update go.sum
This commit is contained in:
@@ -292,110 +292,6 @@ func Reduce(ps []Permission) map[string][]string {
|
||||
return reduced
|
||||
}
|
||||
|
||||
// intersectScopes computes the minimal list of scopes common to two slices.
|
||||
func intersectScopes(s1, s2 []string) []string {
|
||||
if len(s1) == 0 || len(s2) == 0 {
|
||||
return []string{}
|
||||
}
|
||||
|
||||
// helpers
|
||||
splitScopes := func(s []string) (map[string]bool, map[string]bool) {
|
||||
scopes := make(map[string]bool)
|
||||
wildcards := make(map[string]bool)
|
||||
for _, s := range s {
|
||||
if isWildcard(s) {
|
||||
wildcards[s] = true
|
||||
} else {
|
||||
scopes[s] = true
|
||||
}
|
||||
}
|
||||
return scopes, wildcards
|
||||
}
|
||||
includes := func(wildcardsSet map[string]bool, scope string) bool {
|
||||
for wildcard := range wildcardsSet {
|
||||
if wildcard == "*" || strings.HasPrefix(scope, wildcard[:len(wildcard)-1]) {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
res := make([]string, 0)
|
||||
|
||||
// split input into scopes and wildcards
|
||||
s1Scopes, s1Wildcards := splitScopes(s1)
|
||||
s2Scopes, s2Wildcards := splitScopes(s2)
|
||||
|
||||
// intersect wildcards
|
||||
wildcards := make(map[string]bool)
|
||||
for s := range s1Wildcards {
|
||||
// if s1 wildcard is included in s2 wildcards
|
||||
// then it is included in the intersection
|
||||
if includes(s2Wildcards, s) {
|
||||
wildcards[s] = true
|
||||
continue
|
||||
}
|
||||
}
|
||||
for s := range s2Wildcards {
|
||||
// if s2 wildcard is included in s1 wildcards
|
||||
// then it is included in the intersection
|
||||
if includes(s1Wildcards, s) {
|
||||
wildcards[s] = true
|
||||
}
|
||||
}
|
||||
|
||||
// intersect scopes
|
||||
scopes := make(map[string]bool)
|
||||
for s := range s1Scopes {
|
||||
// if s1 scope is included in s2 wilcards or s2 scopes
|
||||
// then it is included in the intersection
|
||||
if includes(s2Wildcards, s) || s2Scopes[s] {
|
||||
scopes[s] = true
|
||||
}
|
||||
}
|
||||
for s := range s2Scopes {
|
||||
// if s2 scope is included in s1 wilcards
|
||||
// then it is included in the intersection
|
||||
if includes(s1Wildcards, s) {
|
||||
scopes[s] = true
|
||||
}
|
||||
}
|
||||
|
||||
// merge wildcards and scopes
|
||||
for w := range wildcards {
|
||||
res = append(res, w)
|
||||
}
|
||||
for s := range scopes {
|
||||
res = append(res, s)
|
||||
}
|
||||
|
||||
return res
|
||||
}
|
||||
|
||||
// Intersect returns the intersection of two slices of permissions, grouping scopes by action.
|
||||
func Intersect(p1, p2 []Permission) map[string][]string {
|
||||
if len(p1) == 0 || len(p2) == 0 {
|
||||
return map[string][]string{}
|
||||
}
|
||||
|
||||
res := make(map[string][]string)
|
||||
p1m := Reduce(p1)
|
||||
p2m := Reduce(p2)
|
||||
|
||||
// Loop over the smallest map
|
||||
if len(p1m) > len(p2m) {
|
||||
p1m, p2m = p2m, p1m
|
||||
}
|
||||
|
||||
for a1, s1 := range p1m {
|
||||
if s2, ok := p2m[a1]; ok {
|
||||
res[a1] = intersectScopes(s1, s2)
|
||||
}
|
||||
}
|
||||
|
||||
return res
|
||||
}
|
||||
|
||||
func ValidateScope(scope string) bool {
|
||||
prefix, last := scope[:len(scope)-1], scope[len(scope)-1]
|
||||
// verify that last char is either ':' or '/' if last character of scope is '*'
|
||||
|
||||
Reference in New Issue
Block a user