nfs4: don't expose NFSv4.2 attributes to earlier versions of the clients

improve protocol spec compliance. Acked-by: Lea Morschel Target: master, 0.20 (cherry picked from commit b044362) Signed-off-by: Tigran Mkrtchyan <[email protected]>
dCache · Apr 6, 2020 · 454fd8a · 454fd8a
1 parent d8c3de4
commit 454fd8a
Showing 1 changed file with 18 additions and 3 deletions.
diff --git a/core/src/main/java/org/dcache/nfs/v4/OperationACCESS.java b/core/src/main/java/org/dcache/nfs/v4/OperationACCESS.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 - 2015 Deutsches Elektronen-Synchroton,
+ * Copyright (c) 2009 - 2020 Deutsches Elektronen-Synchroton,
  * Member of the Helmholtz Association, (DESY), HAMBURG, GERMANY
  *
  * This library is free software; you can redistribute it and/or modify
@@ -21,6 +21,7 @@
 
 import java.io.IOException;
 import org.dcache.nfs.nfsstat;
+import org.dcache.nfs.status.InvalException;
 import org.dcache.nfs.v4.xdr.uint32_t;
 import org.dcache.nfs.v4.xdr.nfs_argop4;
 import org.dcache.nfs.v4.xdr.nfs_opnum4;
@@ -31,10 +32,19 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.dcache.nfs.v4.xdr.nfs4_prot.*;
+
 public class OperationACCESS extends AbstractNFSv4Operation {
 
     private static final Logger _log = LoggerFactory.getLogger(OperationACCESS.class);
 
+    private final static int ACCESS4_MASK_v40 =
+            ACCESS4_DELETE | ACCESS4_EXECUTE | ACCESS4_EXTEND
+            | ACCESS4_LOOKUP | ACCESS4_MODIFY | ACCESS4_READ;
+
+    private final static int ACCESS4_MASK_v42 =
+            ACCESS4_MASK_v40 | ACCESS4_XAREAD | ACCESS4_XAWRITE | ACCESS4_XALIST;
+
     public OperationACCESS(nfs_argop4 args) {
         super(args, nfs_opnum4.OP_ACCESS);
     }
@@ -44,9 +54,14 @@ public void process(CompoundContext context, nfs_resop4 result)
             throws ChimeraNFSException, IOException {
 
         final ACCESS4res res = result.opaccess;
-        int requestedAccess = _args.opaccess.access.value;
+        final int requestedAccess = _args.opaccess.access.value;
+
+        final int validationMask = context.getMinorversion() > 1 ? ACCESS4_MASK_v42 : ACCESS4_MASK_v40;
+        if ((requestedAccess & ~validationMask) != 0) {
+            throw new InvalException("invalid access mask");
+        }
 
-        int realAccess = context.getFs().access(context.currentInode(), requestedAccess);
+        final int realAccess = context.getFs().access(context.currentInode(), requestedAccess);
 
         _log.debug("NFS Request ACCESS uid: {} {} {}",
                     context.getSubject(), requestedAccess, realAccess );