-
Notifications
You must be signed in to change notification settings - Fork 136
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
24 changed files
with
315 additions
and
28 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
73 changes: 73 additions & 0 deletions
73
...secrets/api/src/main/java/org/projectnessie/catalog/secrets/ResolvingSecretsProvider.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,73 @@ | ||
| /* | ||
| * Copyright (C) 2024 Dremio | ||
| * | ||
| * 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 org.projectnessie.catalog.secrets; | ||
|
|
||
| import static com.google.common.base.Preconditions.checkArgument; | ||
|
|
||
| import jakarta.annotation.Nonnull; | ||
| import java.net.URI; | ||
| import java.util.Map; | ||
| import java.util.Optional; | ||
| import org.projectnessie.nessie.immutables.NessieImmutable; | ||
|
|
||
| @NessieImmutable | ||
| public abstract class ResolvingSecretsProvider implements SecretsProvider { | ||
| abstract Map<String, SecretsProvider> secretsProviders(); | ||
|
|
||
| @Override | ||
| public <S extends Secret> Optional<S> getSecret( | ||
| @Nonnull URI name, @Nonnull SecretType secretType, @Nonnull Class<S> secretJavaType) { | ||
| String scheme = name.getScheme(); | ||
| String next = name.getSchemeSpecificPart(); | ||
| checkArgument( | ||
| "urn".equals(scheme) && next != null, | ||
| "Invalid secret URI, must be in the form 'urn:nessie-secret:<provider>:<secret-name>'"); | ||
|
|
||
| int iNessieSecret = next.indexOf(':'); | ||
| checkArgument( | ||
| iNessieSecret > 0 && iNessieSecret != next.length() - 1, | ||
| "Invalid secret URI, must be in the form 'urn:nessie-secret:<provider>:<secret-name>'"); | ||
| scheme = next.substring(0, iNessieSecret); | ||
| checkArgument( | ||
| "nessie-secret".equals(scheme), | ||
| "Invalid secret URI, must be in the form 'urn:nessie-secret:<provider>:<secret-name>'"); | ||
|
|
||
| int iProvider = next.indexOf(':', iNessieSecret + 1); | ||
| checkArgument( | ||
| iProvider > 0 && iProvider != next.length() - 1, | ||
| "Invalid secret URI, must be in the form 'urn:nessie-secret:<provider>:<secret-name>'"); | ||
| String provider = next.substring(iNessieSecret + 1, iProvider); | ||
| checkArgument( | ||
| !provider.isBlank(), | ||
| "Invalid secret URI, must be in the form 'urn:nessie-secret:<provider>:<secret-name>'"); | ||
|
|
||
| next = next.substring(iProvider + 1); | ||
| checkArgument( | ||
| !next.isBlank() && next.charAt(0) != ':', | ||
| "Invalid secret URI, must be in the form 'urn:nessie-secret:<provider>:<secret-name>'"); | ||
| name = URI.create(next); | ||
|
|
||
| SecretsProvider secretsProvider = secretsProviders().get(provider); | ||
| if (secretsProvider == null) { | ||
| return Optional.empty(); | ||
| } | ||
| return secretsProvider.getSecret(name, secretType, secretJavaType); | ||
| } | ||
|
|
||
| public static ImmutableResolvingSecretsProvider.Builder builder() { | ||
| return ImmutableResolvingSecretsProvider.builder(); | ||
| } | ||
| } |
99 changes: 99 additions & 0 deletions
99
...ets/api/src/test/java/org/projectnessie/catalog/secrets/TestResolvingSecretsProvider.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,99 @@ | ||
| /* | ||
| * Copyright (C) 2024 Dremio | ||
| * | ||
| * 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 org.projectnessie.catalog.secrets; | ||
|
|
||
| import static org.projectnessie.catalog.secrets.SecretType.BASIC; | ||
| import static org.projectnessie.catalog.secrets.SecretType.KEY; | ||
| import static org.projectnessie.catalog.secrets.UnsafePlainTextSecretsProvider.unsafePlainTextSecretsProvider; | ||
|
|
||
| import java.net.URI; | ||
| import java.util.Map; | ||
| import org.assertj.core.api.SoftAssertions; | ||
| import org.assertj.core.api.junit.jupiter.InjectSoftAssertions; | ||
| import org.assertj.core.api.junit.jupiter.SoftAssertionsExtension; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.junit.jupiter.api.extension.ExtendWith; | ||
| import org.junit.jupiter.params.ParameterizedTest; | ||
| import org.junit.jupiter.params.provider.CsvSource; | ||
|
|
||
| @ExtendWith(SoftAssertionsExtension.class) | ||
| public class TestResolvingSecretsProvider { | ||
| @InjectSoftAssertions protected SoftAssertions soft; | ||
|
|
||
| @Test | ||
| public void multipleProviders() { | ||
| SecretsProvider secretsProvider = | ||
| ResolvingSecretsProvider.builder() | ||
| .putSecretsProvider( | ||
| "one", | ||
| unsafePlainTextSecretsProvider( | ||
| Map.of( | ||
| URI.create("basic"), Map.of("name", "the-name", "secret", "the-secret")))) | ||
| .putSecretsProvider( | ||
| "two", | ||
| unsafePlainTextSecretsProvider( | ||
| Map.of(URI.create("key"), Map.of("key", "key-value")))) | ||
| .build(); | ||
|
|
||
| soft.assertThat( | ||
| secretsProvider.getSecret( | ||
| URI.create("urn:nessie-secret:one:basic"), BASIC, BasicCredentials.class)) | ||
| .get() | ||
| .isInstanceOf(BasicCredentials.class) | ||
| .extracting(BasicCredentials::name, BasicCredentials::secret) | ||
| .containsExactly("the-name", "the-secret"); | ||
| soft.assertThat( | ||
| secretsProvider.getSecret( | ||
| URI.create("urn:nessie-secret:two:key"), KEY, KeySecret.class)) | ||
| .get() | ||
| .isInstanceOf(KeySecret.class) | ||
| .extracting(KeySecret::key) | ||
| .isEqualTo("key-value"); | ||
| soft.assertThat( | ||
| secretsProvider.getSecret( | ||
| URI.create("urn:nessie-secret:no-provider:key"), KEY, KeySecret.class)) | ||
| .isEmpty(); | ||
| } | ||
|
|
||
| @ParameterizedTest | ||
| @CsvSource({ | ||
| "foo", | ||
| "foo:nessie-secret:provider:key", | ||
| "urn", | ||
| // "urn:", <-- illegal URI | ||
| "urn::", | ||
| "urn:::", | ||
| "urn:secret::", | ||
| "urn:secret:provider:key", | ||
| "urn:secret:provider:key", | ||
| "urn:nessie-secret", | ||
| "urn::nessie-secret", | ||
| "urn:nessie-secret:", | ||
| "urn:nessie-secret:provider", | ||
| "urn:nessie-secret::provider", | ||
| "urn::nessie-secret::provider", | ||
| "urn:nessie-secret:provider:", | ||
| "urn:nessie-secret:provider::key", | ||
| }) | ||
| public void illegal(String name) { | ||
| SecretsProvider secretsProvider = ResolvingSecretsProvider.builder().build(); | ||
| soft.assertThatIllegalArgumentException() | ||
| .isThrownBy( | ||
| () -> secretsProvider.getSecret(URI.create(name), BASIC, BasicCredentials.class)) | ||
| .withMessage( | ||
| "Invalid secret URI, must be in the form 'urn:nessie-secret:<provider>:<secret-name>'"); | ||
| } | ||
| } |
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 (C) 2024 Dremio | ||
| * | ||
| * 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. | ||
| */ | ||
|
|
||
| plugins { id("nessie-conventions-server") } | ||
|
|
||
| extra["maven.name"] = "Nessie - Catalog - Secrets Cache" | ||
|
|
||
| dependencies { | ||
| implementation(project(":nessie-catalog-secrets-api")) | ||
| implementation(libs.guava) | ||
| implementation(libs.smallrye.config.core) | ||
|
|
||
| implementation(platform(libs.jackson.bom)) | ||
| implementation("com.fasterxml.jackson.core:jackson-databind") | ||
| implementation("com.fasterxml.jackson.core:jackson-annotations") | ||
|
|
||
| compileOnly(project(":nessie-immutables")) | ||
| annotationProcessor(project(":nessie-immutables", configuration = "processor")) | ||
| // javax/jakarta | ||
| compileOnly(libs.jakarta.ws.rs.api) | ||
| compileOnly(libs.jakarta.enterprise.cdi.api) | ||
| compileOnly(libs.jakarta.validation.api) | ||
|
|
||
| compileOnly(libs.errorprone.annotations) | ||
| compileOnly(libs.microprofile.openapi) | ||
|
|
||
| testFixturesApi(platform(libs.junit.bom)) | ||
| testFixturesApi(libs.bundles.junit.testing) | ||
| testCompileOnly(libs.jakarta.annotation.api) | ||
| } |
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
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
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
Oops, something went wrong.