check idp when getting a user

cs3org · Aug 4, 2020 · 1cf0384 · 1cf0384
1 parent c7e67b1
commit 1cf0384
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/changelog/unreleased/check-idp-demo-userprovider.md b/changelog/unreleased/check-idp-demo-userprovider.md
@@ -0,0 +1,5 @@
+Bugfix: Fix missing idp check in GetUser of demo userprovider
+
+We've added a check for matching idp in the GetUser function of the demo userprovider
+
+https://github.com/cs3org/reva/issues/1047
diff --git a/pkg/user/manager/demo/demo.go b/pkg/user/manager/demo/demo.go
@@ -46,7 +46,9 @@ func New(m map[string]interface{}) (user.Manager, error) {
 
 func (m *manager) GetUser(ctx context.Context, uid *userpb.UserId) (*userpb.User, error) {
 	if user, ok := m.catalog[uid.OpaqueId]; ok {
-		return user, nil
+		if uid.Idp == "" || user.Id.Idp == uid.Idp {
+			return user, nil
+		}
 	}
 	return nil, errtypes.NotFound(uid.OpaqueId)
 }