You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ec...@apache.org on 2017/07/24 13:43:49 UTC
ambari git commit: AMBARI-21272. LDAP sync requires user to be root -
re-apply due to accident revert (echekanskiy)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 110c8cd6e -> fe761ef7e
AMBARI-21272. LDAP sync requires user to be root - re-apply due to accident revert (echekanskiy)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fe761ef7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fe761ef7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fe761ef7
Branch: refs/heads/branch-2.5
Commit: fe761ef7ee796de450dd71708900184228cbe6e3
Parents: 110c8cd
Author: Eugene Chekanskiy <ec...@apache.org>
Authored: Mon Jul 24 16:42:23 2017 +0300
Committer: Eugene Chekanskiy <ec...@apache.org>
Committed: Mon Jul 24 16:42:23 2017 +0300
----------------------------------------------------------------------
.../src/main/python/ambari_server/setupSecurity.py | 4 ----
ambari-server/src/test/python/TestAmbariServer.py | 13 +------------
2 files changed, 1 insertion(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/fe761ef7/ambari-server/src/main/python/ambari_server/setupSecurity.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/python/ambari_server/setupSecurity.py b/ambari-server/src/main/python/ambari_server/setupSecurity.py
index ea3b9e5..f175d7c 100644
--- a/ambari-server/src/main/python/ambari_server/setupSecurity.py
+++ b/ambari-server/src/main/python/ambari_server/setupSecurity.py
@@ -275,10 +275,6 @@ class LdapSyncOptions:
#
def sync_ldap(options):
logger.info("Sync users and groups with configured LDAP.")
- if not is_root():
- err = 'Ambari-server sync-ldap should be run with ' \
- 'root-level privileges'
- raise FatalException(4, err)
properties = get_ambari_properties()
http://git-wip-us.apache.org/repos/asf/ambari/blob/fe761ef7/ambari-server/src/test/python/TestAmbariServer.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/TestAmbariServer.py b/ambari-server/src/test/python/TestAmbariServer.py
index 1ac77ab2..fb0bb70 100644
--- a/ambari-server/src/test/python/TestAmbariServer.py
+++ b/ambari-server/src/test/python/TestAmbariServer.py
@@ -7747,13 +7747,12 @@ class TestAmbariServer(TestCase):
@patch("urllib2.urlopen")
@patch("urllib2.Request")
@patch("base64.encodestring")
- @patch("ambari_server.setupSecurity.is_root")
@patch("ambari_server.setupSecurity.is_server_runing")
@patch("ambari_server.setupSecurity.get_ambari_properties")
@patch("ambari_server.setupSecurity.get_validated_string_input")
@patch("ambari_server.setupSecurity.logger")
def test_sync_ldap_forbidden(self, logger_mock, get_validated_string_input_method, get_ambari_properties_method,
- is_server_runing_method, is_root_method,
+ is_server_runing_method,
encodestring_method, request_constructor, urlopen_method):
options = self._create_empty_options_mock()
@@ -7762,16 +7761,6 @@ class TestAmbariServer(TestCase):
options.ldap_sync_users = None
options.ldap_sync_groups = None
- is_root_method.return_value = False
- try:
- sync_ldap(options)
- self.fail("Should throw exception if not root")
- except FatalException as fe:
- # Expected
- self.assertTrue("root-level" in fe.reason)
- pass
- is_root_method.return_value = True
-
is_server_runing_method.return_value = (None, None)
try:
sync_ldap(options)