Skip to content

Introduce the Encrypted Repository behind a feature flag #65756

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
merged 10 commits into from
Dec 23, 2020
Merged

Introduce the Encrypted Repository behind a feature flag #65756

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
edc309d
Feature flag to register the new encrypted repository type
albertzaharovits Dec 2, 2020
e034d20
Reverse condition to have a friendlier diff
albertzaharovits Dec 2, 2020
5cd760b
Spotless and invert condition
albertzaharovits Dec 2, 2020
8047924
Merge branch 'repository-encrypted-client-side-reformated' into repos…
albertzaharovits Dec 17, 2020
0afcd96
Merge branch 'repository-encrypted-client-side-reformated' into repos…
albertzaharovits Dec 17, 2020
6c519d5
Merge branch 'repository-encrypted-client-side-reformated' into repos…
albertzaharovits Dec 21, 2020
f0d1158
tests after writeblobatomic interface
albertzaharovits Dec 21, 2020
70a3e6c
Spotless
albertzaharovits Dec 21, 2020
2b4ebdc
Gradle fix
albertzaharovits Dec 22, 2020
23d008a
Merge branch 'repository-encrypted-client-side-reformated' into repos…
albertzaharovits Dec 23, 2020
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
26 changes: 26 additions & 0 deletions ...ted/src/main/java/org/elasticsearch/repositories/encrypted/EncryptedRepositoryPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.message.ParameterizedMessage;
import org.elasticsearch.Build;
import org.elasticsearch.cluster.metadata.RepositoryMetadata;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.Strings;
Expand Down Expand Up @@ -37,6 +38,26 @@
import java.util.function.Supplier;

public class EncryptedRepositoryPlugin extends Plugin implements RepositoryPlugin {

private static final Boolean ENCRYPTED_REPOSITORY_FEATURE_FLAG_REGISTERED;
static {
final String property = System.getProperty("es.encrypted_repository_feature_flag_registered");
if (Build.CURRENT.isSnapshot() && property != null) {
throw new IllegalArgumentException("es.encrypted_repository_feature_flag_registered is only supported in non-snapshot builds");
}
if ("true".equals(property)) {
ENCRYPTED_REPOSITORY_FEATURE_FLAG_REGISTERED = true;
} else if ("false".equals(property)) {
ENCRYPTED_REPOSITORY_FEATURE_FLAG_REGISTERED = false;
} else if (property == null) {
ENCRYPTED_REPOSITORY_FEATURE_FLAG_REGISTERED = null;
} else {
throw new IllegalArgumentException(
"expected es.encrypted_repository_feature_flag_registered to be unset or [true|false] but was [" + property + "]"
);
}
}

static final Logger logger = LogManager.getLogger(EncryptedRepositoryPlugin.class);
static final String REPOSITORY_TYPE_NAME = "encrypted";
// TODO add at least hdfs, and investigate supporting all `BlobStoreRepository` implementations
Expand Down Expand Up @@ -76,6 +97,11 @@ public Map<String, Repository.Factory> getRepositories(
}
final Map<String, SecureString> repositoryPasswordsMap = Map.copyOf(repositoryPasswordsMapBuilder);

if (false == Build.CURRENT.isSnapshot()
&& (ENCRYPTED_REPOSITORY_FEATURE_FLAG_REGISTERED == null || ENCRYPTED_REPOSITORY_FEATURE_FLAG_REGISTERED == false)) {
return Map.of();
}

return Collections.singletonMap(REPOSITORY_TYPE_NAME, new Repository.Factory() {

@Override
Expand Down