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=-15.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 20FE2C433C1 for ; Tue, 23 Mar 2021 13:28:31 +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 4344F61974 for ; Tue, 23 Mar 2021 13:28:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4344F61974 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]:39466 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOh5A-0003qq-Uy for qemu-devel@archiver.kernel.org; Tue, 23 Mar 2021 09:28:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58010) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOh4M-0002os-AS for qemu-devel@nongnu.org; Tue, 23 Mar 2021 09:27:38 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:28894) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOh4I-0006nP-NG for qemu-devel@nongnu.org; Tue, 23 Mar 2021 09:27:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616506053; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=h1iEa+zIGT0FLOVNf5wcXJUwDa75lKVZtlYHbKMlT98=; b=cIkPCAcZKzsanYuO/3vgu2xJq83NExfSfDJ7uqspTItUM/vdaQP2uWy6IZITXpPwLEOaBa p2GYHz4p0NAnvWfDsmgqnArwZQKO2Ymnvuvv3bckfDnGO2IUNNbeplSTlfAi8iu8ZQPgoB LN8vn24bwvuc/1R+DWxnL6XGLCKU18I= 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-449-n4bK7kw_OFqQdIigJcg6yw-1; Tue, 23 Mar 2021 09:27:31 -0400 X-MC-Unique: n4bK7kw_OFqQdIigJcg6yw-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E041283DD24; Tue, 23 Mar 2021 13:27:29 +0000 (UTC) Received: from [10.10.117.181] (ovpn-117-181.rdu2.redhat.com [10.10.117.181]) by smtp.corp.redhat.com (Postfix) with ESMTP id 111C319813; Tue, 23 Mar 2021 13:27:25 +0000 (UTC) Subject: Re: [PATCH 07/28] qapi: Fix to reject optional members with reserved names To: Markus Armbruster , qemu-devel@nongnu.org References: <20210323094025.3569441-1-armbru@redhat.com> <20210323094025.3569441-8-armbru@redhat.com> From: John Snow Message-ID: <42dad810-715d-1dba-2476-b730422101c0@redhat.com> Date: Tue, 23 Mar 2021 09:27:25 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.0 MIME-Version: 1.0 In-Reply-To: <20210323094025.3569441-8-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jsnow@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=216.205.24.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_LOW=-0.7, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: michael.roth@amd.com, marcandre.lureau@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 3/23/21 5:40 AM, Markus Armbruster wrote: > check_type() fails to reject optional members with reserved names, > because it neglects to strip off the leading '*'. Fix that. > > The stripping in check_name_str() is now useless. Drop. > > Also drop the "no leading '*'" assertion, because valid_name.match() > ensures it can't fail. > (Yep, I noticed that, but assumed that it made someone feel safe, so I left it!) > Fixes: 9fb081e0b98409556d023c7193eeb68947cd1211 > Signed-off-by: Markus Armbruster > --- > scripts/qapi/expr.py | 9 ++++----- > tests/qapi-schema/reserved-member-u.err | 2 ++ > tests/qapi-schema/reserved-member-u.json | 1 - > tests/qapi-schema/reserved-member-u.out | 14 -------------- > 4 files changed, 6 insertions(+), 20 deletions(-) > > diff --git a/scripts/qapi/expr.py b/scripts/qapi/expr.py > index 2fcaaa2497..cf09fa9fd3 100644 > --- a/scripts/qapi/expr.py > +++ b/scripts/qapi/expr.py > @@ -34,12 +34,10 @@ def check_name_is_str(name, info, source): > > > def check_name_str(name, info, source, > - allow_optional=False, enum_member=False, > + enum_member=False, I guess we now assume here (in this function) that '*' is /never/ allowed. > permit_upper=False): > membername = name > > - if allow_optional and name.startswith('*'): > - membername = name[1:] > # Enum members can start with a digit, because the generated C > # code always prefixes it with the enum name > if enum_member and membername[0].isdigit(): > @@ -52,7 +50,6 @@ def check_name_str(name, info, source, > if not permit_upper and name.lower() != name: > raise QAPISemError( > info, "%s uses uppercase in name" % source) > - assert not membername.startswith('*') > > > def check_defn_name_str(name, info, meta): > @@ -171,8 +168,10 @@ def check_type(value, info, source, > # value is a dictionary, check that each member is okay > for (key, arg) in value.items(): > key_source = "%s member '%s'" % (source, key) > + if key.startswith('*'): > + key = key[1:] And we'll strip it out up here instead... > check_name_str(key, info, key_source, > - allow_optional=True, permit_upper=permit_upper) > + permit_upper=permit_upper) Which makes that check the same, but > if c_name(key, False) == 'u' or c_name(key, False).startswith('has_'): > raise QAPISemError(info, "%s uses reserved name" % key_source) This check now behaves differently, fixing the bug. Reviewed-by: John Snow (assuming that this was tested and didn't break something /else/ I haven't considered.) > check_keys(arg, info, key_source, ['type'], ['if', 'features']) > diff --git a/tests/qapi-schema/reserved-member-u.err b/tests/qapi-schema/reserved-member-u.err > index e69de29bb2..b58e599a00 100644 > --- a/tests/qapi-schema/reserved-member-u.err > +++ b/tests/qapi-schema/reserved-member-u.err > @@ -0,0 +1,2 @@ > +reserved-member-u.json: In struct 'Oops': > +reserved-member-u.json:7: 'data' member '*u' uses reserved name > diff --git a/tests/qapi-schema/reserved-member-u.json b/tests/qapi-schema/reserved-member-u.json > index 15005abb09..2bfb8f59b6 100644 > --- a/tests/qapi-schema/reserved-member-u.json > +++ b/tests/qapi-schema/reserved-member-u.json > @@ -4,5 +4,4 @@ > # This is true even for non-unions, because it is possible to convert a > # struct to flat union while remaining backwards compatible in QMP. > # TODO - we could munge the member name to 'q_u' to avoid the collision > -# BUG: not rejected > { 'struct': 'Oops', 'data': { '*u': 'str' } } > diff --git a/tests/qapi-schema/reserved-member-u.out b/tests/qapi-schema/reserved-member-u.out > index 6a3705518b..e69de29bb2 100644 > --- a/tests/qapi-schema/reserved-member-u.out > +++ b/tests/qapi-schema/reserved-member-u.out > @@ -1,14 +0,0 @@ > -module ./builtin > -object q_empty > -enum QType > - prefix QTYPE > - member none > - member qnull > - member qnum > - member qstring > - member qdict > - member qlist > - member qbool > -module reserved-member-u.json > -object Oops > - member u: str optional=True >