Re: [PATCH v3 3/3] test-crypto-secret: add 'secret_keyring' object tests.

[Daniel P . Berrangé]

On Mon, May 18, 2020 at 11:28:04PM +0300, Alexey Krasikov wrote:
> Add tests:
>   test_secret_keyring_good;
>   test_secret_keyring_revoked_key;
>   test_secret_keyring_expired_key;
>   test_secret_keyring_bad_serial_key;
>   test_secret_keyring_bad_key_access_right;
> 
> Added tests require libkeyutils. The absence of this library is not
> critical, because these tests will be skipped in this case.
> 
> Signed-off-by: Alexey Krasikov <address@hidden>
> ---
>  configure                  |  25 ++++++
>  tests/Makefile.include     |   4 +
>  tests/test-crypto-secret.c | 154 +++++++++++++++++++++++++++++++++++++
>  3 files changed, 183 insertions(+)
> 
> diff --git a/configure b/configure
> index 1bae5ec0a1..2ab7d2961c 100755
> --- a/configure
> +++ b/configure
> @@ -6283,6 +6283,28 @@ but not implemented on your system"
>      fi
>  fi
>  
> +##########################################
> +# check for usable keyutils.h
> +
> +if test "$linux" = "yes" ; then
> +
> +    have_keyutils=no
> +    cat > $TMPC << EOF
> +#include <errno.h>
> +#include <asm/unistd.h>
> +#include <linux/keyctl.h>
> +#include <unistd.h>
> +#include <sys/types.h>
> +#include <keyutils.h>
> +int main(void) {
> +    return request_key("user", NULL, NULL, 0);
> +}
> +EOF
> +    if compile_prog "" "-lkeyutils"; then
> +        have_keyutils=yes
> +    fi
> +fi

On my Fedora 32 system this always fails despite having keyutils-libs-devel
installed. Looking at config.log,  the linux/keyctl.h file defines structs
with names that clash with those in keyutils.h.  Removing the linux/keyctl.h
include here makes this test succeed, but.....


> +/*
> + * TODO
> + * test_secret_keyring_bad_key_access_right() is not working yet.
> + * We don't know yet if this due a bug in the Linux kernel or
> + * whether it's normal syscall behavior.
> + * We've requested information from kernel maintainers.
> + * See: <https://www.spinics.net/lists/keyrings/index.html>
> + * Thread: 'security/keys: remove possessor verify after key permission 
> check'
> + */
> +
> +static void test_secret_keyring_bad_key_access_right(void)
> +{
> +    char key_str[16];
> +    Object *sec;
> +    int32_t key = add_key("user", DESCRIPTION, PAYLOAD,
> +                          strlen(PAYLOAD), KEY_SPEC_PROCESS_KEYRING);
> +    g_assert(key >= 0);
> +    g_assert_false(keyctl_setperm(key, KEY_POS_ALL & (~KEY_POS_READ)));
> +
> +    snprintf(key_str, sizeof(key_str), "0x%08x", key);
> +
> +    sec = object_new_with_props(
> +        TYPE_QCRYPTO_SECRET_KEYRING,
> +        object_get_objects_root(),
> +        "sec0",
> +        NULL,
> +        "serial", key_str,
> +        NULL);
> +
> +    g_assert(errno == EACCES);
> +    g_assert(sec == NULL);
> +
> +    keyctl_unlink(key, KEY_SPEC_PROCESS_KEYRING);
> +}

This causes the entire test suite to abort

ERROR:tests/test-crypto-secret.c:261:test_secret_keyring_bad_key_access_right: 
assertion failed: (errno == EACCES)
Bail out! 
ERROR:tests/test-crypto-secret.c:261:test_secret_keyring_bad_key_access_right: 
assertion failed: (errno == EACCES)

Either this test needs a temporary  "g_test_skip()" at the start of the
method to stop executing (if we expect Linux to be fixed), or it just 
needs deleting (if this is intentional Linux behaviour)

> +
> +#endif /* CONFIG_TEST_SECRET_KEYRING */
>  
>  static void test_secret_noconv_base64_good(void)
>  {
> @@ -426,6 +567,19 @@ int main(int argc, char **argv)
>      g_test_add_func("/crypto/secret/indirect/emptyfile",
>                      test_secret_indirect_emptyfile);
>  
> +#ifdef CONFIG_TEST_SECRET_KEYRING
> +    g_test_add_func("/crypto/secret/keyring/good",
> +                    test_secret_keyring_good);
> +    g_test_add_func("/crypto/secret/keyring/revoked_key",
> +                    test_secret_keyring_revoked_key);
> +    g_test_add_func("/crypto/secret/keyring/expired_key",
> +                    test_secret_keyring_expired_key);
> +    g_test_add_func("/crypto/secret/keyring/bad_serial_key",
> +                    test_secret_keyring_bad_serial_key);
> +    g_test_add_func("/crypto/secret/keyring/bad_key_access_right",
> +                    test_secret_keyring_bad_key_access_right);
> +#endif /* CONFIG_TEST_SECRET_KEYRING */
> +

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|