From d8a3a5ee7feb8f91c3bec991eacc9a7c9bd2451b Mon Sep 17 00:00:00 2001 From: jannfis Date: Thu, 16 Apr 2020 19:24:40 +0200 Subject: [PATCH] Remove deprecated code and fix new project tests --- server/project/project_test.go | 6 +++--- util/session/sessionmanager.go | 13 ------------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/server/project/project_test.go b/server/project/project_test.go index 37d8b8cf9fab2..edabbe2410be0 100644 --- a/server/project/project_test.go +++ b/server/project/project_test.go @@ -330,7 +330,7 @@ func TestProjectServer(t *testing.T) { }) t.Run("TestCreateTokenWithIDSuccessfully", func(t *testing.T) { - sessionMgr := session.NewSessionManager(settingsMgr, "") + sessionMgr := session.NewSessionManager(settingsMgr, "", newSessionCache()) projectWithRole := existingProj.DeepCopy() projectWithRole.Spec.Roles = []v1alpha1.ProjectRole{{Name: tokenName}} projectServer := NewServer("default", fake.NewSimpleClientset(), apps.NewSimpleClientset(projectWithRole), enforcer, util.NewKeyLock(), sessionMgr) @@ -348,7 +348,7 @@ func TestProjectServer(t *testing.T) { }) t.Run("TestCreateTokenWithSameIdDeny", func(t *testing.T) { - sessionMgr := session.NewSessionManager(settingsMgr, "") + sessionMgr := session.NewSessionManager(settingsMgr, "", newSessionCache()) projectWithRole := existingProj.DeepCopy() projectWithRole.Spec.Roles = []v1alpha1.ProjectRole{{Name: tokenName}} projectServer := NewServer("default", fake.NewSimpleClientset(), apps.NewSimpleClientset(projectWithRole), enforcer, util.NewKeyLock(), sessionMgr) @@ -423,7 +423,7 @@ p, role:admin, projects, update, *, allow`) p, role:admin, projects, update, *, allow`) t.Run("TestDeleteTokenByIdSuccessfully", func(t *testing.T) { - sessionMgr := session.NewSessionManager(settingsMgr, "") + sessionMgr := session.NewSessionManager(settingsMgr, "", newSessionCache()) projWithToken := existingProj.DeepCopy() issuedAt := int64(1) secondIssuedAt := issuedAt + 1 diff --git a/util/session/sessionmanager.go b/util/session/sessionmanager.go index d71dc45b83e2a..c1ee9df9fba33 100644 --- a/util/session/sessionmanager.go +++ b/util/session/sessionmanager.go @@ -86,11 +86,6 @@ const ( envLoginMaxCacheSize = "ARGOCD_SESSION_MAX_CACHE_SIZE" ) -// Returns the cache key to use for a given user -func getSessionCacheKeyForUser(username string) string { - return fmt.Sprintf("%s|%s", loginAttemptsCacheKey, username) -} - // Helper function to parse a number from an environment variable. Returns a // default if env is not set, is not parseable to a number, exceeds max (if // max is greater than 0) or is less than min. @@ -330,18 +325,10 @@ func (mgr *SessionManager) updateFailureCount(username string, failed bool) { if failed { attempt.FailCount += 1 attempt.LastFailed = time.Now() - err := mgr.cache.SetItem(getSessionCacheKeyForUser(username), attempt, 0, false) - if err != nil { - log.Errorf("Could not update session cache: %s", err.Error()) - } failures[username] = attempt log.Warnf("User %s failed login %d time(s)", username, attempt.FailCount) } else { if attempt.FailCount > 0 { - err := mgr.cache.SetItem(getSessionCacheKeyForUser(username), attempt, 0, true) - if err != nil { - log.Errorf("Could not update session cache: %s", err.Error()) - } // Forget username for cache size enforcement, since entry in cache was deleted delete(failures, username) }