Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 3 additions & 10 deletions pkg/operations/operations.go
Original file line number Diff line number Diff line change
Expand Up @@ -149,10 +149,8 @@ func getCurrentUserUIDFromSelfSubjectReview(token string, clientProvider ClientP
return "", err
}

if review.Status.UserInfo.UID == "" {
return "", fmt.Errorf("SelfSubjectReview returned empty UID")
}

// kube:admin / kubeadmin have no Kubernetes UID; empty string is a valid identifier
// when AUTHENTICATED_USER_ID is also empty (see config.AuthenticatedUserID).
return review.Status.UserInfo.UID, nil
}

Expand All @@ -166,10 +164,5 @@ func getCurrentUserUIDFromOpenShiftUserAPI(token string, clientProvider ClientPr
return "", err
}

uid := string(userInfo.GetUID())
if uid == "" {
return "", fmt.Errorf("OpenShift User API returned empty UID")
}

return uid, nil
return string(userInfo.GetUID()), nil
}
8 changes: 4 additions & 4 deletions pkg/operations/operations_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,20 +76,20 @@ func TestGetCurrentUserUID(t *testing.T) {
errRegexp: "failed to get current user information",
},
{
name: "Should return error when SelfSubjectReview returns empty UID",
name: "Should allow empty UID from SelfSubjectReview for kube:admin",
provider: testUserIDClientProvider{
userUID: "",
},
errRegexp: "SelfSubjectReview returned empty UID",
expectedUID: "",
},
{
name: "Should return error when OpenShift User API returns empty UID",
name: "Should allow empty UID from OpenShift User API for kube:admin",
provider: testUserIDClientProvider{
returnReviewError: apierrors.NewNotFound(schema.GroupResource{Group: "authentication.k8s.io", Resource: "selfsubjectreviews"}, "self"),
userAPIUID: "",
emptyUserAPIUID: true,
},
errRegexp: "OpenShift User API returned empty UID",
expectedUID: "",
},
}

Expand Down
Loading