mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-09-24 16:35:44 +00:00
d6623003c6
The current security driver usage requires horrible code like
if (driver->securityDriver &&
driver->securityDriver->domainSetSecurityHostdevLabel &&
driver->securityDriver->domainSetSecurityHostdevLabel(driver->securityDriver,
vm, hostdev) < 0)
This pair of checks for NULL clutters up the code, making the driver
calls 2 lines longer than they really need to be. The goal of the
patchset is to change the calling convention to simply
if (virSecurityManagerSetHostdevLabel(driver->securityDriver,
vm, hostdev) < 0)
The first check for 'driver->securityDriver' being NULL is removed
by introducing a 'no op' security driver that will always be present
if no real driver is enabled. This guarentees driver->securityDriver
!= NULL.
The second check for 'driver->securityDriver->domainSetSecurityHostdevLabel'
being non-NULL is hidden in a new abstraction called virSecurityManager.
This separates the driver callbacks, from main internal API. The addition
of a virSecurityManager object, that is separate from the virSecurityDriver
struct also allows for security drivers to carry state / configuration
information directly. Thus the DAC/Stack drivers from src/qemu which
used to pull config from 'struct qemud_driver' can now be moved into
the 'src/security' directory and store their config directly.
* src/qemu/qemu_conf.h, src/qemu/qemu_driver.c: Update to
use new virSecurityManager APIs
* src/qemu/qemu_security_dac.c, src/qemu/qemu_security_dac.h
src/qemu/qemu_security_stacked.c, src/qemu/qemu_security_stacked.h:
Move into src/security directory
* src/security/security_stack.c, src/security/security_stack.h,
src/security/security_dac.c, src/security/security_dac.h: Generic
versions of previous QEMU specific drivers
* src/security/security_apparmor.c, src/security/security_apparmor.h,
src/security/security_driver.c, src/security/security_driver.h,
src/security/security_selinux.c, src/security/security_selinux.h:
Update to take virSecurityManagerPtr object as the first param
in all callbacks
* src/security/security_nop.c, src/security/security_nop.h: Stub
implementation of all security driver APIs.
* src/security/security_manager.h, src/security/security_manager.c:
New internal API for invoking security drivers
* src/libvirt.c: Add missing debug for security APIs
78 lines
1.8 KiB
C
78 lines
1.8 KiB
C
/*
|
|
* Copyright (C) 2008 Red Hat, Inc.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* Authors:
|
|
* James Morris <jmorris@namei.org>
|
|
*
|
|
*/
|
|
#include <config.h>
|
|
#include <string.h>
|
|
|
|
#include "virterror_internal.h"
|
|
#include "logging.h"
|
|
|
|
#include "security_driver.h"
|
|
#ifdef WITH_SECDRIVER_SELINUX
|
|
# include "security_selinux.h"
|
|
#endif
|
|
|
|
#ifdef WITH_SECDRIVER_APPARMOR
|
|
# include "security_apparmor.h"
|
|
#endif
|
|
|
|
#include "security_nop.h"
|
|
|
|
static virSecurityDriverPtr security_drivers[] = {
|
|
#ifdef WITH_SECDRIVER_SELINUX
|
|
&virSecurityDriverSELinux,
|
|
#endif
|
|
#ifdef WITH_SECDRIVER_APPARMOR
|
|
&virAppArmorSecurityDriver,
|
|
#endif
|
|
&virSecurityDriverNop, /* Must always be last, since it will always probe */
|
|
};
|
|
|
|
virSecurityDriverPtr virSecurityDriverLookup(const char *name)
|
|
{
|
|
virSecurityDriverPtr drv = NULL;
|
|
int i;
|
|
|
|
VIR_DEBUG("name=%s", NULLSTR(name));
|
|
|
|
for (i = 0; i < ARRAY_CARDINALITY(security_drivers) && !drv ; i++) {
|
|
virSecurityDriverPtr tmp = security_drivers[i];
|
|
|
|
if (name &&
|
|
STRNEQ(tmp->name, name))
|
|
continue;
|
|
|
|
switch (tmp->probe()) {
|
|
case SECURITY_DRIVER_ENABLE:
|
|
VIR_DEBUG("Probed name=%s", tmp->name);
|
|
drv = tmp;
|
|
break;
|
|
|
|
case SECURITY_DRIVER_DISABLE:
|
|
VIR_DEBUG("Not enabled name=%s", tmp->name);
|
|
break;
|
|
|
|
default:
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
if (!drv) {
|
|
virSecurityReportError(VIR_ERR_INTERNAL_ERROR,
|
|
_("Security driver %s not found"),
|
|
NULLSTR(name));
|
|
return NULL;
|
|
}
|
|
|
|
return drv;
|
|
}
|