From patchwork Tue Jul 31 06:03:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Pettit X-Patchwork-Id: 951393 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ovn.org Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41fm8V1fS0z9ryn for ; Tue, 31 Jul 2018 16:03:37 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 3E961C22; Tue, 31 Jul 2018 06:03:35 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 2B7AF3EE for ; Tue, 31 Jul 2018 06:03:33 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 562E66A2 for ; Tue, 31 Jul 2018 06:03:32 +0000 (UTC) X-Originating-IP: 76.21.1.228 Received: from localhost.localdomain (unknown [76.21.1.228]) (Authenticated sender: jpettit@ovn.org) by relay6-d.mail.gandi.net (Postfix) with ESMTPSA id 492A5C0003 for ; Tue, 31 Jul 2018 06:03:28 +0000 (UTC) From: Justin Pettit To: dev@openvswitch.org Date: Mon, 30 Jul 2018 23:03:19 -0700 Message-Id: <20180731060319.27558-1-jpettit@ovn.org> X-Mailer: git-send-email 2.17.1 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH] ovn: Clean up log() action parsing errors. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org This also add some OVN action parsing tests. Suggested-by: Ben Pfaff Signed-off-by: Justin Pettit Acked-by: Mark Michelson --- ovn/lib/actions.c | 9 ++++++++- tests/ovn.at | 19 +++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/ovn/lib/actions.c b/ovn/lib/actions.c index 2126fd57551e..bc1a20040cff 100644 --- a/ovn/lib/actions.c +++ b/ovn/lib/actions.c @@ -2071,7 +2071,8 @@ parse_log_arg(struct action_context *ctx, struct ovnact_log *log) } else if (lexer_match_id(ctx->lexer, "allow")) { log->verdict = LOG_VERDICT_ALLOW; } else { - lexer_syntax_error(ctx->lexer, "unknown acl verdict"); + lexer_syntax_error(ctx->lexer, "unknown verdict"); + return; } } else if (lexer_match_id(ctx->lexer, "name")) { if (!lexer_force_match(ctx->lexer, LEX_T_EQUALS)) { @@ -2103,6 +2104,9 @@ parse_log_arg(struct action_context *ctx, struct ovnact_log *log) log->severity = severity; lexer_get(ctx->lexer); return; + } else { + lexer_syntax_error(ctx->lexer, "unknown severity"); + return; } } lexer_syntax_error(ctx->lexer, "expecting severity"); @@ -2142,6 +2146,9 @@ parse_LOG(struct action_context *ctx) lexer_match(ctx->lexer, LEX_T_COMMA); } } + if (log->verdict == LOG_VERDICT_UNKNOWN) { + lexer_syntax_error(ctx->lexer, "expecting verdict"); + } } static void diff --git a/tests/ovn.at b/tests/ovn.at index df80b98d64b4..163f5c590516 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -1224,6 +1224,25 @@ set_meter(100, 1000, ); set_meter(4294967295, 4294967295); encodes as meter:3 +# log +log(verdict=allow, severity=warning); + encodes as controller(userdata=00.00.00.07.00.00.00.00.00.04) +log(name="test1", verdict=drop, severity=info); + encodes as controller(userdata=00.00.00.07.00.00.00.00.01.06.74.65.73.74.31) +log(verdict=drop, severity=info, meter="meter1"); + encodes as controller(userdata=00.00.00.07.00.00.00.00.01.06,meter_id=4) +log(name="test1", verdict=drop, severity=info, meter="meter1"); + encodes as controller(userdata=00.00.00.07.00.00.00.00.01.06.74.65.73.74.31,meter_id=4) +log(verdict=drop); + formats as log(verdict=drop, severity=info); + encodes as controller(userdata=00.00.00.07.00.00.00.00.01.06) +log(verdict=bad_verdict, severity=info); + Syntax error at `bad_verdict' unknown verdict. +log(verdict=drop, severity=bad_severity); + Syntax error at `bad_severity' unknown severity. +log(severity=notice); + Syntax error at `;' expecting verdict. + # put_nd_ra_opts reg1[0] = put_nd_ra_opts(addr_mode = "slaac", mtu = 1500, prefix = aef0::/64, slla = ae:01:02:03:04:05); encodes as controller(userdata=00.00.00.08.00.00.00.00.00.01.de.10.00.00.00.40.86.00.00.00.ff.00.ff.ff.00.00.00.00.00.00.00.00.05.01.00.00.00.00.05.dc.03.04.40.c0.ff.ff.ff.ff.ff.ff.ff.ff.00.00.00.00.ae.f0.00.00.00.00.00.00.00.00.00.00.00.00.00.00.01.01.ae.01.02.03.04.05,pause)