yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-08-31 12:39:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor: Enable Azure DatabaseTokenProvider if there is azure=true in DB_QUERYPARAMS (#18451)

Browse Source
This commit is contained in:
Sriharsha Chintalapani 2024-10-29 02:01:57 -07:00 committed by GitHub
parent e197c3f3d0
commit 96c3364de7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 86 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openmetadata-service/src/main/java/org/openmetadata/csv/CsvUtil.java
View File

@ -134,13 +134,15 @@ public final class CsvUtil {
preprocessedField = preprocessedField.replace("\n", "\\n").replace("\"", "\\\"");
CSVFormat format =
CSVFormat.DEFAULT.builder()
CSVFormat.DEFAULT
.builder()
.setDelimiter(';')
.setQuote('"')
.setRecordSeparator(null)
.setIgnoreSurroundingSpaces(true)
.setIgnoreEmptyLines(true)
.setEscape('\\').build(); // Use backslash for escaping special characters
.setEscape('\\')
.build(); // Use backslash for escaping special characters
try (CSVParser parser = CSVParser.parse(new StringReader(preprocessedField), format)) {
return parser.getRecords().stream()
@ -180,7 +182,7 @@ public final class CsvUtil {
preprocessedField = preprocessedField.replace("\n", "\\n").replace("\"", "\\\"");
CSVFormat format =
CSVFormat.DEFAULT.builder().setDelimiter(',').setQuote('"').setEscape('\\').build();
CSVFormat.DEFAULT.builder().setDelimiter(',').setQuote('"').setEscape('\\').build();
List<String> columns;
try (CSVParser parser = CSVParser.parse(new StringReader(preprocessedField), format)) {

34
openmetadata-service/src/main/java/org/openmetadata/service/util/jdbi/DatabaseAuthenticationProviderFactory.java
View File

@ -1,5 +1,9 @@
package org.openmetadata.service.util.jdbi;
import java.net.URI;
import java.net.URLDecoder;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Optional;
/** Factory class for {@link DatabaseAuthenticationProvider}. */
@ -14,15 +18,35 @@ public class DatabaseAuthenticationProviderFactory {
* @return instance of {@link DatabaseAuthenticationProvider}.
*/
public static Optional<DatabaseAuthenticationProvider> get(String jdbcURL) {
// Check
if (jdbcURL.contains(AwsRdsDatabaseAuthenticationProvider.AWS_REGION)
Map<String, String> queryParams = parseQueryParams(jdbcURL);
if ("true".equals(queryParams.get("azure"))) {
return Optional.of(new AzureDatabaseAuthenticationProvider());
} else if (jdbcURL.contains(AwsRdsDatabaseAuthenticationProvider.AWS_REGION)
&& jdbcURL.contains(AwsRdsDatabaseAuthenticationProvider.ALLOW_PUBLIC_KEY_RETRIEVAL)) {
return Optional.of(new AwsRdsDatabaseAuthenticationProvider());
} else if (jdbcURL.contains(AzureDatabaseAuthenticationProvider.AZURE)) {
return Optional.of(new AzureDatabaseAuthenticationProvider());
}
// Return empty
return Optional.empty();
}
private static Map<String, String> parseQueryParams(String jdbcURL) {
try {
URI uri = new URI(jdbcURL.substring(jdbcURL.indexOf(":") + 1));
Map<String, String> queryPairs = new LinkedHashMap<>();
String query = uri.getQuery();
if (query != null) {
String[] pairs = query.split("&");
for (String pair : pairs) {
int idx = pair.indexOf("=");
queryPairs.put(
URLDecoder.decode(pair.substring(0, idx), "UTF-8"),
URLDecoder.decode(pair.substring(idx + 1), "UTF-8"));
}
}
return queryPairs;
} catch (Exception e) {
throw new IllegalArgumentException("Failed to parse query parameters from JDBC URL", e);
}
}
}

52
openmetadata-service/src/test/java/org/openmetadata/service/util/jdbi/DatabaseAuthenticationProviderFactoryTest.java Normal file
View File

@ -0,0 +1,52 @@
package org.openmetadata.service.util.jdbi;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.Optional;
import org.junit.jupiter.api.Test;
class DatabaseAuthenticationProviderFactoryTest {
@Test
void testGet_withAzureTrueInJdbcUrl_returnsAzureDatabaseAuthenticationProvider() {
String jdbcURL =
"jdbc:postgresql://your-database.postgres.database.azure.com:5432/testdb?azure=true&sslmode=require";
Optional<DatabaseAuthenticationProvider> provider =
DatabaseAuthenticationProviderFactory.get(jdbcURL);
assertTrue(provider.isPresent(), "Expected AzureDatabaseAuthenticationProvider to be present");
assertTrue(
provider.get() instanceof AzureDatabaseAuthenticationProvider,
"Expected instance of AzureDatabaseAuthenticationProvider");
}
@Test
void testGet_withoutAzureTrueInJdbcUrl_returnsEmptyOptional() {
String jdbcURL =
"jdbc:postgresql://your-database.postgres.database.azure.com:5432/testdb?sslmode=require";
Optional<DatabaseAuthenticationProvider> provider =
DatabaseAuthenticationProviderFactory.get(jdbcURL);
assertFalse(provider.isPresent(), "Expected no provider to be present");
}
@Test
void testGet_withAwsRdsParamsInJdbcUrl_returnsAwsRdsDatabaseAuthenticationProvider() {
String jdbcURL =
"jdbc:mysql://your-aws-db.rds.amazonaws.com:3306/testdb?awsRegion=us-west-2&allowPublicKeyRetrieval=true";
Optional<DatabaseAuthenticationProvider> provider =
DatabaseAuthenticationProviderFactory.get(jdbcURL);
assertTrue(provider.isPresent(), "Expected AwsRdsDatabaseAuthenticationProvider to be present");
assertTrue(
provider.get() instanceof AwsRdsDatabaseAuthenticationProvider,
"Expected instance of AwsRdsDatabaseAuthenticationProvider");
}
@Test
void testGet_withInvalidUrl_returnsEmptyOptional() {
String jdbcURL = "jdbc:invalidurl://your-db.test?someParam=true";
Optional<DatabaseAuthenticationProvider> provider =
DatabaseAuthenticationProviderFactory.get(jdbcURL);
assertFalse(provider.isPresent(), "Expected no provider to be present for invalid URL");
}
}