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:09 UTC
[16/19] incubator-ranger git commit: Removing spaces before semicolons
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/tagsync/src/main/java/org/apache/ranger/tagsync/sink/tagadmin/TagAdminRESTSink.java
----------------------------------------------------------------------
diff --git a/tagsync/src/main/java/org/apache/ranger/tagsync/sink/tagadmin/TagAdminRESTSink.java b/tagsync/src/main/java/org/apache/ranger/tagsync/sink/tagadmin/TagAdminRESTSink.java
index 541c5aa..b1225c2 100644
--- a/tagsync/src/main/java/org/apache/ranger/tagsync/sink/tagadmin/TagAdminRESTSink.java
+++ b/tagsync/src/main/java/org/apache/ranger/tagsync/sink/tagadmin/TagAdminRESTSink.java
@@ -49,7 +49,7 @@ public class TagAdminRESTSink implements TagSink, Runnable {
private static final String REST_PREFIX = "/service";
private static final String MODULE_PREFIX = "/tags";
- private static final String REST_MIME_TYPE_JSON = "application/json" ;
+ private static final String REST_MIME_TYPE_JSON = "application/json";
private static final String REST_URL_IMPORT_SERVICETAGS_RESOURCE = REST_PREFIX + MODULE_PREFIX + "/importservicetags/";
@@ -136,7 +136,7 @@ public class TagAdminRESTSink implements TagSink, Runnable {
private ServiceTags doUpload(ServiceTags serviceTags) throws Exception {
if(!StringUtils.isEmpty(authenticationType) && authenticationType.trim().equalsIgnoreCase(AUTH_TYPE_KERBEROS) && SecureClientLogin.isKerberosCredentialExists(principal, keytab)){
try{
- Subject sub = SecureClientLogin.loginUserFromKeytab(principal, keytab, nameRules) ;
+ Subject sub = SecureClientLogin.loginUserFromKeytab(principal, keytab, nameRules);
if(LOG.isDebugEnabled()) {
LOG.debug("Using Principal = "+ principal + ", keytab = "+keytab);
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/tagsync/src/main/java/org/apache/ranger/tagsync/source/atlasrest/AtlasRESTUtil.java
----------------------------------------------------------------------
diff --git a/tagsync/src/main/java/org/apache/ranger/tagsync/source/atlasrest/AtlasRESTUtil.java b/tagsync/src/main/java/org/apache/ranger/tagsync/source/atlasrest/AtlasRESTUtil.java
index 01aaec2..cca7caf 100644
--- a/tagsync/src/main/java/org/apache/ranger/tagsync/source/atlasrest/AtlasRESTUtil.java
+++ b/tagsync/src/main/java/org/apache/ranger/tagsync/source/atlasrest/AtlasRESTUtil.java
@@ -47,7 +47,7 @@ import java.util.Map;
public class AtlasRESTUtil {
private static final Logger LOG = Logger.getLogger(AtlasRESTUtil.class);
- private static final String REST_MIME_TYPE_JSON = "application/json" ;
+ private static final String REST_MIME_TYPE_JSON = "application/json";
private static final String API_ATLAS_TYPES = "api/atlas/types";
private static final String API_ATLAS_ENTITIES = "api/atlas/entities?type=";
private static final String API_ATLAS_ENTITY = "api/atlas/entities/";
@@ -251,7 +251,7 @@ public class AtlasRESTUtil {
try {
if (kerberized) {
LOG.debug("Using kerberos authentication");
- Subject sub = SecureClientLogin.loginUserFromKeytab(principal, keytab, nameRules) ;
+ Subject sub = SecureClientLogin.loginUserFromKeytab(principal, keytab, nameRules);
if(LOG.isDebugEnabled()) {
LOG.debug("Using Principal = "+ principal + ", keytab = "+keytab);
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/LdapConfig.java
----------------------------------------------------------------------
diff --git a/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/LdapConfig.java b/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/LdapConfig.java
index 0480b76..9689f25 100644
--- a/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/LdapConfig.java
+++ b/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/LdapConfig.java
@@ -61,7 +61,7 @@ public class LdapConfig {
private static final String LGSYNC_USER_GROUP_NAME_ATTRIBUTE = "ranger.usersync.ldap.user.groupnameattribute";
- public static final String UGSYNC_NONE_CASE_CONVERSION_VALUE = "none" ;
+ public static final String UGSYNC_NONE_CASE_CONVERSION_VALUE = "none";
public static final String UGSYNC_LOWER_CASE_CONVERSION_VALUE = "lower";
private static final String UGSYNC_USERNAME_CASE_CONVERSION_PARAM = "ranger.usersync.ldap.username.caseconversion";
@@ -172,7 +172,7 @@ public class LdapConfig {
}
if (ret == null) {
- ret = ClassLoader.getSystemClassLoader().getResourceAsStream(path) ;
+ ret = ClassLoader.getSystemClassLoader().getResourceAsStream(path);
if (ret == null) {
if (! path.startsWith("/")) {
ret = ClassLoader.getSystemResourceAsStream("/" + path);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/CustomSSLSocketFactory.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/CustomSSLSocketFactory.java b/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/CustomSSLSocketFactory.java
index 3ed35e7..e97c477 100644
--- a/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/CustomSSLSocketFactory.java
+++ b/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/CustomSSLSocketFactory.java
@@ -48,7 +48,7 @@ public class CustomSSLSocketFactory extends SSLSocketFactory{
public CustomSSLSocketFactory() {
SSLContext sslContext = null;
- String keyStoreFile = config.getSSLKeyStorePath() ;
+ String keyStoreFile = config.getSSLKeyStorePath();
String keyStoreFilepwd = config.getSSLKeyStorePathPassword();
String trustStoreFile = config.getSSLTrustStorePath();
String trustStoreFilepwd = config.getSSLTrustStorePathPassword();
@@ -62,9 +62,9 @@ public class CustomSSLSocketFactory extends SSLSocketFactory{
if (keyStoreFile != null && keyStoreFilepwd != null) {
KeyStore keyStore = KeyStore.getInstance(keyStoreType);
- InputStream in = null ;
+ InputStream in = null;
try {
- in = getFileInputStream(keyStoreFile) ;
+ in = getFileInputStream(keyStoreFile);
if (in == null) {
LOG.error("Unable to obtain keystore from file [" + keyStoreFile + "]");
return;
@@ -85,9 +85,9 @@ public class CustomSSLSocketFactory extends SSLSocketFactory{
if (trustStoreFile != null && trustStoreFilepwd != null) {
KeyStore trustStore = KeyStore.getInstance(trustStoreType);
- InputStream in = null ;
+ InputStream in = null;
try {
- in = getFileInputStream(trustStoreFile) ;
+ in = getFileInputStream(trustStoreFile);
if (in == null) {
LOG.error("Unable to obtain keystore from file [" + trustStoreFile + "]");
return;
@@ -99,7 +99,7 @@ public class CustomSSLSocketFactory extends SSLSocketFactory{
}
finally {
if (in != null) {
- in.close() ;
+ in.close();
}
}
}
@@ -171,7 +171,7 @@ public class CustomSSLSocketFactory extends SSLSocketFactory{
}
if (ret == null) {
- ret = ClassLoader.getSystemClassLoader().getResourceAsStream(path) ;
+ ret = ClassLoader.getSystemClassLoader().getResourceAsStream(path);
if (ret == null) {
if (! path.startsWith("/")) {
ret = ClassLoader.getSystemResourceAsStream("/" + path);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/LdapUserGroupBuilder.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/LdapUserGroupBuilder.java b/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/LdapUserGroupBuilder.java
index d7a0b36..36246aa 100644
--- a/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/LdapUserGroupBuilder.java
+++ b/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/LdapUserGroupBuilder.java
@@ -91,10 +91,10 @@ public class LdapUserGroupBuilder extends AbstractUserGroupSource {
private LdapContext ldapContext;
StartTlsResponse tls;
- private boolean userNameCaseConversionFlag = false ;
- private boolean groupNameCaseConversionFlag = false ;
- private boolean userNameLowerCaseFlag = false ;
- private boolean groupNameLowerCaseFlag = false ;
+ private boolean userNameCaseConversionFlag = false;
+ private boolean groupNameCaseConversionFlag = false;
+ private boolean userNameLowerCaseFlag = false;
+ private boolean groupNameLowerCaseFlag = false;
private boolean groupUserMapSyncEnabled = false;
@@ -107,26 +107,26 @@ public class LdapUserGroupBuilder extends AbstractUserGroupSource {
public LdapUserGroupBuilder() {
super();
- LOG.info("LdapUserGroupBuilder created") ;
+ LOG.info("LdapUserGroupBuilder created");
- String userNameCaseConversion = config.getUserNameCaseConversion() ;
+ String userNameCaseConversion = config.getUserNameCaseConversion();
if (UserGroupSyncConfig.UGSYNC_NONE_CASE_CONVERSION_VALUE.equalsIgnoreCase(userNameCaseConversion)) {
- userNameCaseConversionFlag = false ;
+ userNameCaseConversionFlag = false;
}
else {
- userNameCaseConversionFlag = true ;
- userNameLowerCaseFlag = UserGroupSyncConfig.UGSYNC_LOWER_CASE_CONVERSION_VALUE.equalsIgnoreCase(userNameCaseConversion) ;
+ userNameCaseConversionFlag = true;
+ userNameLowerCaseFlag = UserGroupSyncConfig.UGSYNC_LOWER_CASE_CONVERSION_VALUE.equalsIgnoreCase(userNameCaseConversion);
}
- String groupNameCaseConversion = config.getGroupNameCaseConversion() ;
+ String groupNameCaseConversion = config.getGroupNameCaseConversion();
if (UserGroupSyncConfig.UGSYNC_NONE_CASE_CONVERSION_VALUE.equalsIgnoreCase(groupNameCaseConversion)) {
- groupNameCaseConversionFlag = false ;
+ groupNameCaseConversionFlag = false;
}
else {
- groupNameCaseConversionFlag = true ;
- groupNameLowerCaseFlag = UserGroupSyncConfig.UGSYNC_LOWER_CASE_CONVERSION_VALUE.equalsIgnoreCase(groupNameCaseConversion) ;
+ groupNameCaseConversionFlag = true;
+ groupNameLowerCaseFlag = UserGroupSyncConfig.UGSYNC_LOWER_CASE_CONVERSION_VALUE.equalsIgnoreCase(groupNameCaseConversion);
}
}
@@ -160,7 +160,7 @@ public class LdapUserGroupBuilder extends AbstractUserGroupSource {
ldapContext.addToEnvironment(Context.SECURITY_PRINCIPAL, ldapBindDn);
ldapContext.addToEnvironment(Context.SECURITY_CREDENTIALS, ldapBindPassword);
ldapContext.addToEnvironment(Context.SECURITY_AUTHENTICATION, ldapAuthenticationMechanism);
- ldapContext.addToEnvironment(Context.REFERRAL, ldapReferral) ;
+ ldapContext.addToEnvironment(Context.REFERRAL, ldapReferral);
}
private void setConfig() throws Throwable {
@@ -313,10 +313,10 @@ public class LdapUserGroupBuilder extends AbstractUserGroupSource {
List<String> groupList = userInfo.getGroups();
if (userNameCaseConversionFlag) {
if (userNameLowerCaseFlag) {
- userName = userName.toLowerCase() ;
+ userName = userName.toLowerCase();
}
else {
- userName = userName.toUpperCase() ;
+ userName = userName.toUpperCase();
}
}
@@ -346,10 +346,10 @@ public class LdapUserGroupBuilder extends AbstractUserGroupSource {
List<String> groupList = userInfo.getGroups();
if (userNameCaseConversionFlag) {
if (userNameLowerCaseFlag) {
- userName = userName.toLowerCase() ;
+ userName = userName.toLowerCase();
}
else {
- userName = userName.toUpperCase() ;
+ userName = userName.toUpperCase();
}
}
@@ -511,10 +511,10 @@ public class LdapUserGroupBuilder extends AbstractUserGroupSource {
List<String> groupList = userInfo.getGroups();
if (userNameCaseConversionFlag) {
if (userNameLowerCaseFlag) {
- userName = userName.toLowerCase() ;
+ userName = userName.toLowerCase();
}
else {
- userName = userName.toUpperCase() ;
+ userName = userName.toUpperCase();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/PolicyMgrUserGroupBuilder.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/PolicyMgrUserGroupBuilder.java b/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/PolicyMgrUserGroupBuilder.java
index 987c6d1..d275181 100644
--- a/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/PolicyMgrUserGroupBuilder.java
+++ b/ugsync/src/main/java/org/apache/ranger/ldapusersync/process/PolicyMgrUserGroupBuilder.java
@@ -22,8 +22,8 @@ package org.apache.ranger.ldapusersync.process;
public class PolicyMgrUserGroupBuilder extends org.apache.ranger.unixusersync.process.PolicyMgrUserGroupBuilder {
public static void main(String[] args) throws Throwable {
- PolicyMgrUserGroupBuilder ugbuilder = new PolicyMgrUserGroupBuilder() ;
- ugbuilder.init() ;
+ PolicyMgrUserGroupBuilder ugbuilder = new PolicyMgrUserGroupBuilder();
+ ugbuilder.init();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/ugsync/src/main/java/org/apache/ranger/unixusersync/config/UserGroupSyncConfig.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/config/UserGroupSyncConfig.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/config/UserGroupSyncConfig.java
index 9a906b1..938f6f8 100644
--- a/ugsync/src/main/java/org/apache/ranger/unixusersync/config/UserGroupSyncConfig.java
+++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/config/UserGroupSyncConfig.java
@@ -48,40 +48,40 @@ import org.apache.log4j.Logger;
public class UserGroupSyncConfig {
- public static final String CONFIG_FILE = "ranger-ugsync-site.xml" ;
- private static final Logger LOG = Logger.getLogger(UserGroupSyncConfig.class) ;
+ public static final String CONFIG_FILE = "ranger-ugsync-site.xml";
+ private static final Logger LOG = Logger.getLogger(UserGroupSyncConfig.class);
- public static final String DEFAULT_CONFIG_FILE = "ranger-ugsync-default-site.xml" ;
+ public static final String DEFAULT_CONFIG_FILE = "ranger-ugsync-default-site.xml";
private static final String CORE_SITE_CONFIG_FILE = "core-site.xml";
- public static final String UGSYNC_ENABLED_PROP = "ranger.usersync.enabled" ;
+ public static final String UGSYNC_ENABLED_PROP = "ranger.usersync.enabled";
- public static final String UGSYNC_PM_URL_PROP = "ranger.usersync.policymanager.baseURL" ;
+ public static final String UGSYNC_PM_URL_PROP = "ranger.usersync.policymanager.baseURL";
- public static final String UGSYNC_MIN_USERID_PROP = "ranger.usersync.unix.minUserId" ;
+ public static final String UGSYNC_MIN_USERID_PROP = "ranger.usersync.unix.minUserId";
- public static final String UGSYNC_MIN_GROUPID_PROP = "ranger.usersync.unix.minGroupId" ;
- public static final String DEFAULT_UGSYNC_MIN_GROUPID = "0" ;
+ public static final String UGSYNC_MIN_GROUPID_PROP = "ranger.usersync.unix.minGroupId";
+ public static final String DEFAULT_UGSYNC_MIN_GROUPID = "0";
- public static final String UGSYNC_MAX_RECORDS_PER_API_CALL_PROP = "ranger.usersync.policymanager.maxrecordsperapicall" ;
+ public static final String UGSYNC_MAX_RECORDS_PER_API_CALL_PROP = "ranger.usersync.policymanager.maxrecordsperapicall";
- public static final String UGSYNC_MOCK_RUN_PROP = "ranger.usersync.policymanager.mockrun" ;
+ public static final String UGSYNC_MOCK_RUN_PROP = "ranger.usersync.policymanager.mockrun";
public static final String UGSYNC_SOURCE_FILE_PROC = "ranger.usersync.filesource.file";
public static final String UGSYNC_SOURCE_FILE_DELIMITER = "ranger.usersync.filesource.text.delimiter";
public static final String UGSYNC_SOURCE_FILE_DELIMITERER = "ranger.usersync.filesource.text.delimiterer";
- private static final String SSL_KEYSTORE_PATH_PARAM = "ranger.usersync.keystore.file" ;
+ private static final String SSL_KEYSTORE_PATH_PARAM = "ranger.usersync.keystore.file";
- private static final String SSL_KEYSTORE_PATH_PASSWORD_PARAM = "ranger.usersync.keystore.password" ;
+ private static final String SSL_KEYSTORE_PATH_PASSWORD_PARAM = "ranger.usersync.keystore.password";
- private static final String SSL_TRUSTSTORE_PATH_PARAM = "ranger.usersync.truststore.file" ;
+ private static final String SSL_TRUSTSTORE_PATH_PARAM = "ranger.usersync.truststore.file";
- private static final String SSL_TRUSTSTORE_PATH_PASSWORD_PARAM = "ranger.usersync.truststore.password" ;
+ private static final String SSL_TRUSTSTORE_PATH_PASSWORD_PARAM = "ranger.usersync.truststore.password";
- private static final String UGSYNC_SLEEP_TIME_IN_MILLIS_BETWEEN_CYCLE_PARAM = "ranger.usersync.sleeptimeinmillisbetweensynccycle" ;
+ private static final String UGSYNC_SLEEP_TIME_IN_MILLIS_BETWEEN_CYCLE_PARAM = "ranger.usersync.sleeptimeinmillisbetweensynccycle";
private static final long UGSYNC_SLEEP_TIME_IN_MILLIS_BETWEEN_CYCLE_MIN_VALUE = 60000L;
@@ -132,14 +132,14 @@ public class UserGroupSyncConfig {
private static final String LGSYNC_USER_GROUP_NAME_ATTRIBUTE = "ranger.usersync.ldap.user.groupnameattribute";
private static final String DEFAULT_USER_GROUP_NAME_ATTRIBUTE = "memberof,ismemberof";
- public static final String UGSYNC_NONE_CASE_CONVERSION_VALUE = "none" ;
- public static final String UGSYNC_LOWER_CASE_CONVERSION_VALUE = "lower" ;
- public static final String UGSYNC_UPPER_CASE_CONVERSION_VALUE = "upper" ;
+ public static final String UGSYNC_NONE_CASE_CONVERSION_VALUE = "none";
+ public static final String UGSYNC_LOWER_CASE_CONVERSION_VALUE = "lower";
+ public static final String UGSYNC_UPPER_CASE_CONVERSION_VALUE = "upper";
- private static final String UGSYNC_USERNAME_CASE_CONVERSION_PARAM = "ranger.usersync.ldap.username.caseconversion" ;
+ private static final String UGSYNC_USERNAME_CASE_CONVERSION_PARAM = "ranger.usersync.ldap.username.caseconversion";
private static final String DEFAULT_UGSYNC_USERNAME_CASE_CONVERSION_VALUE = UGSYNC_NONE_CASE_CONVERSION_VALUE;
- private static final String UGSYNC_GROUPNAME_CASE_CONVERSION_PARAM = "ranger.usersync.ldap.groupname.caseconversion" ;
+ private static final String UGSYNC_GROUPNAME_CASE_CONVERSION_PARAM = "ranger.usersync.ldap.groupname.caseconversion";
private static final String DEFAULT_UGSYNC_GROUPNAME_CASE_CONVERSION_VALUE = UGSYNC_NONE_CASE_CONVERSION_VALUE;
private static final String DEFAULT_USER_GROUP_TEXTFILE_DELIMITER = ",";
@@ -216,21 +216,21 @@ public class UserGroupSyncConfig {
private static final String SYNC_MAPPING_GROUPNAME_HANDLER = "ranger.usersync.mapping.groupname.handler";
private static final String DEFAULT_SYNC_MAPPING_GROUPNAME_HANDLER = "org.apache.ranger.usergroupsync.RegEx";
- private Properties prop = new Properties() ;
+ private Properties prop = new Properties();
- private static volatile UserGroupSyncConfig me = null ;
+ private static volatile UserGroupSyncConfig me = null;
public static UserGroupSyncConfig getInstance() {
UserGroupSyncConfig result = me;
if (result == null) {
synchronized(UserGroupSyncConfig.class) {
- result = me ;
+ result = me;
if (result == null) {
- me = result = new UserGroupSyncConfig() ;
+ me = result = new UserGroupSyncConfig();
}
}
}
- return result ;
+ return result;
}
private UserGroupSyncConfig() {
@@ -248,7 +248,7 @@ public class UserGroupSyncConfig {
InputStream in = getFileInputStream(fileName);
if (in != null) {
try {
-// prop.load(in) ;
+// prop.load(in);
DocumentBuilderFactory xmlDocumentBuilderFactory = DocumentBuilderFactory
.newInstance();
xmlDocumentBuilderFactory.setIgnoringComments(true);
@@ -285,7 +285,7 @@ public class UserGroupSyncConfig {
}
if (prop.get(propertyName) != null) {
- prop.remove(propertyName) ;
+ prop.remove(propertyName);
}
prop.put(propertyName, propertyValue);
@@ -295,7 +295,7 @@ public class UserGroupSyncConfig {
}
finally {
try {
- in.close() ;
+ in.close();
}
catch(IOException ioe) {
// Ignore IOE when closing stream
@@ -303,7 +303,7 @@ public class UserGroupSyncConfig {
}
}
} catch (Throwable e) {
- throw new RuntimeException("Unable to load configuration file [" + CONFIG_FILE + "]", e) ;
+ throw new RuntimeException("Unable to load configuration file [" + CONFIG_FILE + "]", e);
}
}
@@ -326,7 +326,7 @@ public class UserGroupSyncConfig {
}
if (ret == null) {
- ret = ClassLoader.getSystemClassLoader().getResourceAsStream(path) ;
+ ret = ClassLoader.getSystemClassLoader().getResourceAsStream(path);
if (ret == null) {
if (! path.startsWith("/")) {
ret = ClassLoader.getSystemResourceAsStream("/" + path);
@@ -339,12 +339,12 @@ public class UserGroupSyncConfig {
}
public String getUserSyncFileSource(){
- String val = prop.getProperty(UGSYNC_SOURCE_FILE_PROC) ;
+ String val = prop.getProperty(UGSYNC_SOURCE_FILE_PROC);
return val;
}
public String getUserSyncFileSourceDelimiter(){
- String val = prop.getProperty(UGSYNC_SOURCE_FILE_DELIMITER) ;
+ String val = prop.getProperty(UGSYNC_SOURCE_FILE_DELIMITER);
if (val == null) {
val = prop.getProperty(UGSYNC_SOURCE_FILE_DELIMITERER);
}
@@ -365,8 +365,8 @@ public class UserGroupSyncConfig {
}
public boolean isUserSyncEnabled() {
- String val = prop.getProperty(UGSYNC_ENABLED_PROP) ;
- return (val != null && val.trim().equalsIgnoreCase("true")) ;
+ String val = prop.getProperty(UGSYNC_ENABLED_PROP);
+ return (val != null && val.trim().equalsIgnoreCase("true"));
}
public String getEnumerateGroups() {
@@ -374,22 +374,22 @@ public class UserGroupSyncConfig {
}
public boolean isGroupEnumerateEnabled() {
- String val = prop.getProperty(UGSYNC_GROUP_ENUMERATE_ENABLED) ;
- return (val != null && val.trim().equalsIgnoreCase("true")) ;
+ String val = prop.getProperty(UGSYNC_GROUP_ENUMERATE_ENABLED);
+ return (val != null && val.trim().equalsIgnoreCase("true"));
}
public boolean isMockRunEnabled() {
- String val = prop.getProperty(UGSYNC_MOCK_RUN_PROP) ;
- return (val != null && val.trim().equalsIgnoreCase("true")) ;
+ String val = prop.getProperty(UGSYNC_MOCK_RUN_PROP);
+ return (val != null && val.trim().equalsIgnoreCase("true"));
}
public String getPolicyManagerBaseURL() {
- return prop.getProperty(UGSYNC_PM_URL_PROP) ;
+ return prop.getProperty(UGSYNC_PM_URL_PROP);
}
public String getMinUserId() {
- return prop.getProperty(UGSYNC_MIN_USERID_PROP) ;
+ return prop.getProperty(UGSYNC_MIN_USERID_PROP);
}
public String getMinGroupId() {
@@ -401,35 +401,35 @@ public class UserGroupSyncConfig {
}
public String getMaxRecordsPerAPICall() {
- return prop.getProperty(UGSYNC_MAX_RECORDS_PER_API_CALL_PROP) ;
+ return prop.getProperty(UGSYNC_MAX_RECORDS_PER_API_CALL_PROP);
}
public String getSSLKeyStorePath() {
- return prop.getProperty(SSL_KEYSTORE_PATH_PARAM) ;
+ return prop.getProperty(SSL_KEYSTORE_PATH_PARAM);
}
public String getSSLKeyStorePathPassword() {
- return prop.getProperty(SSL_KEYSTORE_PATH_PASSWORD_PARAM) ;
+ return prop.getProperty(SSL_KEYSTORE_PATH_PASSWORD_PARAM);
}
public String getSSLTrustStorePath() {
- return prop.getProperty(SSL_TRUSTSTORE_PATH_PARAM) ;
+ return prop.getProperty(SSL_TRUSTSTORE_PATH_PARAM);
}
public String getSSLTrustStorePathPassword() {
- return prop.getProperty(SSL_TRUSTSTORE_PATH_PASSWORD_PARAM) ;
+ return prop.getProperty(SSL_TRUSTSTORE_PATH_PASSWORD_PARAM);
}
public long getUpdateMillisMin() {
- String val = prop.getProperty(UGSYNC_UPDATE_MILLIS_MIN) ;
+ String val = prop.getProperty(UGSYNC_UPDATE_MILLIS_MIN);
if (val == null) {
- return DEFAULT_UGSYNC_UPDATE_MILLIS_MIN ;
+ return DEFAULT_UGSYNC_UPDATE_MILLIS_MIN;
}
- long ret = Long.parseLong(val) ;
+ long ret = Long.parseLong(val);
if (ret < DEFAULT_UGSYNC_UPDATE_MILLIS_MIN) {
return DEFAULT_UGSYNC_UPDATE_MILLIS_MIN;
}
@@ -438,27 +438,27 @@ public class UserGroupSyncConfig {
}
public long getSleepTimeInMillisBetweenCycle() throws Throwable {
- String val = prop.getProperty(UGSYNC_SLEEP_TIME_IN_MILLIS_BETWEEN_CYCLE_PARAM) ;
+ String val = prop.getProperty(UGSYNC_SLEEP_TIME_IN_MILLIS_BETWEEN_CYCLE_PARAM);
if (val == null) {
if (LGSYNC_SOURCE_CLASS.equals(getUserGroupSource().getClass().getName())) {
- return UGSYNC_SLEEP_TIME_IN_MILLIS_BETWEEN_CYCLE_LDAP_DEFAULT_VALUE ;
+ return UGSYNC_SLEEP_TIME_IN_MILLIS_BETWEEN_CYCLE_LDAP_DEFAULT_VALUE;
} else {
- return UGSYNC_SLEEP_TIME_IN_MILLIS_BETWEEN_CYCLE_UNIX_DEFAULT_VALUE ;
+ return UGSYNC_SLEEP_TIME_IN_MILLIS_BETWEEN_CYCLE_UNIX_DEFAULT_VALUE;
}
}
else {
- long ret = Long.parseLong(val) ;
+ long ret = Long.parseLong(val);
long min_interval;
if (LGSYNC_SOURCE_CLASS.equals(getUserGroupSource().getClass().getName())) {
- min_interval = UGSYNC_SLEEP_TIME_IN_MILLIS_BETWEEN_CYCLE_LDAP_DEFAULT_VALUE ;
+ min_interval = UGSYNC_SLEEP_TIME_IN_MILLIS_BETWEEN_CYCLE_LDAP_DEFAULT_VALUE;
}else if(UGSYNC_SOURCE_CLASS.equals(getUserGroupSource().getClass().getName())){
min_interval = UGSYNC_SLEEP_TIME_IN_MILLIS_BETWEEN_CYCLE_UNIX_DEFAULT_VALUE;
} else {
- min_interval = UGSYNC_SLEEP_TIME_IN_MILLIS_BETWEEN_CYCLE_MIN_VALUE ;
+ min_interval = UGSYNC_SLEEP_TIME_IN_MILLIS_BETWEEN_CYCLE_MIN_VALUE;
}
if(ret < min_interval)
{
- LOG.info("Sleep Time Between Cycle can not be lower than [" + min_interval + "] millisec. resetting to min value.") ;
+ LOG.info("Sleep Time Between Cycle can not be lower than [" + min_interval + "] millisec. resetting to min value.");
ret = min_interval;
}
return ret;
@@ -468,18 +468,18 @@ public class UserGroupSyncConfig {
public UserGroupSource getUserGroupSource() throws Throwable {
- String val = prop.getProperty(UGSYNC_SOURCE_CLASS_PARAM) ;
+ String val = prop.getProperty(UGSYNC_SOURCE_CLASS_PARAM);
- String syncSource = null ;
+ String syncSource = null;
if(val == null || val.trim().isEmpty()) {
syncSource=getSyncSource();
}
else {
- syncSource = val ;
+ syncSource = val;
}
- String className = val ;
+ String className = val;
if(syncSource!=null && syncSource.equalsIgnoreCase("UNIX")){
className = UGSYNC_SOURCE_CLASS;
@@ -496,7 +496,7 @@ public class UserGroupSyncConfig {
public UserGroupSink getUserGroupSink() throws Throwable {
- String val = prop.getProperty(UGSYNC_SINK_CLASS_PARAM) ;
+ String val = prop.getProperty(UGSYNC_SINK_CLASS_PARAM);
if(val == null || val.trim().isEmpty()) {
val = UGSYNC_SINK_CLASS;
@@ -627,13 +627,13 @@ public class UserGroupSyncConfig {
}
public String getUserNameCaseConversion() {
- String ret = prop.getProperty(UGSYNC_USERNAME_CASE_CONVERSION_PARAM, DEFAULT_UGSYNC_USERNAME_CASE_CONVERSION_VALUE) ;
- return ret.trim().toLowerCase() ;
+ String ret = prop.getProperty(UGSYNC_USERNAME_CASE_CONVERSION_PARAM, DEFAULT_UGSYNC_USERNAME_CASE_CONVERSION_VALUE);
+ return ret.trim().toLowerCase();
}
public String getGroupNameCaseConversion() {
- String ret = prop.getProperty(UGSYNC_GROUPNAME_CASE_CONVERSION_PARAM, DEFAULT_UGSYNC_GROUPNAME_CASE_CONVERSION_VALUE) ;
- return ret.trim().toLowerCase() ;
+ String ret = prop.getProperty(UGSYNC_GROUPNAME_CASE_CONVERSION_PARAM, DEFAULT_UGSYNC_GROUPNAME_CASE_CONVERSION_VALUE);
+ return ret.trim().toLowerCase();
}
public String getSearchBase() {
@@ -765,11 +765,11 @@ public class UserGroupSyncConfig {
}
public String getProperty(String aPropertyName) {
- return prop.getProperty(aPropertyName) ;
+ return prop.getProperty(aPropertyName);
}
public String getProperty(String aPropertyName, String aDefaultValue) {
- return prop.getProperty(aPropertyName, aDefaultValue) ;
+ return prop.getProperty(aPropertyName, aDefaultValue);
}
public String getPolicyMgrPassword(){
@@ -865,7 +865,7 @@ public class UserGroupSyncConfig {
}
public String getUserSyncMappingUserNameHandler() {
- String val = prop.getProperty(SYNC_MAPPING_USERNAME_HANDLER) ;
+ String val = prop.getProperty(SYNC_MAPPING_USERNAME_HANDLER);
if(val == null) {
val = DEFAULT_SYNC_MAPPING_USERNAME_HANDLER;
@@ -874,7 +874,7 @@ public class UserGroupSyncConfig {
}
public String getUserSyncMappingGroupNameHandler() {
- String val = prop.getProperty(SYNC_MAPPING_GROUPNAME_HANDLER) ;
+ String val = prop.getProperty(SYNC_MAPPING_GROUPNAME_HANDLER);
if(val == null) {
val = DEFAULT_SYNC_MAPPING_GROUPNAME_HANDLER;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/GetXGroupListResponse.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/GetXGroupListResponse.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/model/GetXGroupListResponse.java
index 7377e07..5f1e9af 100644
--- a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/GetXGroupListResponse.java
+++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/model/GetXGroupListResponse.java
@@ -24,10 +24,10 @@ import java.util.List;
import com.google.gson.annotations.SerializedName;
public class GetXGroupListResponse {
- private int totalCount ;
+ private int totalCount;
@SerializedName("vXGroups")
- List<XGroupInfo> xgroupInfoList ;
+ List<XGroupInfo> xgroupInfoList;
public int getTotalCount() {
return totalCount;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/GetXUserGroupListResponse.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/GetXUserGroupListResponse.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/model/GetXUserGroupListResponse.java
index adb80fb..cf6957d 100644
--- a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/GetXUserGroupListResponse.java
+++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/model/GetXUserGroupListResponse.java
@@ -24,10 +24,10 @@ import java.util.List;
import com.google.gson.annotations.SerializedName;
public class GetXUserGroupListResponse {
- private int totalCount ;
+ private int totalCount;
@SerializedName("vXGroupUsers")
- List<XUserGroupInfo> xusergroupInfoList ;
+ List<XUserGroupInfo> xusergroupInfoList;
public int getTotalCount() {
return totalCount;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/GetXUserListResponse.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/GetXUserListResponse.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/model/GetXUserListResponse.java
index c05c04b..809a847 100644
--- a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/GetXUserListResponse.java
+++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/model/GetXUserListResponse.java
@@ -25,10 +25,10 @@ import com.google.gson.annotations.SerializedName;
public class GetXUserListResponse {
- private int totalCount ;
+ private int totalCount;
@SerializedName("vXUsers")
- List<XUserInfo> xuserInfoList ;
+ List<XUserInfo> xuserInfoList;
public int getTotalCount() {
return totalCount;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/MUserInfo.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/MUserInfo.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/model/MUserInfo.java
index 13c6eed..841bac6 100644
--- a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/MUserInfo.java
+++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/model/MUserInfo.java
@@ -21,11 +21,11 @@
public class MUserInfo {
- private String loginId ;
- private String firstName ;
- private String lastName ;
- private String emailAddress ;
- private String[] userRoleList = { "ROLE_USER" } ;
+ private String loginId;
+ private String firstName;
+ private String lastName;
+ private String emailAddress;
+ private String[] userRoleList = { "ROLE_USER" };
public String getLoginId() {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/XGroupInfo.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/XGroupInfo.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/model/XGroupInfo.java
index 9208343..b9e7191 100644
--- a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/XGroupInfo.java
+++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/model/XGroupInfo.java
@@ -21,10 +21,10 @@
public class XGroupInfo {
- private String id ;
- private String name ;
- private String description ;
- private String groupType ;
+ private String id;
+ private String name;
+ private String description;
+ private String groupType;
private String groupSource;
public String getId() {
return id;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/XUserGroupInfo.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/XUserGroupInfo.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/model/XUserGroupInfo.java
index 0efcb68..06b21e0 100644
--- a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/XUserGroupInfo.java
+++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/model/XUserGroupInfo.java
@@ -23,10 +23,10 @@ import com.google.gson.annotations.SerializedName;
public class XUserGroupInfo {
- private String userId ;
+ private String userId;
@SerializedName("name")
- private String groupName ;
- private String parentGroupId ;
+ private String groupName;
+ private String parentGroupId;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/XUserInfo.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/XUserInfo.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/model/XUserInfo.java
index 732e35b..7d636fd 100644
--- a/ugsync/src/main/java/org/apache/ranger/unixusersync/model/XUserInfo.java
+++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/model/XUserInfo.java
@@ -23,11 +23,11 @@ import java.util.ArrayList;
import java.util.List;
public class XUserInfo {
- private String id ;
- private String name ;
- private String description ;
+ private String id;
+ private String name;
+ private String description;
- private List<String> groupNameList = new ArrayList<String>() ;
+ private List<String> groupNameList = new ArrayList<String>();
public String getId() {
return id;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/ListUserGroupTest.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/ListUserGroupTest.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/ListUserGroupTest.java
index 94d569a..fae0870 100644
--- a/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/ListUserGroupTest.java
+++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/ListUserGroupTest.java
@@ -33,7 +33,7 @@ public class ListUserGroupTest {
public static void main(String[] args) {
- clientusergroupmapping = RangerClientUserGroupMapping.buildClientUserGroupMapping(passwdfile) ;
+ clientusergroupmapping = RangerClientUserGroupMapping.buildClientUserGroupMapping(passwdfile);
System.out.println(clientusergroupmapping);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/RangerUpdateUserGroupMapping.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/RangerUpdateUserGroupMapping.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/RangerUpdateUserGroupMapping.java
index 2af4d5e..2edf683 100644
--- a/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/RangerUpdateUserGroupMapping.java
+++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/poc/RangerUpdateUserGroupMapping.java
@@ -62,10 +62,10 @@ public class RangerUpdateUserGroupMapping {
/*
//get user group mapping from DB
- usergroupmapping = RangerUserGroupMapping.buildUserGroupMapping(url) ;
+ usergroupmapping = RangerUserGroupMapping.buildUserGroupMapping(url);
//get user group mapping from client system file
- clientusergroupmapping = RangerClientUserGroupMapping.buildClientUserGroupMapping(passwdfile) ;
+ clientusergroupmapping = RangerClientUserGroupMapping.buildClientUserGroupMapping(passwdfile);
compare_and_update(usergroupmapping,clientusergroupmapping);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/ugsync/src/main/java/org/apache/ranger/unixusersync/process/FileSourceUserGroupBuilder.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/process/FileSourceUserGroupBuilder.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/process/FileSourceUserGroupBuilder.java
index e9163e5..298941a 100644
--- a/ugsync/src/main/java/org/apache/ranger/unixusersync/process/FileSourceUserGroupBuilder.java
+++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/process/FileSourceUserGroupBuilder.java
@@ -41,15 +41,15 @@ import com.google.gson.GsonBuilder;
import com.google.gson.stream.JsonReader;
public class FileSourceUserGroupBuilder extends AbstractUserGroupSource {
- private static final Logger LOG = Logger.getLogger(FileSourceUserGroupBuilder.class) ;
+ private static final Logger LOG = Logger.getLogger(FileSourceUserGroupBuilder.class);
private Map<String,List<String>> user2GroupListMap = new HashMap<String,List<String>>();
private String userGroupFilename = null;
- private long usergroupFileModified = 0 ;
+ private long usergroupFileModified = 0;
public static void main(String[] args) throws Throwable {
- FileSourceUserGroupBuilder filesourceUGBuilder = new FileSourceUserGroupBuilder() ;
+ FileSourceUserGroupBuilder filesourceUGBuilder = new FileSourceUserGroupBuilder();
if (args.length > 0) {
filesourceUGBuilder.setUserGroupFilename(args[0]);
@@ -83,9 +83,9 @@ public class FileSourceUserGroupBuilder extends AbstractUserGroupSource {
@Override
public boolean isChanged() {
- long TempUserGroupFileModifedAt = new File(userGroupFilename).lastModified() ;
+ long TempUserGroupFileModifedAt = new File(userGroupFilename).lastModified();
if (usergroupFileModified != TempUserGroupFileModifedAt) {
- return true ;
+ return true;
}
return false;
}
@@ -124,11 +124,11 @@ public class FileSourceUserGroupBuilder extends AbstractUserGroupSource {
private void print() {
for(String user : user2GroupListMap.keySet()) {
- LOG.debug("USER:" + user) ;
- List<String> groups = user2GroupListMap.get(user) ;
+ LOG.debug("USER:" + user);
+ List<String> groups = user2GroupListMap.get(user);
if (groups != null) {
for(String group : groups) {
- LOG.debug("\tGROUP: " + group) ;
+ LOG.debug("\tGROUP: " + group);
}
}
}
@@ -160,7 +160,7 @@ public class FileSourceUserGroupBuilder extends AbstractUserGroupSource {
if(tmpUser2GroupListMap != null) {
user2GroupListMap = tmpUser2GroupListMap;
- usergroupFileModified = f.lastModified() ;
+ usergroupFileModified = f.lastModified();
} else {
LOG.info("No new UserGroup to sync at this time");
}
@@ -184,7 +184,7 @@ public class FileSourceUserGroupBuilder extends AbstractUserGroupSource {
JsonReader jsonReader = new JsonReader(new BufferedReader(new FileReader(jsonFile)));
- Gson gson = new GsonBuilder().create() ;
+ Gson gson = new GsonBuilder().create();
ret = gson.fromJson(jsonReader, ret.getClass());
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/ugsync/src/main/java/org/apache/ranger/unixusersync/process/PolicyMgrUserGroupBuilder.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/process/PolicyMgrUserGroupBuilder.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/process/PolicyMgrUserGroupBuilder.java
index 13a99ee..098d353 100644
--- a/ugsync/src/main/java/org/apache/ranger/unixusersync/process/PolicyMgrUserGroupBuilder.java
+++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/process/PolicyMgrUserGroupBuilder.java
@@ -71,7 +71,7 @@ import org.apache.ranger.usersync.util.UserSyncUtil;
public class PolicyMgrUserGroupBuilder implements UserGroupSink {
- private static final Logger LOG = Logger.getLogger(PolicyMgrUserGroupBuilder.class) ;
+ private static final Logger LOG = Logger.getLogger(PolicyMgrUserGroupBuilder.class);
private static final String AUTHENTICATION_TYPE = "hadoop.security.authentication";
private String AUTH_KERBEROS = "kerberos";
@@ -79,46 +79,46 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
private static final String KEYTAB = "ranger.usersync.kerberos.keytab";
private static final String NAME_RULE = "hadoop.security.auth_to_local";
- public static final String PM_USER_LIST_URI = "/service/xusers/users/" ; // GET
- private static final String PM_ADD_USER_URI = "/service/xusers/users/" ; // POST
- private static final String PM_ADD_USER_GROUP_INFO_URI = "/service/xusers/users/userinfo" ; // POST
+ public static final String PM_USER_LIST_URI = "/service/xusers/users/"; // GET
+ private static final String PM_ADD_USER_URI = "/service/xusers/users/"; // POST
+ private static final String PM_ADD_USER_GROUP_INFO_URI = "/service/xusers/users/userinfo"; // POST
- public static final String PM_GROUP_LIST_URI = "/service/xusers/groups/" ; // GET
- private static final String PM_ADD_GROUP_URI = "/service/xusers/groups/" ; // POST
+ public static final String PM_GROUP_LIST_URI = "/service/xusers/groups/"; // GET
+ private static final String PM_ADD_GROUP_URI = "/service/xusers/groups/"; // POST
- public static final String PM_USER_GROUP_MAP_LIST_URI = "/service/xusers/groupusers/" ; // GET
- private static final String PM_ADD_USER_GROUP_LINK_URI = "/service/xusers/groupusers/" ; // POST
+ public static final String PM_USER_GROUP_MAP_LIST_URI = "/service/xusers/groupusers/"; // GET
+ private static final String PM_ADD_USER_GROUP_LINK_URI = "/service/xusers/groupusers/"; // POST
- private static final String PM_DEL_USER_GROUP_LINK_URI = "/service/xusers/group/${groupName}/user/${userName}" ; // DELETE
+ private static final String PM_DEL_USER_GROUP_LINK_URI = "/service/xusers/group/${groupName}/user/${userName}"; // DELETE
- private static final String PM_ADD_LOGIN_USER_URI = "/service/users/default" ; // POST
+ private static final String PM_ADD_LOGIN_USER_URI = "/service/users/default"; // POST
private static final String GROUP_SOURCE_EXTERNAL ="1";
- private static String LOCAL_HOSTNAME = "unknown" ;
- private String recordsToPullPerCall = "1000" ;
- private boolean isMockRun = false ;
- private String policyMgrBaseUrl ;
+ private static String LOCAL_HOSTNAME = "unknown";
+ private String recordsToPullPerCall = "1000";
+ private boolean isMockRun = false;
+ private String policyMgrBaseUrl;
- private UserGroupSyncConfig config = UserGroupSyncConfig.getInstance() ;
+ private UserGroupSyncConfig config = UserGroupSyncConfig.getInstance();
private UserGroupInfo usergroupInfo = new UserGroupInfo();
- private List<XGroupInfo> xgroupList = new ArrayList<XGroupInfo>() ;
- private List<XUserInfo> xuserList = new ArrayList<XUserInfo>() ;
- private List<XUserGroupInfo> xusergroupList = new ArrayList<XUserGroupInfo>() ;
- private HashMap<String,XUserInfo> userId2XUserInfoMap = new HashMap<String,XUserInfo>() ;
- private HashMap<String,XUserInfo> userName2XUserInfoMap = new HashMap<String,XUserInfo>() ;
- private HashMap<String,XGroupInfo> groupName2XGroupInfoMap = new HashMap<String,XGroupInfo>() ;
+ private List<XGroupInfo> xgroupList = new ArrayList<XGroupInfo>();
+ private List<XUserInfo> xuserList = new ArrayList<XUserInfo>();
+ private List<XUserGroupInfo> xusergroupList = new ArrayList<XUserGroupInfo>();
+ private HashMap<String,XUserInfo> userId2XUserInfoMap = new HashMap<String,XUserInfo>();
+ private HashMap<String,XUserInfo> userName2XUserInfoMap = new HashMap<String,XUserInfo>();
+ private HashMap<String,XGroupInfo> groupName2XGroupInfoMap = new HashMap<String,XGroupInfo>();
- private String keyStoreFile = null ;
+ private String keyStoreFile = null;
private String keyStoreFilepwd = null;
- private String trustStoreFile = null ;
- private String trustStoreFilepwd = null ;
- private String keyStoreType = null ;
- private String trustStoreType = null ;
- private HostnameVerifier hv = null ;
+ private String trustStoreFile = null;
+ private String trustStoreFilepwd = null;
+ private String keyStoreType = null;
+ private String trustStoreType = null;
+ private HostnameVerifier hv = null;
- private SSLContext sslContext = null ;
+ private SSLContext sslContext = null;
private String authenticationType = null;
String principal;
String keytab;
@@ -128,40 +128,40 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
try {
LOCAL_HOSTNAME = java.net.InetAddress.getLocalHost().getCanonicalHostName();
} catch (UnknownHostException e) {
- LOCAL_HOSTNAME = "unknown" ;
+ LOCAL_HOSTNAME = "unknown";
}
}
public static void main(String[] args) throws Throwable {
- PolicyMgrUserGroupBuilder ugbuilder = new PolicyMgrUserGroupBuilder() ;
- ugbuilder.init() ;
+ PolicyMgrUserGroupBuilder ugbuilder = new PolicyMgrUserGroupBuilder();
+ ugbuilder.init();
// ugbuilder.print();
-// ugbuilder.addMUser("testuser") ;
-// ugbuilder.addXUserInfo("testuser") ;
-// ugbuilder.addXGroupInfo("testgroup") ;
-// XUserInfo u = ugbuilder.addXUserInfo("testuser") ;
-// XGroupInfo g = ugbuilder.addXGroupInfo("testgroup") ;
-// ugbuilder.addXUserGroupInfo(u, g) ;
+// ugbuilder.addMUser("testuser");
+// ugbuilder.addXUserInfo("testuser");
+// ugbuilder.addXGroupInfo("testgroup");
+// XUserInfo u = ugbuilder.addXUserInfo("testuser");
+// XGroupInfo g = ugbuilder.addXGroupInfo("testgroup");
+// ugbuilder.addXUserGroupInfo(u, g);
}
synchronized public void init() throws Throwable {
- recordsToPullPerCall = config.getMaxRecordsPerAPICall() ;
- policyMgrBaseUrl = config.getPolicyManagerBaseURL() ;
- isMockRun = config.isMockRunEnabled() ;
+ recordsToPullPerCall = config.getMaxRecordsPerAPICall();
+ policyMgrBaseUrl = config.getPolicyManagerBaseURL();
+ isMockRun = config.isMockRunEnabled();
if (isMockRun) {
- LOG.setLevel(Level.DEBUG) ;
+ LOG.setLevel(Level.DEBUG);
}
- keyStoreFile = config.getSSLKeyStorePath() ;
- keyStoreFilepwd = config.getSSLKeyStorePathPassword() ;
- trustStoreFile = config.getSSLTrustStorePath() ;
- trustStoreFilepwd = config.getSSLTrustStorePathPassword() ;
- keyStoreType = KeyStore.getDefaultType() ;
- trustStoreType = KeyStore.getDefaultType() ;
+ keyStoreFile = config.getSSLKeyStorePath();
+ keyStoreFilepwd = config.getSSLKeyStorePathPassword();
+ trustStoreFile = config.getSSLTrustStorePath();
+ trustStoreFilepwd = config.getSSLTrustStorePathPassword();
+ keyStoreType = KeyStore.getDefaultType();
+ trustStoreType = KeyStore.getDefaultType();
authenticationType = config.getProperty(AUTHENTICATION_TYPE,"simple");
try {
principal = SecureClientLogin.getPrincipal(config.getProperty(PRINCIPAL,""), LOCAL_HOSTNAME);
@@ -170,7 +170,7 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
}
keytab = config.getProperty(KEYTAB,"");
nameRules = config.getProperty(NAME_RULE,"DEFAULT");
- buildUserGroupInfo() ;
+ buildUserGroupInfo();
}
private void buildUserGroupInfo() throws Throwable {
@@ -189,8 +189,8 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
try {
buildGroupList();
buildUserList();
- buildUserGroupLinkList() ;
- rebuildUserGroupMap() ;
+ buildUserGroupLinkList();
+ rebuildUserGroupMap();
} catch (Exception e) {
LOG.error("Failed to build Group List : ", e);
}
@@ -203,8 +203,8 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
} else {
buildGroupList();
buildUserList();
- buildUserGroupLinkList() ;
- rebuildUserGroupMap() ;
+ buildUserGroupLinkList();
+ rebuildUserGroupMap();
if (LOG.isDebugEnabled()) {
this.print();
}
@@ -212,8 +212,8 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
}
private String getURL(String uri) {
- String ret = null ;
- ret = policyMgrBaseUrl + (uri.startsWith("/") ? uri : ("/" + uri)) ;
+ String ret = null;
+ ret = policyMgrBaseUrl + (uri.startsWith("/") ? uri : ("/" + uri));
return ret;
}
@@ -239,19 +239,19 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
private void addUserToList(XUserInfo aUserInfo) {
if (! xuserList.contains(aUserInfo)) {
- xuserList.add(aUserInfo) ;
+ xuserList.add(aUserInfo);
}
- String userId = aUserInfo.getId() ;
+ String userId = aUserInfo.getId();
if (userId != null) {
- userId2XUserInfoMap.put(userId, aUserInfo) ;
+ userId2XUserInfoMap.put(userId, aUserInfo);
}
String userName = aUserInfo.getName();
if (userName != null) {
- userName2XUserInfoMap.put(userName, aUserInfo) ;
+ userName2XUserInfoMap.put(userName, aUserInfo);
}
}
@@ -259,25 +259,25 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
private void addGroupToList(XGroupInfo aGroupInfo) {
if (! xgroupList.contains(aGroupInfo) ) {
- xgroupList.add(aGroupInfo) ;
+ xgroupList.add(aGroupInfo);
}
if (aGroupInfo.getName() != null) {
- groupName2XGroupInfoMap.put(aGroupInfo.getName(), aGroupInfo) ;
+ groupName2XGroupInfoMap.put(aGroupInfo.getName(), aGroupInfo);
}
}
private void addUserGroupToList(XUserGroupInfo ugInfo) {
- String userId = ugInfo.getUserId() ;
+ String userId = ugInfo.getUserId();
if (userId != null) {
- XUserInfo user = userId2XUserInfoMap.get(userId) ;
+ XUserInfo user = userId2XUserInfoMap.get(userId);
if (user != null) {
- List<String> groups = user.getGroups() ;
+ List<String> groups = user.getGroups();
if (! groups.contains(ugInfo.getGroupName())) {
- groups.add(ugInfo.getGroupName()) ;
+ groups.add(ugInfo.getGroupName());
}
}
}
@@ -287,30 +287,30 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
String userId = userInfo.getId();
if (userId != null) {
- XUserInfo user = userId2XUserInfoMap.get(userId) ;
+ XUserInfo user = userId2XUserInfoMap.get(userId);
if (user != null) {
- List<String> groups = user.getGroups() ;
+ List<String> groups = user.getGroups();
if (! groups.contains(groupInfo.getName())) {
- groups.add(groupInfo.getName()) ;
+ groups.add(groupInfo.getName());
}
}
}
}
private void delUserGroupFromList(XUserInfo userInfo, XGroupInfo groupInfo) {
- List<String> groups = userInfo.getGroups() ;
+ List<String> groups = userInfo.getGroups();
if (groups.contains(groupInfo.getName())) {
- groups.remove(groupInfo.getName()) ;
+ groups.remove(groupInfo.getName());
}
}
private void print() {
LOG.debug("Number of users read [" + xuserList.size() + "]");
for(XUserInfo user : xuserList) {
- LOG.debug("USER: " + user.getName()) ;
+ LOG.debug("USER: " + user.getName());
for(String group : user.getGroups()) {
- LOG.debug("\tGROUP: " + group) ;
+ LOG.debug("\tGROUP: " + group);
}
}
}
@@ -319,17 +319,17 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
public void addOrUpdateUser(String userName, List<String> groups) {
UserGroupInfo ugInfo = new UserGroupInfo();
- XUserInfo user = userName2XUserInfoMap.get(userName) ;
+ XUserInfo user = userName2XUserInfoMap.get(userName);
if (groups == null) {
- groups = new ArrayList<String>() ;
+ groups = new ArrayList<String>();
}
if (user == null) { // Does not exists
- LOG.debug("INFO: addPMAccount(" + userName + ")" ) ;
+ LOG.debug("INFO: addPMAccount(" + userName + ")" );
if (! isMockRun) {
- addMUser(userName) ;
+ addMUser(userName);
}
//* Build the user group info object and do the rest call
@@ -339,14 +339,14 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
}
else { // Validate group memberships
- List<String> oldGroups = user.getGroups() ;
- List<String> addGroups = new ArrayList<String>() ;
- List<String> delGroups = new ArrayList<String>() ;
- List<String> updateGroups = new ArrayList<String>() ;
+ List<String> oldGroups = user.getGroups();
+ List<String> addGroups = new ArrayList<String>();
+ List<String> delGroups = new ArrayList<String>();
+ List<String> updateGroups = new ArrayList<String>();
XGroupInfo tempXGroupInfo=null;
for(String group : groups) {
if (! oldGroups.contains(group)) {
- addGroups.add(group) ;
+ addGroups.add(group);
}else{
tempXGroupInfo=groupName2XGroupInfoMap.get(group);
if(tempXGroupInfo!=null && ! GROUP_SOURCE_EXTERNAL.equals(tempXGroupInfo.getGroupSource())){
@@ -357,12 +357,12 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
for(String group : oldGroups) {
if (! groups.contains(group) ) {
- delGroups.add(group) ;
+ delGroups.add(group);
}
}
for(String g : addGroups) {
- LOG.debug("INFO: addPMXAGroupToUser(" + userName + "," + g + ")" ) ;
+ LOG.debug("INFO: addPMXAGroupToUser(" + userName + "," + g + ")" );
}
if (! isMockRun) {
if (!addGroups.isEmpty()){
@@ -375,15 +375,15 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
+ ", for user-group entry: " + ugInfo);
}
}
- addXUserGroupInfo(user, addGroups) ;
+ addXUserGroupInfo(user, addGroups);
}
for(String g : delGroups) {
- LOG.debug("INFO: delPMXAGroupFromUser(" + userName + "," + g + ")" ) ;
+ LOG.debug("INFO: delPMXAGroupFromUser(" + userName + "," + g + ")" );
}
if (! isMockRun ) {
- delXUserGroupInfo(user, delGroups) ;
+ delXUserGroupInfo(user, delGroups);
}
if (! isMockRun) {
if (!updateGroups.isEmpty()){
@@ -404,25 +404,25 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
if (LOG.isDebugEnabled()) {
LOG.debug("==> PolicyMgrUserGroupBuilder.buildGroupList");
}
- Client c = getClient() ;
+ Client c = getClient();
- int totalCount = 100 ;
- int retrievedCount = 0 ;
+ int totalCount = 100;
+ int retrievedCount = 0;
while (retrievedCount < totalCount) {
WebResource r = c.resource(getURL(PM_GROUP_LIST_URI))
.queryParam("pageSize", recordsToPullPerCall)
- .queryParam("startIndex", String.valueOf(retrievedCount)) ;
+ .queryParam("startIndex", String.valueOf(retrievedCount));
String response = r.accept(MediaType.APPLICATION_JSON_TYPE).get(String.class);
- LOG.debug("RESPONSE: [" + response + "]") ;
+ LOG.debug("RESPONSE: [" + response + "]");
- Gson gson = new GsonBuilder().create() ;
+ Gson gson = new GsonBuilder().create();
- GetXGroupListResponse groupList = gson.fromJson(response, GetXGroupListResponse.class) ;
+ GetXGroupListResponse groupList = gson.fromJson(response, GetXGroupListResponse.class);
- totalCount = groupList.getTotalCount() ;
+ totalCount = groupList.getTotalCount();
if (groupList.getXgroupInfoList() != null) {
xgroupList.addAll(groupList.getXgroupInfoList());
@@ -439,33 +439,33 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
if (LOG.isDebugEnabled()) {
LOG.debug("==> PolicyMgrUserGroupBuilder.buildUserList");
}
- Client c = getClient() ;
+ Client c = getClient();
- int totalCount = 100 ;
- int retrievedCount = 0 ;
+ int totalCount = 100;
+ int retrievedCount = 0;
while (retrievedCount < totalCount) {
WebResource r = c.resource(getURL(PM_USER_LIST_URI))
.queryParam("pageSize", recordsToPullPerCall)
- .queryParam("startIndex", String.valueOf(retrievedCount)) ;
+ .queryParam("startIndex", String.valueOf(retrievedCount));
String response = r.accept(MediaType.APPLICATION_JSON_TYPE).get(String.class);
- Gson gson = new GsonBuilder().create() ;
+ Gson gson = new GsonBuilder().create();
- LOG.debug("RESPONSE: [" + response + "]") ;
+ LOG.debug("RESPONSE: [" + response + "]");
- GetXUserListResponse userList = gson.fromJson(response, GetXUserListResponse.class) ;
+ GetXUserListResponse userList = gson.fromJson(response, GetXUserListResponse.class);
- totalCount = userList.getTotalCount() ;
+ totalCount = userList.getTotalCount();
if (userList.getXuserInfoList() != null) {
- xuserList.addAll(userList.getXuserInfoList()) ;
- retrievedCount = xuserList.size() ;
+ xuserList.addAll(userList.getXuserInfoList());
+ retrievedCount = xuserList.size();
for(XUserInfo u : userList.getXuserInfoList()) {
- LOG.debug("USER: Id:" + u.getId() + ", Name: " + u.getName() + ", Description: " + u.getDescription()) ;
+ LOG.debug("USER: Id:" + u.getId() + ", Name: " + u.getName() + ", Description: " + u.getDescription());
}
}
}
@@ -475,33 +475,33 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
if(LOG.isDebugEnabled()) {
LOG.debug("==> PolicyMgrUserGroupBuilder.buildUserGroupLinkList");
}
- Client c = getClient() ;
+ Client c = getClient();
- int totalCount = 100 ;
- int retrievedCount = 0 ;
+ int totalCount = 100;
+ int retrievedCount = 0;
while (retrievedCount < totalCount) {
WebResource r = c.resource(getURL(PM_USER_GROUP_MAP_LIST_URI))
.queryParam("pageSize", recordsToPullPerCall)
- .queryParam("startIndex", String.valueOf(retrievedCount)) ;
+ .queryParam("startIndex", String.valueOf(retrievedCount));
String response = r.accept(MediaType.APPLICATION_JSON_TYPE).get(String.class);
- LOG.debug("RESPONSE: [" + response + "]") ;
+ LOG.debug("RESPONSE: [" + response + "]");
- Gson gson = new GsonBuilder().create() ;
+ Gson gson = new GsonBuilder().create();
- GetXUserGroupListResponse usergroupList = gson.fromJson(response, GetXUserGroupListResponse.class) ;
+ GetXUserGroupListResponse usergroupList = gson.fromJson(response, GetXUserGroupListResponse.class);
- totalCount = usergroupList.getTotalCount() ;
+ totalCount = usergroupList.getTotalCount();
if (usergroupList.getXusergroupInfoList() != null) {
- xusergroupList.addAll(usergroupList.getXusergroupInfoList()) ;
- retrievedCount = xusergroupList.size() ;
+ xusergroupList.addAll(usergroupList.getXusergroupInfoList());
+ retrievedCount = xusergroupList.size();
for(XUserGroupInfo ug : usergroupList.getXusergroupInfoList()) {
- LOG.debug("USER_GROUP: UserId:" + ug.getUserId() + ", Name: " + ug.getGroupName()) ;
+ LOG.debug("USER_GROUP: UserId:" + ug.getUserId() + ", Name: " + ug.getGroupName());
}
}
}
@@ -514,16 +514,16 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
UserGroupInfo ret = null;
XUserInfo user = null;
- LOG.debug("INFO: addPMXAUser(" + userName + ")" ) ;
+ LOG.debug("INFO: addPMXAUser(" + userName + ")" );
if (! isMockRun) {
- user = addXUserInfo(userName) ;
+ user = addXUserInfo(userName);
}
for(String g : groups) {
- LOG.debug("INFO: addPMXAGroupToUser(" + userName + "," + g + ")" ) ;
+ LOG.debug("INFO: addPMXAGroupToUser(" + userName + "," + g + ")" );
}
if (! isMockRun ) {
- addXUserGroupInfo(user, groups) ;
+ addXUserGroupInfo(user, groups);
}
if (authenticationType != null && AUTH_KERBEROS.equalsIgnoreCase(authenticationType) && SecureClientLogin.isKerberosCredentialExists(principal, keytab)){
try {
@@ -561,9 +561,9 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
LOG.debug("USER GROUP MAPPING" + jsonString);
- String response = r.accept(MediaType.APPLICATION_JSON_TYPE).type(MediaType.APPLICATION_JSON_TYPE).post(String.class, jsonString) ;
+ String response = r.accept(MediaType.APPLICATION_JSON_TYPE).type(MediaType.APPLICATION_JSON_TYPE).post(String.class, jsonString);
- LOG.debug("RESPONSE: [" + response + "]") ;
+ LOG.debug("RESPONSE: [" + response + "]");
ret = gson.fromJson(response, UserGroupInfo.class);
@@ -595,12 +595,12 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
String response = null;
try{
- response=r.accept(MediaType.APPLICATION_JSON_TYPE).type(MediaType.APPLICATION_JSON_TYPE).post(String.class, jsonString) ;
+ response=r.accept(MediaType.APPLICATION_JSON_TYPE).type(MediaType.APPLICATION_JSON_TYPE).post(String.class, jsonString);
}catch(Throwable t){
LOG.error("Failed to communicate Ranger Admin : ", t);
}
if ( LOG.isDebugEnabled() ) {
- LOG.debug("RESPONSE: [" + response + "]") ;
+ LOG.debug("RESPONSE: [" + response + "]");
}
ret = gson.fromJson(response, UserGroupInfo.class);
@@ -651,31 +651,31 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
private XUserInfo addXUserInfo(String aUserName) {
- XUserInfo xuserInfo = new XUserInfo() ;
+ XUserInfo xuserInfo = new XUserInfo();
xuserInfo.setName(aUserName);
- xuserInfo.setDescription(aUserName + " - add from Unix box") ;
+ xuserInfo.setDescription(aUserName + " - add from Unix box");
usergroupInfo.setXuserInfo(xuserInfo);
- return xuserInfo ;
+ return xuserInfo;
}
private XGroupInfo addXGroupInfo(String aGroupName) {
- XGroupInfo addGroup = new XGroupInfo() ;
+ XGroupInfo addGroup = new XGroupInfo();
addGroup.setName(aGroupName);
- addGroup.setDescription(aGroupName + " - add from Unix box") ;
+ addGroup.setDescription(aGroupName + " - add from Unix box");
- addGroup.setGroupType("1") ;
+ addGroup.setGroupType("1");
addGroup.setGroupSource(GROUP_SOURCE_EXTERNAL);
- return addGroup ;
+ return addGroup;
}
@@ -684,12 +684,12 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
List<XGroupInfo> xGroupInfoList = new ArrayList<XGroupInfo>();
for(String groupName : aGroupList) {
- XGroupInfo group = groupName2XGroupInfoMap.get(groupName) ;
+ XGroupInfo group = groupName2XGroupInfoMap.get(groupName);
if (group == null) {
- group = addXGroupInfo(groupName) ;
+ group = addXGroupInfo(groupName);
}
xGroupInfoList.add(group);
- addXUserGroupInfo(aUserInfo, group) ;
+ addXUserGroupInfo(aUserInfo, group);
}
usergroupInfo.setXgroupInfo(xGroupInfoList);
@@ -699,9 +699,9 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
List<XGroupInfo> xGroupInfoList = new ArrayList<XGroupInfo>();
for(String groupName : aGroupList) {
- XGroupInfo group = groupName2XGroupInfoMap.get(groupName) ;
+ XGroupInfo group = groupName2XGroupInfoMap.get(groupName);
if (group == null) {
- group = addXGroupInfo(groupName) ;
+ group = addXGroupInfo(groupName);
}else if(!GROUP_SOURCE_EXTERNAL.equals(group.getGroupSource())){
group.setGroupSource(GROUP_SOURCE_EXTERNAL);
}
@@ -715,11 +715,11 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
private XUserGroupInfo addXUserGroupInfo(XUserInfo aUserInfo, XGroupInfo aGroupInfo) {
- XUserGroupInfo ugInfo = new XUserGroupInfo() ;
+ XUserGroupInfo ugInfo = new XUserGroupInfo();
ugInfo.setUserId(aUserInfo.getId());
- ugInfo.setGroupName(aGroupInfo.getName()) ;
+ ugInfo.setGroupName(aGroupInfo.getName());
// ugInfo.setParentGroupId("1");
@@ -729,7 +729,7 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
private void delXUserGroupInfo(final XUserInfo aUserInfo, List<String> aGroupList) {
for(String groupName : aGroupList) {
- final XGroupInfo group = groupName2XGroupInfoMap.get(groupName) ;
+ final XGroupInfo group = groupName2XGroupInfoMap.get(groupName);
if (group != null) {
if (authenticationType != null && AUTH_KERBEROS.equalsIgnoreCase(authenticationType) && SecureClientLogin.isKerberosCredentialExists(principal, keytab)) {
try {
@@ -764,26 +764,26 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
try {
- Client c = getClient() ;
+ Client c = getClient();
String uri = PM_DEL_USER_GROUP_LINK_URI.replaceAll(Pattern.quote("${groupName}"),
UserSyncUtil.encodeURIParam(groupName)).replaceAll(Pattern.quote("${userName}"), UserSyncUtil.encodeURIParam(userName));
- WebResource r = c.resource(getURL(uri)) ;
+ WebResource r = c.resource(getURL(uri));
- ClientResponse response = r.delete(ClientResponse.class) ;
+ ClientResponse response = r.delete(ClientResponse.class);
if ( LOG.isDebugEnabled() ) {
- LOG.debug("RESPONSE: [" + response.toString() + "]") ;
+ LOG.debug("RESPONSE: [" + response.toString() + "]");
}
if (response.getStatus() == 200) {
- delUserGroupFromList(aUserInfo, aGroupInfo) ;
+ delUserGroupFromList(aUserInfo, aGroupInfo);
}
} catch (Exception e) {
- LOG.warn( "ERROR: Unable to delete GROUP: " + groupName + " from USER:" + userName , e) ;
+ LOG.warn( "ERROR: Unable to delete GROUP: " + groupName + " from USER:" + userName , e);
}
}
@@ -824,23 +824,23 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
private MUserInfo getMUser(MUserInfo userInfo, MUserInfo ret) {
- Client c = getClient() ;
+ Client c = getClient();
- WebResource r = c.resource(getURL(PM_ADD_LOGIN_USER_URI)) ;
+ WebResource r = c.resource(getURL(PM_ADD_LOGIN_USER_URI));
- Gson gson = new GsonBuilder().create() ;
+ Gson gson = new GsonBuilder().create();
- String jsonString = gson.toJson(userInfo) ;
+ String jsonString = gson.toJson(userInfo);
- String response = r.accept(MediaType.APPLICATION_JSON_TYPE).type(MediaType.APPLICATION_JSON_TYPE).post(String.class, jsonString) ;
+ String response = r.accept(MediaType.APPLICATION_JSON_TYPE).type(MediaType.APPLICATION_JSON_TYPE).post(String.class, jsonString);
- LOG.debug("RESPONSE[" + response + "]") ;
+ LOG.debug("RESPONSE[" + response + "]");
- ret = gson.fromJson(response, MUserInfo.class) ;
+ ret = gson.fromJson(response, MUserInfo.class);
LOG.debug("MUser Creation successful " + ret);
- return ret ;
+ return ret;
}
private synchronized Client getClient() {
@@ -861,12 +861,12 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
if (keyStoreFile != null && keyStoreFilepwd != null) {
KeyStore keyStore = KeyStore.getInstance(keyStoreType);
- InputStream in = null ;
+ InputStream in = null;
try {
- in = getFileInputStream(keyStoreFile) ;
+ in = getFileInputStream(keyStoreFile);
if (in == null) {
LOG.error("Unable to obtain keystore from file [" + keyStoreFile + "]");
- return ret ;
+ return ret;
}
keyStore.load(in, keyStoreFilepwd.toCharArray());
KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
@@ -884,12 +884,12 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
if (trustStoreFile != null && trustStoreFilepwd != null) {
KeyStore trustStore = KeyStore.getInstance(trustStoreType);
- InputStream in = null ;
+ InputStream in = null;
try {
- in = getFileInputStream(trustStoreFile) ;
+ in = getFileInputStream(trustStoreFile);
if (in == null) {
LOG.error("Unable to obtain keystore from file [" + trustStoreFile + "]");
- return ret ;
+ return ret;
}
trustStore.load(in, trustStoreFilepwd.toCharArray());
TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
@@ -898,7 +898,7 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
}
finally {
if (in != null) {
- in.close() ;
+ in.close();
}
}
}
@@ -943,7 +943,7 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
}
}
}
- return ret ;
+ return ret;
}
private InputStream getFileInputStream(String path) throws FileNotFoundException {
@@ -964,7 +964,7 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
}
if (ret == null) {
- ret = ClassLoader.getSystemClassLoader().getResourceAsStream(path) ;
+ ret = ClassLoader.getSystemClassLoader().getResourceAsStream(path);
if (ret == null) {
if (! path.startsWith("/")) {
ret = ClassLoader.getSystemResourceAsStream("/" + path);
@@ -979,7 +979,7 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
@Override
public void addOrUpdateGroup(String groupName) {
- XGroupInfo group = groupName2XGroupInfoMap.get(groupName) ;
+ XGroupInfo group = groupName2XGroupInfoMap.get(groupName);
if (group == null) { // Does not exists
@@ -997,9 +997,9 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
XGroupInfo ret = null;
XGroupInfo group = null;
- LOG.debug("INFO: addPMXAGroup(" + groupName + ")" ) ;
+ LOG.debug("INFO: addPMXAGroup(" + groupName + ")" );
if (! isMockRun) {
- group = addXGroupInfo(groupName) ;
+ group = addXGroupInfo(groupName);
}
if (authenticationType != null && AUTH_KERBEROS.equalsIgnoreCase(authenticationType) && SecureClientLogin.isKerberosCredentialExists(principal,keytab)) {
try {
@@ -1040,9 +1040,9 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
LOG.debug("Group" + jsonString);
- String response = r.accept(MediaType.APPLICATION_JSON_TYPE).type(MediaType.APPLICATION_JSON_TYPE).post(String.class, jsonString) ;
+ String response = r.accept(MediaType.APPLICATION_JSON_TYPE).type(MediaType.APPLICATION_JSON_TYPE).post(String.class, jsonString);
- LOG.debug("RESPONSE: [" + response + "]") ;
+ LOG.debug("RESPONSE: [" + response + "]");
ret = gson.fromJson(response, XGroupInfo.class);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/ugsync/src/main/java/org/apache/ranger/unixusersync/process/UnixUserGroupBuilder.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/process/UnixUserGroupBuilder.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/process/UnixUserGroupBuilder.java
index e5abd08..88aa266 100644
--- a/ugsync/src/main/java/org/apache/ranger/unixusersync/process/UnixUserGroupBuilder.java
+++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/process/UnixUserGroupBuilder.java
@@ -38,17 +38,17 @@ import org.apache.ranger.usergroupsync.UserGroupSource;
public class UnixUserGroupBuilder implements UserGroupSource {
- private static final Logger LOG = Logger.getLogger(UnixUserGroupBuilder.class) ;
- private final static String OS = System.getProperty("os.name") ;
+ private static final Logger LOG = Logger.getLogger(UnixUserGroupBuilder.class);
+ private final static String OS = System.getProperty("os.name");
// kept for legacy support
- public static final String UNIX_USER_PASSWORD_FILE = "/etc/passwd" ;
- public static final String UNIX_GROUP_FILE = "/etc/group" ;
+ public static final String UNIX_USER_PASSWORD_FILE = "/etc/passwd";
+ public static final String UNIX_GROUP_FILE = "/etc/group";
/** Shell commands to get users and groups */
- static final String LINUX_GET_ALL_USERS_CMD = "getent passwd" ;
- static final String LINUX_GET_ALL_GROUPS_CMD = "getent group" ;
- static final String LINUX_GET_GROUP_CMD = "getent group %s" ;
+ static final String LINUX_GET_ALL_USERS_CMD = "getent passwd";
+ static final String LINUX_GET_ALL_GROUPS_CMD = "getent group";
+ static final String LINUX_GET_GROUP_CMD = "getent group %s";
// mainly for testing purposes
// there might be a better way
@@ -56,12 +56,12 @@ public class UnixUserGroupBuilder implements UserGroupSource {
"awk 'BEGIN { OFS = \":\"; ORS=\"\\n\"; i=0;}" +
"/RecordName: / {name = $2;i = 0;}/PrimaryGroupID: / {gid = $2;}" +
"/^ / {if (i == 0) { i++; name = $1;}}" +
- "/UniqueID: / {uid = $2;print name, \"*\", gid, uid;}'" ;
+ "/UniqueID: / {uid = $2;print name, \"*\", gid, uid;}'";
static final String MAC_GET_ALL_GROUPS_CMD = "dscl . -list /Groups PrimaryGroupID | " +
- "awk -v OFS=\":\" '{print $1, \"*\", $2, \"\"}'" ;
+ "awk -v OFS=\":\" '{print $1, \"*\", $2, \"\"}'";
static final String MAC_GET_GROUP_CMD = "dscl . -read /Groups/%1$s | paste -d, -s - | sed -e 's/:/|/g' | " +
"awk -v OFS=\":\" -v ORS=\"\\n\" -F, '{print \"%1$s\",\"*\",$6,$4}' | " +
- "sed -e 's/:[^:]*| /:/g' | sed -e 's/ /,/g'" ;
+ "sed -e 's/:[^:]*| /:/g' | sed -e 's/ /,/g'";
static final String BACKEND_PASSWD = "passwd";
@@ -71,29 +71,29 @@ public class UnixUserGroupBuilder implements UserGroupSource {
private long lastUpdateTime = 0; // Last time maps were updated
private long timeout = 0;
- private UserGroupSyncConfig config = UserGroupSyncConfig.getInstance() ;
+ private UserGroupSyncConfig config = UserGroupSyncConfig.getInstance();
private Map<String,List<String>> user2GroupListMap = new HashMap<String,List<String>>();
private Map<String,List<String>> internalUser2GroupListMap = new HashMap<String,List<String>>();
- private Map<String,String> groupId2groupNameMap = new HashMap<String,String>() ;
- private int minimumUserId = 0 ;
- private int minimumGroupId = 0 ;
+ private Map<String,String> groupId2groupNameMap = new HashMap<String,String>();
+ private int minimumUserId = 0;
+ private int minimumGroupId = 0;
- private long passwordFileModifiedAt = 0 ;
- private long groupFileModifiedAt = 0 ;
+ private long passwordFileModifiedAt = 0;
+ private long groupFileModifiedAt = 0;
public static void main(String[] args) throws Throwable {
- UnixUserGroupBuilder ugbuilder = new UnixUserGroupBuilder() ;
+ UnixUserGroupBuilder ugbuilder = new UnixUserGroupBuilder();
ugbuilder.init();
ugbuilder.print();
}
public UnixUserGroupBuilder() {
- minimumUserId = Integer.parseInt(config.getMinUserId()) ;
- minimumGroupId = Integer.parseInt(config.getMinGroupId()) ;
+ minimumUserId = Integer.parseInt(config.getMinUserId());
+ minimumGroupId = Integer.parseInt(config.getMinGroupId());
- LOG.debug("Minimum UserId: " + minimumUserId + ", minimum GroupId: " + minimumGroupId) ;
+ LOG.debug("Minimum UserId: " + minimumUserId + ", minimum GroupId: " + minimumGroupId);
- timeout = config.getUpdateMillisMin() ;
+ timeout = config.getUpdateMillisMin();
enumerateGroupMembers = config.isGroupEnumerateEnabled();
if (!config.getUnixBackend().equalsIgnoreCase(BACKEND_PASSWD)) {
@@ -106,31 +106,31 @@ public class UnixUserGroupBuilder implements UserGroupSource {
@Override
public void init() throws Throwable {
- buildUserGroupInfo() ;
+ buildUserGroupInfo();
}
@Override
public boolean isChanged() {
if (useNss)
- return System.currentTimeMillis() - lastUpdateTime > timeout ;
+ return System.currentTimeMillis() - lastUpdateTime > timeout;
- long TempPasswordFileModifiedAt = new File(UNIX_USER_PASSWORD_FILE).lastModified() ;
+ long TempPasswordFileModifiedAt = new File(UNIX_USER_PASSWORD_FILE).lastModified();
if (passwordFileModifiedAt != TempPasswordFileModifiedAt) {
- return true ;
+ return true;
}
- long TempGroupFileModifiedAt = new File(UNIX_GROUP_FILE).lastModified() ;
+ long TempGroupFileModifiedAt = new File(UNIX_GROUP_FILE).lastModified();
if (groupFileModifiedAt != TempGroupFileModifiedAt) {
- return true ;
+ return true;
}
- return false ;
+ return false;
}
@Override
public void updateSink(UserGroupSink sink) throws Throwable {
- buildUserGroupInfo() ;
+ buildUserGroupInfo();
for (Map.Entry<String, List<String>> entry : user2GroupListMap.entrySet()) {
String user = entry.getKey();
@@ -162,20 +162,20 @@ public class UnixUserGroupBuilder implements UserGroupSource {
buildUnixUserList(LINUX_GET_ALL_USERS_CMD);
}
- lastUpdateTime = System.currentTimeMillis() ;
+ lastUpdateTime = System.currentTimeMillis();
if (LOG.isDebugEnabled()) {
- print() ;
+ print();
}
}
private void print() {
for(String user : user2GroupListMap.keySet()) {
- LOG.debug("USER:" + user) ;
- List<String> groups = user2GroupListMap.get(user) ;
+ LOG.debug("USER:" + user);
+ List<String> groups = user2GroupListMap.get(user);
if (groups != null) {
for(String group : groups) {
- LOG.debug("\tGROUP: " + group) ;
+ LOG.debug("\tGROUP: " + group);
}
}
}
@@ -213,9 +213,9 @@ public class UnixUserGroupBuilder implements UserGroupSource {
continue;
}
- String userName = null ;
- String userId = null ;
- String groupId = null ;
+ String userName = null;
+ String userId = null;
+ String groupId = null;
try {
userName = tokens[0];
@@ -223,8 +223,8 @@ public class UnixUserGroupBuilder implements UserGroupSource {
groupId = tokens[3];
}
catch(ArrayIndexOutOfBoundsException aiobe) {
- LOG.warn("Ignoring line - [" + line + "]: Unable to parse line for getting user information", aiobe) ;
- continue ;
+ LOG.warn("Ignoring line - [" + line + "]: Unable to parse line for getting user information", aiobe);
+ continue;
}
int numUserId = -1;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/ugsync/src/main/java/org/apache/ranger/usergroupsync/UserGroupSync.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/usergroupsync/UserGroupSync.java b/ugsync/src/main/java/org/apache/ranger/usergroupsync/UserGroupSync.java
index 30b891c..e57247a 100644
--- a/ugsync/src/main/java/org/apache/ranger/usergroupsync/UserGroupSync.java
+++ b/ugsync/src/main/java/org/apache/ranger/usergroupsync/UserGroupSync.java
@@ -25,24 +25,24 @@ import org.apache.ranger.unixusersync.config.UserGroupSyncConfig;
public class UserGroupSync implements Runnable {
- private static final Logger LOG = Logger.getLogger(UserGroupSync.class) ;
+ private static final Logger LOG = Logger.getLogger(UserGroupSync.class);
- private boolean shutdownFlag = false ;
- private UserGroupSink ugSink = null ;
- private UserGroupSource ugSource = null ;
+ private boolean shutdownFlag = false;
+ private UserGroupSink ugSink = null;
+ private UserGroupSource ugSource = null;
public static void main(String[] args) {
- UserGroupSync userGroupSync = new UserGroupSync() ;
- userGroupSync.run() ;
+ UserGroupSync userGroupSync = new UserGroupSync();
+ userGroupSync.run();
}
public void run() {
try {
- long sleepTimeBetweenCycleInMillis = UserGroupSyncConfig.getInstance().getSleepTimeInMillisBetweenCycle() ;
+ long sleepTimeBetweenCycleInMillis = UserGroupSyncConfig.getInstance().getSleepTimeInMillisBetweenCycle();
- boolean initDone = false ;
+ boolean initDone = false;
while (! initDone ) {
try {
@@ -58,17 +58,17 @@ public class UserGroupSync implements Runnable {
ugSource.updateSink(ugSink);
LOG.info("End: initial load of user/group from source==>sink");
- initDone = true ;
+ initDone = true;
- LOG.info("Done initializing user/group source and sink") ;
+ LOG.info("Done initializing user/group source and sink");
}
catch(Throwable t) {
- LOG.error("Failed to initialize UserGroup source/sink. Will retry after " + sleepTimeBetweenCycleInMillis + " milliseconds. Error details: ", t) ;
+ LOG.error("Failed to initialize UserGroup source/sink. Will retry after " + sleepTimeBetweenCycleInMillis + " milliseconds. Error details: ", t);
try {
- LOG.debug("Sleeping for [" + sleepTimeBetweenCycleInMillis + "] milliSeconds") ;
- Thread.sleep(sleepTimeBetweenCycleInMillis) ;
+ LOG.debug("Sleeping for [" + sleepTimeBetweenCycleInMillis + "] milliSeconds");
+ Thread.sleep(sleepTimeBetweenCycleInMillis);
} catch (Exception e) {
- LOG.error("Failed to wait for [" + sleepTimeBetweenCycleInMillis + "] milliseconds before attempting to initialize UserGroup source/sink", e) ;
+ LOG.error("Failed to wait for [" + sleepTimeBetweenCycleInMillis + "] milliseconds before attempting to initialize UserGroup source/sink", e);
}
}
}
@@ -77,19 +77,19 @@ public class UserGroupSync implements Runnable {
while (! shutdownFlag ) {
try {
- LOG.debug("Sleeping for [" + sleepTimeBetweenCycleInMillis + "] milliSeconds") ;
+ LOG.debug("Sleeping for [" + sleepTimeBetweenCycleInMillis + "] milliSeconds");
Thread.sleep(sleepTimeBetweenCycleInMillis);
} catch (InterruptedException e) {
- LOG.error("Failed to wait for [" + sleepTimeBetweenCycleInMillis + "] milliseconds before attempting to synchronize UserGroup information", e) ;
+ LOG.error("Failed to wait for [" + sleepTimeBetweenCycleInMillis + "] milliseconds before attempting to synchronize UserGroup information", e);
}
try {
- syncUserGroup(forceSync) ;
+ syncUserGroup(forceSync);
forceSync = false;
}
catch(Throwable t) {
- LOG.error("Failed to synchronize UserGroup information. Error details: ", t) ;
+ LOG.error("Failed to synchronize UserGroup information. Error details: ", t);
forceSync = true; // force sync to the destination in the next attempt
}
@@ -97,15 +97,15 @@ public class UserGroupSync implements Runnable {
}
catch(Throwable t) {
- LOG.error("UserGroupSync thread got an error", t) ;
+ LOG.error("UserGroupSync thread got an error", t);
}
finally {
- LOG.error("Shutting down the UserGroupSync thread") ;
+ LOG.error("Shutting down the UserGroupSync thread");
}
}
private void syncUserGroup(boolean forceSync) throws Throwable {
- UserGroupSyncConfig config = UserGroupSyncConfig.getInstance() ;
+ UserGroupSyncConfig config = UserGroupSyncConfig.getInstance();
try{
if (config.isUserSyncEnabled()) {
@@ -115,7 +115,7 @@ public class UserGroupSync implements Runnable {
LOG.info("End: update user/group from source==>sink");
}
else {
- LOG.debug("UserGroupSource: no change found for synchronization.") ;
+ LOG.debug("UserGroupSource: no change found for synchronization.");
}
}
}catch(Throwable t){
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/eb21ea6a/unixauthclient/src/main/java/org/apache/ranger/authentication/unix/jaas/ConsolePromptCallbackHandler.java
----------------------------------------------------------------------
diff --git a/unixauthclient/src/main/java/org/apache/ranger/authentication/unix/jaas/ConsolePromptCallbackHandler.java b/unixauthclient/src/main/java/org/apache/ranger/authentication/unix/jaas/ConsolePromptCallbackHandler.java
index e960fed..31e6ddb 100644
--- a/unixauthclient/src/main/java/org/apache/ranger/authentication/unix/jaas/ConsolePromptCallbackHandler.java
+++ b/unixauthclient/src/main/java/org/apache/ranger/authentication/unix/jaas/ConsolePromptCallbackHandler.java
@@ -35,11 +35,11 @@ public class ConsolePromptCallbackHandler implements CallbackHandler {
@Override
public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
- BufferedReader reader = new BufferedReader(new InputStreamReader(System.in)) ;
+ BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
for(Callback cb : callbacks) {
if (cb instanceof NameCallback) {
- NameCallback nc = (NameCallback)cb ;
+ NameCallback nc = (NameCallback)cb;
System.out.print(nc.getPrompt());
System.out.flush();
String line = null;
@@ -61,7 +61,7 @@ public class ConsolePromptCallbackHandler implements CallbackHandler {
pc.setPassword(line.toCharArray());
}
else {
- System.out.println("Unknown callbacl [" + cb.getClass().getName() + "]") ;
+ System.out.println("Unknown callbacl [" + cb.getClass().getName() + "]");
}
}
}