[X2Go-Commits] [x2gobroker] 04/18: x2gobroker/agent.py: Bail out if no hostaddr contained in remote_agent.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gobroker.

commit 69591740eb0f244e4aa88dfc5e076cc071418996
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Apr 30 15:10:18 2018 +0200

    x2gobroker/agent.py: Bail out if no hostaddr contained in remote_agent.
---
 x2gobroker/agent.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py
index 1ee6e37..aba0931 100644
--- a/x2gobroker/agent.py
+++ b/x2gobroker/agent.py
@@ -199,8 +199,12 @@ def _call_remote_broker_agent(username, task, cmdline_args=[], remote_agent=None
     elif 'host_key_policy' not in remote_agent:
         remote_agent['host_key_policy'] = paramiko.WarningPolicy()
 
-    remote_hostname = remote_agent['hostaddr']
-    remote_hostaddr = remote_agent['hostaddr']
+    if 'hostaddr' in remote_agent:
+        remote_hostname = remote_agent['hostaddr']
+        remote_hostaddr = remote_agent['hostaddr']
+    else:
+        raise x2gobroker.x2gobroker_exceptions.X2GoBrokerAgentException('Internal error: The remote_agent dict must always specify a hostaddr key!')
+
     if 'port' in remote_agent:
         remote_port = int(remote_agent['port'])
     else:

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git