Properly map method errors

Author: willscott

errors.go

@@ -167,6 +167,7 @@ func basicErrorFormatter(err error) RPCError {
 // NFSStatusError represents an error at the NFS level.
 type NFSStatusError struct {
 	NFSStatus
+	WrappedErr error
 }
 
 // Error is The wrapped error
@@ -186,6 +187,11 @@ func (s *NFSStatusError) MarshalBinary() (data []byte, err error) {
 	return resp[:], nil
 }
 
+// Unwrap unpacks wrapped errors
+func (s *NFSStatusError) Unwrap() error {
+	return s.WrappedErr
+}
+
 // StatusErrorWithBody is an NFS error with a payload.
 type StatusErrorWithBody struct {
 	NFSStatusError

file.go

@@ -136,29 +136,49 @@ func tryStat(fs billy.Filesystem, path []string) *FileAttribute {
 }
 
 // WriteWcc writes the `wcc_data` representation of an object.
-func WriteWcc(writer io.Writer, pre *FileCacheAttribute, post *FileAttribute) {
+func WriteWcc(writer io.Writer, pre *FileCacheAttribute, post *FileAttribute) error {
 	if pre == nil {
-		_ = xdr.Write(writer, uint32(0))
+		if err := xdr.Write(writer, uint32(0)); err != nil {
+			return err
+		}
 	} else {
-		_ = xdr.Write(writer, uint32(1))
-		_ = xdr.Write(writer, *pre)
+		if err := xdr.Write(writer, uint32(1)); err != nil {
+			return err
+		}
+		if err := xdr.Write(writer, *pre); err != nil {
+			return err
+		}
 	}
 	if post == nil {
-		_ = xdr.Write(writer, uint32(0))
+		if err := xdr.Write(writer, uint32(0)); err != nil {
+			return err
+		}
 	} else {
-		_ = xdr.Write(writer, uint32(1))
-		_ = xdr.Write(writer, *post)
+		if err := xdr.Write(writer, uint32(1)); err != nil {
+			return err
+		}
+		if err := xdr.Write(writer, *post); err != nil {
+			return err
+		}
 	}
+	return nil
 }
 
 // WritePostOpAttrs writes the `post_op_attr` representation of a files attributes
-func WritePostOpAttrs(writer io.Writer, post *FileAttribute) {
+func WritePostOpAttrs(writer io.Writer, post *FileAttribute) error {
 	if post == nil {
-		_ = xdr.Write(writer, uint32(0))
+		if err := xdr.Write(writer, uint32(0)); err != nil {
+			return err
+		}
 	} else {
-		_ = xdr.Write(writer, uint32(1))
-		_ = xdr.Write(writer, *post)
+		if err := xdr.Write(writer, uint32(1)); err != nil {
+			return err
+		}
+		if err := xdr.Write(writer, *post); err != nil {
+			return err
+		}
 	}
+	return nil
 }
 
 // SetFileAttributes represents a command to update some metadata
@@ -185,7 +205,7 @@ func (s *SetFileAttributes) Apply(changer billy.Change, fs billy.Filesystem, fil
 		mode := os.FileMode(*s.SetMode) & os.ModePerm
 		if mode != curr.Mode().Perm() {
 			if changer == nil {
-				return &NFSStatusError{NFSStatusNotSupp}
+				return &NFSStatusError{NFSStatusNotSupp, os.ErrPermission}
 			}
 			if err := changer.Chmod(file, mode); err != nil {
 				return err
@@ -203,7 +223,7 @@ func (s *SetFileAttributes) Apply(changer billy.Change, fs billy.Filesystem, fil
 		}
 		if euid != curr.UID || egid != curr.GID {
 			if changer == nil {
-				return &NFSStatusError{NFSStatusNotSupp}
+				return &NFSStatusError{NFSStatusNotSupp, os.ErrPermission}
 			}
 			if err := changer.Lchown(file, int(euid), int(egid)); err != nil {
 				return err
@@ -212,7 +232,7 @@ func (s *SetFileAttributes) Apply(changer billy.Change, fs billy.Filesystem, fil
 	}
 	if s.SetSize != nil {
 		if curr.Mode()&os.ModeSymlink != 0 {
-			return &NFSStatusError{NFSStatusNotSupp}
+			return &NFSStatusError{NFSStatusNotSupp, os.ErrInvalid}
 		}
 		fp, err := fs.Open(file)
 		if err != nil {
@@ -237,7 +257,7 @@ func (s *SetFileAttributes) Apply(changer billy.Change, fs billy.Filesystem, fil
 		}
 		if atime != curr.Atime.Native() || mtime != curr.Mtime.Native() {
 			if changer == nil {
-				return &NFSStatusError{NFSStatusNotSupp}
+				return &NFSStatusError{NFSStatusNotSupp, os.ErrPermission}
 			}
 			if err := changer.Chtimes(file, *atime, *mtime); err != nil {
 				return err

go.mod

@@ -6,12 +6,10 @@ require (
 	github.com/go-git/go-billy/v5 v5.0.0
 	github.com/google/uuid v1.1.1
 	github.com/hashicorp/golang-lru v0.5.4
-	github.com/polydawn/refmt v0.0.0-20190807091052-3d65705ee9f1 // indirect
 	github.com/rasky/go-xdr v0.0.0-20170124162913-1a41d1a06c93
+	github.com/warpfork/go-wish v0.0.0-20200122115046-b9ea61034e4a // indirect
 	github.com/willscott/go-nfs-client v0.0.0-20200605172546-271fa9065b33
 	github.com/willscott/memphis v0.0.0-20200912205913-768fef98189f
-	go.polydawn.net/go-timeless-api v0.0.0-00010101000000-000000000000 // indirect
-	go.polydawn.net/rio v0.0.0-00010101000000-000000000000
 )
 
 replace go.polydawn.net/go-timeless-api => github.com/polydawn/go-timeless-api v0.0.0-20190707220600-0ece408663ed

go.sum

@@ -3,13 +3,17 @@ github.com/go-git/go-billy/v5 v5.0.0 h1:7NQHvd9FVid8VL4qVUMm8XifBK+2xCoZ2lSk0agR
 github.com/go-git/go-billy/v5 v5.0.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0=
 github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
 github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
+github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/polydawn/go-timeless-api v0.0.0-20190707220600-0ece408663ed h1:WzzCCfq6k2m5d+FT2JRoeH+knLiA1aNWDuqTy6CZnDs=
 github.com/polydawn/go-timeless-api v0.0.0-20190707220600-0ece408663ed/go.mod h1:z2fMUifgtqrZiNLgzF4ZR8pX+YFLCmAp1jJTSTvyDMM=
@@ -19,10 +23,14 @@ github.com/polydawn/rio v0.0.0-20200325050149-e97d9995e350 h1:4fkF5MLSMdVPu+Or1+
 github.com/polydawn/rio v0.0.0-20200325050149-e97d9995e350/go.mod h1:mwZtAu36D3fSNzVLN1we6PFdRU4VeE+RXLTZiOiQlJ0=
 github.com/rasky/go-xdr v0.0.0-20170124162913-1a41d1a06c93 h1:UVArwN/wkKjMVhh2EQGC0tEc1+FqiLlvYXY5mQ2f8Wg=
 github.com/rasky/go-xdr v0.0.0-20170124162913-1a41d1a06c93/go.mod h1:Nfe4efndBz4TibWycNE+lqyJZiMX4ycx+QKV8Ta0f/o=
+github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
+github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/warpfork/go-errcat v0.0.0-20180917083543-335044ffc86e h1:FIB2fi7XJGHIdf5rWNsfFQqatIKxutT45G+wNuMQNgs=
 github.com/warpfork/go-errcat v0.0.0-20180917083543-335044ffc86e/go.mod h1:/qe02xr3jvTUz8u/PV0FHGpP8t96OQNP7U9BJMwMLEw=
+github.com/warpfork/go-wish v0.0.0-20200122115046-b9ea61034e4a h1:G++j5e0OC488te356JvdhaM8YS6nMsjLAYF7JxCv07w=
+github.com/warpfork/go-wish v0.0.0-20200122115046-b9ea61034e4a/go.mod h1:x6AKhvSSexNrVSrViXSHUEbICjmGXhtgABaHIySUSGw=
 github.com/willscott/go-nfs-client v0.0.0-20200605172546-271fa9065b33 h1:Wd8wdpRzPXskyHvZLyw7Wc1fp5oCE2mhBCj7bAiibUs=
 github.com/willscott/go-nfs-client v0.0.0-20200605172546-271fa9065b33/go.mod h1:cOUKSNty+RabZqKhm5yTJT5Vq/Fe83ZRWAJ5Kj8nRes=
 github.com/willscott/memphis v0.0.0-20200912205913-768fef98189f h1:b+G0cnCRLaSCGLPV/mXpDaqVrPdOIKx0y59wENVFUBI=
@@ -35,4 +43,5 @@ golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527 h1:uYVVQ9WP/Ds2ROhcaGPeIdVq0
 golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

nfs_onaccess.go

@@ -11,22 +11,20 @@ import (
 func onAccess(ctx context.Context, w *response, userHandle Handler) error {
 	roothandle, err := xdr.ReadOpaque(w.req.Body)
 	if err != nil {
-		// TODO: wrap
-		return err
+		return &NFSStatusError{NFSStatusInval, err}
 	}
 	fs, path, err := userHandle.FromHandle(roothandle)
 	if err != nil {
-		return &NFSStatusError{NFSStatusStale}
+		return &NFSStatusError{NFSStatusStale, err}
 	}
 	mask, err := xdr.ReadUint32(w.req.Body)
 	if err != nil {
-		// TODO: wrap
-		return err
+		return &NFSStatusError{NFSStatusInval, err}
 	}
 
 	writer := bytes.NewBuffer([]byte{})
 	if err := xdr.Write(writer, uint32(NFSStatusOk)); err != nil {
-		return err
+		return &NFSStatusError{NFSStatusServerFault, err}
 	}
 	WritePostOpAttrs(writer, tryStat(fs, path))
 
@@ -35,7 +33,10 @@ func onAccess(ctx context.Context, w *response, userHandle Handler) error {
 	}
 
 	if err := xdr.Write(writer, mask); err != nil {
-		return err
+		return &NFSStatusError{NFSStatusServerFault, err}
 	}
-	return w.Write(writer.Bytes())
+	if err := w.Write(writer.Bytes()); err != nil {
+		return &NFSStatusError{NFSStatusServerFault, err}
+	}
+	return nil
 }

nfs_oncommit.go

@@ -3,6 +3,7 @@ package nfs
 import (
 	"bytes"
 	"context"
+	"os"
 
 	"github.com/go-git/go-billy/v5"
 	"github.com/willscott/go-nfs-client/nfs/xdr"
@@ -13,17 +14,16 @@ func onCommit(ctx context.Context, w *response, userHandle Handler) error {
 	w.errorFmt = wccDataErrorFormatter
 	handle, err := xdr.ReadOpaque(w.req.Body)
 	if err != nil {
-		// TODO: wrap
-		return err
+		return &NFSStatusError{NFSStatusInval, err}
 	}
 	// The conn will drain the unread offset and count arguments.
 
 	fs, path, err := userHandle.FromHandle(handle)
 	if err != nil {
-		return &NFSStatusError{NFSStatusStale}
+		return &NFSStatusError{NFSStatusStale, err}
 	}
 	if !billy.CapabilityCheck(fs, billy.WriteCapability) {
-		return &NFSStatusError{NFSStatusServerFault}
+		return &NFSStatusError{NFSStatusServerFault, os.ErrPermission}
 	}
 
 	writer := bytes.NewBuffer([]byte{})
@@ -33,13 +33,16 @@ func onCommit(ctx context.Context, w *response, userHandle Handler) error {
 
 	// no pre-op cache data.
 	if err := xdr.Write(writer, uint32(0)); err != nil {
-		return err
+		return &NFSStatusError{NFSStatusServerFault, err}
 	}
 	WritePostOpAttrs(writer, tryStat(fs, path))
 	// write the 8 bytes of write verification.
 	if err := xdr.Write(writer, w.Server.ID); err != nil {
-		return err
+		return &NFSStatusError{NFSStatusServerFault, err}
 	}
 
-	return w.Write(writer.Bytes())
+	if err := w.Write(writer.Bytes()); err != nil {
+		return &NFSStatusError{NFSStatusServerFault, err}
+	}
+	return nil
 }

nfs_oncreate.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"log"
+	"os"
 
 	"github.com/go-git/go-billy/v5"
 	"github.com/willscott/go-nfs-client/nfs/xdr"
@@ -20,98 +21,104 @@ func onCreate(ctx context.Context, w *response, userHandle Handler) error {
 	obj := DirOpArg{}
 	err := xdr.Read(w.req.Body, &obj)
 	if err != nil {
-		// TODO: wrap
-		return err
+		return &NFSStatusError{NFSStatusInval, err}
 	}
 	how, err := xdr.ReadUint32(w.req.Body)
 	if err != nil {
-		return err
+		return &NFSStatusError{NFSStatusInval, err}
 	}
 	var attrs *SetFileAttributes
 	if how == createModeUnchecked || how == createModeGuarded {
 		sattr, err := ReadSetFileAttributes(w.req.Body)
 		if err != nil {
-			return err
+			return &NFSStatusError{NFSStatusInval, err}
 		}
 		attrs = sattr
 	} else if how == createModeExclusive {
 		// read createverf3
 		var verf [8]byte
 		if err := xdr.Read(w.req.Body, &verf); err != nil {
-			return err
+			return &NFSStatusError{NFSStatusInval, err}
 		}
 		log.Printf("failing create to indicate lack of support for 'exclusive' mode.")
 		// TODO: support 'exclusive' mode.
-		return &NFSStatusError{NFSStatusNotSupp}
+		return &NFSStatusError{NFSStatusNotSupp, os.ErrPermission}
 	} else {
 		// invalid
-		return &NFSStatusError{NFSStatusNotSupp}
+		return &NFSStatusError{NFSStatusNotSupp, os.ErrInvalid}
 	}
 
 	fs, path, err := userHandle.FromHandle(obj.Handle)
 	if err != nil {
-		return &NFSStatusError{NFSStatusStale}
+		return &NFSStatusError{NFSStatusStale, err}
 	}
 	if !billy.CapabilityCheck(fs, billy.WriteCapability) {
-		return &NFSStatusError{NFSStatusROFS}
+		return &NFSStatusError{NFSStatusROFS, os.ErrPermission}
 	}
 
 	if len(string(obj.Filename)) > PathNameMax {
-		return &NFSStatusError{NFSStatusNameTooLong}
+		return &NFSStatusError{NFSStatusNameTooLong, nil}
 	}
 
 	newFilePath := fs.Join(append(path, string(obj.Filename))...)
 	if s, err := fs.Stat(newFilePath); err == nil {
 		if s.IsDir() {
-			return &NFSStatusError{NFSStatusExist}
+			return &NFSStatusError{NFSStatusExist, nil}
 		}
 		if how == createModeGuarded {
-			return &NFSStatusError{NFSStatusExist}
+			return &NFSStatusError{NFSStatusExist, os.ErrPermission}
 		}
 	} else {
 		if s, err := fs.Stat(fs.Join(path...)); err != nil {
-			return &NFSStatusError{NFSStatusAccess}
+			return &NFSStatusError{NFSStatusAccess, err}
 		} else if !s.IsDir() {
-			return &NFSStatusError{NFSStatusNotDir}
+			return &NFSStatusError{NFSStatusNotDir, nil}
 		}
 	}
 
 	file, err := fs.Create(newFilePath)
 	if err != nil {
 		log.Printf("Error Creating: %v", err)
-		return &NFSStatusError{NFSStatusAccess}
+		return &NFSStatusError{NFSStatusAccess, err}
 	}
 	if err := file.Close(); err != nil {
 		log.Printf("Error Creating: %v", err)
-		return &NFSStatusError{NFSStatusAccess}
+		return &NFSStatusError{NFSStatusAccess, err}
 	}
 
 	fp := userHandle.ToHandle(fs, append(path, file.Name()))
 	changer := userHandle.Change(fs)
 	if err := attrs.Apply(changer, fs, newFilePath); err != nil {
 		log.Printf("Error applying attributes: %v\n", err)
-		return &NFSStatusError{NFSStatusIO}
+		return &NFSStatusError{NFSStatusIO, err}
 	}
 
 	writer := bytes.NewBuffer([]byte{})
 	if err := xdr.Write(writer, uint32(NFSStatusOk)); err != nil {
-		return err
+		return &NFSStatusError{NFSStatusServerFault, err}
 	}
 
 	// "handle follows"
 	if err := xdr.Write(writer, uint32(1)); err != nil {
-		return err
+		return &NFSStatusError{NFSStatusServerFault, err}
 	}
 	if err := xdr.Write(writer, fp); err != nil {
-		return err
+		return &NFSStatusError{NFSStatusServerFault, err}
+	}
+	if err := WritePostOpAttrs(writer, tryStat(fs, append(path, file.Name()))); err != nil {
+		return &NFSStatusError{NFSStatusServerFault, err}
 	}
-	WritePostOpAttrs(writer, tryStat(fs, append(path, file.Name())))
 
 	// dir_wcc (we don't include pre_op_attr)
 	if err := xdr.Write(writer, uint32(0)); err != nil {
-		return err
+		return &NFSStatusError{NFSStatusServerFault, err}
+	}
+	if err := WritePostOpAttrs(writer, tryStat(fs, path)); err != nil {
+		return &NFSStatusError{NFSStatusServerFault, err}
 	}
-	WritePostOpAttrs(writer, tryStat(fs, path))
 
-	return w.Write(writer.Bytes())
+	if err := w.Write(writer.Bytes()); err != nil {
+		return &NFSStatusError{NFSStatusServerFault, err}
+	}
+	return nil
 }