cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Don't fail if a remote_addr with a '/' hits ansible_connection (#49781)

Browse source 
* Fail if a remote_addr with a '/' hist ansible_connection

This is _probably_ a CIDR block, but anything with a slash will fail,
so no need to try to parse to make sure

* Locks are now per-socket_path.

Locks use the same value as socket_path. Locks are also cleaned up in
shutdown like sockets.
This commit is contained in:
Nathaniel Case 2018-12-17 12:53:32 -05:00 committed by GitHub
parent bf4ad56479
commit 61a649ce0f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
bin/ansible-connection
View file

@ -179,6 +179,7 @@ class ConnectionProcess(object):
def shutdown(self): def shutdown(self):
""" Shuts down the local domain socket """ Shuts down the local domain socket
""" """
lock_path = unfrackpath("%s/.ansible_pc_lock_%s" % os.path.split(self.socket_path))
if os.path.exists(self.socket_path): if os.path.exists(self.socket_path):
try: try:
if self.sock: if self.sock:
@ -192,6 +193,10 @@ class ConnectionProcess(object):
os.remove(self.socket_path) os.remove(self.socket_path)
setattr(self.connection, '_socket_path', None) setattr(self.connection, '_socket_path', None)
setattr(self.connection, '_connected', False) setattr(self.connection, '_connected', False)
if os.path.exists(lock_path):
os.remove(lock_path)
display.display('shutdown complete', log_only=True) display.display('shutdown complete', log_only=True)
@ -246,8 +251,8 @@ def main():
tmp_path = unfrackpath(C.PERSISTENT_CONTROL_PATH_DIR) tmp_path = unfrackpath(C.PERSISTENT_CONTROL_PATH_DIR)
makedirs_safe(tmp_path) makedirs_safe(tmp_path)
lock_path = unfrackpath("%s/.ansible_pc_lock_%s" % (tmp_path, play_context.remote_addr))
socket_path = unfrackpath(cp % dict(directory=tmp_path)) socket_path = unfrackpath(cp % dict(directory=tmp_path))
lock_path = unfrackpath("%s/.ansible_pc_lock_%s" % os.path.split(socket_path))
with file_lock(lock_path): with file_lock(lock_path):
if not os.path.exists(socket_path): if not os.path.exists(socket_path):