Skip to content

Do not rotate bootstrapped root credentials #1414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adutra merged 1 commit into from
Apr 21, 2025
Merged

Do not rotate bootstrapped root credentials #1414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 5 additions & 17 deletions ...rc/main/java/org/apache/polaris/core/persistence/LocalPolarisMetaStoreManagerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import org.apache.polaris.core.entity.PolarisEntityConstants;
import org.apache.polaris.core.entity.PolarisEntitySubType;
import org.apache.polaris.core.entity.PolarisEntityType;
import org.apache.polaris.core.entity.PolarisPrincipalSecrets;
import org.apache.polaris.core.persistence.bootstrap.RootCredentialsSet;
import org.apache.polaris.core.persistence.cache.EntityCache;
import org.apache.polaris.core.persistence.dao.entity.BaseResult;
Expand Down Expand Up @@ -237,22 +236,11 @@ private PrincipalSecretsResult bootstrapServiceAndCreatePolarisPrincipalForRealm
PolarisEntityType.PRINCIPAL,
PolarisEntitySubType.NULL_SUBTYPE,
PolarisEntityConstants.getRootPrincipalName());
PolarisPrincipalSecrets secrets =
metaStoreManager
.loadPrincipalSecrets(
polarisContext,
PolarisEntity.of(rootPrincipalLookup.getEntity())
.getInternalPropertiesAsMap()
.get(PolarisEntityConstants.getClientIdPropertyName()))
.getPrincipalSecrets();
PrincipalSecretsResult rotatedSecrets =
Copy link
Contributor

@eric-maynard eric-maynard Apr 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm a little surprised no tests need to change for this to pass!

metaStoreManager.rotatePrincipalSecrets(
polarisContext,
secrets.getPrincipalClientId(),
secrets.getPrincipalId(),
false,
secrets.getMainSecretHash());
return rotatedSecrets;
return metaStoreManager.loadPrincipalSecrets(
polarisContext,
PolarisEntity.of(rootPrincipalLookup.getEntity())
.getInternalPropertiesAsMap()
.get(PolarisEntityConstants.getClientIdPropertyName()));
}

/**
Expand Down
6 changes: 3 additions & 3 deletions ...n/java/org/apache/polaris/service/persistence/InMemoryPolarisMetaStoreManagerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public synchronized PolarisMetaStoreManager getOrCreateMetaStoreManager(
RealmContext realmContext) {
String realmId = realmContext.getRealmIdentifier();
if (!bootstrappedRealms.contains(realmId)) {
bootstrapRealmsAndPrintCredentials(List.of(realmId));
bootstrapRealmsFromEnvironment(List.of(realmId));
}
return super.getOrCreateMetaStoreManager(realmContext);
}
Expand All @@ -89,12 +89,12 @@ public synchronized Supplier<TransactionalPersistence> getOrCreateSessionSupplie
RealmContext realmContext) {
String realmId = realmContext.getRealmIdentifier();
if (!bootstrappedRealms.contains(realmId)) {
bootstrapRealmsAndPrintCredentials(List.of(realmId));
bootstrapRealmsFromEnvironment(List.of(realmId));
}
return super.getOrCreateSessionSupplier(realmContext);
}

private void bootstrapRealmsAndPrintCredentials(List<String> realms) {
private void bootstrapRealmsFromEnvironment(List<String> realms) {
Copy link
Contributor Author

@adutra adutra Apr 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just renamed this method to better reflect its new purpose (it changed recently).

RootCredentialsSet rootCredentialsSet = RootCredentialsSet.fromEnvironment();
this.bootstrapRealms(realms, rootCredentialsSet);
}
Expand Down