From fe546bd77c96bafb97623d1f36f98a5b2990d0b9 Mon Sep 17 00:00:00 2001 From: breel Date: Fri, 31 Jul 2020 23:28:35 -0600 Subject: [PATCH] Fix path.join clearing scheme // --- public/vue/dndex-ui | 2 +- view/who.go | 2 +- view/who_test.go | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/public/vue/dndex-ui b/public/vue/dndex-ui index c5da36f..f230c7f 160000 --- a/public/vue/dndex-ui +++ b/public/vue/dndex-ui @@ -1 +1 @@ -Subproject commit c5da36f592820312e10d05ff27c32d0ef644f282 +Subproject commit f230c7fc9a25ff3e94d0be7152a86b23fd9ddb03 diff --git a/view/who.go b/view/who.go index dfa5427..4c763df 100644 --- a/view/who.go +++ b/view/who.go @@ -89,7 +89,7 @@ func whoGet(namespace string, g storage.RateLimitedGraph, w http.ResponseWriter, baseUrl.RawQuery = "" for k := range one.Attachments { if _, err := url.Parse(one.Attachments[k]); err != nil || !strings.Contains(one.Attachments[k], ":") { - one.Attachments[k] = path.Join(baseUrl.String(), config.New().FilePrefix, namespace, one.Attachments[k]) + one.Attachments[k] = baseUrl.String() + path.Join("/", config.New().FilePrefix, namespace, one.Attachments[k]) } } diff --git a/view/who_test.go b/view/who_test.go index d6029aa..9036e73 100644 --- a/view/who_test.go +++ b/view/who_test.go @@ -109,6 +109,9 @@ func TestWho(t *testing.T) { if !strings.HasSuffix(o.Attachments[k], path.Join(config.New().FilePrefix, "col", iwant.Attachments[k])) { t.Fatal(k, o.Attachments[k], iwant.Attachments[k]) } + if !strings.HasPrefix(o.Attachments[k], "http://") { + t.Fatal(k, o.Attachments[k], iwant.Attachments[k]) + } } iwant.Attachments = o.Attachments iwant.Connections = o.Connections