Skip to content

ATLAS-5189: Encrypt postgres password #499

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

Open
chaitalicod wants to merge 1 commit into
base: master
Choose a base branch
from
+34 −3
Open

ATLAS-5189: Encrypt postgres password #499

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
4 changes: 4 additions & 0 deletions graphdb/janusgraph-rdbms/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@
<artifactId>HikariCP</artifactId>
<version>${HikariCP.version}</version>
</dependency>
<dependency>
<groupId>org.apache.atlas</groupId>
<artifactId>atlas-intg</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>eclipselink</artifactId>
Expand Down
13 changes: 13 additions & 0 deletions graphdb/janusgraph-rdbms/src/main/java/org/janusgraph/diskstorage/rdbms/dao/DaoManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@

import com.zaxxer.hikari.HikariConfig;
import com.zaxxer.hikari.HikariDataSource;
import org.apache.atlas.ApplicationProperties;
import org.apache.atlas.AtlasException;
import org.eclipse.persistence.config.PersistenceUnitProperties;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -62,6 +64,7 @@ public class DaoManager {
private static final Logger LOG = LoggerFactory.getLogger(DaoManager.class);

private final EntityManagerFactory emFactory;
private static final String HIKARI_PASSWORD_KEY = "atlas.graph.storage.rdbms.jpa.hikari.password";

/**
*
Expand All @@ -78,6 +81,16 @@ public DaoManager(Map<String, Object> jpaConfig) {

if (value != null) {
if (key.startsWith("hikari.")) {
if ("hikari.password".equals(key)) {
try {
String decrypted = ApplicationProperties.getDecryptedPassword(ApplicationProperties.get(), HIKARI_PASSWORD_KEY);
if (decrypted != null) {
value = decrypted;
}
} catch (AtlasException e) {
LOG.error("Error in getting secure password ", e);
}
}
hikariConfig.put(key.substring("hikari".length() + 1), value.toString());
} else {
config.put(key, value.toString());
Expand Down
20 changes: 17 additions & 3 deletions intg/src/main/java/org/apache/atlas/ApplicationProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public final class ApplicationProperties extends PropertiesConfiguration {
public static final String AD = "AD";
public static final String LDAP_AD_BIND_PASSWORD = "atlas.authentication.method.ldap.ad.bind.password";
public static final String LDAP_BIND_PASSWORD = "atlas.authentication.method.ldap.bind.password";
public static final String MASK_LDAP_PASSWORD = "********";
public static final String MASK_PASSWORD = "********";
public static final String DEFAULT_GRAPHDB_BACKEND = GRAPHBD_BACKEND_JANUS;
public static final boolean DEFAULT_SOLR_WAIT_SEARCHER = false;
public static final boolean DEFAULT_INDEX_MAP_NAME = false;
Expand Down Expand Up @@ -342,7 +342,7 @@ private static void setLdapPasswordFromKeystore(Configuration configuration) {
if (ldapType.equalsIgnoreCase(LDAP)) {
String maskPasssword = configuration.getString(LDAP_BIND_PASSWORD);

if (MASK_LDAP_PASSWORD.equals(maskPasssword)) {
if (MASK_PASSWORD.equals(maskPasssword)) {
String password = SecurityUtil.getPassword(configuration, LDAP_BIND_PASSWORD, HADOOP_SECURITY_CREDENTIAL_PROVIDER_PATH);

configuration.clearProperty(LDAP_BIND_PASSWORD);
Expand All @@ -351,7 +351,7 @@ private static void setLdapPasswordFromKeystore(Configuration configuration) {
} else if (ldapType.equalsIgnoreCase(AD)) {
String maskPasssword = configuration.getString(LDAP_AD_BIND_PASSWORD);

if (MASK_LDAP_PASSWORD.equals(maskPasssword)) {
if (MASK_PASSWORD.equals(maskPasssword)) {
String password = SecurityUtil.getPassword(configuration, LDAP_AD_BIND_PASSWORD, HADOOP_SECURITY_CREDENTIAL_PROVIDER_PATH);

configuration.clearProperty(LDAP_AD_BIND_PASSWORD);
Expand All @@ -364,6 +364,20 @@ private static void setLdapPasswordFromKeystore(Configuration configuration) {
}
}

public static String getDecryptedPassword(Configuration configuration, String propertyKey) {
String configuredValue = configuration != null ? configuration.getString(propertyKey) : null;

if (configuredValue != null && MASK_PASSWORD.equals(configuredValue)) {
try {
return SecurityUtil.getPassword(configuration, propertyKey, HADOOP_SECURITY_CREDENTIAL_PROVIDER_PATH);
} catch (Exception e) {
LOG.error("Error in getting secure password ", e);
}
}

return configuredValue;
}

private void setDefaults() {
AtlasRunMode runMode = AtlasRunMode.valueOf(getString(ATLAS_RUN_MODE, DEFAULT_ATLAS_RUN_MODE.name()));

Expand Down