On 9/10/19 10:49 AM, Scott Mayhew wrote: > 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 a hash of 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 v2: > - we're storing a sha256 hash of a principal instead of the principal > itself > > 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 Committed.... steved. > > configure.ac | 1 + > support/include/cld.h | 41 ++++- > tools/Makefile.am | 4 + > tools/clddb-tool/Makefile.am | 13 ++ > tools/clddb-tool/clddb-tool.man | 83 ++++++++++ > tools/clddb-tool/clddb-tool.py | 266 ++++++++++++++++++++++++++++++++ > utils/nfsdcld/cld-internal.h | 13 +- > utils/nfsdcld/nfsdcld.c | 140 ++++++++++++++--- > utils/nfsdcld/nfsdcld.man | 32 +++- > utils/nfsdcld/sqlite.c | 239 +++++++++++++++++++++++----- > utils/nfsdcld/sqlite.h | 2 + > 11 files changed, 765 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 >
