mirror of
https://github.com/gohugoio/hugo.git
synced 2024-11-07 20:30:36 -05:00
identity: Fix potential infinite recursion in server change detection
Fixes #6986
This commit is contained in:
parent
b0d850321e
commit
6f48146e75
1 changed files with 14 additions and 4 deletions
|
@ -24,14 +24,24 @@ func NewPathIdentity(typ, pat string) PathIdentity {
|
|||
// Identities stores identity providers.
|
||||
type Identities map[Identity]Provider
|
||||
|
||||
func (ids Identities) search(id Identity) Provider {
|
||||
if v, found := ids[id]; found {
|
||||
func (ids Identities) search(depth int, id Identity) Provider {
|
||||
|
||||
if v, found := ids[id.GetIdentity()]; found {
|
||||
return v
|
||||
}
|
||||
|
||||
depth++
|
||||
|
||||
// There may be infinite recursion in templates.
|
||||
if depth > 100 {
|
||||
// Bail out.
|
||||
return nil
|
||||
}
|
||||
|
||||
for _, v := range ids {
|
||||
switch t := v.(type) {
|
||||
case IdentitiesProvider:
|
||||
if nested := t.GetIdentities().search(id); nested != nil {
|
||||
if nested := t.GetIdentities().search(depth, id); nested != nil {
|
||||
return nested
|
||||
}
|
||||
}
|
||||
|
@ -127,5 +137,5 @@ func (im *identityManager) GetIdentities() Identities {
|
|||
func (im *identityManager) Search(id Identity) Provider {
|
||||
im.Lock()
|
||||
defer im.Unlock()
|
||||
return im.ids.search(id.GetIdentity())
|
||||
return im.ids.search(0, id.GetIdentity())
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue