Received: by 2002:a25:8b12:0:0:0:0:0 with SMTP id i18csp950907ybl; Fri, 30 Aug 2019 09:27:56 -0700 (PDT) X-Google-Smtp-Source: APXvYqyPX7YByBxnq6eH6b2UU6/9HY7I1/2sLpF1KtGufMGVN38ZYMeLb4rw/cjMaiyEJlmVAmym X-Received: by 2002:a17:90a:cb88:: with SMTP id a8mr16157644pju.111.1567182476555; Fri, 30 Aug 2019 09:27:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567182476; cv=none; d=google.com; s=arc-20160816; b=EnRiPywDANcRvz3+YV/RvYl8qoTWqREOlx1tjua9g2bLkST/Eq1mWnpPH1iV/yTLKI aMZ31fmHMMSk3s2UsmyEdyB/n+dWgMsNvuk8J+SnWpZjOX/gDngKOS/Gs/ysqkH7wXzK g3+ibJDm6H9kgCqgpUrNN0XYgHPp3VD/LL0Ucj5IEkkB4Nmxv2GiGV3vwMVyGS0N8J0E 0kP/NVowGvhbASs/b4I81+lS4kmmm21c/rW0svHb2uGu930oGg6rqwttN6yx31xaVdfH +gGyhUHEjQcycSjx1bXCWZ37YlRMt7pNISWYqN6P5TB60oxoCk8UKtxXOcQehhK6OZYW CTQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from; bh=jpmQAkeO+lxuvEsd60bAZshkd+8PUhd3FE2KAjUst6s=; b=G8vp7lx8mfZhMkxzJgBRHP4FWesdnwm1dE1+OeB1BL3l1g90/Nxa3FCkAXSLYiYZwl NVjJBfq1OzwCQpg4hbKi9dLYZTVrowydrsrtl8c9dBkCZxKjUEH2b7bjRh9RR8AlFZxE YASKdsVx4LJmyBd5j33pmZqd+Opa/YVjLMCv8XW/ENF3bx67K6l7LjT7FRrgG9NMrUcf F0OylbnCV7Wi63GDK4lvVTAm1wtfrZr2WSky9HQlUCpoG5rp8J3GgNIgeJjpBYeHzZji 63VbD9NX/icfq2oWPRdBh9HiGw6SsRMvBHbRni69/h+JPQGsDizwqXbpL+MzwSNItVCJ rGXw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-nfs-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e13si4872765pgs.275.2019.08.30.09.27.42; Fri, 30 Aug 2019 09:27:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-nfs-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-nfs-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728178AbfH3Q1Z (ORCPT + 99 others); Fri, 30 Aug 2019 12:27:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38604 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728166AbfH3Q1Z (ORCPT ); Fri, 30 Aug 2019 12:27:25 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 01D4C3001839 for ; Fri, 30 Aug 2019 16:27:25 +0000 (UTC) Received: from coeurl.usersys.redhat.com (ovpn-121-35.rdu2.redhat.com [10.10.121.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id DB0AB1001281; Fri, 30 Aug 2019 16:27:24 +0000 (UTC) Received: by coeurl.usersys.redhat.com (Postfix, from userid 1000) id 8A9D620963; Fri, 30 Aug 2019 12:27:24 -0400 (EDT) From: Scott Mayhew To: steved@redhat.com Cc: linux-nfs@vger.kernel.org Subject: [nfs-utils PATCH v2 0/4] add principal to the data being tracked by nfsdcld Date: Fri, 30 Aug 2019 12:27:20 -0400 Message-Id: <20190830162724.13862-1-smayhew@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Fri, 30 Aug 2019 16:27:25 +0000 (UTC) Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org At the spring bakeathon, Chuck suggested that we should store the kerberos principal in addition to the client id string in nfsdcld. The idea is to prevent an illegitimate client from reclaiming another client's opens by supplying that client's id string. The first patch adds support for a "GetVersion" upcall which allows nfsd to determine the maximum message version that nfsdcld supports. Right now it's based on the value of CLD_UPCALL_VERSION from cld.h, but I was thinking we may wish to add a command-line option (and an nfs.conf) option to make it possible to use a lower version than CLD_UPCALL_VERSION. My thinking here is that an older nfsdcld daemon won't be compatible with the new database schema... rather than worrying about messing with downgrading the database, just use the command-line option to make it behave like an older daemon. The second patch adds handling for the v2 Cld_Create and Cld_GraceStart upcalls, which can include the kerberos principal which we'll store along with the client id string in the database. Note that if we're talking to an old kernel that does the v1 upcall, everything still works (we just ignore the new columns in the database). The third patch adds a tool for manipulating nfsdcld's database schema. It's mostly intended to be used to downgrade the database in the (hopefully rare) event that an admin would want to downgrade nfsdcld. It also provides the ability for fixing broken recovery table names (which nfsdcld also fixes automatically) as well as the ability to print the contents of the database. The final patch updates the nfsdcld man page. Changes since v1: - added a tool for manipulating nfsdcld's sqlite database schema - updated the nfsdcld man page Scott Mayhew (4): nfsdcld: add a "GetVersion" upcall nfsdcld: add support for upcall version 2 Add a tool for manipulating the nfsdcld sqlite database schema. nfsdcld: update nfsdcld.man configure.ac | 1 + support/include/cld.h | 37 ++++- tools/Makefile.am | 4 + tools/clddb-tool/Makefile.am | 13 ++ tools/clddb-tool/clddb-tool.man | 83 ++++++++++ tools/clddb-tool/clddb-tool.py | 261 ++++++++++++++++++++++++++++++++ utils/nfsdcld/cld-internal.h | 13 +- utils/nfsdcld/nfsdcld.c | 140 ++++++++++++++--- utils/nfsdcld/nfsdcld.man | 32 +++- utils/nfsdcld/sqlite.c | 238 ++++++++++++++++++++++++----- utils/nfsdcld/sqlite.h | 2 + 11 files changed, 755 insertions(+), 69 deletions(-) create mode 100644 tools/clddb-tool/Makefile.am create mode 100644 tools/clddb-tool/clddb-tool.man create mode 100644 tools/clddb-tool/clddb-tool.py -- 2.17.2