From 5754103efc3f85715926bb9fe45a78ec6fad81ec Mon Sep 17 00:00:00 2001 From: Matteo Suppo Date: Mon, 18 Jan 2016 11:34:01 +0100 Subject: [PATCH 1/2] Delete the CA when requested --- conn.go | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/conn.go b/conn.go index f8285633a..2c0c848ec 100644 --- a/conn.go +++ b/conn.go @@ -3,11 +3,13 @@ package main import ( + "net/http" + "os" + "strconv" + log "github.com/Sirupsen/logrus" "github.com/gin-gonic/gin" "github.com/googollee/go-socket.io" - "net/http" - "strconv" ) type connection struct { @@ -101,6 +103,13 @@ func wsHandler() *WsServer { so.On("command", func(message string) { h.broadcast <- []byte(message) }) + + so.On("deleteCA", func() { + os.Remove("ca.cert.pem") + os.Remove("ca.cert.cer") + os.Remove("ca.key.pem") + }) + so.On("disconnection", func() { h.unregister <- c }) From 314ef0783489fd38030d7f8a988b695473972acc Mon Sep 17 00:00:00 2001 From: Matteo Suppo Date: Mon, 18 Jan 2016 13:01:57 +0100 Subject: [PATCH 2/2] Use a DELETE to delete the certificate --- certificates.go | 6 ++++++ conn.go | 7 ------- main.go | 1 + 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/certificates.go b/certificates.go index bfa4d11ac..abbad7a4c 100644 --- a/certificates.go +++ b/certificates.go @@ -229,6 +229,12 @@ func certHandler(c *gin.Context) { }) } +func deleteCertHandler(c *gin.Context) { + os.Remove("ca.cert.pem") + os.Remove("ca.cert.cer") + os.Remove("ca.key.pem") +} + const noFirefoxTemplateHTML = ` diff --git a/conn.go b/conn.go index 2c0c848ec..4989ebd6a 100644 --- a/conn.go +++ b/conn.go @@ -4,7 +4,6 @@ package main import ( "net/http" - "os" "strconv" log "github.com/Sirupsen/logrus" @@ -104,12 +103,6 @@ func wsHandler() *WsServer { h.broadcast <- []byte(message) }) - so.On("deleteCA", func() { - os.Remove("ca.cert.pem") - os.Remove("ca.cert.cer") - os.Remove("ca.key.pem") - }) - so.On("disconnection", func() { h.unregister <- c }) diff --git a/main.go b/main.go index e04ba5477..0d951af56 100755 --- a/main.go +++ b/main.go @@ -235,6 +235,7 @@ func main() { r.GET("/", homeHandler) r.GET("/certificate.crt", certHandler) + r.DELETE("/certificate.crt", deleteCertHandler) r.POST("/upload", uploadHandler) r.GET("/socket.io/", socketHandler) r.POST("/socket.io/", socketHandler)