Unescape server path when building resource

Author: jdtw

http.go

@@ -4,6 +4,7 @@ import (
 	"encoding/base64"
 	"fmt"
 	"net/http"
+	"net/url"
 	"strings"
 	"time"
 
@@ -64,5 +65,9 @@ func clientResource(r *http.Request) string {
 }
 
 func serverResource(r *http.Request) string {
-	return fmt.Sprintf("%s %s%s", r.Method, r.Host, r.URL)
+	path, err := url.PathUnescape(r.URL.Path)
+	if err != nil {
+		path = r.URL.Path
+	}
+	return fmt.Sprintf("%s %s%s", r.Method, r.Host, path)
 }

http_test.go

@@ -202,3 +202,15 @@ func TestHttp(t *testing.T) {
 		}
 	}
 }
+
+func TestUnicode(t *testing.T) {
+	ks, priv := generateKey(t, "bob")
+	url := startServer(t, ks)
+	r := get(t, url+`/+++/föö/bär/🚀/foo%20bar/`, authorize(priv))
+	if r.Err != "" {
+		t.Fatal(r.Err)
+	}
+	if r.Subject != "bob" {
+		t.Fatalf("want subject bob, got %q", r.Subject)
+	}
+}