fileserver: do not double-escape paths

[mohammed90]

Fixes the issue specified in #4329 (comment).

[mohammed90]

@bmichotte and @ueffel, please check if the patch resolves your issue and doesn't break new stuff.

[ueffel]

$ ./caddy version
v2.4.7-0.20211126140144-80fbec0102d5 h1:mdBZC644zlsG4dWbTG3YcsU34linp0ODDoMfaogqSB0=

It does not seem to be fixed.

I think the escaping here is causing the double encoding. This bit:

u := url.URL{Path: url.PathEscape(name)}

[mohammed90]

Now I can see why. While we're escaping it in that line, the template also calls the html function from the text/template package of stdlib:

caddy/modules/caddyhttp/fileserver/browse.html

Lines 390 to 396 in 6f9b6ad

	<a href="{{html .URL}}">
	{{- if .IsDir}}
	<svg width="1.5em" height="1em" version="1.1" viewBox="0 0 317 259"><use xlink:href="#folder{{if .IsSymlink}}-shortcut{{end}}"></use></svg>
	{{- else}}
	<svg width="1.5em" height="1em" version="1.1" viewBox="0 0 265 323"><use xlink:href="#file{{if .IsSymlink}}-shortcut{{end}}"></use></svg>
	{{- end}}
	<span class="name">{{html .Name}}</span>

The documentation of the function is:

html
Returns the escaped HTML equivalent of the textual
representation of its arguments. This function is unavailable
in html/template, with a few exceptions.

I've updated the code. This effectively reverts the buggy earlier PR but keeps the tests, which were passing anyways.

[francislavoie]

Seems good 👍