From nobody Sun May 5 04:41:59 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1583580773; cv=none; d=zohomail.com; s=zohoarc; b=h+HDMmNoDEUzdhaoN2jQPlWztk88j7QJTAU0UU3BZauFZEE70bf5xnkoigrXtgDn6ZZJgvtj4KwduOUQKx4vhVRy2t9vK2etCiPfaABWQ7D9ewgDHZ1qDmi6TRsyrcWJfjdwIBSfpbg2KY6gCdsgmLJFyXzjUmz9yyS3Q3xW19Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583580773; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=m84n9Q3+TpdER0HLAj6H5PhUwtT8UPRUHHMoICI8R8A=; b=eXTTZQrbSWUIXcOG7QGvRHaNC4j4E7K2q4HmdNUkOueXYhoPlvJAReAfmuQu0vY9tCa8ELoboO3WbBHQ65z8GDn8N1YRjHIRsXXrIKfxHfrt/RSdivGjIgtHsSgK+TNQOSYqESNj7A22EPfWK+3dhmS8GGxOJ9+RXg/pH/4ho38= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1583580773913185.49635519603726; Sat, 7 Mar 2020 03:32:53 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-113-shQQadswP5qghEHZt4qMmg-1; Sat, 07 Mar 2020 06:32:50 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EC5151085933; Sat, 7 Mar 2020 11:32:44 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9BA2C10016EB; Sat, 7 Mar 2020 11:32:44 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 46A2186A0F; Sat, 7 Mar 2020 11:32:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 027BWdnJ001111 for ; Sat, 7 Mar 2020 06:32:39 -0500 Received: by smtp.corp.redhat.com (Postfix) id 5720410F1CA5; Sat, 7 Mar 2020 11:32:39 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 51C7010F8E10 for ; Sat, 7 Mar 2020 11:32:35 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 32999101A55D for ; Sat, 7 Mar 2020 11:32:35 +0000 (UTC) Received: from huawei.com (szxga07-in.huawei.com [45.249.212.35]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-29-hqn2_Pt0Pp2_Z--hCEF05A-1; Sat, 07 Mar 2020 06:32:31 -0500 Received: from DGGEMS405-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 19D9534DAA750E1C561C for ; Sat, 7 Mar 2020 19:32:00 +0800 (CST) Received: from huawei.com (10.133.210.227) by DGGEMS405-HUB.china.huawei.com (10.3.19.205) with Microsoft SMTP Server id 14.3.487.0; Sat, 7 Mar 2020 19:31:51 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583580773; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=m84n9Q3+TpdER0HLAj6H5PhUwtT8UPRUHHMoICI8R8A=; b=iXnqozjFBimry49uiQpIkOvvfqC4Fif8ePudd0FT1VFyplMUqBKShcQRiPnZpIb0C12LUB BFHO6So9GeYl9NXItU5E8HbooSIfq5HXhAC9hB4a+m4/Qo2F/QvwyBcdtABPJBONqBgmEt ucTuWHnQClV/EG5pa3B1tCRNoID2rwo= X-MC-Unique: shQQadswP5qghEHZt4qMmg-1 X-MC-Unique: hqn2_Pt0Pp2_Z--hCEF05A-1 From: Zhang Bo To: Subject: [PATCHv2 1/5] virnetserver: Introduce virNetServerUpdateTlsFiles Date: Sat, 7 Mar 2020 19:31:00 +0800 Message-ID: <20200307113104.722-2-oscar.zhangbo@huawei.com> In-Reply-To: <20200307113104.722-1-oscar.zhangbo@huawei.com> References: <20200307113104.722-1-oscar.zhangbo@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.133.210.227] X-CFilter-Loop: Reflected X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 027BWdnJ001111 X-loop: libvir-list@redhat.com Cc: Zhang Bo , dengkai1@huawei.com, wujing42@huawei.com, wuqingliang4@huawei.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Add an API to update server's tls context. Reviewed-by: Daniel P. Berrang=C3=A9 --- src/libvirt_remote.syms | 1 + src/rpc/virnetserver.c | 51 ++++++++++++++++++++++++++++++++++++++ src/rpc/virnetserver.h | 2 ++ src/rpc/virnettlscontext.c | 46 ++++++++++++++++++++++++++++++++++ src/rpc/virnettlscontext.h | 3 +++ 5 files changed, 103 insertions(+) diff --git a/src/libvirt_remote.syms b/src/libvirt_remote.syms index 0493467f46..0018a0c41d 100644 --- a/src/libvirt_remote.syms +++ b/src/libvirt_remote.syms @@ -137,6 +137,7 @@ virNetServerSetClientLimits; virNetServerSetThreadPoolParameters; virNetServerSetTLSContext; virNetServerUpdateServices; +virNetServerUpdateTlsFiles; =20 =20 # rpc/virnetserverclient.h diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index 072ffdf5a3..0bfe94d3f8 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -21,6 +21,9 @@ =20 #include =20 +#include +#include + #include "virnetserver.h" #include "virlog.h" #include "viralloc.h" @@ -1205,3 +1208,51 @@ virNetServerSetClientLimits(virNetServerPtr srv, virObjectUnlock(srv); return ret; } + +static virNetTLSContextPtr +virNetServerGetTLSContext(virNetServerPtr srv) +{ + size_t i; + virNetTLSContextPtr ctxt =3D NULL; + virNetServerServicePtr svc =3D NULL; + + /* find svcTLS from srv, get svcTLS->tls */ + for (i =3D 0; i < srv->nservices; i++) { + svc =3D srv->services[i]; + ctxt =3D virNetServerServiceGetTLSContext(svc); + if (ctxt !=3D NULL) + break; + } + + return ctxt; +} + +int +virNetServerUpdateTlsFiles(virNetServerPtr srv) +{ + int ret =3D -1; + virNetTLSContextPtr ctxt =3D NULL; + bool privileged =3D geteuid() =3D=3D 0 ? true : false; + + ctxt =3D virNetServerGetTLSContext(srv); + if (!ctxt) { + VIR_ERROR(_("no tls svc found, unable to update tls files")); + return -1; + } + + virObjectLock(srv); + virObjectLock(ctxt); + + if (virNetTLSContextReloadForServer(ctxt, !privileged)) { + VIR_ERROR(_("failed to reload server's tls context")); + goto cleanup; + } + + VIR_INFO("update tls files success"); + ret =3D 0; + + cleanup: + virObjectUnlock(ctxt); + virObjectUnlock(srv); + return ret; +} diff --git a/src/rpc/virnetserver.h b/src/rpc/virnetserver.h index 260c99b22d..1c6a2efb6c 100644 --- a/src/rpc/virnetserver.h +++ b/src/rpc/virnetserver.h @@ -133,3 +133,5 @@ size_t virNetServerGetCurrentUnauthClients(virNetServer= Ptr srv); int virNetServerSetClientLimits(virNetServerPtr srv, long long int maxClients, long long int maxClientsUnauth); + +int virNetServerUpdateTlsFiles(virNetServerPtr srv); diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c index 44f0dfce77..02c17124a1 100644 --- a/src/rpc/virnettlscontext.c +++ b/src/rpc/virnettlscontext.c @@ -919,6 +919,52 @@ virNetTLSContextPtr virNetTLSContextNewServer(const ch= ar *cacert, } =20 =20 +int virNetTLSContextReloadForServer(virNetTLSContextPtr ctxt, + bool tryUserPkiPath) +{ + gnutls_certificate_credentials_t x509credBak; + int err; + char *cacert =3D NULL; + char *cacrl =3D NULL; + char *cert =3D NULL; + char *key =3D NULL; + + x509credBak =3D ctxt->x509cred; + ctxt->x509cred =3D NULL; + + if (virNetTLSContextLocateCredentials(NULL, tryUserPkiPath, true, + &cacert, &cacrl, &cert, &key)) + goto error; + + err =3D gnutls_certificate_allocate_credentials(&ctxt->x509cred); + if (err) { + virReportError(VIR_ERR_SYSTEM_ERROR, + _("Unable to allocate x509 credentials: %s"), + gnutls_strerror(err)); + goto error; + } + + if (virNetTLSContextSanityCheckCredentials(true, cacert, cert)) + goto error; + + if (virNetTLSContextLoadCredentials(ctxt, true, cacert, cacrl, cert, k= ey)) + goto error; + + gnutls_certificate_set_dh_params(ctxt->x509cred, + ctxt->dhParams); + + gnutls_certificate_free_credentials(x509credBak); + + return 0; + + error: + if (ctxt->x509cred) + gnutls_certificate_free_credentials(ctxt->x509cred); + ctxt->x509cred =3D x509credBak; + return -1; +} + + virNetTLSContextPtr virNetTLSContextNewClient(const char *cacert, const char *cacrl, const char *cert, diff --git a/src/rpc/virnettlscontext.h b/src/rpc/virnettlscontext.h index f3273bc26a..fe885aed9a 100644 --- a/src/rpc/virnettlscontext.h +++ b/src/rpc/virnettlscontext.h @@ -62,6 +62,9 @@ virNetTLSContextPtr virNetTLSContextNewClient(const char = *cacert, bool sanityCheckCert, bool requireValidCert); =20 +int virNetTLSContextReloadForServer(virNetTLSContextPtr ctxt, + bool tryUserPkiPath); + int virNetTLSContextCheckCertificate(virNetTLSContextPtr ctxt, virNetTLSSessionPtr sess); =20 --=20 2.23.0.windows.1 From nobody Sun May 5 04:41:59 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1583580770; cv=none; d=zohomail.com; s=zohoarc; b=C373MiuJ76KkikpjUdVbENlXJXud3yxqRtZsCxKGCgTCeNOtfo7kyXXvIUsbIFNsinwOAAHlh5cG3jMPwTFPyWQh1NChlaNUFWOuEfpE8apEl3MaS2kJRe1sZxCVHnNmKCYzOYO7mYRxggjmSLkMSOnsM1Ua9MTaA+2Lfqz2PpA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583580770; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=vTyoW/p+w8nC99XNRjlzxTWh8fTjeTCdpG2bX1n+b9Y=; b=Q7r4dPgi8OiXTC6ecWcWXQMlHGDr1aIvo+TFnbCbakOPk/cqKEN2aTPz9J0j0WiqyBV92VEwx6dLCNc2b8nBac6Q9lpvOIrJzC5XtPEyGJdfDw+tEnCX+CFzy9vYI5XlcyOa2SpbbESqvOwtdWD03GfqyKOFBoQIsFlkBu4u1Nw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1583580770178823.5166247882954; Sat, 7 Mar 2020 03:32:50 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-155-0TG7I5WuOY6LYV39u2GMtQ-1; Sat, 07 Mar 2020 06:32:47 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6B9348017DF; Sat, 7 Mar 2020 11:32:41 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 413831BC6D; Sat, 7 Mar 2020 11:32:41 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id EB0EF86A0A; Sat, 7 Mar 2020 11:32:40 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 027BW8hG001026 for ; Sat, 7 Mar 2020 06:32:08 -0500 Received: by smtp.corp.redhat.com (Postfix) id E39502166B2D; Sat, 7 Mar 2020 11:32:07 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DF1302166B28 for ; Sat, 7 Mar 2020 11:32:05 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B21848BA508 for ; Sat, 7 Mar 2020 11:32:05 +0000 (UTC) Received: from huawei.com (szxga07-in.huawei.com [45.249.212.35]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-390-MhckmoFcNHy7EGMcfure0g-1; Sat, 07 Mar 2020 06:32:03 -0500 Received: from DGGEMS405-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 058A0B7AEC7084D8C1A2 for ; Sat, 7 Mar 2020 19:32:00 +0800 (CST) Received: from huawei.com (10.133.210.227) by DGGEMS405-HUB.china.huawei.com (10.3.19.205) with Microsoft SMTP Server id 14.3.487.0; Sat, 7 Mar 2020 19:31:52 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583580769; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=vTyoW/p+w8nC99XNRjlzxTWh8fTjeTCdpG2bX1n+b9Y=; b=Ffyz2ohwUoevHcqv9YPpKFxb4quCEoVvna4PUo63N/0CL/5pf+gmFhNgOdOpoJTtxQ+a8t 8M0lrjbz4zihp2AM9iyhjtNY3cJxD2xti3jryiXgQLksmPSwXx5PE4NM8mGnbiCxKdR2kw 2mFBnbnCDp3rztAKL+638aNFFqRYIyE= X-MC-Unique: 0TG7I5WuOY6LYV39u2GMtQ-1 X-MC-Unique: MhckmoFcNHy7EGMcfure0g-1 From: Zhang Bo To: Subject: [PATCHv2 2/5] tls: Add a mutex lock on 'tlsCtxt' Date: Sat, 7 Mar 2020 19:31:01 +0800 Message-ID: <20200307113104.722-3-oscar.zhangbo@huawei.com> In-Reply-To: <20200307113104.722-1-oscar.zhangbo@huawei.com> References: <20200307113104.722-1-oscar.zhangbo@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.133.210.227] X-CFilter-Loop: Reflected X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 027BW8hG001026 X-loop: libvir-list@redhat.com Cc: Zhang Bo , dengkai1@huawei.com, wujing42@huawei.com, wuqingliang4@huawei.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Prevent the handshake function from reading 'tlsCtxt' while updating 'tlsCtxt'. --- src/rpc/virnetserverclient.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c index 4d85ee25d7..657108239f 100644 --- a/src/rpc/virnetserverclient.c +++ b/src/rpc/virnetserverclient.c @@ -1114,7 +1114,9 @@ int virNetServerClientInit(virNetServerClientPtr clie= nt) client->tls); =20 /* Begin the TLS handshake. */ + virObjectLock(client->tlsCtxt); ret =3D virNetTLSSessionHandshake(client->tls); + virObjectUnlock(client->tlsCtxt); if (ret =3D=3D 0) { /* Unlikely, but ... Next step is to check the certificate. */ if (virNetServerClientCheckAccess(client) < 0) @@ -1435,7 +1437,9 @@ virNetServerClientDispatchHandshake(virNetServerClien= tPtr client) { int ret; /* Continue the handshake. */ + virObjectLock(client->tlsCtxt); ret =3D virNetTLSSessionHandshake(client->tls); + virObjectUnlock(client->tlsCtxt); if (ret =3D=3D 0) { /* Finished. Next step is to check the certificate. */ if (virNetServerClientCheckAccess(client) < 0) --=20 2.23.0.windows.1 From nobody Sun May 5 04:41:59 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1583580754; cv=none; d=zohomail.com; s=zohoarc; b=CsFrQvhriGvzCL2hlXxXOCTy1JGzxkvw5o7TRBGywc7GuW+tbSqX9BATNGAtPCjA6FTN8eJqETy0j/IVfag98IeS+HmdmtAJ/pFp9J7xwGTfMvkHD/fPQY9FPqUjs/jAXPgHpEBnoAbd/8CHaUINk8UneZJNc9i+uomHXGd2uys= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583580754; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6j+o5GwKM2YVf0tca9128qSgqbEIF+Ol1dE9UCrz0iI=; b=kwZj1OcGxccRJt3WrGJW4EJvkGQKw36lxt0PPqfDrPDWJqzL+8DoaX5TMnT+n3G+zRHsr8YteDeKyv5JML8bQJQiwuZgXgQQ1E+VH1qHe8ZxD4/ed5tvTkeTWgKeMp25/+zAPhsWArPygJAz2dUgfEZZP/ma+68iT82O95xIfP0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1583580754104342.619954670331; Sat, 7 Mar 2020 03:32:34 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-229-ffFLhSjsMYi_TsH870LmvA-1; Sat, 07 Mar 2020 06:32:30 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6A1031005510; Sat, 7 Mar 2020 11:32:24 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 355545D9CA; Sat, 7 Mar 2020 11:32:24 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id D437B86A09; Sat, 7 Mar 2020 11:32:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 027BWE8M001070 for ; Sat, 7 Mar 2020 06:32:14 -0500 Received: by smtp.corp.redhat.com (Postfix) id 1C8B810F8E0E; Sat, 7 Mar 2020 11:32:14 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 181DB10F8E03 for ; Sat, 7 Mar 2020 11:32:14 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EB7A7101A55D for ; Sat, 7 Mar 2020 11:32:13 +0000 (UTC) Received: from huawei.com (szxga07-in.huawei.com [45.249.212.35]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-429-W57zm9zcOHm52wDeROO68w-1; Sat, 07 Mar 2020 06:32:10 -0500 Received: from DGGEMS405-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 2923D577EFFFF49706FC for ; Sat, 7 Mar 2020 19:32:00 +0800 (CST) Received: from huawei.com (10.133.210.227) by DGGEMS405-HUB.china.huawei.com (10.3.19.205) with Microsoft SMTP Server id 14.3.487.0; Sat, 7 Mar 2020 19:31:52 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583580753; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=6j+o5GwKM2YVf0tca9128qSgqbEIF+Ol1dE9UCrz0iI=; b=iClziJrliDDzSjMGac3DYytqhfuCTCB2LfRs7iuudZbqw0/1ZahLySdQzhkiV1QnL6piHZ kNtL9MhKJBDfuiIJ3DMlxC/YTmtzxp2pQDruSKtYg2Qcbua8wuflBeyR0hNyUnAc1R3D+G x1II6+C0Z2kXe4nm1JQKi+ochpAQUcQ= X-MC-Unique: ffFLhSjsMYi_TsH870LmvA-1 X-MC-Unique: W57zm9zcOHm52wDeROO68w-1 From: Zhang Bo To: Subject: [PATCHv2 3/5] admin: Introduce virAdmServerUpdateTlsFiles Date: Sat, 7 Mar 2020 19:31:02 +0800 Message-ID: <20200307113104.722-4-oscar.zhangbo@huawei.com> In-Reply-To: <20200307113104.722-1-oscar.zhangbo@huawei.com> References: <20200307113104.722-1-oscar.zhangbo@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.133.210.227] X-CFilter-Loop: Reflected X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 027BWE8M001070 X-loop: libvir-list@redhat.com Cc: Zhang Bo , dengkai1@huawei.com, wujing42@huawei.com, wuqingliang4@huawei.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The server needs to use CA certificate, CRL, server certificate/key to complete the TLS handshake. If these files change, we needed to restart libvirtd for them to take effect. This API can update the TLS context *ONLINE* without restarting libvirtd. --- include/libvirt/libvirt-admin.h | 3 +++ src/admin/admin_protocol.x | 12 ++++++++++- src/admin/admin_server.c | 9 +++++++++ src/admin/admin_server.h | 3 +++ src/admin/libvirt-admin.c | 30 ++++++++++++++++++++++++++++ src/admin/libvirt_admin_private.syms | 1 + src/admin/libvirt_admin_public.syms | 1 + 7 files changed, 58 insertions(+), 1 deletion(-) diff --git a/include/libvirt/libvirt-admin.h b/include/libvirt/libvirt-admi= n.h index abf2792926..e414f776e4 100644 --- a/include/libvirt/libvirt-admin.h +++ b/include/libvirt/libvirt-admin.h @@ -402,6 +402,9 @@ int virAdmServerSetClientLimits(virAdmServerPtr srv, int nparams, unsigned int flags); =20 +int virAdmServerUpdateTlsFiles(virAdmServerPtr srv, + unsigned int flags); + int virAdmConnectGetLoggingOutputs(virAdmConnectPtr conn, char **outputs, unsigned int flags); diff --git a/src/admin/admin_protocol.x b/src/admin/admin_protocol.x index 42e215d23a..7dc6724032 100644 --- a/src/admin/admin_protocol.x +++ b/src/admin/admin_protocol.x @@ -181,6 +181,11 @@ struct admin_server_set_client_limits_args { unsigned int flags; }; =20 +struct admin_server_update_tls_files_args { + admin_nonnull_server srv; + unsigned int flags; +}; + struct admin_connect_get_logging_outputs_args { unsigned int flags; }; @@ -314,5 +319,10 @@ enum admin_procedure { /** * @generate: both */ - ADMIN_PROC_CONNECT_SET_LOGGING_FILTERS =3D 17 + ADMIN_PROC_CONNECT_SET_LOGGING_FILTERS =3D 17, + + /** + * @generate: both + */ + ADMIN_PROC_SERVER_UPDATE_TLS_FILES =3D 18 }; diff --git a/src/admin/admin_server.c b/src/admin/admin_server.c index ba87f701c3..ebc0cfb045 100644 --- a/src/admin/admin_server.c +++ b/src/admin/admin_server.c @@ -367,3 +367,12 @@ adminServerSetClientLimits(virNetServerPtr srv, =20 return 0; } + +int +adminServerUpdateTlsFiles(virNetServerPtr srv, + unsigned int flags) +{ + virCheckFlags(0, -1); + + return virNetServerUpdateTlsFiles(srv); +} diff --git a/src/admin/admin_server.h b/src/admin/admin_server.h index 1d5cbec55f..08877a8edc 100644 --- a/src/admin/admin_server.h +++ b/src/admin/admin_server.h @@ -67,3 +67,6 @@ int adminServerSetClientLimits(virNetServerPtr srv, virTypedParameterPtr params, int nparams, unsigned int flags); + +int adminServerUpdateTlsFiles(virNetServerPtr srv, + unsigned int flags); diff --git a/src/admin/libvirt-admin.c b/src/admin/libvirt-admin.c index a8592ebfd3..835b5560d2 100644 --- a/src/admin/libvirt-admin.c +++ b/src/admin/libvirt-admin.c @@ -1078,6 +1078,36 @@ virAdmServerSetClientLimits(virAdmServerPtr srv, return ret; } =20 +/** + * virAdmServerUpdateTlsFiles: + * @srv: a valid server object reference + * @flags: extra flags; not used yet, so callers should always pass 0 + * + * Notify server to update tls file, such as cacert, cacrl, server cert / = key. + * + * Returns 0 if the TLS files have been updated successfully or -1 in case= of an + * error. + */ +int +virAdmServerUpdateTlsFiles(virAdmServerPtr srv, + unsigned int flags) +{ + int ret =3D -1; + + VIR_DEBUG("srv=3D%p, flags=3D0x%x", srv, flags); + virResetLastError(); + + virCheckAdmServerGoto(srv, error); + + if ((ret =3D remoteAdminServerUpdateTlsFiles(srv, flags)) < 0) + goto error; + + return ret; + error: + virDispatchError(NULL); + return ret; +} + /** * virAdmConnectGetLoggingOutputs: * @conn: pointer to an active admin connection diff --git a/src/admin/libvirt_admin_private.syms b/src/admin/libvirt_admin= _private.syms index 9526412de8..157a45341e 100644 --- a/src/admin/libvirt_admin_private.syms +++ b/src/admin/libvirt_admin_private.syms @@ -31,6 +31,7 @@ xdr_admin_server_lookup_client_args; xdr_admin_server_lookup_client_ret; xdr_admin_server_set_client_limits_args; xdr_admin_server_set_threadpool_parameters_args; +xdr_admin_server_update_tls_files_args; =20 # datatypes.h virAdmClientClass; diff --git a/src/admin/libvirt_admin_public.syms b/src/admin/libvirt_admin_= public.syms index 9a3f843780..8126973e5b 100644 --- a/src/admin/libvirt_admin_public.syms +++ b/src/admin/libvirt_admin_public.syms @@ -38,6 +38,7 @@ LIBVIRT_ADMIN_2.0.0 { virAdmClientClose; virAdmServerGetClientLimits; virAdmServerSetClientLimits; + virAdmServerUpdateTlsFiles; }; =20 LIBVIRT_ADMIN_3.0.0 { --=20 2.23.0.windows.1 From nobody Sun May 5 04:41:59 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1583580748; cv=none; d=zohomail.com; s=zohoarc; b=eWzPQcaINVxjfjthy/SzvTcD1cXjOjZe+vFg3ETOxKKr7H66oGfkccgD4pSzBNvbigvV5qNmmWWteV/8tjPzuBTat3r6XuxgVFo8OKW6LosyFhtPxZjNDYAyzgQmpq9J+sqaXZin1O143BJtZ7IYpwMT+f9EXidy8OqYZH6WWV8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583580748; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=X922RFvsBlxuAJevYbT41077HY5FO5quHk2VfDpd5tw=; b=YCL1CGBmDGGx4swdtRE305o0N8el5P31n2YIADKws/LlTkbxQyPVwsR1qr32RnGpU8QyndhRucJMAfj8LX6y/u46MMlwadymQMAiX4knW5117lz2Kg90Wbvp8Ul3hs51HhMSYV2tU7TnVPC4QdHBaq39dxnK42VILPyhLz4gIFs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1583580748540647.8832179564328; Sat, 7 Mar 2020 03:32:28 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-327-CXTJSFF6M7G01GBfyvLpoA-1; Sat, 07 Mar 2020 06:32:25 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 59D3F107ACC4; Sat, 7 Mar 2020 11:32:19 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6C96D91D94; Sat, 7 Mar 2020 11:32:18 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id E84BE18095FF; Sat, 7 Mar 2020 11:32:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 027BW9kI001036 for ; Sat, 7 Mar 2020 06:32:09 -0500 Received: by smtp.corp.redhat.com (Postfix) id 2AE3A2038B80; Sat, 7 Mar 2020 11:32:09 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 244A42026D68 for ; Sat, 7 Mar 2020 11:32:06 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7DEC780066D for ; Sat, 7 Mar 2020 11:32:06 +0000 (UTC) Received: from huawei.com (szxga07-in.huawei.com [45.249.212.35]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-36-Dh92yhGzOLqmTTZaibGLeA-1; Sat, 07 Mar 2020 06:32:03 -0500 Received: from DGGEMS405-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id EF6ED61530B4E81A7B1D for ; Sat, 7 Mar 2020 19:31:59 +0800 (CST) Received: from huawei.com (10.133.210.227) by DGGEMS405-HUB.china.huawei.com (10.3.19.205) with Microsoft SMTP Server id 14.3.487.0; Sat, 7 Mar 2020 19:31:53 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583580747; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=X922RFvsBlxuAJevYbT41077HY5FO5quHk2VfDpd5tw=; b=cgTJ91DXgON2ZWuJHwT8cgGx0QCaC5vQCp4sj7p/i3yza4B9Az0WjoVXm0K/ucShK2z6ih g48GXe/EgJvIsc+6KR6rFQWLHk+x7kqRngkwVHSzpGGneEn8PTDA22g9YAx8/MVJghwNg5 OXrl+pzodyfxoX0h8Ml120ncYkOQhHc= X-MC-Unique: CXTJSFF6M7G01GBfyvLpoA-1 X-MC-Unique: Dh92yhGzOLqmTTZaibGLeA-1 From: Zhang Bo To: Subject: [PATCHv2 4/5] virt-admin: Introduce command srv-update-tls Date: Sat, 7 Mar 2020 19:31:03 +0800 Message-ID: <20200307113104.722-5-oscar.zhangbo@huawei.com> In-Reply-To: <20200307113104.722-1-oscar.zhangbo@huawei.com> References: <20200307113104.722-1-oscar.zhangbo@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.133.210.227] X-CFilter-Loop: Reflected X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 027BW9kI001036 X-loop: libvir-list@redhat.com Cc: Zhang Bo , dengkai1@huawei.com, wujing42@huawei.com, wuqingliang4@huawei.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" wire-up virAdmServerUpdateTlsFiles API into virt-admin client. --- tools/virt-admin.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/tools/virt-admin.c b/tools/virt-admin.c index 32edfe5757..a8e5e0a5af 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -957,6 +957,60 @@ cmdSrvClientsSet(vshControl *ctl, const vshCmd *cmd) goto cleanup; } =20 +/* ------------------------ + * Command srv-update-tls + * ------------------------ + */ +static const vshCmdInfo info_srv_update_tls_file[] =3D { + {.name =3D "help", + .data =3D N_("notify server to update TLS related files online.") + }, + {.name =3D "desc", + .data =3D N_("notify server to update the CA cert, " + "CA CRL, server cert / key without restarts. " + "See OPTIONS for currently supported attributes.") + }, + {.name =3D NULL} +}; + +static const vshCmdOptDef opts_srv_update_tls_file[] =3D { + {.name =3D "server", + .type =3D VSH_OT_DATA, + .flags =3D VSH_OFLAG_REQ, + .help =3D N_("Available servers on a daemon. " + "Currently only supports 'libvirtd'.") + }, + {.name =3D NULL} +}; + +static bool +cmdSrvUpdateTlsFiles(vshControl *ctl, const vshCmd *cmd) +{ + bool ret =3D false; + const char *srvname =3D NULL; + + virAdmServerPtr srv =3D NULL; + vshAdmControlPtr priv =3D ctl->privData; + + if (vshCommandOptStringReq(ctl, cmd, "server", &srvname) < 0) + return false; + + if (!(srv =3D virAdmConnectLookupServer(priv->conn, srvname, 0))) + goto cleanup; + + if (virAdmServerUpdateTlsFiles(srv, 0) < 0) { + vshError(ctl, "%s", _("Unable to update server's tls related files= .")); + goto cleanup; + } + + ret =3D true; + vshPrint(ctl, "update tls related files succeed\n"); + + cleanup: + virAdmServerFree(srv); + return ret; +} + /* -------------------------- * Command daemon-log-filters * -------------------------- @@ -1436,6 +1490,16 @@ static const vshCmdDef managementCmds[] =3D { .info =3D info_srv_clients_set, .flags =3D 0 }, + {.name =3D "srv-update-tls", + .flags =3D VSH_CMD_FLAG_ALIAS, + .alias =3D "server-update-tls" + }, + {.name =3D "server-update-tls", + .handler =3D cmdSrvUpdateTlsFiles, + .opts =3D opts_srv_update_tls_file, + .info =3D info_srv_update_tls_file, + .flags =3D 0 + }, {.name =3D "daemon-log-filters", .handler =3D cmdDaemonLogFilters, .opts =3D opts_daemon_log_filters, --=20 2.23.0.windows.1 From nobody Sun May 5 04:41:59 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1583580770; cv=none; d=zohomail.com; s=zohoarc; b=kJu0tj0Vx56mKKGSOZDgGQW315p22jxRgyamgL4gyFnS2N2KWN3MP5y+orX90VZLxdhrKY1+KGsBF/NDWQYpHoQa1y+B15L1O2WhHEO9ufXboqdWDpYayB7hcUauNanHxP6dJZeG5w6lbXqzKctPTrkClp1DDoOT8x3wLMPngzE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583580770; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HO0fNZIP0qru3Wja6lL4n27C4yHKxV32zoMg8cXkRzc=; b=Q6eFBd9touEYVN4VJlg6FcOxDxNjGAZxZ3ucMgzC5i4EBmWPZGFNe+AMdtEynZPqA6KWDT0C/YJLV/VDsvfUNSwwtrEnh6CQvlN9yr7SprF3gdVNnpDIztEV+yRgopN2fwwNrz63OGi17uc7gSulXH9uEnPFyk0z+vU1QrrRgFs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 15835807709258.92110630997206; Sat, 7 Mar 2020 03:32:50 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-207-t1gdD1WbOMKW57eA5dkLqg-1; Sat, 07 Mar 2020 06:32:47 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6763A100550E; Sat, 7 Mar 2020 11:32:41 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 39E0860C80; Sat, 7 Mar 2020 11:32:41 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id E595686A09; Sat, 7 Mar 2020 11:32:40 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 027BW9SD001037 for ; Sat, 7 Mar 2020 06:32:10 -0500 Received: by smtp.corp.redhat.com (Postfix) id 9CE3310F8E03; Sat, 7 Mar 2020 11:32:09 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast05.extmail.prod.ext.rdu2.redhat.com [10.11.55.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 986AC104FA56 for ; Sat, 7 Mar 2020 11:32:07 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B6455800296 for ; Sat, 7 Mar 2020 11:32:07 +0000 (UTC) Received: from huawei.com (szxga07-in.huawei.com [45.249.212.35]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-261-5uNGKAqgNRupak_8R0jv-A-1; Sat, 07 Mar 2020 06:32:04 -0500 Received: from DGGEMS405-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id F2CD989FC0F27BBEDD8A for ; Sat, 7 Mar 2020 19:31:59 +0800 (CST) Received: from huawei.com (10.133.210.227) by DGGEMS405-HUB.china.huawei.com (10.3.19.205) with Microsoft SMTP Server id 14.3.487.0; Sat, 7 Mar 2020 19:31:54 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583580770; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=HO0fNZIP0qru3Wja6lL4n27C4yHKxV32zoMg8cXkRzc=; b=gEx5E7yTsfj7a0IMHs4p4ux/QvDNUKgBtVWZekGr5gmG+wS1yqGoJJn38NBU8LIoWROZKE tCmc5CRBLoOeeOWLvopBE56pvqnUksodYRWwkLnbLFC+KaOagffPNIUl7mZ0zeNKECXYhI u0+k8owKhY63flHz5s6Fb5SjwrRBOy8= X-MC-Unique: t1gdD1WbOMKW57eA5dkLqg-1 X-MC-Unique: 5uNGKAqgNRupak_8R0jv-A-1 From: Zhang Bo To: Subject: [PATCHv2 5/5] docs: update virt-admin.rst for server-update-tls Date: Sat, 7 Mar 2020 19:31:04 +0800 Message-ID: <20200307113104.722-6-oscar.zhangbo@huawei.com> In-Reply-To: <20200307113104.722-1-oscar.zhangbo@huawei.com> References: <20200307113104.722-1-oscar.zhangbo@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.133.210.227] X-CFilter-Loop: Reflected X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 027BW9SD001037 X-loop: libvir-list@redhat.com Cc: Zhang Bo , dengkai1@huawei.com, wujing42@huawei.com, wuqingliang4@huawei.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Update the manpage for the 'server-update-tls' command --- docs/manpages/virt-admin.rst | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/docs/manpages/virt-admin.rst b/docs/manpages/virt-admin.rst index 51c3d3917e..3e0d127790 100644 --- a/docs/manpages/virt-admin.rst +++ b/docs/manpages/virt-admin.rst @@ -442,6 +442,22 @@ Set new client-related limits on *server*. *--max-clients*. =20 =20 +server-update-tls +----------------- + +**Syntax:** + +.. code-block:: + + server-update-tls server + +Update tls context on *server*. + +- *server* + + Available servers on a daemon. Currently only supports 'libvirtd'. + + CLIENT COMMANDS =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 --=20 2.23.0.windows.1