-
Notifications
You must be signed in to change notification settings - Fork 740
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(gate-web): Add delete session tokens from redis endpoint (#1827)
* Add delete session tokens from redis endpoint delete sessions cache code #publish-snapshot fix api tests #publish-snapshot fix sessino service spec test #publish-snapshot * Update gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/SessionService.groovy Co-authored-by: Matt Gogerly <6519811+mattgogerly@users.noreply.github.com> * java rewrite * spotless apply --------- Co-authored-by: Matt Gogerly <6519811+mattgogerly@users.noreply.github.com>
- Loading branch information
1 parent
1e706c0
commit cae9b39
Showing
4 changed files
with
141 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
43 changes: 43 additions & 0 deletions
43
gate-web/src/main/java/com/netflix/spinnaker/gate/services/SessionService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| /* | ||
| * Copyright 2024 Wise PLC | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.netflix.spinnaker.gate.services; | ||
|
|
||
| import java.util.Set; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.stereotype.Component; | ||
| import redis.clients.jedis.Jedis; | ||
| import redis.clients.jedis.JedisPool; | ||
|
|
||
| @Component | ||
| public class SessionService { | ||
|
|
||
| private final JedisPool jedisPool; | ||
|
|
||
| public SessionService(@Autowired JedisPool jedisPool) { | ||
| this.jedisPool = jedisPool; | ||
| } | ||
|
|
||
| public void deleteSpringSessions() { | ||
| try (Jedis jedis = jedisPool.getResource()) { | ||
| Set<String> keys = jedis.keys("spring:session*"); | ||
|
|
||
| if (!keys.isEmpty()) { | ||
| jedis.del(keys.toArray(new String[0])); | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
65 changes: 65 additions & 0 deletions
65
gate-web/src/test/java/com/netflix/spinnaker/gate/service/SessionServiceTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| /* | ||
| * Copyright 2024 Wise PLC | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.netflix.spinnaker.gate.service; | ||
|
|
||
| import com.netflix.spinnaker.gate.services.SessionService; | ||
| import com.netflix.spinnaker.kork.jedis.EmbeddedRedis; | ||
| import java.util.Set; | ||
| import org.junit.jupiter.api.AfterAll; | ||
| import org.junit.jupiter.api.Assertions; | ||
| import org.junit.jupiter.api.BeforeAll; | ||
| import org.junit.jupiter.api.Test; | ||
| import redis.clients.jedis.Jedis; | ||
|
|
||
| public class SessionServiceTest { | ||
|
|
||
| private static EmbeddedRedis embeddedRedis; | ||
|
|
||
| @BeforeAll | ||
| public static void setupSpec() { | ||
| embeddedRedis = EmbeddedRedis.embed(); | ||
| } | ||
|
|
||
| @AfterAll | ||
| public static void tearDown() { | ||
| if (embeddedRedis != null) { | ||
| embeddedRedis.destroy(); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void shouldDeleteSpringSessions() { | ||
| // Given | ||
| Jedis jedis = embeddedRedis.getJedis(); | ||
| jedis.set("spring:session:session1", "session1-data"); | ||
| jedis.set("spring:session:session2", "session2-data"); | ||
| jedis.set("other:key", "other-data"); | ||
|
|
||
| SessionService subject = new SessionService(embeddedRedis.getPool()); | ||
|
|
||
| // When | ||
| subject.deleteSpringSessions(); | ||
|
|
||
| // Then | ||
| Set<String> springSessionKeys = jedis.keys("spring:session*"); | ||
| Set<String> otherKeys = jedis.keys("other:key"); | ||
|
|
||
| Assertions.assertTrue( | ||
| springSessionKeys.isEmpty(), "Spring session keys should have been deleted"); | ||
| Assertions.assertEquals(1, otherKeys.size(), "Other keys should remain"); | ||
| } | ||
| } |