You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by co...@apache.org on 2016/09/28 09:33:12 UTC
[19/19] incubator-ranger git commit: Removing spaces before semicolons
Removing spaces before semicolons
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/eb21ea6a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/eb21ea6a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/eb21ea6a
Branch: refs/heads/master
Commit: eb21ea6afb9f2ca0e26a769bfc6333ba3cce0e61
Parents: 09700f3
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Sep 28 10:25:34 2016 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Sep 28 10:25:34 2016 +0100
----------------------------------------------------------------------
.../audit/destination/SolrAuditDestination.java | 18 +-
.../audit/entity/AuthzAuditEventDbObj.java | 2 +-
.../ranger/audit/model/EnumRepositoryType.java | 10 +-
.../ranger/audit/provider/DbAuditProvider.java | 4 +-
.../audit/provider/Log4jAuditProvider.java | 2 +-
.../apache/ranger/audit/provider/MiscUtil.java | 2 +-
.../audit/provider/hdfs/HdfsAuditProvider.java | 2 +-
.../audit/provider/hdfs/HdfsLogDestination.java | 2 +-
.../ranger/audit/utils/RollingTimeUtil.java | 2 +-
.../security/KrbPasswordSaverLoginModule.java | 12 +-
.../hadoop/security/SecureClientLogin.java | 8 +-
.../hadoop/config/RangerConfiguration.java | 26 +-
.../config/RangerLegacyConfigBuilder.java | 26 +-
.../hadoop/constants/RangerHadoopConstants.java | 58 ++--
.../plugin/audit/RangerDefaultAuditHandler.java | 4 +-
.../apache/ranger/plugin/client/BaseClient.java | 44 +--
.../plugin/client/HadoopConfigHolder.java | 176 +++++-----
.../plugin/errors/ValidationErrorCode.java | 2 +-
.../RangerPathResourceMatcher.java | 6 +-
.../plugin/store/rest/ServiceRESTStore.java | 2 +-
.../ranger/plugin/util/PasswordUtils.java | 90 ++---
.../ranger/plugin/util/RangerRESTClient.java | 34 +-
.../ranger/plugin/util/RangerRESTUtils.java | 16 +-
.../ranger/plugin/util/RangerSslHelper.java | 34 +-
.../plugin/policyengine/TestPolicyEngine.java | 2 +-
.../ranger/plugin/store/TestServiceStore.java | 14 +-
.../ranger/plugin/store/TestTagStore.java | 10 +-
.../utils/RangerCredentialProviderTest.java | 52 +--
.../ranger/utils/install/PasswordGenerator.java | 90 ++---
.../ranger/utils/install/XmlConfigChanger.java | 250 +++++++-------
.../apache/ranger/credentialapi/buildks.java | 24 +-
.../ranger/server/tomcat/EmbeddedServer.java | 4 +-
.../server/tomcat/StopEmbeddedServer.java | 14 +-
.../authorization/hbase/HbaseAuthUtilsImpl.java | 2 +-
.../hbase/RangerAuthorizationCoprocessor.java | 2 +-
.../hbase/client/HBaseConnectionMgr.java | 2 +-
.../services/hbase/client/HBaseResourceMgr.java | 12 +-
.../hadoop/HDFSAccessVerifier.java | 2 +-
.../hadoop/RangerHdfsAuthorizer.java | 20 +-
.../RangerAccessControlException.java | 2 +-
.../ranger/services/hdfs/client/HdfsClient.java | 68 ++--
.../services/hdfs/client/HdfsResourceMgr.java | 10 +-
.../hive/authorizer/RangerHiveAuditHandler.java | 2 +-
.../hive/authorizer/RangerHiveAuthorizer.java | 4 +-
.../hive/constants/RangerHiveConstants.java | 8 +-
.../ranger/services/hive/client/HiveClient.java | 172 +++++-----
.../services/hive/client/HiveResourceMgr.java | 12 +-
.../main/java/org/apache/util/sql/Jisql.java | 2 +-
.../java/org/apache/util/sql/MySQLPLRunner.java | 2 +-
.../apache/hadoop/crypto/key/DB2HSMMKUtil.java | 38 +--
.../apache/hadoop/crypto/key/HSM2DBMKUtil.java | 36 +-
.../hadoop/crypto/key/JKS2RangerUtil.java | 60 ++--
.../hadoop/crypto/key/Ranger2JKSUtil.java | 50 +--
.../org/apache/hadoop/crypto/key/RangerHSM.java | 2 +-
.../apache/hadoop/crypto/key/RangerKMSDB.java | 2 +-
.../hadoop/crypto/key/RangerKeyStore.java | 28 +-
.../crypto/key/RangerKeyStoreProvider.java | 6 +-
.../hadoop/crypto/key/RangerMasterKey.java | 50 +--
.../hadoop/crypto/key/kms/server/KMSWebApp.java | 2 +-
.../java/org/apache/ranger/entity/XXDBBase.java | 2 +-
.../ranger/services/knox/client/KnoxClient.java | 2 +-
.../services/knox/client/KnoxResourceMgr.java | 8 +-
.../services/kms/client/KMSResourceMgr.java | 10 +-
.../ranger/services/nifi/client/NiFiClient.java | 2 +-
.../yarn/authorizer/RangerYarnAuthorizer.java | 8 +-
.../ranger/services/yarn/client/YarnClient.java | 20 +-
.../services/yarn/client/YarnResourceMgr.java | 10 +-
.../access/RangerAccessControlLists.java | 44 +--
.../access/RangerAccessControlListsTest.java | 10 +-
.../RangerPluginClassLoaderUtil.java | 2 +-
.../policyengine/RangerPluginPerfTester.java | 4 +-
.../java/org/apache/ranger/biz/AssetMgr.java | 8 +-
.../java/org/apache/ranger/biz/KmsKeyMgr.java | 8 +-
.../org/apache/ranger/common/AppConstants.java | 30 +-
.../apache/ranger/common/PropertiesUtil.java | 2 +-
.../apache/ranger/common/RangerProperties.java | 12 +-
.../apache/ranger/common/RangerSearchUtil.java | 12 +-
.../org/apache/ranger/common/ServiceUtil.java | 10 +-
.../java/org/apache/ranger/entity/XXDBBase.java | 2 +-
.../java/org/apache/ranger/entity/XXGroup.java | 2 +-
.../java/org/apache/ranger/entity/XXUser.java | 2 +-
.../patch/PatchPersmissionModel_J10003.java | 2 +-
.../patch/cliutil/DbToSolrMigrationUtil.java | 2 +-
.../apache/ranger/service/XAgentService.java | 18 +-
.../java/org/apache/ranger/solr/SolrMgr.java | 2 +-
.../apache/ranger/common/TestStringUtil.java | 4 +-
.../authorization/storm/StormRangerPlugin.java | 2 +-
.../storm/authorizer/RangerStormAuthorizer.java | 34 +-
.../services/storm/client/StormClient.java | 28 +-
.../services/storm/client/StormResourceMgr.java | 12 +-
.../storm/client/json/model/Topology.java | 6 +-
.../ranger/tagsync/process/TagSyncConfig.java | 14 +-
.../tagsync/sink/tagadmin/TagAdminRESTSink.java | 4 +-
.../tagsync/source/atlasrest/AtlasRESTUtil.java | 4 +-
.../ranger/ldapconfigcheck/LdapConfig.java | 4 +-
.../process/CustomSSLSocketFactory.java | 14 +-
.../process/LdapUserGroupBuilder.java | 40 +--
.../process/PolicyMgrUserGroupBuilder.java | 4 +-
.../config/UserGroupSyncConfig.java | 136 ++++----
.../model/GetXGroupListResponse.java | 4 +-
.../model/GetXUserGroupListResponse.java | 4 +-
.../model/GetXUserListResponse.java | 4 +-
.../ranger/unixusersync/model/MUserInfo.java | 10 +-
.../ranger/unixusersync/model/XGroupInfo.java | 8 +-
.../unixusersync/model/XUserGroupInfo.java | 6 +-
.../ranger/unixusersync/model/XUserInfo.java | 8 +-
.../unixusersync/poc/ListUserGroupTest.java | 2 +-
.../poc/RangerUpdateUserGroupMapping.java | 4 +-
.../process/FileSourceUserGroupBuilder.java | 20 +-
.../process/PolicyMgrUserGroupBuilder.java | 332 +++++++++----------
.../process/UnixUserGroupBuilder.java | 78 ++---
.../ranger/usergroupsync/UserGroupSync.java | 44 +--
.../unix/jaas/ConsolePromptCallbackHandler.java | 6 +-
.../unix/jaas/RemoteUnixLoginModule.java | 64 ++--
.../unix/jaas/UnixGroupPrincipal.java | 6 +-
.../unix/jaas/UnixUserPrincipal.java | 6 +-
.../UnixAuthenticationTester.java | 6 +-
.../authentication/PasswordValidator.java | 54 +--
.../UnixAuthenticationService.java | 156 ++++-----
119 files changed, 1500 insertions(+), 1500 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-audit/src/main/java/org/apache/ranger/audit/destination/SolrAuditDestination.java
----------------------------------------------------------------------
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/destination/SolrAuditDestination.java b/agents-audit/src/main/java/org/apache/ranger/audit/destination/SolrAuditDestination.java
index 57f2f6d..c8f4f13 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/destination/SolrAuditDestination.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/destination/SolrAuditDestination.java
@@ -137,7 +137,7 @@ public class SolrAuditDestination extends AuditDestination {
+ zkHosts, t);
}
finally {
- resetInitializerInSOLR() ;
+ resetInitializerInSOLR();
}
} else if (solrURLs != null && !solrURLs.isEmpty()) {
try {
@@ -171,7 +171,7 @@ public class SolrAuditDestination extends AuditDestination {
+ solrURLs, t);
}
finally {
- resetInitializerInSOLR() ;
+ resetInitializerInSOLR();
}
}
}
@@ -182,8 +182,8 @@ public class SolrAuditDestination extends AuditDestination {
private void resetInitializerInSOLR() {
javax.security.auth.login.Configuration solrConfig = javax.security.auth.login.Configuration.getConfiguration();
- String solrConfigClassName = solrConfig.getClass().getName() ;
- String solrJassConfigEnd = "SolrJaasConfiguration" ;
+ String solrConfigClassName = solrConfig.getClass().getName();
+ String solrJassConfigEnd = "SolrJaasConfiguration";
if (solrConfigClassName.endsWith(solrJassConfigEnd)) {
try {
Field f = solrConfig.getClass().getDeclaredField("initiateAppNames");
@@ -316,11 +316,11 @@ public class SolrAuditDestination extends AuditDestination {
// SolrJ requires "java.security.auth.login.config" property to be set to identify itself that it is kerberized. So using a dummy property for it
// Acutal solrclient JAAS configs are read from the ranger-<component>-audit.xml present in components conf folder and set by InMemoryJAASConfiguration
// Refer InMemoryJAASConfiguration doc for JAAS Configuration
- String confFileName = System.getProperty(PROP_JAVA_SECURITY_AUTH_LOGIN_CONFIG) ;
- LOG.info("In solrAuditDestination.init() : JAAS Configuration set as [" + confFileName + "]") ;
+ String confFileName = System.getProperty(PROP_JAVA_SECURITY_AUTH_LOGIN_CONFIG);
+ LOG.info("In solrAuditDestination.init() : JAAS Configuration set as [" + confFileName + "]");
if ( System.getProperty(PROP_JAVA_SECURITY_AUTH_LOGIN_CONFIG) == null ) {
if ( MiscUtil.getBooleanProperty(props, propPrefix + "." + PROP_SOLR_FORCE_USE_INMEMORY_JAAS_CONFIG,false) ) {
- System.setProperty(PROP_JAVA_SECURITY_AUTH_LOGIN_CONFIG, "/dev/null") ;
+ System.setProperty(PROP_JAVA_SECURITY_AUTH_LOGIN_CONFIG, "/dev/null");
} else {
LOG.warn("No Client JAAS config present in solr audit config. Ranger Audit to Kerberized Solr will fail...");
}
@@ -331,8 +331,8 @@ public class SolrAuditDestination extends AuditDestination {
LOG.error("ERROR: Unable to load SolrClient JAAS config from Audit config file. Audit to Kerberized Solr will fail...", e);
}
finally {
- String confFileName = System.getProperty(PROP_JAVA_SECURITY_AUTH_LOGIN_CONFIG) ;
- LOG.info("In solrAuditDestination.init() (finally) : JAAS Configuration set as [" + confFileName + "]") ;
+ String confFileName = System.getProperty(PROP_JAVA_SECURITY_AUTH_LOGIN_CONFIG);
+ LOG.info("In solrAuditDestination.init() (finally) : JAAS Configuration set as [" + confFileName + "]");
}
LOG.info("<==SolrAuditDestination.init()" );
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-audit/src/main/java/org/apache/ranger/audit/entity/AuthzAuditEventDbObj.java
----------------------------------------------------------------------
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/entity/AuthzAuditEventDbObj.java b/agents-audit/src/main/java/org/apache/ranger/audit/entity/AuthzAuditEventDbObj.java
index 8735fc6..6830e95 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/entity/AuthzAuditEventDbObj.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/entity/AuthzAuditEventDbObj.java
@@ -192,7 +192,7 @@ public class AuthzAuditEventDbObj implements Serializable {
@Column(name = "repo_type")
public int getRepositoryType() {
- return this.repositoryType ;
+ return this.repositoryType;
}
public void setRepositoryType(int repositoryType) {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-audit/src/main/java/org/apache/ranger/audit/model/EnumRepositoryType.java
----------------------------------------------------------------------
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/model/EnumRepositoryType.java b/agents-audit/src/main/java/org/apache/ranger/audit/model/EnumRepositoryType.java
index eb3e288..a8364c2 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/model/EnumRepositoryType.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/model/EnumRepositoryType.java
@@ -21,17 +21,17 @@
public final class EnumRepositoryType {
- public static final int HDFS = 1 ;
+ public static final int HDFS = 1;
- public static final int HBASE = 2 ;
+ public static final int HBASE = 2;
- public static final int HIVE = 3 ;
+ public static final int HIVE = 3;
- public static final int XAAGENT = 4 ;
+ public static final int XAAGENT = 4;
public static final int KNOX = 5;
- public static final int STORM = 6 ;
+ public static final int STORM = 6;
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-audit/src/main/java/org/apache/ranger/audit/provider/DbAuditProvider.java
----------------------------------------------------------------------
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/provider/DbAuditProvider.java b/agents-audit/src/main/java/org/apache/ranger/audit/provider/DbAuditProvider.java
index 34de6f7..0987688 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/provider/DbAuditProvider.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/provider/DbAuditProvider.java
@@ -47,10 +47,10 @@ public class DbAuditProvider extends AuditDestination {
private static final Log LOG = LogFactory.getLog(DbAuditProvider.class);
public static final String AUDIT_DB_IS_ASYNC_PROP = "xasecure.audit.db.is.async";
- public static final String AUDIT_DB_MAX_QUEUE_SIZE_PROP = "xasecure.audit.db.async.max.queue.size" ;
+ public static final String AUDIT_DB_MAX_QUEUE_SIZE_PROP = "xasecure.audit.db.async.max.queue.size";
public static final String AUDIT_DB_MAX_FLUSH_INTERVAL_PROP = "xasecure.audit.db.async.max.flush.interval.ms";
- private static final String AUDIT_DB_BATCH_SIZE_PROP = "xasecure.audit.db.batch.size" ;
+ private static final String AUDIT_DB_BATCH_SIZE_PROP = "xasecure.audit.db.batch.size";
private static final String AUDIT_DB_RETRY_MIN_INTERVAL_PROP = "xasecure.audit.db.config.retry.min.interval.ms";
private static final String AUDIT_JPA_CONFIG_PROP_PREFIX = "xasecure.audit.jpa.";
private static final String AUDIT_DB_CREDENTIAL_PROVIDER_FILE = "xasecure.audit.credential.provider.file";
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-audit/src/main/java/org/apache/ranger/audit/provider/Log4jAuditProvider.java
----------------------------------------------------------------------
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/provider/Log4jAuditProvider.java b/agents-audit/src/main/java/org/apache/ranger/audit/provider/Log4jAuditProvider.java
index 3beab69..353c809 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/provider/Log4jAuditProvider.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/provider/Log4jAuditProvider.java
@@ -34,7 +34,7 @@ public class Log4jAuditProvider extends AuditDestination {
private static final Log AUDITLOG = LogFactory.getLog("xaaudit." + Log4jAuditProvider.class.getName());
public static final String AUDIT_LOG4J_IS_ASYNC_PROP = "xasecure.audit.log4j.is.async";
- public static final String AUDIT_LOG4J_MAX_QUEUE_SIZE_PROP = "xasecure.audit.log4j.async.max.queue.size" ;
+ public static final String AUDIT_LOG4J_MAX_QUEUE_SIZE_PROP = "xasecure.audit.log4j.async.max.queue.size";
public static final String AUDIT_LOG4J_MAX_FLUSH_INTERVAL_PROP = "xasecure.audit.log4j.async.max.flush.interval.ms";
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-audit/src/main/java/org/apache/ranger/audit/provider/MiscUtil.java
----------------------------------------------------------------------
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/provider/MiscUtil.java b/agents-audit/src/main/java/org/apache/ranger/audit/provider/MiscUtil.java
index edb1c63..4515843 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/provider/MiscUtil.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/provider/MiscUtil.java
@@ -77,7 +77,7 @@ public class MiscUtil {
private static String sApplicationType = null;
private static UserGroupInformation ugiLoginUser = null;
private static Subject subjectLoginUser = null;
- private static String local_hostname = null ;
+ private static String local_hostname = null;
private static Map<String, LogHistory> logHistoryList = new Hashtable<String, LogHistory>();
private static int logInterval = 30000; // 30 seconds
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-audit/src/main/java/org/apache/ranger/audit/provider/hdfs/HdfsAuditProvider.java
----------------------------------------------------------------------
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/provider/hdfs/HdfsAuditProvider.java b/agents-audit/src/main/java/org/apache/ranger/audit/provider/hdfs/HdfsAuditProvider.java
index 8cdf869..65429ad 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/provider/hdfs/HdfsAuditProvider.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/provider/hdfs/HdfsAuditProvider.java
@@ -32,7 +32,7 @@ public class HdfsAuditProvider extends BufferedAuditProvider {
private static final Log LOG = LogFactory.getLog(HdfsAuditProvider.class);
public static final String AUDIT_HDFS_IS_ASYNC_PROP = "xasecure.audit.hdfs.is.async";
- public static final String AUDIT_HDFS_MAX_QUEUE_SIZE_PROP = "xasecure.audit.hdfs.async.max.queue.size" ;
+ public static final String AUDIT_HDFS_MAX_QUEUE_SIZE_PROP = "xasecure.audit.hdfs.async.max.queue.size";
public static final String AUDIT_HDFS_MAX_FLUSH_INTERVAL_PROP = "xasecure.audit.hdfs.async.max.flush.interval.ms";
public HdfsAuditProvider() {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-audit/src/main/java/org/apache/ranger/audit/provider/hdfs/HdfsLogDestination.java
----------------------------------------------------------------------
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/provider/hdfs/HdfsLogDestination.java b/agents-audit/src/main/java/org/apache/ranger/audit/provider/hdfs/HdfsLogDestination.java
index c09abb5..065e8b0 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/provider/hdfs/HdfsLogDestination.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/provider/hdfs/HdfsLogDestination.java
@@ -425,7 +425,7 @@ public class HdfsLogDestination<T> implements LogDestination<T> {
return "";
}
- for(int i = 1; ; i++) {
+ for(int i = 1;; i++) {
String ret = fileName;
String strToAppend = "-" + Integer.toString(i);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-audit/src/main/java/org/apache/ranger/audit/utils/RollingTimeUtil.java
----------------------------------------------------------------------
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/utils/RollingTimeUtil.java b/agents-audit/src/main/java/org/apache/ranger/audit/utils/RollingTimeUtil.java
index 54675c7..f59817f 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/utils/RollingTimeUtil.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/utils/RollingTimeUtil.java
@@ -246,7 +246,7 @@ public class RollingTimeUtil {
// Test Method for RolloverTime calculation
// Set rollOverPeriod 10m,30m..,1h,2h,..1d,2d..,1w,2w..,1M,2M..1y..2y
// If nothing is set for rollOverPeriod or Duration default rollOverPeriod is 1 day
- String rollOverPeriod = "" ;
+ String rollOverPeriod = "";
RollingTimeUtil rollingTimeUtil = new RollingTimeUtil();
int duration = 86400;
Date nextRollOvertime = null;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-common/src/main/java/org/apache/hadoop/security/KrbPasswordSaverLoginModule.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/hadoop/security/KrbPasswordSaverLoginModule.java b/agents-common/src/main/java/org/apache/hadoop/security/KrbPasswordSaverLoginModule.java
index e4f00f0..aa986fd 100644
--- a/agents-common/src/main/java/org/apache/hadoop/security/KrbPasswordSaverLoginModule.java
+++ b/agents-common/src/main/java/org/apache/hadoop/security/KrbPasswordSaverLoginModule.java
@@ -32,7 +32,7 @@ public class KrbPasswordSaverLoginModule implements LoginModule {
public static final String PASSWORD_PARAM = "javax.security.auth.login.password";
@SuppressWarnings("rawtypes")
- private Map sharedState = null ;
+ private Map sharedState = null;
public KrbPasswordSaverLoginModule() {
}
@@ -51,16 +51,16 @@ public class KrbPasswordSaverLoginModule implements LoginModule {
@Override
public void initialize(Subject subject, CallbackHandler callbackhandler, Map<String, ?> sharedMap, Map<String, ?> options) {
- this.sharedState = sharedMap ;
+ this.sharedState = sharedMap;
- String userName = (options != null) ? (String)options.get(USERNAME_PARAM) : null ;
+ String userName = (options != null) ? (String)options.get(USERNAME_PARAM) : null;
if (userName != null) {
- this.sharedState.put(USERNAME_PARAM,userName) ;
+ this.sharedState.put(USERNAME_PARAM,userName);
}
- String password = (options != null) ? (String)options.get(PASSWORD_PARAM) : null ;
+ String password = (options != null) ? (String)options.get(PASSWORD_PARAM) : null;
if (password != null) {
- this.sharedState.put(PASSWORD_PARAM,password.toCharArray()) ;
+ this.sharedState.put(PASSWORD_PARAM,password.toCharArray());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-common/src/main/java/org/apache/hadoop/security/SecureClientLogin.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/hadoop/security/SecureClientLogin.java b/agents-common/src/main/java/org/apache/hadoop/security/SecureClientLogin.java
index a9f4da6..e6b3387 100644
--- a/agents-common/src/main/java/org/apache/hadoop/security/SecureClientLogin.java
+++ b/agents-common/src/main/java/org/apache/hadoop/security/SecureClientLogin.java
@@ -108,7 +108,7 @@ public class SecureClientLogin {
}
public static Principal createUserPrincipal(String aLoginName) {
- return new User(aLoginName) ;
+ return new User(aLoginName);
}
public static boolean isKerberosCredentialExists(String principal, String keytabPath){
@@ -163,7 +163,7 @@ public class SecureClientLogin {
class SecureClientLoginConfiguration extends javax.security.auth.login.Configuration {
private Map<String, String> kerberosOptions = new HashMap<String, String>();
- private boolean usePassword = false ;
+ private boolean usePassword = false;
public SecureClientLoginConfiguration(boolean useKeyTab, String principal, String credential) {
kerberosOptions.put("principal", principal);
@@ -173,13 +173,13 @@ class SecureClientLoginConfiguration extends javax.security.auth.login.Configura
kerberosOptions.put("keyTab", credential);
kerberosOptions.put("doNotPrompt", "true");
} else {
- usePassword = true ;
+ usePassword = true;
kerberosOptions.put("useKeyTab", "false");
kerberosOptions.put(KrbPasswordSaverLoginModule.USERNAME_PARAM, principal);
kerberosOptions.put(KrbPasswordSaverLoginModule.PASSWORD_PARAM, credential);
kerberosOptions.put("doNotPrompt", "false");
kerberosOptions.put("useFirstPass", "true");
- kerberosOptions.put("tryFirstPass","false") ;
+ kerberosOptions.put("tryFirstPass","false");
}
kerberosOptions.put("storeKey", "true");
kerberosOptions.put("refreshKrb5Config", "true");
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerConfiguration.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerConfiguration.java b/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerConfiguration.java
index ffe352e..8a9be4f 100644
--- a/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerConfiguration.java
+++ b/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerConfiguration.java
@@ -31,12 +31,12 @@ import org.apache.ranger.audit.provider.AuditProviderFactory;
public class RangerConfiguration extends Configuration {
- private static final Logger LOG = Logger.getLogger(RangerConfiguration.class) ;
+ private static final Logger LOG = Logger.getLogger(RangerConfiguration.class);
private static volatile RangerConfiguration config = null;
private RangerConfiguration() {
- super(false) ;
+ super(false);
}
public void addResourcesForServiceType(String serviceType) {
@@ -87,18 +87,18 @@ public class RangerConfiguration extends Configuration {
LOG.debug("==> addResourceIfReadable(" + aResourceName + ")");
}
- String fName = getFileLocation(aResourceName) ;
+ String fName = getFileLocation(aResourceName);
if (fName != null) {
if(LOG.isInfoEnabled()) {
LOG.info("addResourceIfReadable(" + aResourceName + "): resource file is " + fName);
}
- File f = new File(fName) ;
+ File f = new File(fName);
if (f.exists() && f.canRead()) {
- URL fUrl = null ;
+ URL fUrl = null;
try {
- fUrl = f.toURI().toURL() ;
- addResource(fUrl) ;
+ fUrl = f.toURI().toURL();
+ addResource(fUrl);
ret = true;
} catch (MalformedURLException e) {
LOG.error("Unable to find URL for the resource name [" + aResourceName + "]. Ignoring the resource:" + aResourceName);
@@ -134,7 +134,7 @@ public class RangerConfiguration extends Configuration {
AuditProviderFactory auditFactory = AuditProviderFactory.getInstance();
if(auditFactory == null) {
- LOG.error("Unable to find the AuditProviderFactory. (null) found") ;
+ LOG.error("Unable to find the AuditProviderFactory. (null) found");
return;
}
@@ -157,19 +157,19 @@ public class RangerConfiguration extends Configuration {
private String getFileLocation(String fileName) {
- String ret = null ;
+ String ret = null;
- URL lurl = RangerConfiguration.class.getClassLoader().getResource(fileName) ;
+ URL lurl = RangerConfiguration.class.getClassLoader().getResource(fileName);
if (lurl == null ) {
- lurl = RangerConfiguration.class.getClassLoader().getResource("/" + fileName) ;
+ lurl = RangerConfiguration.class.getClassLoader().getResource("/" + fileName);
}
if (lurl != null) {
- ret = lurl.getFile() ;
+ ret = lurl.getFile();
}
- return ret ;
+ return ret;
}
private void addSecurityResource(String serviceType) {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerLegacyConfigBuilder.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerLegacyConfigBuilder.java b/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerLegacyConfigBuilder.java
index 89be842..3b0a3fc 100644
--- a/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerLegacyConfigBuilder.java
+++ b/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerLegacyConfigBuilder.java
@@ -112,26 +112,26 @@ public class RangerLegacyConfigBuilder {
public static URL getAuditResource(String fName) throws Throwable {
- URL ret = null ;
+ URL ret = null;
try {
for(String cfgFile : new String[] { "hive-site.xml", "hbase-site.xml", "hdfs-site.xml" } ) {
- String loc = getFileLocation(cfgFile) ;
+ String loc = getFileLocation(cfgFile);
if (loc != null) {
File f = new File(loc);
if ( f.exists() && f.canRead()) {
- File parentFile = new File(loc).getParentFile() ;
+ File parentFile = new File(loc).getParentFile();
ret = new File(parentFile, RangerConfigConstants.XASECURE_AUDIT_FILE).toURI().toURL();
- break ;
+ break;
}
}
}
}
catch(Throwable t) {
- LOG.error("Unable to locate audit file location." + fName + " " + t) ;
+ LOG.error("Unable to locate audit file location." + fName + " " + t);
throw t;
}
- return ret ;
+ return ret;
}
public static Configuration buildRangerSecurityConf(String serviceType) {
@@ -191,21 +191,21 @@ public class RangerLegacyConfigBuilder {
}
public static String getFileLocation(String fileName) {
- String ret = null ;
+ String ret = null;
- URL lurl = RangerLegacyConfigBuilder.class.getClassLoader().getResource(fileName) ;
+ URL lurl = RangerLegacyConfigBuilder.class.getClassLoader().getResource(fileName);
if (lurl == null ) {
- lurl = RangerLegacyConfigBuilder.class.getClassLoader().getResource("/" + fileName) ;
+ lurl = RangerLegacyConfigBuilder.class.getClassLoader().getResource("/" + fileName);
}
if (lurl != null) {
- ret = lurl.getFile() ;
+ ret = lurl.getFile();
}
- return ret ;
+ return ret;
}
public static URL getFileURL(String fileName) {
- URL lurl = RangerLegacyConfigBuilder.class.getClassLoader().getResource(fileName) ;
- return lurl ;
+ URL lurl = RangerLegacyConfigBuilder.class.getClassLoader().getResource(fileName);
+ return lurl;
}
public static String getPropertyName(String rangerProp, String serviceType) {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/constants/RangerHadoopConstants.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/constants/RangerHadoopConstants.java b/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/constants/RangerHadoopConstants.java
index 906a156..b3d761c 100644
--- a/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/constants/RangerHadoopConstants.java
+++ b/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/constants/RangerHadoopConstants.java
@@ -20,8 +20,8 @@ package org.apache.ranger.authorization.hadoop.constants;
public class RangerHadoopConstants {
- public static final String RANGER_ADD_HDFS_PERMISSION_PROP = "xasecure.add-hadoop-authorization" ;
- public static final boolean RANGER_ADD_HDFS_PERMISSION_DEFAULT = false ;
+ public static final String RANGER_ADD_HDFS_PERMISSION_PROP = "xasecure.add-hadoop-authorization";
+ public static final boolean RANGER_ADD_HDFS_PERMISSION_DEFAULT = false;
public static final String READ_ACCCESS_TYPE = "read";
public static final String WRITE_ACCCESS_TYPE = "write";
public static final String EXECUTE_ACCCESS_TYPE = "execute";
@@ -29,52 +29,52 @@ public class RangerHadoopConstants {
public static final String HDFS_ROOT_FOLDER_PATH_ALT = "";
public static final String HDFS_ROOT_FOLDER_PATH = "/";
- public static final String HIVE_UPDATE_RANGER_POLICIES_ON_GRANT_REVOKE_PROP = "xasecure.hive.update.xapolicies.on.grant.revoke" ;
+ public static final String HIVE_UPDATE_RANGER_POLICIES_ON_GRANT_REVOKE_PROP = "xasecure.hive.update.xapolicies.on.grant.revoke";
public static final boolean HIVE_UPDATE_RANGER_POLICIES_ON_GRANT_REVOKE_DEFAULT_VALUE = true;
public static final String HIVE_BLOCK_UPDATE_IF_ROWFILTER_COLUMNMASK_SPECIFIED_PROP = "xasecure.hive.block.update.if.rowfilter.columnmask.specified";
public static final boolean HIVE_BLOCK_UPDATE_IF_ROWFILTER_COLUMNMASK_SPECIFIED_DEFAULT_VALUE = true;
- public static final String HBASE_UPDATE_RANGER_POLICIES_ON_GRANT_REVOKE_PROP = "xasecure.hbase.update.xapolicies.on.grant.revoke" ;
+ public static final String HBASE_UPDATE_RANGER_POLICIES_ON_GRANT_REVOKE_PROP = "xasecure.hbase.update.xapolicies.on.grant.revoke";
public static final boolean HBASE_UPDATE_RANGER_POLICIES_ON_GRANT_REVOKE_DEFAULT_VALUE = true;
- public static final String KNOX_ACCESS_VERIFIER_CLASS_NAME_PROP = "knox.authorization.verifier.classname" ;
- public static final String KNOX_ACCESS_VERIFIER_CLASS_NAME_DEFAULT_VALUE = "org.apache.ranger.pdp.knox.RangerAuthorizer" ;
+ public static final String KNOX_ACCESS_VERIFIER_CLASS_NAME_PROP = "knox.authorization.verifier.classname";
+ public static final String KNOX_ACCESS_VERIFIER_CLASS_NAME_DEFAULT_VALUE = "org.apache.ranger.pdp.knox.RangerAuthorizer";
- public static final String STORM_ACCESS_VERIFIER_CLASS_NAME_PROP = "storm.authorization.verifier.classname" ;
- public static final String STORM_ACCESS_VERIFIER_CLASS_NAME_DEFAULT_VALUE = "org.apache.ranger.pdp.storm.RangerAuthorizer" ;
+ public static final String STORM_ACCESS_VERIFIER_CLASS_NAME_PROP = "storm.authorization.verifier.classname";
+ public static final String STORM_ACCESS_VERIFIER_CLASS_NAME_DEFAULT_VALUE = "org.apache.ranger.pdp.storm.RangerAuthorizer";
- public static final String RANGER_ADD_YARN_PERMISSION_PROP = "ranger.add-yarn-authorization" ;
- public static final boolean RANGER_ADD_YARN_PERMISSION_DEFAULT = true ;
+ public static final String RANGER_ADD_YARN_PERMISSION_PROP = "ranger.add-yarn-authorization";
+ public static final boolean RANGER_ADD_YARN_PERMISSION_DEFAULT = true;
//
// Logging constants
//
public static final String AUDITLOG_FIELD_DELIMITER_PROP = "xasecure.auditlog.fieldDelimiterString";
- public static final String AUDITLOG_RANGER_MODULE_ACL_NAME_PROP = "xasecure.auditlog.xasecureAcl.name" ;
- public static final String AUDITLOG_HADOOP_MODULE_ACL_NAME_PROP = "xasecure.auditlog.hadoopAcl.name" ;
- public static final String AUDITLOG_YARN_MODULE_ACL_NAME_PROP = "ranger.auditlog.yarnAcl.name" ;
+ public static final String AUDITLOG_RANGER_MODULE_ACL_NAME_PROP = "xasecure.auditlog.xasecureAcl.name";
+ public static final String AUDITLOG_HADOOP_MODULE_ACL_NAME_PROP = "xasecure.auditlog.hadoopAcl.name";
+ public static final String AUDITLOG_YARN_MODULE_ACL_NAME_PROP = "ranger.auditlog.yarnAcl.name";
- public static final String DEFAULT_LOG_FIELD_DELIMITOR = "|" ;
- public static final String DEFAULT_XASECURE_MODULE_ACL_NAME = "xasecure-acl" ;
- public static final String DEFAULT_RANGER_MODULE_ACL_NAME = "ranger-acl" ;
- public static final String DEFAULT_HADOOP_MODULE_ACL_NAME = "hadoop-acl" ;
- public static final String DEFAULT_YARN_MODULE_ACL_NAME = "yarn-acl" ;
+ public static final String DEFAULT_LOG_FIELD_DELIMITOR = "|";
+ public static final String DEFAULT_XASECURE_MODULE_ACL_NAME = "xasecure-acl";
+ public static final String DEFAULT_RANGER_MODULE_ACL_NAME = "ranger-acl";
+ public static final String DEFAULT_HADOOP_MODULE_ACL_NAME = "hadoop-acl";
+ public static final String DEFAULT_YARN_MODULE_ACL_NAME = "yarn-acl";
- public static final String AUDITLOG_FIELDINFO_VISIBLE_PROP = "xasecure.auditlog.fieldInfoVisible" ;
- public static final boolean DEFAULT_AUDITLOG_FIELDINFO_VISIBLE = false ;
+ public static final String AUDITLOG_FIELDINFO_VISIBLE_PROP = "xasecure.auditlog.fieldInfoVisible";
+ public static final boolean DEFAULT_AUDITLOG_FIELDINFO_VISIBLE = false;
- public static final String AUDITLOG_ACCESS_GRANTED_TEXT_PROP = "xasecure.auditlog.accessgranted.text" ;
- public static final String AUDITLOG_ACCESS_DENIED_TEXT_PROP = "xasecure.auditlog.accessdenied.text" ;
+ public static final String AUDITLOG_ACCESS_GRANTED_TEXT_PROP = "xasecure.auditlog.accessgranted.text";
+ public static final String AUDITLOG_ACCESS_DENIED_TEXT_PROP = "xasecure.auditlog.accessdenied.text";
- public static final String DEFAULT_ACCESS_GRANTED_TEXT = "granted" ;
- public static final String DEFAULT_ACCESS_DENIED_TEXT = "denied" ;
+ public static final String DEFAULT_ACCESS_GRANTED_TEXT = "granted";
+ public static final String DEFAULT_ACCESS_DENIED_TEXT = "denied";
- public static final String AUDITLOG_EMPTY_STRING = "" ;
+ public static final String AUDITLOG_EMPTY_STRING = "";
- public static final String AUDITLOG_HDFS_EXCLUDE_LIST_PROP = "xasecure.auditlog.hdfs.excludeusers" ;
- public static final String AUDITLOG_REPOSITORY_NAME_PROP = "xasecure.audit.repository.name" ;
- public static final String AUDITLOG_IS_ENABLED_PROP = "xasecure.audit.is.enabled" ;
+ public static final String AUDITLOG_HDFS_EXCLUDE_LIST_PROP = "xasecure.auditlog.hdfs.excludeusers";
+ public static final String AUDITLOG_REPOSITORY_NAME_PROP = "xasecure.audit.repository.name";
+ public static final String AUDITLOG_IS_ENABLED_PROP = "xasecure.audit.is.enabled";
- public static final String KEYMGR_URL_PROP = "hdfs.keymanager.url" ;
+ public static final String KEYMGR_URL_PROP = "hdfs.keymanager.url";
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-common/src/main/java/org/apache/ranger/plugin/audit/RangerDefaultAuditHandler.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/audit/RangerDefaultAuditHandler.java b/agents-common/src/main/java/org/apache/ranger/plugin/audit/RangerDefaultAuditHandler.java
index 4fd0c6e..3c342a3 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/audit/RangerDefaultAuditHandler.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/audit/RangerDefaultAuditHandler.java
@@ -38,13 +38,13 @@ import org.apache.ranger.plugin.util.RangerAccessRequestUtil;
public class RangerDefaultAuditHandler implements RangerAccessResultProcessor {
- protected static final String RangerModuleName = RangerConfiguration.getInstance().get(RangerHadoopConstants.AUDITLOG_RANGER_MODULE_ACL_NAME_PROP , RangerHadoopConstants.DEFAULT_RANGER_MODULE_ACL_NAME) ;
+ protected static final String RangerModuleName = RangerConfiguration.getInstance().get(RangerHadoopConstants.AUDITLOG_RANGER_MODULE_ACL_NAME_PROP , RangerHadoopConstants.DEFAULT_RANGER_MODULE_ACL_NAME);
private static final Log LOG = LogFactory.getLog(RangerDefaultAuditHandler.class);
static long sequenceNumber = 0;
private static String UUID = MiscUtil.generateUniqueId();
- private static AtomicInteger counter = new AtomicInteger(0); ;
+ private static AtomicInteger counter = new AtomicInteger(0);;
public RangerDefaultAuditHandler() {
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-common/src/main/java/org/apache/ranger/plugin/client/BaseClient.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/client/BaseClient.java b/agents-common/src/main/java/org/apache/ranger/plugin/client/BaseClient.java
index eeec8ff..4ba1f89 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/client/BaseClient.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/client/BaseClient.java
@@ -34,44 +34,44 @@ import org.apache.hadoop.security.SecureClientLogin;
import org.apache.ranger.plugin.util.PasswordUtils;
public abstract class BaseClient {
- private static final Log LOG = LogFactory.getLog(BaseClient.class) ;
+ private static final Log LOG = LogFactory.getLog(BaseClient.class);
private static final String DEFAULT_NAME_RULE = "DEFAULT";
- private String serviceName ;
- private String defaultConfigFile ;
- private Subject loginSubject ;
+ private String serviceName;
+ private String defaultConfigFile;
+ private Subject loginSubject;
private HadoopConfigHolder configHolder;
- protected Map<String,String> connectionProperties ;
+ protected Map<String,String> connectionProperties;
public BaseClient(String svcName, Map<String,String> connectionProperties) {
this(svcName, connectionProperties, null);
}
public BaseClient(String serivceName, Map<String,String> connectionProperties, String defaultConfigFile) {
- this.serviceName = serivceName ;
- this.connectionProperties = connectionProperties ;
- this.defaultConfigFile = defaultConfigFile ;
- init() ;
- login() ;
+ this.serviceName = serivceName;
+ this.connectionProperties = connectionProperties;
+ this.defaultConfigFile = defaultConfigFile;
+ init();
+ login();
}
private void init() {
if (connectionProperties == null) {
- configHolder = HadoopConfigHolder.getInstance(serviceName) ;
+ configHolder = HadoopConfigHolder.getInstance(serviceName);
}
else {
- configHolder = HadoopConfigHolder.getInstance(serviceName,connectionProperties, defaultConfigFile) ;
+ configHolder = HadoopConfigHolder.getInstance(serviceName,connectionProperties, defaultConfigFile);
}
}
protected void login() {
- ClassLoader prevCl = Thread.currentThread().getContextClassLoader() ;
+ ClassLoader prevCl = Thread.currentThread().getContextClassLoader();
String errMsg = " You can still save the repository and start creating "
+ "policies, but you would not be able to use autocomplete for "
+ "resource names. Check ranger_admin.log for more info.";
@@ -86,7 +86,7 @@ public abstract class BaseClient {
}
nameRules = DEFAULT_NAME_RULE;
}
- String userName = configHolder.getUserName() ;
+ String userName = configHolder.getUserName();
if(StringUtils.isEmpty(lookupPrincipal) || StringUtils.isEmpty(lookupKeytab)){
if (userName == null) {
String msgDesc = "Unable to find login username for hadoop environment, ["
@@ -97,33 +97,33 @@ public abstract class BaseClient {
throw hdpException;
}
- String keyTabFile = configHolder.getKeyTabFile() ;
+ String keyTabFile = configHolder.getKeyTabFile();
if (keyTabFile != null) {
if ( configHolder.isKerberosAuthentication() ) {
LOG.info("Init Login: security enabled, using username/keytab");
- loginSubject = SecureClientLogin.loginUserFromKeytab(userName, keyTabFile, nameRules) ;
+ loginSubject = SecureClientLogin.loginUserFromKeytab(userName, keyTabFile, nameRules);
}
else {
LOG.info("Init Login: using username");
- loginSubject = SecureClientLogin.login(userName) ;
+ loginSubject = SecureClientLogin.login(userName);
}
}
else {
- String encryptedPwd = configHolder.getPassword() ;
+ String encryptedPwd = configHolder.getPassword();
String password = PasswordUtils.decryptPassword(encryptedPwd);
if ( configHolder.isKerberosAuthentication() ) {
LOG.info("Init Login: using username/password");
- loginSubject = SecureClientLogin.loginUserWithPassword(userName, password) ;
+ loginSubject = SecureClientLogin.loginUserWithPassword(userName, password);
}
else {
LOG.info("Init Login: security not enabled, using username");
- loginSubject = SecureClientLogin.login(userName) ;
+ loginSubject = SecureClientLogin.login(userName);
}
}
}else{
if ( configHolder.isKerberosAuthentication() ) {
LOG.info("Init Lookup Login: security enabled, using lookupPrincipal/lookupKeytab");
- loginSubject = SecureClientLogin.loginUserFromKeytab(lookupPrincipal, lookupKeytab, nameRules) ;
+ loginSubject = SecureClientLogin.loginUserFromKeytab(lookupPrincipal, lookupKeytab, nameRules);
}else{
LOG.info("Init Login: security not enabled, using username");
loginSubject = SecureClientLogin.login(userName);
@@ -150,7 +150,7 @@ public abstract class BaseClient {
}
public String getSerivceName() {
- return serviceName ;
+ return serviceName;
}
protected Subject getLoginSubject() {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-common/src/main/java/org/apache/ranger/plugin/client/HadoopConfigHolder.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/client/HadoopConfigHolder.java b/agents-common/src/main/java/org/apache/ranger/plugin/client/HadoopConfigHolder.java
index a728c19..902a8b9 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/client/HadoopConfigHolder.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/client/HadoopConfigHolder.java
@@ -32,15 +32,15 @@ import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.security.SecureClientLogin;
public class HadoopConfigHolder {
- private static final Log LOG = LogFactory.getLog(HadoopConfigHolder.class) ;
- public static final String GLOBAL_LOGIN_PARAM_PROP_FILE = "hadoop-login.properties" ;
- public static final String DEFAULT_DATASOURCE_PARAM_PROP_FILE = "datasource.properties" ;
- public static final String RESOURCEMAP_PROP_FILE = "resourcenamemap.properties" ;
- public static final String DEFAULT_RESOURCE_NAME = "core-site.xml" ;
- public static final String RANGER_SECTION_NAME = "xalogin.xml" ;
- public static final String RANGER_LOGIN_USER_NAME_PROP = "username" ;
- public static final String RANGER_LOGIN_KEYTAB_FILE_PROP = "keytabfile" ;
- public static final String RANGER_LOGIN_PASSWORD = "password" ;
+ private static final Log LOG = LogFactory.getLog(HadoopConfigHolder.class);
+ public static final String GLOBAL_LOGIN_PARAM_PROP_FILE = "hadoop-login.properties";
+ public static final String DEFAULT_DATASOURCE_PARAM_PROP_FILE = "datasource.properties";
+ public static final String RESOURCEMAP_PROP_FILE = "resourcenamemap.properties";
+ public static final String DEFAULT_RESOURCE_NAME = "core-site.xml";
+ public static final String RANGER_SECTION_NAME = "xalogin.xml";
+ public static final String RANGER_LOGIN_USER_NAME_PROP = "username";
+ public static final String RANGER_LOGIN_KEYTAB_FILE_PROP = "keytabfile";
+ public static final String RANGER_LOGIN_PASSWORD = "password";
public static final String RANGER_LOOKUP_PRINCIPAL = "lookupprincipal";
public static final String RANGER_LOOKUP_KEYTAB = "lookupkeytab";
public static final String RANGER_PRINCIPAL = "rangerprincipal";
@@ -53,19 +53,19 @@ public class HadoopConfigHolder {
public static final String HADOOP_RPC_PROTECTION = "hadoop.rpc.protection";
- private static boolean initialized = false ;
- private static Map<String,HashMap<String,Properties>> dataSource2ResourceListMap = new HashMap<String,HashMap<String,Properties>>() ;
- private static Properties globalLoginProp = new Properties() ;
- private static Map<String,HadoopConfigHolder> dataSource2HadoopConfigHolder = new HashMap<String,HadoopConfigHolder>() ;
- private static Properties resourcemapProperties = null ;
+ private static boolean initialized = false;
+ private static Map<String,HashMap<String,Properties>> dataSource2ResourceListMap = new HashMap<String,HashMap<String,Properties>>();
+ private static Properties globalLoginProp = new Properties();
+ private static Map<String,HadoopConfigHolder> dataSource2HadoopConfigHolder = new HashMap<String,HadoopConfigHolder>();
+ private static Properties resourcemapProperties = null;
- private String datasourceName ;
- private String defaultConfigFile ;
- private String userName ;
- private String keyTabFile ;
- private String password ;
- private boolean isKerberosAuth ;
+ private String datasourceName;
+ private String defaultConfigFile;
+ private String userName;
+ private String keyTabFile;
+ private String password;
+ private boolean isKerberosAuth;
private String lookupPrincipal;
private String lookupKeytab;
private String nameRules;
@@ -76,17 +76,17 @@ public class HadoopConfigHolder {
private static Set<String> rangerInternalPropertyKeys = new HashSet<String>();
public static HadoopConfigHolder getInstance(String aDatasourceName) {
- HadoopConfigHolder ret = dataSource2HadoopConfigHolder.get(aDatasourceName) ;
+ HadoopConfigHolder ret = dataSource2HadoopConfigHolder.get(aDatasourceName);
if (ret == null) {
synchronized(HadoopConfigHolder.class) {
- HadoopConfigHolder temp = ret ;
+ HadoopConfigHolder temp = ret;
if (temp == null) {
- ret = new HadoopConfigHolder(aDatasourceName) ;
- dataSource2HadoopConfigHolder.put(aDatasourceName, ret) ;
+ ret = new HadoopConfigHolder(aDatasourceName);
+ dataSource2HadoopConfigHolder.put(aDatasourceName, ret);
}
}
}
- return ret ;
+ return ret;
}
public static HadoopConfigHolder getInstance(String aDatasourceName, Map<String,String> connectionProperties) {
@@ -95,25 +95,25 @@ public class HadoopConfigHolder {
public static HadoopConfigHolder getInstance(String aDatasourceName, Map<String,String> connectionProperties,
String defaultConfigFile) {
- HadoopConfigHolder ret = dataSource2HadoopConfigHolder.get(aDatasourceName) ;
+ HadoopConfigHolder ret = dataSource2HadoopConfigHolder.get(aDatasourceName);
if (ret == null) {
synchronized(HadoopConfigHolder.class) {
- HadoopConfigHolder temp = ret ;
+ HadoopConfigHolder temp = ret;
if (temp == null) {
- ret = new HadoopConfigHolder(aDatasourceName,connectionProperties, defaultConfigFile) ;
- dataSource2HadoopConfigHolder.put(aDatasourceName, ret) ;
+ ret = new HadoopConfigHolder(aDatasourceName,connectionProperties, defaultConfigFile);
+ dataSource2HadoopConfigHolder.put(aDatasourceName, ret);
}
}
}
else {
if (connectionProperties !=null && !connectionProperties.equals(ret.connectionProperties)) {
- ret = new HadoopConfigHolder(aDatasourceName,connectionProperties) ;
- dataSource2HadoopConfigHolder.remove(aDatasourceName) ;
- dataSource2HadoopConfigHolder.put(aDatasourceName, ret) ;
+ ret = new HadoopConfigHolder(aDatasourceName,connectionProperties);
+ dataSource2HadoopConfigHolder.remove(aDatasourceName);
+ dataSource2HadoopConfigHolder.put(aDatasourceName, ret);
}
}
- return ret ;
+ return ret;
}
@@ -121,7 +121,7 @@ public class HadoopConfigHolder {
private HadoopConfigHolder(String aDatasourceName) {
datasourceName = aDatasourceName;
if ( ! initialized ) {
- init() ;
+ init();
}
initLoginInfo();
}
@@ -133,21 +133,21 @@ public class HadoopConfigHolder {
private HadoopConfigHolder(String aDatasourceName, Map<String,String> connectionProperties,
String defaultConfigFile) {
datasourceName = aDatasourceName;
- this.connectionProperties = connectionProperties ;
+ this.connectionProperties = connectionProperties;
this.defaultConfigFile = defaultConfigFile;
- initConnectionProp() ;
+ initConnectionProp();
initLoginInfo();
}
private void initConnectionProp() {
for(String key : connectionProperties.keySet()) {
- String resourceName = getResourceName(key) ;
+ String resourceName = getResourceName(key);
if (resourceName == null) {
- resourceName = RANGER_SECTION_NAME ;
+ resourceName = RANGER_SECTION_NAME;
}
- String val = connectionProperties.get(key) ;
+ String val = connectionProperties.get(key);
addConfiguration(datasourceName, resourceName, key, val );
}
}
@@ -169,8 +169,8 @@ public class HadoopConfigHolder {
public static void initResourceMap() {
if (resourcemapProperties == null) {
- resourcemapProperties = new Properties() ;
- InputStream in = HadoopConfigHolder.class.getClassLoader().getResourceAsStream(RESOURCEMAP_PROP_FILE) ;
+ resourcemapProperties = new Properties();
+ InputStream in = HadoopConfigHolder.class.getClassLoader().getResourceAsStream(RESOURCEMAP_PROP_FILE);
if (in != null) {
try {
resourcemapProperties.load(in);
@@ -187,7 +187,7 @@ public class HadoopConfigHolder {
finally {
if (in != null) {
try {
- in.close() ;
+ in.close();
}
catch(IOException ioe) {
// Ignore IOException during close of stream
@@ -206,15 +206,15 @@ public class HadoopConfigHolder {
private static synchronized void init() {
if (initialized) {
- return ;
+ return;
}
try {
- InputStream in = HadoopConfigHolder.class.getClassLoader().getResourceAsStream(DEFAULT_DATASOURCE_PARAM_PROP_FILE) ;
+ InputStream in = HadoopConfigHolder.class.getClassLoader().getResourceAsStream(DEFAULT_DATASOURCE_PARAM_PROP_FILE);
if (in != null) {
- Properties prop = new Properties() ;
+ Properties prop = new Properties();
try {
- prop.load(in) ;
+ prop.load(in);
} catch (IOException e) {
throw new HadoopException("Unable to get configuration information for Hadoop environments", e);
}
@@ -227,36 +227,36 @@ public class HadoopConfigHolder {
}
if (prop.size() == 0)
- return ;
+ return;
for(Object keyobj : prop.keySet()) {
String key = (String)keyobj;
- String val = prop.getProperty(key) ;
+ String val = prop.getProperty(key);
- int dotLocatedAt = key.indexOf(".") ;
+ int dotLocatedAt = key.indexOf(".");
if (dotLocatedAt == -1) {
- continue ;
+ continue;
}
- String dataSource = key.substring(0,dotLocatedAt) ;
+ String dataSource = key.substring(0,dotLocatedAt);
- String propKey = key.substring(dotLocatedAt+1) ;
- int resourceFoundAt = propKey.indexOf(".") ;
+ String propKey = key.substring(dotLocatedAt+1);
+ int resourceFoundAt = propKey.indexOf(".");
if (resourceFoundAt > -1) {
- String resourceName = propKey.substring(0, resourceFoundAt) + ".xml" ;
- propKey = propKey.substring(resourceFoundAt+1) ;
- addConfiguration(dataSource, resourceName, propKey, val) ;
+ String resourceName = propKey.substring(0, resourceFoundAt) + ".xml";
+ propKey = propKey.substring(resourceFoundAt+1);
+ addConfiguration(dataSource, resourceName, propKey, val);
}
}
}
- in = HadoopConfigHolder.class.getClassLoader().getResourceAsStream(GLOBAL_LOGIN_PARAM_PROP_FILE) ;
+ in = HadoopConfigHolder.class.getClassLoader().getResourceAsStream(GLOBAL_LOGIN_PARAM_PROP_FILE);
if (in != null) {
- Properties tempLoginProp = new Properties() ;
+ Properties tempLoginProp = new Properties();
try {
- tempLoginProp.load(in) ;
+ tempLoginProp.load(in);
} catch (IOException e) {
throw new HadoopException("Unable to get login configuration information for Hadoop environments from file: [" + GLOBAL_LOGIN_PARAM_PROP_FILE + "]", e);
}
@@ -267,21 +267,21 @@ public class HadoopConfigHolder {
// Ignored exception when the stream is closed.
}
}
- globalLoginProp = tempLoginProp ;
+ globalLoginProp = tempLoginProp;
}
}
finally {
- initialized = true ;
+ initialized = true;
}
}
private void initLoginInfo() {
- Properties prop = this.getRangerSection() ;
+ Properties prop = this.getRangerSection();
if (prop != null) {
- userName = prop.getProperty(RANGER_LOGIN_USER_NAME_PROP) ;
- keyTabFile = prop.getProperty(RANGER_LOGIN_KEYTAB_FILE_PROP) ;
- password = prop.getProperty(RANGER_LOGIN_PASSWORD) ;
+ userName = prop.getProperty(RANGER_LOGIN_USER_NAME_PROP);
+ keyTabFile = prop.getProperty(RANGER_LOGIN_KEYTAB_FILE_PROP);
+ password = prop.getProperty(RANGER_LOGIN_PASSWORD);
lookupPrincipal = prop.getProperty(RANGER_LOOKUP_PRINCIPAL);
lookupKeytab = prop.getProperty(RANGER_LOOKUP_KEYTAB);
nameRules = prop.getProperty(RANGER_NAME_RULES);
@@ -300,11 +300,11 @@ public class HadoopConfigHolder {
public Properties getRangerSection() {
- Properties prop = this.getProperties(RANGER_SECTION_NAME) ;
+ Properties prop = this.getProperties(RANGER_SECTION_NAME);
if (prop == null) {
- prop = globalLoginProp ;
+ prop = globalLoginProp;
}
- return prop ;
+ return prop;
}
@@ -312,55 +312,55 @@ public class HadoopConfigHolder {
private static void addConfiguration(String dataSource, String resourceName, String propertyName, String value) {
if (dataSource == null || dataSource.isEmpty()) {
- return ;
+ return;
}
if (propertyName == null || propertyName.isEmpty()) {
- return ;
+ return;
}
if (resourceName == null) {
- resourceName = DEFAULT_RESOURCE_NAME ;
+ resourceName = DEFAULT_RESOURCE_NAME;
}
- HashMap<String,Properties> resourceName2PropertiesMap = dataSource2ResourceListMap.get(dataSource) ;
+ HashMap<String,Properties> resourceName2PropertiesMap = dataSource2ResourceListMap.get(dataSource);
if (resourceName2PropertiesMap == null) {
- resourceName2PropertiesMap = new HashMap<String,Properties>() ;
- dataSource2ResourceListMap.put(dataSource, resourceName2PropertiesMap) ;
+ resourceName2PropertiesMap = new HashMap<String,Properties>();
+ dataSource2ResourceListMap.put(dataSource, resourceName2PropertiesMap);
}
- Properties prop = resourceName2PropertiesMap.get(resourceName) ;
+ Properties prop = resourceName2PropertiesMap.get(resourceName);
if (prop == null) {
- prop = new Properties() ;
- resourceName2PropertiesMap.put(resourceName, prop) ;
+ prop = new Properties();
+ resourceName2PropertiesMap.put(resourceName, prop);
}
if (value == null) {
- prop.remove(propertyName) ;
+ prop.remove(propertyName);
}
else {
- prop.put(propertyName, value) ;
+ prop.put(propertyName, value);
}
}
public String getDatasourceName() {
- return datasourceName ;
+ return datasourceName;
}
public boolean hasResourceExists(String aResourceName) { // dilli
- HashMap<String,Properties> resourceName2PropertiesMap = dataSource2ResourceListMap.get(datasourceName) ;
- return (resourceName2PropertiesMap != null && resourceName2PropertiesMap.containsKey(aResourceName)) ;
+ HashMap<String,Properties> resourceName2PropertiesMap = dataSource2ResourceListMap.get(datasourceName);
+ return (resourceName2PropertiesMap != null && resourceName2PropertiesMap.containsKey(aResourceName));
}
public Properties getProperties(String aResourceName) {
- Properties ret = null ;
- HashMap<String,Properties> resourceName2PropertiesMap = dataSource2ResourceListMap.get(datasourceName) ;
+ Properties ret = null;
+ HashMap<String,Properties> resourceName2PropertiesMap = dataSource2ResourceListMap.get(datasourceName);
if (resourceName2PropertiesMap != null) {
- ret = resourceName2PropertiesMap.get(aResourceName) ;
+ ret = resourceName2PropertiesMap.get(aResourceName);
}
- return ret ;
+ return ret;
}
public String getHadoopSecurityAuthentication() {
@@ -427,10 +427,10 @@ public class HadoopConfigHolder {
LOG.debug("==> HadoopConfigHolder.getProperties( " + " DataSource : " + sectionName + " Property : " + property + ")" );
}
- Properties repoParam = null ;
+ Properties repoParam = null;
String ret = null;
- HashMap<String,Properties> resourceName2PropertiesMap = dataSource2ResourceListMap.get(this.getDatasourceName()) ;
+ HashMap<String,Properties> resourceName2PropertiesMap = dataSource2ResourceListMap.get(this.getDatasourceName());
if ( resourceName2PropertiesMap != null) {
repoParam=resourceName2PropertiesMap.get(sectionName);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-common/src/main/java/org/apache/ranger/plugin/errors/ValidationErrorCode.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/errors/ValidationErrorCode.java b/agents-common/src/main/java/org/apache/ranger/plugin/errors/ValidationErrorCode.java
index 556f8b3..d0f015d 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/errors/ValidationErrorCode.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/errors/ValidationErrorCode.java
@@ -90,7 +90,7 @@ public enum ValidationErrorCode {
POLICY_VALIDATION_ERR_MISSING_RESOURCE_LIST(3026, "Resource list was empty or contains null. At least one resource must be specified"),
POLICY_VALIDATION_ERR_POLICY_UPDATE_MOVE_SERVICE_NOT_ALLOWED(3027, "attempt to move policy id={0} from service={1} to service={2} is not allowed"),
POLICY_VALIDATION_ERR_POLICY_TYPE_CHANGE_NOT_ALLOWED(3028, "attempt to change type of policy id={0} from type={1} to type={2} is not allowed"),
- ;
+ ;
private static final Log LOG = LogFactory.getLog(ValidationErrorCode.class);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-common/src/main/java/org/apache/ranger/plugin/resourcematcher/RangerPathResourceMatcher.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/resourcematcher/RangerPathResourceMatcher.java b/agents-common/src/main/java/org/apache/ranger/plugin/resourcematcher/RangerPathResourceMatcher.java
index 07f21c4..7bf30f3 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/resourcematcher/RangerPathResourceMatcher.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/resourcematcher/RangerPathResourceMatcher.java
@@ -150,18 +150,18 @@ public class RangerPathResourceMatcher extends RangerDefaultResourceMatcher {
for(String p : pathElements) {
sb.append(p);
- ret = FilenameUtils.wildcardMatch(sb.toString(), wildcardPath, caseSensitivity) ;
+ ret = FilenameUtils.wildcardMatch(sb.toString(), wildcardPath, caseSensitivity);
if (ret) {
break;
}
- sb.append(pathSeparatorChar) ;
+ sb.append(pathSeparatorChar);
}
sb = null;
} else { // pathToCheck consists of only pathSeparatorChar
- ret = FilenameUtils.wildcardMatch(pathToCheck, wildcardPath, caseSensitivity) ;
+ ret = FilenameUtils.wildcardMatch(pathToCheck, wildcardPath, caseSensitivity);
}
}
return ret;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-common/src/main/java/org/apache/ranger/plugin/store/rest/ServiceRESTStore.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/store/rest/ServiceRESTStore.java b/agents-common/src/main/java/org/apache/ranger/plugin/store/rest/ServiceRESTStore.java
index 22329d0..8f01934 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/store/rest/ServiceRESTStore.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/store/rest/ServiceRESTStore.java
@@ -72,7 +72,7 @@ public class ServiceRESTStore extends AbstractServiceStore {
public final String REST_URL_POLICY_GET_FOR_SERVICE_IF_UPDATED = "/service/plugins/policies/download/";
public final String REST_URL_POLICY_GET_FOR_SECURE_SERVICE_IF_UPDATED = "/service/plugins/secure/policies/download/";
- public static final String REST_MIME_TYPE_JSON = "application/json" ;
+ public static final String REST_MIME_TYPE_JSON = "application/json";
private Boolean populateExistingBaseFields = false;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-common/src/main/java/org/apache/ranger/plugin/util/PasswordUtils.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/PasswordUtils.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/PasswordUtils.java
index a546ebf..f47fd29 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/util/PasswordUtils.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/PasswordUtils.java
@@ -31,92 +31,92 @@ import org.slf4j.LoggerFactory;
import com.sun.jersey.core.util.Base64;
public class PasswordUtils {
- private static final Logger LOG = LoggerFactory.getLogger(PasswordUtils.class) ;
+ private static final Logger LOG = LoggerFactory.getLogger(PasswordUtils.class);
- private static final char[] ENCRYPT_KEY = "tzL1AKl5uc4NKYaoQ4P3WLGIBFPXWPWdu1fRm9004jtQiV".toCharArray() ;
+ private static final char[] ENCRYPT_KEY = "tzL1AKl5uc4NKYaoQ4P3WLGIBFPXWPWdu1fRm9004jtQiV".toCharArray();
- private static final byte[] SALT = "f77aLYLo".getBytes() ;
+ private static final byte[] SALT = "f77aLYLo".getBytes();
- private static final int ITERATION_COUNT = 17 ;
+ private static final int ITERATION_COUNT = 17;
- private static final String CRYPT_ALGO = "PBEWithMD5AndDES" ;
+ private static final String CRYPT_ALGO = "PBEWithMD5AndDES";
- private static final String PBE_KEY_ALGO = "PBEWithMD5AndDES" ;
+ private static final String PBE_KEY_ALGO = "PBEWithMD5AndDES";
- private static final String LEN_SEPARATOR_STR = ":" ;
+ private static final String LEN_SEPARATOR_STR = ":";
public static String encryptPassword(String aPassword) throws IOException {
Map<String, String> env = System.getenv();
- String encryptKeyStr = env.get("ENCRYPT_KEY") ;
+ String encryptKeyStr = env.get("ENCRYPT_KEY");
char[] encryptKey;
if (encryptKeyStr == null) {
encryptKey=ENCRYPT_KEY;
}else{
encryptKey=encryptKeyStr.toCharArray();
}
- String saltStr = env.get("ENCRYPT_SALT") ;
+ String saltStr = env.get("ENCRYPT_SALT");
byte[] salt;
if (saltStr == null) {
- salt = SALT ;
+ salt = SALT;
}else{
salt=saltStr.getBytes();
}
- String ret = null ;
- String strToEncrypt = null ;
+ String ret = null;
+ String strToEncrypt = null;
if (aPassword == null) {
- strToEncrypt = "" ;
+ strToEncrypt = "";
}
else {
- strToEncrypt = aPassword.length() + LEN_SEPARATOR_STR + aPassword ;
+ strToEncrypt = aPassword.length() + LEN_SEPARATOR_STR + aPassword;
}
try {
- Cipher engine = Cipher.getInstance(CRYPT_ALGO) ;
- PBEKeySpec keySpec = new PBEKeySpec(encryptKey) ;
- SecretKeyFactory skf = SecretKeyFactory.getInstance(PBE_KEY_ALGO) ;
- SecretKey key = skf.generateSecret(keySpec) ;
+ Cipher engine = Cipher.getInstance(CRYPT_ALGO);
+ PBEKeySpec keySpec = new PBEKeySpec(encryptKey);
+ SecretKeyFactory skf = SecretKeyFactory.getInstance(PBE_KEY_ALGO);
+ SecretKey key = skf.generateSecret(keySpec);
engine.init(Cipher.ENCRYPT_MODE, key, new PBEParameterSpec(salt, ITERATION_COUNT));
- byte[] encryptedStr = engine.doFinal(strToEncrypt.getBytes()) ;
- ret = new String(Base64.encode(encryptedStr)) ;
+ byte[] encryptedStr = engine.doFinal(strToEncrypt.getBytes());
+ ret = new String(Base64.encode(encryptedStr));
}
catch(Throwable t) {
LOG.error("Unable to encrypt password due to error", t);
- throw new IOException("Unable to encrypt password due to error", t) ;
+ throw new IOException("Unable to encrypt password due to error", t);
}
- return ret ;
+ return ret;
}
public static String decryptPassword(String aPassword) throws IOException {
- String ret = null ;
+ String ret = null;
Map<String, String> env = System.getenv();
- String encryptKeyStr = env.get("ENCRYPT_KEY") ;
+ String encryptKeyStr = env.get("ENCRYPT_KEY");
char[] encryptKey;
if (encryptKeyStr == null) {
encryptKey=ENCRYPT_KEY;
}else{
encryptKey=encryptKeyStr.toCharArray();
}
- String saltStr = env.get("ENCRYPT_SALT") ;
+ String saltStr = env.get("ENCRYPT_SALT");
byte[] salt;
if (saltStr == null) {
- salt = SALT ;
+ salt = SALT;
}else{
salt=saltStr.getBytes();
}
try {
- byte[] decodedPassword = Base64.decode(aPassword) ;
- Cipher engine = Cipher.getInstance(CRYPT_ALGO) ;
- PBEKeySpec keySpec = new PBEKeySpec(encryptKey) ;
- SecretKeyFactory skf = SecretKeyFactory.getInstance(PBE_KEY_ALGO) ;
- SecretKey key = skf.generateSecret(keySpec) ;
+ byte[] decodedPassword = Base64.decode(aPassword);
+ Cipher engine = Cipher.getInstance(CRYPT_ALGO);
+ PBEKeySpec keySpec = new PBEKeySpec(encryptKey);
+ SecretKeyFactory skf = SecretKeyFactory.getInstance(PBE_KEY_ALGO);
+ SecretKey key = skf.generateSecret(keySpec);
engine.init(Cipher.DECRYPT_MODE, key,new PBEParameterSpec(salt, ITERATION_COUNT));
- String decrypted = new String(engine.doFinal(decodedPassword)) ;
- int foundAt = decrypted.indexOf(LEN_SEPARATOR_STR) ;
+ String decrypted = new String(engine.doFinal(decodedPassword));
+ int foundAt = decrypted.indexOf(LEN_SEPARATOR_STR);
if (foundAt > -1) {
if (decrypted.length() > foundAt) {
- ret = decrypted.substring(foundAt+1) ;
+ ret = decrypted.substring(foundAt+1);
}
else {
- ret = "" ;
+ ret = "";
}
}
else {
@@ -125,35 +125,35 @@ public class PasswordUtils {
}
catch(Throwable t) {
LOG.error("Unable to decrypt password due to error", t);
- throw new IOException("Unable to decrypt password due to error", t) ;
+ throw new IOException("Unable to decrypt password due to error", t);
}
- return ret ;
+ return ret;
}
public static void main(String[] args) {
- String[] testPasswords = { "a", "a123", "dsfdsgdg", "*7263^5#", "", null } ;
+ String[] testPasswords = { "a", "a123", "dsfdsgdg", "*7263^5#", "", null };
for(String password : testPasswords) {
try {
- String ePassword = PasswordUtils.encryptPassword(password) ;
- String dPassword = PasswordUtils.decryptPassword(ePassword) ;
+ String ePassword = PasswordUtils.encryptPassword(password);
+ String dPassword = PasswordUtils.decryptPassword(ePassword);
if (password == null ) {
if (dPassword != null) {
- throw new RuntimeException("The password expected [" + password + "]. Found [" + dPassword + "]") ;
+ throw new RuntimeException("The password expected [" + password + "]. Found [" + dPassword + "]");
}
else {
- System.out.println("Password: [" + password + "] matched after decrypt. Encrypted: [" + ePassword + "]") ;
+ System.out.println("Password: [" + password + "] matched after decrypt. Encrypted: [" + ePassword + "]");
}
}
else if (! password.equals(dPassword)) {
- throw new RuntimeException("The password expected [" + password + "]. Found [" + dPassword + "]") ;
+ throw new RuntimeException("The password expected [" + password + "]. Found [" + dPassword + "]");
}
else {
- System.out.println("Password: [" + password + "] matched after decrypt. Encrypted: [" + ePassword + "]") ;
+ System.out.println("Password: [" + password + "] matched after decrypt. Encrypted: [" + ePassword + "]");
}
}
catch(IOException ioe) {
ioe.printStackTrace();
- System.out.println("Password verification failed for password [" + password + "]:" + ioe) ;
+ System.out.println("Password verification failed for password [" + password + "]:" + ioe);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTClient.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTClient.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTClient.java
index fa800fe..5218624 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTClient.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTClient.java
@@ -79,9 +79,9 @@ public class RangerRESTClient {
public static final String RANGER_POLICYMGR_TRUSTSTORE_FILE_CREDENTIAL_ALIAS = "sslTrustStore";
public static final String RANGER_POLICYMGR_TRUSTSTORE_FILE_TYPE_DEFAULT = "jks";
- public static final String RANGER_SSL_KEYMANAGER_ALGO_TYPE = "SunX509" ;
- public static final String RANGER_SSL_TRUSTMANAGER_ALGO_TYPE = "SunX509" ;
- public static final String RANGER_SSL_CONTEXT_ALGO_TYPE = "SSL" ;
+ public static final String RANGER_SSL_KEYMANAGER_ALGO_TYPE = "SunX509";
+ public static final String RANGER_SSL_TRUSTMANAGER_ALGO_TYPE = "SunX509";
+ public static final String RANGER_SSL_CONTEXT_ALGO_TYPE = "SSL";
private String mUrl = null;
private String mSslConfigFileName = null;
@@ -232,12 +232,12 @@ public class RangerRESTClient {
mIsSSL = StringUtil.containsIgnoreCase(mUrl, "https");
- InputStream in = null ;
+ InputStream in = null;
try {
- Configuration conf = new Configuration() ;
+ Configuration conf = new Configuration();
- in = getFileInputStream(mSslConfigFileName) ;
+ in = getFileInputStream(mSslConfigFileName);
if (in != null) {
conf.addResource(in);
@@ -267,10 +267,10 @@ public class RangerRESTClient {
String keyStoreFilepwd = getCredential(mKeyStoreURL, mKeyStoreAlias);
if (!StringUtil.isEmpty(mKeyStoreFile) && !StringUtil.isEmpty(keyStoreFilepwd)) {
- InputStream in = null ;
+ InputStream in = null;
try {
- in = getFileInputStream(mKeyStoreFile) ;
+ in = getFileInputStream(mKeyStoreFile);
if (in != null) {
KeyStore keyStore = KeyStore.getInstance(mKeyStoreType);
@@ -311,10 +311,10 @@ public class RangerRESTClient {
String trustStoreFilepwd = getCredential(mTrustStoreURL, mTrustStoreAlias);
if (!StringUtil.isEmpty(mTrustStoreFile) && !StringUtil.isEmpty(trustStoreFilepwd)) {
- InputStream in = null ;
+ InputStream in = null;
try {
- in = getFileInputStream(mTrustStoreFile) ;
+ in = getFileInputStream(mTrustStoreFile);
if (in != null) {
KeyStore trustStore = KeyStore.getInstance(mTrustStoreType);
@@ -373,28 +373,28 @@ public class RangerRESTClient {
}
private InputStream getFileInputStream(String fileName) throws IOException {
- InputStream in = null ;
+ InputStream in = null;
if(! StringUtil.isEmpty(fileName)) {
- File f = new File(fileName) ;
+ File f = new File(fileName);
if (f.exists()) {
- in = new FileInputStream(f) ;
+ in = new FileInputStream(f);
}
else {
- in = ClassLoader.getSystemResourceAsStream(fileName) ;
+ in = ClassLoader.getSystemResourceAsStream(fileName);
}
}
- return in ;
+ return in;
}
private void close(InputStream str, String filename) {
if (str != null) {
try {
- str.close() ;
+ str.close();
} catch (IOException excp) {
- LOG.error("Error while closing file: [" + filename + "]", excp) ;
+ LOG.error("Error while closing file: [" + filename + "]", excp);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTUtils.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTUtils.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTUtils.java
index e622ad2..ed674ee 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTUtils.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTUtils.java
@@ -52,13 +52,13 @@ public class RangerRESTUtils {
public static final String REST_URL_LOOKUP_TAG_NAMES = "/service/tags/lookup";
- public static final String REST_EXPECTED_MIME_TYPE = "application/json" ;
- public static final String REST_MIME_TYPE_JSON = "application/json" ;
+ public static final String REST_EXPECTED_MIME_TYPE = "application/json";
+ public static final String REST_MIME_TYPE_JSON = "application/json";
public static final String REST_PARAM_LAST_KNOWN_POLICY_VERSION = "lastKnownVersion";
public static final String REST_PARAM_PLUGIN_ID = "pluginId";
- private static final int MAX_PLUGIN_ID_LEN = 255 ;
+ private static final int MAX_PLUGIN_ID_LEN = 255;
public String getPolicyRestUrl(String propertyPrefix) {
@@ -112,22 +112,22 @@ public class RangerRESTUtils {
String hostName = null;
try {
- hostName = InetAddress.getLocalHost().getHostName() ;
+ hostName = InetAddress.getLocalHost().getHostName();
} catch (UnknownHostException e) {
LOG.error("ERROR: Unable to find hostname for the agent ", e);
- hostName = "unknownHost" ;
+ hostName = "unknownHost";
}
- String ret = hostName + "-" + serviceName ;
+ String ret = hostName + "-" + serviceName;
if(! StringUtils.isEmpty(appId)) {
ret = appId + "@" + ret;
}
if (ret.length() > MAX_PLUGIN_ID_LEN ) {
- ret = ret.substring(0,MAX_PLUGIN_ID_LEN) ;
+ ret = ret.substring(0,MAX_PLUGIN_ID_LEN);
}
- return ret ;
+ return ret ;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerSslHelper.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerSslHelper.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerSslHelper.java
index a770183..ee8a34e 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerSslHelper.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerSslHelper.java
@@ -63,9 +63,9 @@ public class RangerSslHelper {
static final String RANGER_POLICYMGR_TRUSTSTORE_FILE_CREDENTIAL_ALIAS = "sslTrustStore";
static final String RANGER_POLICYMGR_TRUSTSTORE_FILE_TYPE_DEFAULT = "jks";
- static final String RANGER_SSL_KEYMANAGER_ALGO_TYPE = "SunX509" ;
- static final String RANGER_SSL_TRUSTMANAGER_ALGO_TYPE = "SunX509" ;
- static final String RANGER_SSL_CONTEXT_ALGO_TYPE = "SSL" ;
+ static final String RANGER_SSL_KEYMANAGER_ALGO_TYPE = "SunX509";
+ static final String RANGER_SSL_TRUSTMANAGER_ALGO_TYPE = "SunX509";
+ static final String RANGER_SSL_CONTEXT_ALGO_TYPE = "SSL";
private String mKeyStoreURL = null;
private String mKeyStoreAlias = null;
@@ -108,12 +108,12 @@ public class RangerSslHelper {
}
void readConfig() {
- InputStream in = null ;
+ InputStream in = null;
try {
- Configuration conf = new Configuration() ;
+ Configuration conf = new Configuration();
- in = getFileInputStream(mSslConfigFileName) ;
+ in = getFileInputStream(mSslConfigFileName);
if (in != null) {
conf.addResource(in);
@@ -156,10 +156,10 @@ public class RangerSslHelper {
String keyStoreFilepwd = getCredential(mKeyStoreURL, mKeyStoreAlias);
if (!StringUtil.isEmpty(mKeyStoreFile) && !StringUtil.isEmpty(keyStoreFilepwd)) {
- InputStream in = null ;
+ InputStream in = null;
try {
- in = getFileInputStream(mKeyStoreFile) ;
+ in = getFileInputStream(mKeyStoreFile);
if (in != null) {
KeyStore keyStore = KeyStore.getInstance(mKeyStoreType);
@@ -200,10 +200,10 @@ public class RangerSslHelper {
String trustStoreFilepwd = getCredential(mTrustStoreURL, mTrustStoreAlias);
if (!StringUtil.isEmpty(mTrustStoreFile) && !StringUtil.isEmpty(trustStoreFilepwd)) {
- InputStream in = null ;
+ InputStream in = null;
try {
- in = getFileInputStream(mTrustStoreFile) ;
+ in = getFileInputStream(mTrustStoreFile);
if (in != null) {
KeyStore trustStore = KeyStore.getInstance(mTrustStoreType);
@@ -261,28 +261,28 @@ public class RangerSslHelper {
}
private InputStream getFileInputStream(String fileName) throws IOException {
- InputStream in = null ;
+ InputStream in = null;
if(! StringUtil.isEmpty(fileName)) {
- File f = new File(fileName) ;
+ File f = new File(fileName);
if (f.exists()) {
- in = new FileInputStream(f) ;
+ in = new FileInputStream(f);
}
else {
- in = ClassLoader.getSystemResourceAsStream(fileName) ;
+ in = ClassLoader.getSystemResourceAsStream(fileName);
}
}
- return in ;
+ return in;
}
private void close(InputStream str, String filename) {
if (str != null) {
try {
- str.close() ;
+ str.close();
} catch (IOException excp) {
- LOG.error("Error while closing file: [" + filename + "]", excp) ;
+ LOG.error("Error while closing file: [" + filename + "]", excp);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-common/src/test/java/org/apache/ranger/plugin/policyengine/TestPolicyEngine.java
----------------------------------------------------------------------
diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/policyengine/TestPolicyEngine.java b/agents-common/src/test/java/org/apache/ranger/plugin/policyengine/TestPolicyEngine.java
index 5bd0282..cb0af84 100644
--- a/agents-common/src/test/java/org/apache/ranger/plugin/policyengine/TestPolicyEngine.java
+++ b/agents-common/src/test/java/org/apache/ranger/plugin/policyengine/TestPolicyEngine.java
@@ -105,7 +105,7 @@ public class TestPolicyEngine {
System.out.println("provider=" + provider.toString());
- File file = File.createTempFile("ranger-admin-test-site", ".xml") ;
+ File file = File.createTempFile("ranger-admin-test-site", ".xml");
file.deleteOnExit();
FileOutputStream outStream = new FileOutputStream(file);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-common/src/test/java/org/apache/ranger/plugin/store/TestServiceStore.java
----------------------------------------------------------------------
diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/store/TestServiceStore.java b/agents-common/src/test/java/org/apache/ranger/plugin/store/TestServiceStore.java
index 077289a..90e97b7 100644
--- a/agents-common/src/test/java/org/apache/ranger/plugin/store/TestServiceStore.java
+++ b/agents-common/src/test/java/org/apache/ranger/plugin/store/TestServiceStore.java
@@ -49,19 +49,19 @@ public class TestServiceStore {
public static void setupTest() throws Exception {
- File file = File.createTempFile("fileStore", "dir") ;
+ File file = File.createTempFile("fileStore", "dir");
if (file.exists()) {
- file.delete() ;
+ file.delete();
}
file.deleteOnExit();
- file.mkdirs() ;
+ file.mkdirs();
- String fileStoreDir = file.getAbsolutePath() ;
+ String fileStoreDir = file.getAbsolutePath();
- System.out.println("Using fileStoreDirectory as [" + fileStoreDir + "]") ;
+ System.out.println("Using fileStoreDirectory as [" + fileStoreDir + "]");
svcStore = new ServiceFileStore(fileStoreDir);
svcStore.init();
@@ -250,8 +250,8 @@ public class TestServiceStore {
assertEquals("getPolicies(filter=origPolicyName) failed", 1, policies == null ? 0 : policies.size());
filter = null;
- String osName = System.getProperty("os.name") ;
- boolean windows = (osName != null && osName.toLowerCase().startsWith("windows")) ;
+ String osName = System.getProperty("os.name");
+ boolean windows = (osName != null && osName.toLowerCase().startsWith("windows"));
if (! windows ) {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/agents-common/src/test/java/org/apache/ranger/plugin/store/TestTagStore.java
----------------------------------------------------------------------
diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/store/TestTagStore.java b/agents-common/src/test/java/org/apache/ranger/plugin/store/TestTagStore.java
index af09562..d8d61d4 100644
--- a/agents-common/src/test/java/org/apache/ranger/plugin/store/TestTagStore.java
+++ b/agents-common/src/test/java/org/apache/ranger/plugin/store/TestTagStore.java
@@ -66,18 +66,18 @@ public class TestTagStore {
" </property>\n" +
"</configuration>\n";
- File file = File.createTempFile("ranger-admin-test-site", ".xml") ;
+ File file = File.createTempFile("ranger-admin-test-site", ".xml");
file.deleteOnExit();
- tagStoreDir = File.createTempFile("tagStore", "dir") ;
+ tagStoreDir = File.createTempFile("tagStore", "dir");
if (tagStoreDir.exists()) {
- tagStoreDir.delete() ;
+ tagStoreDir.delete();
}
- tagStoreDir.mkdirs() ;
+ tagStoreDir.mkdirs();
- String tagStoreDirName = tagStoreDir.getAbsolutePath() ;
+ String tagStoreDirName = tagStoreDir.getAbsolutePath();
String text = String.format(textTemplate, tagStoreDirName, tagStoreDirName);