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

Don't mind the options of a key when removing it

Browse source 
This allows to remove a key without knowing the options in the
authorized_key file
This commit is contained in:
Stefan Heinemann 2013-10-14 16:59:30 +02:00
parent 4503cbebc0
commit 948713db5e
1 changed files with 21 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
system/authorized_key
View file

@ -221,16 +221,17 @@ def readkeys(filename):
if not os.path.isfile(filename):
return []
keys = []
keys = {}
f = open(filename)
for line in f.readlines():
key_data = parsekey(line)
if key_data:
keys.append(key_data)
# use key as identifier
keys[key_data[0]] = key_data
else:
# for an invalid line, just append the line
# to the array so it will be re-output later
keys.append(line)
keys[line] = line
f.close()
return keys
@ -239,7 +240,7 @@ def writekeys(module, filename, keys):
fd, tmp_path = tempfile.mkstemp('', 'tmp', os.path.dirname(filename))
f = open(tmp_path,"w")
try:
for key in keys:
for index, key in keys.items():
try:
(keyhash,type,options,comment) = key
option_str = ""
@ -290,39 +291,35 @@ def enforce_state(module, params):
present = False
matched = False
non_matching_keys = []
for existing_key in existing_keys:
# skip bad entries or bad input
if len(parsed_new_key) == 0 or len(existing_key) == 0:
continue
# the first element in the array after parsing
# is the actual key hash, which we check first
if parsed_new_key[0] == existing_key[0]:
present = True
# Then we check if everything matches, including
# the key type and options. If not, we append this
# existing key to the non-matching list
if parsed_new_key != existing_key:
non_matching_keys.append(existing_key)
else:
matched = True
if parsed_new_key[0] in existing_keys:
present = True
# Then we check if everything matches, including
# the key type and options. If not, we append this
# existing key to the non-matching list
# We only want it to match everything when the state
# is present
if parsed_new_key != existing_keys[parsed_new_key[0]] and state == "present":
non_matching_keys.append(existing_keys[parsed_new_key[0]])
else:
matched = True
# handle idempotent state=present
if state=="present":
if unique and len(non_matching_keys) > 0:
for non_matching_key in non_matching_keys:
existing_keys.remove(non_matching_key)
del existing_keys[non_matching_key[0]]
do_write = True
if not matched:
existing_keys.append(parsed_new_key)
existing_keys[parsed_new_key[0]] = parsed_new_key
do_write = True
elif state=="absent":
# currently, we only remove keys when
# they are an exact match
if not matched:
continue
existing_keys.remove(parsed_new_key)
del existing_keys[parsed_new_key[0]]
do_write = True
if do_write: