ipfs: de-duplicate path validation + std error val

Author: djdv

internal/filesystem/ipfs/ipfs.go

@@ -318,8 +318,8 @@ func (fsys *IPFS) Open(name string) (fs.File, error) {
 		return emptyRoot{info: &fsys.info}, nil
 	}
 	const op = "open"
-	if !fs.ValidPath(name) {
-		return nil, fserrors.New(op, name, fs.ErrInvalid, fserrors.InvalidItem)
+	if err := validatePath(op, name); err != nil {
+		return nil, err
 	}
 	cid, err := fsys.toCID(op, name)
 	if err != nil {

internal/filesystem/ipfs/ipns.go

@@ -256,8 +256,8 @@ func (fsys *IPNS) Open(name string) (fs.File, error) {
 		return emptyRoot{info: &fsys.info}, nil
 	}
 	const op = "open"
-	if !fs.ValidPath(name) {
-		return nil, fserrors.New(op, name, fs.ErrInvalid, fserrors.InvalidItem)
+	if err := validatePath(op, name); err != nil {
+		return nil, err
 	}
 	cid, err := fsys.toCID(op, name)
 	if err != nil {

internal/filesystem/ipfs/shared.go

@@ -135,6 +135,13 @@ func (emptyRoot) ReadDir(count int) ([]fs.DirEntry, error) {
 	return nil, nil
 }
 
+func validatePath(op, name string) error {
+	if fs.ValidPath(name) {
+		return nil
+	}
+	return fserrors.New(op, name, fs.ErrInvalid, fserrors.InvalidItem)
+}
+
 func statNode(node ipld.Node, info *nodeInfo) error {
 	switch typedNode := node.(type) {
 	case *dag.ProtoNode: