From fdedccfc8b025ca2551514a8f5f667e58c9eedec Mon Sep 17 00:00:00 2001
From: Henry <cryptix@riseup.net>
Date: Fri, 19 Mar 2021 13:34:41 +0100
Subject: [PATCH] more denied-keys fixes

---
 web/handlers/admin/denied_keys_test.go              |  7 ++++---
 web/router/admin.go                                 | 10 ++++++++++
 web/templates/admin/denied-keys-remove-confirm.tmpl |  6 +++---
 web/templates/admin/denied-keys.tmpl                |  6 ++++++
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/web/handlers/admin/denied_keys_test.go b/web/handlers/admin/denied_keys_test.go
index 5d6bfc0..ad2a8d6 100644
--- a/web/handlers/admin/denied_keys_test.go
+++ b/web/handlers/admin/denied_keys_test.go
@@ -92,6 +92,7 @@ func TestDeniedKeysDontAddInvalid(t *testing.T) {
 
 	newKey := "@some-garbage"
 	addVals := url.Values{
+		"comment": []string{"some-comment"},
 		"pub_key": []string{newKey},
 	}
 	rec := ts.Client.PostForm(addURL.String(), addVals)
@@ -120,7 +121,7 @@ func TestDeniedKeys(t *testing.T) {
 	}
 	ts.DeniedKeysDB.ListReturns(lst, nil)
 
-	html, resp := ts.Client.GetHTML("/members")
+	html, resp := ts.Client.GetHTML("/denied")
 	a.Equal(http.StatusOK, resp.Code, "wrong HTTP status code")
 
 	webassert.Localized(t, html, []webassert.LocalizedElement{
@@ -136,7 +137,7 @@ func TestDeniedKeys(t *testing.T) {
 	}
 	ts.DeniedKeysDB.ListReturns(lst, nil)
 
-	html, resp = ts.Client.GetHTML("/members")
+	html, resp = ts.Client.GetHTML("/denied")
 	a.Equal(http.StatusOK, resp.Code, "wrong HTTP status code")
 
 	webassert.Localized(t, html, []webassert.LocalizedElement{
@@ -151,7 +152,7 @@ func TestDeniedKeys(t *testing.T) {
 	// check for link to remove confirm link
 	link, yes := elems.ContentsFiltered("a").Attr("href")
 	a.True(yes, "a-tag has href attribute")
-	a.Equal("/admin/members/remove/confirm?id=666", link)
+	a.Equal("/admin/denied/remove/confirm?id=666", link)
 }
 
 func TestDeniedKeysRemoveConfirmation(t *testing.T) {
diff --git a/web/router/admin.go b/web/router/admin.go
index 1b21d19..1ebca08 100644
--- a/web/router/admin.go
+++ b/web/router/admin.go
@@ -13,6 +13,11 @@ const (
 	AdminAliasesRevokeConfirm = "admin:aliases:revoke:confirm"
 	AdminAliasesRevoke        = "admin:aliases:revoke"
 
+	AdminDeniedKeysOverview      = "admin:denied-keys:overview"
+	AdminDeniedKeysAdd           = "admin:denied-keys:add"
+	AdminDeniedKeysRemoveConfirm = "admin:denied-keys:remove:confirm"
+	AdminDeniedKeysRemove        = "admin:denied-keys:remove"
+
 	AdminMembersOverview      = "admin:members:overview"
 	AdminMembersAdd           = "admin:members:add"
 	AdminMembersRemoveConfirm = "admin:members:remove:confirm"
@@ -42,6 +47,11 @@ func Admin(m *mux.Router) *mux.Router {
 	m.Path("/aliases/revoke/confirm").Methods("GET").Name(AdminAliasesRevokeConfirm)
 	m.Path("/aliases/revoke").Methods("POST").Name(AdminAliasesRevoke)
 
+	m.Path("/denied").Methods("GET").Name(AdminDeniedKeysOverview)
+	m.Path("/denied/add").Methods("POST").Name(AdminDeniedKeysAdd)
+	m.Path("/denied/remove/confirm").Methods("GET").Name(AdminDeniedKeysRemoveConfirm)
+	m.Path("/denied/remove").Methods("POST").Name(AdminDeniedKeysRemove)
+
 	m.Path("/members").Methods("GET").Name(AdminMembersOverview)
 	m.Path("/members/add").Methods("POST").Name(AdminMembersAdd)
 	m.Path("/members/remove/confirm").Methods("GET").Name(AdminMembersRemoveConfirm)
diff --git a/web/templates/admin/denied-keys-remove-confirm.tmpl b/web/templates/admin/denied-keys-remove-confirm.tmpl
index 3e6b64c..d2fa9b1 100644
--- a/web/templates/admin/denied-keys-remove-confirm.tmpl
+++ b/web/templates/admin/denied-keys-remove-confirm.tmpl
@@ -1,18 +1,18 @@
-{{ define "title" }}{{i18n "AdminAllowListRemoveConfirmTitle"}}{{ end }}
+{{ define "title" }}{{i18n "AdminDeniedKeysRemoveConfirmTitle"}}{{ end }}
 {{ define "content" }}
     <div class="flex flex-col justify-center items-center h-64">
 
       <span
         id="welcome"
         class="text-center"
-      >{{i18n "AdminAllowListRemoveConfirmWelcome"}}</span>
+      >{{i18n "AdminDeniedKeysRemoveConfirmWelcome"}}</span>
 
       <pre
         id="verify"
         class="my-4 font-mono truncate max-w-full text-lg text-gray-700"
       >{{.Entry.PubKey.Ref}}</pre>
 
-      <form id="confirm" action="{{urlTo "admin:allow-list:remove"}}" method="POST">
+      <form id="confirm" action="{{urlTo "admin:denied-keys:remove"}}" method="POST">
         {{ .csrfField }}
         <input type="hidden" name="id" value={{.Entry.ID}}>
         <div class="grid grid-cols-2 gap-4">
diff --git a/web/templates/admin/denied-keys.tmpl b/web/templates/admin/denied-keys.tmpl
index 18bc9b6..31ab010 100644
--- a/web/templates/admin/denied-keys.tmpl
+++ b/web/templates/admin/denied-keys.tmpl
@@ -25,6 +25,12 @@
           placeholder="@                                            .ed25519"
           class="font-mono truncate flex-auto tracking-wider h-12 text-gray-900 focus:outline-none focus:ring-1 focus:ring-green-500 focus:border-transparent placeholder-gray-300"
         >
+        <input
+          type="text"
+          name="comment"
+          placeholder="some comment"
+          class="font-mono truncate flex-auto tracking-wider h-12 text-gray-900 focus:outline-none focus:ring-1 focus:ring-green-500 focus:border-transparent placeholder-gray-300"
+        >
         <input
           type="submit"
           value="{{i18n "AdminDeniedKeysAdd"}}"