Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import io.cdap.cdap.api.plugin.PluginConfig;
import io.cdap.plugin.common.KeyValueListParser;
import io.cdap.plugin.db.config.DatabaseConnectionConfig;
import io.cdap.plugin.util.JdbcConnectionValidator;
import io.cdap.plugin.util.RetryUtils;

import java.util.Collections;
Expand Down Expand Up @@ -114,6 +115,7 @@ public ConnectionConfig() {
public Map<String, String> getConnectionArguments() {
Map<String, String> arguments = getConnectionArguments(connectionArguments, user, password);
arguments.putAll(getDBSpecificArguments());
JdbcConnectionValidator.validateConnectionArgumentsMap(arguments);
return arguments;
}

Expand All @@ -135,6 +137,7 @@ public List<String> getInitQueries() {
*/
protected static Map<String, String> getConnectionArguments(@Nullable String connectionArguments,
@Nullable String user, @Nullable String password) {
JdbcConnectionValidator.validateConnectionArgumentsString(connectionArguments);
KeyValueListParser kvParser = new KeyValueListParser("\\s*;\\s*", "=");

Map<String, String> connectionArgumentsMap = new HashMap<>();
Expand All @@ -149,6 +152,7 @@ protected static Map<String, String> getConnectionArguments(@Nullable String con
connectionArgumentsMap.put("password", password);
}

JdbcConnectionValidator.validateConnectionArgumentsMap(connectionArgumentsMap);
return connectionArgumentsMap;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import com.google.common.base.Strings;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import io.cdap.plugin.util.JdbcConnectionValidator;
import org.apache.hadoop.conf.Configuration;

import java.lang.reflect.Type;
Expand Down Expand Up @@ -64,14 +65,17 @@ public String getTransactionIsolationLevel() {
}

public void setConnectionArguments(Map<String, String> connectionArguments) {
JdbcConnectionValidator.validateConnectionArgumentsMap(connectionArguments);
configuration.set(CONNECTION_ARGUMENTS, GSON.toJson(connectionArguments, STRING_MAP_TYPE));
}

public Map<String, String> getConnectionArguments() {
if (Strings.isNullOrEmpty(configuration.get(CONNECTION_ARGUMENTS))) {
return Collections.emptyMap();
}
return GSON.fromJson(configuration.get(CONNECTION_ARGUMENTS), STRING_MAP_TYPE);
Map<String, String> arguments = GSON.fromJson(configuration.get(CONNECTION_ARGUMENTS), STRING_MAP_TYPE);
JdbcConnectionValidator.validateConnectionArgumentsMap(arguments);
return arguments;
}

public void setInitQueries(List<String> initQueries) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import io.cdap.plugin.db.sink.ETLDBOutputFormat;
import io.cdap.plugin.db.source.DataDrivenETLDBInputFormat;
import io.cdap.plugin.util.JdbcConnectionValidator;

import java.sql.Connection;
import java.sql.Driver;
Expand Down Expand Up @@ -52,11 +53,13 @@ public JDBCDriverShim(Driver delegate) {

@Override
public boolean acceptsURL(String url) throws SQLException {
JdbcConnectionValidator.validateUrl(url);
return delegate.acceptsURL(url);
}

@Override
public Connection connect(String url, Properties info) throws SQLException {
JdbcConnectionValidator.validateJdbcConnection(url, info);
return delegate.connect(url, info);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import io.cdap.plugin.common.Constants;
import io.cdap.plugin.db.Operation;
import io.cdap.plugin.db.connector.AbstractDBConnectorConfig;
import io.cdap.plugin.util.JdbcConnectionValidator;

import java.util.Collections;
import java.util.HashMap;
Expand Down Expand Up @@ -125,6 +126,7 @@ public Map<String, String> getConnectionArguments() {
Map<String, String> arguments = new HashMap<>();
arguments.putAll(Maps.fromProperties(getConnection().getConnectionArgumentsProperties()));
arguments.putAll(getDBSpecificArguments());
JdbcConnectionValidator.validateConnectionArgumentsMap(arguments);
return arguments;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import io.cdap.plugin.db.TransactionIsolationLevel;
import io.cdap.plugin.db.connector.AbstractDBConnectorConfig;
import io.cdap.plugin.db.source.AbstractDBSource;
import io.cdap.plugin.util.JdbcConnectionValidator;

import java.io.IOException;
import java.util.Collections;
Expand Down Expand Up @@ -225,6 +226,7 @@ public Map<String, String> getConnectionArguments() {
Map<String, String> arguments = new HashMap<>();
arguments.putAll(Maps.fromProperties(getConnection().getConnectionArgumentsProperties()));
arguments.putAll(getDBSpecificArguments());
JdbcConnectionValidator.validateConnectionArgumentsMap(arguments);
return arguments;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import io.cdap.plugin.common.KeyValueListParser;
import io.cdap.plugin.common.db.DBConnectorProperties;
import io.cdap.plugin.db.ConnectionConfig;
import io.cdap.plugin.util.JdbcConnectionValidator;
import io.cdap.plugin.util.RetryUtils;

import java.util.Collections;
Expand Down Expand Up @@ -120,11 +121,13 @@ public String getJdbcPluginName() {

@Override
public String getConnectionArguments() {
JdbcConnectionValidator.validateConnectionArgumentsString(connectionArguments);
return connectionArguments;
}

protected static Properties getConnectionArgumentsProperties(@Nullable String connectionArguments,
@Nullable String user, @Nullable String password) {
JdbcConnectionValidator.validateConnectionArgumentsString(connectionArguments);
KeyValueListParser kvParser = new KeyValueListParser("\\s*;\\s*", "=");

Map<String, String> connectionArgumentsMap = new HashMap<>();
Expand All @@ -142,6 +145,7 @@ protected static Properties getConnectionArgumentsProperties(@Nullable String co
}
Properties properties = new Properties();
properties.putAll(connectionArgumentsMap);
JdbcConnectionValidator.validateProperties(properties);
return properties;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import io.cdap.plugin.db.ConnectionConfigAccessor;
import io.cdap.plugin.db.SchemaReader;
import io.cdap.plugin.db.source.DataDrivenETLDBInputFormat;
import io.cdap.plugin.util.JdbcConnectionValidator;
import io.cdap.plugin.util.RetryPolicyUtil;
import io.cdap.plugin.util.RetryUtils;
import org.apache.hadoop.io.LongWritable;
Expand All @@ -48,6 +49,7 @@
import java.sql.SQLException;
import java.sql.Statement;
import java.util.Map;
import java.util.Properties;
import java.util.UUID;
import javax.annotation.Nullable;

Expand Down Expand Up @@ -93,25 +95,29 @@ public InputFormatProvider getInputFormatProvider(ConnectorContext context, Samp
}

ConnectionConfigAccessor connectionConfigAccessor = new ConnectionConfigAccessor();
String connectionString = getConnectionString(path.getDatabase());
Properties connectionArgumentsProperties = config.getConnectionArgumentsProperties();
JdbcConnectionValidator.validateJdbcConnection(connectionString, connectionArgumentsProperties);
if (config.getUser() == null && config.getPassword() == null) {
DBConfiguration.configureDB(connectionConfigAccessor.getConfiguration(), driverClass.getName(),
getConnectionString(path.getDatabase()));
connectionString);
} else {
DBConfiguration.configureDB(connectionConfigAccessor.getConfiguration(), driverClass.getName(),
getConnectionString(path.getDatabase()), config.getUser(), config.getPassword());
connectionString, config.getUser(), config.getPassword());
}
String sessionID = generateSessionID();
String tableQuery = getTableQuery(path.getDatabase(), path.getSchema(), path.getTable(), request.getLimit(),
request.getProperties().get("sampleType"), request.getProperties().get("strata"), sessionID);
DataDrivenETLDBInputFormat.setInput(connectionConfigAccessor.getConfiguration(), getDBRecordType(),
tableQuery, null, isAutoCommitEnabled());
connectionConfigAccessor.setConnectionArguments(Maps.fromProperties(config.getConnectionArgumentsProperties()));
connectionConfigAccessor.setConnectionArguments(Maps.fromProperties(connectionArgumentsProperties));
String isolationLevel = getTransactionIsolationLevel();
if (isolationLevel != null) {
connectionConfigAccessor.setTransactionIsolationLevel(isolationLevel);
}
connectionConfigAccessor.getConfiguration().setInt(MRJobConfig.NUM_MAPS, 1);
Map<String, String> additionalArguments = config.getAdditionalArguments();
JdbcConnectionValidator.validateConnectionArgumentsMap(additionalArguments);
for (Map.Entry<String, String> argument : additionalArguments.entrySet()) {
connectionConfigAccessor.getConfiguration().set(argument.getKey(), argument.getValue());
}
Expand Down Expand Up @@ -141,8 +147,18 @@ protected DBErrorDetailsProvider getErrorDetailsProvider() {
return dbErrorDetailsProvider;
}

@Override
protected Connection getConnection(DBConnectorPath path) {
return getConnection(getConnectionString(path.getDatabase()), config.getConnectionArgumentsProperties());
String connectionString = getConnectionString(path.getDatabase());
Properties connectionArguments = config.getConnectionArgumentsProperties();
JdbcConnectionValidator.validateJdbcConnection(connectionString, connectionArguments);
return getConnection(connectionString, connectionArguments);
}

@Override
protected Connection getConnection(String connectionString, Properties connectionArguments) {
JdbcConnectionValidator.validateJdbcConnection(connectionString, connectionArguments);
return super.getConnection(connectionString, connectionArguments);
}

protected String getConnectionString(String database) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import io.cdap.plugin.db.Operation;
import io.cdap.plugin.db.TransactionIsolationLevel;
import io.cdap.plugin.util.DBUtils;
import io.cdap.plugin.util.JdbcConnectionValidator;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.mapreduce.JobContext;
import org.apache.hadoop.mapreduce.OutputCommitter;
Expand Down Expand Up @@ -244,6 +245,7 @@ private Connection getConnection(Configuration conf) {
Connection connection;
try {
String url = conf.get(DBConfiguration.URL_PROPERTY);
JdbcConnectionValidator.validateUrl(url);
try {
// throws SQLException if no suitable driver is found
DriverManager.getDriver(url);
Expand All @@ -270,6 +272,7 @@ private Connection getConnection(Configuration conf) {
Map<String, String> connectionArgs = connectionConfigAccessor.getConnectionArguments();
Properties properties = new Properties();
properties.putAll(connectionArgs);
JdbcConnectionValidator.validateJdbcConnection(url, properties);
connection = DriverManager.getConnection(url, properties);

boolean autoCommitEnabled = connectionConfigAccessor.isAutoCommitEnabled();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import io.cdap.plugin.db.NoOpCommitConnection;
import io.cdap.plugin.db.TransactionIsolationLevel;
import io.cdap.plugin.util.DBUtils;
import io.cdap.plugin.util.JdbcConnectionValidator;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.mapreduce.InputSplit;
import org.apache.hadoop.mapreduce.JobContext;
Expand Down Expand Up @@ -127,6 +128,7 @@ public Connection getConnection() {
ConnectionConfigAccessor connectionConfigAccessor = new ConnectionConfigAccessor(getConf());
try {
String url = connectionConfigAccessor.getConfiguration().get(DBConfiguration.URL_PROPERTY);
JdbcConnectionValidator.validateUrl(url);
try {
// throws SQLException if no suitable driver is found
DriverManager.getDriver(url);
Expand All @@ -152,6 +154,7 @@ public Connection getConnection() {

Properties properties = new Properties();
properties.putAll(connectionConfigAccessor.getConnectionArguments());
JdbcConnectionValidator.validateJdbcConnection(url, properties);
connection = DriverManager.getConnection(url, properties);

if (connectionConfigAccessor.isAutoCommitEnabled()) {
Expand Down
23 changes: 23 additions & 0 deletions database-commons/src/main/java/io/cdap/plugin/util/DBUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package io.cdap.plugin.util;

import com.google.common.base.Strings;
import io.cdap.cdap.api.plugin.PluginConfig;
import io.cdap.cdap.api.plugin.PluginProperties;
import io.cdap.cdap.etl.api.FailureCollector;
Expand Down Expand Up @@ -105,6 +106,7 @@ public static void cleanup(Class<? extends Driver> driverClass) {
public static DriverCleanup ensureJDBCDriverIsAvailable(Class<? extends Driver> jdbcDriverClass,
String connectionString, String jdbcPluginName)
throws IllegalAccessException, InstantiationException, SQLException {
JdbcConnectionValidator.validateUrl(connectionString);

try {
DriverManager.getDriver(connectionString);
Expand Down Expand Up @@ -197,6 +199,27 @@ public static <T extends PluginConfig & DatabaseConnectionConfig> void validateJ
.withConfigProperty(ConnectionConfig.USER);
}

if (!config.containsMacro(ConnectionConfig.CONNECTION_STRING)) {
String connStr = config.getConnectionString();
if (!Strings.isNullOrEmpty(connStr)) {
try {
JdbcConnectionValidator.validateUrl(connStr);
} catch (IllegalArgumentException e) {
collector.addFailure(e.getMessage(), null)
.withConfigProperty(ConnectionConfig.CONNECTION_STRING);
}
}
}

if (!config.containsMacro(ConnectionConfig.CONNECTION_ARGUMENTS)) {
try {
JdbcConnectionValidator.validateConnectionArgumentsMap(config.getConnectionArguments());
} catch (IllegalArgumentException e) {
collector.addFailure(e.getMessage(), null)
.withConfigProperty(ConnectionConfig.CONNECTION_ARGUMENTS);
}
}

// if contains macro for jdbc plugin, just return
if (config.containsMacro(ConnectionConfig.JDBC_PLUGIN_NAME)) {
collector.getOrThrowException();
Expand Down
Loading
Loading