From 2ce3b86e0ff69538935db3149d1ed2f24aea09a3 Mon Sep 17 00:00:00 2001
From: Ben Burwell <ben@benburwell.com>
Date: Mon, 13 Apr 2020 23:57:13 -0400
Subject: Simplify

---
 server/handlers.go | 66 ------------------------------------------------------
 1 file changed, 66 deletions(-)

(limited to 'server/handlers.go')

diff --git a/server/handlers.go b/server/handlers.go
index 3f3543e..f3b25aa 100644
--- a/server/handlers.go
+++ b/server/handlers.go
@@ -9,14 +9,10 @@ import (
 	"io"
 	"log"
 	"net/http"
-	"strconv"
 	"strings"
 
-	"github.com/gorilla/csrf"
 	"github.com/nsheridan/cashier/lib"
-	"github.com/nsheridan/cashier/server/store"
 	"github.com/nsheridan/cashier/server/templates"
-	"github.com/pkg/errors"
 	"golang.org/x/oauth2"
 )
 
@@ -46,15 +42,7 @@ func (a *app) sign(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if a.requireReason && req.Message == "" {
-		w.Header().Add("X-Need-Reason", "required")
-		w.WriteHeader(http.StatusForbidden)
-		fmt.Fprint(w, http.StatusText(http.StatusForbidden))
-		return
-	}
-
 	username := a.authprovider.Username(token)
-	a.authprovider.Revoke(token) // We don't need this anymore.
 	cert, err := a.keysigner.SignUserKey(req, username)
 	if err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
@@ -62,11 +50,6 @@ func (a *app) sign(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	rec := store.MakeRecord(cert)
-	rec.Message = req.Message
-	if err := a.certstore.SetRecord(rec); err != nil {
-		log.Printf("Error recording cert: %v", err)
-	}
 	if err := json.NewEncoder(w).Encode(&lib.SignResponse{
 		Status:   "ok",
 		Response: string(lib.GetPublicKey(cert)),
@@ -123,52 +106,3 @@ func (a *app) index(w http.ResponseWriter, r *http.Request) {
 	tmpl := template.Must(template.New("token.html").Parse(templates.Token))
 	tmpl.Execute(w, page)
 }
-
-func (a *app) revoked(w http.ResponseWriter, r *http.Request) {
-	revoked, err := a.certstore.GetRevoked()
-	if err != nil {
-		w.WriteHeader(http.StatusInternalServerError)
-		fmt.Fprintf(w, errors.Wrap(err, "error retrieving revoked certs").Error())
-		return
-	}
-	rl, err := a.keysigner.GenerateRevocationList(revoked)
-	if err != nil {
-		w.WriteHeader(http.StatusInternalServerError)
-		fmt.Fprintf(w, errors.Wrap(err, "unable to generate KRL").Error())
-		return
-	}
-	w.Header().Set("Content-Type", "application/octet-stream")
-	w.Write(rl)
-}
-
-func (a *app) getAllCerts(w http.ResponseWriter, r *http.Request) {
-	tmpl := template.Must(template.New("certs.html").Parse(templates.Certs))
-	tmpl.Execute(w, map[string]interface{}{
-		csrf.TemplateTag: csrf.TemplateField(r),
-	})
-}
-
-func (a *app) getCertsJSON(w http.ResponseWriter, r *http.Request) {
-	includeExpired, _ := strconv.ParseBool(r.URL.Query().Get("all"))
-	certs, err := a.certstore.List(includeExpired)
-	if err != nil {
-		w.WriteHeader(http.StatusInternalServerError)
-		fmt.Fprint(w, http.StatusText(http.StatusInternalServerError))
-		return
-	}
-	if err := json.NewEncoder(w).Encode(certs); err != nil {
-		w.WriteHeader(http.StatusInternalServerError)
-		fmt.Fprint(w, http.StatusText(http.StatusInternalServerError))
-		return
-	}
-}
-
-func (a *app) revoke(w http.ResponseWriter, r *http.Request) {
-	r.ParseForm()
-	if err := a.certstore.Revoke(r.Form["cert_id"]); err != nil {
-		w.WriteHeader(http.StatusInternalServerError)
-		w.Write([]byte("Unable to revoke certs"))
-	} else {
-		http.Redirect(w, r, "/admin/certs", http.StatusSeeOther)
-	}
-}
-- 
cgit v1.2.3