Skip to content

UNOMI-583 : add credential support to ES migration data #466

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
dgriffon merged 1 commit into from
Jul 30, 2022
Merged

UNOMI-583 : add credential support to ES migration data #466

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
2 changes: 1 addition & 1 deletion itests/src/test/java/org/apache/unomi/itests/migration/Migrate16xTo200IT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public class Migrate16xTo200IT extends BaseIT {
public void waitForStartup() throws InterruptedException {

// Restore snapshot from 1.6.x
try (CloseableHttpClient httpClient = HttpUtils.initHttpClient(true)) {
try (CloseableHttpClient httpClient = HttpUtils.initHttpClient(true, null)) {
// Create snapshot repo
HttpUtils.executePutRequest(httpClient, "http://localhost:9400/_snapshot/snapshots_repository/", resourceAsString("migration/create_snapshots_repository.json"), null);
// Get snapshot, insure it exists
Expand Down
1 change: 1 addition & 0 deletions itests/src/test/resources/migration/org.apache.unomi.migration.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,6 @@
# Migration config used for silent migration

esAddress = http://localhost:9400
esLogin =
httpClient.trustAllCertificates = true
indexPrefix = context
4 changes: 4 additions & 0 deletions tools/shell-commands/src/main/java/org/apache/unomi/shell/migration/MigrationConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@
public class MigrationConfig {

public static final String CONFIG_ES_ADDRESS = "esAddress";
public static final String CONFIG_ES_LOGIN = "esLogin";
public static final String CONFIG_ES_PASSWORD = "esPassword";
public static final String CONFIG_TRUST_ALL_CERTIFICATES = "httpClient.trustAllCertificates";
public static final String INDEX_PREFIX = "indexPrefix";
public static final String NUMBER_OF_SHARDS = "number_of_shards";
Expand All @@ -49,6 +51,8 @@ public class MigrationConfig {
static {
Map<String, MigrationConfigProperty> m = new HashMap<>();
m.put(CONFIG_ES_ADDRESS, new MigrationConfigProperty("Enter ElasticSearch TARGET address (default: http://localhost:9200): ", "http://localhost:9200"));
m.put(CONFIG_ES_LOGIN, new MigrationConfigProperty("Enter ElasticSearch TARGET login (default: none): ", ""));
m.put(CONFIG_ES_PASSWORD, new MigrationConfigProperty("Enter ElasticSearch TARGET password (default: none): ", ""));
m.put(CONFIG_TRUST_ALL_CERTIFICATES, new MigrationConfigProperty("We need to initialize a HttpClient, do we need to trust all certificates ?", null));
m.put(INDEX_PREFIX, new MigrationConfigProperty("Enter ElasticSearch Unomi indices prefix (default: context): ", "context"));
m.put(NUMBER_OF_SHARDS, new MigrationConfigProperty("Enter ElasticSearch index mapping configuration: number_of_shards (default: 3): ", "3"));
Expand Down
21 changes: 18 additions & 3 deletions tools/shell-commands/src/main/java/org/apache/unomi/shell/migration/actions/Migrate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@
import groovy.lang.GroovyClassLoader;
import groovy.lang.GroovyShell;
import groovy.util.GroovyScriptEngine;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.auth.AuthScope;
import org.apache.http.auth.UsernamePasswordCredentials;
import org.apache.http.client.CredentialsProvider;
import org.apache.http.impl.client.BasicCredentialsProvider;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.karaf.shell.api.action.Action;
import org.apache.karaf.shell.api.action.Argument;
Expand All @@ -42,7 +47,7 @@
import java.util.stream.Collectors;
import java.util.stream.Stream;

import static org.apache.unomi.shell.migration.MigrationConfig.CONFIG_TRUST_ALL_CERTIFICATES;
import static org.apache.unomi.shell.migration.MigrationConfig.*;

@Command(scope = "unomi", name = "migrate", description = "This will Migrate your data in ES to be compliant with current version. " +
"It's possible to configure the migration using OSGI configuration file: org.apache.unomi.migration.cfg, if no configuration is provided then questions will be prompted during the migration process.")
Expand Down Expand Up @@ -97,8 +102,18 @@ public Object execute() throws Exception {

// reset migration config from previous stored users choices.
migrationConfig.reset();

try (CloseableHttpClient httpClient = HttpUtils.initHttpClient(migrationConfig.getBoolean(CONFIG_TRUST_ALL_CERTIFICATES, session))) {

// Handle credentials
CredentialsProvider credentialsProvider = null;
String login = migrationConfig.getString(CONFIG_ES_LOGIN, session);
if (StringUtils.isNotEmpty(login)) {
credentialsProvider = new BasicCredentialsProvider();
UsernamePasswordCredentials credentials
= new UsernamePasswordCredentials(login, migrationConfig.getString(CONFIG_ES_PASSWORD, session));
credentialsProvider.setCredentials(AuthScope.ANY, credentials);
}

try (CloseableHttpClient httpClient = HttpUtils.initHttpClient(migrationConfig.getBoolean(CONFIG_TRUST_ALL_CERTIFICATES, session), credentialsProvider)) {

// Compile scripts
scripts = parseScripts(scripts, session, httpClient, migrationConfig);
Expand Down
7 changes: 5 additions & 2 deletions tools/shell-commands/src/main/java/org/apache/unomi/shell/migration/utils/HttpUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package org.apache.unomi.shell.migration.utils;

import org.apache.http.HttpEntity;
import org.apache.http.client.CredentialsProvider;
import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.methods.*;
import org.apache.http.config.Registry;
Expand Down Expand Up @@ -52,11 +53,13 @@
public class HttpUtils {
private static final Logger logger = LoggerFactory.getLogger(HttpUtils.class);

public static CloseableHttpClient initHttpClient(boolean trustAllCertificates) throws IOException {
public static CloseableHttpClient initHttpClient(boolean trustAllCertificates, CredentialsProvider credentialsProvider) throws IOException {
long requestStartTime = System.currentTimeMillis();

HttpClientBuilder httpClientBuilder = HttpClients.custom().useSystemProperties();

if (credentialsProvider != null) {
httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
}
if (trustAllCertificates) {
try {
SSLContext sslContext = SSLContext.getInstance("SSL");
Expand Down
2 changes: 2 additions & 0 deletions tools/shell-commands/src/main/resources/org.apache.unomi.migration.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,7 @@
# Migration config used for silent migration

# esAddress = http://localhost:9200
# esLogin = elastic
# esPassword = password
# httpClient.trustAllCertificates = true
# indexPrefix = context