fix(serverHandler): prevent using html encoded name for link

marjune163 · marjune163 · commit 8e2959db1d81 · 2020-01-23T16:22:52.000+08:00
diff --git a/src/serverHandler/responseData.go b/src/serverHandler/responseData.go
@@ -17,22 +17,23 @@ type pathEntry struct {
 	Path string `json:"path"`
 }
 
-type subItemSort struct {
+type itemSort struct {
 	Name []byte
 }
 
-type subItemHtml struct {
+type itemHtml struct {
 	IsDir   bool
+	Link    string
 	Name    template.HTML
 	Size    template.HTML
 	ModTime template.HTML
 }
 
 type subItem struct {
-	sort subItemSort
+	sort itemSort
 
 	Info os.FileInfo
-	Html *subItemHtml
+	Html *itemHtml
 }
 
 type responseData struct {
@@ -222,7 +223,7 @@ func getSubItems(subInfos []os.FileInfo) []*subItem {
 	for i := 0; i < len(subInfos); i++ {
 		info := subInfos[i]
 		subItems[i] = &subItem{
-			sort: subItemSort{
+			sort: itemSort{
 				Name: []byte(info.Name()),
 			},
 			Info: info,
@@ -235,9 +236,11 @@ func getSubItems(subInfos []os.FileInfo) []*subItem {
 func updateSubsItemHtml(subItems []*subItem) {
 	for _, item := range subItems {
 		info := item.Info
-		item.Html = &subItemHtml{
+		name := info.Name()
+		item.Html = &itemHtml{
 			IsDir:   info.IsDir(),
-			Name:    tplutil.FormatFilename(info.Name()),
+			Link:    name,
+			Name:    tplutil.FormatFilename(name),
 			Size:    tplutil.FormatSize(info.Size()),
 			ModTime: tplutil.FormatTime(info.ModTime()),
 		}
diff --git a/src/tpl/assert/main.css b/src/tpl/assert/main.css
@@ -41,6 +41,14 @@ input, button {
 	padding: 0.25em 0;
 }
 
+em {
+	font-style: normal;
+	font-weight: normal;
+	padding: 0 0.2em;
+	border: 1px #ddd solid;
+	border-radius: 3px;
+}
+
 .path-list {
 	font-size: 1.5em;
 	overflow: hidden;
@@ -191,14 +199,6 @@ input, button {
 	word-break: break-all;
 }
 
-.item-list .name em {
-	font-style: normal;
-	font-weight: normal;
-	padding: 0 0.2em;
-	border: 1px #ddd solid;
-	border-radius: 3px;
-}
-
 .item-list .size {
 	white-space: nowrap;
 	text-align: right;
diff --git a/src/tpl/assert/main.css.go b/src/tpl/assert/main.css.go
@@ -36,6 +36,13 @@ input, button {
 margin: 0;
 padding: 0.25em 0;
 }
+em {
+font-style: normal;
+font-weight: normal;
+padding: 0 0.2em;
+border: 1px #ddd solid;
+border-radius: 3px;
+}
 .path-list {
 font-size: 1.5em;
 overflow: hidden;
@@ -165,13 +172,6 @@ font-size: 1.5em;
 white-space: pre-wrap;
 word-break: break-all;
 }
-.item-list .name em {
-font-style: normal;
-font-weight: normal;
-padding: 0 0.2em;
-border: 1px #ddd solid;
-border-radius: 3px;
-}
 .item-list .size {
 white-space: nowrap;
 text-align: right;
diff --git a/src/tpl/page.html b/src/tpl/page.html
@@ -16,7 +16,7 @@
 
 <ol class="path-list">
 	{{range .Paths}}
-		<li><a href="{{.Path}}">{{.Name}}</a></li>
+		<li><a href="{{.Path}}">{{fmtFilename .Name}}</a></li>
 	{{end}}
 </ol>
 
@@ -47,7 +47,7 @@
 	</li>
 	{{range .SubItems}}{{with .Html}}
 		<li class="{{if .IsDir}}dir{{else}}file{{end}}">
-			<a href="{{$subItemPrefix}}{{.Name}}{{if .IsDir}}/{{end}}">
+			<a href="{{$subItemPrefix}}{{.Link}}{{if .IsDir}}/{{end}}">
 				<span class="name">{{.Name}}{{if .IsDir}}/{{end}}</span>
 				<span class="size">{{if not .IsDir}}{{.Size}}{{end}}</span>
 				<span class="time">{{.ModTime}}</span>
diff --git a/src/tpl/page.html.go b/src/tpl/page.html.go
@@ -24,7 +24,7 @@ const pageTplStr = `
 <body class="{{if .IsRoot}}root-dir{{else}}sub-dir{{end}}">
 <ol class="path-list">
 {{range .Paths}}
-<li><a href="{{.Path}}">{{.Name}}</a></li>
+<li><a href="{{.Path}}">{{fmtFilename .Name}}</a></li>
 {{end}}
 </ol>
 {{if .CanUpload}}
@@ -52,7 +52,7 @@ const pageTplStr = `
 </li>
 {{range .SubItems}}{{with .Html}}
 <li class="{{if .IsDir}}dir{{else}}file{{end}}">
-<a href="{{$subItemPrefix}}{{.Name}}{{if .IsDir}}/{{end}}">
+<a href="{{$subItemPrefix}}{{.Link}}{{if .IsDir}}/{{end}}">
 <span class="name">{{.Name}}{{if .IsDir}}/{{end}}</span>
 <span class="size">{{if not .IsDir}}{{.Size}}{{end}}</span>
 <span class="time">{{.ModTime}}</span>
