-
Notifications
You must be signed in to change notification settings - Fork 1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(docker): Add RBAC support to Docker accounts (#6187)
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
- Loading branch information
1 parent
7b2f4c8
commit 4d786f7
Showing
6 changed files
with
250 additions
and
4 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
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
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
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
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
211 changes: 211 additions & 0 deletions
211
...aker/clouddriver/docker/registry/controllers/DockerRegistryImageLookupControllerTest.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,211 @@ | ||
| /* | ||
| * Copyright 2024 Apple, Inc. | ||
| * | ||
| * 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.clouddriver.docker.registry.controllers; | ||
|
|
||
| import static org.mockito.ArgumentMatchers.eq; | ||
| import static org.mockito.BDDMockito.given; | ||
| import static org.mockito.Mockito.mock; | ||
| import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; | ||
|
|
||
| import com.netflix.spectator.api.NoopRegistry; | ||
| import com.netflix.spectator.api.Registry; | ||
| import com.netflix.spinnaker.cats.cache.CacheData; | ||
| import com.netflix.spinnaker.cats.cache.DefaultCacheData; | ||
| import com.netflix.spinnaker.cats.cache.WriteableCache; | ||
| import com.netflix.spinnaker.cats.mem.InMemoryCache; | ||
| import com.netflix.spinnaker.clouddriver.docker.registry.DockerRegistryCloudProvider; | ||
| import com.netflix.spinnaker.clouddriver.docker.registry.cache.Keys; | ||
| import com.netflix.spinnaker.clouddriver.docker.registry.controllers.DockerRegistryImageLookupControllerTest.TestConfig; | ||
| import com.netflix.spinnaker.clouddriver.docker.registry.security.DockerRegistryNamedAccountCredentials; | ||
| import com.netflix.spinnaker.clouddriver.security.AccountCredentialsProvider; | ||
| import com.netflix.spinnaker.clouddriver.security.AccountCredentialsRepository; | ||
| import com.netflix.spinnaker.clouddriver.security.DefaultAccountCredentialsProvider; | ||
| import com.netflix.spinnaker.clouddriver.security.MapBackedAccountCredentialsRepository; | ||
| import com.netflix.spinnaker.fiat.model.Authorization; | ||
| import com.netflix.spinnaker.fiat.model.UserPermission; | ||
| import com.netflix.spinnaker.fiat.model.resources.Account; | ||
| import com.netflix.spinnaker.fiat.model.resources.Permissions; | ||
| import com.netflix.spinnaker.fiat.model.resources.Role; | ||
| import com.netflix.spinnaker.fiat.shared.EnableFiatAutoConfig; | ||
| import com.netflix.spinnaker.fiat.shared.FiatService; | ||
| import com.netflix.spinnaker.fiat.shared.FiatStatus; | ||
| import com.netflix.spinnaker.kork.dynamicconfig.DynamicConfigService; | ||
| import com.netflix.spinnaker.kork.dynamicconfig.SpringDynamicConfigService; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import org.junit.jupiter.api.BeforeEach; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.boot.test.autoconfigure.json.AutoConfigureJson; | ||
| import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; | ||
| import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureWebMvc; | ||
| import org.springframework.boot.test.context.SpringBootTest; | ||
| import org.springframework.boot.test.mock.mockito.MockBean; | ||
| import org.springframework.context.annotation.Bean; | ||
| import org.springframework.context.annotation.Import; | ||
| import org.springframework.security.test.context.support.WithMockUser; | ||
| import org.springframework.test.web.servlet.MockMvc; | ||
|
|
||
| @SpringBootTest(classes = TestConfig.class, properties = "services.fiat.cache.max-entries=0") | ||
| @AutoConfigureMockMvc | ||
| @AutoConfigureWebMvc | ||
| @AutoConfigureJson | ||
| @EnableFiatAutoConfig | ||
| @WithMockUser | ||
| class DockerRegistryImageLookupControllerTest { | ||
| @Import(DockerRegistryImageLookupController.class) | ||
| static class TestConfig { | ||
| @Bean | ||
| WriteableCache cache() { | ||
| return new InMemoryCache(); | ||
| } | ||
|
|
||
| @Bean | ||
| AccountCredentialsRepository accountCredentialsRepository() { | ||
| return new MapBackedAccountCredentialsRepository(); | ||
| } | ||
|
|
||
| @Bean | ||
| AccountCredentialsProvider accountCredentialsProvider( | ||
| AccountCredentialsRepository accountCredentialsRepository) { | ||
| return new DefaultAccountCredentialsProvider(accountCredentialsRepository); | ||
| } | ||
|
|
||
| @Bean | ||
| Registry registry() { | ||
| return new NoopRegistry(); | ||
| } | ||
|
|
||
| @Bean | ||
| DynamicConfigService dynamicConfigService() { | ||
| return new SpringDynamicConfigService(); | ||
| } | ||
| } | ||
|
|
||
| @Autowired MockMvc mockMvc; | ||
| @Autowired WriteableCache cache; | ||
| @Autowired AccountCredentialsRepository accountCredentialsRepository; | ||
| @MockBean FiatStatus fiatStatus; | ||
| @MockBean FiatService fiatService; | ||
|
|
||
| @BeforeEach | ||
| void setUp() { | ||
| given(fiatStatus.isEnabled()).willReturn(true); | ||
| } | ||
|
|
||
| @Test | ||
| void authorizedToReadTags() throws Exception { | ||
| var permissions = createAuthorizedUserPermission(); | ||
| given(fiatService.getUserPermission(eq("user"))).willReturn(permissions); | ||
|
|
||
| mockMvc | ||
| .perform( | ||
| get("/dockerRegistry/images/tags") | ||
| .queryParam("account", "test-account") | ||
| .queryParam("repository", "test-repository")) | ||
| .andExpect(status().isOk()); | ||
| } | ||
|
|
||
| @Test | ||
| void notAuthorizedToReadTags() throws Exception { | ||
| var permissions = createUnauthorizedUserPermission(); | ||
| given(fiatService.getUserPermission("user")).willReturn(permissions); | ||
|
|
||
| mockMvc | ||
| .perform( | ||
| get("/dockerRegistry/images/tags") | ||
| .queryParam("account", "test-account") | ||
| .queryParam("repository", "test-repository")) | ||
| .andExpect(status().isForbidden()); | ||
| } | ||
|
|
||
| @Test | ||
| void canSearchForAuthorizedItems() throws Exception { | ||
| var permissions = createAuthorizedUserPermission(); | ||
| given(fiatService.getUserPermission("user")).willReturn(permissions); | ||
| cache.merge(Keys.Namespace.TAGGED_IMAGE.getNs(), createTestAccountTaggedImageCacheData()); | ||
| var credentials = createTestAccountCredentials(); | ||
| accountCredentialsRepository.save(credentials.getName(), credentials); | ||
|
|
||
| mockMvc | ||
| .perform(get("/dockerRegistry/images/find")) | ||
| .andExpect(jsonPath("$[0].account").value("test-account")); | ||
| } | ||
|
|
||
| @Test | ||
| void filtersOutUnauthorizedItems() throws Exception { | ||
| var permissions = createUnauthorizedUserPermission(); | ||
| given(fiatService.getUserPermission("user")).willReturn(permissions); | ||
| cache.merge(Keys.Namespace.TAGGED_IMAGE.getNs(), createTestAccountTaggedImageCacheData()); | ||
| var credentials = createTestAccountCredentials(); | ||
| accountCredentialsRepository.save(credentials.getName(), credentials); | ||
|
|
||
| mockMvc | ||
| .perform(get("/dockerRegistry/images/find")) | ||
| .andExpectAll(status().isOk(), jsonPath("$.length()").value(0)); | ||
| } | ||
|
|
||
| private static UserPermission.View createAuthorizedUserPermission() { | ||
| return new UserPermission() | ||
| .setId("user") | ||
| .addResources( | ||
| List.of( | ||
| new Account() | ||
| .setName("test-account") | ||
| .setPermissions( | ||
| new Permissions.Builder().add(Authorization.READ, "user").build()), | ||
| new Role("user"))) | ||
| .getView(); | ||
| } | ||
|
|
||
| private static UserPermission.View createUnauthorizedUserPermission() { | ||
| return new UserPermission().setId("user").addResources(List.of(new Role("user"))).getView(); | ||
| } | ||
|
|
||
| private static CacheData createTestAccountTaggedImageCacheData() { | ||
| String imageKey = Keys.getTaggedImageKey("test-account", "test-repository", "1.0"); | ||
| return new DefaultCacheData( | ||
| imageKey, | ||
| Map.of( | ||
| "account", | ||
| "test-account", | ||
| "digest", | ||
| "test-digest", | ||
| "labels", | ||
| Map.of( | ||
| "commitId", | ||
| "test-commit", | ||
| "buildNumber", | ||
| "1", | ||
| "branch", | ||
| "test-branch", | ||
| "jobName", | ||
| "test-job")), | ||
| Map.of()); | ||
| } | ||
|
|
||
| private static DockerRegistryNamedAccountCredentials createTestAccountCredentials() { | ||
| var credentials = mock(DockerRegistryNamedAccountCredentials.class); | ||
| given(credentials.getName()).willReturn("test-account"); | ||
| given(credentials.getCloudProvider()) | ||
| .willReturn(DockerRegistryCloudProvider.getDOCKER_REGISTRY()); | ||
| given(credentials.getRegistry()).willReturn("test-registry"); | ||
| return credentials; | ||
| } | ||
| } |