Compare commits

..

No commits in common. "3370bf70aec03c3ef2c0d95786757acd3c1054fc" and "7d0870dda5c0990765a30dc4596c2d3e316c8c19" have entirely different histories.

2 changed files with 1 additions and 34 deletions

View File

@ -103,9 +103,8 @@ func (s *Store) HasAccessControl(projectID string) bool {
if len(s.members[projectID]) > 0 {
return true
}
now := time.Now().UTC()
for _, token := range s.tokens {
if token.ProjectID == projectID && token.RevokedAt == nil && (token.ExpiresAt == nil || now.Before(*token.ExpiresAt)) {
if token.ProjectID == projectID {
return true
}
}

View File

@ -102,35 +102,3 @@ func TestStoreKeepsLastProjectAdmin(t *testing.T) {
t.Fatal("demoting the last project admin should fail")
}
}
func TestStoreIgnoresExpiredAndRevokedTokensForAccessControl(t *testing.T) {
store, err := New(filepath.Join(t.TempDir(), "access.json"))
if err != nil {
t.Fatal(err)
}
expired := time.Now().UTC().Add(-time.Minute)
_, _, err = store.CreateToken("ssl", "过期令牌", RoleViewer, &expired)
if err != nil {
t.Fatal(err)
}
if store.HasAccessControl("ssl") {
t.Fatal("过期项目令牌不应启用项目权限控制")
}
_, secret, err := store.CreateToken("ssl", "待吊销令牌", RoleViewer, nil)
if err != nil {
t.Fatal(err)
}
tokens := store.ListTokens("ssl")
if len(tokens) != 2 {
t.Fatalf("项目令牌数量错误:%d", len(tokens))
}
if _, err := store.RevokeToken("ssl", tokens[1].ID); err != nil {
t.Fatal(err)
}
if store.HasAccessControl("ssl") {
t.Fatal("仅剩过期或吊销令牌时不应启用项目权限控制")
}
if _, ok := store.AuthenticateToken("ssl", secret); ok {
t.Fatal("已吊销项目令牌仍可认证")
}
}