Skip to content
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

Jump to bottom

Wrap getpwnam in try/except in authorized_key module #1556

Merged
merged 1 commit into from
Nov 9, 2012
Merged

Wrap getpwnam in try/except in authorized_key module #1556

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 8 additions & 5 deletions library/authorized_key
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ import os.path
import tempfile
import shutil

def keyfile(user, write=False):
def keyfile(module, user, write=False):
"""
Calculate name of authorized keys file, optionally creating the
directories and file, properly setting permissions.
Expand All @@ -81,7 +81,10 @@ def keyfile(user, write=False):
:return: full path string to authorized_keys for user
"""

user_entry = pwd.getpwnam(user)
try:
user_entry = pwd.getpwnam(user)
except KeyError, e:
module.fail_json(msg="Failed to lookup user %s: %s" % (user, str(e)))
homedir = user_entry.pw_dir
sshdir = os.path.join(homedir, ".ssh")
keysfile = os.path.join(sshdir, "authorized_keys")
Expand Down Expand Up @@ -137,7 +140,7 @@ def enforce_state(module, params):
state = params.get("state", "present")

# check current state -- just get the filename, don't create file
params["keyfile"] = keyfile(user, write=False)
params["keyfile"] = keyfile(module, user, write=False)
keys = readkeys(params["keyfile"])
present = key in keys

Expand All @@ -146,13 +149,13 @@ def enforce_state(module, params):
if present:
module.exit_json(changed=False)
keys.append(key)
writekeys(module, keyfile(user,write=True), keys)
writekeys(module, keyfile(module, user,write=True), keys)

elif state=="absent":
if not present:
module.exit_json(changed=False)
keys.remove(key)
writekeys(module, keyfile(user,write=True), keys)
writekeys(module, keyfile(module, user,write=True), keys)

params['changed'] = True
return params
Expand Down