refactor(serverHandler): extract alias relation detection

Author: marjune163

src/serverHandler/alias.go

@@ -1,5 +1,10 @@
 package serverHandler
 
+import (
+	"../util"
+	"path"
+)
+
 type alias struct {
 	urlPath string
 	fsPath  string
@@ -15,3 +20,11 @@ func (aliases aliases) byUrlPath(urlPath string) (alias *alias, ok bool) {
 	}
 	return nil, false
 }
+
+func (alias alias) isChildOf(rawReqPath string) bool {
+	return len(alias.urlPath) > len(rawReqPath) && path.Dir(alias.urlPath) == rawReqPath
+}
+
+func (alias alias) isSuccessorOf(rawReqPath string) bool {
+	return len(alias.urlPath) > len(rawReqPath) && util.HasUrlPrefixDir(alias.urlPath, rawReqPath)
+}

src/serverHandler/archive.go

@@ -71,16 +71,13 @@ func (h *handler) visitFs(
 	if fInfo.IsDir() {
 		childAliases := map[string]string{}
 		for _, alias := range h.aliases {
-			aliasUrlPath := alias.urlPath
-			aliasFsPath := alias.fsPath
-
-			if aliasUrlPath != rawRequestPath && path.Dir(aliasUrlPath) == rawRequestPath {
-				childAliases[aliasUrlPath] = aliasFsPath
+			if alias.isChildOf(rawRequestPath) {
+				childAliases[alias.urlPath] = alias.fsPath
 				continue
 			}
 
-			if len(aliasUrlPath) > len(rawRequestPath) && util.HasUrlPrefixDir(aliasUrlPath, rawRequestPath) {
-				succPath := aliasUrlPath[len(rawRequestPath):]
+			if alias.isSuccessorOf(rawRequestPath) {
+				succPath := alias.urlPath[len(rawRequestPath):]
 				if succPath[0] == '/' {
 					succPath = succPath[1:]
 				}

test/case/015.alias.archive.bash

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+cleanup() {
+	rm -f "$fs"/downloaded/*.tmp
+}
+
+source "$root"/lib.bash
+
+"$ghfs" -l 3003 -r "$fs"/vhost2 --archive / -a :/go:"$fs"/vhost1/go -a :/hello/world:"$fs"/vhost1/world -E '' &
+sleep 0.05 # wait server ready
+cleanup
+
+archive="$fs"/downloaded/archive.tar.tmp
+curl_get_body 'http://127.0.0.1:3003/?tar' > "$archive"
+(tar -tf "$archive" | grep -q 'go/index.txt') || fail "go/index.txt not in $(basename $archive)"
+(tar -tf "$archive" | grep -q 'hello/world/index.txt') || fail "hello/world/index.txt not in $(basename $archive)"
+
+cleanup
+kill %1