[ranger] branch master updated: update role
This is an automated email from the ASF dual-hosted git repository. zhangqiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ranger.git The following commit(s) were added to refs/heads/master by this push: new 1b4c97a update role 1b4c97a is described below commit 1b4c97ab24b36b9193ca5841c311dbb63414b402 Author: zhangqiang2 AuthorDate: Mon Apr 15 14:14:20 2019 +0800 update role --- docs/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/pom.xml b/docs/pom.xml index 5f600bb..724d494 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -405,6 +405,7 @@ zhangqi...@apache.org +8 +PMC Committer
ranger git commit: RANGER-2177: Handle validations for duplicate configuration item during service create/edit
Repository: ranger
Updated Branches:
refs/heads/master 49142eb1b -> 0db2e80b4
RANGER-2177: Handle validations for duplicate configuration item during service
create/edit
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/0db2e80b
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/0db2e80b
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/0db2e80b
Branch: refs/heads/master
Commit: 0db2e80b4de5eb134d2a33ac13c1a648ca113d10
Parents: 49142eb
Author: xingpeng1
Authored: Fri Aug 10 11:08:19 2018 +0800
Committer: zhangqiang2
Committed: Mon Aug 13 13:34:26 2018 +0800
--
.../src/main/webapp/scripts/views/service/ServiceForm.js| 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/0db2e80b/security-admin/src/main/webapp/scripts/views/service/ServiceForm.js
--
diff --git
a/security-admin/src/main/webapp/scripts/views/service/ServiceForm.js
b/security-admin/src/main/webapp/scripts/views/service/ServiceForm.js
index 726fb5f..b7215f2 100644
--- a/security-admin/src/main/webapp/scripts/views/service/ServiceForm.js
+++ b/security-admin/src/main/webapp/scripts/views/service/ServiceForm.js
@@ -145,19 +145,22 @@ define(function(require){
formValidation : function(){
var valid = true;
var config = {};
- this.extraConfigColl.each(function(obj){
+
+ for (var i = 0; i < this.extraConfigColl.length; i++) {
+ var obj = this.extraConfigColl.at(i);
if(!_.isEmpty(obj.attributes)) {
if
(!_.isUndefined(config[obj.get('name')])) {
XAUtil.alertPopup({
msg :
localization.tt('msg.duplicateNewConfigValidationMsg')
});
valid = false;
- return;
+ break;
} else {
config[obj.get('name')] =
obj.get('value');
}
}
- });
+ }
+
return valid;
},
ranger git commit: RANGER-2177: Handle validations for duplicate configuration item during service create/edit
Repository: ranger
Updated Branches:
refs/heads/master 4fc539b78 -> c7d15b305
RANGER-2177: Handle validations for duplicate configuration item during service
create/edit
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/c7d15b30
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/c7d15b30
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/c7d15b30
Branch: refs/heads/master
Commit: c7d15b3059c209bd57795dcbe231dafc7e95c62a
Parents: 4fc539b
Author: xingpeng1
Authored: Fri Aug 3 15:58:24 2018 +0800
Committer: zhangqiang2
Committed: Tue Aug 7 09:46:03 2018 +0800
--
.../scripts/modules/globalize/message/en.js | 3 +-
.../scripts/views/service/ServiceCreate.js | 22 ++--
.../webapp/scripts/views/service/ServiceForm.js | 36 ++--
3 files changed, 39 insertions(+), 22 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/c7d15b30/security-admin/src/main/webapp/scripts/modules/globalize/message/en.js
--
diff --git
a/security-admin/src/main/webapp/scripts/modules/globalize/message/en.js
b/security-admin/src/main/webapp/scripts/modules/globalize/message/en.js
index f4c3c27..99cbf55 100644
--- a/security-admin/src/main/webapp/scripts/modules/globalize/message/en.js
+++ b/security-admin/src/main/webapp/scripts/modules/globalize/message/en.js
@@ -437,7 +437,8 @@ define(function(require) {
noUserFoundText: 'No user associate
with this group.',
showInitialHundredUser : 'Initially search filter is applied
for first hundred users. To get more users click on ',
searchForUserSync :"Search for your user sync audits...",
-policyExpired :'Policy Expired'
+policyExpired :'Policy Expired',
+duplicateNewConfigValidationMsg :'Please make sure the new
configuration has no duplicate names'
},
plcHldr : {
http://git-wip-us.apache.org/repos/asf/ranger/blob/c7d15b30/security-admin/src/main/webapp/scripts/views/service/ServiceCreate.js
--
diff --git
a/security-admin/src/main/webapp/scripts/views/service/ServiceCreate.js
b/security-admin/src/main/webapp/scripts/views/service/ServiceCreate.js
index c8ecdc3..7c2c778 100644
--- a/security-admin/src/main/webapp/scripts/views/service/ServiceCreate.js
+++ b/security-admin/src/main/webapp/scripts/views/service/ServiceCreate.js
@@ -17,7 +17,7 @@
* under the License.
*/
-
+
/*
* Repository/Service create view
*/
@@ -31,7 +31,7 @@ define(function(require){
var XAEnums = require('utils/XAEnums');
var XALinks = require('modules/XALinks');
var localization= require('utils/XALangSupport');
-
+
var ServiceForm = require('views/service/ServiceForm');
var RangerServiceDef= require('models/RangerServiceDef');
var ServiceCreateTmpl = require('hbs!tmpl/service/ServiceCreate_tmpl');
@@ -42,19 +42,19 @@ define(function(require){
_viewName : 'ServiceCreate',
template: ServiceCreateTmpl,
-
+
templateHelpers : function(){
return { editService : this.editService};
},
-
+
breadCrumbs :function(){
- var name = this.rangerServiceDefModel.get('name') !=
XAEnums.ServiceType.SERVICE_TAG.label ? 'ServiceManager' :
'TagBasedServiceManager';
+ var name = this.rangerServiceDefModel.get('name') !=
XAEnums.ServiceType.SERVICE_TAG.label ? 'ServiceManager' :
'TagBasedServiceManager';
if(this.model.isNew()){
return [XALinks.get(name),
XALinks.get('ServiceCreate')];
} else {
return [XALinks.get(name),
XALinks.get('ServiceEdit')];
}
- },
+ },
/** Layout sub regions */
regions: {
@@ -132,7 +132,9 @@ define(function(require){
if(! _.isEmpty(errors)){
return;
}
- this.form.formValidation();
+ if (!this.form.formValidation()) {
+ return;
+ }
this.saveService();
},
saveService : function(){
@@ -165,7 +167,7 @@ define(function(require){
m
ranger git commit: RANGER-2152: Incorrect debugging information in RangerPluginClassLoader.java
Repository: ranger
Updated Branches:
refs/heads/master 344992900 -> 86b714048
RANGER-2152: Incorrect debugging information in RangerPluginClassLoader.java
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/86b71404
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/86b71404
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/86b71404
Branch: refs/heads/master
Commit: 86b714048c27515763a69a7a07c307f96a26acb6
Parents: 3449929
Author: xingpeng1
Authored: Mon Jul 23 15:13:20 2018 +0800
Committer: zhangqiang2
Committed: Thu Jul 26 14:40:24 2018 +0800
--
.../apache/ranger/plugin/classloader/RangerPluginClassLoader.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/86b71404/ranger-plugin-classloader/src/main/java/org/apache/ranger/plugin/classloader/RangerPluginClassLoader.java
--
diff --git
a/ranger-plugin-classloader/src/main/java/org/apache/ranger/plugin/classloader/RangerPluginClassLoader.java
b/ranger-plugin-classloader/src/main/java/org/apache/ranger/plugin/classloader/RangerPluginClassLoader.java
index 2855560..41f53c0 100644
---
a/ranger-plugin-classloader/src/main/java/org/apache/ranger/plugin/classloader/RangerPluginClassLoader.java
+++
b/ranger-plugin-classloader/src/main/java/org/apache/ranger/plugin/classloader/RangerPluginClassLoader.java
@@ -127,7 +127,7 @@ public class RangerPluginClassLoader extends URLClassLoader
{
}
if(LOG.isDebugEnabled()) {
-LOG.debug("<== RangerPluginClassLoader.loadClass" + name + "): " +
ret);
+LOG.debug("<== RangerPluginClassLoader.loadClass(" + name + "): "
+ ret);
}
return ret;
ranger git commit: RANGER-2044:Fix execute sql failure in db_setup.py file of the admin.
Repository: ranger
Updated Branches:
refs/heads/master b6d45a261 -> ceaed3f3d
RANGER-2044:Fix execute sql failure in db_setup.py file of the admin.
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/ceaed3f3
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/ceaed3f3
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/ceaed3f3
Branch: refs/heads/master
Commit: ceaed3f3dd590078a59ca9007fec3930542b6152
Parents: b6d45a2
Author: zhangqiang2
Authored: Tue Mar 27 14:33:40 2018 +0800
Committer: zhangqiang2
Committed: Thu Mar 29 10:54:30 2018 +0800
--
security-admin/scripts/db_setup.py | 23 ++-
1 file changed, 6 insertions(+), 17 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/ceaed3f3/security-admin/scripts/db_setup.py
--
diff --git a/security-admin/scripts/db_setup.py
b/security-admin/scripts/db_setup.py
index 1689e5d..83ccc32 100644
--- a/security-admin/scripts/db_setup.py
+++ b/security-admin/scripts/db_setup.py
@@ -15,18 +15,12 @@
import os
import re
import sys
-import errno
import shlex
import platform
import logging
import subprocess
-import fileinput
from os.path import basename
-from subprocess import Popen,PIPE
-from datetime import date
import time
-import datetime
-from time import gmtime, strftime
import socket
globalDict = {}
@@ -80,7 +74,7 @@ def populate_global_dict():
read_config_file =
open(os.path.join(RANGER_ADMIN_CONF,'install.properties'))
elif os_name == "WINDOWS":
read_config_file =
open(os.path.join(RANGER_ADMIN_CONF,'install_config.properties'))
- library_path = os.path.join(RANGER_ADMIN_HOME,"cred","lib","*")
+ #library_path = os.path.join(RANGER_ADMIN_HOME,"cred","lib","*")
for each_line in read_config_file.read().split('\n') :
each_line = each_line.strip();
if len(each_line) == 0:
@@ -91,7 +85,7 @@ def populate_global_dict():
key , value = each_line.split("=",1)
key = key.strip()
if 'PASSWORD' in key:
- jceks_file_path =
os.path.join(RANGER_ADMIN_HOME, 'jceks','ranger_db.jceks')
+ #jceks_file_path =
os.path.join(RANGER_ADMIN_HOME, 'jceks','ranger_db.jceks')
#statuscode,value =
call_keystore(library_path,key,'',jceks_file_path,'get')
#if statuscode == 1:
value = ''
@@ -607,7 +601,6 @@ class MysqlConf(BaseDB):
sys.exit(1)
def change_admin_default_password(self, xa_db_host, db_user,
db_password, db_name,userName,oldPassword,newPassword):
- my_dict = {}
version = ""
className = "ChangePasswordUtil"
version = dbversionBasedOnUserName(userName)
@@ -1322,7 +1315,6 @@ class OracleConf(BaseDB):
sys.exit(1)
def change_admin_default_password(self, xa_db_host, db_user,
db_password, db_name,userName,oldPassword,newPassword):
- my_dict = {}
version = ""
className = "ChangePasswordUtil"
version = dbversionBasedOnUserName(userName)
@@ -1992,7 +1984,6 @@ class PostgresConf(BaseDB):
sys.exit(1)
def change_admin_default_password(self, xa_db_host, db_user,
db_password, db_name,userName,oldPassword,newPassword):
- my_dict = {}
version = ""
className = "ChangePasswordUtil"
version = dbversionBasedOnUserName(userName)
@@ -2624,7 +2615,6 @@ class SqlServerConf(BaseDB):
sys.exit(1)
def change_admin_default_password(self, xa_db_host, db_user,
db_password, db_name,userName,oldPassword,newPassword):
- my_dict = {}
version = ""
className = "ChangePasswordUtil"
version = dbversionBasedOnUserName(userName)
@@ -3102,22 +3092,22 @@ class SqlAnywhereConf(BaseDB):
log("[I] Patch version
updated", "info")
else:
if is_unix:
- query = get_cmd
+ " -query \"delete from x_db_version_h where version='%s' and active='N' and
updated_by='%s';\" -c \;" %(versi
ranger git commit: RANGER-2042:Fix error variable and remove invalid import package in upgrade_admin.py file of the security admin.
Repository: ranger Updated Branches: refs/heads/master e80464244 -> b6d45a261 RANGER-2042:Fix error variable and remove invalid import package in upgrade_admin.py file of the security admin. Signed-off-by: zhangqiang2 Project: http://git-wip-us.apache.org/repos/asf/ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/b6d45a26 Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/b6d45a26 Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/b6d45a26 Branch: refs/heads/master Commit: b6d45a261810b3ddbf3bca5bb68110a86dd5060c Parents: e804642 Author: zhangqiang2 Authored: Tue Mar 27 11:40:32 2018 +0800 Committer: zhangqiang2 Committed: Thu Mar 29 10:47:10 2018 +0800 -- security-admin/scripts/upgrade_admin.py | 14 +- 1 file changed, 5 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ranger/blob/b6d45a26/security-admin/scripts/upgrade_admin.py -- diff --git a/security-admin/scripts/upgrade_admin.py b/security-admin/scripts/upgrade_admin.py index 5c79192..28b7e98 100755 --- a/security-admin/scripts/upgrade_admin.py +++ b/security-admin/scripts/upgrade_admin.py @@ -13,15 +13,13 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -import re import StringIO import xml.etree.ElementTree as ET import ConfigParser -import os,errno,sys,getopt +import os,sys,getopt from os import listdir from os.path import isfile, join, dirname, basename -from urlparse import urlparse -from time import gmtime, strftime, localtime +from time import strftime, localtime import shutil debugLevel = 1 @@ -236,7 +234,7 @@ def main(): tempLibFile=join(tempLibFolder,mysqlConnectorJarFileName[0]) shutil.copy(join(libFolder,mysqlConnectorJarFileName[0]), tempLibFile) installProps['SQL_CONNECTOR_JAR'] = tempLibFile - elif (token[3] == 'odbc'): + elif (tokens[3] == 'odbc'): installProps['DB_FLAVOR'] = 'ORACLE' installProps['SQL_COMMAND_INVOKER'] = 'sqlplus' installProps['db_host'] = dbTokens[0] @@ -325,11 +323,9 @@ def writeToFile(keyList, defValMap, props, outFileName): for key in keyList: if (key in props): - print >> outf, "%s=%s" % (key,props[key]) - val = props[key] + print >> outf, "%s=%s" % (key,props[key]) else: - print >> outf, "# Default value for [%s] is used\n%s=%s\n#---" % (key, key,defValMap[key]) - val = defValMap[key] + print >> outf, "# Default value for [%s] is used\n%s=%s\n#---" % (key, key,defValMap[key]) outf.flush() outf.close()
ranger git commit: RANGER-2033:Add hbase policy and click the 'Test Connection' button. Connection Failed.
Repository: ranger
Updated Branches:
refs/heads/master 2b5a72ea7 -> e80464244
RANGER-2033:Add hbase policy and click the 'Test Connection' button. Connection
Failed.
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/e8046424
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/e8046424
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/e8046424
Branch: refs/heads/master
Commit: e80464244db6f5a1acf393862752cb951155524d
Parents: 2b5a72e
Author: zhangqiang2
Authored: Mon Mar 26 14:36:37 2018 +0800
Committer: zhangqiang2
Committed: Thu Mar 29 10:44:56 2018 +0800
--
pom.xml | 5 +
1 file changed, 5 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/e8046424/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 413c23b..a3ef325 100644
--- a/pom.xml
+++ b/pom.xml
@@ -354,6 +354,11 @@
commons-beanutils
${commons.beanutils.version}
+
+ org.apache.hbase
+ hbase-client
+ ${hbase.version}
+
ranger git commit: RANGER-2033:Add hbase policy and click the 'Test Connection' button. Connection Failed.
Repository: ranger
Updated Branches:
refs/heads/ranger-1.0 8e1b9c480 -> f58b53ab4
RANGER-2033:Add hbase policy and click the 'Test Connection' button. Connection
Failed.
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/f58b53ab
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/f58b53ab
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/f58b53ab
Branch: refs/heads/ranger-1.0
Commit: f58b53ab4e0ac752b1c2913b54316a339a7759e2
Parents: 8e1b9c4
Author: zhangqiang2
Authored: Mon Mar 26 14:36:37 2018 +0800
Committer: zhangqiang2
Committed: Thu Mar 29 10:42:51 2018 +0800
--
pom.xml | 5 +
1 file changed, 5 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/f58b53ab/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 6e2b76b..c7632ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -349,6 +349,11 @@
commons-beanutils
${commons.beanutils.version}
+
+ org.apache.hbase
+ hbase-client
+ ${hbase.version}
+
ranger git commit: RANGER-2005:Remove invalid packages and import commands package to installer to fixed RANGER-1469 defect.
Repository: ranger
Updated Branches:
refs/heads/master f96a9276f -> 0ae46b746
RANGER-2005:Remove invalid packages and import commands package to installer to
fixed RANGER-1469 defect.
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/0ae46b74
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/0ae46b74
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/0ae46b74
Branch: refs/heads/master
Commit: 0ae46b7467594bb01038dac0bc240743cfb4f5ef
Parents: f96a927
Author: zhangqiang2
Authored: Sun Mar 4 22:51:42 2018 +0800
Committer: zhangqiang2
Committed: Tue Mar 6 17:05:08 2018 +0800
--
unixauthservice/scripts/setup.py | 9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/0ae46b74/unixauthservice/scripts/setup.py
--
diff --git a/unixauthservice/scripts/setup.py b/unixauthservice/scripts/setup.py
index 3fd0dd9..d6b1807 100755
--- a/unixauthservice/scripts/setup.py
+++ b/unixauthservice/scripts/setup.py
@@ -18,15 +18,12 @@ import re
import StringIO
import xml.etree.ElementTree as ET
import ConfigParser
-import os, errno, sys, getopt
-import sys
-from os import listdir
+import os, sys
from os.path import isfile, join, dirname, basename
-from urlparse import urlparse
-from time import gmtime, strftime, localtime
-from xml import etree
+from time import strftime, localtime
import shutil
import pwd, grp
+import commands
globalDict = {}
ranger git commit: RANGER-2001:Similar to RANGER-1469, we should check whether the user or group has existed before the installer create a new user or group when user install usersync
Repository: ranger
Updated Branches:
refs/heads/master 91a437a29 -> dcba4bc40
RANGER-2001:Similar to RANGER-1469, we should check whether the user or group
has existed before the installer create a new user or group when user install
usersync
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/dcba4bc4
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/dcba4bc4
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/dcba4bc4
Branch: refs/heads/master
Commit: dcba4bc40a795156fbac8b747e339dc34a23bec7
Parents: 91a437a
Author: zhangqiang2
Authored: Thu Mar 1 14:56:59 2018 +0800
Committer: zhangqiang2
Committed: Fri Mar 2 08:57:20 2018 +0800
--
unixauthservice/scripts/setup.py | 26 --
1 file changed, 16 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/dcba4bc4/unixauthservice/scripts/setup.py
--
diff --git a/unixauthservice/scripts/setup.py b/unixauthservice/scripts/setup.py
index 5ae9123..3fd0dd9 100755
--- a/unixauthservice/scripts/setup.py
+++ b/unixauthservice/scripts/setup.py
@@ -280,11 +280,14 @@ def convertInstallPropsToXML(props):
def createUser(username, groupname):
-cmd = "useradd -g %s %s -m" % (groupname, username)
-ret = os.system(cmd)
-if (ret != 0):
-print "ERROR: os command execution (%s) failed. error code = %d " %
(cmd, ret)
-sys.exit(1)
+checkuser = "grep ^" + username + ": /etc/passwd | awk -F: '{print
$1}'|head -1 "
+(status, output) = commands.getstatusoutput(checkuser)
+if len(output) < 1:
+cmd = "useradd -g %s %s -m" % (groupname, username)
+ret = os.system(cmd)
+if (ret != 0):
+print "ERROR: os command execution (%s) failed. error code = %d "
% (cmd, ret)
+sys.exit(1)
try:
ret = pwd.getpwnam(username).pw_uid
return ret
@@ -294,11 +297,14 @@ def createUser(username, groupname):
def createGroup(groupname):
-cmd = "groupadd %s" % (groupname)
-ret = os.system(cmd)
-if (ret != 0):
-print "ERROR: os command execution (%s) failed. error code = %d " %
(cmd, ret)
-sys.exit(1)
+checkgroup = "egrep ^" + groupname + ": /etc/group | awk -F: '{print
$1}'|head -1 "
+(status, output) = commands.getstatusoutput(checkgroup)
+if len(output) < 1:
+cmd = "groupadd %s" % (groupname)
+ret = os.system(cmd)
+if (ret != 0):
+print "ERROR: os command execution (%s) failed. error code = %d "
% (cmd, ret)
+sys.exit(1)
try:
ret = grp.getgrnam(groupname).gr_gid
return ret
ranger git commit: RANGER-1929 The ranger should support the View policy.
Repository: ranger
Updated Branches:
refs/heads/master 3e1168ddb -> 4ef52b46b
RANGER-1929 The ranger should support the View policy.
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/4ef52b46
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/4ef52b46
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/4ef52b46
Branch: refs/heads/master
Commit: 4ef52b46b1e6dd7bc1991a05b8256984d30a6c58
Parents: 3e1168d
Author: peng.jianhua
Authored: Thu Dec 21 09:31:57 2017 +0800
Committer: zhangqiang2
Committed: Wed Dec 20 20:45:24 2017 -0500
--
.../scripts/modules/globalize/message/en.js | 19 +++
.../views/policies/RangerPolicyConditions.js| 54 ++
.../views/policies/RangerPolicyDetail.js| 166 +++
.../views/policies/RangerPolicyTableLayout.js | 30 +++-
security-admin/src/main/webapp/styles/xa.css| 10 ++
.../policies/RangerPolicyConditions_tmpl.html | 79 +
.../policies/RangerPolicyDetail_tmpl.html | 79 +
7 files changed, 436 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/4ef52b46/security-admin/src/main/webapp/scripts/modules/globalize/message/en.js
--
diff --git
a/security-admin/src/main/webapp/scripts/modules/globalize/message/en.js
b/security-admin/src/main/webapp/scripts/modules/globalize/message/en.js
index b8de5c3..2cd3345 100644
--- a/security-admin/src/main/webapp/scripts/modules/globalize/message/en.js
+++ b/security-admin/src/main/webapp/scripts/modules/globalize/message/en.js
@@ -330,6 +330,25 @@ define(function(require) {
pluginStatus:'Plugin Status',
clusterName :'Name of ambari cluster',
url:'Hive url.',
+enabled :'enabled',
+disabled:'disabled',
+Url :'Url',
+recursive :'recursive',
+nonRecursive:'non-recursive',
+dataBase:'DataBase',
+exclude :'exclude',
+include :'include',
+yes :'Yes',
+no :'No',
+conditions :'Conditions',
+exAllowCondition:'Exclude from Allow Conditions',
+denyCondition :'Deny Conditions',
+exDenyCondition :'Exclude from Deny Conditions',
+maskingOption :'Masking Option',
+masking :'Masking',
+custom :'CUSTOM',
+mask:'Mask',
+rowFilter :'Row Filter'
},
msg : {
deletePolicyValidationMsg : 'Policy does not
have any settings for the specific resource. Policy will be deleted. Press [Ok]
to continue. Press [Cancel] to edit the policy.',
http://git-wip-us.apache.org/repos/asf/ranger/blob/4ef52b46/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyConditions.js
--
diff --git
a/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyConditions.js
b/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyConditions.js
new file mode 100644
index 000..96d9c8b
--- /dev/null
+++
b/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyConditions.js
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/*
+ * Policy Conditions view
+ */
+
+define(function(require) {
+ 'use strict';
+
+ var Backbone = re
ranger git commit: RANGER-1934:Optimize the init method in BaseAuditHandler class to avoid ArrayIndexOutOfBoundsException
Repository: ranger
Updated Branches:
refs/heads/master f1fb6315f -> 52a303218
RANGER-1934:Optimize the init method in BaseAuditHandler class to avoid
ArrayIndexOutOfBoundsException
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/52a30321
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/52a30321
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/52a30321
Branch: refs/heads/master
Commit: 52a303218224610d4b7b34f745bacfadaea1420c
Parents: f1fb631
Author: peng.jianhua
Authored: Wed Dec 20 13:48:29 2017 +0800
Committer: zhangqiang2
Committed: Wed Dec 20 20:23:19 2017 -0500
--
.../ranger/audit/provider/BaseAuditHandler.java | 14 --
1 file changed, 8 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/52a30321/agents-audit/src/main/java/org/apache/ranger/audit/provider/BaseAuditHandler.java
--
diff --git
a/agents-audit/src/main/java/org/apache/ranger/audit/provider/BaseAuditHandler.java
b/agents-audit/src/main/java/org/apache/ranger/audit/provider/BaseAuditHandler.java
index b095000..dac5c94 100644
---
a/agents-audit/src/main/java/org/apache/ranger/audit/provider/BaseAuditHandler.java
+++
b/agents-audit/src/main/java/org/apache/ranger/audit/provider/BaseAuditHandler.java
@@ -88,19 +88,21 @@ public abstract class BaseAuditHandler implements
AuditHandler {
propPrefix = basePropertyName;
}
LOG.info("propPrefix=" + propPrefix);
- // Get final token
- List tokens = MiscUtil.toArray(propPrefix, ".");
- String finalToken = tokens.get(tokens.size() - 1);
String name = MiscUtil.getStringProperty(props,
basePropertyName + "."
+ PROP_NAME);
if (name != null && !name.isEmpty()) {
setName(name);
}
+ // Get final token
if (providerName == null) {
- setName(finalToken);
- LOG.info("Using providerName from property prefix.
providerName="
- + getName());
+ List tokens = MiscUtil.toArray(propPrefix, ".");
+ if (!tokens.isEmpty()) {
+ String finalToken = tokens.get(tokens.size() -
1);
+ setName(finalToken);
+ LOG.info("Using providerName from property
prefix. providerName="
+ + getName());
+ }
}
LOG.info("providerName=" + getName());
ranger git commit: RANGER-1924:Simplify ranger-hdfs plugin remove gson.jar in ranger/src/main/assembly/hdfs-agent.xml
Repository: ranger
Updated Branches:
refs/heads/master d1ee6a578 -> cd67d7295
RANGER-1924:Simplify ranger-hdfs plugin remove gson.jar in
ranger/src/main/assembly/hdfs-agent.xml
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/cd67d729
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/cd67d729
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/cd67d729
Branch: refs/heads/master
Commit: cd67d7295a95049646c44c3bcf1fdd04895eff5d
Parents: d1ee6a5
Author: peng.jianhua
Authored: Wed Dec 13 09:31:29 2017 +0800
Committer: zhangqiang2
Committed: Thu Dec 14 07:09:06 2017 -0500
--
hdfs-agent/pom.xml | 4
hive-agent/pom.xml | 4
src/main/assembly/hdfs-agent.xml | 1 -
src/main/assembly/hive-agent.xml | 1 -
4 files changed, 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/cd67d729/hdfs-agent/pom.xml
--
diff --git a/hdfs-agent/pom.xml b/hdfs-agent/pom.xml
index 0b6773d..7aec881 100644
--- a/hdfs-agent/pom.xml
+++ b/hdfs-agent/pom.xml
@@ -32,10 +32,6 @@
-com.google.code.gson
-gson
-
-
commons-logging
commons-logging
${commons.logging.version}
http://git-wip-us.apache.org/repos/asf/ranger/blob/cd67d729/hive-agent/pom.xml
--
diff --git a/hive-agent/pom.xml b/hive-agent/pom.xml
index c195443..44e8158 100644
--- a/hive-agent/pom.xml
+++ b/hive-agent/pom.xml
@@ -52,10 +52,6 @@
${hive.version}
-com.google.code.gson
-gson
-
-
org.apache.hive
hive-metastore
${hive.version}
http://git-wip-us.apache.org/repos/asf/ranger/blob/cd67d729/src/main/assembly/hdfs-agent.xml
--
diff --git a/src/main/assembly/hdfs-agent.xml b/src/main/assembly/hdfs-agent.xml
index 5279a9a..561d137 100644
--- a/src/main/assembly/hdfs-agent.xml
+++ b/src/main/assembly/hdfs-agent.xml
@@ -79,7 +79,6 @@
/lib/ranger-hdfs-plugin-impl
-
com.google.code.gson:gson*
org.eclipse.persistence:javax.persistence
org.eclipse.persistence:eclipselink
org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}
http://git-wip-us.apache.org/repos/asf/ranger/blob/cd67d729/src/main/assembly/hive-agent.xml
--
diff --git a/src/main/assembly/hive-agent.xml b/src/main/assembly/hive-agent.xml
index ca65c80..03bd31a 100644
--- a/src/main/assembly/hive-agent.xml
+++ b/src/main/assembly/hive-agent.xml
@@ -47,7 +47,6 @@
/lib/ranger-hive-plugin-impl
-com.google.code.gson:gson*
org.eclipse.persistence:eclipselink
org.eclipse.persistence:javax.persistence
org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}
ranger git commit: RANGER-1925:Remove invalid code from plugin script
Repository: ranger
Updated Branches:
refs/heads/master 58f513215 -> d1ee6a578
RANGER-1925:Remove invalid code from plugin script
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/d1ee6a57
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/d1ee6a57
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/d1ee6a57
Branch: refs/heads/master
Commit: d1ee6a578e4d3268bdb220cdb73f481d7403fbc2
Parents: 58f5132
Author: zhangqiang2
Authored: Tue Dec 12 04:16:47 2017 -0500
Committer: zhangqiang2
Committed: Thu Dec 14 07:07:09 2017 -0500
--
agents-common/scripts/enable-agent.sh | 1 -
plugin-kms/scripts/enable-kms-plugin.sh | 1 -
2 files changed, 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/d1ee6a57/agents-common/scripts/enable-agent.sh
--
diff --git a/agents-common/scripts/enable-agent.sh
b/agents-common/scripts/enable-agent.sh
index d77e4f9e..8ae7e33 100755
--- a/agents-common/scripts/enable-agent.sh
+++ b/agents-common/scripts/enable-agent.sh
@@ -38,7 +38,6 @@ function getInstallProperty() {
# Base env variable for Ranger related files/directories
#
PROJ_NAME=ranger
-BASE_CONF_DIR=/etc/${PROJ_NAME}
#
# The script should be run by "root" user
http://git-wip-us.apache.org/repos/asf/ranger/blob/d1ee6a57/plugin-kms/scripts/enable-kms-plugin.sh
--
diff --git a/plugin-kms/scripts/enable-kms-plugin.sh
b/plugin-kms/scripts/enable-kms-plugin.sh
index 9180b57..43657f3 100755
--- a/plugin-kms/scripts/enable-kms-plugin.sh
+++ b/plugin-kms/scripts/enable-kms-plugin.sh
@@ -38,7 +38,6 @@ function getInstallProperty() {
# Base env variable for Ranger related files/directories
#
PROJ_NAME=ranger
-BASE_CONF_DIR=/etc/${PROJ_NAME}
#
# The script should be run by "root" user
ranger git commit: RANGER-1914:Modify crypt_algo_array.length to avoid java.lang.ArrayIndexOutOfBoundsException in PasswordUtils.class
Repository: ranger
Updated Branches:
refs/heads/master fb0b6f6ab -> 879a4dfdd
RANGER-1914:Modify crypt_algo_array.length to avoid
java.lang.ArrayIndexOutOfBoundsException in PasswordUtils.class
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/879a4dfd
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/879a4dfd
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/879a4dfd
Branch: refs/heads/master
Commit: 879a4dfddca4218148a738ef20001b020f4b9f3e
Parents: fb0b6f6
Author: peng.jianhua
Authored: Mon Dec 4 16:18:12 2017 +0800
Committer: zhangqiang2
Committed: Mon Dec 4 19:54:56 2017 -0500
--
.../src/main/java/org/apache/ranger/plugin/util/PasswordUtils.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/879a4dfd/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 58cdd35..6ba42d4 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
@@ -83,7 +83,7 @@ public class PasswordUtils {
count = StringUtils.countMatches(aPassword, ",");
crypt_algo_array = aPassword.split(",");
}
-if (crypt_algo_array != null && crypt_algo_array.length > 1) {
+if (crypt_algo_array != null && crypt_algo_array.length > 4) {
CRYPT_ALGO = crypt_algo_array[0];
ENCRYPT_KEY = crypt_algo_array[1].toCharArray();
SALT = crypt_algo_array[2].getBytes();
ranger git commit: RANGER-1907:The solr-solrj jar is not need for hive-agent. So it should be removed from the pom.xml file of the hive-agent
Repository: ranger
Updated Branches:
refs/heads/master 4c2bed536 -> fb0b6f6ab
RANGER-1907:The solr-solrj jar is not need for hive-agent. So it should be
removed from the pom.xml file of the hive-agent
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/fb0b6f6a
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/fb0b6f6a
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/fb0b6f6a
Branch: refs/heads/master
Commit: fb0b6f6abd06ad051d53fe67ed62a2aaedf518ed
Parents: 4c2bed5
Author: peng.jianhua
Authored: Fri Nov 24 09:59:48 2017 +0800
Committer: zhangqiang2
Committed: Fri Dec 1 01:48:48 2017 -0500
--
hive-agent/pom.xml | 5 -
1 file changed, 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/fb0b6f6a/hive-agent/pom.xml
--
diff --git a/hive-agent/pom.xml b/hive-agent/pom.xml
index a2b4aa8..7d54a4d 100644
--- a/hive-agent/pom.xml
+++ b/hive-agent/pom.xml
@@ -87,11 +87,6 @@
${project.version}
- org.apache.solr
- solr-solrj
- ${solr.version}
-
-
org.apache.httpcomponents
httpcore
${httpcomponents.httpcore.version}
ranger git commit: RANGER-1901:Similar to RANGER-1846, the JAVA_VERSION_REQUIRED configuration item is invalid in kms installer, we should enable it to control the necessary java version.
Repository: ranger
Updated Branches:
refs/heads/master 5824fdc81 -> 21f8b63f5
RANGER-1901:Similar to RANGER-1846, the JAVA_VERSION_REQUIRED configuration
item is invalid in kms installer, we should enable it to control the necessary
java version.
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/21f8b63f
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/21f8b63f
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/21f8b63f
Branch: refs/heads/master
Commit: 21f8b63f5d0c6e422bc19adb515ba8a542955ab5
Parents: 5824fdc
Author: peng.jianhua
Authored: Wed Nov 22 10:51:35 2017 +0800
Committer: zhangqiang2
Committed: Thu Nov 23 20:13:55 2017 -0500
--
kms/scripts/setup.sh| 9 +++--
security-admin/scripts/setup.sh | 2 ++
2 files changed, 9 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/21f8b63f/kms/scripts/setup.sh
--
diff --git a/kms/scripts/setup.sh b/kms/scripts/setup.sh
index 30999c2..2da1e96 100755
--- a/kms/scripts/setup.sh
+++ b/kms/scripts/setup.sh
@@ -302,8 +302,13 @@ check_java_version() {
version=$("$JAVA_BIN" -version 2>&1 | awk -F '"' '/version/ {print $2}')
major=`echo ${version} | cut -d. -f1`
minor=`echo ${version} | cut -d. -f2`
- if [[ "${major}" == 1 && "${minor}" < 7 ]] ; then
- log "[E] Java 1.7 is required, current java version is $version"
+ current_java_version="$major.$minor"
+ num_current_java_version=`echo $current_java_version|awk ' {
printf("%3.2f\n", $0); } '`
+ JAVA_VERSION_REQUIRED=`echo $JAVA_VERSION_REQUIRED | awk '{gsub(/
/,"")}1'`
+ JAVA_VERSION_REQUIRED=`echo $JAVA_VERSION_REQUIRED | awk
'{gsub(/'"'"'/,"")}1'`
+ num_required_java_version=`echo $JAVA_VERSION_REQUIRED|awk ' {
printf("%3.2f\n", $0); } '`
+ if [ `echo "$num_current_java_version < $num_required_java_version" |
bc` -eq 1 ];then
+ log "[E] The java version must be greater than or equal to
$JAVA_VERSION_REQUIRED, the current java version is $version"
exit 1;
fi
}
http://git-wip-us.apache.org/repos/asf/ranger/blob/21f8b63f/security-admin/scripts/setup.sh
--
diff --git a/security-admin/scripts/setup.sh b/security-admin/scripts/setup.sh
index 19008fb..4d09bc2 100755
--- a/security-admin/scripts/setup.sh
+++ b/security-admin/scripts/setup.sh
@@ -305,6 +305,8 @@ check_java_version() {
minor=`echo ${version} | cut -d. -f2`
current_java_version="$major.$minor"
num_current_java_version=`echo $current_java_version|awk ' {
printf("%3.2f\n", $0); } '`
+ JAVA_VERSION_REQUIRED=`echo $JAVA_VERSION_REQUIRED | awk '{gsub(/
/,"")}1'`
+ JAVA_VERSION_REQUIRED=`echo $JAVA_VERSION_REQUIRED | awk
'{gsub(/'"'"'/,"")}1'`
num_required_java_version=`echo $JAVA_VERSION_REQUIRED|awk ' {
printf("%3.2f\n", $0); } '`
if [ `echo "$num_current_java_version < $num_required_java_version" |
bc` -eq 1 ];then
log "[E] The java version must be greater than or equal to
$JAVA_VERSION_REQUIRED, the current java version is $version"
ranger git commit: RANGER-1861:There are errors when the 'ranger-kms start' command was executed
Repository: ranger
Updated Branches:
refs/heads/master 10051777e -> 8ab766846
RANGER-1861:There are errors when the 'ranger-kms start' command was executed
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/8ab76684
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/8ab76684
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/8ab76684
Branch: refs/heads/master
Commit: 8ab766846538ddcb3dd56dc11c174c6a8e3ad83c
Parents: 1005177
Author: peng.jianhua
Authored: Thu Nov 16 17:39:13 2017 +0800
Committer: zhangqiang2
Committed: Mon Nov 20 19:13:21 2017 -0500
--
.../java/org/apache/ranger/server/tomcat/EmbeddedServer.java| 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/8ab76684/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java
--
diff --git
a/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java
b/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java
index 40eed86..eac0dac 100644
---
a/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java
+++
b/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java
@@ -72,9 +72,10 @@ public class EmbeddedServer {
public EmbeddedServer(String[] args) {
if (args.length > 0) {
configFile = args[0];
+ } else {
+ XMLUtils.loadConfig(DEFAULT_CONFIG_FILENAME,
serverConfigProperties);
}
-XMLUtils.loadConfig(CORE_SITE_CONFIG_FILENAME, serverConfigProperties);
-XMLUtils.loadConfig(DEFAULT_CONFIG_FILENAME, serverConfigProperties);
+ XMLUtils.loadConfig(CORE_SITE_CONFIG_FILENAME,
serverConfigProperties);
XMLUtils.loadConfig(configFile, serverConfigProperties);
}
ranger git commit: RANGER-1875:The installer of the kms should not repeatedly add a user to the same group.
Repository: ranger
Updated Branches:
refs/heads/master 44691b556 -> 502f3cea6
RANGER-1875:The installer of the kms should not repeatedly add a user to the
same group.
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/502f3cea
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/502f3cea
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/502f3cea
Branch: refs/heads/master
Commit: 502f3cea682013f5ca4ea5e702f887aabc60e538
Parents: 44691b5
Author: peng.jianhua
Authored: Tue Nov 7 10:56:04 2017 +0800
Committer: zhangqiang2
Committed: Thu Nov 9 04:26:28 2017 -0500
--
kms/scripts/setup.sh | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/502f3cea/kms/scripts/setup.sh
--
diff --git a/kms/scripts/setup.sh b/kms/scripts/setup.sh
index 6e4b7e2..30999c2 100755
--- a/kms/scripts/setup.sh
+++ b/kms/scripts/setup.sh
@@ -750,8 +750,15 @@ EOF
chpasswd < ${passwdtmpfile}
rm -rf ${passwdtmpfile}
else
- log "[I] User already exists, adding it to group";
- usermod -g ${unix_group} ${unix_user}
+ useringroup=`id ${unix_user}`
+useringrouparr=(${useringroup// / })
+ if [[ ${useringrouparr[1]} =~ "(${unix_group})" ]]
+ then
+ log "[I] the ${unix_user} user already exists and
belongs to group ${unix_group}"
+ else
+ log "[I] User already exists, adding it to group
${unix_group}"
+ usermod -g ${unix_group} ${unix_user}
+ fi
fi
log "[I] Setting up UNIX user : ${unix_user} and group: ${unix_group}
DONE";
ranger git commit: RANGER-1870:Modify the logic for buildUnixUserList and parseMembers method in UnixUserGroupBuilder class
Repository: ranger
Updated Branches:
refs/heads/master a62060fb0 -> 550cefcb6
RANGER-1870:Modify the logic for buildUnixUserList and parseMembers method in
UnixUserGroupBuilder class
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/550cefcb
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/550cefcb
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/550cefcb
Branch: refs/heads/master
Commit: 550cefcb6c7cd9009c123f8052cf6cc45ee6350b
Parents: a62060f
Author: zhangqiang2
Authored: Fri Nov 3 10:16:14 2017 +0800
Committer: zhangqiang2
Committed: Mon Nov 6 08:44:10 2017 -0500
--
.../apache/ranger/unixusersync/process/UnixUserGroupBuilder.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/550cefcb/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 045fe3f..60ce08d 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
@@ -222,7 +222,7 @@ public class UnixUserGroupBuilder implements
UserGroupSource {
int len = tokens.length;
- if (len < 3) {
+ if (len < 4) {
LOG.warn("Unable to parse: " + line);
continue;
}
@@ -350,7 +350,7 @@ public class UnixUserGroupBuilder implements
UserGroupSource {
String[] tokens = line.split(":");
- if (tokens.length < 2)
+ if (tokens.length < 3)
return;
String groupName = tokens[0];
ranger git commit: RANGER-1863:Optimize the code and keep the code style consistent, remove the invalid code in the RemoteUnixLoginModule class
Repository: ranger
Updated Branches:
refs/heads/master 4c1e80e6b -> 45f40277c
RANGER-1863:Optimize the code and keep the code style consistent, remove the
invalid code in the RemoteUnixLoginModule class
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/45f40277
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/45f40277
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/45f40277
Branch: refs/heads/master
Commit: 45f40277c996ea754eb7efb995e73efaec311394
Parents: 4c1e80e
Author: peng.jianhua
Authored: Mon Oct 30 11:31:46 2017 +0800
Committer: zhangqiang2
Committed: Fri Nov 3 04:21:00 2017 -0400
--
.../unix/jaas/RemoteUnixLoginModule.java| 23 ++--
1 file changed, 2 insertions(+), 21 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/45f40277/unixauthclient/src/main/java/org/apache/ranger/authentication/unix/jaas/RemoteUnixLoginModule.java
--
diff --git
a/unixauthclient/src/main/java/org/apache/ranger/authentication/unix/jaas/RemoteUnixLoginModule.java
b/unixauthclient/src/main/java/org/apache/ranger/authentication/unix/jaas/RemoteUnixLoginModule.java
index ff296b4..40cc51e 100644
---
a/unixauthclient/src/main/java/org/apache/ranger/authentication/unix/jaas/RemoteUnixLoginModule.java
+++
b/unixauthclient/src/main/java/org/apache/ranger/authentication/unix/jaas/RemoteUnixLoginModule.java
@@ -133,31 +133,12 @@ public class RemoteUnixLoginModule implements LoginModule
{
this.callbackHandler = new
ConsolePromptCallbackHandler();
}
- /*
- Properties config = null;
-
- String val = (String)
options.get(REMOTE_UNIX_AUTHENICATION_CONFIG_FILE_PARAM);
- log("Remote Unix Auth Configuration file [" + val + "]");
- if (val != null) {
- XMLUtils.loadConfig(val, config);
- }
-
- if (config == null) {
- logError("Remote Unix Auth Configuration is being
loaded from XML configuration - not Properties");
- config = new Properties();
- config.putAll(options);
- }
-
- */
-
Properties config = new Properties();
config.putAll(options);
initParams(config);
}
-
-
public void initParams(Properties options) {
String val = (String) options.get(JAAS_ENABLED_PARAM);
@@ -165,7 +146,7 @@ public class RemoteUnixLoginModule implements LoginModule {
if (val != null) {
remoteLoginEnabled =
val.trim().equalsIgnoreCase("true");
if (! remoteLoginEnabled) {
- System.err.println("Skipping RemoteLogin - [" +
JAAS_ENABLED_PARAM + "] => [" + val + "]");
+ log("Skipping RemoteLogin - [" +
JAAS_ENABLED_PARAM + "] => [" + val + "]");
return;
}
}
@@ -218,7 +199,7 @@ public class RemoteUnixLoginModule implements LoginModule {
}
String certValidationFlag = (String)
options.get(SERVER_CERT_VALIDATION_PARAM);
- serverCertValidation = (! (certValidationFlag != null
&& ("false".equalsIgnoreCase(certValidationFlag.trim().toLowerCase();
+ serverCertValidation = (! (certValidationFlag != null
&& ("false".equalsIgnoreCase(certValidationFlag.trim();
log("Server Cert Validation : " + serverCertValidation);
}
ranger git commit: RANGER-1856:Installation and access logic are inconsistent for the pid of kms program. Like security admin, they should be consistent.
Repository: ranger
Updated Branches:
refs/heads/master e16fd4c33 -> 454be055e
RANGER-1856:Installation and access logic are inconsistent for the pid of kms
program. Like security admin, they should be consistent.
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/454be055
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/454be055
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/454be055
Branch: refs/heads/master
Commit: 454be055e496921c7384ada2cb1d00120c83bc48
Parents: e16fd4c
Author: peng.jianhua
Authored: Wed Oct 25 10:21:05 2017 +0800
Committer: zhangqiang2
Committed: Thu Oct 26 20:48:09 2017 -0400
--
kms/scripts/setup.sh | 23 +--
1 file changed, 13 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/454be055/kms/scripts/setup.sh
--
diff --git a/kms/scripts/setup.sh b/kms/scripts/setup.sh
index 0b13ab4..6e4b7e2 100755
--- a/kms/scripts/setup.sh
+++ b/kms/scripts/setup.sh
@@ -22,11 +22,6 @@
PROPFILE=$PWD/install.properties
propertyValue=''
-pidFolderName='/var/run/ranger_kms'
-if [ ! -d "${pidFolderName}" ]; then
-mkdir -p "${pidFolderName}"
-fi
-
if [ ! -f ${PROPFILE} ]
then
echo "$PROPFILE file not found!!";
@@ -866,13 +861,21 @@ setup_install_files(){
echo "export RANGER_KMS_LOG_DIR=${RANGER_KMS_LOG_DIR}" >
${WEBAPP_ROOT}/WEB-INF/classes/conf/ranger-kms-env-logdir.sh
chmod a+rx ${WEBAPP_ROOT}/WEB-INF/classes/conf/ranger-kms-env-logdir.sh
+if [ -z "${RANGER_KMS_PID_DIR_PATH}" ]
+ then
+ RANGER_KMS_PID_DIR_PATH=/var/run/ranger_kms
+ fi
if [ ! -d ${RANGER_KMS_PID_DIR_PATH} ]; then
-log "[I] Creating KMS PID folder: ${RANGER_KMS_PID_DIR_PATH}"
-mkdir -p ${RANGER_KMS_PID_DIR_PATH}
-fi
-if [ -d ${RANGER_KMS_PID_DIR_PATH} ]; then
-chown -R ${unix_user} ${RANGER_KMS_PID_DIR_PATH}
+log "[I] Creating KMS PID folder: ${RANGER_KMS_PID_DIR_PATH}"
+mkdir -p ${RANGER_KMS_PID_DIR_PATH}
+if [ ! $? = "0" ];then
+log "Make $RANGER_KMS_PID_DIR_PATH failure!!";
+exit 1;
+fi
fi
+
+chown -R ${unix_user} ${RANGER_KMS_PID_DIR_PATH}
+
echo "export RANGER_KMS_PID_DIR_PATH=${RANGER_KMS_PID_DIR_PATH}" >
${WEBAPP_ROOT}/WEB-INF/classes/conf/ranger-kms-env-piddir.sh
echo "export KMS_USER=${unix_user}" >>
${WEBAPP_ROOT}/WEB-INF/classes/conf/ranger-kms-env-piddir.sh
chmod a+rx ${WEBAPP_ROOT}/WEB-INF/classes/conf/ranger-kms-env-piddir.sh
ranger git commit: RANGER-1857:The value of RANGER_KMS_HOME logic is not correct in dba_script.py and db_setup.py, Like db_setup.py in admin, we should optimize them.
Repository: ranger
Updated Branches:
refs/heads/master 543b9ff00 -> e16fd4c33
RANGER-1857:The value of RANGER_KMS_HOME logic is not correct in dba_script.py
and db_setup.py, Like db_setup.py in admin, we should optimize them.
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/e16fd4c3
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/e16fd4c3
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/e16fd4c3
Branch: refs/heads/master
Commit: e16fd4c338fc318c26721107107b12f414df79a3
Parents: 543b9ff
Author: peng.jianhua
Authored: Wed Oct 25 10:30:37 2017 +0800
Committer: zhangqiang2
Committed: Thu Oct 26 20:42:57 2017 -0400
--
kms/scripts/db_setup.py | 9 +++--
kms/scripts/dba_script.py | 10 --
2 files changed, 7 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/e16fd4c3/kms/scripts/db_setup.py
--
diff --git a/kms/scripts/db_setup.py b/kms/scripts/db_setup.py
index fb89198..663d60d 100644
--- a/kms/scripts/db_setup.py
+++ b/kms/scripts/db_setup.py
@@ -34,12 +34,9 @@ is_unix = os_name == "LINUX" or os_name == "DARWIN"
jisql_debug=True
-if is_unix:
- RANGER_KMS_HOME = os.getenv("RANGER_KMS_HOME")
- if RANGER_KMS_HOME is None:
- RANGER_KMS_HOME = os.getcwd()
-elif os_name == "WINDOWS":
- RANGER_KMS_HOME = os.getenv("RANGER_KMS_HOME")
+RANGER_KMS_HOME = os.getenv("RANGER_KMS_HOME")
+if RANGER_KMS_HOME is None:
+ RANGER_KMS_HOME = os.getcwd()
def check_output(query):
if is_unix:
http://git-wip-us.apache.org/repos/asf/ranger/blob/e16fd4c3/kms/scripts/dba_script.py
--
diff --git a/kms/scripts/dba_script.py b/kms/scripts/dba_script.py
index c471f59..c0dc7a4 100755
--- a/kms/scripts/dba_script.py
+++ b/kms/scripts/dba_script.py
@@ -33,12 +33,10 @@ is_unix = os_name == "LINUX" or os_name == "DARWIN"
jisql_debug=True
masked_pwd_string=''
-if is_unix:
- RANGER_KMS_HOME = os.getenv("RANGER_KMS_HOME")
- if RANGER_KMS_HOME is None:
- RANGER_KMS_HOME = os.getcwd()
-elif os_name == "WINDOWS":
- RANGER_KMS_HOME = os.getenv("RANGER_KMS_HOME")
+
+RANGER_KMS_HOME = os.getenv("RANGER_KMS_HOME")
+if RANGER_KMS_HOME is None:
+ RANGER_KMS_HOME = os.getcwd()
def check_output(query):
if is_unix:
ranger git commit: RANGER-1846:This JAVA_VERSION_REQUIRED configuration item is invalid in security admin installer, we should enable it to control the necessary java version.
Repository: ranger
Updated Branches:
refs/heads/master 7fc74fccc -> 543b9ff00
RANGER-1846:This JAVA_VERSION_REQUIRED configuration item is invalid in
security admin installer, we should enable it to control the necessary java
version.
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/543b9ff0
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/543b9ff0
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/543b9ff0
Branch: refs/heads/master
Commit: 543b9ff006da4f64b951e2f6c0a6b16d9b703f22
Parents: 7fc74fc
Author: peng.jianhua
Authored: Tue Oct 24 16:36:04 2017 +0800
Committer: zhangqiang2
Committed: Thu Oct 26 20:29:10 2017 -0400
--
security-admin/scripts/setup.sh | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/543b9ff0/security-admin/scripts/setup.sh
--
diff --git a/security-admin/scripts/setup.sh b/security-admin/scripts/setup.sh
index 468e8a0..19008fb 100755
--- a/security-admin/scripts/setup.sh
+++ b/security-admin/scripts/setup.sh
@@ -304,10 +304,12 @@ check_java_version() {
major=`echo ${version} | cut -d. -f1`
minor=`echo ${version} | cut -d. -f2`
current_java_version="$major.$minor"
-if [[ "$current_java_version" != "$JAVA_VERSION_REQUIRED" ]];then
-log "[E] Java $JAVA_VERSION_REQUIRED is required, current java version
is $version"
+ num_current_java_version=`echo $current_java_version|awk ' {
printf("%3.2f\n", $0); } '`
+ num_required_java_version=`echo $JAVA_VERSION_REQUIRED|awk ' {
printf("%3.2f\n", $0); } '`
+ if [ `echo "$num_current_java_version < $num_required_java_version" |
bc` -eq 1 ];then
+ log "[E] The java version must be greater than or equal to
$JAVA_VERSION_REQUIRED, the current java version is $version"
exit 1;
-fi
+ fi
}
sanity_check_files() {
ranger git commit: RANGER-1815:Fix invalid code and logic for BaseDao class
Repository: ranger
Updated Branches:
refs/heads/master a341fa1af -> ea9d66a24
RANGER-1815:Fix invalid code and logic for BaseDao class
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/ea9d66a2
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/ea9d66a2
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/ea9d66a2
Branch: refs/heads/master
Commit: ea9d66a249a169e2de8f90e0452a684c2629e762
Parents: a341fa1
Author: peng.jianhua
Authored: Thu Sep 28 20:24:06 2017 +0800
Committer: zhangqiang2
Committed: Mon Oct 9 21:49:59 2017 -0400
--
.../src/main/java/org/apache/ranger/audit/dao/BaseDao.java | 6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/ea9d66a2/agents-audit/src/main/java/org/apache/ranger/audit/dao/BaseDao.java
--
diff --git
a/agents-audit/src/main/java/org/apache/ranger/audit/dao/BaseDao.java
b/agents-audit/src/main/java/org/apache/ranger/audit/dao/BaseDao.java
index 75593d2..124f89e 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/dao/BaseDao.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/dao/BaseDao.java
@@ -144,8 +144,6 @@ public abstract class BaseDao {
return true;
}
- boolean ret = false;
-
boolean trxBegan = beginTransaction();
getEntityManager().remove(obj);
@@ -154,9 +152,7 @@ public abstract class BaseDao {
commitTransaction();
}
- ret = true;
-
- return ret;
+ return trxBegan;
}
public T getById(Long id) {
ranger git commit: RANGER-1790 Select/Deselect All should along with the chosed permission
Repository: ranger
Updated Branches:
refs/heads/master e47181f40 -> 238374e2a
RANGER-1790 Select/Deselect All should along with the chosed permission
Signed-off-by: peng.jianhua
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/238374e2
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/238374e2
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/238374e2
Branch: refs/heads/master
Commit: 238374e2a9b8335cd94fa8824c87b465b089c933
Parents: e47181f
Author: zhangqiang2
Authored: Tue Sep 19 10:11:04 2017 +0800
Committer: peng.jianhua
Committed: Thu Sep 28 17:07:44 2017 +0800
--
.../main/webapp/scripts/views/policies/PermissionList.js | 11 +++
1 file changed, 11 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/238374e2/security-admin/src/main/webapp/scripts/views/policies/PermissionList.js
--
diff --git
a/security-admin/src/main/webapp/scripts/views/policies/PermissionList.js
b/security-admin/src/main/webapp/scripts/views/policies/PermissionList.js
index 92b8334..73ea8fe 100644
--- a/security-admin/src/main/webapp/scripts/views/policies/PermissionList.js
+++ b/security-admin/src/main/webapp/scripts/views/policies/PermissionList.js
@@ -508,6 +508,17 @@ define(function(require) {
$(this).is(':checked') ?
checkboxlist.prop('checked',true) : checkboxlist.prop('checked',false);
});
+ that.$('.editable-checklist
input[type="checkbox"]').click(function(e){
+ if(this.value!="-1"){
+ var selectAll = true;
+ that.$('.editable-checklist
input[type="checkbox"]').each(function(index,item){
+ if(item.value!="-1" &&
!item.checked){
+ selectAll = false;
+ }
+ });
+
that.$('input[type="checkbox"][value="-1"]').prop('checked',selectAll);
+ }
+ });
},
renderPolicyCondtion : function() {
var that = this;
ranger git commit: RANGER-1798 HiveClient.java log print is error
Repository: ranger
Updated Branches:
refs/heads/master afc5e742d -> 2ec3b646e
RANGER-1798 HiveClient.java log print is error
Signed-off-by: peng.jianhua
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/2ec3b646
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/2ec3b646
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/2ec3b646
Branch: refs/heads/master
Commit: 2ec3b646e1cccf9b707f26344b5eb19ffee4bd61
Parents: afc5e74
Author: zhangqiang2
Authored: Fri Sep 22 17:38:30 2017 +0800
Committer: peng.jianhua
Committed: Sat Sep 23 12:32:58 2017 +0800
--
.../java/org/apache/ranger/services/hive/client/HiveClient.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/2ec3b646/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveClient.java
--
diff --git
a/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveClient.java
b/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveClient.java
index 5730593..265c015 100644
---
a/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveClient.java
+++
b/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveClient.java
@@ -234,7 +234,7 @@ public class HiveClient extends BaseClient implements
Closeable {
ret =
getTblList(tblNameMatching,dbList,tblList);
}
} catch (HadoopException he) {
- LOG.error("<== HiveClient getTblList()
:Unable to get the Table List", he);
+ LOG.error("<== HiveClient
getTableList() :Unable to get the Table List", he);
throw he;
}
return ret;
ranger git commit: revert RANGER-1782
Repository: ranger
Updated Branches:
refs/heads/master 88d8481d1 -> afc5e742d
revert RANGER-1782
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/afc5e742
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/afc5e742
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/afc5e742
Branch: refs/heads/master
Commit: afc5e742d7d15127737bcc0447a9cee78ee523c7
Parents: 88d8481
Author: peng.jianhua
Authored: Thu Sep 21 10:29:02 2017 +0800
Committer: peng.jianhua
Committed: Thu Sep 21 10:29:02 2017 +0800
--
.../src/main/webapp/scripts/views/policies/RangerPolicyForm.js| 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/afc5e742/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyForm.js
--
diff --git
a/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyForm.js
b/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyForm.js
index 3a58dcc..9a8d82d 100644
--- a/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyForm.js
+++ b/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyForm.js
@@ -333,8 +333,7 @@ define(function(require){
field.editor.validators =
this.defaultValidator[key];
if($.inArray('required',field.editor.validators) >= 0){
var label =
field.$el.find('label').html();
-
label=label.indexOf("*")>-1?label:label+"*";
-
field.$el.find('label').html(label);
+
field.$el.find('label').html(label+"*");
}
}
}
ranger git commit: RANGER-1782 When the drop-down box is switched, more than one symbol is displayed each time in ranger-web-hivedev
Repository: ranger
Updated Branches:
refs/heads/master 8ca94c113 -> 8a728b5d7
RANGER-1782 When the drop-down box is switched, more than one symbol is
displayed each time in ranger-web-hivedev
Signed-off-by: peng.jianhua
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/8a728b5d
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/8a728b5d
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/8a728b5d
Branch: refs/heads/master
Commit: 8a728b5d78495524da75a057d2eb4fd9248f2cef
Parents: 8ca94c1
Author: zhangqiang2
Authored: Mon Sep 18 09:17:17 2017 +0800
Committer: peng.jianhua
Committed: Wed Sep 20 08:46:58 2017 +0800
--
.../src/main/webapp/scripts/views/policies/RangerPolicyForm.js| 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/8a728b5d/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyForm.js
--
diff --git
a/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyForm.js
b/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyForm.js
index 9a8d82d..3a58dcc 100644
--- a/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyForm.js
+++ b/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyForm.js
@@ -333,7 +333,8 @@ define(function(require){
field.editor.validators =
this.defaultValidator[key];
if($.inArray('required',field.editor.validators) >= 0){
var label =
field.$el.find('label').html();
-
field.$el.find('label').html(label+"*");
+
label=label.indexOf("*")>-1?label:label+"*";
+
field.$el.find('label').html(label);
}
}
}
ranger git commit: RANGER-1769:The update_property.py should exit the loop to improve execution efficiency once the attribute value is set.
Repository: ranger
Updated Branches:
refs/heads/master 991481b27 -> 774f55845
RANGER-1769:The update_property.py should exit the loop to improve execution
efficiency once the attribute value is set.
Signed-off-by: peng.jianhua
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/774f5584
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/774f5584
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/774f5584
Branch: refs/heads/master
Commit: 774f55845921c6a60ce5c06ccb19e339a5529d49
Parents: 991481b
Author: peng.jianhua
Authored: Thu Sep 7 21:25:44 2017 +0800
Committer: peng.jianhua
Committed: Mon Sep 11 16:04:25 2017 +0800
--
security-admin/scripts/update_property.py | 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/774f5584/security-admin/scripts/update_property.py
--
diff --git a/security-admin/scripts/update_property.py
b/security-admin/scripts/update_property.py
index 80ccdb8..1eab564 100644
--- a/security-admin/scripts/update_property.py
+++ b/security-admin/scripts/update_property.py
@@ -30,6 +30,7 @@ def write_properties_to_xml(xml_path, property_name='',
property_value=''):
name = child.find("name").text.strip()
if name == property_name:
child.find("value").text = property_value
+ break
xml.write(xml_path)
return 0
else:
ranger git commit: RANGER-1752 When dfs.nameservices configures multiple nameservice id and then test hdfs connection, verifying dfs.client.failover.proxy.provider.
Repository: ranger
Updated Branches:
refs/heads/master f4019d11b -> d0cf2dd55
RANGER-1752 When dfs.nameservices configures multiple nameservice id and then
test hdfs connection, verifying dfs.client.failover.proxy.provider.
Signed-off-by: peng.jianhua
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/d0cf2dd5
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/d0cf2dd5
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/d0cf2dd5
Branch: refs/heads/master
Commit: d0cf2dd5545152701355560d2b2dbba19eec0b3b
Parents: f4019d1
Author: peng.jianhua
Authored: Fri Sep 8 09:36:05 2017 +0800
Committer: peng.jianhua
Committed: Fri Sep 8 09:56:11 2017 +0800
--
.../ranger/services/hdfs/client/HdfsClient.java | 39 +++-
1 file changed, 21 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/d0cf2dd5/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsClient.java
--
diff --git
a/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsClient.java
b/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsClient.java
index bb9ecbf..c252213 100644
---
a/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsClient.java
+++
b/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsClient.java
@@ -286,25 +286,28 @@ public class HdfsClient extends BaseClient {
String dfsNameservices = configs.get("dfs.nameservices");
dfsNameservices = (dfsNameservices == null) ? "" : dfsNameservices.trim();
if (!dfsNameservices.isEmpty()) {
- String proxyProvider = configs.get("dfs.client.failover.proxy.provider."
+ dfsNameservices);
- proxyProvider = (proxyProvider == null) ? "" : proxyProvider.trim();
- if (proxyProvider.isEmpty()) {
-throw new IllegalArgumentException("Value for " +
"dfs.client.failover.proxy.provider." + dfsNameservices + " not specified");
- }
+ String[] dfsNameserviceElements = dfsNameservices.split(",");
+ for (String dfsNameserviceElement : dfsNameserviceElements) {
+String proxyProvider =
configs.get("dfs.client.failover.proxy.provider." + dfsNameserviceElement);
+proxyProvider = (proxyProvider == null) ? "" : proxyProvider.trim();
+if (proxyProvider.isEmpty()) {
+ throw new IllegalArgumentException("Value for " +
"dfs.client.failover.proxy.provider." + dfsNameserviceElement + " not
specified");
+}
- String dfsNameNodes = configs.get("dfs.ha.namenodes." + dfsNameservices);
- dfsNameNodes = (dfsNameNodes == null) ? "" : dfsNameNodes.trim();
- if (dfsNameNodes.isEmpty()) {
-throw new IllegalArgumentException("Value for " + "dfs.ha.namenodes."
+ dfsNameservices + " not specified");
- }
- String[] dfsNameNodeElements = dfsNameNodes.split(",");
- for (String dfsNameNodeElement : dfsNameNodeElements) {
-String nameNodeUrlKey = "dfs.namenode.rpc-address." +
-dfsNameservices + "." + dfsNameNodeElement.trim();
-String nameNodeUrl = configs.get(nameNodeUrlKey);
-nameNodeUrl = (nameNodeUrl == null) ? "" : nameNodeUrl.trim();
-if (nameNodeUrl.isEmpty()) {
- throw new IllegalArgumentException("Value for " + nameNodeUrlKey + "
not specified");
+String dfsNameNodes = configs.get("dfs.ha.namenodes." +
dfsNameserviceElement);
+dfsNameNodes = (dfsNameNodes == null) ? "" : dfsNameNodes.trim();
+if (dfsNameNodes.isEmpty()) {
+ throw new IllegalArgumentException("Value for " +
"dfs.ha.namenodes." + dfsNameserviceElement + " not specified");
+}
+String[] dfsNameNodeElements = dfsNameNodes.split(",");
+for (String dfsNameNodeElement : dfsNameNodeElements) {
+ String nameNodeUrlKey = "dfs.namenode.rpc-address." +
+ dfsNameserviceElement + "." + dfsNameNodeElement.trim();
+ String nameNodeUrl = configs.get(nameNodeUrlKey);
+ nameNodeUrl = (nameNodeUrl == null) ? "" : nameNodeUrl.trim();
+ if (nameNodeUrl.isEmpty()) {
+throw new IllegalArgumentException("Value for " + nameNodeUrlKey +
" not specified");
+ }
}
}
}
ranger git commit: RANGER-1763 On the Edit Policy page, Conditions is expanded by default, so the expansion button shuold be hide instead of show.
Repository: ranger
Updated Branches:
refs/heads/master 513477d06 -> c24c9bdfd
RANGER-1763 On the Edit Policy page, Conditions is expanded by default, so the
expansion button shuold be hide instead of show.
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/c24c9bdf
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/c24c9bdf
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/c24c9bdf
Branch: refs/heads/master
Commit: c24c9bdfd2bc813febf16736877b7f43cd8bfeb5
Parents: 513477d
Author: peng.jianhua
Authored: Mon Sep 4 20:17:41 2017 +0800
Committer: zhangqiang2
Committed: Thu Sep 7 14:23:18 2017 +0800
--
.../scripts/views/policies/RangerPolicyForm.js | 25 +++-
1 file changed, 14 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/c24c9bdf/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyForm.js
--
diff --git
a/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyForm.js
b/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyForm.js
index 6f27d5d..9a8d82d 100644
--- a/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyForm.js
+++ b/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyForm.js
@@ -147,12 +147,8 @@ define(function(require){
var wrap = $(this).next();
// If next element is a wrap and hasn't
.non-collapsible class
if (wrap.hasClass('wrap') && !
wrap.hasClass('non-collapsible')){
- $(this).append('show ')
- .append('hide ');
- if( i === 0 ) {
-
$(this).find('.wrap-expand').hide();
-
$(this).find('.wrap-collapse').show();
- }
+ $(this).append('show ')
+ .append('hide ');
}
});
// Collapse wrap
@@ -175,16 +171,23 @@ define(function(require){
var parentPermsObj = { groupPermsDeny :
this.formInputDenyList, };
var childPermsObj = { groupPermsAllowExclude :
this.formInputAllowExceptionList, groupPermsDenyExclude :
this.formInputDenyExceptionList}
_.each(childPermsObj, function(val, name){
- if(val.length <= 0)
-
this.$el.find('[data-customfields="'+name+'"]').parent().hide();
+ if(val.length <= 0) {
+ var wrap =
this.$el.find('[data-customfields="'+name+'"]').parent();
+ wrap.hide();
+ $('.wrap-collapse',
wrap.prev('.wrap-header')).hide();
+ $('.wrap-expand',
wrap.prev('.wrap-header')).show();
+ }
},this)
- _.each(parentPermsObj, function(val, name, i){
+ _.each(parentPermsObj, function(val, name){
if(val.length <= 0){
- var tmp =
this.$el.find('[data-customfields="'+name+'"]').next()
+ var tmp =
this.$el.find('[data-customfields="'+name+'"]').next();
var childPerm =
tmp.find('[data-customfields^="groupPerms"]');
if(childPerm.parent().css('display') ==
'none'){
-
this.$el.find('[data-customfields="'+name+'"]').parent().hide();
+ var wrap =
this.$el.find('[data-customfields="'+name+'"]').parent();
+ wrap.hide();
+ $('.wrap-collapse',
wrap.prev('.wrap-header')).hide();
+ $('.wrap-expand',
wrap.prev('.wrap-header')).show();
}
}
},this)
ranger git commit: RANGER-1755 hbase system tablename is old version in ranger-hbase-plugin
Repository: ranger
Updated Branches:
refs/heads/master c7d1e50b2 -> a71dab7fd
RANGER-1755 hbase system tablename is old version in ranger-hbase-plugin
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/a71dab7f
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/a71dab7f
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/a71dab7f
Branch: refs/heads/master
Commit: a71dab7fdf43cb939221c9aaa0e34a34df153dd6
Parents: c7d1e50
Author: peng.jianhua
Authored: Thu Aug 31 15:20:24 2017 +0800
Committer: zhangqiang2
Committed: Thu Aug 31 19:35:45 2017 +0800
--
.../ranger/authorization/hbase/RangerAuthorizationCoprocessor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/a71dab7f/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessor.java
--
diff --git
a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessor.java
b/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessor.java
index da73c67..3b38d02 100644
---
a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessor.java
+++
b/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessor.java
@@ -159,7 +159,7 @@ public class RangerAuthorizationCoprocessor extends
RangerAuthorizationCoprocess
return isSpecialTable(Bytes.toString(tableName));
}
protected boolean isSpecialTable(String input) {
- final String[] specialTables = new String[] { "hbase:meta",
"-ROOT-", ".META."};
+ final String[] specialTables = new String[] { "hbase:meta",
"-ROOT-", ".META.", "hbase:acl", "hbase:namespace"};
for (String specialTable : specialTables ) {
if (specialTable.equals(input)) {
return true;
ranger git commit: RANGER-1751:The importJCEKSKeys.sh and DBMK2HSM.sh will throw an exception when the JAVA_HOME is equal to null.
Repository: ranger
Updated Branches:
refs/heads/master 4daf1e9ed -> 83b67df99
RANGER-1751:The importJCEKSKeys.sh and DBMK2HSM.sh will throw an exception when
the JAVA_HOME is equal to null.
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/83b67df9
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/83b67df9
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/83b67df9
Branch: refs/heads/master
Commit: 83b67df99b87e8fa14564e237623f8749f1fab81
Parents: 4daf1e9
Author: peng.jianhua
Authored: Thu Aug 24 03:10:30 2017 -0400
Committer: zhangqiang2
Committed: Sun Aug 27 22:23:08 2017 -0400
--
kms/scripts/DBMK2HSM.sh | 5 +
kms/scripts/HSMMK2DB.sh | 5 +
kms/scripts/exportKeysToJCEKS.sh | 5 +
kms/scripts/importJCEKSKeys.sh | 5 +
4 files changed, 20 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/83b67df9/kms/scripts/DBMK2HSM.sh
--
diff --git a/kms/scripts/DBMK2HSM.sh b/kms/scripts/DBMK2HSM.sh
index e5beec3..89c8c2d 100644
--- a/kms/scripts/DBMK2HSM.sh
+++ b/kms/scripts/DBMK2HSM.sh
@@ -14,6 +14,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-
+if [ "$JAVA_HOME" != "" ]; then
+export PATH=$JAVA_HOME/bin:$PATH
+else
+exit ;
+fi
RANGER_KMS_HOME=`dirname $0`
cp="${RANGER_KMS_HOME}/cred/lib/*:${RANGER_KMS_HOME}/./ews/webapp/WEB-INF/classes/conf/:${RANGER_KMS_HOME}/ews/webapp/config:${RANGER_KMS_HOME}/ews/lib/*:${RANGER_KMS_HOME}/ews/webapp/lib/*:${RANGER_KMS_HOME}/ews/webapp/META-INF"
java -cp "${cp}" org.apache.hadoop.crypto.key.DB2HSMMKUtil ${1} ${2}
http://git-wip-us.apache.org/repos/asf/ranger/blob/83b67df9/kms/scripts/HSMMK2DB.sh
--
diff --git a/kms/scripts/HSMMK2DB.sh b/kms/scripts/HSMMK2DB.sh
index 03e9888..2637cf6 100644
--- a/kms/scripts/HSMMK2DB.sh
+++ b/kms/scripts/HSMMK2DB.sh
@@ -14,6 +14,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-
+if [ "$JAVA_HOME" != "" ]; then
+export PATH=$JAVA_HOME/bin:$PATH
+else
+exit ;
+fi
RANGER_KMS_HOME=`dirname $0`
cp="${RANGER_KMS_HOME}/cred/lib/*:${RANGER_KMS_HOME}/./ews/webapp/WEB-INF/classes/conf/:${RANGER_KMS_HOME}/ews/webapp/config:${RANGER_KMS_HOME}/ews/lib/*:${RANGER_KMS_HOME}/ews/webapp/lib/*:${RANGER_KMS_HOME}/ews/webapp/META-INF"
java -cp "${cp}" org.apache.hadoop.crypto.key.HSM2DBMKUtil ${1} ${2}
http://git-wip-us.apache.org/repos/asf/ranger/blob/83b67df9/kms/scripts/exportKeysToJCEKS.sh
--
diff --git a/kms/scripts/exportKeysToJCEKS.sh b/kms/scripts/exportKeysToJCEKS.sh
index 03dbe48..f320578 100644
--- a/kms/scripts/exportKeysToJCEKS.sh
+++ b/kms/scripts/exportKeysToJCEKS.sh
@@ -14,6 +14,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-
+if [ "$JAVA_HOME" != "" ]; then
+export PATH=$JAVA_HOME/bin:$PATH
+else
+exit ;
+fi
RANGER_KMS_HOME=`dirname $0`
cp="${RANGER_KMS_HOME}/cred/lib/*:${RANGER_KMS_HOME}/./ews/webapp/WEB-INF/classes/conf/:${RANGER_KMS_HOME}/ews/webapp/config:${RANGER_KMS_HOME}/ews/lib/*:${RANGER_KMS_HOME}/ews/webapp/lib/*:${RANGER_KMS_HOME}/ews/webapp/META-INF"
java -cp "${cp}" org.apache.hadoop.crypto.key.Ranger2JKSUtil ${1} ${2}
http://git-wip-us.apache.org/repos/asf/ranger/blob/83b67df9/kms/scripts/importJCEKSKeys.sh
--
diff --git a/kms/scripts/importJCEKSKeys.sh b/kms/scripts/importJCEKSKeys.sh
index 57a2053..d72c93e 100755
--- a/kms/scripts/importJCEKSKeys.sh
+++ b/kms/scripts/importJCEKSKeys.sh
@@ -14,6 +14,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-
+if [ "$JAVA_HOME" != "" ]; then
+export PATH=$JAVA_HOME/bin:$PATH
+else
+exit ;
+fi
RANGER_KMS_HOME=`dirname $0`
cp="${RANGER_KMS_HOME}/cred/lib/*:${RANGER_KMS_HOME}/./ews/webapp/WEB-INF/classes/conf/:${RANGER_KMS_HOME}/ews/webapp/config:${RANGER_KMS_HOME}/ews/lib/*:${RANGER_KMS_HOME}/ews/webapp/lib/*:${RANGER_KMS_HOME}/ews/webapp/META-INF"
java -cp "${cp}" org.apache.hadoop.crypto.key.JKS2RangerUtil ${1} ${2}
ranger git commit: RANGER-1746 The prompt message is incorrect when test hdfs connection and check 'dfs.ha.namenodes.[nameservice ID]' to be mandatory.
Repository: ranger
Updated Branches:
refs/heads/master a43dd80f0 -> 4daf1e9ed
RANGER-1746 The prompt message is incorrect when test hdfs connection and check
'dfs.ha.namenodes.[nameservice ID]' to be mandatory.
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/4daf1e9e
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/4daf1e9e
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/4daf1e9e
Branch: refs/heads/master
Commit: 4daf1e9ed9f89f389f8cdb74baa1792f92fc2466
Parents: a43dd80
Author: 10069681
Authored: Wed Aug 23 11:03:22 2017 +0800
Committer: zhangqiang2
Committed: Sat Aug 26 04:38:47 2017 -0400
--
.../java/org/apache/ranger/services/hdfs/client/HdfsClient.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/4daf1e9e/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsClient.java
--
diff --git
a/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsClient.java
b/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsClient.java
index cab1b52..bb9ecbf 100644
---
a/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsClient.java
+++
b/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsClient.java
@@ -295,7 +295,7 @@ public class HdfsClient extends BaseClient {
String dfsNameNodes = configs.get("dfs.ha.namenodes." + dfsNameservices);
dfsNameNodes = (dfsNameNodes == null) ? "" : dfsNameNodes.trim();
if (dfsNameNodes.isEmpty()) {
-throw new IllegalArgumentException("Value for " + "dfs.ha.namenodes."
+ proxyProvider + " not specified");
+throw new IllegalArgumentException("Value for " + "dfs.ha.namenodes."
+ dfsNameservices + " not specified");
}
String[] dfsNameNodeElements = dfsNameNodes.split(",");
for (String dfsNameNodeElement : dfsNameNodeElements) {
ranger git commit: revert RANGER-1725
Repository: ranger
Updated Branches:
refs/heads/master 18a47ed4b -> a43dd80f0
revert RANGER-1725
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/a43dd80f
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/a43dd80f
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/a43dd80f
Branch: refs/heads/master
Commit: a43dd80f08857b99464934de9f5262851ab6749f
Parents: 18a47ed
Author: zhangqiang2
Authored: Sat Aug 26 04:23:29 2017 -0400
Committer: zhangqiang2
Committed: Sat Aug 26 04:23:29 2017 -0400
--
.../plugin/store/EmbeddedServiceDefsUtil.java | 31 +++-
1 file changed, 17 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/a43dd80f/agents-common/src/main/java/org/apache/ranger/plugin/store/EmbeddedServiceDefsUtil.java
--
diff --git
a/agents-common/src/main/java/org/apache/ranger/plugin/store/EmbeddedServiceDefsUtil.java
b/agents-common/src/main/java/org/apache/ranger/plugin/store/EmbeddedServiceDefsUtil.java
index a09daae..0bc09f6 100755
---
a/agents-common/src/main/java/org/apache/ranger/plugin/store/EmbeddedServiceDefsUtil.java
+++
b/agents-common/src/main/java/org/apache/ranger/plugin/store/EmbeddedServiceDefsUtil.java
@@ -49,6 +49,7 @@ public class EmbeddedServiceDefsUtil {
// following servicedef list should be reviewed/updated whenever a new
embedded service-def is added
private static final String DEFAULT_BOOTSTRAP_SERVICEDEF_LIST =
"tag,hdfs,hbase,hive,kms,knox,storm,yarn,kafka,solr,atlas,nifi";
private static final String PROPERTY_SUPPORTED_SERVICE_DEFS =
"ranger.supportedcomponents";
+ private Set supportedServiceDefs;
public static final String EMBEDDED_SERVICEDEF_TAG_NAME = "tag";
public static final String EMBEDDED_SERVICEDEF_HDFS_NAME = "hdfs";
public static final String EMBEDDED_SERVICEDEF_HBASE_NAME = "hbase";
@@ -80,7 +81,6 @@ public class EmbeddedServiceDefsUtil {
private static EmbeddedServiceDefsUtil instance = new
EmbeddedServiceDefsUtil();
private boolean createEmbeddedServiceDefs = true;
- private Set supportedServiceDefs;
private RangerServiceDef hdfsServiceDef;
private RangerServiceDef hBaseServiceDef;
private RangerServiceDef hiveServiceDef;
@@ -209,7 +209,7 @@ public class EmbeddedServiceDefsUtil {
}
RangerServiceDef ret = null;
- boolean createServiceDef =
(!CollectionUtils.isEmpty(supportedServiceDefs) &&
supportedServiceDefs.contains(serviceDefName));
+ boolean createServiceDef =
(CollectionUtils.isEmpty(supportedServiceDefs) ||
supportedServiceDefs.contains(serviceDefName));
try {
ret = store.getServiceDefByName(serviceDefName);
if(ret == null && createEmbeddedServiceDefs &&
createServiceDef) {
@@ -261,20 +261,23 @@ public class EmbeddedServiceDefsUtil {
return ret;
}
- private Set getSupportedServiceDef() {
- Set supportedServiceDef = new HashSet<>();
- String ranger_supportedcomponents =
RangerConfiguration.getInstance().get(PROPERTY_SUPPORTED_SERVICE_DEFS,
DEFAULT_BOOTSTRAP_SERVICEDEF_LIST);
- if (StringUtils.isBlank(ranger_supportedcomponents) ||
"all".equalsIgnoreCase(ranger_supportedcomponents)) {
- ranger_supportedcomponents =
DEFAULT_BOOTSTRAP_SERVICEDEF_LIST;
- }
- String[] supportedComponents =
ranger_supportedcomponents.split(",");
- if (supportedComponents != null && supportedComponents.length >
0) {
- for (String element : supportedComponents) {
- if (!StringUtils.isBlank(element)) {
- element = element.toLowerCase();
- supportedServiceDef.add(element);
+ private Set getSupportedServiceDef(){
+ Set supportedServiceDef =new HashSet<>();
+ try{
+ String
ranger_supportedcomponents=RangerConfiguration.getInstance().get(PROPERTY_SUPPORTED_SERVICE_DEFS,
DEFAULT_BOOTSTRAP_SERVICEDEF_LIST);
+ if(StringUtils.isBlank(ranger_supportedcomponents) ||
"all".equalsIgnoreCase(ranger_supportedcomponents)){
+
ranger_supportedcomponents=DEFAULT_BOOTSTRAP_SERVICEDEF_LIST;
+ }
+ String[]
supportedComponents=ranger_supportedcomponents.split(",");
+ if(supportedComponents!=null &&
supportedComponents.length>0){
+ for(String el
ranger git commit: RANGER-1744:Similar to RANGER-1541, the assignment logic is inconsistent for the value of the RANGER_ADMIN_HOME variable in changeusernameutil.py and changepasswordutil.py. It will
Repository: ranger
Updated Branches:
refs/heads/master 5318e2f5f -> 5fc9ee1f9
RANGER-1744:Similar to RANGER-1541, the assignment logic is inconsistent for
the value of the RANGER_ADMIN_HOME variable in changeusernameutil.py and
changepasswordutil.py. It will cause a serious failure.
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/5fc9ee1f
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/5fc9ee1f
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/5fc9ee1f
Branch: refs/heads/master
Commit: 5fc9ee1f9a41d2dd73dad1dc9e32fbfaa38872a6
Parents: 5318e2f
Author: zhangqiang2
Authored: Mon Aug 21 09:56:51 2017 -0400
Committer: zhangqiang2
Committed: Wed Aug 23 20:43:34 2017 -0400
--
security-admin/scripts/changepasswordutil.py | 9 +++--
security-admin/scripts/changeusernameutil.py | 9 +++--
2 files changed, 6 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/5fc9ee1f/security-admin/scripts/changepasswordutil.py
--
diff --git a/security-admin/scripts/changepasswordutil.py
b/security-admin/scripts/changepasswordutil.py
index 3086962..95bd613 100644
--- a/security-admin/scripts/changepasswordutil.py
+++ b/security-admin/scripts/changepasswordutil.py
@@ -32,12 +32,9 @@ from datetime import datetime
os_name = platform.system()
os_name = os_name.upper()
-if os_name == "LINUX":
- RANGER_ADMIN_HOME = os.getenv("RANGER_ADMIN_HOME")
- if RANGER_ADMIN_HOME is None:
- RANGER_ADMIN_HOME = os.getcwd()
-elif os_name == "WINDOWS":
- RANGER_ADMIN_HOME = os.getenv("RANGER_ADMIN_HOME")
+RANGER_ADMIN_HOME = os.getenv("RANGER_ADMIN_HOME")
+if RANGER_ADMIN_HOME is None:
+ RANGER_ADMIN_HOME = os.getcwd()
def log(msg,type):
if type == 'info':
http://git-wip-us.apache.org/repos/asf/ranger/blob/5fc9ee1f/security-admin/scripts/changeusernameutil.py
--
diff --git a/security-admin/scripts/changeusernameutil.py
b/security-admin/scripts/changeusernameutil.py
index 7216bbc..cb471f0 100644
--- a/security-admin/scripts/changeusernameutil.py
+++ b/security-admin/scripts/changeusernameutil.py
@@ -32,12 +32,9 @@ from datetime import datetime
os_name = platform.system()
os_name = os_name.upper()
-if os_name == "LINUX":
-RANGER_ADMIN_HOME = os.getenv("RANGER_ADMIN_HOME")
-if RANGER_ADMIN_HOME is None:
-RANGER_ADMIN_HOME = os.getcwd()
-elif os_name == "WINDOWS":
-RANGER_ADMIN_HOME = os.getenv("RANGER_ADMIN_HOME")
+RANGER_ADMIN_HOME = os.getenv("RANGER_ADMIN_HOME")
+if RANGER_ADMIN_HOME is None:
+ RANGER_ADMIN_HOME = os.getcwd()
def log(msg,type):
if type == 'info':
ranger git commit: RANGER-1742:Like setup.sh, the set_globals.sh should check whether the user group exists before created user group in security admin.
Repository: ranger
Updated Branches:
refs/heads/master b676cd920 -> a16889fbb
RANGER-1742:Like setup.sh, the set_globals.sh should check whether the user
group exists before created user group in security admin.
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/a16889fb
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/a16889fb
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/a16889fb
Branch: refs/heads/master
Commit: a16889fbbd189ea6282030b528f8d17fac79144a
Parents: b676cd9
Author: peng.jianhua
Authored: Sun Aug 20 09:27:54 2017 -0400
Committer: zhangqiang2
Committed: Tue Aug 22 21:43:58 2017 -0400
--
security-admin/scripts/set_globals.sh | 16 ++--
1 file changed, 10 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/a16889fb/security-admin/scripts/set_globals.sh
--
diff --git a/security-admin/scripts/set_globals.sh
b/security-admin/scripts/set_globals.sh
index 5e985e2..b0b400b 100755
--- a/security-admin/scripts/set_globals.sh
+++ b/security-admin/scripts/set_globals.sh
@@ -60,13 +60,17 @@ log() {
unix_user=$(get_prop 'unix_user' $PROPFILE)
unix_group=$(get_prop 'unix_group' $PROPFILE)
-groupadd ${unix_group}
-ret=$?
-if [ $ret -ne 0 ] && [ $ret -ne 9 ]; then
- echo "Error creating group $unix_group"
- exit 1
+#create group if it does not exist
+egrep "^$unix_group" /etc/group >& /dev/null
+if [ $? -ne 0 ]; then
+ groupadd ${unix_group}
+ ret=$?
+ if [ $ret -ne 0 ] && [ $ret -ne 9 ]; then
+ echo "Error creating group $unix_group"
+ exit 1
+ fi
fi
-
+#create user if it does not exists
id -u ${unix_user} > /dev/null 2>&1
if [ $? -ne 0 ]; then
useradd ${unix_user} -g ${unix_group} -m
ranger git commit: RANGER-1743:Comment lines have not been filtered out when the populate_global_dict function parsed install.properties in security-admin/scripts/restrict_permissions.py. Like RANGER-
Repository: ranger
Updated Branches:
refs/heads/master a9523814c -> b676cd920
RANGER-1743:Comment lines have not been filtered out when the
populate_global_dict function parsed install.properties in
security-admin/scripts/restrict_permissions.py. Like RANGER-1284, we should
modify it.
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/b676cd92
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/b676cd92
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/b676cd92
Branch: refs/heads/master
Commit: b676cd920cc64e6e8d286f231a714a65f93031ef
Parents: a952381
Author: peng.jianhua
Authored: Sun Aug 20 09:48:13 2017 -0400
Committer: zhangqiang2
Committed: Tue Aug 22 21:40:50 2017 -0400
--
security-admin/scripts/restrict_permissions.py | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/b676cd92/security-admin/scripts/restrict_permissions.py
--
diff --git a/security-admin/scripts/restrict_permissions.py
b/security-admin/scripts/restrict_permissions.py
index a4998be..1ce54a5 100644
--- a/security-admin/scripts/restrict_permissions.py
+++ b/security-admin/scripts/restrict_permissions.py
@@ -55,9 +55,13 @@ def populate_global_dict():
global globalDict
read_config_file = open(os.path.join(os.getcwd(),'install.properties'))
for each_line in read_config_file.read().split('\n') :
- if len(each_line) == 0 : continue
+ each_line = each_line.strip();
+ if len(each_line) == 0:
+ continue
+ elif each_line[0] == "#":
+ continue
if re.search('=', each_line):
- key , value = each_line.strip().split("=",1)
+ key , value = each_line.split("=",1)
key = key.strip()
if 'PASSWORD' in key:
ranger git commit: RANGER-1741:The initd ran repeatedly when ranger-usersync-services.sh was running
Repository: ranger
Updated Branches:
refs/heads/master 32999cd07 -> a9523814c
RANGER-1741:The initd ran repeatedly when ranger-usersync-services.sh was
running
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/a9523814
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/a9523814
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/a9523814
Branch: refs/heads/master
Commit: a9523814cf4b3763a3a8db7d7eb3161e624074c5
Parents: 32999cd
Author: peng.jianhua
Authored: Sun Aug 20 05:08:52 2017 -0400
Committer: zhangqiang2
Committed: Tue Aug 22 21:35:09 2017 -0400
--
unixauthservice/scripts/initd | 15 +--
1 file changed, 13 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/a9523814/unixauthservice/scripts/initd
--
diff --git a/unixauthservice/scripts/initd b/unixauthservice/scripts/initd
index a1062af..361b1d5 100644
--- a/unixauthservice/scripts/initd
+++ b/unixauthservice/scripts/initd
@@ -26,11 +26,22 @@
LINUX_USER=ranger
BIN_PATH=/usr/bin
MOD_NAME=ranger-usersync
-pidf=/var/run/ranger/usersync.pid
+
+if [ -z "${USERSYNC_PID_DIR_PATH}" ]; then
+USERSYNC_PID_DIR_PATH=/var/run/ranger
+fi
+if [ -z "${USERSYNC_PID_NAME}" ]
+then
+USERSYNC_PID_NAME=usersync.pid
+fi
+pidf=${USERSYNC_PID_DIR_PATH}/${USERSYNC_PID_NAME}
+
pid=""
if [ -f ${pidf} ]
then
-pid=`cat $pidf`
+pid=`cat $pidf` > /dev/null 2>&1
+else
+pid=`ps -ef | grep java | grep -- '-Dproc_rangerusersync' | grep -v grep |
awk '{ print $2 }'`
fi
case $1 in
ranger git commit: RANGER-1740:There is a exception when the ranger_credential_helper.py was executed.
Repository: ranger
Updated Branches:
refs/heads/master ca9f7c182 -> 32999cd07
RANGER-1740:There is a exception when the ranger_credential_helper.py was
executed.
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/32999cd0
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/32999cd0
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/32999cd0
Branch: refs/heads/master
Commit: 32999cd07c4dae454e0dde8fc3433c0e822d068d
Parents: ca9f7c1
Author: peng.jianhua
Authored: Sat Aug 19 11:19:03 2017 -0400
Committer: zhangqiang2
Committed: Tue Aug 22 21:31:17 2017 -0400
--
security-admin/scripts/ranger_credential_helper.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/32999cd0/security-admin/scripts/ranger_credential_helper.py
--
diff --git a/security-admin/scripts/ranger_credential_helper.py
b/security-admin/scripts/ranger_credential_helper.py
index 940dbf1..b36adea 100644
--- a/security-admin/scripts/ranger_credential_helper.py
+++ b/security-admin/scripts/ranger_credential_helper.py
@@ -20,8 +20,8 @@ from subprocess import Popen,PIPE
from optparse import OptionParser
if os.getenv('JAVA_HOME') is None:
- print "[W] -- JAVA_HOME environment property not defined, using
java in path. --"
- JAVA_BIN='java'
+ print "ERROR: JAVA_HOME environment property was not defined, exit."
+ sys.exit(1)
else:
JAVA_BIN=os.path.join(os.getenv('JAVA_HOME'),'bin','java')
print "Using Java:" + str(JAVA_BIN)
ranger git commit: RANGER-1669:We need to support the original functionality of hive:show grant user username
Repository: ranger
Updated Branches:
refs/heads/master 0736d98e2 -> 0878d19e9
RANGER-1669:We need to support the original functionality of hive:show grant
user username
Signed-off-by: peng.jianhua
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/0878d19e
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/0878d19e
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/0878d19e
Branch: refs/heads/master
Commit: 0878d19e9fc39c13c136411ee4df6c6fa33c7b43
Parents: 0736d98
Author: peng.jianhua
Authored: Thu Aug 10 20:22:48 2017 +0800
Committer: peng.jianhua
Committed: Thu Aug 10 23:12:27 2017 -0400
--
.../hive/authorizer/RangerHiveAuthorizer.java | 81 +++-
.../services/hive/HIVERangerAuthorizerTest.java | 9 +++
2 files changed, 54 insertions(+), 36 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/0878d19e/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizer.java
--
diff --git
a/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizer.java
b/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizer.java
index 6872e50..1c7a9d0 100644
---
a/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizer.java
+++
b/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizer.java
@@ -1457,51 +1457,60 @@ public class RangerHiveAuthorizer extends
RangerHiveAuthorizerBase {
public List showPrivileges(HivePrincipal principal,
HivePrivilegeObject privObj) throws
HiveAuthzPluginException {
try {
+
LOG.debug("RangerHiveAuthorizer.showPrivileges()");
IMetaStoreClient mClient = getMetastoreClientFactory()
.getHiveMetastoreClient();
List resPrivInfos = new
ArrayList();
- String principalName = principal == null ? null :
principal
- .getName();
- PrincipalType principalType = principal == null ? null
- :
AuthorizationUtils.getThriftPrincipalType(principal
- .getType());
+ String principalName = null;
+ PrincipalType principalType = null;
+ if (principal != null) {
+ principalName = principal.getName();
+ principalType = AuthorizationUtils
+
.getThriftPrincipalType(principal.getType());
+ }
List msObjPrivs =
mClient.list_privileges(
principalName, principalType,
this.getThriftHiveObjectRef(privObj));
-
- for (HiveObjectPrivilege msObjPriv : msObjPrivs) {
- HivePrincipal resPrincipal = new HivePrincipal(
- msObjPriv.getPrincipalName(),
-
AuthorizationUtils.getHivePrincipalType(msObjPriv
-
.getPrincipalType()));
-
- PrivilegeGrantInfo msGrantInfo =
msObjPriv.getGrantInfo();
- HivePrivilege resPrivilege = new HivePrivilege(
- msGrantInfo.getPrivilege(),
null);
-
- HiveObjectRef msObjRef =
msObjPriv.getHiveObject();
-
org.apache.hadoop.hive.metastore.api.HiveObjectType objectType = msObjRef
- .getObjectType();
- if
(!isSupportedObjectType(msObjRef.getObjectType())) {
- continue;
+ if (msObjPrivs != null) {
+ for (HiveObjectPrivilege msObjPriv :
msObjPrivs) {
+ HiveObjectRef msObjRef =
msObjPriv.getHiveObject();
+
org.apache.hadoop.hive.metastore.api.HiveObjectType objectType = msObjRef
+ .getObjectType();
+ if (!isSupportedObjectType(objectType))
{
+ continue;
+ }
+ Hive
ranger git commit: RANGER-1725: It is incorrect to judge whether you need to create a RangerServiceDef object for a given service
Repository: ranger
Updated Branches:
refs/heads/master 4ce27cffb -> 0736d98e2
RANGER-1725: It is incorrect to judge whether you need to create a
RangerServiceDef object for a given service
Signed-off-by: peng.jianhua
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/0736d98e
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/0736d98e
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/0736d98e
Branch: refs/heads/master
Commit: 0736d98e23441a112567b470254cc47bbdf2cb69
Parents: 4ce27cf
Author: peng.jianhua
Authored: Wed Aug 9 13:27:29 2017 +0800
Committer: peng.jianhua
Committed: Thu Aug 10 03:03:07 2017 -0400
--
.../plugin/store/EmbeddedServiceDefsUtil.java | 31 +---
1 file changed, 14 insertions(+), 17 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/0736d98e/agents-common/src/main/java/org/apache/ranger/plugin/store/EmbeddedServiceDefsUtil.java
--
diff --git
a/agents-common/src/main/java/org/apache/ranger/plugin/store/EmbeddedServiceDefsUtil.java
b/agents-common/src/main/java/org/apache/ranger/plugin/store/EmbeddedServiceDefsUtil.java
index 0bc09f6..a09daae 100755
---
a/agents-common/src/main/java/org/apache/ranger/plugin/store/EmbeddedServiceDefsUtil.java
+++
b/agents-common/src/main/java/org/apache/ranger/plugin/store/EmbeddedServiceDefsUtil.java
@@ -49,7 +49,6 @@ public class EmbeddedServiceDefsUtil {
// following servicedef list should be reviewed/updated whenever a new
embedded service-def is added
private static final String DEFAULT_BOOTSTRAP_SERVICEDEF_LIST =
"tag,hdfs,hbase,hive,kms,knox,storm,yarn,kafka,solr,atlas,nifi";
private static final String PROPERTY_SUPPORTED_SERVICE_DEFS =
"ranger.supportedcomponents";
- private Set supportedServiceDefs;
public static final String EMBEDDED_SERVICEDEF_TAG_NAME = "tag";
public static final String EMBEDDED_SERVICEDEF_HDFS_NAME = "hdfs";
public static final String EMBEDDED_SERVICEDEF_HBASE_NAME = "hbase";
@@ -81,6 +80,7 @@ public class EmbeddedServiceDefsUtil {
private static EmbeddedServiceDefsUtil instance = new
EmbeddedServiceDefsUtil();
private boolean createEmbeddedServiceDefs = true;
+ private Set supportedServiceDefs;
private RangerServiceDef hdfsServiceDef;
private RangerServiceDef hBaseServiceDef;
private RangerServiceDef hiveServiceDef;
@@ -209,7 +209,7 @@ public class EmbeddedServiceDefsUtil {
}
RangerServiceDef ret = null;
- boolean createServiceDef =
(CollectionUtils.isEmpty(supportedServiceDefs) ||
supportedServiceDefs.contains(serviceDefName));
+ boolean createServiceDef =
(!CollectionUtils.isEmpty(supportedServiceDefs) &&
supportedServiceDefs.contains(serviceDefName));
try {
ret = store.getServiceDefByName(serviceDefName);
if(ret == null && createEmbeddedServiceDefs &&
createServiceDef) {
@@ -261,23 +261,20 @@ public class EmbeddedServiceDefsUtil {
return ret;
}
- private Set getSupportedServiceDef(){
- Set supportedServiceDef =new HashSet<>();
- try{
- String
ranger_supportedcomponents=RangerConfiguration.getInstance().get(PROPERTY_SUPPORTED_SERVICE_DEFS,
DEFAULT_BOOTSTRAP_SERVICEDEF_LIST);
- if(StringUtils.isBlank(ranger_supportedcomponents) ||
"all".equalsIgnoreCase(ranger_supportedcomponents)){
-
ranger_supportedcomponents=DEFAULT_BOOTSTRAP_SERVICEDEF_LIST;
- }
- String[]
supportedComponents=ranger_supportedcomponents.split(",");
- if(supportedComponents!=null &&
supportedComponents.length>0){
- for(String element:supportedComponents){
- if(!StringUtils.isBlank(element)){
- element=element.toLowerCase();
-
supportedServiceDef.add(element);
- }
+ private Set getSupportedServiceDef() {
+ Set supportedServiceDef = new HashSet<>();
+ String ranger_supportedcomponents =
RangerConfiguration.getInstance().get(PROPERTY_SUPPORTED_SERVICE_DEFS,
DEFAULT_BOOTSTRAP_SERVICEDEF_LIST);
+ if (StringUtils.isBlank(ranger_supportedcomponents) ||
"all".equalsIgnoreCase(ranger_supportedcomponents)) {
+ ranger_supportedcomponents =
DEFAULT_BOOTSTRAP_SERVICEDEF_LIST;
+ }
+ String[] su
ranger git commit: RANGER-1723: The Ranger doesn't support solr6. In the HttpSolrClient class of solr6, the setMaxRetries function has been removed, which causes ranger to fail to compile.
Repository: ranger
Updated Branches:
refs/heads/master c5daf83bc -> f01bcf3d0
RANGER-1723: The Ranger doesn't support solr6. In the HttpSolrClient class of
solr6, the setMaxRetries function has been removed, which causes ranger to fail
to compile.
Signed-off-by: peng.jianhua
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/f01bcf3d
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/f01bcf3d
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/f01bcf3d
Branch: refs/heads/master
Commit: f01bcf3d003500eaa28c1f48b8eac83fb037298a
Parents: c5daf83
Author: peng.jianhua
Authored: Thu Aug 3 09:19:46 2017 +0800
Committer: peng.jianhua
Committed: Tue Aug 8 04:03:08 2017 -0400
--
.../org/apache/ranger/audit/provider/solr/SolrAuditProvider.java| 1 -
.../java/org/apache/ranger/patch/cliutil/DbToSolrMigrationUtil.java | 1 -
security-admin/src/main/java/org/apache/ranger/solr/SolrMgr.java| 1 -
3 files changed, 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/f01bcf3d/agents-audit/src/main/java/org/apache/ranger/audit/provider/solr/SolrAuditProvider.java
--
diff --git
a/agents-audit/src/main/java/org/apache/ranger/audit/provider/solr/SolrAuditProvider.java
b/agents-audit/src/main/java/org/apache/ranger/audit/provider/solr/SolrAuditProvider.java
index 3a4da5a..26633fd 100644
---
a/agents-audit/src/main/java/org/apache/ranger/audit/provider/solr/SolrAuditProvider.java
+++
b/agents-audit/src/main/java/org/apache/ranger/audit/provider/solr/SolrAuditProvider.java
@@ -108,7 +108,6 @@ public class SolrAuditProvider extends AuditDestination {
httpSolrClient.setAllowCompression(true);
httpSolrClient.setConnectionTimeout(1000);
//
solrClient.setSoTimeout(1);
-
httpSolrClient.setMaxRetries(1);
}
} catch (Throwable t) {
LOG.fatal("Can't connect to
Solr server. URL="
http://git-wip-us.apache.org/repos/asf/ranger/blob/f01bcf3d/security-admin/src/main/java/org/apache/ranger/patch/cliutil/DbToSolrMigrationUtil.java
--
diff --git
a/security-admin/src/main/java/org/apache/ranger/patch/cliutil/DbToSolrMigrationUtil.java
b/security-admin/src/main/java/org/apache/ranger/patch/cliutil/DbToSolrMigrationUtil.java
index 89d5f4d..3a1f934 100644
---
a/security-admin/src/main/java/org/apache/ranger/patch/cliutil/DbToSolrMigrationUtil.java
+++
b/security-admin/src/main/java/org/apache/ranger/patch/cliutil/DbToSolrMigrationUtil.java
@@ -435,7 +435,6 @@ public class DbToSolrMigrationUtil extends BaseLoader {
.setAllowCompression(true);
httpSolrClient
.setConnectionTimeout(1000);
- httpSolrClient.setMaxRetries(1);
httpSolrClient
.setRequestWriter(new BinaryRequestWriter());
}
http://git-wip-us.apache.org/repos/asf/ranger/blob/f01bcf3d/security-admin/src/main/java/org/apache/ranger/solr/SolrMgr.java
--
diff --git a/security-admin/src/main/java/org/apache/ranger/solr/SolrMgr.java
b/security-admin/src/main/java/org/apache/ranger/solr/SolrMgr.java
index b1f0be4..795b976 100644
--- a/security-admin/src/main/java/org/apache/ranger/solr/SolrMgr.java
+++ b/security-admin/src/main/java/org/apache/ranger/solr/SolrMgr.java
@@ -144,7 +144,6 @@ public class SolrMgr {
httpSolrClient
.setConnectionTimeout(1000);
// httpSolrClient.setSoTimeout(1);
-
httpSolrClient.setMaxRetries(1);
httpSolrClient
.setR
ranger git commit: RANGER-1713:Hive testConnection failed after open ldap authentication in Hive
Repository: ranger
Updated Branches:
refs/heads/master 7c401b3e3 -> 13620b264
RANGER-1713:Hive testConnection failed after open ldap authentication in Hive
Signed-off-by: peng.jianhua
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/13620b26
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/13620b26
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/13620b26
Branch: refs/heads/master
Commit: 13620b2647899732452ad883a33cd4e98fe70edb
Parents: 7c401b3
Author: zhangqiang2
Authored: Thu Jul 27 14:48:11 2017 +0800
Committer: peng.jianhua
Committed: Sun Jul 30 22:15:11 2017 -0400
--
.../ranger/services/hive/client/HiveClient.java| 17 +++--
1 file changed, 15 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/13620b26/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveClient.java
--
diff --git
a/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveClient.java
b/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveClient.java
index e442aef..5730593 100644
---
a/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveClient.java
+++
b/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveClient.java
@@ -50,6 +50,7 @@ import org.apache.hadoop.hive.metastore.api.FieldSchema;
import org.apache.hadoop.hive.metastore.api.MetaException;
import org.apache.ranger.plugin.client.BaseClient;
import org.apache.ranger.plugin.client.HadoopException;
+import org.apache.ranger.plugin.util.PasswordUtils;
import org.apache.thrift.TException;
public class HiveClient extends BaseClient implements Closeable {
@@ -704,12 +705,24 @@ public class HiveClient extends BaseClient implements
Closeable {
}
}
+ String decryptedPwd = null;
try {
-
+ decryptedPwd =
PasswordUtils.decryptPassword(password);
+ } catch (Exception ex) {
+ LOG.info("Password decryption failed; trying
Hive connection with received password string");
+ decryptedPwd = null;
+ } finally {
+ if (decryptedPwd == null) {
+ decryptedPwd = password;
+ }
+ }
+
+ try {
+
if (userName == null && password == null) {
con = DriverManager.getConnection(url);
} else {
- con = DriverManager.getConnection(url,
userName, password);
+ con = DriverManager.getConnection(url,
userName, decryptedPwd);
}
} catch (SQLException e) {
String msgDesc = "Unable to connect to Hive
Thrift Server instance.";
ranger git commit: RANGER:1669:We need to support the original functionality of hive.show grant user username
Repository: ranger
Updated Branches:
refs/heads/master 1685bacf0 -> edd0bd6a6
RANGER:1669:We need to support the original functionality of hive.show grant
user username
Signed-off-by: peng.jianhua
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/edd0bd6a
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/edd0bd6a
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/edd0bd6a
Branch: refs/heads/master
Commit: edd0bd6a69b4919745d79119e943ad4b330941d0
Parents: 1685bac
Author: peng.jianhua
Authored: Fri Jul 14 15:45:11 2017 +0800
Committer: peng.jianhua
Committed: Wed Jul 26 21:29:45 2017 -0400
--
.../hive/authorizer/RangerHiveAuthorizer.java | 100 +++
1 file changed, 100 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/edd0bd6a/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizer.java
--
diff --git
a/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizer.java
b/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizer.java
index 85a865a..6872e50 100644
---
a/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizer.java
+++
b/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizer.java
@@ -36,8 +36,15 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.permission.FsAction;
import org.apache.hadoop.hive.common.FileUtils;
import org.apache.hadoop.hive.conf.HiveConf;
+import org.apache.hadoop.hive.metastore.IMetaStoreClient;
+import org.apache.hadoop.hive.metastore.api.HiveObjectPrivilege;
+import org.apache.hadoop.hive.metastore.api.HiveObjectRef;
+import org.apache.hadoop.hive.metastore.api.PrincipalType;
+import org.apache.hadoop.hive.metastore.api.PrivilegeGrantInfo;
+import org.apache.hadoop.hive.ql.metadata.HiveException;
import org.apache.hadoop.hive.ql.parse.SemanticException;
import org.apache.hadoop.hive.ql.security.HiveAuthenticationProvider;
+import org.apache.hadoop.hive.ql.security.authorization.AuthorizationUtils;
import
org.apache.hadoop.hive.ql.security.authorization.plugin.HiveAccessControlException;
import
org.apache.hadoop.hive.ql.security.authorization.plugin.HiveAuthzContext;
import
org.apache.hadoop.hive.ql.security.authorization.plugin.HiveAuthzPluginException;
@@ -46,6 +53,7 @@ import
org.apache.hadoop.hive.ql.security.authorization.plugin.HiveMetastoreClie
import
org.apache.hadoop.hive.ql.security.authorization.plugin.HiveOperationType;
import org.apache.hadoop.hive.ql.security.authorization.plugin.HivePrincipal;
import org.apache.hadoop.hive.ql.security.authorization.plugin.HivePrivilege;
+import
org.apache.hadoop.hive.ql.security.authorization.plugin.HivePrivilegeInfo;
import
org.apache.hadoop.hive.ql.security.authorization.plugin.HivePrivilegeObject;
import
org.apache.hadoop.hive.ql.security.authorization.plugin.HivePrivilegeObject.HivePrivObjectActionType;
import
org.apache.hadoop.hive.ql.security.authorization.plugin.HivePrivilegeObject.HivePrivilegeObjectType;
@@ -1445,6 +1453,98 @@ public class RangerHiveAuthorizer extends
RangerHiveAuthorizerBase {
return ret;
}
+ @Override
+ public List showPrivileges(HivePrincipal principal,
+ HivePrivilegeObject privObj) throws
HiveAuthzPluginException {
+ try {
+ LOG.debug("RangerHiveAuthorizer.showPrivileges()");
+ IMetaStoreClient mClient = getMetastoreClientFactory()
+ .getHiveMetastoreClient();
+ List resPrivInfos = new
ArrayList();
+ String principalName = principal == null ? null :
principal
+ .getName();
+ PrincipalType principalType = principal == null ? null
+ :
AuthorizationUtils.getThriftPrincipalType(principal
+ .getType());
+
+ List msObjPrivs =
mClient.list_privileges(
+ principalName, principalType,
+ this.getThriftHiveObjectRef(privObj));
+
+ for (HiveObjectPrivilege msObjPriv : msObjPrivs) {
+ HivePrincipal resPrincipal = new HivePrincipal(
+ msObjPriv.getPrincipalName(),
+
AuthorizationUtils.getHivePrincipalType(msObjPriv
+
ranger git commit: RANGER-1709:kms test case write logs to log file.
Repository: ranger
Updated Branches:
refs/heads/master 96b0c4860 -> 1685bacf0
RANGER-1709:kms test case write logs to log file.
Signed-off-by: peng.jianhua
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/1685bacf
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/1685bacf
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/1685bacf
Branch: refs/heads/master
Commit: 1685bacf057b773210ae8ca055a6668ea2fa7dd5
Parents: 96b0c48
Author: peng.jianhua
Authored: Tue Jul 25 23:29:00 2017 -0400
Committer: peng.jianhua
Committed: Wed Jul 26 21:01:54 2017 -0400
--
.../kms/authorizer/RangerKmsAuthorizerTest.java | 32 ++--
.../src/test/resources/kms/kms-log4j.properties | 40
plugin-kms/src/test/resources/kms/kms-site.xml | 5 +++
3 files changed, 65 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/1685bacf/plugin-kms/src/test/java/org/apache/ranger/authorization/kms/authorizer/RangerKmsAuthorizerTest.java
--
diff --git
a/plugin-kms/src/test/java/org/apache/ranger/authorization/kms/authorizer/RangerKmsAuthorizerTest.java
b/plugin-kms/src/test/java/org/apache/ranger/authorization/kms/authorizer/RangerKmsAuthorizerTest.java
index 4c2d242..647f431 100644
---
a/plugin-kms/src/test/java/org/apache/ranger/authorization/kms/authorizer/RangerKmsAuthorizerTest.java
+++
b/plugin-kms/src/test/java/org/apache/ranger/authorization/kms/authorizer/RangerKmsAuthorizerTest.java
@@ -33,6 +33,7 @@ import
org.apache.hadoop.crypto.key.kms.server.KMSConfiguration;
import org.apache.hadoop.crypto.key.kms.server.KMSWebApp;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.authorize.AuthorizationException;
+import org.apache.log4j.Logger;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
@@ -51,6 +52,8 @@ import org.mockito.runners.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
public class RangerKmsAuthorizerTest {
+private static final Logger LOG =
Logger.getLogger(RangerKmsAuthorizerTest.class);
+
private static KMSWebApp kmsWebapp;
private static final boolean UNRESTRICTED_POLICIES_INSTALLED;
static {
@@ -81,7 +84,12 @@ public class RangerKmsAuthorizerTest {
DerbyTestUtils.startDerby();
Path configDir = Paths.get("src/test/resources/kms");
+Path logDir = Paths.get("target");
+
System.setProperty(KMSConfiguration.KMS_CONFIG_DIR,
configDir.toFile().getAbsolutePath());
+System.setProperty("kms.log.dir", logDir.toFile().getAbsolutePath());
+System.setProperty("hostname", "localhost");
+System.setProperty("user", "autotest");
// Start KMSWebApp
ServletContextEvent servletContextEvent =
Mockito.mock(ServletContextEvent.class);
@@ -122,7 +130,7 @@ public class RangerKmsAuthorizerTest {
KMSWebApp.getACLs().assertAccess(Type.CREATE, ugi2,
KMSOp.CREATE_KEY, "newkey2", "127.0.0.1");
Assert.fail("Failure expected");
} catch (AuthorizationException ex) {
-// expected
+LOG.error(ex);
}
return null;
}
@@ -137,7 +145,7 @@ public class RangerKmsAuthorizerTest {
KMSWebApp.getACLs().assertAccess(Type.CREATE, ugi3,
KMSOp.CREATE_KEY, "newkey1", "127.0.0.1");
Assert.fail("Failure expected");
} catch (AuthorizationException ex) {
-// expected
+LOG.error(ex);
}
return null;
}
@@ -169,7 +177,7 @@ public class RangerKmsAuthorizerTest {
KMSWebApp.getACLs().assertAccess(Type.DELETE, ugi2,
KMSOp.DELETE_KEY, "newkey1", "127.0.0.1");
Assert.fail("Failure expected");
} catch (AuthorizationException ex) {
-// expected
+LOG.error(ex);
}
return null;
}
@@ -184,7 +192,7 @@ public class RangerKmsAuthorizerTest {
KMSWebApp.getACLs().assertAccess(Type.DELETE, ugi3,
KMSOp.DELETE_KEY, "newkey1", "127.0.0.1");
Assert.fail("Failure expected");
} catch (AuthorizationException ex) {
-// expected
+LOG.error(ex);
}
return null;
}
@@ -217,7 +225,7 @@ public class RangerKmsAuthorizerTest {
KMSWebApp.getACLs().assertAccess(Type.ROLLOVER, ugi2,
KMSOp.ROLL_NEW_VERSION, "newkey1", "127.0.0.1");
Assert.fail("Fai
ranger git commit: RANGER-1698:Write audit log to solr failure.
Repository: ranger Updated Branches: refs/heads/master 5055db153 -> 88352408b RANGER-1698:Write audit log to solr failure. Signed-off-by: peng.jianhua Project: http://git-wip-us.apache.org/repos/asf/ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/88352408 Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/88352408 Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/88352408 Branch: refs/heads/master Commit: 88352408b535d82bbef1b1ffc79b16fb57ffb505 Parents: 5055db1 Author: peng.jianhua Authored: Tue Jul 25 04:59:33 2017 -0400 Committer: peng.jianhua Committed: Tue Jul 25 08:49:57 2017 -0400 -- pom.xml | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ranger/blob/88352408/pom.xml -- diff --git a/pom.xml b/pom.xml index 3fcc4aa..7ae0217 100644 --- a/pom.xml +++ b/pom.xml @@ -163,9 +163,9 @@ 1.1.3 2.1.0 3.1.0-incubating - 4.5.3 - 4.4.6 - 4.5.3 + 4.5.3 + 4.4.6 + 4.5.3 3.12.1.GA 2.1.0 3.1.0 @@ -192,10 +192,12 @@ 2.7.22 5.1.31 3.6.2.Final +0.6 r239 2.3 3.12 UTF-8 +2.5.0 2.11.8 2.11 1.0.4
ranger git commit: RANGER-1690:Ranger usersync created error users. Ranger usersync got System Virtual User Group Name instead of real group name when built the unix user list.
Repository: ranger Updated Branches: refs/heads/master c5332d123 -> 66e1ce2e1 RANGER-1690:Ranger usersync created error users. Ranger usersync got System Virtual User Group Name instead of real group name when built the unix user list. Signed-off-by: peng.jianhua Project: http://git-wip-us.apache.org/repos/asf/ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/66e1ce2e Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/66e1ce2e Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/66e1ce2e Branch: refs/heads/master Commit: 66e1ce2e1eb2bcf894178be5a6b64f60dc8faeed Parents: c5332d1 Author: peng.jianhua Authored: Tue Jul 11 22:11:31 2017 -0400 Committer: peng.jianhua Committed: Sat Jul 15 02:35:47 2017 -0400 -- unixauthservice/conf.dist/ranger-ugsync-default.xml | 6 +- unixauthservice/scripts/install.properties | 6 +- unixauthservice/scripts/templates/installprop2xml.properties | 1 + unixauthservice/scripts/templates/ranger-ugsync-template.xml | 4 4 files changed, 15 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ranger/blob/66e1ce2e/unixauthservice/conf.dist/ranger-ugsync-default.xml -- diff --git a/unixauthservice/conf.dist/ranger-ugsync-default.xml b/unixauthservice/conf.dist/ranger-ugsync-default.xml index 5ed5b89..708e651 100644 --- a/unixauthservice/conf.dist/ranger-ugsync-default.xml +++ b/unixauthservice/conf.dist/ranger-ugsync-default.xml @@ -19,7 +19,7 @@ ranger.usersync.port - 5151 + 5151 ranger.usersync.ssl @@ -46,6 +46,10 @@ 500 + ranger.usersync.unix.minGroupId + 500 + + ranger.usersync.ldap.username.caseconversion none http://git-wip-us.apache.org/repos/asf/ranger/blob/66e1ce2e/unixauthservice/scripts/install.properties -- diff --git a/unixauthservice/scripts/install.properties b/unixauthservice/scripts/install.properties index 13ae1e5..00ddef5 100644 --- a/unixauthservice/scripts/install.properties +++ b/unixauthservice/scripts/install.properties @@ -28,13 +28,17 @@ POLICY_MGR_URL = # defaults to unix SYNC_SOURCE = unix - # # Minimum Unix User-id to start SYNC. # This should avoid creating UNIX system-level users in the Policy Manager # MIN_UNIX_USER_ID_TO_SYNC = 500 +# Minimum Unix Group-id to start SYNC. +# This should avoid creating UNIX system-level users in the Policy Manager +# +MIN_UNIX_GROUP_ID_TO_SYNC = 500 + # sync interval in minutes # user, groups would be synced again at the end of each sync interval # defaults to 5 if SYNC_SOURCE is unix http://git-wip-us.apache.org/repos/asf/ranger/blob/66e1ce2e/unixauthservice/scripts/templates/installprop2xml.properties -- diff --git a/unixauthservice/scripts/templates/installprop2xml.properties b/unixauthservice/scripts/templates/installprop2xml.properties index 1a9bf36..fc69f36 100644 --- a/unixauthservice/scripts/templates/installprop2xml.properties +++ b/unixauthservice/scripts/templates/installprop2xml.properties @@ -15,6 +15,7 @@ # limitations under the License. POLICY_MGR_URL = ranger.usersync.policymanager.baseURL MIN_UNIX_USER_ID_TO_SYNC = ranger.usersync.unix.minUserId +MIN_UNIX_GROUP_ID_TO_SYNC = ranger.usersync.unix.minGroupId SYNC_INTERVAL = ranger.usersync.sleeptimeinmillisbetweensynccycle SYNC_LDAP_URL = ranger.usersync.ldap.url SYNC_LDAP_BIND_DN = ranger.usersync.ldap.binddn http://git-wip-us.apache.org/repos/asf/ranger/blob/66e1ce2e/unixauthservice/scripts/templates/ranger-ugsync-template.xml -- diff --git a/unixauthservice/scripts/templates/ranger-ugsync-template.xml b/unixauthservice/scripts/templates/ranger-ugsync-template.xml index 0025dc8..5321dc6 100644 --- a/unixauthservice/scripts/templates/ranger-ugsync-template.xml +++ b/unixauthservice/scripts/templates/ranger-ugsync-template.xml @@ -162,6 +162,10 @@ + ranger.usersync.unix.minGroupId + + + ranger.usersync.keystore.file
ranger git commit: RANGER-1693:The pidf's assignment logic in ranger-kms-initd should be consistent with the pidf's assignment logic in ranger-kms
Repository: ranger
Updated Branches:
refs/heads/master 15fd7fa5d -> c5332d123
RANGER-1693:The pidf's assignment logic in ranger-kms-initd should be
consistent with the pidf's assignment logic in ranger-kms
Signed-off-by: peng.jianhua
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/c5332d12
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/c5332d12
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/c5332d12
Branch: refs/heads/master
Commit: c5332d123411535f3dbfeef7b1872d97cc087bb2
Parents: 15fd7fa
Author: peng.jianhua
Authored: Thu Jul 13 05:00:46 2017 -0400
Committer: peng.jianhua
Committed: Sat Jul 15 02:30:40 2017 -0400
--
kms/scripts/ranger-kms-initd | 25 -
1 file changed, 24 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/c5332d12/kms/scripts/ranger-kms-initd
--
diff --git a/kms/scripts/ranger-kms-initd b/kms/scripts/ranger-kms-initd
index 8d4fa3d..2bade43 100755
--- a/kms/scripts/ranger-kms-initd
+++ b/kms/scripts/ranger-kms-initd
@@ -27,7 +27,30 @@
#LINUX_USER=kms
BIN_PATH=/usr/bin
MOD_NAME=ranger-kms
-pidf=/var/run/ranger_kms/rangerkms.pid
+
+realScriptPath=`readlink -f $0`
+realScriptDir=`dirname $realScriptPath`
+RANGER_KMS_DIR=`(cd $realScriptDir; pwd)`
+for custom_env_script in `find
${RANGER_KMS_DIR}/ews/webapp/WEB-INF/classes/conf/ -name "ranger-kms-env*"`; do
+if [ -f $custom_env_script ]; then
+. $custom_env_script
+fi
+done
+if [ -z "${RANGER_KMS_PID_NAME}" ]
+then
+RANGER_KMS_PID_NAME=rangerkms.pid
+fi
+if [ -z "${RANGER_KMS_PID_DIR_PATH}" ]
+then
+ RANGER_KMS_PID_DIR_PATH=/var/run/ranger_kms
+fi
+# User can set their own pid path using RANGER_KMS_PID_DIR_PATH and
+# RANGER_KMS_PID_NAME variable before calling the script. The user can modify
+# the value of the RANGER_KMS_PID_DIR_PATH in ranger-kms-env-piddir.sh to
+# change pid path and set the value of RANGER_KMS_PID_NAME to change the
+# pid file.
+pidf=${RANGER_KMS_PID_DIR_PATH}/${RANGER_KMS_PID_NAME}
+
if [ -f $pidf ]; then
pid=`cat $pidf`
else
ranger git commit: RANGER-1692:Similar to RANGER-1540, the Ranger kms should also support the same new feature.
Repository: ranger
Updated Branches:
refs/heads/master 7b61f159f -> 15fd7fa5d
RANGER-1692:Similar to RANGER-1540, the Ranger kms should also support the same
new feature.
Signed-off-by: peng.jianhua
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/15fd7fa5
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/15fd7fa5
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/15fd7fa5
Branch: refs/heads/master
Commit: 15fd7fa5d1a734246640e1337d2b2b927dccc486
Parents: 7b61f15
Author: peng.jianhua
Authored: Wed Jul 12 09:30:09 2017 -0400
Committer: peng.jianhua
Committed: Thu Jul 13 23:33:46 2017 -0400
--
kms/config/kms-webapp/kms-log4j.properties | 4 ++--
kms/scripts/ranger-kms | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/15fd7fa5/kms/config/kms-webapp/kms-log4j.properties
--
diff --git a/kms/config/kms-webapp/kms-log4j.properties
b/kms/config/kms-webapp/kms-log4j.properties
index 479b5b4..2ebfe2e 100644
--- a/kms/config/kms-webapp/kms-log4j.properties
+++ b/kms/config/kms-webapp/kms-log4j.properties
@@ -17,14 +17,14 @@
log4j.appender.kms=org.apache.log4j.DailyRollingFileAppender
log4j.appender.kms.DatePattern='.'-MM-dd
-log4j.appender.kms.File=${kms.log.dir}/kms.log
+log4j.appender.kms.File=${kms.log.dir}/ranger-kms-${hostname}-${user}.log
log4j.appender.kms.Append=true
log4j.appender.kms.layout=org.apache.log4j.PatternLayout
log4j.appender.kms.layout.ConversionPattern=%d{ISO8601} %-5p %c{1} - %m%n
log4j.appender.kms-audit=org.apache.log4j.DailyRollingFileAppender
log4j.appender.kms-audit.DatePattern='.'-MM-dd
-log4j.appender.kms-audit.File=${kms.log.dir}/kms-audit.log
+log4j.appender.kms-audit.File=${kms.log.dir}/kms-audit-${hostname}-${user}.log
log4j.appender.kms-audit.Append=true
log4j.appender.kms-audit.layout=org.apache.log4j.PatternLayout
log4j.appender.kms-audit.layout.ConversionPattern=%d{ISO8601} %m%n
http://git-wip-us.apache.org/repos/asf/ranger/blob/15fd7fa5/kms/scripts/ranger-kms
--
diff --git a/kms/scripts/ranger-kms b/kms/scripts/ranger-kms
index e902509..c279bc1 100755
--- a/kms/scripts/ranger-kms
+++ b/kms/scripts/ranger-kms
@@ -104,7 +104,7 @@ fi
KMS_CONF_DIR=${RANGER_KMS_EWS_DIR}/webapp/WEB-INF/classes/conf
SERVER_NAME=rangerkms
-JAVA_OPTS="${JAVA_OPTS} -Dservername=${SERVER_NAME}
-Dcatalina.base=${RANGER_KMS_EWS_DIR} -Dkms.config.dir=${KMS_CONF_DIR}
-Dkms.log.dir=${TOMCAT_LOG_DIR} -cp
${RANGER_KMS_EWS_CONF_DIR}:${RANGER_KMS_EWS_LIB_DIR}/*:${RANGER_KMS_EWS_DIR}/webapp/lib/*:${JAVA_HOME}/lib/*:${RANGER_HADOOP_CONF_DIR}/*:$CLASSPATH
"
+JAVA_OPTS="${JAVA_OPTS} -Duser=${USER} -Dhostname=${HOSTNAME}
-Dservername=${SERVER_NAME} -Dcatalina.base=${RANGER_KMS_EWS_DIR}
-Dkms.config.dir=${KMS_CONF_DIR} -Dkms.log.dir=${TOMCAT_LOG_DIR} -cp
${RANGER_KMS_EWS_CONF_DIR}:${RANGER_KMS_EWS_LIB_DIR}/*:${RANGER_KMS_EWS_DIR}/webapp/lib/*:${JAVA_HOME}/lib/*:${RANGER_HADOOP_CONF_DIR}/*:$CLASSPATH
"
createRangerKMSPid () {
SLEEP_TIME_AFTER_START=5
nohup java -D${PROC_NAME} ${JAVA_OPTS} ${START_CLASS_NAME}
${KMS_CONFIG_FILENAME} > ${TOMCAT_LOG_FILE} 2>&1 &
ranger git commit: RANGER-1688:The version file did not exist in ranger-1.0.0-SNAPSHOT-kms.tar.gz. The result was that the VERSION variable can only get a fixed 0.5.0 value when installed ranger kms.
Repository: ranger
Updated Branches:
refs/heads/master 988f8eafe -> a92129807
RANGER-1688:The version file did not exist in ranger-1.0.0-SNAPSHOT-kms.tar.gz.
The result was that the VERSION variable can only get a fixed 0.5.0 value when
installed ranger kms.
Signed-off-by: peng.jianhua
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/a9212980
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/a9212980
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/a9212980
Branch: refs/heads/master
Commit: a92129807e4a46c6644c1dd6e430fe8b8b4c1739
Parents: 988f8ea
Author: peng.jianhua
Authored: Tue Jul 11 09:16:40 2017 -0400
Committer: peng.jianhua
Committed: Wed Jul 12 23:33:12 2017 -0400
--
src/main/assembly/kms.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/a9212980/src/main/assembly/kms.xml
--
diff --git a/src/main/assembly/kms.xml b/src/main/assembly/kms.xml
index e26dd33..1d7116a 100755
--- a/src/main/assembly/kms.xml
+++ b/src/main/assembly/kms.xml
@@ -356,7 +356,7 @@
/
-${project.build.outputDirectory}
+${project.build.directory}
version
ranger git commit: RANGER-1686:Log file name format of usersync and security admin should be consistent.
Repository: ranger
Updated Branches:
refs/heads/master 05a1a4017 -> 988f8eafe
RANGER-1686:Log file name format of usersync and security admin should be
consistent.
Signed-off-by: peng.jianhua
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/988f8eaf
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/988f8eaf
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/988f8eaf
Branch: refs/heads/master
Commit: 988f8eafeea04772dfbbe5b5ea838984c2bf522e
Parents: 05a1a40
Author: peng.jianhua
Authored: Tue Jul 11 03:05:06 2017 -0400
Committer: peng.jianhua
Committed: Tue Jul 11 20:18:01 2017 -0400
--
unixauthservice/src/main/resources/log4j.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/988f8eaf/unixauthservice/src/main/resources/log4j.properties
--
diff --git a/unixauthservice/src/main/resources/log4j.properties
b/unixauthservice/src/main/resources/log4j.properties
index dbad541..b022b51 100644
--- a/unixauthservice/src/main/resources/log4j.properties
+++ b/unixauthservice/src/main/resources/log4j.properties
@@ -21,7 +21,7 @@ log4j.rootLogger = info,logFile
# logFile
log4j.appender.logFile=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.logFile.file=${logdir}/usersync.log
+log4j.appender.logFile.file=${logdir}/usersync-${hostname}-${user}.log
log4j.appender.logFile.datePattern='.'-MM-dd
log4j.appender.logFile.layout=org.apache.log4j.PatternLayout
log4j.appender.logFile.layout.ConversionPattern=%d{dd MMM HH:mm:ss} %5p
%c{1} [%t] - %m%n
ranger git commit: RANGER-1678: In different places to achieve the same function using repeat codes, new issue is perhaps generated when these functions are modified.
Repository: ranger
Updated Branches:
refs/heads/master d4f2340a9 -> 05a1a4017
RANGER-1678: In different places to achieve the same function using repeat
codes, new issue is perhaps generated when these functions are modified.
Signed-off-by: peng.jianhua
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/05a1a401
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/05a1a401
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/05a1a401
Branch: refs/heads/master
Commit: 05a1a40175d6458509e715bb19fd219248e965e1
Parents: d4f2340
Author: 10069681
Authored: Tue Jul 11 10:40:10 2017 +0800
Committer: peng.jianhua
Committed: Tue Jul 11 20:16:00 2017 -0400
--
.../audit/destination/SolrAuditDestination.java | 9 +
.../audit/provider/solr/SolrAuditProvider.java | 11 ++
.../apache/ranger/audit/utils/SolrAppUtil.java | 39
3 files changed, 45 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/05a1a401/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 14ad791..329e2f0 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
@@ -25,6 +25,7 @@ import org.apache.ranger.audit.model.AuditEventBase;
import org.apache.ranger.audit.model.AuthzAuditEvent;
import org.apache.ranger.audit.provider.MiscUtil;
import org.apache.ranger.audit.utils.InMemoryJAASConfiguration;
+import org.apache.ranger.audit.utils.SolrAppUtil;
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.impl.CloudSolrClient;
import org.apache.solr.client.solrj.impl.HttpClientUtil;
@@ -221,13 +222,7 @@ public class SolrAuditDestination extends AuditDestination
{
docs.add(document);
}
try {
- final UpdateResponse response =
MiscUtil.executePrivilegedAction(new
PrivilegedExceptionAction() {
- @Override
- public UpdateResponse run() throws
Exception {
- UpdateResponse response =
solrClient.add(docs);
- return response;
- };
- });
+ final UpdateResponse response =
SolrAppUtil.addDocsToSolr(solrClient, docs);
if (response.getStatus() != 0) {
addFailedCount(events.size());
http://git-wip-us.apache.org/repos/asf/ranger/blob/05a1a401/agents-audit/src/main/java/org/apache/ranger/audit/provider/solr/SolrAuditProvider.java
--
diff --git
a/agents-audit/src/main/java/org/apache/ranger/audit/provider/solr/SolrAuditProvider.java
b/agents-audit/src/main/java/org/apache/ranger/audit/provider/solr/SolrAuditProvider.java
index e0c192c..3a4da5a 100644
---
a/agents-audit/src/main/java/org/apache/ranger/audit/provider/solr/SolrAuditProvider.java
+++
b/agents-audit/src/main/java/org/apache/ranger/audit/provider/solr/SolrAuditProvider.java
@@ -21,6 +21,7 @@ package org.apache.ranger.audit.provider.solr;
import java.security.PrivilegedExceptionAction;
import java.util.Collection;
+import java.util.Collections;
import java.util.Date;
import java.util.Properties;
@@ -30,6 +31,7 @@ import org.apache.ranger.audit.destination.AuditDestination;
import org.apache.ranger.audit.model.AuditEventBase;
import org.apache.ranger.audit.model.AuthzAuditEvent;
import org.apache.ranger.audit.provider.MiscUtil;
+import org.apache.ranger.audit.utils.SolrAppUtil;
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.impl.HttpSolrClient;
import org.apache.solr.client.solrj.response.UpdateResponse;
@@ -167,13 +169,8 @@ public class SolrAuditProvider extends AuditDestination {
}
// Convert AuditEventBase to Solr document
final SolrInputDocument document =
toSolrDoc(authzEvent);
- final UpdateResponse response =
MiscUtil.executePrivilegedAction(new
PrivilegedExceptionAction() {
- @Override
- public UpdateResponse run() thro
ranger git commit: Useless configuration in unixauthservice pom.xml lead to project compiler error in eclipse
Repository: ranger
Updated Branches:
refs/heads/master 655ceb219 -> 324a8e872
Useless configuration in unixauthservice pom.xml lead to project compiler error
in eclipse
Signed-off-by: peng.jianhua
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/324a8e87
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/324a8e87
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/324a8e87
Branch: refs/heads/master
Commit: 324a8e8728bd8d43c4165c77ed65fe63448533e9
Parents: 655ceb2
Author: zhangqiang2
Authored: Wed Jul 5 11:18:11 2017 +0800
Committer: peng.jianhua
Committed: Wed Jul 5 22:38:03 2017 -0400
--
unixauthservice/pom.xml | 11 ---
.../src/main/resources/log4j.properties | 33
2 files changed, 33 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/324a8e87/unixauthservice/pom.xml
--
diff --git a/unixauthservice/pom.xml b/unixauthservice/pom.xml
index cc8fb1c..d2bc2a8 100644
--- a/unixauthservice/pom.xml
+++ b/unixauthservice/pom.xml
@@ -88,15 +88,4 @@
${slf4j-api.version}
-
-
-
-${project.build.outputDirectory}/
-conf.dist
-
-log4j.properties
-
-
-
-
http://git-wip-us.apache.org/repos/asf/ranger/blob/324a8e87/unixauthservice/src/main/resources/log4j.properties
--
diff --git a/unixauthservice/src/main/resources/log4j.properties
b/unixauthservice/src/main/resources/log4j.properties
new file mode 100644
index 000..dbad541
--- /dev/null
+++ b/unixauthservice/src/main/resources/log4j.properties
@@ -0,0 +1,33 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+
+log4j.rootLogger = info,logFile
+
+# logFile
+log4j.appender.logFile=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.logFile.file=${logdir}/usersync.log
+log4j.appender.logFile.datePattern='.'-MM-dd
+log4j.appender.logFile.layout=org.apache.log4j.PatternLayout
+log4j.appender.logFile.layout.ConversionPattern=%d{dd MMM HH:mm:ss} %5p
%c{1} [%t] - %m%n
+
+# console
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.Target=System.out
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%d{dd MMM HH:mm:ss} %5p
%c{1} [%t] - %m%n
ranger git commit: RANGER-1503: Add tips to make jdbc.url parameter easy for users to use when create hive-plugin service
Repository: ranger
Updated Branches:
refs/heads/master 16353c268 -> b096802be
RANGER-1503: Add tips to make jdbc.url parameter easy for users to use when
create hive-plugin service
Signed-off-by: peng.jianhua
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/b096802b
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/b096802b
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/b096802b
Branch: refs/heads/master
Commit: b096802bec6fa59142ae924ed09419be5ad719e5
Parents: 16353c2
Author: zhangqiang2
Authored: Fri Jun 30 11:40:43 2017 +0800
Committer: peng.jianhua
Committed: Mon Jul 3 02:49:27 2017 -0400
--
.../src/main/webapp/scripts/models/BackboneFormDataType.js| 3 +++
.../src/main/webapp/scripts/modules/globalize/message/en.js | 3 ++-
2 files changed, 5 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/b096802b/security-admin/src/main/webapp/scripts/models/BackboneFormDataType.js
--
diff --git
a/security-admin/src/main/webapp/scripts/models/BackboneFormDataType.js
b/security-admin/src/main/webapp/scripts/models/BackboneFormDataType.js
index a074146..3f8697e 100644
--- a/security-admin/src/main/webapp/scripts/models/BackboneFormDataType.js
+++ b/security-admin/src/main/webapp/scripts/models/BackboneFormDataType.js
@@ -82,6 +82,9 @@ define(function(require) {
if(v.name ==
'yarn.url'){
formObj.type = 'TextFiledWithIcon';
formObj.errorMsg = localization.tt("hintMsg.yarnRestUrl");
+ }else if(v.name
== 'jdbc.url'){
+
formObj.type = 'TextFiledWithIcon';
+
formObj.errorMsg = localization.tt("hintMsg.hiveJDBCUrl");
}else{
formObj.type = 'Text';
}
http://git-wip-us.apache.org/repos/asf/ranger/blob/b096802b/security-admin/src/main/webapp/scripts/modules/globalize/message/en.js
--
diff --git
a/security-admin/src/main/webapp/scripts/modules/globalize/message/en.js
b/security-admin/src/main/webapp/scripts/modules/globalize/message/en.js
index a21170d..af7bdfe 100644
--- a/security-admin/src/main/webapp/scripts/modules/globalize/message/en.js
+++ b/security-admin/src/main/webapp/scripts/modules/globalize/message/en.js
@@ -445,7 +445,8 @@ define(function(require) {
},
hintMsg : {
- yarnRestUrl:"1.For one url,
eg.'http or https://:8088'2.For multiple urls (use , or ;
delimiter), eg.'http://:8088,http://:8088'"
+ yarnRestUrl:"1.For one url,
eg.'http or https://:8088'2.For multiple urls (use , or ;
delimiter), eg.'http://:8088,http://:8088'",
+ hiveJDBCUrl:"1.For Remote Mode,
eg.jdbc:hive2://:2.For Embedded Mode (no host
or port), eg.jdbc:hive2:///;initFile=3.For HTTP Mode,
eg.jdbc:hive2://:/;transportMode=http;httpPath=4.For
SSL Mode,
eg.jdbc:hive2://:/;ssl=true;sslTrustStore=tStore;trustStorePassword=pw5.For
ZooKeeper Mode,
eg.jdbc:hive2:///;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace=hiveserver26.For
Kerberos Mode,
eg.jdbc:hive2://:/;principal=hive/dom...@example.com"
}
ranger git commit: RANGER-1659:Similar to RANGER-1599, Different developers use different log directories in the kms installation script. Its processing logic is chaotic. We should optimize this logic
Repository: ranger
Updated Branches:
refs/heads/master b7a1cc05c -> 16353c268
RANGER-1659:Similar to RANGER-1599, Different developers use different log
directories in the kms installation script. Its processing logic is chaotic. We
should optimize this logic.
Signed-off-by: peng.jianhua
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/16353c26
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/16353c26
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/16353c26
Branch: refs/heads/master
Commit: 16353c268e9d4c4c5cfd44f12937386165435493
Parents: b7a1cc0
Author: peng.jianhua
Authored: Tue Jun 27 07:11:23 2017 -0400
Committer: peng.jianhua
Committed: Thu Jun 29 05:13:48 2017 -0400
--
kms/scripts/install.properties | 1 -
kms/scripts/setup.sh | 9 +
2 files changed, 1 insertion(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/16353c26/kms/scripts/install.properties
--
diff --git a/kms/scripts/install.properties b/kms/scripts/install.properties
index 5b32ae1..5d4945e 100755
--- a/kms/scripts/install.properties
+++ b/kms/scripts/install.properties
@@ -226,7 +226,6 @@ KMS_DIR=$PWD
app_home=$PWD/ews/webapp
TMPFILE=$PWD/.fi_tmp
LOGFILE=$PWD/logfile
-LOGFILES="$LOGFILE"
JAVA_BIN='java'
JAVA_VERSION_REQUIRED='1.7'
http://git-wip-us.apache.org/repos/asf/ranger/blob/16353c26/kms/scripts/setup.sh
--
diff --git a/kms/scripts/setup.sh b/kms/scripts/setup.sh
index 77d8e80..0b13ab4 100755
--- a/kms/scripts/setup.sh
+++ b/kms/scripts/setup.sh
@@ -78,7 +78,6 @@ KMS_DIR=$(eval echo "$(get_prop 'KMS_DIR' $PROPFILE)")
app_home=$(eval echo "$(get_prop 'app_home' $PROPFILE)")
TMPFILE=$(eval echo "$(get_prop 'TMPFILE' $PROPFILE)")
LOGFILE=$(eval echo "$(get_prop 'LOGFILE' $PROPFILE)")
-LOGFILES=$(eval echo "$(get_prop 'LOGFILES' $PROPFILE)")
JAVA_BIN=$(get_prop 'JAVA_BIN' $PROPFILE)
JAVA_VERSION_REQUIRED=$(get_prop 'JAVA_VERSION_REQUIRED' $PROPFILE)
JAVA_ORACLE=$(get_prop 'JAVA_ORACLE' $PROPFILE)
@@ -193,11 +192,7 @@ check_user_pwd(){
exit 1;
fi
}
-init_logfiles(){
-for f in $LOGFILES; do
-touch $f
-done
-}
+
password_validation(){
if [ -z "$1" ]
then
@@ -932,10 +927,8 @@ setup_install_files(){
chmod 755 /var/log/ranger/kms
chown -R $unix_user:$unix_group /var/log/ranger/kms
fi
-
}
-init_logfiles
log " - Running Ranger KMS Application Install Script - "
log "[I] uname=`uname`"
log "[I] hostname=`hostname`"
ranger git commit: RANGER-1668:Do some code improvement in setup.sh of security-admin
Repository: ranger
Updated Branches:
refs/heads/master 84d132fcf -> f6029f1cc
RANGER-1668:Do some code improvement in setup.sh of security-admin
Signed-off-by: peng.jianhua
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/f6029f1c
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/f6029f1c
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/f6029f1c
Branch: refs/heads/master
Commit: f6029f1cc926d8f487368216deb9dbebb3074eac
Parents: 84d132f
Author: peng.jianhua
Authored: Tue Jun 27 09:45:30 2017 +0800
Committer: peng.jianhua
Committed: Tue Jun 27 06:44:14 2017 -0400
--
security-admin/scripts/setup.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/f6029f1c/security-admin/scripts/setup.sh
--
diff --git a/security-admin/scripts/setup.sh b/security-admin/scripts/setup.sh
index f49bb13..1630684 100755
--- a/security-admin/scripts/setup.sh
+++ b/security-admin/scripts/setup.sh
@@ -1218,13 +1218,13 @@ setup_install_files(){
if [ "${hadoop_conf}" == "" ]
then
log "[WARN] Property hadoop_conf not found. Creating
blank core-site.xml."
- echo "" >
${WEBAPP_ROOT}/WEB-INF/classes/conf/core-site.xml
+ echo "" >
${ranger_hadoop_conf_file}
else
if [ -f ${hadoop_conf_file} ]; then
-ln -sf ${hadoop_conf_file}
${WEBAPP_ROOT}/WEB-INF/classes/conf/core-site.xml
+ln -sf ${hadoop_conf_file}
${ranger_hadoop_conf_file}
else
log "[WARN] core-site.xml file not found in
provided hadoop_conf path. Creating blank core-site.xml"
- echo "" >
${WEBAPP_ROOT}/WEB-INF/classes/conf/core-site.xml
+ echo "" >
${ranger_hadoop_conf_file}
fi
fi
fi
ranger git commit: RANGER-1662
Repository: ranger
Updated Branches:
refs/heads/master 51a96a86e -> f6ff008a1
RANGER-1662
Signed-off-by: peng.jianhua
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/f6ff008a
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/f6ff008a
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/f6ff008a
Branch: refs/heads/master
Commit: f6ff008a13d2fe25196d8f939369a1273829b927
Parents: 51a96a8
Author: peng.jianhua
Authored: Thu Jun 22 17:16:19 2017 +0800
Committer: peng.jianhua
Committed: Thu Jun 22 20:51:48 2017 -0400
--
.../src/main/webapp/scripts/models/BackboneFormDataType.js | 8 +++-
.../src/main/webapp/scripts/modules/globalize/message/en.js | 3 +++
2 files changed, 10 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/f6ff008a/security-admin/src/main/webapp/scripts/models/BackboneFormDataType.js
--
diff --git
a/security-admin/src/main/webapp/scripts/models/BackboneFormDataType.js
b/security-admin/src/main/webapp/scripts/models/BackboneFormDataType.js
index fee50f5..a074146 100644
--- a/security-admin/src/main/webapp/scripts/models/BackboneFormDataType.js
+++ b/security-admin/src/main/webapp/scripts/models/BackboneFormDataType.js
@@ -23,6 +23,7 @@ define(function(require) {
var Backbone= require('backbone');
var XAUtils = require('utils/XAUtils');
var XAEnums = require('utils/XAEnums');
+ var localization= require('utils/XALangSupport');
var FormDataType = Backbone.Model.extend({
type : [ 'string', 'boolean', 'int' ],
@@ -78,7 +79,12 @@ define(function(require) {
switch (v.type) {
case 'string':
if(!isPolicyForm) {
- formObj.type =
'Text';
+ if(v.name ==
'yarn.url'){
+
formObj.type = 'TextFiledWithIcon';
+
formObj.errorMsg = localization.tt("hintMsg.yarnRestUrl");
+ }else{
+
formObj.type = 'Text';
+ }
break;
}
if($.inArray(v.level,
samelevelFieldCreated) >= 0){
http://git-wip-us.apache.org/repos/asf/ranger/blob/f6ff008a/security-admin/src/main/webapp/scripts/modules/globalize/message/en.js
--
diff --git
a/security-admin/src/main/webapp/scripts/modules/globalize/message/en.js
b/security-admin/src/main/webapp/scripts/modules/globalize/message/en.js
index 4397721..a21170d 100644
--- a/security-admin/src/main/webapp/scripts/modules/globalize/message/en.js
+++ b/security-admin/src/main/webapp/scripts/modules/globalize/message/en.js
@@ -443,6 +443,9 @@ define(function(require) {
userAlreadyExistsError : 'User already exists',
repositoryNameAlreadyExistsError : 'Repository
name already exists'
+ },
+ hintMsg : {
+ yarnRestUrl:"1.For one url,
eg.'http or https://:8088'2.For multiple urls (use , or ;
delimiter), eg.'http://:8088,http://:8088'"
}
ranger git commit: RANGER-1660:Similar to RANGER-1575, the kms should also support the same new feature.
Repository: ranger
Updated Branches:
refs/heads/master ba29b4094 -> 84de2f030
RANGER-1660:Similar to RANGER-1575, the kms should also support the same new
feature.
Signed-off-by: peng.jianhua
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/84de2f03
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/84de2f03
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/84de2f03
Branch: refs/heads/master
Commit: 84de2f030d92798e6715e180e00785f19d7c09bc
Parents: ba29b40
Author: peng.jianhua
Authored: Tue Jun 20 23:54:01 2017 -0400
Committer: peng.jianhua
Committed: Wed Jun 21 21:29:55 2017 -0400
--
kms/scripts/ranger-kms | 21 ++---
1 file changed, 18 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/84de2f03/kms/scripts/ranger-kms
--
diff --git a/kms/scripts/ranger-kms b/kms/scripts/ranger-kms
index 11dc4ff..e902509 100755
--- a/kms/scripts/ranger-kms
+++ b/kms/scripts/ranger-kms
@@ -56,15 +56,30 @@ then
RANGER_KMS_LOG_DIR=${RANGER_KMS_EWS_DIR}/logs
fi
+if [ -z "${RANGER_KMS_PID_NAME}" ]
+then
+RANGER_KMS_PID_NAME=rangerkms.pid
+fi
+
if [ -z "${RANGER_KMS_PID_DIR_PATH}" ]
then
-RANGER_KMS_PID_DIR_PATH=/var/run/ranger_kms
+ RANGER_KMS_PID_DIR_PATH=/var/run/ranger_kms
+fi
+if [ ! -d "${RANGER_KMS_PID_DIR_PATH}" ]
+then
+ mkdir -p $RANGER_KMS_PID_DIR_PATH
+ chmod 660 $RANGER_KMS_PID_DIR_PATH
fi
-pidf=${RANGER_KMS_PID_DIR_PATH}/rangerkms.pid
+# User can set their own pid path using RANGER_KMS_PID_DIR_PATH and
+# RANGER_KMS_PID_NAME variable before calling the script. The user can modify
+# the value of the RANGER_KMS_PID_DIR_PATH in ranger-kms-env-piddir.sh to
+# change pid path and set the value of RANGER_KMS_PID_NAME to change the
+# pid file.
+pidf=${RANGER_KMS_PID_DIR_PATH}/${RANGER_KMS_PID_NAME}
if [ -z "${KMS_USER}" ]
then
-KMS_USER=kms
+ KMS_USER=kms
fi
PROC_NAME=proc_rangerkms
ranger git commit: RANGER-1657:Like ranger admin and usersync, the password should be set after the user is created by installer during installing kms.
Repository: ranger
Updated Branches:
refs/heads/master f2e36940c -> e07556457
RANGER-1657:Like ranger admin and usersync, the password should be set after
the user is created by installer during installing kms.
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/e0755645
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/e0755645
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/e0755645
Branch: refs/heads/master
Commit: e07556457c8b159046016c97aedaa4dc4d0c3ef2
Parents: f2e3694
Author: zhangqiang2
Authored: Tue Jun 20 02:35:20 2017 -0400
Committer: zhangqiang2
Committed: Tue Jun 20 20:29:32 2017 -0400
--
kms/scripts/install.properties | 1 +
kms/scripts/setup.sh | 25 +
2 files changed, 22 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/e0755645/kms/scripts/install.properties
--
diff --git a/kms/scripts/install.properties b/kms/scripts/install.properties
index b173d13..5b32ae1 100755
--- a/kms/scripts/install.properties
+++ b/kms/scripts/install.properties
@@ -91,6 +91,7 @@ HSM_PARTITION_PASSWORD=S@fenet123
# --- UNIX User CONFIG
#
unix_user=kms
+unix_user_pwd=kms
unix_group=kms
#
# --- UNIX User CONFIG - END
http://git-wip-us.apache.org/repos/asf/ranger/blob/e0755645/kms/scripts/setup.sh
--
diff --git a/kms/scripts/setup.sh b/kms/scripts/setup.sh
index be706b6..77d8e80 100755
--- a/kms/scripts/setup.sh
+++ b/kms/scripts/setup.sh
@@ -66,6 +66,7 @@ db_ssl_required=$(get_prop 'db_ssl_required' $PROPFILE)
db_ssl_verifyServerCertificate=$(get_prop 'db_ssl_verifyServerCertificate'
$PROPFILE)
KMS_MASTER_KEY_PASSWD=$(get_prop 'KMS_MASTER_KEY_PASSWD' $PROPFILE)
unix_user=$(get_prop 'unix_user' $PROPFILE)
+unix_user_pwd=$(get_prop 'unix_user_pwd' $PROPFILE)
unix_group=$(get_prop 'unix_group' $PROPFILE)
POLICY_MGR_URL=$(get_prop 'POLICY_MGR_URL' $PROPFILE)
REPOSITORY_NAME=$(get_prop 'REPOSITORY_NAME' $PROPFILE)
@@ -186,13 +187,18 @@ updatePropertyToFilePy(){
check_ret_status $? "Update property failed for: {'$1'}"
}
-
-init_logfiles () {
+check_user_pwd(){
+if [ -z "$1" ]; then
+log "[E] The unix user password is empty. Please set user password.";
+exit 1;
+fi
+}
+init_logfiles(){
for f in $LOGFILES; do
touch $f
done
}
-password_validation() {
+password_validation(){
if [ -z "$1" ]
then
log "[I] Blank password is not allowed for" $2". Please enter
valid password."
@@ -735,13 +741,24 @@ setup_unix_user_group(){
check_ret_status_for_groupadd $? "Creating group ${unix_group}
failed"
fi
+ #create user if it does not exists
id -u ${unix_user} > /dev/null 2>&1
-
if [ $? -ne 0 ]
then
+ check_user_pwd ${unix_user_pwd}
log "[I] Creating new user and adding to group";
useradd ${unix_user} -g ${unix_group} -m
check_ret_status $? "useradd ${unix_user} failed"
+
+ passwdtmpfile=passwd.tmp
+ if [ -f "$passwdtmpfile" ]; then
+ rm -rf ${passwdtmpfile}
+ fi
+ cat> ${passwdtmpfile} << EOF
+${unix_user}:${unix_user_pwd}
+EOF
+ chpasswd < ${passwdtmpfile}
+ rm -rf ${passwdtmpfile}
else
log "[I] User already exists, adding it to group";
usermod -g ${unix_group} ${unix_user}
ranger git commit: RANGER-1652:Clean invalid code for kms installer to improve code clarity and execution efficiency.
Repository: ranger
Updated Branches:
refs/heads/master fdd1d294c -> 7e75e9b1c
RANGER-1652:Clean invalid code for kms installer to improve code clarity and
execution efficiency.
Signed-off-by: peng.jianhua
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/7e75e9b1
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/7e75e9b1
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/7e75e9b1
Branch: refs/heads/master
Commit: 7e75e9b1c4a0e6dd64d3ff09da1f713bc43b7e26
Parents: fdd1d29
Author: peng.jianhua
Authored: Mon Jun 19 05:03:02 2017 -0400
Committer: peng.jianhua
Committed: Mon Jun 19 05:43:47 2017 -0400
--
kms/scripts/setup.sh | 37 +
1 file changed, 5 insertions(+), 32 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/7e75e9b1/kms/scripts/setup.sh
--
diff --git a/kms/scripts/setup.sh b/kms/scripts/setup.sh
index 297fdd2..be706b6 100755
--- a/kms/scripts/setup.sh
+++ b/kms/scripts/setup.sh
@@ -22,8 +22,6 @@
PROPFILE=$PWD/install.properties
propertyValue=''
-CONF_FILE=$PWD/ews/webapp/WEB-INF/classes/conf
-ETC_CONF_FILE=/etc/ranger/kms/conf
pidFolderName='/var/run/ranger_kms'
if [ ! -d "${pidFolderName}" ]; then
mkdir -p "${pidFolderName}"
@@ -234,36 +232,11 @@ init_variables(){
fi
log "[I] DB_FLAVOR=${DB_FLAVOR}"
## HSM Config ##
-
-propertyName=ranger.ks.hsm.enabled
-HSM_ENABLED=`echo $HSM_ENABLED | tr '[:lower:]' '[:upper:]'`
-password_validation "$KMS_MASTER_KEY_PASSWD" "KMS Master key"
-
- #getPropertyFromFile 'db_root_user' $PROPFILE db_root_user
- #getPropertyFromFile 'db_root_password' $PROPFILE db_user
- #getPropertyFromFile 'db_user' $PROPFILE db_user
- #getPropertyFromFile 'db_password' $PROPFILE db_password
-
- #if [ -L ${CONF_FILE} ]
- # then
- # log "Deleting conf symlink"
- # rm -f ${CONF_FILE}
- # fi
-
- # if [ -f ${ETC_CONF_FILE} ]
- # then
- # log "Deleting /etc/ranger/kms/conf file"
- # rm -f ${ETC_CONF_FILE}
- # fi
-
- # if [ ! -d ${ETC_CONF_FILE} ]
- # then
- # log "Creating /etc/ranger/kms/conf dir"
- # mkdir -p ${ETC_CONF_FILE}
- # fi
-
- # log "Create link of conf -> /etc/ranger/kms/conf"
- # ln -sf ${ETC_CONF_FILE} ${CONF_FILE}
+
+ propertyName=ranger.ks.hsm.enabled
+ HSM_ENABLED=`echo $HSM_ENABLED | tr '[:lower:]' '[:upper:]'`
+ password_validation "$KMS_MASTER_KEY_PASSWD" "KMS Master key"
+
db_ssl_enabled=`echo $db_ssl_enabled | tr '[:upper:]' '[:lower:]'`
if [ "${db_ssl_enabled}" != "true" ]
then
ranger git commit: RANGER-1641:Like security admin and usersync, the kms installer should chech whether the user group exists before creating the user group.
Repository: ranger
Updated Branches:
refs/heads/master 08d9c4e33 -> 42657fdb8
RANGER-1641:Like security admin and usersync, the kms installer should chech
whether the user group exists before creating the user group.
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/42657fdb
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/42657fdb
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/42657fdb
Branch: refs/heads/master
Commit: 42657fdb849f9e96e87c3f16f7c06a639600253a
Parents: 08d9c4e
Author: zhangqiang2
Authored: Wed Jun 14 02:27:54 2017 -0400
Committer: zhangqiang2
Committed: Wed Jun 14 20:46:56 2017 -0400
--
kms/scripts/setup.sh | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/42657fdb/kms/scripts/setup.sh
--
diff --git a/kms/scripts/setup.sh b/kms/scripts/setup.sh
index c8d7519..297fdd2 100755
--- a/kms/scripts/setup.sh
+++ b/kms/scripts/setup.sh
@@ -753,11 +753,14 @@ update_properties() {
#=
setup_unix_user_group(){
-
log "[I] Setting up UNIX user : ${unix_user} and group: ${unix_group}";
-
-groupadd ${unix_group}
-check_ret_status_for_groupadd $? "Creating group ${unix_group} failed"
+ #create group if it does not exist
+ egrep "^$unix_group" /etc/group >& /dev/null
+ if [ $? -ne 0 ]
+ then
+ groupadd ${unix_group}
+ check_ret_status_for_groupadd $? "Creating group ${unix_group}
failed"
+ fi
id -u ${unix_user} > /dev/null 2>&1
ranger git commit: RANGER-1636:Remove the pmd check error
Repository: ranger
Updated Branches:
refs/heads/master 9a99e3f41 -> 2c57feaf8
RANGER-1636:Remove the pmd check error
Signed-off-by: peng.jianhua
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/2c57feaf
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/2c57feaf
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/2c57feaf
Branch: refs/heads/master
Commit: 2c57feaf8b53f719d889f07a21cbdfafe6608dc4
Parents: 9a99e3f
Author: peng.jianhua
Authored: Tue Jun 13 00:20:44 2017 -0400
Committer: peng.jianhua
Committed: Tue Jun 13 21:54:18 2017 -0400
--
.../org/apache/ranger/plugin/errors/TestValidationErrorCode.java | 1 -
.../main/java/org/apache/hadoop/crypto/key/RangerKeyStore.java | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/2c57feaf/agents-common/src/test/java/org/apache/ranger/plugin/errors/TestValidationErrorCode.java
--
diff --git
a/agents-common/src/test/java/org/apache/ranger/plugin/errors/TestValidationErrorCode.java
b/agents-common/src/test/java/org/apache/ranger/plugin/errors/TestValidationErrorCode.java
index 1b00c64..2c69bcc 100644
---
a/agents-common/src/test/java/org/apache/ranger/plugin/errors/TestValidationErrorCode.java
+++
b/agents-common/src/test/java/org/apache/ranger/plugin/errors/TestValidationErrorCode.java
@@ -20,7 +20,6 @@
package org.apache.ranger.plugin.errors;
import com.google.common.collect.ImmutableSet;
-import org.apache.ranger.plugin.model.validation.ValidationFailureDetails;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/ranger/blob/2c57feaf/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStore.java
--
diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStore.java
b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStore.java
index c4f7267..09b46bc 100644
--- a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStore.java
+++ b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStore.java
@@ -321,7 +321,7 @@ public class RangerKeyStore extends KeyStoreSpi {
xxRangerKeyStore = new
XXRangerKeyStore();
keyStoreExists = false;
}
- xxRangerKeyStore =
mapToEntityBean(rangerKeyStore, xxRangerKeyStore, 0);
+ xxRangerKeyStore =
mapToEntityBean(rangerKeyStore, xxRangerKeyStore);
if (keyStoreExists) {
xxRangerKeyStore =
rangerKMSDao.update(xxRangerKeyStore);
} else {
@@ -334,7 +334,7 @@ public class RangerKeyStore extends KeyStoreSpi {
}
}
- private XXRangerKeyStore mapToEntityBean(XXRangerKeyStore
rangerKMSKeyStore, XXRangerKeyStore xxRangerKeyStore,int i) {
+ private XXRangerKeyStore mapToEntityBean(XXRangerKeyStore
rangerKMSKeyStore, XXRangerKeyStore xxRangerKeyStore) {
xxRangerKeyStore.setAlias(rangerKMSKeyStore.getAlias());
xxRangerKeyStore.setCreatedDate(rangerKMSKeyStore.getCreatedDate());
xxRangerKeyStore.setEncoded(rangerKMSKeyStore.getEncoded());
ranger git commit: RANGER-1604:DB based auditing had been removed in RANGER-900. But some configurations and codes are not removed accordingly in Ranger Admin. It often makes the user feel confused su
Repository: ranger
Updated Branches:
refs/heads/master 2814f71fa -> f2c4f90f0
RANGER-1604:DB based auditing had been removed in RANGER-900. But some
configurations and codes are not removed accordingly in Ranger Admin. It often
makes the user feel confused such as RANGER-1286.
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/f2c4f90f
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/f2c4f90f
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/f2c4f90f
Branch: refs/heads/master
Commit: f2c4f90f07f6cddc008b560aa361b5a0b1e04a00
Parents: 2814f71
Author: zhangqiang2
Authored: Fri Jun 9 05:37:01 2017 -0400
Committer: zhangqiang2
Committed: Mon Jun 12 03:24:39 2017 -0400
--
security-admin/scripts/install.properties | 6 +-
security-admin/scripts/setup.sh | 83 +-
2 files changed, 2 insertions(+), 87 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/f2c4f90f/security-admin/scripts/install.properties
--
diff --git a/security-admin/scripts/install.properties
b/security-admin/scripts/install.properties
index 06a1b89..268b8ac 100644
--- a/security-admin/scripts/install.properties
+++ b/security-admin/scripts/install.properties
@@ -67,8 +67,7 @@ db_name=ranger
db_user=rangeradmin
db_password=
-#Source for Audit Store
-#audit_store=solr|db
+#Source for Audit Store. Currently only solr is supported.
# * audit_store is solr
audit_store=solr
@@ -77,9 +76,6 @@ audit_solr_urls=
audit_solr_user=
audit_solr_password=
audit_solr_zookeepers=
-#audit_db_name=
-#audit_db_user=
-#audit_db_password=
#- DB CONFIG - END --
http://git-wip-us.apache.org/repos/asf/ranger/blob/f2c4f90f/security-admin/scripts/setup.sh
--
diff --git a/security-admin/scripts/setup.sh b/security-admin/scripts/setup.sh
index ef61e8d..f49bb13 100755
--- a/security-admin/scripts/setup.sh
+++ b/security-admin/scripts/setup.sh
@@ -71,9 +71,6 @@ audit_solr_urls=$(get_prop 'audit_solr_urls' $PROPFILE)
audit_solr_user=$(get_prop 'audit_solr_user' $PROPFILE)
audit_solr_password=$(get_prop 'audit_solr_password' $PROPFILE)
audit_solr_zookeepers=$(get_prop 'audit_solr_zookeepers' $PROPFILE)
-audit_db_name=''
-audit_db_user=''
-audit_db_password=''
policymgr_external_url=$(get_prop 'policymgr_external_url' $PROPFILE)
policymgr_http_enabled=$(get_prop 'policymgr_http_enabled' $PROPFILE)
policymgr_https_keystore_file=$(get_prop 'policymgr_https_keystore_file'
$PROPFILE)
@@ -238,11 +235,7 @@ init_variables(){
exit 1
fi
fi
- if [ "${audit_store}" == "db" ] ;then
- audit_db_name=$(get_prop 'audit_db_name' $PROPFILE)
- audit_db_user=$(get_prop 'audit_db_user' $PROPFILE)
- audit_db_password=$(get_prop 'audit_db_password' $PROPFILE)
- fi
+
db_ssl_enabled=`echo $db_ssl_enabled | tr '[:upper:]' '[:lower:]'`
if [ "${db_ssl_enabled}" != "true" ]
then
@@ -488,13 +481,6 @@ update_properties() {
newPropertyValue="jdbc:log4jdbc:mysql://${DB_HOST}/${db_name}"
updatePropertyToFilePy $propertyName $newPropertyValue
$to_file_ranger
- if [ "${audit_store}" == "db" ]
- then
- propertyName=ranger.jpa.audit.jdbc.url
-
newPropertyValue="jdbc:log4jdbc:mysql://${DB_HOST}/${audit_db_name}"
- updatePropertyToFilePy $propertyName $newPropertyValue
$to_file_default
- fi
-
propertyName=ranger.jpa.jdbc.dialect
newPropertyValue="org.eclipse.persistence.platform.database.MySQLPlatform"
updatePropertyToFilePy $propertyName $newPropertyValue
$to_file_default
@@ -525,12 +511,6 @@ update_properties() {
fi
updatePropertyToFilePy $propertyName $newPropertyValue
$to_file_ranger
- if [ "${audit_store}" == "db" ]
- then
- propertyName=ranger.jpa.audit.jdbc.url
- updatePropertyToFilePy $propertyName $newPropertyValue
$to_file_default
- fi
-
propertyName=ranger.jpa.jdbc.dialect
newPropertyValue="org.eclipse.persistence.platform.database.OraclePlatform"
updatePropertyToFilePy $propertyName $newPropertyValue
$to_file_default
@@ -550,21 +530,12 @@ update_properties() {
if [ "${DB_FLAVOR}" == "POSTGRES" ]
then
db_name=`echo ${db_name} | tr '[:upper:]' '[:lower:]'`
- aud
ranger git commit: RANGER-1600:In install.properties, I configured the testusr user and the testgroup groups that not exist in system. The error “chown: invalid user: testusr:testgroup” occured during
Repository: ranger
Updated Branches:
refs/heads/master 2d8895e6d -> fbfa3193d
RANGER-1600:In install.properties, I configured the testusr user and the
testgroup groups that not exist in system. The error âchown: invalid user:
testusr:testgroupâ occured during installed the hbase plugin.
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/fbfa3193
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/fbfa3193
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/fbfa3193
Branch: refs/heads/master
Commit: fbfa3193d9b267c18e95048d177f8d68f31a61ff
Parents: 2d8895e
Author: peng.jianhua
Authored: Mon May 22 22:07:56 2017 -0400
Committer: zhangqiang2
Committed: Fri Jun 9 02:45:03 2017 -0400
--
agents-common/scripts/enable-agent.sh | 19 +++
1 file changed, 15 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/fbfa3193/agents-common/scripts/enable-agent.sh
--
diff --git a/agents-common/scripts/enable-agent.sh
b/agents-common/scripts/enable-agent.sh
index a74289a..562a404 100755
--- a/agents-common/scripts/enable-agent.sh
+++ b/agents-common/scripts/enable-agent.sh
@@ -133,17 +133,28 @@ CUSTOM_USER=${CUSTOM_USER// }
CUSTOM_GROUP=$(getInstallProperty 'CUSTOM_GROUP')
CUSTOM_GROUP=${CUSTOM_GROUP// }
+CUSTOM_GROUP_STATUS=${CUSTOM_GROUP};
+CUSTOM_USER_STATUS=${CUSTOM_USER};
+egrep "^$CUSTOM_GROUP" /etc/group >& /dev/null
+if [ $? -ne 0 ]
+then
+ CUSTOM_GROUP_STATUS=""
+fi
+id -u ${CUSTOM_USER} > /dev/null 2>&1
+if [ $? -ne 0 ]
+then
+ CUSTOM_USER_STATUS=""
+fi
-
-if [ ! -z "${CUSTOM_USER}" ] && [ ! -z "${CUSTOM_GROUP}" ]
+if [ ! -z "${CUSTOM_USER_STATUS}" ] && [ ! -z "${CUSTOM_GROUP_STATUS}" ]
then
echo "Custom user and group is available, using custom user and group."
CFG_OWNER_INF="${CUSTOM_USER}:${CUSTOM_GROUP}"
-elif [ ! -z "${CUSTOM_USER}" ] && [ -z "${CUSTOM_GROUP}" ]
+elif [ ! -z "${CUSTOM_USER_STATUS}" ] && [ -z "${CUSTOM_GROUP_STATUS}" ]
then
echo "Custom user is available, using custom user and default group."
CFG_OWNER_INF="${CUSTOM_USER}:${HCOMPONENT_NAME}"
-elif [ -z "${CUSTOM_USER}" ] && [ ! -z "${CUSTOM_GROUP}" ]
+elif [ -z "${CUSTOM_USER_STATUS}" ] && [ ! -z "${CUSTOM_GROUP_STATUS}" ]
then
echo "Custom group is available, using default user and custom group."
CFG_OWNER_INF="${HCOMPONENT_NAME}:${CUSTOM_GROUP}"
ranger git commit: RANGER-1617:The ranger build failure in windows environment
Repository: ranger Updated Branches: refs/heads/master 734eff61d -> f8ed53ef4 RANGER-1617:The ranger build failure in windows environment Signed-off-by: peng.jianhua Project: http://git-wip-us.apache.org/repos/asf/ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/f8ed53ef Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/f8ed53ef Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/f8ed53ef Branch: refs/heads/master Commit: f8ed53ef466e3206d743b4b92f48e1889df0cb7b Parents: 734eff6 Author: peng.jianhua Authored: Thu May 25 23:28:14 2017 -0400 Committer: peng.jianhua Committed: Fri May 26 03:01:37 2017 -0400 -- ranger-util/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ranger/blob/f8ed53ef/ranger-util/pom.xml -- diff --git a/ranger-util/pom.xml b/ranger-util/pom.xml index 7d19d10..2ad5eca 100644 --- a/ranger-util/pom.xml +++ b/ranger-util/pom.xml @@ -46,7 +46,7 @@ generate-sources - +
ranger git commit: RANGER-1613:There is one defect in start script for ranger-usersync process
Repository: ranger
Updated Branches:
refs/heads/master d7ea2e27a -> 734eff61d
RANGER-1613:There is one defect in start script for ranger-usersync process
Signed-off-by: peng.jianhua
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/734eff61
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/734eff61
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/734eff61
Branch: refs/heads/master
Commit: 734eff61d86243805e578e1fb3a2b7c52cc91acc
Parents: d7ea2e2
Author: zhangqiang2
Authored: Thu May 25 16:11:14 2017 +0800
Committer: peng.jianhua
Committed: Fri May 26 09:26:32 2017 +0800
--
.../scripts/ranger-usersync-services.sh | 24 +++-
1 file changed, 23 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/734eff61/unixauthservice/scripts/ranger-usersync-services.sh
--
diff --git a/unixauthservice/scripts/ranger-usersync-services.sh
b/unixauthservice/scripts/ranger-usersync-services.sh
index f57a0c4..18dbc9a 100644
--- a/unixauthservice/scripts/ranger-usersync-services.sh
+++ b/unixauthservice/scripts/ranger-usersync-services.sh
@@ -15,6 +15,25 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+function getInstallProperty() {
+local propertyName=$1
+local propertyValue=""
+
+for file in "${INSTALL_ARGS}"
+do
+if [ -f "${file}" ]
+then
+propertyValue=`grep "^${propertyName}[ \t]*=" ${file} | awk -F= '{
sub("^[ \t]*", "", $2); sub("[ \t]*$", "", $2); print $2 }'`
+if [ "${propertyValue}" != "" ]
+then
+break
+fi
+fi
+done
+
+echo ${propertyValue}
+}
+
if [[ -z $1 ]]; then
echo "Invalid argument [$1];"
echo "Usage: Only start | stop | restart | version, are supported."
@@ -56,6 +75,9 @@ if [ -z "${UNIX_USERSYNC_USER}" ]; then
UNIX_USERSYNC_USER=ranger
fi
+INSTALL_ARGS="${cdir}/install.properties"
+RANGER_BASE_DIR=$(getInstallProperty 'ranger_base_dir')
+
if [ "${action}" == "START" ]; then
#Export JAVA_HOME
@@ -85,7 +107,7 @@ if [ "${action}" == "START" ]; then
fi
fi
SLEEP_TIME_AFTER_START=5
- nohup java -Dproc_rangerusersync
-Dlog4j.configuration=file:/etc/ranger/usersync/conf/log4j.properties
${JAVA_OPTS} -Duser=${USER} -Dhostname=${HOSTNAME} -Dlogdir="${logdir}" -cp
"${cp}" org.apache.ranger.authentication.UnixAuthenticationService
-enableUnixAuth > ${logdir}/auth.log 2>&1 &
+ nohup java -Dproc_rangerusersync
-Dlog4j.configuration=file:${RANGER_BASE_DIR}/usersync/conf/log4j.properties
${JAVA_OPTS} -Duser=${USER} -Dhostname=${HOSTNAME} -Dlogdir="${logdir}" -cp
"${cp}" org.apache.ranger.authentication.UnixAuthenticationService
-enableUnixAuth > ${logdir}/auth.log 2>&1 &
VALUE_OF_PID=$!
echo "Starting Apache Ranger Usersync Service"
sleep $SLEEP_TIME_AFTER_START
ranger git commit: RANGER-1614:Similar to RANGER-1575, the Ranger UserSync should also support the same new feature.
Repository: ranger
Updated Branches:
refs/heads/master 24d15821c -> d7ea2e27a
RANGER-1614:Similar to RANGER-1575, the Ranger UserSync should also support the
same new feature.
Signed-off-by: peng.jianhua
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/d7ea2e27
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/d7ea2e27
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/d7ea2e27
Branch: refs/heads/master
Commit: d7ea2e27a52e531f883be436a290f0de8f15ff4a
Parents: 24d1582
Author: peng.jianhua
Authored: Thu May 25 05:11:40 2017 -0400
Committer: peng.jianhua
Committed: Fri May 26 09:22:53 2017 +0800
--
unixauthservice/scripts/ranger-usersync-services.sh | 13 +++--
1 file changed, 11 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/d7ea2e27/unixauthservice/scripts/ranger-usersync-services.sh
--
diff --git a/unixauthservice/scripts/ranger-usersync-services.sh
b/unixauthservice/scripts/ranger-usersync-services.sh
index 97f5708..f57a0c4 100644
--- a/unixauthservice/scripts/ranger-usersync-services.sh
+++ b/unixauthservice/scripts/ranger-usersync-services.sh
@@ -35,14 +35,23 @@ done
if [ -z "${USERSYNC_PID_DIR_PATH}" ]; then
USERSYNC_PID_DIR_PATH=/var/run/ranger
fi
-
+if [ -z "${USERSYNC_PID_NAME}" ]
+then
+USERSYNC_PID_NAME=usersync.pid
+fi
if [ ! -d "${USERSYNC_PID_DIR_PATH}" ]
then
mkdir -p $USERSYNC_PID_DIR_PATH
chmod 660 $USERSYNC_PID_DIR_PATH
fi
-pidf=${USERSYNC_PID_DIR_PATH}/usersync.pid
+# User can set their own pid path using USERSYNC_PID_DIR_PATH and
+# USERSYNC_PID_NAME variable before calling the script. The user can modify
+# the value of the USERSYNC_PID_DIR_PATH in ranger-usersync-env-piddir.sh to
+# change pid path and set the value of USERSYNC_PID_NAME to change the
+# pid file.
+pidf=${USERSYNC_PID_DIR_PATH}/${USERSYNC_PID_NAME}
+
if [ -z "${UNIX_USERSYNC_USER}" ]; then
UNIX_USERSYNC_USER=ranger
fi
ranger git commit: RANGER-1575:Some users hope that the pid file of the Ranger Admin can be unified management when they integrate Ranger into the big data platform or business systems to uniform inst
Repository: ranger
Updated Branches:
refs/heads/master 01be3608f -> 7e223f90b
RANGER-1575:Some users hope that the pid file of the Ranger Admin can be
unified management when they integrate Ranger into the big data platform or
business systems to uniform install and run Ranger.
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/7e223f90
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/7e223f90
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/7e223f90
Branch: refs/heads/master
Commit: 7e223f90b319795c23225b447aded71f74546331
Parents: 01be360
Author: peng.jianhua
Authored: Mon May 22 23:35:03 2017 -0400
Committer: zhangqiang2
Committed: Wed May 24 12:14:06 2017 -0400
--
embeddedwebserver/scripts/ranger-admin-services.sh | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/7e223f90/embeddedwebserver/scripts/ranger-admin-services.sh
--
diff --git a/embeddedwebserver/scripts/ranger-admin-services.sh
b/embeddedwebserver/scripts/ranger-admin-services.sh
index a81219b..e902f73 100755
--- a/embeddedwebserver/scripts/ranger-admin-services.sh
+++ b/embeddedwebserver/scripts/ranger-admin-services.sh
@@ -58,6 +58,10 @@ if [ -z "${RANGER_PID_DIR_PATH}" ]
then
RANGER_PID_DIR_PATH=/var/run/ranger
fi
+if [ -z "${RANGER_ADMIN_PID_NAME}" ]
+then
+RANGER_ADMIN_PID_NAME=rangeradmin.pid
+fi
if [ ! -d "${RANGER_PID_DIR_PATH}" ]
then
@@ -65,7 +69,11 @@ then
chmod 660 $RANGER_PID_DIR_PATH
fi
-pidf=${RANGER_PID_DIR_PATH}/rangeradmin.pid
+# User can set their own pid path using RANGER_PID_DIR_PATH and
+# RANGER_ADMIN_PID_NAME variable before calling the script. The user can modify
+# the value of the RANGER_PID_DIR_PATH in ranger-admin-env-piddir.sh to change
+# pid path and set the value of RANGER_ADMIN_PID_NAME to change the pid file.
+pidf=${RANGER_PID_DIR_PATH}/${RANGER_ADMIN_PID_NAME}
if [ -z "${RANGER_USER}" ]
then
ranger git commit: RANGER-1611:The init_logfiles function had been removed in RANGER-1599. The segment code that calls the init_logfiles function should also be removed in setup.sh for Ranger Admin.
Repository: ranger
Updated Branches:
refs/heads/master d7c0b7a43 -> 615a70ddb
RANGER-1611:The init_logfiles function had been removed in RANGER-1599. The
segment code that calls the init_logfiles function should also be removed in
setup.sh for Ranger Admin.
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/615a70dd
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/615a70dd
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/615a70dd
Branch: refs/heads/master
Commit: 615a70ddbd66d4a2403ef26fa018246b8ac7ddb1
Parents: d7c0b7a
Author: peng.jianhua
Authored: Wed May 24 10:59:30 2017 +0800
Committer: zhangqiang2
Committed: Wed May 24 00:06:20 2017 -0400
--
security-admin/scripts/setup.sh | 1 -
1 file changed, 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/615a70dd/security-admin/scripts/setup.sh
--
diff --git a/security-admin/scripts/setup.sh b/security-admin/scripts/setup.sh
index 098f857..ef61e8d 100755
--- a/security-admin/scripts/setup.sh
+++ b/security-admin/scripts/setup.sh
@@ -1427,7 +1427,6 @@ setup_install_files(){
fi
}
-init_logfiles
log " - Running Ranger PolicyManager Web Application Install Script
- "
log "[I] uname=`uname`"
log "[I] hostname=`hostname`"
ranger git commit: RANGER-1605:These invalid codes that were copied have not been deleted in db_setup.py for the Ranger admin
Repository: ranger
Updated Branches:
refs/heads/master 56a93f6e4 -> d7c0b7a43
RANGER-1605:These invalid codes that were copied have not been deleted in
db_setup.py for the Ranger admin
Signed-off-by: peng.jianhua
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/d7c0b7a4
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/d7c0b7a4
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/d7c0b7a4
Branch: refs/heads/master
Commit: d7c0b7a43e1fb1c372495ba8b16a27243197
Parents: 56a93f6
Author: peng.jianhua
Authored: Tue May 23 04:42:56 2017 -0400
Committer: peng.jianhua
Committed: Wed May 24 08:52:01 2017 +0800
--
security-admin/scripts/db_setup.py | 2 --
1 file changed, 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/d7c0b7a4/security-admin/scripts/db_setup.py
--
diff --git a/security-admin/scripts/db_setup.py
b/security-admin/scripts/db_setup.py
index b5ab132..79d79d0 100644
--- a/security-admin/scripts/db_setup.py
+++ b/security-admin/scripts/db_setup.py
@@ -500,8 +500,6 @@ class MysqlConf(BaseDB):
for filename in files:
f =
re.match("^Patch.*?.class$",filename)
if f:
- className =
re.match("(Patch.*?)_.*.class",filename)
- className = className.group(1)
version =
re.match("Patch.*?_(.*).class",filename)
version = version.group(1)
key3 = int(version.strip("J"))
ranger git commit: RANGER-1597:The log is inconsistent with the code in RangerServiceDefHelper class, update it to ensure their consistency.
Repository: ranger
Updated Branches:
refs/heads/master 4a87c2983 -> 03fa94cb9
RANGER-1597:The log is inconsistent with the code in RangerServiceDefHelper
class,update it to ensure their consistency.
Signed-off-by: peng.jianhua
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/03fa94cb
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/03fa94cb
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/03fa94cb
Branch: refs/heads/master
Commit: 03fa94cb91904d33f1fa925581e5978522da998d
Parents: 4a87c29
Author: peng.jianhua
Authored: Mon May 22 10:55:18 2017 +0800
Committer: peng.jianhua
Committed: Mon May 22 21:29:37 2017 -0400
--
.../ranger/plugin/model/validation/RangerServiceDefHelper.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/03fa94cb/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceDefHelper.java
--
diff --git
a/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceDefHelper.java
b/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceDefHelper.java
index 159ee1a..9fb724d 100644
---
a/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceDefHelper.java
+++
b/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceDefHelper.java
@@ -131,7 +131,7 @@ public class RangerServiceDefHelper {
// NOTE: we assume serviceDef, its name and update time are can
never by null.
if(LOG.isDebugEnabled()) {
- LOG.debug(String.format("==>
RangerPolicyValidator.isValidResourceNames(%s)", serviceDef));
+ LOG.debug(String.format("==> RangerServiceDefHelper().
The RangerServiceDef: %s", serviceDef));
}
String serviceName = serviceDef.getName();
ranger git commit: RANGER-1599:Different developers use different log directories in the Ranger Admin installation script. Its processing logic is chaotic. We should optimize this logic.
Repository: ranger
Updated Branches:
refs/heads/master e8abd7f3d -> 4a87c2983
RANGER-1599:Different developers use different log directories in the Ranger
Admin installation script. Its processing logic is chaotic. We should optimize
this logic.
Signed-off-by: peng.jianhua
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/4a87c298
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/4a87c298
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/4a87c298
Branch: refs/heads/master
Commit: 4a87c298362da5bf3265103a37bb25eec6166b85
Parents: e8abd7f
Author: peng.jianhua
Authored: Mon May 22 14:54:02 2017 +0800
Committer: peng.jianhua
Committed: Mon May 22 21:25:45 2017 -0400
--
security-admin/scripts/setup.sh | 7 ---
1 file changed, 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/4a87c298/security-admin/scripts/setup.sh
--
diff --git a/security-admin/scripts/setup.sh b/security-admin/scripts/setup.sh
index 3b259a0..098f857 100755
--- a/security-admin/scripts/setup.sh
+++ b/security-admin/scripts/setup.sh
@@ -216,13 +216,6 @@ updatePropertyToFilePy(){
check_ret_status $? "Update property failed for: " $1
}
-init_logfiles () {
-for f in $LOGFILES; do
-touch $f
-done
-#log "start date for $0 = `date`"
-}
-
init_variables(){
curDt=`date '+%Y%m%d%H%M%S'`
VERSION=`cat ${PWD}/version`
ranger git commit: RANGER-1601 The log name is incorrect in ValuePrinter.java
Repository: ranger
Updated Branches:
refs/heads/master dae5808f3 -> e8abd7f3d
RANGER-1601 The log name is incorrect in ValuePrinter.java
Signed-off-by: peng.jianhua
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/e8abd7f3
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/e8abd7f3
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/e8abd7f3
Branch: refs/heads/master
Commit: e8abd7f3dc5617536cad4dc736976c70567fb391
Parents: dae5808
Author: 10069681
Authored: Mon May 22 19:40:38 2017 +0800
Committer: peng.jianhua
Committed: Tue May 23 09:06:01 2017 +0800
--
.../src/main/java/org/apache/ranger/plugin/geo/ValuePrinter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/e8abd7f3/agents-common/src/main/java/org/apache/ranger/plugin/geo/ValuePrinter.java
--
diff --git
a/agents-common/src/main/java/org/apache/ranger/plugin/geo/ValuePrinter.java
b/agents-common/src/main/java/org/apache/ranger/plugin/geo/ValuePrinter.java
index 89bb0b4..cc429a2 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/geo/ValuePrinter.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/geo/ValuePrinter.java
@@ -26,7 +26,7 @@ import org.apache.commons.logging.LogFactory;
import java.io.*;
class ValuePrinter implements ValueProcessor {
- private static final Log LOG =
LogFactory.getLog(RangerGeolocationDatabase.class);
+ private static final Log LOG = LogFactory.getLog(ValuePrinter.class);
private Writer writer;
private String fileName;
ranger git commit: RANGER-1598-make the tips of group and user consistent with others in en.js
Repository: ranger
Updated Branches:
refs/heads/master e26bcce24 -> dae5808f3
RANGER-1598-make the tips of group and user consistent with others in en.js
Signed-off-by: peng.jianhua
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/dae5808f
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/dae5808f
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/dae5808f
Branch: refs/heads/master
Commit: dae5808f35332270ee5c4b4e5467d860982b532d
Parents: e26bcce
Author: zhangqiang2
Authored: Mon May 22 19:19:27 2017 +0800
Committer: peng.jianhua
Committed: Tue May 23 08:59:25 2017 +0800
--
.../src/main/webapp/scripts/modules/globalize/message/en.js | 8
1 file changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/dae5808f/security-admin/src/main/webapp/scripts/modules/globalize/message/en.js
--
diff --git
a/security-admin/src/main/webapp/scripts/modules/globalize/message/en.js
b/security-admin/src/main/webapp/scripts/modules/globalize/message/en.js
index 895ab14..f47276c 100644
--- a/security-admin/src/main/webapp/scripts/modules/globalize/message/en.js
+++ b/security-admin/src/main/webapp/scripts/modules/globalize/message/en.js
@@ -337,11 +337,11 @@ define(function(require) {
areYouSureWantToDelete: 'Are you sure want
to delete ?',
policyDeleteMsg : 'Policy
deleted successfully',
policyNotAddedMsg : 'Policy not
added!',
- addGroupPermission: 'Please add
permission(s) for the selected Group, else group will not be added.',
+ addGroupPermission: 'Please add
permission(s) for the selected group, else group will not be added.',
addGroup :
'Please select group for the selected permission(s), else group will not be
added.',
- addUserPermission : 'Please add
permission(s) for the selected User, else User will not be added.',
- addUser :
'Please select User for the selected permission(s), else User will not be
added.',
- enterAlteastOneCharactere : 'Enter alteast one
character.',
+ addUserPermission : 'Please add
permission(s) for the selected user, else user will not be added.',
+ addUser :
'Please select user for the selected permission(s), else user will not be
added.',
+ enterAlteastOneCharactere : 'Enter at least one
character.',
permsAlreadyExistForSelectedUser : 'Permission
already exists for selected user.',
permsAlreadyExistForSelectedGroup : 'Permission
already exists for selected group.',
youDontHavePermission : 'You don\'t have
permission for the resource !!',
ranger git commit: RANGER-1592:Do code improvement for static fields and Log in the AtlasClient.java
Repository: ranger
Updated Branches:
refs/heads/master bae15a962 -> e26bcce24
RANGER-1592:Do code improvement for static fields and Log in the
AtlasClient.java
Signed-off-by: peng.jianhua
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/e26bcce2
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/e26bcce2
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/e26bcce2
Branch: refs/heads/master
Commit: e26bcce249ec1852e4b55daf8e9f78f754e30343
Parents: bae15a9
Author: zhangqiang2
Authored: Mon May 22 19:37:10 2017 +0800
Committer: peng.jianhua
Committed: Tue May 23 08:51:35 2017 +0800
--
.../ranger/services/atlas/client/AtlasClient.java | 16
1 file changed, 8 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/e26bcce2/plugin-atlas/src/main/java/org/apache/ranger/services/atlas/client/AtlasClient.java
--
diff --git
a/plugin-atlas/src/main/java/org/apache/ranger/services/atlas/client/AtlasClient.java
b/plugin-atlas/src/main/java/org/apache/ranger/services/atlas/client/AtlasClient.java
index e686c4d..c10da79 100644
---
a/plugin-atlas/src/main/java/org/apache/ranger/services/atlas/client/AtlasClient.java
+++
b/plugin-atlas/src/main/java/org/apache/ranger/services/atlas/client/AtlasClient.java
@@ -57,7 +57,7 @@ public class AtlasClient extends BaseClient {
/*** TYPE **/
private static final String ATLAS_LIST_TYPE_API_ENDPOINT =
"/api/atlas/types/";
/ ENTITY **/
- private static final String ATLAS_ENTITY_lIST_API_ENDPOINT =
"/api/atlas/v1/entities";
+ private static final String ATLAS_ENTITY_LIST_API_ENDPOINT =
"/api/atlas/v1/entities";
/*** TERM **/
private static final String ATLAS_LIST_TERM_API_ENDPOINT =
"/api/atlas/v1/taxonomies/Catalog/terms/";
/*** TAXONOMY **/
@@ -302,7 +302,7 @@ public class AtlasClient extends BaseClient {
if
(atlasResourceParameter == null || atlasResourceParameter.isEmpty()
|| responseResource.startsWith(atlasResourceParameter)) {
if (LOG.isDebugEnabled()) {
-
LOG.debug("getTypeResource():Adding existsResource " +
responseResource);
+
LOG.debug("getTypeResource():Adding existing Resource " +
responseResource);
}
lret.add(responseResource);
}
@@ -347,7 +347,7 @@ public class AtlasClient extends BaseClient {
LOG.debug("getEntityResource():response.getStatus() = " +
statusResponse.getStatus());
}
if (statusResponse.getStatus() == 200) {
- WebResource webResourceEntity =
client.resource(atlasUrl + ATLAS_ENTITY_lIST_API_ENDPOINT);
+ WebResource webResourceEntity =
client.resource(atlasUrl + ATLAS_ENTITY_LIST_API_ENDPOINT);
WebResource.Builder builder =
webResourceEntity.getRequestBuilder();
for (NewCookie cook :
statusResponse.getCookies()) {
builder = builder.cookie(cook);
@@ -376,7 +376,7 @@ public class AtlasClient extends BaseClient {
if (atlasResourceParameter == null || atlasResourceParameter.isEmpty()
|| responseResource.startsWith(atlasResourceParameter)) {
if (LOG.isDebugEnabled()) {
-
LOG.debug("getEntityResource():Adding existsResource "
+
LOG.debug("getEntityResource():Adding existing Resource "
+ responseResource);
ranger git commit: RANGER-1596 The log name is incorrect in Log4JAuditDestination.java.
Repository: ranger
Updated Branches:
refs/heads/master 69204867d -> e22ee9607
RANGER-1596 The log name is incorrect in Log4JAuditDestination.java.
Signed-off-by: peng.jianhua
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/e22ee960
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/e22ee960
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/e22ee960
Branch: refs/heads/master
Commit: e22ee9607206ad387572e3cac0aac32a562c57d5
Parents: 6920486
Author: zhangqiang2
Authored: Mon May 22 10:05:13 2017 +0800
Committer: peng.jianhua
Committed: Mon May 22 15:56:36 2017 +0800
--
.../org/apache/ranger/audit/destination/Log4JAuditDestination.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/e22ee960/agents-audit/src/main/java/org/apache/ranger/audit/destination/Log4JAuditDestination.java
--
diff --git
a/agents-audit/src/main/java/org/apache/ranger/audit/destination/Log4JAuditDestination.java
b/agents-audit/src/main/java/org/apache/ranger/audit/destination/Log4JAuditDestination.java
index 4e3338e..1dd35c9 100644
---
a/agents-audit/src/main/java/org/apache/ranger/audit/destination/Log4JAuditDestination.java
+++
b/agents-audit/src/main/java/org/apache/ranger/audit/destination/Log4JAuditDestination.java
@@ -29,7 +29,7 @@ import org.apache.ranger.audit.provider.MiscUtil;
public class Log4JAuditDestination extends AuditDestination {
private static final Log logger = LogFactory
- .getLog(FileAuditDestination.class);
+ .getLog(Log4JAuditDestination.class);
private static Log auditLogger = null;
ranger git commit: RANGER-1591:The log is inconsistent with the code in ServiceDBStore class, update it to ensure their consistency.
Repository: ranger
Updated Branches:
refs/heads/master d128b5fe1 -> 66adb23ca
RANGER-1591:The log is inconsistent with the code in ServiceDBStore
class,update it to ensure their consistency.
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/66adb23c
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/66adb23c
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/66adb23c
Branch: refs/heads/master
Commit: 66adb23ca5e46710d9c7804e54faa0767ae624e3
Parents: d128b5f
Author: zhangqiang2
Authored: Fri May 19 15:20:17 2017 +0800
Committer: zhangqiang2
Committed: Fri May 19 17:19:11 2017 +0800
--
.../src/main/java/org/apache/ranger/biz/ServiceDBStore.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/66adb23c/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
--
diff --git
a/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
b/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
index a44aa46..9b191b6 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
@@ -1743,7 +1743,7 @@ public class ServiceDBStore extends AbstractServiceStore {
public RangerService getServiceByNameForDP(String name) throws
Exception {
if(LOG.isDebugEnabled()) {
- LOG.debug("==> ServiceDBStore.getServiceByName()");
+ LOG.debug("==> ServiceDBStore.getServiceByNameForDP()");
}
XXService xService = daoMgr.getXXService().findByName(name);
if (ContextUtil.getCurrentUserSession() != null) {
ranger git commit: RANGER-1542:Exceptions occured when I test connection during create a new service for atlas-plugin
Repository: ranger
Updated Branches:
refs/heads/master 5d5dee08a -> d128b5fe1
RANGER-1542:Exceptions occured when I test connection during create a new
service for atlas-plugin
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/d128b5fe
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/d128b5fe
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/d128b5fe
Branch: refs/heads/master
Commit: d128b5fe159cc52186c790ab08163718cab65b89
Parents: 5d5dee0
Author: zhangqiang2
Authored: Wed Apr 26 10:11:49 2017 +0800
Committer: zhangqiang2
Committed: Fri May 19 17:16:10 2017 +0800
--
.../java/org/apache/ranger/services/atlas/client/AtlasClient.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/d128b5fe/plugin-atlas/src/main/java/org/apache/ranger/services/atlas/client/AtlasClient.java
--
diff --git
a/plugin-atlas/src/main/java/org/apache/ranger/services/atlas/client/AtlasClient.java
b/plugin-atlas/src/main/java/org/apache/ranger/services/atlas/client/AtlasClient.java
index 116fceb..e686c4d 100644
---
a/plugin-atlas/src/main/java/org/apache/ranger/services/atlas/client/AtlasClient.java
+++
b/plugin-atlas/src/main/java/org/apache/ranger/services/atlas/client/AtlasClient.java
@@ -189,7 +189,7 @@ public class AtlasClient extends BaseClient {
decryptedPwd = password;
}
}
- formData.add("j_password",
PasswordUtils.decryptPassword(password));
+ formData.add("j_password", decryptedPwd);
try {
statusResponse =
webResource.type("application/x-www-form-urlencoded").post(ClientResponse.class,
formData);
ranger git commit: RANGER-1545:The associated AUDIT database configuration has been removed in enable_hive_plugin.sh. But the corresponding code has not been deleted. We should remove redundant code t
Repository: ranger
Updated Branches:
refs/heads/master a8a0b5533 -> b08baf923
RANGER-1545:The associated AUDIT database configuration has been removed in
enable_hive_plugin.sh. But the corresponding code has not been deleted. We
should remove redundant code to keep consistency.
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/b08baf92
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/b08baf92
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/b08baf92
Branch: refs/heads/master
Commit: b08baf923d1f24434f79edeccc68de2103340275
Parents: a8a0b55
Author: zhangqiang2
Authored: Wed Apr 26 01:46:19 2017 -0400
Committer: zhangqiang2
Committed: Thu May 18 08:01:30 2017 -0400
--
agents-common/scripts/enable-agent.sh | 48 --
1 file changed, 48 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/b08baf92/agents-common/scripts/enable-agent.sh
--
diff --git a/agents-common/scripts/enable-agent.sh
b/agents-common/scripts/enable-agent.sh
index 57278b4..76ba8f0 100755
--- a/agents-common/scripts/enable-agent.sh
+++ b/agents-common/scripts/enable-agent.sh
@@ -399,54 +399,6 @@ then
chmod a+rx ${POLICY_CACHE_FILE_PATH}
chown -R ${CFG_OWNER_INF} /etc/${PROJ_NAME}/${REPO_NAME}
-
- #
- # We need to do the AUDIT JDBC url
- #
-db_flavor=''
-db_flavor=`echo $(getInstallProperty 'XAAUDIT.DB.FLAVOUR') | tr '[:lower:]'
'[:upper:]'`
-if [ "${db_flavor}" != "" ]
-then
-audit_db_hostname=$(getInstallProperty 'XAAUDIT.DB.HOSTNAME')
-audit_db_name=$(getInstallProperty 'XAAUDIT.DB.DATABASE_NAME')
-
- if [ "${db_flavor}" = "MYSQL" ]
- then
- export
XAAUDIT_DB_JDBC_URL="jdbc:mysql://${audit_db_hostname}/${audit_db_name}"
- export XAAUDIT_DB_JDBC_DRIVER="com.mysql.jdbc.Driver"
- elif [ "${db_flavor}" = "ORACLE" ]
- then
- count=$(grep -o ":" <<< "$audit_db_hostname" | wc -l)
- #if [[ ${count} -eq 2 ]] ; then
- if [ ${count} -eq 2 ] || [ ${count} -eq 0 ]; then
- #jdbc:oracle:thin:@[HOST][:PORT]:SID or
#jdbc:oracle:thin:@GL
-
newPropertyValue="jdbc:oracle:thin:@${audit_db_hostname}"
- else
- #jdbc:oracle:thin:@//[HOST][:PORT]/SERVICE
-
newPropertyValue="jdbc:oracle:thin:@//${audit_db_hostname}"
- fi
- export XAAUDIT_DB_JDBC_URL=${newPropertyValue}
- export XAAUDIT_DB_JDBC_DRIVER="oracle.jdbc.OracleDriver"
-elif [ "${db_flavor}" = "POSTGRES" ]
- then
- export
XAAUDIT_DB_JDBC_URL="jdbc:postgresql://${audit_db_hostname}/${audit_db_name}"
- export XAAUDIT_DB_JDBC_DRIVER="org.postgresql.Driver"
- elif [ "${db_flavor}" = "MSSQL" ]
- then
- export
XAAUDIT_DB_JDBC_URL="jdbc:sqlserver://${audit_db_hostname};databaseName=${audit_db_name}"
- export
XAAUDIT_DB_JDBC_DRIVER="com.microsoft.sqlserver.jdbc.SQLServerDriver"
- elif [ "${db_flavor}" = "SQLA" ]
- then
- export
XAAUDIT_DB_JDBC_URL="jdbc:sqlanywhere:database=${audit_db_name};host=${audit_db_hostname}"
- export XAAUDIT_DB_JDBC_DRIVER="sap.jdbc4.sqlanywhere.IDriver"
- else
-echo "Audit is not specified with a valid db_flavor: [${db_flavor}].
Ignoring audit ..."
-export
XAAUDIT_DB_JDBC_URL="jdbc:${db_flavor}://${audit_db_hostname}/${audit_db_name}"
-export XAAUDIT_DB_JDBC_DRIVER="com.unknown.driver.${db_flavor}"
- fi
-fi
-
-
for f in ${PROJ_INSTALL_DIR}/install/conf.templates/${action}/*.cfg
do
if [ -f "${f}" ]
ranger git commit: RANGER-1585:Do some code improvement for the error logs in RangerBasePlugin.java
Repository: ranger
Updated Branches:
refs/heads/master b451c34d9 -> 1056997de
RANGER-1585:Do some code improvement for the error logs in RangerBasePlugin.java
Signed-off-by: peng.jianhua
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/1056997d
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/1056997d
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/1056997d
Branch: refs/heads/master
Commit: 1056997de83fae36a6b966be8ffe24cd89bcf551
Parents: b451c34
Author: zhangqiang2
Authored: Wed May 17 09:44:27 2017 +0800
Committer: peng.jianhua
Committed: Thu May 18 09:35:07 2017 +0800
--
.../apache/ranger/plugin/service/RangerBasePlugin.java | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/1056997d/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBasePlugin.java
--
diff --git
a/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBasePlugin.java
b/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBasePlugin.java
index 13900c6..06b8f4d 100644
---
a/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBasePlugin.java
+++
b/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBasePlugin.java
@@ -308,7 +308,7 @@ public class RangerBasePlugin {
public void grantAccess(GrantRevokeRequest request,
RangerAccessResultProcessor resultProcessor) throws Exception {
if(LOG.isDebugEnabled()) {
- LOG.debug("==> RangerAdminRESTClient.grantAccess(" +
request + ")");
+ LOG.debug("==> RangerBasePlugin.grantAccess(" + request
+ ")");
}
PolicyRefresher refresher = this.refresher;
@@ -328,13 +328,13 @@ public class RangerBasePlugin {
}
if(LOG.isDebugEnabled()) {
- LOG.debug("<== RangerAdminRESTClient.grantAccess(" +
request + ")");
+ LOG.debug("<== RangerBasePlugin.grantAccess(" + request
+ ")");
}
}
public void revokeAccess(GrantRevokeRequest request,
RangerAccessResultProcessor resultProcessor) throws Exception {
if(LOG.isDebugEnabled()) {
- LOG.debug("==> RangerAdminRESTClient.revokeAccess(" +
request + ")");
+ LOG.debug("==> RangerBasePlugin.revokeAccess(" +
request + ")");
}
PolicyRefresher refresher = this.refresher;
@@ -354,13 +354,13 @@ public class RangerBasePlugin {
}
if(LOG.isDebugEnabled()) {
- LOG.debug("<== RangerAdminRESTClient.revokeAccess(" +
request + ")");
+ LOG.debug("<== RangerBasePlugin.revokeAccess(" +
request + ")");
}
}
public static RangerAdminClient createAdminClient(String
rangerServiceName, String applicationId, String propertyPrefix) {
if(LOG.isDebugEnabled()) {
- LOG.debug("==>
RangerAdminRESTClient.createAdminClient(" + rangerServiceName + ", " +
applicationId + ", " + propertyPrefix + ")");
+ LOG.debug("==> RangerBasePlugin.createAdminClient(" +
rangerServiceName + ", " + applicationId + ", " + propertyPrefix + ")");
}
RangerAdminClient ret = null;
@@ -393,7 +393,7 @@ public class RangerBasePlugin {
ret.init(rangerServiceName, applicationId, propertyPrefix);
if(LOG.isDebugEnabled()) {
- LOG.debug("<==
RangerAdminRESTClient.createAdminClient(" + rangerServiceName + ", " +
applicationId + ", " + propertyPrefix + "): policySourceImpl=" +
policySourceImpl + ", client=" + ret);
+ LOG.debug("<== RangerBasePlugin.createAdminClient(" +
rangerServiceName + ", " + applicationId + ", " + propertyPrefix + "):
policySourceImpl=" + policySourceImpl + ", client=" + ret);
}
return ret;
}
ranger git commit: RANGER-1574:The XAAUDIT.DB.PASSWORD property had been deleted in RANGER-900. The related redundant code should be deleted for plugin installer.
Repository: ranger
Updated Branches:
refs/heads/master fa38ed737 -> a8b4976de
RANGER-1574:The XAAUDIT.DB.PASSWORD property had been deleted in RANGER-900.
The related redundant code should be deleted for plugin installer.
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/a8b4976d
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/a8b4976d
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/a8b4976d
Branch: refs/heads/master
Commit: a8b4976ded4c4f980c351dd5c90f990c437107cd
Parents: fa38ed7
Author: peng.jianhua
Authored: Fri May 12 09:16:05 2017 -0400
Committer: zhangqiang2
Committed: Fri May 12 19:12:12 2017 -0400
--
agents-common/scripts/enable-agent.sh | 9 ---
hbase-agent/scripts/install.sh | 17 -
hdfs-agent/scripts/install.sh | 13 --
hive-agent/scripts/install.sh | 13 --
knox-agent/scripts/install.sh | 14 ---
plugin-kms/scripts/enable-kms-plugin.sh | 36 +++-
storm-agent/scripts/install.sh | 14 ---
7 files changed, 9 insertions(+), 107 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/a8b4976d/agents-common/scripts/enable-agent.sh
--
diff --git a/agents-common/scripts/enable-agent.sh
b/agents-common/scripts/enable-agent.sh
index d13875c..57278b4 100755
--- a/agents-common/scripts/enable-agent.sh
+++ b/agents-common/scripts/enable-agent.sh
@@ -561,15 +561,6 @@ then
fi
#
- # Generate Credential Provider file and Credential for Audit DB access.
- #
- auditCredAlias="auditDBCred"
- auditdbCred=$(getInstallProperty 'XAAUDIT.DB.PASSWORD')
- if [ "${auditdbCred}" != "" ]; then
- create_jceks "${auditCredAlias}" "${auditdbCred}"
"${CredFile}"
- fi
-
- #
# Generate Credential Provider file and Credential for SSL KEYSTORE AND
TRUSTSTORE
#
sslkeystoreAlias="sslKeyStore"
http://git-wip-us.apache.org/repos/asf/ranger/blob/a8b4976d/hbase-agent/scripts/install.sh
--
diff --git a/hbase-agent/scripts/install.sh b/hbase-agent/scripts/install.sh
index 265be1d..d900d6a 100644
--- a/hbase-agent/scripts/install.sh
+++ b/hbase-agent/scripts/install.sh
@@ -218,32 +218,15 @@ then
fi
fi
-
-#
-# Generate Credential Provider file and Credential for Audit DB access.
-#
-
-
-auditCredAlias="auditDBCred"
-
-auditdbCred=`grep '^XAAUDIT.DB.PASSWORD' ${install_dir}/install.properties |
awk -F= '{ print $2 }'`
-
-create_jceks ${auditCredAlias} ${auditdbCred} ${CredFile}
-
-
#
# Generate Credential Provider file and Credential for SSL KEYSTORE AND
TRUSTSTORE
#
-
-
sslkeystoreAlias="sslKeyStore"
sslkeystoreCred=`head -1 /etc/xasecure/ssl/certs/${repoName}.maze`
create_jceks ${sslkeystoreAlias} ${sslkeystoreCred} ${CredFile}
-
-
ssltruststoreAlias="sslTrustStore"
ssltruststoreCred=`grep '^SSL_TRUSTSTORE_PASSWORD'
${install_dir}/install.properties | awk -F= '{ print $2 }'`
http://git-wip-us.apache.org/repos/asf/ranger/blob/a8b4976d/hdfs-agent/scripts/install.sh
--
diff --git a/hdfs-agent/scripts/install.sh b/hdfs-agent/scripts/install.sh
index ea88546..302faa0 100644
--- a/hdfs-agent/scripts/install.sh
+++ b/hdfs-agent/scripts/install.sh
@@ -227,22 +227,9 @@ then
fi
#
-# Generate Credential Provider file and Credential for Audit DB access.
-#
-
-
-auditCredAlias="auditDBCred"
-
-auditdbCred=`grep '^XAAUDIT.DB.PASSWORD' ${install_dir}/install.properties |
awk -F= '{ print $2 }'`
-
-create_jceks ${auditCredAlias} ${auditdbCred} ${CredFile}
-
-
-#
# Generate Credential Provider file and Credential for SSL KEYSTORE AND
TRUSTSTORE
#
-
sslkeystoreAlias="sslKeyStore"
sslkeystoreCred=`grep '^SSL_KEYSTORE_PASSWORD'
${install_dir}/install.properties | awk -F= '{ print $2 }'`
http://git-wip-us.apache.org/repos/asf/ranger/blob/a8b4976d/hive-agent/scripts/install.sh
--
diff --git a/hive-agent/scripts/install.sh b/hive-agent/scripts/install.sh
index fa19634..6a8a8a7 100644
--- a/hive-agent/scripts/install.sh
+++ b/hive-agent/scripts/install.sh
@@ -205,22 +205,9 @@ then
fi
#
-# Generate Credential Provider file and Credential for Audit DB access.
-#
-
-
-auditCredAlias="auditDBCred"
-
-auditdbCred=`grep '^XAAUDIT.DB.PASSWORD' ${install_dir}/install.properties |
awk -F= '{ print $2 }'`
-
-create_jceks ${auditCredAlias} ${auditdbCred} ${CredFile}
-
-
-#
# Generate Credential Provider file and Credential for SSL KEYSTORE AND
TRUSTSTORE
#
-
s
ranger git commit: RANGER-1547:The XmlConfigChanger does not have any error messages when some exceptions occur
Repository: ranger
Updated Branches:
refs/heads/master 42e050157 -> 95b2912e9
RANGER-1547:The XmlConfigChanger does not have any error messages when some
exceptions occur
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/95b2912e
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/95b2912e
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/95b2912e
Branch: refs/heads/master
Commit: 95b2912e93a69fac4bc1081b49cf62f46c78d176
Parents: 42e0501
Author: zhangqiang2
Authored: Thu May 11 04:56:10 2017 -0400
Committer: zhangqiang2
Committed: Thu May 11 07:59:20 2017 -0400
--
.../ranger/utils/install/XmlConfigChanger.java | 68 ++--
1 file changed, 18 insertions(+), 50 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/95b2912e/agents-installer/src/main/java/org/apache/ranger/utils/install/XmlConfigChanger.java
--
diff --git
a/agents-installer/src/main/java/org/apache/ranger/utils/install/XmlConfigChanger.java
b/agents-installer/src/main/java/org/apache/ranger/utils/install/XmlConfigChanger.java
index ba949bd..270e521 100644
---
a/agents-installer/src/main/java/org/apache/ranger/utils/install/XmlConfigChanger.java
+++
b/agents-installer/src/main/java/org/apache/ranger/utils/install/XmlConfigChanger.java
@@ -53,23 +53,22 @@ import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
public class XmlConfigChanger {
-
+
private static final String EMPTY_TOKEN = "%EMPTY%";
private static final String EMPTY_TOKEN_VALUE = "";
-
+
public static final String ROOT_NODE_NAME = "configuration";
public static final String NAME_NODE_NAME = "name";
public static final String PROPERTY_NODE_NAME = "property";
public static final String VALUE_NODE_NAME = "value";
-
+
private File inpFile;
private File outFile;
private File confFile;
private File propFile;
private Document doc;
-
-
+ Properties installProperties = new Properties();
public static void main(String[] args) {
XmlConfigChanger xmlConfigChanger = new XmlConfigChanger();
@@ -85,10 +84,7 @@ public class XmlConfigChanger {
System.exit(1);
}
}
-
-
-
-
+
@SuppressWarnings("static-access")
public void parseConfig(String[] args) {
@@ -157,13 +153,8 @@ public class XmlConfigChanger {
}
}
-
-
-
public void run() throws ParserConfigurationException, SAXException,
IOException, TransformerException {
-
-
loadInstallProperties();
DocumentBuilderFactory factory =
DocumentBuilderFactory.newInstance();
@@ -172,39 +163,31 @@ public class XmlConfigChanger {
factory.setFeature("http://xml.org/sax/features/external-parameter-entities";,
false);
DocumentBuilder builder = factory.newDocumentBuilder();
doc = builder.parse(inpFile);
-
+
BufferedReader reader = null;
try {
reader = new BufferedReader(new FileReader(confFile));
-
+
String line = null;
-
+
@SuppressWarnings("unused")
int lineNo = 0;
Properties variables = new Properties();
while ((line = reader.readLine()) != null) {
-
lineNo++;
-
line = line.trim();
-
if (line.isEmpty() )
continue;
if (line.startsWith("#")) {
continue;
}
-
if (line.contains("#")) {
int len = line.indexOf("#");
line = line.substring(0,len);
}
-
String[] tokens = line.split("\\s+");
-
String propName = tokens[0];
-
String propValue = null;
-
try {
if
(propnameContainsVariables(propName)) {
ranger git commit: RANGER-1568:Similar to RANGER-1540, the Ranger UserSync should also support the same new feature.
Repository: ranger
Updated Branches:
refs/heads/master 6f51d062a -> 42e050157
RANGER-1568:Similar to RANGER-1540, the Ranger UserSync should also support the
same new feature.
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/42e05015
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/42e05015
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/42e05015
Branch: refs/heads/master
Commit: 42e050157b55a9a5bef1f2d913e8c5f0351364ab
Parents: 6f51d06
Author: peng.jianhua
Authored: Tue May 9 22:51:31 2017 -0400
Committer: zhangqiang2
Committed: Thu May 11 05:21:15 2017 -0400
--
unixauthservice/conf.dist/log4j.properties | 2 +-
unixauthservice/scripts/ranger-usersync-services.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/42e05015/unixauthservice/conf.dist/log4j.properties
--
diff --git a/unixauthservice/conf.dist/log4j.properties
b/unixauthservice/conf.dist/log4j.properties
index dbad541..b022b51 100644
--- a/unixauthservice/conf.dist/log4j.properties
+++ b/unixauthservice/conf.dist/log4j.properties
@@ -21,7 +21,7 @@ log4j.rootLogger = info,logFile
# logFile
log4j.appender.logFile=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.logFile.file=${logdir}/usersync.log
+log4j.appender.logFile.file=${logdir}/usersync-${hostname}-${user}.log
log4j.appender.logFile.datePattern='.'-MM-dd
log4j.appender.logFile.layout=org.apache.log4j.PatternLayout
log4j.appender.logFile.layout.ConversionPattern=%d{dd MMM HH:mm:ss} %5p
%c{1} [%t] - %m%n
http://git-wip-us.apache.org/repos/asf/ranger/blob/42e05015/unixauthservice/scripts/ranger-usersync-services.sh
--
diff --git a/unixauthservice/scripts/ranger-usersync-services.sh
b/unixauthservice/scripts/ranger-usersync-services.sh
index ade10ea..97f5708 100644
--- a/unixauthservice/scripts/ranger-usersync-services.sh
+++ b/unixauthservice/scripts/ranger-usersync-services.sh
@@ -76,7 +76,7 @@ if [ "${action}" == "START" ]; then
fi
fi
SLEEP_TIME_AFTER_START=5
- nohup java -Dproc_rangerusersync
-Dlog4j.configuration=file:/etc/ranger/usersync/conf/log4j.properties
${JAVA_OPTS} -Dlogdir="${logdir}" -cp "${cp}"
org.apache.ranger.authentication.UnixAuthenticationService -enableUnixAuth >
${logdir}/auth.log 2>&1 &
+ nohup java -Dproc_rangerusersync
-Dlog4j.configuration=file:/etc/ranger/usersync/conf/log4j.properties
${JAVA_OPTS} -Duser=${USER} -Dhostname=${HOSTNAME} -Dlogdir="${logdir}" -cp
"${cp}" org.apache.ranger.authentication.UnixAuthenticationService
-enableUnixAuth > ${logdir}/auth.log 2>&1 &
VALUE_OF_PID=$!
echo "Starting Apache Ranger Usersync Service"
sleep $SLEEP_TIME_AFTER_START
ranger git commit: RANGER-1564:The SQL_CONNECTOR_JAR properity had been deleted in RANGER-1387. The invalid code should also be deleted to keep the code consistent
Repository: ranger
Updated Branches:
refs/heads/master 4f7519293 -> 6f51d062a
RANGER-1564:The SQL_CONNECTOR_JAR properity had been deleted in RANGER-1387.
The invalid code should also be deleted to keep the code consistent
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/6f51d062
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/6f51d062
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/6f51d062
Branch: refs/heads/master
Commit: 6f51d062a6e698d4100e7725c31782b35182c7b4
Parents: 4f75192
Author: peng.jianhua
Authored: Wed May 10 03:57:58 2017 -0400
Committer: zhangqiang2
Committed: Wed May 10 21:38:57 2017 -0400
--
agents-common/scripts/enable-agent.sh | 70 +++---
1 file changed, 16 insertions(+), 54 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/6f51d062/agents-common/scripts/enable-agent.sh
--
diff --git a/agents-common/scripts/enable-agent.sh
b/agents-common/scripts/enable-agent.sh
index 14e9577..d13875c 100755
--- a/agents-common/scripts/enable-agent.sh
+++ b/agents-common/scripts/enable-agent.sh
@@ -517,64 +517,41 @@ fi
#
# Create library link
#
-
if [ "${action}" = "enable" ]
then
-
- #if [ -d "${PROJ_LIB_DIR}" ]
- #then
- dt=`date '+%Y%m%d%H%M%S'`
-for f in ${PROJ_LIB_DIR}/*
-do
- if [ -f "${f}" ] || [ -d "${f}" ]
- then
- bn=`basename $f`
- if [ -f ${HCOMPONENT_LIB_DIR}/${bn} ] || [ -d
${HCOMPONENT_LIB_DIR}/${bn} ]
- then
- log "Saving lib file: ${HCOMPONENT_LIB_DIR}/${bn} to
${HCOMPONENT_LIB_DIR}/.${bn}.${dt} ..."
- mv ${HCOMPONENT_LIB_DIR}/${bn}
${HCOMPONENT_LIB_DIR}/.${bn}.${dt}
- fi
- if [ ! -f ${HCOMPONENT_LIB_DIR}/${bn} ] && [ ! -d
${HCOMPONENT_LIB_DIR}/${bn} ]
- then
- ln -s ${f} ${HCOMPONENT_LIB_DIR}/${bn}
- fi
-fi
-done
- # ADD SQL CONNECTOR JAR TO PLUGIN DEPENDENCY JAR FOLDER
- dbJar=$(getInstallProperty 'SQL_CONNECTOR_JAR')
- if [ -f "${dbJar}" ]
- then
- bn=`basename ${dbJar}`
- if [ -f ${PROJ_LIB_PLUGIN_DIR}/${bn} ]
+ dt=`date '+%Y%m%d%H%M%S'`
+ for f in ${PROJ_LIB_DIR}/*
+ do
+ if [ -f "${f}" ] || [ -d "${f}" ]
+ then
+ bn=`basename $f`
+ if [ -f ${HCOMPONENT_LIB_DIR}/${bn} ] || [ -d
${HCOMPONENT_LIB_DIR}/${bn} ]
then
- rm ${PROJ_LIB_PLUGIN_DIR}/${bn}
+ log "Saving lib file:
${HCOMPONENT_LIB_DIR}/${bn} to ${HCOMPONENT_LIB_DIR}/.${bn}.${dt} ..."
+ mv ${HCOMPONENT_LIB_DIR}/${bn}
${HCOMPONENT_LIB_DIR}/.${bn}.${dt}
fi
- if [ ! -f ${PROJ_LIB_PLUGIN_DIR}/${bn} ]
+ if [ ! -f ${HCOMPONENT_LIB_DIR}/${bn} ] && [ ! -d
${HCOMPONENT_LIB_DIR}/${bn} ]
then
- ln -s ${dbJar} ${PROJ_LIB_PLUGIN_DIR}/${bn}
+ ln -s ${f} ${HCOMPONENT_LIB_DIR}/${bn}
fi
fi
-
- #fi
+ done
#
# Encrypt the password and keep it secure in Credential Provider API
#
-
CredFile=${CREDENTIAL_PROVIDER_FILE}
-
if ! [ `echo ${CredFile} | grep '^/.*'` ]
then
- echo "ERROR:Please enter the Credential File Store with proper file
path"
- exit 1
+ echo "ERROR:Please enter the Credential File Store with proper
file path"
+ exit 1
fi
-
+
pardir=`dirname ${CredFile}`
if [ ! -d "${pardir}" ]
then
mkdir -p "${pardir}"
-
if [ $? -ne 0 ]
then
echo "ERROR: Unable to create credential store file path"
@@ -586,42 +563,27 @@ then
#
# Generate Credential Provider file and Credential for Audit DB access.
#
-
-
auditCredAlias="auditDBCred"
-
auditdbCred=$(getInstallProperty 'XAAUDIT.DB.PASSWORD')
-
if [ "${auditdbCred}" != "" ]; then
create_jceks "${auditCredAlias}" "${auditdbCred}"
"${CredFile}"
fi
-
-
+
#
# Generate Credential Provider file and Credential for SSL KEYSTORE AND
TRUSTSTORE
#
-
-
sslkeystoreAlia
ranger git commit: RANGER-1541:The assignment logic is inconsistent for the value of the RANGER_ADMIN_HOME variable in Ranger Admin. It will cause a serious failure.
Repository: ranger
Updated Branches:
refs/heads/master 7019d3c6b -> 095c358b5
RANGER-1541:The assignment logic is inconsistent for the value of the
RANGER_ADMIN_HOME variable in Ranger Admin. It will cause a serious failure.
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/095c358b
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/095c358b
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/095c358b
Branch: refs/heads/master
Commit: 095c358b5aac6178cd60d73a429f2d6f7bd10cdc
Parents: 7019d3c
Author: zhangqiang2
Authored: Tue Apr 25 02:38:49 2017 -0400
Committer: zhangqiang2
Committed: Tue May 9 21:33:21 2017 -0400
--
security-admin/scripts/db_setup.py | 9 +++--
security-admin/scripts/dba_script.py | 10 --
2 files changed, 7 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/095c358b/security-admin/scripts/db_setup.py
--
diff --git a/security-admin/scripts/db_setup.py
b/security-admin/scripts/db_setup.py
index b2b29ee..b5ab132 100644
--- a/security-admin/scripts/db_setup.py
+++ b/security-admin/scripts/db_setup.py
@@ -38,12 +38,9 @@ retryPatchAfterSeconds=120
is_unix = os_name == "LINUX" or os_name == "DARWIN"
-if is_unix:
- RANGER_ADMIN_HOME = os.getenv("RANGER_ADMIN_HOME")
- if RANGER_ADMIN_HOME is None:
- RANGER_ADMIN_HOME = os.getcwd()
-elif os_name == "WINDOWS":
- RANGER_ADMIN_HOME = os.getenv("RANGER_ADMIN_HOME")
+RANGER_ADMIN_HOME = os.getenv("RANGER_ADMIN_HOME")
+if RANGER_ADMIN_HOME is None:
+ RANGER_ADMIN_HOME = os.getcwd()
if socket.getfqdn().find('.')>=0:
client_host=socket.getfqdn()
http://git-wip-us.apache.org/repos/asf/ranger/blob/095c358b/security-admin/scripts/dba_script.py
--
diff --git a/security-admin/scripts/dba_script.py
b/security-admin/scripts/dba_script.py
index a4f6c97..c71ca42 100644
--- a/security-admin/scripts/dba_script.py
+++ b/security-admin/scripts/dba_script.py
@@ -35,12 +35,10 @@ is_unix = os_name == "LINUX" or os_name == "DARWIN"
jisql_debug=True
masked_pwd_string=''
-if is_unix:
- RANGER_ADMIN_HOME = os.getenv("RANGER_ADMIN_HOME")
- if RANGER_ADMIN_HOME is None:
- RANGER_ADMIN_HOME = os.getcwd()
-elif os_name == "WINDOWS":
- RANGER_ADMIN_HOME = os.getenv("RANGER_ADMIN_HOME")
+
+RANGER_ADMIN_HOME = os.getenv("RANGER_ADMIN_HOME")
+if RANGER_ADMIN_HOME is None:
+ RANGER_ADMIN_HOME = os.getcwd()
RANGER_ADMIN_CONF = os.getenv("RANGER_ADMIN_CONF")
if RANGER_ADMIN_CONF is None:
ranger git commit: RANGER-1540:Log is very important for big data platform. The main purpose of log analysis is that we need to know who is running the service, in which machine running service, which
Repository: ranger
Updated Branches:
refs/heads/master 13f01c82b -> 87bc2e786
RANGER-1540:Log is very important for big data platform. The main purpose of
log analysis is that we need to know who is running the service, in which
machine running service, which service out of the problem. The ranger security
admin should support the feature.
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/87bc2e78
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/87bc2e78
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/87bc2e78
Branch: refs/heads/master
Commit: 87bc2e786cc2159aae274998c8ae52719b06b798
Parents: 13f01c8
Author: peng.jianhua
Authored: Thu May 4 01:24:24 2017 -0400
Committer: zhangqiang2
Committed: Sun May 7 21:10:35 2017 -0400
--
embeddedwebserver/scripts/ranger-admin-services.sh | 6 +++---
security-admin/src/main/webapp/WEB-INF/log4j.properties | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/87bc2e78/embeddedwebserver/scripts/ranger-admin-services.sh
--
diff --git a/embeddedwebserver/scripts/ranger-admin-services.sh
b/embeddedwebserver/scripts/ranger-admin-services.sh
index f2d2bf5..a81219b 100755
--- a/embeddedwebserver/scripts/ranger-admin-services.sh
+++ b/embeddedwebserver/scripts/ranger-admin-services.sh
@@ -74,7 +74,7 @@ fi
SERVER_NAME=rangeradmin
start() {
SLEEP_TIME_AFTER_START=5
- nohup java -Dproc_rangeradmin ${JAVA_OPTS} ${DB_SSL_PARAM}
-Dservername=${SERVER_NAME} -Dlogdir=${RANGER_ADMIN_LOG_DIR}
-Dcatalina.base=${XAPOLICYMGR_EWS_DIR} -cp
"${XAPOLICYMGR_EWS_DIR}/webapp/WEB-INF/classes/conf:${XAPOLICYMGR_EWS_DIR}/lib/*:${RANGER_JAAS_LIB_DIR}/*:${RANGER_JAAS_CONF_DIR}:${JAVA_HOME}/lib/*:${RANGER_HADOOP_CONF_DIR}/*:$CLASSPATH"
org.apache.ranger.server.tomcat.EmbeddedServer >
${RANGER_ADMIN_LOG_DIR}/catalina.out 2>&1 &
+ nohup java -Dproc_rangeradmin ${JAVA_OPTS} -Duser=${USER}
-Dhostname=${HOSTNAME} ${DB_SSL_PARAM} -Dservername=${SERVER_NAME}
-Dlogdir=${RANGER_ADMIN_LOG_DIR} -Dcatalina.base=${XAPOLICYMGR_EWS_DIR} -cp
"${XAPOLICYMGR_EWS_DIR}/webapp/WEB-INF/classes/conf:${XAPOLICYMGR_EWS_DIR}/lib/*:${RANGER_JAAS_LIB_DIR}/*:${RANGER_JAAS_CONF_DIR}:${JAVA_HOME}/lib/*:${RANGER_HADOOP_CONF_DIR}/*:$CLASSPATH"
org.apache.ranger.server.tomcat.EmbeddedServer >
${RANGER_ADMIN_LOG_DIR}/catalina.out 2>&1 &
VALUE_OF_PID=$!
echo "Starting Apache Ranger Admin Service"
sleep $SLEEP_TIME_AFTER_START
@@ -108,7 +108,7 @@ stop(){
fi
echo "Found Apache Ranger Admin Service with pid $pid, Stopping it..."
- nohup java ${JAVA_OPTS} -Dlogdir=${RANGER_ADMIN_LOG_DIR}
-Dcatalina.base=${XAPOLICYMGR_EWS_DIR} -cp
"${XAPOLICYMGR_EWS_DIR}/webapp/WEB-INF/classes/conf:${XAPOLICYMGR_EWS_DIR}/lib/*:${RANGER_JAAS_LIB_DIR}/*:${RANGER_JAAS_CONF_DIR}:${RANGER_HADOOP_CONF_DIR}/*:$CLASSPATH"
org.apache.ranger.server.tomcat.StopEmbeddedServer >
${RANGER_ADMIN_LOG_DIR}/catalina.out 2>&1
+ nohup java ${JAVA_OPTS} -Duser=${USER} -Dhostname=${HOSTNAME}
-Dlogdir=${RANGER_ADMIN_LOG_DIR} -Dcatalina.base=${XAPOLICYMGR_EWS_DIR} -cp
"${XAPOLICYMGR_EWS_DIR}/webapp/WEB-INF/classes/conf:${XAPOLICYMGR_EWS_DIR}/lib/*:${RANGER_JAAS_LIB_DIR}/*:${RANGER_JAAS_CONF_DIR}:${RANGER_HADOOP_CONF_DIR}/*:$CLASSPATH"
org.apache.ranger.server.tomcat.StopEmbeddedServer >
${RANGER_ADMIN_LOG_DIR}/catalina.out 2>&1
for ((i=0; i<$NR_ITER_FOR_SHUTDOWN_CHECK; i++))
do
sleep $WAIT_TIME_FOR_SHUTDOWN
@@ -137,7 +137,7 @@ stop(){
}
metric(){
- java ${JAVA_OPTS} -Dlogdir=${RANGER_ADMIN_LOG_DIR} -cp
"${XAPOLICYMGR_EWS_DIR}/webapp/WEB-INF/classes/conf:${XAPOLICYMGR_EWS_DIR}/webapp/WEB-INF/classes/:${XAPOLICYMGR_EWS_DIR}/webapp/WEB-INF/classes/lib/*:${XAPOLICYMGR_EWS_DIR}/webapp/WEB-INF/classes/META-INF:${XAPOLICYMGR_EWS_DIR}/webapp/WEB-INF/lib/*:${XAPOLICYMGR_EWS_DIR}/webapp/META-INF:${XAPOLICYMGR_EWS_DIR}/lib/*:${RANGER_JAAS_LIB_DIR}/*:${RANGER_JAAS_CONF_DIR}:${JAVA_HOME}/lib/*:${RANGER_HADOOP_CONF_DIR}/*:$CLASSPATH"
org.apache.ranger.patch.cliutil.MetricUtil ${arg2} ${arg3} 2>/dev/null
+ java ${JAVA_OPTS} -Duser=${USER} -Dhostname=${HOSTNAME}
-Dlogdir=${RANGER_ADMIN_LOG_DIR} -cp
"${XAPOLICYMGR_EWS_DIR}/webapp/WEB-INF/classes/conf:${XAPOLICYMGR_EWS_DIR}/webapp/WEB-INF/classes/:${XAPOLICYMGR_EWS_DIR}/webapp/WEB-INF/classes/lib/*:${XAPOLICYMGR_EWS_DIR}/webapp/WEB-INF/classes/META-INF:${XAPOLICYMGR_EWS_DIR}/webapp/WEB-INF/lib/*:${XAPOLICYMGR_EWS_DIR}/webapp/META-INF:${XAPOLICYMGR_EWS_DIR}/lib/*:${RANGER_JAAS_LIB_DIR}/*:${RANGER_JAAS_CONF_DIR}:${JAVA_HOME}/lib/*:${RANGER_HADOOP_CONF_DIR}/*:$CLASSPATH"
org.apache.ranger.patch.cliutil.MetricUtil ${
ranger git commit: RANGER-1543:Fix the spelling in RangerBaseUdf
Repository: ranger
Updated Branches:
refs/heads/master cd9d1a491 -> e51d992a3
RANGER-1543:Fix the spelling in RangerBaseUdf
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/e51d992a
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/e51d992a
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/e51d992a
Branch: refs/heads/master
Commit: e51d992a36acc1714081163f893539753cb5dddb
Parents: cd9d1a4
Author: zhangqiang2
Authored: Wed Apr 26 09:33:57 2017 +0800
Committer: zhangqiang2
Committed: Wed May 3 04:44:56 2017 -0400
--
.../org/apache/ranger/authorization/hive/udf/RangerBaseUdf.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/e51d992a/ranger-hive-utils/src/main/java/org/apache/ranger/authorization/hive/udf/RangerBaseUdf.java
--
diff --git
a/ranger-hive-utils/src/main/java/org/apache/ranger/authorization/hive/udf/RangerBaseUdf.java
b/ranger-hive-utils/src/main/java/org/apache/ranger/authorization/hive/udf/RangerBaseUdf.java
index 89552da..8bc6b36 100644
---
a/ranger-hive-utils/src/main/java/org/apache/ranger/authorization/hive/udf/RangerBaseUdf.java
+++
b/ranger-hive-utils/src/main/java/org/apache/ranger/authorization/hive/udf/RangerBaseUdf.java
@@ -87,8 +87,8 @@ public abstract class RangerBaseUdf extends GenericUDF {
*/
abstract class AbstractTransformer {
/**
- * Initialzie the transformer object
- * @param arguments arguments given to GenericUDF.initialzie()
+ * Initialize the transformer object
+ * @param arguments arguments given to GenericUDF.initialize()
* @param startIdx index into array, from which the transformer should read
values
*/
abstract void init(ObjectInspector[] arguments, int startIdx);
ranger git commit: RANGER-1534:Fix the spelling in HiveConnectionMgr
Repository: ranger
Updated Branches:
refs/heads/master 37667d7fa -> a02901c6f
RANGER-1534:Fix the spelling in HiveConnectionMgr
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/a02901c6
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/a02901c6
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/a02901c6
Branch: refs/heads/master
Commit: a02901c6f613a9bc3d10c31869400496c254b01b
Parents: 37667d7
Author: zhangqiang2
Authored: Fri Apr 21 15:19:36 2017 +0800
Committer: zhangqiang2
Committed: Tue Apr 25 20:44:44 2017 -0400
--
.../org/apache/ranger/services/hive/client/HiveConnectionMgr.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/a02901c6/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveConnectionMgr.java
--
diff --git
a/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveConnectionMgr.java
b/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveConnectionMgr.java
index 9376358..5d7c8e5 100644
---
a/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveConnectionMgr.java
+++
b/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveConnectionMgr.java
@@ -90,7 +90,7 @@ public class HiveConnectionMgr {
} catch(Exception e) {
hiveConnectionCache.remove(serviceName);
/*
-* There is a possiblity that
some other thread is also using this connection that we are going to close but
+* There is a possibility that
some other thread is also using this connection that we are going to close but
* presumably the connection is
bad which is why we are closing it, so damage should not be much.
*/
hiveClient.close();
ranger git commit: RANGER-1536:Error information in the printed logs
Repository: ranger
Updated Branches:
refs/heads/master c41f19e47 -> 3bc1229ff
RANGER-1536:Error information in the printed logs
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/3bc1229f
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/3bc1229f
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/3bc1229f
Branch: refs/heads/master
Commit: 3bc1229ffd098e28e323eeaed47040277955dccb
Parents: c41f19e
Author: zhangqiang2
Authored: Sat Apr 22 16:01:57 2017 +0800
Committer: zhangqiang2
Committed: Mon Apr 24 21:37:47 2017 -0400
--
.../src/main/java/org/apache/ranger/plugin/client/BaseClient.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/3bc1229f/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 941c118..485ac04 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
@@ -81,7 +81,7 @@ public abstract class BaseClient {
String nameRules = configHolder.getNameRules();
if(StringUtils.isEmpty(nameRules)){
if(LOG.isDebugEnabled()){
-LOG.debug("Name is empty. Setting Name
Rule as 'DEFAULT'");
+LOG.debug("Name Rule is empty. Setting
Name Rule as 'DEFAULT'");
}
nameRules = DEFAULT_NAME_RULE;
}
ranger git commit: RANGER-1539-Improve, modify print log display method name
Repository: ranger
Updated Branches:
refs/heads/master 8751791d8 -> c41f19e47
RANGER-1539-Improve, modify print log display method name
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/c41f19e4
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/c41f19e4
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/c41f19e4
Branch: refs/heads/master
Commit: c41f19e47d4e35520eae15b181a4d05baed5ad48
Parents: 8751791
Author: zhangqiang2
Authored: Mon Apr 24 11:19:54 2017 +0800
Committer: zhangqiang2
Committed: Mon Apr 24 21:30:18 2017 -0400
--
.../org/apache/ranger/services/hdfs/client/HdfsClient.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/c41f19e4/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsClient.java
--
diff --git
a/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsClient.java
b/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsClient.java
index cd5c013..cab1b52 100644
---
a/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsClient.java
+++
b/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsClient.java
@@ -201,7 +201,7 @@ public class HdfsClient extends BaseClient {
public static Map connectionTest(String serviceName,
Map configs) throws Exception {
- LOG.info("===> HdfsClient.testConnection()" );
+ LOG.info("===> HdfsClient.connectionTest()" );
Map responseData = new HashMap();
boolean connectivityStatus = false;
@@ -220,7 +220,7 @@ public class HdfsClient extends BaseClient {
try {
testResult = connectionObj.listFiles("/",
null,null);
} catch (HadoopException e) {
- LOG.error("<== HdfsClient.testConnection()
error " + e.getMessage(),e );
+ LOG.error("<== HdfsClient.connectionTest()
error " + e.getMessage(),e );
throw e;
}
@@ -244,7 +244,7 @@ public class HdfsClient extends BaseClient {
generateResponseDataMap(connectivityStatus,
testconnMsg, additionalMsg,
null, null, responseData);
}
- LOG.info("<== HdfsClient.testConnection(): Status " +
testconnMsg );
+ LOG.info("<== HdfsClient.connectionTest(): Status " +
testconnMsg );
return responseData;
}
ranger git commit: RANGER-1538-Duplicated code,in AtlasClient class for client = Client.create();
Repository: ranger
Updated Branches:
refs/heads/master fd5972967 -> 8751791d8
RANGER-1538-Duplicated code,in AtlasClient class for client = Client.create();
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/8751791d
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/8751791d
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/8751791d
Branch: refs/heads/master
Commit: 8751791d8dae25f2dd6f2499e8f766c5763677db
Parents: fd59729
Author: zhangqiang2
Authored: Mon Apr 24 11:17:15 2017 +0800
Committer: zhangqiang2
Committed: Mon Apr 24 21:27:56 2017 -0400
--
.../java/org/apache/ranger/services/atlas/client/AtlasClient.java | 1 -
1 file changed, 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/8751791d/plugin-atlas/src/main/java/org/apache/ranger/services/atlas/client/AtlasClient.java
--
diff --git
a/plugin-atlas/src/main/java/org/apache/ranger/services/atlas/client/AtlasClient.java
b/plugin-atlas/src/main/java/org/apache/ranger/services/atlas/client/AtlasClient.java
index 62b67dc..116fceb 100644
---
a/plugin-atlas/src/main/java/org/apache/ranger/services/atlas/client/AtlasClient.java
+++
b/plugin-atlas/src/main/java/org/apache/ranger/services/atlas/client/AtlasClient.java
@@ -545,7 +545,6 @@ public class AtlasClient extends BaseClient {
ClientResponse statusResponse = null;
ClientResponse resultResponse = null;
try {
- client = Client.create();
statusResponse = getStatusResponse(client);
if (statusResponse != null) {
if (LOG.isDebugEnabled()) {
ranger git commit: RANGER-1525:Some users hope that the execute programs and install configuration file of the Ranger Admin can be deployed separately when they integrate Ranger into the big data plat
Repository: ranger
Updated Branches:
refs/heads/master 27bd3fe5c -> fd5972967
RANGER-1525:Some users hope that the execute programs and install configuration
file of the Ranger Admin can be deployed separately when they integrate Ranger
into the big data platform or business systems to uniform install Ranger.
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/fd597296
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/fd597296
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/fd597296
Branch: refs/heads/master
Commit: fd597296756c0680e136439271c05d1ff38d86c9
Parents: 27bd3fe
Author: peng.jianhua
Authored: Mon Apr 24 08:33:28 2017 +0800
Committer: zhangqiang2
Committed: Mon Apr 24 20:47:59 2017 -0400
--
security-admin/scripts/db_setup.py | 11 +--
security-admin/scripts/dba_script.py | 11 +--
security-admin/scripts/setup.sh | 2 +-
3 files changed, 19 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/fd597296/security-admin/scripts/db_setup.py
--
diff --git a/security-admin/scripts/db_setup.py
b/security-admin/scripts/db_setup.py
index 6e79151..b2b29ee 100644
--- a/security-admin/scripts/db_setup.py
+++ b/security-admin/scripts/db_setup.py
@@ -50,6 +50,13 @@ if socket.getfqdn().find('.')>=0:
else:
client_host=socket.gethostbyaddr(socket.gethostname())[0]
+RANGER_ADMIN_CONF = os.getenv("RANGER_ADMIN_CONF")
+if RANGER_ADMIN_CONF is None:
+ if is_unix:
+ RANGER_ADMIN_CONF = RANGER_ADMIN_HOME
+ elif os_name == "WINDOWS":
+ RANGER_ADMIN_CONF = os.path.join(RANGER_ADMIN_HOME,'bin')
+
def check_output(query):
if is_unix:
p = subprocess.Popen(shlex.split(query), stdout=subprocess.PIPE)
@@ -73,9 +80,9 @@ def log(msg,type):
def populate_global_dict():
global globalDict
if is_unix:
- read_config_file =
open(os.path.join(RANGER_ADMIN_HOME,'install.properties'))
+ read_config_file =
open(os.path.join(RANGER_ADMIN_CONF,'install.properties'))
elif os_name == "WINDOWS":
- read_config_file =
open(os.path.join(RANGER_ADMIN_HOME,'bin','install_config.properties'))
+ read_config_file =
open(os.path.join(RANGER_ADMIN_CONF,'install_config.properties'))
library_path = os.path.join(RANGER_ADMIN_HOME,"cred","lib","*")
for each_line in read_config_file.read().split('\n') :
each_line = each_line.strip();
http://git-wip-us.apache.org/repos/asf/ranger/blob/fd597296/security-admin/scripts/dba_script.py
--
diff --git a/security-admin/scripts/dba_script.py
b/security-admin/scripts/dba_script.py
index 83d6fe7..a4f6c97 100644
--- a/security-admin/scripts/dba_script.py
+++ b/security-admin/scripts/dba_script.py
@@ -42,6 +42,13 @@ if is_unix:
elif os_name == "WINDOWS":
RANGER_ADMIN_HOME = os.getenv("RANGER_ADMIN_HOME")
+RANGER_ADMIN_CONF = os.getenv("RANGER_ADMIN_CONF")
+if RANGER_ADMIN_CONF is None:
+ if is_unix:
+ RANGER_ADMIN_CONF = RANGER_ADMIN_HOME
+ elif os_name == "WINDOWS":
+ RANGER_ADMIN_CONF = os.path.join(RANGER_ADMIN_HOME,'bin')
+
def check_output(query):
if is_unix:
p = subprocess.Popen(shlex.split(query), stdout=subprocess.PIPE)
@@ -65,9 +72,9 @@ def log(msg,type):
def populate_global_dict():
global globalDict
if is_unix:
- read_config_file =
open(os.path.join(RANGER_ADMIN_HOME,'install.properties'))
+ read_config_file =
open(os.path.join(RANGER_ADMIN_CONF,'install.properties'))
elif os_name == "WINDOWS":
- read_config_file =
open(os.path.join(RANGER_ADMIN_HOME,'bin','install_config.properties'))
+ read_config_file =
open(os.path.join(RANGER_ADMIN_CONF,'install_config.properties'))
library_path = os.path.join(RANGER_ADMIN_HOME,"cred","lib","*")
for cireach_line in read_config_file.read().split('\n') :
each_line = cireach_line.strip()
http://git-wip-us.apache.org/repos/asf/ranger/blob/fd597296/security-admin/scripts/setup.sh
--
diff --git a/security-admin/scripts/setup.sh b/security-admin/scripts/setup.sh
index e77b2a9..3b259a0 100755
--- a/security-admin/scripts/setup.sh
+++ b/security-admin/scripts/setup.sh
@@ -42,7 +42,7 @@ get_prop(){
fi
}
-PROPFILE=$PWD/install.properties
+PROPFILE=${RANGER_ADMIN_CONF:-$PWD}/install.properties
if [ ! -f "${PROPFILE}" ]; then
echo "$PROPFILE file not found!
ranger git commit: RANGER-1520:Some codes do not follow the python language development rules in usersync. They are messy.
Repository: ranger
Updated Branches:
refs/heads/master 9f0cfcfc0 -> 770f274d0
RANGER-1520:Some codes do not follow the python language development rules in
usersync. They are messy.
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/770f274d
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/770f274d
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/770f274d
Branch: refs/heads/master
Commit: 770f274d04f1a438b90d3cb6643d587558f6bbf7
Parents: 9f0cfcf
Author: zhangqiang2
Authored: Wed Apr 19 23:49:00 2017 -0400
Committer: zhangqiang2
Committed: Fri Apr 21 22:16:56 2017 -0400
--
unixauthservice/scripts/setup.py | 754 +-
1 file changed, 387 insertions(+), 367 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/770f274d/unixauthservice/scripts/setup.py
--
diff --git a/unixauthservice/scripts/setup.py b/unixauthservice/scripts/setup.py
index d7872ea..bbc9226 100755
--- a/unixauthservice/scripts/setup.py
+++ b/unixauthservice/scripts/setup.py
@@ -18,7 +18,7 @@ import re
import StringIO
import xml.etree.ElementTree as ET
import ConfigParser
-import os,errno,sys,getopt
+import os, errno, sys, getopt
import sys
from os import listdir
from os.path import isfile, join, dirname, basename
@@ -27,15 +27,16 @@ from time import gmtime, strftime, localtime
from xml import etree
import shutil
import pwd, grp
+
globalDict = {}
if (not 'JAVA_HOME' in os.environ):
- print "ERROR: JAVA_HOME environment variable is not defined. Please
define JAVA_HOME before running this script"
- sys.exit(1)
+print "ERROR: JAVA_HOME environment variable is not defined. Please define
JAVA_HOME before running this script"
+sys.exit(1)
debugLevel = 1
generateXML = 0
-#logFolderName = '/var/log/ranger'
+# logFolderName = '/var/log/ranger'
initdDirName = '/etc/init.d'
rangerBaseDirName = '/etc/ranger'
@@ -48,21 +49,21 @@ defaultCertFileName = 'unixauthservice.jks'
outputFileName = 'ranger-ugsync-site.xml'
installPropFileName = 'install.properties'
defaultSiteXMLFileName = 'ranger-ugsync-default.xml'
-log4jFileName = 'log4j.properties'
+log4jFileName = 'log4j.properties'
install2xmlMapFileName = 'installprop2xml.properties'
templateFileName = 'ranger-ugsync-template.xml'
initdProgramName = 'ranger-usersync'
-PROP2ALIASMAP = {
'ranger.usersync.ldap.ldapbindpassword':'ranger.usersync.ldap.bindalias',
-
'ranger.usersync.keystore.password':'usersync.ssl.key.password',
-
'ranger.usersync.truststore.password':'usersync.ssl.truststore.password'}
+PROP2ALIASMAP = {'ranger.usersync.ldap.ldapbindpassword':
'ranger.usersync.ldap.bindalias',
+ 'ranger.usersync.keystore.password':
'usersync.ssl.key.password',
+ 'ranger.usersync.truststore.password':
'usersync.ssl.truststore.password'}
RANGER_USERSYNC_HOME = os.getenv("RANGER_USERSYNC_HOME")
if RANGER_USERSYNC_HOME is None:
RANGER_USERSYNC_HOME = os.getcwd()
-installTemplateDirName = join(RANGER_USERSYNC_HOME,'templates')
+installTemplateDirName = join(RANGER_USERSYNC_HOME, 'templates')
confDistDirName = join(RANGER_USERSYNC_HOME, confDistBaseDirName)
-#ugsyncLogFolderName = join(logFolderName, 'usersync')
+# ugsyncLogFolderName = join(logFolderName, 'usersync')
nativeAuthFolderName = join(RANGER_USERSYNC_HOME, 'native')
localConfFolderName = join(RANGER_USERSYNC_HOME, confBaseDirName)
@@ -79,62 +80,66 @@ logFolderPermMode = 0770
rootOwnerId = 0
initPrefixList = ['S99', 'K00']
-SYNC_SOURCE_KEY = 'SYNC_SOURCE'
+SYNC_SOURCE_KEY = 'SYNC_SOURCE'
SYNC_INTERVAL_NEW_KEY = 'ranger.usersync.sleeptimeinmillisbetweensynccycle'
SYNC_SOURCE_UNIX = 'unix'
SYNC_SOURCE_LDAP = 'ldap'
-SYNC_SOURCE_LIST = [ SYNC_SOURCE_UNIX, SYNC_SOURCE_LDAP ]
-SYNC_LDAP_BIND_PASSWORD_KEY = 'ranger.usersync.ldap.ldapbindpassword'
-credUpdateClassName = 'org.apache.ranger.credentialapi.buildks'
+SYNC_SOURCE_LIST = [SYNC_SOURCE_UNIX, SYNC_SOURCE_LDAP]
+SYNC_LDAP_BIND_PASSWORD_KEY = 'ranger.usersync.ldap.ldapbindpassword'
+credUpdateClassName = 'org.apache.ranger.credentialapi.buildks'
ENV_LOGDIR_FILE = 'ranger-usersync-env-logdir.sh'
hadoopConfFileName = 'core-site.xml'
ENV_HADOOP_CONF_FILE = "ranger-usersync-env-hadoopconfdir.sh"
ENV_PID_FILE = 'ranger-usersync-env-piddir.sh'
+
def populate_global_dict():
global globalDict
-read_config_file = open(join(RANGER_USERSYNC_HOME,'install.properties'))
-for each_line in read_config_file.read().split('\n') :
+read_config_file = open(join(RANGER_USERSYNC_HOME, 'install.properties'))
+for each_line in read_config_file.read().spl
ranger git commit: RANGER-1532-Friendly groups page delete function display, and other pages of the same function in sync
Repository: ranger
Updated Branches:
refs/heads/master 9c1ffb104 -> 9f0cfcfc0
RANGER-1532-Friendly groups page delete function display, and other pages of
the same function in sync
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/9f0cfcfc
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/9f0cfcfc
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/9f0cfcfc
Branch: refs/heads/master
Commit: 9f0cfcfc06e281fc5781e09dea2bcfa9e677333c
Parents: 9c1ffb1
Author: zhangqiang2
Authored: Fri Apr 21 09:52:41 2017 +0800
Committer: zhangqiang2
Committed: Fri Apr 21 22:07:01 2017 -0400
--
.../src/main/webapp/scripts/modules/globalize/message/en.js| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/9f0cfcfc/security-admin/src/main/webapp/scripts/modules/globalize/message/en.js
--
diff --git
a/security-admin/src/main/webapp/scripts/modules/globalize/message/en.js
b/security-admin/src/main/webapp/scripts/modules/globalize/message/en.js
index 8f7d5d9..dd5d146 100644
--- a/security-admin/src/main/webapp/scripts/modules/globalize/message/en.js
+++ b/security-admin/src/main/webapp/scripts/modules/globalize/message/en.js
@@ -390,7 +390,7 @@ define(function(require) {
noPolicytoExport:'No policies found to export!',
importingFiles :'Importing policies from file is
started...',
noDeleteUserRow :'Please select user first to
delete.',
-noDeleteGroupRow:'Please select Group first to
delete.',
+noDeleteGroupRow:'Please select group first to
delete.',
plsSelectUserToSetVisibility :' Please select user to set
visibility or selected user is already visible/hidden.',
plsSelectGroupToSetVisibility:' Please select group to set
visibility or selected group is already visible/hidden.',
ranger git commit: RANGER-1526:Error class names in the printed logs
Repository: ranger
Updated Branches:
refs/heads/master acee1c4f7 -> a3d9b0f91
RANGER-1526:Error class names in the printed logs
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/a3d9b0f9
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/a3d9b0f9
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/a3d9b0f9
Branch: refs/heads/master
Commit: a3d9b0f91d2113a1d1977e6f527d70b76c447f08
Parents: acee1c4
Author: zhangqiang2
Authored: Wed Apr 19 17:18:38 2017 +0800
Committer: zhangqiang2
Committed: Thu Apr 20 20:32:55 2017 -0400
--
.../org/apache/ranger/biz/ServiceDBStore.java | 36 ++--
1 file changed, 18 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/a3d9b0f9/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
--
diff --git
a/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
b/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
index 986c37e..33e0e85 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
@@ -283,18 +283,18 @@ public class ServiceDBStore extends AbstractServiceStore {
@Override
public void init() throws Exception {
if (LOG.isDebugEnabled()) {
- LOG.debug("==> ServiceDefDBStore.init()");
+ LOG.debug("==> ServiceDBStore.init()");
}
if (LOG.isDebugEnabled()) {
- LOG.debug("<== ServiceDefDBStore.init()");
+ LOG.debug("<== ServiceDBStore.init()");
}
}
@PostConstruct
public void initStore() {
if (LOG.isDebugEnabled()) {
- LOG.debug("==> ServiceDefDBStore.initStore()");
+ LOG.debug("==> ServiceDBStore.initStore()");
}
if(! legacyServiceDefsInitDone) {
@@ -321,7 +321,7 @@ public class ServiceDBStore extends AbstractServiceStore {
}
});
} catch (Throwable ex) {
-
LOG.fatal("ServiceDefDBStore.initStore(): Failed to update DB: " + ex);
+
LOG.fatal("ServiceDBStore.initStore(): Failed to update DB: " + ex);
}
legacyServiceDefsInitDone = true;
@@ -330,14 +330,14 @@ public class ServiceDBStore extends AbstractServiceStore {
}
if (LOG.isDebugEnabled()) {
- LOG.debug("<== ServiceDefDBStore.initStore()");
+ LOG.debug("<== ServiceDBStore.initStore()");
}
}
@Override
public RangerServiceDef createServiceDef(RangerServiceDef serviceDef)
throws Exception {
if (LOG.isDebugEnabled()) {
- LOG.debug("==> ServiceDefDBStore.createServiceDef(" +
serviceDef + ")");
+ LOG.debug("==> ServiceDBStore.createServiceDef(" +
serviceDef + ")");
}
XXServiceDef xServiceDef = daoMgr.getXXServiceDef().findByName(
@@ -575,7 +575,7 @@ public class ServiceDBStore extends AbstractServiceStore {
postCreate(createdServiceDef);
if (LOG.isDebugEnabled()) {
- LOG.debug("<== ServiceDefDBStore.createServiceDef(" +
serviceDef + "): " + createdServiceDef);
+ LOG.debug("<== ServiceDBStore.createServiceDef(" +
serviceDef + "): " + createdServiceDef);
}
return createdServiceDef;
@@ -584,7 +584,7 @@ public class ServiceDBStore extends AbstractServiceStore {
@Override
public RangerServiceDef updateServiceDef(RangerServiceDef serviceDef)
throws Exception {
if (LOG.isDebugEnabled()) {
- LOG.debug("==> ServiceDefDBStore.updateServiceDef(" +
serviceDef + ")");
+ LOG.debug("==> ServiceDBStore.updateServiceDef(" +
serviceDef + ")");
}
Long serviceDefId = serviceDef.getId();
@@ -634,7 +634,7 @@ public class ServiceDBStore extends AbstractServiceStore {
if (LOG.isDebugEnabled()) {
- LOG.debug("<== ServiceDefDBStore.updateServiceDef(" +
serviceDef + "): " + serviceDef);
+ LOG.debug("<== ServiceDBStore.updateServiceDef(" +
servi
ranger git commit: Ranger-1518:Do some code inprovement
Repository: ranger
Updated Branches:
refs/heads/master dc31b21fc -> 8944052fc
Ranger-1518:Do some code inprovement
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/8944052f
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/8944052f
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/8944052f
Branch: refs/heads/master
Commit: 8944052fc67d262be0c2677f7d0988679a683b88
Parents: dc31b21
Author: zhangqiang2
Authored: Mon Apr 17 13:45:17 2017 +0800
Committer: zhangqiang2
Committed: Tue Apr 18 21:03:18 2017 -0400
--
.../ranger/unixusersync/process/PolicyMgrUserGroupBuilder.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/8944052f/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 070a39b..9ce4abf 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
@@ -372,7 +372,7 @@ public class PolicyMgrUserGroupBuilder implements
UserGroupSink {
// If the rest call to ranger
admin fails,
// propagate the failure to the
caller for retry in next sync cycle.
if (addUserGroupInfo(ugInfo) ==
null) {
- String msg = "Failed to
add add user group info";
+ String msg = "Failed to
add user group info";
LOG.error(msg);
throw new
Exception(msg);
}
@@ -399,7 +399,7 @@ public class PolicyMgrUserGroupBuilder implements
UserGroupSink {
// If the rest call to ranger
admin fails,
// propagate the failure to the
caller for retry in next sync cycle.
if (addUserGroupInfo(ugInfo) ==
null) {
- String msg = "Failed to
add add user group info";
+ String msg = "Failed to
add user group info";
LOG.error(msg);
throw new
Exception(msg);
}
ranger git commit: RANGER-1519:Error occurred after execute enable-hive-plugin.sh
Repository: ranger Updated Branches: refs/heads/master 1bdc28c61 -> dc31b21fc RANGER-1519:Error occurred after execute enable-hive-plugin.sh Signed-off-by: zhangqiang2 Project: http://git-wip-us.apache.org/repos/asf/ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/dc31b21f Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/dc31b21f Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/dc31b21f Branch: refs/heads/master Commit: dc31b21fcda9ca0a1f39af6b90599bf600a88290 Parents: 1bdc28c Author: zhangqiang2 Authored: Tue Apr 18 19:13:42 2017 +0800 Committer: zhangqiang2 Committed: Tue Apr 18 21:00:24 2017 -0400 -- hive-agent/scripts/install.properties | 8 1 file changed, 8 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ranger/blob/dc31b21f/hive-agent/scripts/install.properties -- diff --git a/hive-agent/scripts/install.properties b/hive-agent/scripts/install.properties index 2c109af..3e8f590 100644 --- a/hive-agent/scripts/install.properties +++ b/hive-agent/scripts/install.properties @@ -29,6 +29,14 @@ POLICY_MGR_URL= # REPOSITORY_NAME= +# +# Hive installation directory +# +# Example: +# COMPONENT_INSTALL_DIR_NAME=/var/local/apache-hive-2.1.0-bin +# +COMPONENT_INSTALL_DIR_NAME= + # AUDIT configuration with V3 properties # Enable audit logs to Solr
ranger git commit: RANGER-1508-support-internationalization
Repository: ranger
Updated Branches:
refs/heads/master b25026259 -> 1bdc28c61
RANGER-1508-support-internationalization
Signed-off-by: zhangqiang2
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/1bdc28c6
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/1bdc28c6
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/1bdc28c6
Branch: refs/heads/master
Commit: 1bdc28c61b934895afde923895caf000d1b95979
Parents: b250262
Author: zhangqiang2
Authored: Mon Apr 17 09:15:32 2017 +0800
Committer: zhangqiang2
Committed: Tue Apr 18 20:48:38 2017 -0400
--
.../RangerAuthFailureHandler.java | 26 -
.../java/org/apache/ranger/util/CLIUtil.java| 14 -
.../internationalization/messages.properties| 26 +
.../messages_cs_CZ.properties | 26 +
.../internationalization/messages_de.properties | 26 +
.../messages_es_ES.properties | 26 +
.../internationalization/messages_fr.properties | 26 +
.../internationalization/messages_it.properties | 26 +
.../messages_ko_KR.properties | 26 +
.../internationalization/messages_lt.properties | 26 +
.../internationalization/messages_pl.properties | 26 +
.../messages_pt_BR.properties | 26 +
.../messages_pt_PT.properties | 26 +
.../messages_uk_UA.properties | 26 +
.../messages_zh_CN.properties | 26 +
.../main/webapp/META-INF/applicationContext.xml | 57 ++--
16 files changed, 394 insertions(+), 41 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ranger/blob/1bdc28c6/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthFailureHandler.java
--
diff --git
a/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthFailureHandler.java
b/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthFailureHandler.java
index 580b6bc..35d7543 100644
---
a/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthFailureHandler.java
+++
b/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthFailureHandler.java
@@ -31,6 +31,7 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.log4j.Logger;
import org.apache.ranger.common.JSONUtil;
import org.apache.ranger.common.PropertiesUtil;
+import org.apache.ranger.util.CLIUtil;
import org.apache.ranger.view.VXResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.AuthenticationException;
@@ -73,7 +74,7 @@ ExceptionMappingAuthenticationFailureHandler {
if (logger.isDebugEnabled()) {
logger.debug("commence() X-Requested-With=" + ajaxRequestHeader);
}
-
+
response.setContentType("application/json;charset=UTF-8");
response.setHeader("Cache-Control", "no-cache");
response.setHeader("X-Frame-Options", "DENY");
@@ -81,19 +82,20 @@ ExceptionMappingAuthenticationFailureHandler {
try {
String msg = exception.getMessage();
VXResponse vXResponse = new VXResponse();
- if(msg!=null && !msg.isEmpty()){
- if("Bad credentials".equalsIgnoreCase(msg)){
-
vXResponse.setStatusCode(HttpServletResponse.SC_UNAUTHORIZED);
- vXResponse.setMsgDesc("The username or
password you entered is incorrect..");
- }else if(msg.contains("Could not get JDBC
Connection; nested exception is java.sql.SQLException: Connections could not be
acquired from the underlying database!")){
+ if (msg != null && !msg.isEmpty()) {
+ if
(CLIUtil.getMessage("AbstractUserDetailsAuthenticationProvider.badCredentials",request).equalsIgnoreCase(msg))
{
+
vXResponse.setStatusCode(HttpServletResponse.SC_UNAUTHORIZED);
+ vXResponse.setMsgDesc("The username or password
you entered is incorrect...");
+ logger.info("Error Message : " + msg);
+ } else if (msg.contains("Could not get JDBC
Connection; nested exception is java.sql.SQLException: Connections could not be
acquired from the underlying database!")) {
vXResponse.setStatusCode(HttpServletResponse.SC_UNAUTHORIZED);
-
