Quellcode durchsuchen

pkg/tool/path: handle Windows path separators

Yoginth vor 7 Jahren
Ursprung
Commit
97f5ae968e
2 geänderte Dateien mit 4 neuen und 0 gelöschten Zeilen
  1. 1 0
      pkg/tool/path.go
  2. 3 0
      pkg/tool/path_test.go

+ 1 - 0
pkg/tool/path.go

@@ -22,5 +22,6 @@ func IsSameSiteURLPath(url string) bool {
 func SanitizePath(path string) string {
 	path = strings.TrimLeft(path, "/")
 	path = strings.Replace(path, "../", "", -1)
+	path = strings.Replace(path, "..\\", "", -1)
 	return path
 }

+ 3 - 0
pkg/tool/path_test.go

@@ -39,7 +39,10 @@ func Test_SanitizePath(t *testing.T) {
 		}{
 			{"../../../../../../../../../data/gitote/data/sessions/a/9/a9f0ab6c3ef63dd8", "data/gitote/data/sessions/a/9/a9f0ab6c3ef63dd8"},
 			{"data/gitote/../../../../../../../../../data/sessions/a/9/a9f0ab6c3ef63dd8", "data/gitote/data/sessions/a/9/a9f0ab6c3ef63dd8"},
+			{"..\\..\\..\\..\\..\\..\\..\\..\\..\\data\\gitote\\data\\sessions\\a\\9\\a9f0ab6c3ef63dd8", "data\\gitote\\data\\sessions\\a\\9\\a9f0ab6c3ef63dd8"},
+			{"data\\gitote\\..\\..\\..\\..\\..\\..\\..\\..\\..\\data\\sessions\\a\\9\\a9f0ab6c3ef63dd8", "data\\gitote\\data\\sessions\\a\\9\\a9f0ab6c3ef63dd8"},
 			{"data/sessions/a/9/a9f0ab6c3ef63dd8", "data/sessions/a/9/a9f0ab6c3ef63dd8"},
+			{"data\\sessions\\a\\9\\a9f0ab6c3ef63dd8", "data\\sessions\\a\\9\\a9f0ab6c3ef63dd8"},
 		}
 		for _, tc := range testCases {
 			So(SanitizePath(tc.path), ShouldEqual, tc.expect)