particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add-host work even if host already tried to log in

Browse source 
Fixes: https://pagure.io/koji/issue/1874
This commit is contained in:
Tomas Kopecek 2020-02-25 10:53:33 +01:00
parent ae8958e977
commit 5eafede60b
4 changed files with 111 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cli/koji_cli/commands.py
View file

@ -187,6 +187,8 @@ def handle_add_host(goptions, session, args):
parser = OptionParser(usage=get_usage_str(usage))
parser.add_option("--krb-principal",
help=_("set a non-default kerberos principal for the host"))
parser.add_option("--force", default=False, action="store_true",
help=_("if existing used is a regular user, convert it to a host"))
(options, args) = parser.parse_args(args)
if len(args) < 2:
parser.error(_("Please specify a hostname and at least one arch"))
@ -194,15 +196,13 @@ def handle_add_host(goptions, session, args):
activate_session(session, goptions)
id = session.getHost(host)
if id:
print("%s is already in the database" % host)
return 1
error("%s is already in the database" % host)
else:
kwargs = {}
kwargs = {'force': options.force}
if options.krb_principal is not None:
kwargs['krb_principal'] = options.krb_principal
id = session.addHost(host, args[1:], **kwargs)
if id:
print("%s added: id %d" % (host, id))
print("%s added: id %d" % (host, id))
def handle_edit_host(options, session, args):

24
hub/kojihub.py
View file

@ -12153,7 +12153,7 @@ class RootExports(object):
arch=taskInfo['arch'], channel=channel['name'],
priority=taskInfo['priority'])
def addHost(self, hostname, arches, krb_principal=None):
def addHost(self, hostname, arches, krb_principal=None, force=False):
"""
Add a builder host to the database.
@ -12161,6 +12161,7 @@ class RootExports(object):
:param list arches: list of architectures this builder supports.
:param str krb_principal: (optional) a non-default kerberos principal
for the host.
:param bool force: override user type
:returns: new host id
If krb_principal is not given then that field will be generated
@ -12178,9 +12179,24 @@ class RootExports(object):
fmt = context.opts.get('HostPrincipalFormat')
if fmt:
krb_principal = fmt % hostname
# users entry
userID = context.session.createUser(hostname, usertype=koji.USERTYPES['HOST'],
krb_principal=krb_principal)
# builder user can already exist, if host tried to log in before adding into db
user = get_user(userInfo={'name': hostname, 'krb_principals': [krb_principal]})
if user:
if user['usertype'] != koji.USERTYPES['HOST']:
if force and user['usertype'] == koji.USERTYPES['NORMAL']:
# override usertype in this special case
update = UpdateProcessor('users',
values={'userID': user['id']},
clauses=['id = %(userID)i'])
update.set(usertype=koji.USERTYPES['HOST'])
update.execute()
else:
raise koji.GenericError(
'user %s already exists and it is not a host' % hostname)
userID = user['id']
else:
userID = context.session.createUser(hostname, usertype=koji.USERTYPES['HOST'],
krb_principal=krb_principal)
# host entry
hostID = _singleValue("SELECT nextval('host_id_seq')", strict=True)
insert = "INSERT INTO host (id, user_id, name) VALUES (%(hostID)i, %(userID)i, " \

22
tests/test_cli/test_add_host.py
View file

@ -8,6 +8,7 @@ try:
except ImportError:
import unittest
import koji
from koji_cli.commands import handle_add_host
class TestAddHost(unittest.TestCase):
@ -24,7 +25,7 @@ class TestAddHost(unittest.TestCase):
krb_principal = '--krb-principal=krb'
arguments = [host] + arches
arguments.append(krb_principal)
kwargs = {'krb_principal': 'krb'}
kwargs = {'krb_principal': 'krb', 'force': False}
options = mock.MagicMock()
# Mock out the xmlrpc server
@ -69,12 +70,12 @@ class TestAddHost(unittest.TestCase):
# Finally, assert that things were called as we expected.
activate_session_mock.assert_called_once_with(session, options)
session.getHost.assert_called_once_with(host)
session.addHost.assert_called_once_with(host, arches)
session.addHost.assert_called_once_with(host, arches, force=False)
self.assertNotEqual(rv, 1)
@mock.patch('sys.stdout', new_callable=six.StringIO)
@mock.patch('sys.stderr', new_callable=six.StringIO)
@mock.patch('koji_cli.commands.activate_session')
def test_handle_add_host_dupl(self, activate_session_mock, stdout):
def test_handle_add_host_dupl(self, activate_session_mock, stderr):
host = 'host'
host_id = 1
arches = ['arch1', 'arch2']
@ -89,15 +90,15 @@ class TestAddHost(unittest.TestCase):
# Run it and check immediate output
# args: host, arch1, arch2, --krb-principal=krb
# expected: failed, host already exists
rv = handle_add_host(options, session, arguments)
actual = stdout.getvalue()
with self.assertRaises(SystemExit):
handle_add_host(options, session, arguments)
actual = stderr.getvalue()
expected = 'host is already in the database\n'
self.assertMultiLineEqual(actual, expected)
# Finally, assert that things were called as we expected.
activate_session_mock.assert_called_once_with(session, options)
session.getHost.assert_called_once_with(host)
session.addHost.assert_not_called()
self.assertEqual(rv, 1)
@mock.patch('sys.stdout', new_callable=six.StringIO)
@mock.patch('sys.stderr', new_callable=six.StringIO)
@ -141,18 +142,19 @@ class TestAddHost(unittest.TestCase):
krb_principal = '--krb-principal=krb'
arguments = [host] + arches
arguments.append(krb_principal)
kwargs = {'krb_principal': 'krb'}
kwargs = {'krb_principal': 'krb', 'force': False}
options = mock.MagicMock()
# Mock out the xmlrpc server
session = mock.MagicMock()
session.getHost.return_value = None
session.addHost.return_value = None
session.addHost.side_effect = koji.GenericError
# Run it and check immediate output
# args: host, arch1, arch2, --krb-principal=krb
# expected: failed
handle_add_host(options, session, arguments)
with self.assertRaises(koji.GenericError):
handle_add_host(options, session, arguments)
actual = stdout.getvalue()
expected = ''
self.assertMultiLineEqual(actual, expected)

74
tests/test_hub/test_add_host.py
View file

@ -77,3 +77,77 @@ class TestAddHost(unittest.TestCase):
self.assertEqual(_dml.call_count, 1)
_dml.assert_called_once_with("INSERT INTO host (id, user_id, name) VALUES (%(hostID)i, %(userID)i, %(hostname)s)",
{'hostID': 12, 'userID': 456, 'hostname': 'hostname'})
@mock.patch('kojihub.get_user')
@mock.patch('kojihub._dml')
@mock.patch('kojihub.get_host')
@mock.patch('kojihub._singleValue')
def test_add_host_wrong_user(self, _singleValue, get_host, _dml, get_user):
get_user.return_value = {
'id': 1,
'name': 'hostname',
'usertype': koji.USERTYPES['NORMAL']
}
get_host.return_value = {}
with self.assertRaises(koji.GenericError):
self.exports.addHost('hostname', ['i386', 'x86_64'])
_dml.assert_not_called()
get_user.assert_called_once_with(userInfo={
'name': 'hostname',
'krb_principals': ['-hostname-']})
get_host.assert_called_once_with('hostname')
_singleValue.assert_called_once()
self.assertEqual(len(self.inserts), 0)
self.assertEqual(len(self.updates), 0)
@mock.patch('kojihub.get_user')
@mock.patch('kojihub._dml')
@mock.patch('kojihub.get_host')
@mock.patch('kojihub._singleValue')
def test_add_host_wrong_user_forced(self, _singleValue, get_host, _dml, get_user):
get_user.return_value = {
'id': 123,
'name': 'hostname',
'usertype': koji.USERTYPES['NORMAL']
}
get_host.return_value = {}
self.exports.addHost('hostname', ['i386', 'x86_64'], force=True)
_dml.assert_called_once()
get_user.assert_called_once_with(userInfo={
'name': 'hostname',
'krb_principals': ['-hostname-']})
get_host.assert_called_once_with('hostname')
_singleValue.assert_called()
self.assertEqual(len(self.inserts), 2)
self.assertEqual(len(self.updates), 1)
update = self.updates[0]
self.assertEqual(update.values, {'userID': 123})
self.assertEqual(update.table, 'users')
self.assertEqual(update.clauses, ['id = %(userID)i'])
self.assertEqual(update.data, {'usertype': koji.USERTYPES['HOST']})
@mock.patch('kojihub.get_user')
@mock.patch('kojihub._dml')
@mock.patch('kojihub.get_host')
@mock.patch('kojihub._singleValue')
def test_add_host_superwrong_user_forced(self, _singleValue, get_host, _dml, get_user):
get_user.return_value = {
'id': 123,
'name': 'hostname',
'usertype': koji.USERTYPES['GROUP']
}
get_host.return_value = {}
with self.assertRaises(koji.GenericError):
self.exports.addHost('hostname', ['i386', 'x86_64'], force=True)
_dml.assert_not_called()
get_user.assert_called_once_with(userInfo={
'name': 'hostname',
'krb_principals': ['-hostname-']})
get_host.assert_called_once_with('hostname')
_singleValue.assert_called()
self.assertEqual(len(self.inserts), 0)
self.assertEqual(len(self.updates), 0)