From mboxrd@z Thu Jan 1 00:00:00 1970 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=-10.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED 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 6C664C2D0A8 for ; Mon, 28 Sep 2020 12:05:04 +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 9843920774 for ; Mon, 28 Sep 2020 12:05:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="OmI0Xiai" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9843920774 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:36486 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kMrtu-0008Vf-At for qemu-devel@archiver.kernel.org; Mon, 28 Sep 2020 08:05:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42736) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kMrt9-00082s-4T for qemu-devel@nongnu.org; Mon, 28 Sep 2020 08:04:15 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:41429) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kMrt5-0001fa-3i for qemu-devel@nongnu.org; Mon, 28 Sep 2020 08:04:14 -0400 Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601294650; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=OgpJPg7rDoVGXI2ZP+61SWVkcZrz3rlsE1riw5BVliY=; b=OmI0XiaiB73Lh9ObSVMy1igitIaz/4mNT1Jd0bx+EqXtdT36IXx5rBI6UxrH8KAW359KqC WiGE0wrp74ueOjrxpqbX+fDKcNvvVcHOHs26V/eGuBMjSlw8ONOdqIJe7/11NdaDtvkAfG tMpT4hBkK0WbKdq017xE8DN5kFwdpT8= 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-45-fKM7pCUBOxWYv9pQvBYFDg-1; Mon, 28 Sep 2020 08:04:04 -0400 X-MC-Unique: fKM7pCUBOxWYv9pQvBYFDg-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 31DCB8C2B20; Mon, 28 Sep 2020 12:04:03 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-70.ams2.redhat.com [10.36.112.70]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F280E19D7D; Mon, 28 Sep 2020 12:04:02 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 80555113865F; Mon, 28 Sep 2020 14:04:01 +0200 (CEST) From: Markus Armbruster To: Eduardo Habkost Subject: Re: [PATCH v2 24/38] qapi/gen.py: Fix edge-case of _is_user_module References: <20200922210101.4081073-1-jsnow@redhat.com> <20200922210101.4081073-25-jsnow@redhat.com> <20200923151743.GK3312949@habkost.net> <87wo0iroxo.fsf@dusky.pond.sub.org> <20200925151527.GQ3717385@habkost.net> <20200925155028.GR3717385@habkost.net> Date: Mon, 28 Sep 2020 14:04:01 +0200 In-Reply-To: <20200925155028.GR3717385@habkost.net> (Eduardo Habkost's message of "Fri, 25 Sep 2020 11:50:28 -0400") Message-ID: <873632hzv2.fsf@dusky.pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Received-SPF: pass client-ip=216.205.24.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/28 03:29:35 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.687, 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_H5=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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , John Snow , qemu-devel@nongnu.org, Michael Roth , Cleber Rosa , Alex =?utf-8?Q?Benn=C3=A9e?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Eduardo Habkost writes: > On Fri, Sep 25, 2020 at 11:15:28AM -0400, Eduardo Habkost wrote: >> On Fri, Sep 25, 2020 at 03:00:51PM +0200, Markus Armbruster wrote: >> > Eduardo Habkost writes: >> > >> > > On Tue, Sep 22, 2020 at 05:00:47PM -0400, John Snow wrote: >> > >> The edge case is that if the name is '', this expression returns a >> > >> string instead of a bool, which violates our declared type. >> > >> >> > >> Signed-off-by: John Snow >> > >> --- >> > >> scripts/qapi/gen.py | 2 +- >> > >> 1 file changed, 1 insertion(+), 1 deletion(-) >> > >> >> > >> diff --git a/scripts/qapi/gen.py b/scripts/qapi/gen.py >> > >> index 9898d513ae..cb2b2655c3 100644 >> > >> --- a/scripts/qapi/gen.py >> > >> +++ b/scripts/qapi/gen.py >> > >> @@ -251,7 +251,7 @@ def __init__(self, prefix, what, user_blurb, builtin_blurb, pydoc): >> > >> >> > >> @staticmethod >> > >> def _is_user_module(name): >> > >> - return name and not name.startswith('./') >> > >> + return name is not None and not name.startswith('./') >> > > >> > > This changes behavior if name=='', and I guess this is OK, but >> > > I'm not sure. >> > >> > @name is either >> > >> > (1) A module pathname relative to the main module >> > >> > This is a module defined by the user. >> > >> > (2) system module name, starting with './' >> > >> > This is a named system module. We currently have two: './init' in >> > commands.py, and and './emit' in events.py. >> > >> > (3) None >> > >> > This is the (nameless) system module for built-in stuff. It >> > predates (2). Using './builtin' would probably be better now. >> > >> > Note that (1) and (2) are disjoint: relative pathnames do not begin with >> > './'. >> > >> > name='' is not possible, because '' is not a valid pathname. >> >> Thanks! So, the './' prefix is just internal state and never >> visible to the outside, correct? Yes. >> I would use a separate bool >> instead of trying to encode additional state inside the string. > > I've found only one place where the './' prefix might be leaking, > and I don't know if it's intentional or not: > > Is the name argument to visit_include() supposed to be always > (1), or are './' pathnames allowed too? Always (1). visit_include() gets passed a module name: class QAPISchemaInclude(QAPISchemaEntity): [...] def visit(self, visitor): super().visit(visitor) visitor.visit_include(self._sub_module.name, self.info) Module names are relative to the main module's directory: def _module_name(self, fname): if fname is None: return None return os.path.relpath(fname, self._schema_dir) os,path.relpath() normalizes away './': $ python Python 3.8.5 (default, Aug 12 2020, 00:00:00) [GCC 10.2.1 20200723 (Red Hat 10.2.1-1)] on linux Type "help", "copyright", "credits" or "license" for more information. >>> os.path.relpath('./sub.json', '') 'sub.json' QAPISchema._make_module() uses ._module_name() as it should: def _make_module(self, fname): name = self._module_name(fname) if name not in self._module_dict: self._module_dict[name] = QAPISchemaModule(name) return self._module_dict[name]