From patchwork Thu Jan 7 14:30:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zihao Chang X-Patchwork-Id: 12004277 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 61799C433E0 for ; Thu, 7 Jan 2021 14:34:54 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EE49922AAA for ; Thu, 7 Jan 2021 14:34:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EE49922AAA Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:48568 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kxWNH-00034X-Sk for qemu-devel@archiver.kernel.org; Thu, 07 Jan 2021 09:34:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53778) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kxWJl-0000Lz-3u for qemu-devel@nongnu.org; Thu, 07 Jan 2021 09:31:19 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:3025) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kxWJT-0004sR-TM for qemu-devel@nongnu.org; Thu, 07 Jan 2021 09:31:11 -0500 Received: from DGGEMS405-HUB.china.huawei.com (unknown [172.30.72.59]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4DBTCP1JDCzj4s1; Thu, 7 Jan 2021 22:29:53 +0800 (CST) Received: from DESKTOP-F1615D3.china.huawei.com (10.174.186.85) by DGGEMS405-HUB.china.huawei.com (10.3.19.205) with Microsoft SMTP Server id 14.3.498.0; Thu, 7 Jan 2021 22:30:38 +0800 From: Zihao Chang To: Subject: [PATCH v2 1/2] crypto: add reload for QCryptoTLSCredsClass Date: Thu, 7 Jan 2021 22:30:31 +0800 Message-ID: <20210107143032.752-2-changzihao1@huawei.com> X-Mailer: git-send-email 2.22.0.windows.1 In-Reply-To: <20210107143032.752-1-changzihao1@huawei.com> References: <20210107143032.752-1-changzihao1@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.174.186.85] X-CFilter-Loop: Reflected Received-SPF: pass client-ip=45.249.212.191; envelope-from=changzihao1@huawei.com; helo=szxga05-in.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: berrange@redhat.com, oscar.zhangbo@huawei.com, changzihao1@huawei.com, armbru@redhat.com, xiexiangyou@huawei.com, kraxel@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This patch adds reload interface for QCryptoTLSCredsClass and implements the interface for QCryptoTLSCredsX509. Signed-off-by: Zihao Chang --- crypto/tlscredsx509.c | 77 +++++++++++++++++++++++++++++++++++++++ include/crypto/tlscreds.h | 8 ++-- 2 files changed, 82 insertions(+), 3 deletions(-) diff --git a/crypto/tlscredsx509.c b/crypto/tlscredsx509.c index dd7267ccdb..a94f862d1d 100644 --- a/crypto/tlscredsx509.c +++ b/crypto/tlscredsx509.c @@ -23,8 +23,10 @@ #include "tlscredspriv.h" #include "crypto/secret.h" #include "qapi/error.h" +#include "qapi/qmp/qstring.h" #include "qemu/module.h" #include "qom/object_interfaces.h" +#include "qom/qom-qobject.h" #include "trace.h" @@ -771,6 +773,78 @@ qcrypto_tls_creds_x509_prop_get_sanity(Object *obj, } +#ifdef CONFIG_GNUTLS + + +static void +qcrypto_tls_creds_x509_reload(QCryptoTLSCreds *creds, Error **errp) +{ + Object *old = OBJECT(creds); + QCryptoTLSCredsX509 *old_x509 = QCRYPTO_TLS_CREDS_X509(creds); + Object *new = object_new(TYPE_QCRYPTO_TLS_CREDS_X509); + QCryptoTLSCredsX509 *new_x509 = QCRYPTO_TLS_CREDS_X509(new); + ObjectProperty *prop; + ObjectPropertyIterator iter; + Error *local_err = NULL; + + object_property_iter_init(&iter, old); + while ((prop = object_property_iter_next(&iter))) { + QObject *value; + /* loaded depends on other props, copy it finally */ + if (g_strcmp0(prop->name, "loaded") == 0) { + continue; + } + + value = object_property_get_qobject(old, prop->name, &local_err); + if (local_err) { + error_propagate(errp, local_err); + goto out; + } + + if ((!prop->set) || + (qobject_type(value) == QTYPE_QSTRING && + strlen(qstring_get_str(qobject_to(QString, value))) == 0)) { + continue; + } + + object_property_set_qobject(new, prop->name, value, &local_err); + if (local_err) { + error_propagate(errp, local_err); + goto out; + } + } + + qcrypto_tls_creds_x509_load(new_x509, &local_err); + if (local_err) { + error_propagate(errp, local_err); + goto out; + } + + /* load new cert successfully, free the old and update */ + qcrypto_tls_creds_x509_unload(old_x509); + old_x509->data = new_x509->data; + old_x509->parent_obj.dh_params = new_x509->parent_obj.dh_params; + new_x509->data = NULL; + new_x509->parent_obj.dh_params = NULL; + +out: + object_unref(new); +} + + +#else /* ! CONFIG_GNUTLS */ + + +static void +qcrypto_tls_creds_x509_reload(QCryptoTLSCreds *creds, Error **errp) +{ + /* nada */ +} + + +#endif /* ! CONFIG_GNUTLS */ + + static void qcrypto_tls_creds_x509_complete(UserCreatable *uc, Error **errp) { @@ -801,6 +875,9 @@ static void qcrypto_tls_creds_x509_class_init(ObjectClass *oc, void *data) { UserCreatableClass *ucc = USER_CREATABLE_CLASS(oc); + QCryptoTLSCredsClass *ctcc = QCRYPTO_TLS_CREDS_CLASS(oc); + + ctcc->reload = qcrypto_tls_creds_x509_reload; ucc->complete = qcrypto_tls_creds_x509_complete; diff --git a/include/crypto/tlscreds.h b/include/crypto/tlscreds.h index 079e376047..281c01a304 100644 --- a/include/crypto/tlscreds.h +++ b/include/crypto/tlscreds.h @@ -30,14 +30,15 @@ #define TYPE_QCRYPTO_TLS_CREDS "tls-creds" typedef struct QCryptoTLSCreds QCryptoTLSCreds; -DECLARE_INSTANCE_CHECKER(QCryptoTLSCreds, QCRYPTO_TLS_CREDS, - TYPE_QCRYPTO_TLS_CREDS) - typedef struct QCryptoTLSCredsClass QCryptoTLSCredsClass; +DECLARE_OBJ_CHECKERS(QCryptoTLSCreds, QCryptoTLSCredsClass, QCRYPTO_TLS_CREDS, + TYPE_QCRYPTO_TLS_CREDS) + #define QCRYPTO_TLS_CREDS_DH_PARAMS "dh-params.pem" +typedef void (*CryptoTLSCredsReload)(QCryptoTLSCreds *, Error **); /** * QCryptoTLSCreds: * @@ -61,6 +62,7 @@ struct QCryptoTLSCreds { struct QCryptoTLSCredsClass { ObjectClass parent_class; + CryptoTLSCredsReload reload; }; From patchwork Thu Jan 7 14:30:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zihao Chang X-Patchwork-Id: 12004275 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1FFB3C433DB for ; Thu, 7 Jan 2021 14:33:07 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5597823343 for ; Thu, 7 Jan 2021 14:33:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5597823343 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:44242 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kxWLZ-0001HO-5f for qemu-devel@archiver.kernel.org; Thu, 07 Jan 2021 09:33:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53728) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kxWJd-0000LO-NC for qemu-devel@nongnu.org; Thu, 07 Jan 2021 09:31:06 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:3024) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kxWJT-0004sP-Q9 for qemu-devel@nongnu.org; Thu, 07 Jan 2021 09:31:05 -0500 Received: from DGGEMS405-HUB.china.huawei.com (unknown [172.30.72.59]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4DBTCP1WMvzj4s5; Thu, 7 Jan 2021 22:29:53 +0800 (CST) Received: from DESKTOP-F1615D3.china.huawei.com (10.174.186.85) by DGGEMS405-HUB.china.huawei.com (10.3.19.205) with Microsoft SMTP Server id 14.3.498.0; Thu, 7 Jan 2021 22:30:41 +0800 From: Zihao Chang To: Subject: [PATCH v2 2/2] vnc: add qmp to support reload vnc tls certificates Date: Thu, 7 Jan 2021 22:30:32 +0800 Message-ID: <20210107143032.752-3-changzihao1@huawei.com> X-Mailer: git-send-email 2.22.0.windows.1 In-Reply-To: <20210107143032.752-1-changzihao1@huawei.com> References: <20210107143032.752-1-changzihao1@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.174.186.85] X-CFilter-Loop: Reflected Received-SPF: pass client-ip=45.249.212.191; envelope-from=changzihao1@huawei.com; helo=szxga05-in.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: berrange@redhat.com, oscar.zhangbo@huawei.com, changzihao1@huawei.com, armbru@redhat.com, xiexiangyou@huawei.com, kraxel@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" QEMU loads vnc tls certificates only when vm is started. This patch provides a new qmp to reload vnc tls certificates without restart vnc-server/VM. {"execute": "reload-vnc-cert"} Signed-off-by: Zihao Chang --- include/ui/console.h | 1 + monitor/qmp-cmds.c | 5 +++++ qapi/ui.json | 18 ++++++++++++++++++ ui/vnc.c | 24 ++++++++++++++++++++++++ 4 files changed, 48 insertions(+) diff --git a/include/ui/console.h b/include/ui/console.h index 5dd21976a3..60a24a8bb5 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -441,6 +441,7 @@ int vnc_display_password(const char *id, const char *password); int vnc_display_pw_expire(const char *id, time_t expires); QemuOpts *vnc_parse(const char *str, Error **errp); int vnc_init_func(void *opaque, QemuOpts *opts, Error **errp); +void vnc_display_reload_cert(const char *id, Error **errp); /* input.c */ int index_from_key(const char *key, size_t key_length); diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c index 34f7e75b7b..84f2b74ea8 100644 --- a/monitor/qmp-cmds.c +++ b/monitor/qmp-cmds.c @@ -287,6 +287,11 @@ static void qmp_change_vnc(const char *target, bool has_arg, const char *arg, qmp_change_vnc_listen(target, errp); } } + +void qmp_reload_vnc_cert(Error **errp) +{ + vnc_display_reload_cert(NULL, errp); +} #endif /* !CONFIG_VNC */ void qmp_change(const char *device, const char *target, diff --git a/qapi/ui.json b/qapi/ui.json index d08d72b439..855b1ac007 100644 --- a/qapi/ui.json +++ b/qapi/ui.json @@ -1179,3 +1179,21 @@ ## { 'command': 'query-display-options', 'returns': 'DisplayOptions' } + +## +# @reload-vnc-cert: +# +# Reload certificates for vnc. +# +# Returns: nothing +# +# Since: 5.2 +# +# Example: +# +# -> { "execute": "reload-vnc-cert" } +# <- { "return": {} } +# +## +{ 'command': 'reload-vnc-cert', + 'if': 'defined(CONFIG_VNC)' } diff --git a/ui/vnc.c b/ui/vnc.c index 7452ac7df2..2cc88c2421 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -582,6 +582,30 @@ VncInfo2List *qmp_query_vnc_servers(Error **errp) return prev; } +void vnc_display_reload_cert(const char *id, Error **errp) +{ + VncDisplay *vd = vnc_display_find(id); + QCryptoTLSCredsClass *creds = NULL; + + if (!vd) { + error_setg(errp, "Can not find Vnc Display"); + return; + } + + if (!vd->tlscreds) { + error_setg(errp, "Vnc tls is not enable"); + return; + } + + creds = QCRYPTO_TLS_CREDS_GET_CLASS(OBJECT(vd->tlscreds)); + if (creds->reload == NULL) { + error_setg(errp, "%s doesn't support to reload TLS credential", + object_get_typename(OBJECT(vd->tlscreds))); + return; + } + creds->reload(vd->tlscreds, errp); +} + /* TODO 1) Get the queue working for IO. 2) there is some weirdness when using the -S option (the screen is grey