feat(serverHandler): ensure all sub items shadowed by case-insensitive alias are fake FileInfo

This ensures that shadowed directory could not be deleted or mkdired.

Author: marjune163

src/serverHandler/alias.go

@@ -8,6 +8,7 @@ import (
 type alias interface {
 	urlPath() string
 	fsPath() string
+	caseSensitive() bool
 	isMatch(rawReqPath string) bool
 	isSuccessorOf(rawReqPath string) bool
 	isPredecessorOf(rawReqPath string) bool

src/serverHandler/aliasAccurate.go

@@ -21,6 +21,10 @@ func (alias aliasAccurate) fsPath() string {
 	return alias.fs
 }
 
+func (alias aliasAccurate) caseSensitive() bool {
+	return true
+}
+
 func (alias aliasAccurate) isMatch(rawReqPath string) bool {
 	return alias.url == rawReqPath
 }

src/serverHandler/aliasAccurate_test.go

@@ -15,6 +15,10 @@ func TestAliasAccurate(t *testing.T) {
 	}
 
 	// isSuccessorOf
+	if !alias.isSuccessorOf("/") {
+		t.Error()
+	}
+
 	if !alias.isSuccessorOf("/hello") {
 		t.Error()
 	}
@@ -51,6 +55,18 @@ func TestAliasAccurate(t *testing.T) {
 		t.Error()
 	}
 
+	if alias.isSuccessorOf("/hi") {
+		t.Error()
+	}
+
+	if alias.isSuccessorOf("/hi/") {
+		t.Error()
+	}
+
+	if alias.isSuccessorOf("/hi/there") {
+		t.Error()
+	}
+
 	// isPredecessorOf
 	if !alias.isPredecessorOf("/hello/world/foo/bar") {
 		t.Error()
@@ -59,4 +75,8 @@ func TestAliasAccurate(t *testing.T) {
 	if !alias.isPredecessorOf("/hello/world/foo/bar/") {
 		t.Error()
 	}
+
+	if alias.isPredecessorOf("/hi/world/foo/bar") {
+		t.Error()
+	}
 }

src/serverHandler/aliasNoCase.go

@@ -22,6 +22,10 @@ func (alias aliasNoCase) fsPath() string {
 	return alias.fs
 }
 
+func (alias aliasNoCase) caseSensitive() bool {
+	return false
+}
+
 func (alias aliasNoCase) isMatch(rawReqPath string) bool {
 	return strings.EqualFold(alias.url, rawReqPath)
 }

src/serverHandler/aliasNoCase_test.go

@@ -15,6 +15,10 @@ func TestAliasNoCase(t *testing.T) {
 	}
 
 	// isSuccessorOf
+	if !alias.isSuccessorOf("/") {
+		t.Error()
+	}
+
 	if !alias.isSuccessorOf("/hello") {
 		t.Error()
 	}
@@ -58,6 +62,18 @@ func TestAliasNoCase(t *testing.T) {
 		t.Error()
 	}
 
+	if alias.isSuccessorOf("/hi") {
+		t.Error()
+	}
+
+	if alias.isSuccessorOf("/Hi/") {
+		t.Error()
+	}
+
+	if alias.isSuccessorOf("/hi/There") {
+		t.Error()
+	}
+
 	// isPredecessorOf
 	if !alias.isPredecessorOf("/Hello/world/foo/bar") {
 		t.Error()
@@ -66,4 +82,8 @@ func TestAliasNoCase(t *testing.T) {
 	if !alias.isPredecessorOf("/hello/world/FOO/BAR/") {
 		t.Error()
 	}
+
+	if alias.isPredecessorOf("/Hi/world/foo/bar") {
+		t.Error()
+	}
 }

src/serverHandler/alias_test.go

@@ -8,6 +8,17 @@ func TestGetAliasSubPartAccurate(t *testing.T) {
 
 	aliasAccurate := createAliasAccurate("/hello/world/foo", "/tmp")
 
+	subName, isLastPart, ok = getAliasSubPart(aliasAccurate, "/")
+	if !ok {
+		t.Error()
+	}
+	if subName != "hello" {
+		t.Error()
+	}
+	if isLastPart {
+		t.Error()
+	}
+
 	_, _, ok = getAliasSubPart(aliasAccurate, "/test")
 	if ok {
 		t.Error()
@@ -81,7 +92,6 @@ func TestGetAliasSubPartAccurate(t *testing.T) {
 	if ok {
 		t.Error()
 	}
-
 }
 
 func TestGetAliasSubPartNoCase(t *testing.T) {
@@ -90,6 +100,17 @@ func TestGetAliasSubPartNoCase(t *testing.T) {
 
 	aliasNoCase := createAliasNoCase("/hello/world/foo", "/tmp")
 
+	subName, isLastPart, ok = getAliasSubPart(aliasNoCase, "/")
+	if !ok {
+		t.Error()
+	}
+	if subName != "hello" {
+		t.Error()
+	}
+	if isLastPart {
+		t.Error()
+	}
+
 	_, _, ok = getAliasSubPart(aliasNoCase, "/test")
 	if ok {
 		t.Error()
@@ -200,5 +221,4 @@ func TestGetAliasSubPartNoCase(t *testing.T) {
 	if ok {
 		t.Error()
 	}
-
 }

src/serverHandler/responseData.go

@@ -143,39 +143,45 @@ func (h *handler) mergeAlias(
 			continue
 		}
 
-		var aliasSubItem os.FileInfo
-		matchExisted := false
+		var fsItem os.FileInfo
 		if isChildAlias { // reached second-deepest path of alias
 			var err error
-			aliasSubItem, err = os.Stat(alias.fsPath())
-			if err == nil {
-				aliasSubItem = newRenamedFileInfo(subName, aliasSubItem)
-			} else {
+			fsItem, err = os.Stat(alias.fsPath())
+			if err != nil {
 				errs = append(errs, err)
-				aliasSubItem = newFakeFileInfo(subName, true)
 			}
 		}
 
+		matchExisted := false
 		for i, subItem := range subItems {
 			if !alias.namesEqual(subItem.Name(), subName) {
 				continue
 			}
+			if isVirtual(subItem) {
+				continue
+			}
 			matchExisted = true
-			if aliasSubItem == nil {
-				// use aliased item instead of original item
-				// to mark it as an alias, which results non-deletable
-				aliasSubItem = newRenamedFileInfo(subName, subItems[i])
+			var aliasSubItem os.FileInfo
+			if fsItem != nil {
+				aliasSubItem = newRenamedFileInfo(subItem.Name(), fsItem)
+			} else {
+				aliasSubItem = newRenamedFileInfo(subItem.Name(), subItem)
 			}
+			aliasSubItems = append(aliasSubItems, aliasSubItem)
 			subItems[i] = aliasSubItem
-			break
-		}
-
-		if aliasSubItem == nil {
-			aliasSubItem = newFakeFileInfo(subName, true)
+			if alias.caseSensitive() {
+				break
+			}
 		}
-		aliasSubItems = append(aliasSubItems, aliasSubItem)
 
 		if !matchExisted {
+			var aliasSubItem os.FileInfo
+			if fsItem != nil {
+				aliasSubItem = newRenamedFileInfo(subName, fsItem)
+			} else {
+				aliasSubItem = newFakeFileInfo(subName, true)
+			}
+			aliasSubItems = append(aliasSubItems, aliasSubItem)
 			subItems = append(subItems, aliasSubItem)
 		}
 	}

src/util/path_test.go

@@ -5,6 +5,12 @@ import "testing"
 func TestHasUrlPrefixDir(t *testing.T) {
 	var full, prefix string
 
+	full = "/hello"
+	prefix = "/"
+	if !HasUrlPrefixDir(full, prefix) {
+		t.Error(full, prefix)
+	}
+
 	full = "/a/b/c"
 	prefix = "/a/b"
 	if !HasUrlPrefixDir(full, prefix) {
@@ -63,6 +69,12 @@ func TestHasUrlPrefixDir(t *testing.T) {
 func TestHasUrlPrefixDirNoCase(t *testing.T) {
 	var full, prefix string
 
+	full = "/hello"
+	prefix = "/"
+	if !HasUrlPrefixDirNoCase(full, prefix) {
+		t.Error(full, prefix)
+	}
+
 	full = "/a/b/c"
 	prefix = "/a/b"
 	if !HasUrlPrefixDirNoCase(full, prefix) {