3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-08-03 08:50:42 +02:00
Code Issues Projects Releases Packages Wiki Activity

authorize: implement allowed_idp_claims (#1542)

Browse source 
* add arbitrary claims to session

* add support for maps

* update flattened claims

* fix eol

* fix trailing whitespace

* fix tests
This commit is contained in:
Caleb Doxsey 2020-10-23 14:05:37 -06:00 • committed by GitHub
parent 2a97e92d50
commit 153e438eb6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 1369 additions and 743 deletions
Download patch file Download diff file Expand all files Collapse all files

26
internal/identity/manager/data.go
View file

@ -6,8 +6,8 @@ import (
"github.com/golang/protobuf/ptypes"
"github.com/google/btree"
"google.golang.org/protobuf/types/known/anypb"
"github.com/pomerium/pomerium/internal/identity"
"github.com/pomerium/pomerium/pkg/grpc/session"
"github.com/pomerium/pomerium/pkg/grpc/user"
)
@ -45,17 +45,7 @@ func (u *User) UnmarshalJSON(data []byte) error {
delete(raw, "email")
}
u.User.Claims = make(map[string]*anypb.Any)
for k, rawv := range raw {
var v interface{}
if json.Unmarshal(rawv, &v) != nil {
continue
}
if anyv, err := toAny(v); err == nil {
u.User.Claims[k] = anyv
}
}
u.AddClaims(identity.NewClaimsFromRaw(raw).Flatten())
return nil
}
@ -141,17 +131,7 @@ func (s *Session) UnmarshalJSON(data []byte) error {
delete(raw, "iat")
}
s.Session.Claims = make(map[string]*anypb.Any)
for k, rawv := range raw {
var v interface{}
if json.Unmarshal(rawv, &v) != nil {
continue
}
if anyv, err := toAny(v); err == nil {
s.Session.Claims[k] = anyv
}
}
s.AddClaims(identity.NewClaimsFromRaw(raw).Flatten())
return nil
}