From nobody Mon Nov 25 12:20:57 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1715691502; cv=none; d=zohomail.com; s=zohoarc; b=huOkBdGBoq6lGtUaLk1tx8nkf84NweXn0WWV76dJPN4wzdPd1a9RL++p3TuzrjZGQa4L4ZJfcqZdHGQeYTWCTqk9QufsgBC5by6EjN19YCm5rJmiJy8weaJXfX4IpzGj4HUT8oNFqGJIjU814ECVJFpu4AgMJ9plsHdw1M4eSwE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1715691502; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=zmUvabFbM+5OwxI+dTdCm1VUwA2ZFPyObGsB+gBRnMw=; b=hm3mBI7DexVd9RJ6ftjlTu2bskXZcPqBkgAkPLwJTZ7uhTBSqlr4IW9FgQebhBylzC+i9ExngGvHCazCTXoZXHWd+SwdNMavtkMEX+emXId6NY5bFAFHKApvE5f+Cj6BfnFWrvJ7ZGH386L1hJohTVff9F1q4FEfJQnzsgDrrxI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1715691502127278.46438395884616; Tue, 14 May 2024 05:58:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s6rjN-0004gX-8e; Tue, 14 May 2024 08:58:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s6rjJ-0004bL-0P for qemu-devel@nongnu.org; Tue, 14 May 2024 08:58:05 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s6rjG-0006Fz-7h for qemu-devel@nongnu.org; Tue, 14 May 2024 08:58:04 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-462-wd7kdXDCNkKkZPzTPRJK3Q-1; Tue, 14 May 2024 08:51:34 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 144A1800CA5; Tue, 14 May 2024 12:51:34 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.193.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5B020400057; Tue, 14 May 2024 12:51:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1715691481; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zmUvabFbM+5OwxI+dTdCm1VUwA2ZFPyObGsB+gBRnMw=; b=LMHeBu/bMI8AtcMAzl8vBhKBUSHN+8i2G7ESDeUQEgdabjYFmf+eGsbPjBLiyUp5GN558t Oqdw3htH/wGK6SiWxZkz2fnUWPjXlbamFR+1SKLQzUm5CdvKrfBJgQy/ce+1nnKv+w//TP 7SVD/guSd4noPDWtWbNALWg6+yvZNr8= X-MC-Unique: wd7kdXDCNkKkZPzTPRJK3Q-1 From: Thomas Huth To: qemu-devel@nongnu.org, Richard Henderson Subject: [PULL 10/11] block/ssh: Use URI parsing code from glib Date: Tue, 14 May 2024 14:51:18 +0200 Message-ID: <20240514125119.284638-11-thuth@redhat.com> In-Reply-To: <20240514125119.284638-1-thuth@redhat.com> References: <20240514125119.284638-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.9 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.974, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1715691502535100001 Content-Type: text/plain; charset="utf-8" Since version 2.66, glib has useful URI parsing functions, too. Use those instead of the QEMU-internal ones to be finally able to get rid of the latter. While we're at it, also emit a warning when encountering unknown parameters in the URI, so that the users have a chance to detect their typos or other mistakes. Reviewed-by: Richard W.M. Jones Message-ID: <20240418101056.302103-13-thuth@redhat.com> Signed-off-by: Thomas Huth --- block/ssh.c | 75 ++++++++++++++++++++++++++++------------------------- 1 file changed, 40 insertions(+), 35 deletions(-) diff --git a/block/ssh.c b/block/ssh.c index 2748253d4a..a88171d4b5 100644 --- a/block/ssh.c +++ b/block/ssh.c @@ -37,7 +37,6 @@ #include "qemu/ctype.h" #include "qemu/cutils.h" #include "qemu/sockets.h" -#include "qemu/uri.h" #include "qapi/qapi-visit-sockets.h" #include "qapi/qapi-visit-block-core.h" #include "qapi/qmp/qdict.h" @@ -181,65 +180,71 @@ static void sftp_error_trace(BDRVSSHState *s, const c= har *op) =20 static int parse_uri(const char *filename, QDict *options, Error **errp) { - URI *uri =3D NULL; - QueryParams *qp; + g_autoptr(GUri) uri =3D g_uri_parse(filename, G_URI_FLAGS_NONE, NULL); + const char *uri_host, *uri_path, *uri_user, *uri_query; char *port_str; - int i; + int port; + g_autoptr(GError) gerror =3D NULL; + char *qp_name, *qp_value; + GUriParamsIter qp; =20 - uri =3D uri_parse(filename); if (!uri) { return -EINVAL; } =20 - if (g_strcmp0(uri->scheme, "ssh") !=3D 0) { + if (g_strcmp0(g_uri_get_scheme(uri), "ssh") !=3D 0) { error_setg(errp, "URI scheme must be 'ssh'"); - goto err; + return -EINVAL; } =20 - if (!uri->server || strcmp(uri->server, "") =3D=3D 0) { + uri_host =3D g_uri_get_host(uri); + if (!uri_host || g_str_equal(uri_host, "")) { error_setg(errp, "missing hostname in URI"); - goto err; + return -EINVAL; } =20 - if (!uri->path || strcmp(uri->path, "") =3D=3D 0) { + uri_path =3D g_uri_get_path(uri); + if (!uri_path || g_str_equal(uri_path, "")) { error_setg(errp, "missing remote path in URI"); - goto err; - } - - qp =3D query_params_parse(uri->query); - if (!qp) { - error_setg(errp, "could not parse query parameters"); - goto err; + return -EINVAL; } =20 - if(uri->user && strcmp(uri->user, "") !=3D 0) { - qdict_put_str(options, "user", uri->user); + uri_user =3D g_uri_get_user(uri); + if (uri_user && !g_str_equal(uri_user, "")) { + qdict_put_str(options, "user", uri_user); } =20 - qdict_put_str(options, "server.host", uri->server); + qdict_put_str(options, "server.host", uri_host); =20 - port_str =3D g_strdup_printf("%d", uri->port ?: 22); + port =3D g_uri_get_port(uri); + port_str =3D g_strdup_printf("%d", port > 0 ? port : 22); qdict_put_str(options, "server.port", port_str); g_free(port_str); =20 - qdict_put_str(options, "path", uri->path); - - /* Pick out any query parameters that we understand, and ignore - * the rest. - */ - for (i =3D 0; i < qp->n; ++i) { - if (strcmp(qp->p[i].name, "host_key_check") =3D=3D 0) { - qdict_put_str(options, "host_key_check", qp->p[i].value); + qdict_put_str(options, "path", uri_path); + + uri_query =3D g_uri_get_query(uri); + if (uri_query) { + g_uri_params_iter_init(&qp, uri_query, -1, "&", G_URI_PARAMS_NONE); + while (g_uri_params_iter_next(&qp, &qp_name, &qp_value, &gerror)) { + if (!qp_name || !qp_value || gerror) { + warn_report("Failed to parse SSH URI parameters '%s'", + uri_query); + break; + } + /* + * Pick out the query parameters that we understand, and ignore + * (or rather warn about) the rest. + */ + if (g_str_equal(qp_name, "host_key_check")) { + qdict_put_str(options, "host_key_check", qp_value); + } else { + warn_report("Unsupported parameter '%s' in URI", qp_name); + } } } =20 - query_params_free(qp); - uri_free(uri); return 0; - - err: - uri_free(uri); - return -EINVAL; } =20 static bool ssh_has_filename_options_conflict(QDict *options, Error **errp) --=20 2.45.0