Skip to content

AMBARI-26569 Added fix for two-way ssl #4112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sunilganatra wants to merge 1 commit into
base: trunk
Choose a base branch
from
+8 −5
Open

AMBARI-26569 Added fix for two-way ssl #4112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ambari-agent/src/main/python/ambari_agent/security.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,23 +247,23 @@ def getSrvrCrtName(self):
def checkCertExists(self):
s = os.path.abspath(self.config.get("security", "keysdir")) + os.sep + "ca.crt"

server_crt_exists = os.path.exists(s)
server_crt_exists = os.path.exists(s) and os.path.getsize(s) > 0

if not server_crt_exists:
logger.info("Server certicate not exists, downloading")
self.loadSrvrCrt()
else:
logger.info("Server certicate exists, ok")

agent_key_exists = os.path.exists(self.getAgentKeyName())
agent_key_exists = os.path.exists(self.getAgentKeyName()) and os.path.getsize(self.getAgentKeyName()) > 0

if not agent_key_exists:
logger.info("Agent key not exists, generating request")
self.genAgentCrtReq(self.getAgentKeyName())
else:
logger.info("Agent key exists, ok")

agent_crt_exists = os.path.exists(self.getAgentCrtName())
agent_crt_exists = os.path.exists(self.getAgentCrtName()) and os.path.getsize(self.getAgentCrtName()) > 0

if not agent_crt_exists:
logger.info("Agent certificate not exists, sending sign request")
Expand All @@ -280,7 +280,7 @@ def loadSrvrCrt(self):
response = stream.read()
stream.close()
srvr_crt_f = open(self.getSrvrCrtName(), "w+")
srvr_crt_f.write(response)
srvr_crt_f.write(response if isinstance(response, str) else response.decode('utf-8'))
srvr_crt_f.close()

def reqSignCrt(self):
Expand All @@ -291,7 +291,7 @@ def reqSignCrt(self):
passphrase_env_var = self.config.get("security", "passphrase_env_var_name")
passphrase = os.environ[passphrase_env_var]
register_data = {"csr": agent_crt_req_content, "passphrase": passphrase}
data = json.dumps(register_data)
data = json.dumps(register_data).encode('utf-8')
proxy_handler = urllib.request.ProxyHandler({})
opener = urllib.request.build_opener(proxy_handler)
urllib.request.install_opener(opener)
Expand Down
3 changes: 3 additions & 0 deletions ambari-agent/src/test/python/ambari_agent/TestSecurity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ def test_getSrvrCrtName(self):
self.assertEqual(res, os.path.abspath("/dummy-keysdir/ca.crt"))

@patch("os.path.exists")
@patch("os.path.getsize")
@patch.object(security.CertificateManager, "loadSrvrCrt")
@patch.object(security.CertificateManager, "getAgentKeyName")
@patch.object(security.CertificateManager, "genAgentCrtReq")
Expand All @@ -169,6 +170,7 @@ def test_checkCertExists(
getAgentKeyName_mock,
loadSrvrCrt_mock,
exists_mock,
getsize_mock,
):
self.config.set("security", "keysdir", "/dummy-keysdir")
getAgentKeyName_mock.return_value = "dummy AgentKeyName"
Expand All @@ -177,6 +179,7 @@ def test_checkCertExists(

# Case when all files exist
exists_mock.side_effect = [True, True, True]
getsize_mock.return_value = 100
man.checkCertExists()
self.assertFalse(loadSrvrCrt_mock.called)
self.assertFalse(genAgentCrtReq_mock.called)
Expand Down