manage individual keys instead of block of text
also fixes #251 Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
This commit is contained in:
parent
9c6defe17c
commit
16a829d3eb
3 changed files with 49 additions and 12 deletions
22
cdist/conf/type/__ssh_authorized_keys/explorer/group
Executable file
22
cdist/conf/type/__ssh_authorized_keys/explorer/group
Executable file
|
@ -0,0 +1,22 @@
|
||||||
|
#!/bin/sh
|
||||||
|
#
|
||||||
|
# 2014 Steven Armstrong (steven-cdist at armstrong.cc)
|
||||||
|
#
|
||||||
|
# This file is part of cdist.
|
||||||
|
#
|
||||||
|
# cdist is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# cdist is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
#
|
||||||
|
|
||||||
|
gid="$("$__type_explorer/passwd" | cut -d':' -f 4)"
|
||||||
|
getent group "$gid" || true
|
|
@ -97,5 +97,5 @@ SEE ALSO
|
||||||
|
|
||||||
COPYING
|
COPYING
|
||||||
-------
|
-------
|
||||||
Copyright \(C) 2012 Steven Armstrong. Free use of this software is
|
Copyright \(C) 2012-2014 Steven Armstrong. Free use of this software is
|
||||||
granted under the terms of the GNU General Public License version 3 (GPLv3).
|
granted under the terms of the GNU General Public License version 3 (GPLv3).
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
#
|
#
|
||||||
# 2012 Steven Armstrong (steven-cdist at armstrong.cc)
|
# 2012-2014 Steven Armstrong (steven-cdist at armstrong.cc)
|
||||||
#
|
#
|
||||||
# This file is part of cdist.
|
# This file is part of cdist.
|
||||||
#
|
#
|
||||||
|
@ -32,7 +32,7 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ! -f "$__object/parameter/noparent" -o ! -f "$__object/parameter/nofile" ]; then
|
if [ ! -f "$__object/parameter/noparent" -o ! -f "$__object/parameter/nofile" ]; then
|
||||||
group="$(cut -d':' -f 4 "$__object/explorer/passwd")"
|
group="$(cut -d':' -f 1 "$__object/explorer/group")"
|
||||||
if [ -z "$group" ]; then
|
if [ -z "$group" ]; then
|
||||||
echo "Failed to get owners group from explorer." >&2
|
echo "Failed to get owners group from explorer." >&2
|
||||||
exit 1
|
exit 1
|
||||||
|
@ -56,16 +56,31 @@ if [ ! -f "$__object/parameter/noparent" -o ! -f "$__object/parameter/nofile" ];
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Generate entry for inclusion in authorized_keys file
|
# Remove legacy blocks created by old versions of this type
|
||||||
(
|
|
||||||
if [ -f "$__object/parameter/comment" ]; then
|
|
||||||
echo "# $(cat "$__object/parameter/comment")"
|
|
||||||
fi
|
|
||||||
cat "$__object/parameter/key"
|
|
||||||
) | \
|
|
||||||
__block "$__object_name" \
|
__block "$__object_name" \
|
||||||
--file "$file" \
|
--file "$file" \
|
||||||
--prefix "#cdist:$__object_name" \
|
--prefix "#cdist:$__object_name" \
|
||||||
--suffix "#/cdist:$__object_name" \
|
--suffix "#/cdist:$__object_name" \
|
||||||
--state "$state" \
|
--state 'absent' \
|
||||||
--text -
|
--text - << DONE
|
||||||
|
remove legacy block
|
||||||
|
DONE
|
||||||
|
|
||||||
|
_cksum() {
|
||||||
|
echo "$1" | cksum | cut -d' ' -f 1
|
||||||
|
}
|
||||||
|
|
||||||
|
# Add each key
|
||||||
|
IFS=$'\n'
|
||||||
|
for key in $(cat "$__object/parameter/key"); do
|
||||||
|
unset IFS
|
||||||
|
raw_key="$(echo "$key" | tr ' ' '\n' | awk '/^ssh-(rsa|dsa)/ {printf $1" ";getline;printf $1}')"
|
||||||
|
set -- "$(_cksum "$raw_key")"
|
||||||
|
set -- "$@" --file "$file"
|
||||||
|
set -- "$@" --regex ".*$raw_key.*"
|
||||||
|
if [ "$state" = 'present' ]; then
|
||||||
|
set -- "$@" --line "$key"
|
||||||
|
fi
|
||||||
|
set -- "$@" --state "$state"
|
||||||
|
require="__block/$__object_name" __line "$@"
|
||||||
|
done
|
||||||
|
|
Loading…
Reference in a new issue