ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

sudo tweaks

Browse source
This commit is contained in:
Michael DeHaan 2012-03-28 23:30:31 -04:00
parent 7ae75eb14b
commit 72cc99722d
2 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
lib/ansible/connection.py
View file

@ -83,7 +83,7 @@ class ParamikoConnection(object):
def exec_command(self, cmd, sudoable=True): def exec_command(self, cmd, sudoable=True):
''' run a command on the remote host ''' ''' run a command on the remote host '''
if not False: # if not self.runner.sudo or not sudoable: if not self.runner.sudo or not sudoable:
stdin, stdout, stderr = self.ssh.exec_command(cmd) stdin, stdout, stderr = self.ssh.exec_command(cmd)
return (stdin, stdout, stderr) return (stdin, stdout, stderr)
else: else:
@ -91,15 +91,32 @@ class ParamikoConnection(object):
self.ssh.close() self.ssh.close()
ssh_sudo = self._get_conn() ssh_sudo = self._get_conn()
sudo_chan = ssh_sudo.invoke_shell() sudo_chan = ssh_sudo.invoke_shell()
sudo_chan.exec_command("sudo -s") sudo_chan.send("sudo -s\n")
sudo_chan.recv(1024) sudo_chan.recv(1024)
sudo_chan.send("%s\n" % cmd) sudo_chan.send("echo && %s && echo\n" % cmd)
# TODO: wait for ready... while not sudo_chan.recv_ready():
# TODO: timeout support
time.sleep(1)
out = sudo_chan.recv(1024) out = sudo_chan.recv(1024)
sudo_chan.close() sudo_chan.close()
self.ssh = self._get_conn() self.ssh = self._get_conn()
return (None, "\n".join(out), '') out = self._expect_like(out)
return (None, out, '')
def _expect_like(self, msg):
''' hack to make invoke_shell more or less work for sudo usage '''
lines = msg.split("\n")
index = 0
for x in lines:
if x == '\r':
break
index += 1
index2 = index+1
for x in lines[index:]:
if x == '\r':
break
index2 += 1
return "\n".join(lines[index+1:index2+1]).strip()
def put_file(self, in_path, out_path): def put_file(self, in_path, out_path):
''' transfer a file from local to remote ''' ''' transfer a file from local to remote '''

2
lib/ansible/runner.py
View file

@ -356,7 +356,7 @@ class Runner(object):
cmd = "%s %s" % (remote_module_path, argsfile) cmd = "%s %s" % (remote_module_path, argsfile)
else: else:
cmd = " ".join([str(x) for x in [remote_module_path, async_jid, async_limit, async_module, argsfile]]) cmd = " ".join([str(x) for x in [remote_module_path, async_jid, async_limit, async_module, argsfile]])
return [ self._exec_command(conn, cmd), client_executed_str ] return [ self._exec_command(conn, cmd, sudoable=True), client_executed_str ]
# ***************************************************** # *****************************************************