From patchwork Mon Sep 4 12:31:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shyam Saini X-Patchwork-Id: 809631 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="H3YPFWLr"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xm8Nh3Gyhz9t2Z for ; Mon, 4 Sep 2017 22:31:48 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753526AbdIDMbr (ORCPT ); Mon, 4 Sep 2017 08:31:47 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:38481 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753516AbdIDMbq (ORCPT ); Mon, 4 Sep 2017 08:31:46 -0400 Received: by mail-pf0-f194.google.com with SMTP id q76so93893pfq.5 for ; Mon, 04 Sep 2017 05:31:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=b7EzitgZjpAi1LLyX8jcYP8llBsu2RsRmmYx+7Dmvc8=; b=H3YPFWLrO/8cY0b/i5ENBTZxWJAENsELlkAcq1IIzhTLe9b8fjSUwRRSdQd+qtAj/i 8ZuBDapbPNMQ0BimbYzGpkau3mA9BPwHnUwJA7crZ/wHye+zHs4q8s1WjkS6a/Axi9HO u35ffWoQmYPW7rK7nCuAn3YL1yLdfUxjqpwHxfYDqDFh04Zg/3FyoHgesqUvhOVd4l5O gIJFvPmvS06xfGxpDEJT98fiUsAmIEKPyl6kYzf7AaJh3nG7s+CMGaor3FHGzNxFA32I /bJki3lQuG8ek+4q/9C2Ka26FBWd+QPWlOU0b2kxfShGqMSjd3VGsg8nfPfe5w6rng3o 5MPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=b7EzitgZjpAi1LLyX8jcYP8llBsu2RsRmmYx+7Dmvc8=; b=WzNqCpozs5eEG/EB3lFSmZQMoGKC8SK7KJfbClEePi0Oc1ywBPBgKhqrhjTlGY3q+M YmhjUADnbCnJ+24bapOpKev/TGyGwWtPZy2VvHCG2f5g10K/zeLvDZdp+gQ4C4QkKq5j K5BB9X6n6O9A21cZfq/APmUfVUPlvDwFUFuaF0/puEdblbW5IFWT5gWhD3NJ6FzAgjL8 pZPRPnRfL2rPyD2ZDWeoF3vJTEiWFz6nUfsTbgPvtq13oEwVVc/KPFXESO3+cApoCMu4 XuzASTQZQBqgP9jqZ4bVqNorHA2H+z/nD7C/dwITRCukDsn11UH8SiO9e3AGiuUSYRDo EDKg== X-Gm-Message-State: AHPjjUh0QMX43PhfpGgz028ODZa7m6LWCZhFwZ48zlp9vCZissLD3ZCT 7QB5I9OmG5UdxWWs X-Google-Smtp-Source: ADKCNb7mkMyXFbgaq+1AOos8QfuE6pEpesSglR1Hq39JMgYt00qETdBEsFoaQgo1WX4M30OPiUP2jw== X-Received: by 10.98.72.90 with SMTP id v87mr270463pfa.29.1504528305824; Mon, 04 Sep 2017 05:31:45 -0700 (PDT) Received: from administrator-ThinkPad-L450.one97.delhi.net ([125.20.39.66]) by smtp.gmail.com with ESMTPSA id j16sm11053955pga.81.2017.09.04.05.31.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 04 Sep 2017 05:31:45 -0700 (PDT) From: Shyam Saini To: netfilter-devel@vger.kernel.org Cc: Shyam Saini Subject: [PATCH nft V3] tests: shell: Add tests for json import Date: Mon, 4 Sep 2017 18:01:33 +0530 Message-Id: <1504528293-22052-1-git-send-email-mayhs11saini@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Test upcoming "import json" statement. Basically it loads same set of rules by "nft -f" and "nft import json" and prints differences(if any) in the ruleset listed by "nft list ruleset" in each case. For Example: $ ./run-tests.sh testcases/import/json_import_0 Signed-off-by: Shyam Saini --- v3: Retain json_import_0 file which runs the actaual tests Drop all the rules_* files as they are no longer useful Drop all_ruleset_list file as rules are already included in test file v2: Add rules_* file for the reference Add all_ruleset_list file containing all the ruleset Add json_import_0 which runs the tests --- tests/shell/testcases/import/json_import_0 | 72 ++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100755 tests/shell/testcases/import/json_import_0 diff --git a/tests/shell/testcases/import/json_import_0 b/tests/shell/testcases/import/json_import_0 new file mode 100755 index 0000000..a469a4d --- /dev/null +++ b/tests/shell/testcases/import/json_import_0 @@ -0,0 +1,72 @@ +#!/bin/bash + +tmpfile=$(mktemp) + +if [ ! -w $tmpfile ] ; then + echo "Failed to create tmp file" >&2 + exit 0 +fi + +trap "rm -rf $tmpfile" EXIT # cleanup if aborted + +RULESET="table ip mangle { + set blackhole { + type ipv4_addr + elements = { 192.168.1.4, 192.168.1.5 } + } + + chain prerouting { + type filter hook prerouting priority 0; policy accept; + tcp dport { ssh, http } accept + ip saddr @blackhole drop + icmp type echo-request accept + iifname \"lo\" accept + icmp type echo-request counter packets 0 bytes 0 + ct state established,related accept + tcp flags != syn counter packets 7 bytes 841 + ip saddr 192.168.1.100 ip daddr 192.168.1.1 counter packets 0 bytes 0 + } +} +table arp x { + chain y { + arp htype 22 + arp ptype ip + arp operation != rrequest + arp operation { request, reply, rrequest, rreply, inrequest, inreply, nak } + arp hlen 33-45 + } +} +table bridge x { + chain y { + type filter hook input priority 0; policy accept; + vlan id 4094 + vlan id 4094 vlan cfi 0 + vlan id 1 ip saddr 10.0.0.0/23 udp dport domain + } +} +table ip6 x { + chain y { + type nat hook postrouting priority 0; policy accept; + icmpv6 id 33-45 + ip6 daddr fe00::1-fe00::200 udp dport domain counter packets 0 bytes 0 + meta l4proto tcp masquerade to :1024 + iifname \"wlan0\" ct state established,new tcp dport vmap { ssh : drop, 222 : drop } masquerade + tcp dport ssh ip6 daddr 1::2 ether saddr 00:0f:54:0c:11:04 accept + ip6 daddr fe00::1-fe00::200 udp dport domain counter packets 0 bytes 0 masquerade + } +}" + +echo "$RULESET" > $tmpfile +$NFT -f $tmpfile +$NFT export json > $tmpfile +$NFT flush ruleset +cat $tmpfile | $NFT import json + +RESULT="$($NFT list ruleset)" + + +if [ "$RULESET" != "$RESULT" ] ; then + DIFF="$(which diff)" + [ -x $DIFF ] && $DIFF -u <(echo "$RULESET") <(echo "$RESULT") +fi +