[pykickstart] Add support for setting user account ssh key
Martin Kolman
mkolman at redhat.com
Mon Dec 15 14:33:40 UTC 2014
On Fri, 2014-12-12 at 18:33 -0800, Brian C. Lane wrote:
> This adds the sshkey --username=<user> "ssh key" command.
>
> This is used to set the ssh key for users on the installed system.
> ---
> pykickstart/commands/__init__.py | 4 +-
> pykickstart/commands/sshkey.py | 99 ++++++++++++++++++++++++++++++++++++++++
> pykickstart/handlers/f22.py | 2 +
> tests/commands/sshkey.py | 41 +++++++++++++++++
> 4 files changed, 144 insertions(+), 2 deletions(-)
> create mode 100644 pykickstart/commands/sshkey.py
> create mode 100644 tests/commands/sshkey.py
>
> diff --git a/pykickstart/commands/__init__.py b/pykickstart/commands/__init__.py
> index b27546a..dfd492d 100644
> --- a/pykickstart/commands/__init__.py
> +++ b/pykickstart/commands/__init__.py
> @@ -23,5 +23,5 @@ from pykickstart.commands import \
> group, harddrive, ignoredisk, interactive, iscsi, iscsiname, key, keyboard, lang, \
> langsupport, lilocheck, liveimg, logging, logvol, mediacheck, method, monitor, \
> mouse, multipath, network, nfs, ostreesetup, partition, raid, realm, reboot, repo, \
> - rescue, rootpw, selinux, services, skipx, sshpw, timezone, updates, upgrade, url, \
> - user, unsupported_hardware, vnc, volgroup, xconfig, zerombr, zfcp
> + rescue, rootpw, selinux, services, skipx, sshpw, sshkey, timezone, updates, upgrade, \
> + url, user, unsupported_hardware, vnc, volgroup, xconfig, zerombr, zfcp
> diff --git a/pykickstart/commands/sshkey.py b/pykickstart/commands/sshkey.py
> new file mode 100644
> index 0000000..b470c28
> --- /dev/null
> +++ b/pykickstart/commands/sshkey.py
> @@ -0,0 +1,99 @@
> +#
> +# Brian C. Lane <bcl at redhat.com>
> +#
> +# Copyright 2014 Red Hat, Inc.
> +#
> +# This copyrighted material is made available to anyone wishing to use, modify,
> +# copy, or redistribute it subject to the terms and conditions of the GNU
> +# General Public License v.2. This program is distributed in the hope that it
> +# will be useful, but WITHOUT ANY WARRANTY expressed or implied, including the
> +# implied warranties 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
> +# this program; if not, write to the Free Software Foundation, Inc., 51
> +# Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Any Red Hat
> +# trademarks that are incorporated in the source code or documentation are not
> +# subject to the GNU General Public License and may only be used or replicated
> +# with the express permission of Red Hat, Inc.
> +#
> +from pykickstart.base import BaseData, KickstartCommand
> +from pykickstart.errors import KickstartValueError, formatErrorMsg
> +from pykickstart.options import KSOptionParser
> +import warnings
> +
> +import gettext
> +_ = lambda x: gettext.ldgettext("pykickstart", x)
> +
> +class F22_SshKeyData(BaseData):
> + removedKeywords = BaseData.removedKeywords
> + removedAttrs = BaseData.removedAttrs
> +
> + def __init__(self, *args, **kwargs):
> + BaseData.__init__(self, *args, **kwargs)
> + self.username = kwargs.get("username", None)
> + self.key = kwargs.get("key", "")
> +
> + def __eq__(self, y):
> + if not y:
> + return False
> +
> + return self.username == y.username
> +
> + def __ne__(self, y):
> + return not self == y
> +
> + def __str__(self):
> + retval = BaseData.__str__(self)
> +
> + retval += "sshkey"
> + retval += self._getArgsAsStr() + '\n'
> +
> + return retval
> +
> + def _getArgsAsStr(self):
> + retval = ""
> +
> + retval += " --username=%s" % self.username
> + retval += ' "%s"' % self.key
> + return retval
> +
> +class F22_SshKey(KickstartCommand):
> + removedKeywords = KickstartCommand.removedKeywords
> + removedAttrs = KickstartCommand.removedAttrs
> +
> + def __init__(self, writePriority=0, *args, **kwargs):
> + KickstartCommand.__init__(self, writePriority, *args, **kwargs)
> + self.op = self._getParser()
> +
> + self.sshUserList = kwargs.get("sshUserList", [])
> +
> + def __str__(self):
> + retval = ""
> + for user in self.sshUserList:
> + retval += user.__str__()
> +
> + return retval
> +
> + def _getParser(self):
> + op = KSOptionParser()
> + op.add_option("--username", dest="username", required=True)
> + return op
> +
> + def parse(self, args):
> + ud = self.handler.SshKeyData()
> + (opts, extra) = self.op.parse_args(args=args, lineno=self.lineno)
> + self._setToObj(self.op, opts, ud)
> + ud.lineno = self.lineno
> +
> + if len(extra) != 1:
> + raise KickstartValueError(formatErrorMsg(self.lineno, msg=_("A single argument is expected for the %s command") % "sshkey"))
> + ud.key = extra[0]
> +
> + if ud in self.dataList():
> + warnings.warn(_("An ssh user with the name %s has already been defined.") % ud.name)
> +
> + return ud
> +
> + def dataList(self):
> + return self.sshUserList
> diff --git a/pykickstart/handlers/f22.py b/pykickstart/handlers/f22.py
> index ceb4131..603dbc9 100644
> --- a/pykickstart/handlers/f22.py
> +++ b/pykickstart/handlers/f22.py
> @@ -77,6 +77,7 @@ class F22Handler(BaseHandler):
> "shutdown": commands.reboot.F18_Reboot,
> "skipx": commands.skipx.FC3_SkipX,
> "sshpw": commands.sshpw.F13_SshPw,
> + "sshkey": commands.sshkey.F22_SshKey,
> "text": commands.displaymode.FC3_DisplayMode,
> "timezone": commands.timezone.F18_Timezone,
> "updates": commands.updates.F7_Updates,
> @@ -105,6 +106,7 @@ class F22Handler(BaseHandler):
> "RaidData": commands.raid.F18_RaidData,
> "RepoData": commands.repo.F21_RepoData,
> "SshPwData": commands.sshpw.F13_SshPwData,
> + "SshKeyData": commands.sshkey.F22_SshKeyData,
> "UserData": commands.user.F19_UserData,
> "VolGroupData": commands.volgroup.F21_VolGroupData,
> "ZFCPData": commands.zfcp.F14_ZFCPData,
> diff --git a/tests/commands/sshkey.py b/tests/commands/sshkey.py
> new file mode 100644
> index 0000000..f419b18
> --- /dev/null
> +++ b/tests/commands/sshkey.py
> @@ -0,0 +1,41 @@
> +#
> +# Brian C. Lane <bcl at redhat.com>
> +#
> +# Copyright 2014 Red Hat, Inc.
> +#
> +# This copyrighted material is made available to anyone wishing to use, modify,
> +# copy, or redistribute it subject to the terms and conditions of the GNU
> +# General Public License v.2. This program is distributed in the hope that it
> +# will be useful, but WITHOUT ANY WARRANTY expressed or implied, including the
> +# implied warranties 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
> +# this program; if not, write to the Free Software Foundation, Inc., 51
> +# Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Any Red Hat
> +# trademarks that are incorporated in the source code or documentation are not
> +# subject to the GNU General Public License and may only be used or replicated
> +# with the express permission of Red Hat, Inc.
> +#
> +import unittest
> +from tests.baseclass import *
> +
> +from pykickstart.errors import *
> +from pykickstart.commands.rootpw import *
> +
> +class F22_TestCase(CommandTest):
> + command = "sshkey"
> + key = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJGDmFSzIWSvnFYhExf+FbzSiZxsoohJdrKlmPKQhdts8nSg5PH7jyG5X+w6RgWhSetlD3WouKoo3zFOR5nCYq4= bcl at notae.us"
> +
> + def runTest(self):
> + # pass
> + self.assert_parse('sshkey --username=root "%s"' % self.key, 'sshkey --username=root "%s"\n' % self.key)
> +
> + # fail
> + self.assert_parse_error("sshkey", KickstartValueError)
> + self.assert_parse_error("sshkey --foo", KickstartParseError)
> + self.assert_parse_error("sshkey --username", KickstartParseError)
> + self.assert_parse_error("sshkey --username=root", KickstartValueError)
> +
> +if __name__ == "__main__":
> + unittest.main()
Both look good to me, thanks & ACK!
More information about the anaconda-patches
mailing list