add CA fields to self signed certificate

Author: facchinm

certificates.go

@@ -106,13 +106,16 @@ func generateCertificates() {
 	template := x509.Certificate{
 		SerialNumber: serialNumber,
 		Subject: pkix.Name{
-			Organization: []string{"Arduino LLC US"},
+			Organization:       []string{"Arduino LLC US"},
+			Country:            []string{"US"},
+			CommonName:         "localhost",
+			OrganizationalUnit: []string{"IT"},
 		},
 		NotBefore: notBefore,
 		NotAfter:  notAfter,
 
 		KeyUsage:              x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature,
-		ExtKeyUsage:           []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth},
+		ExtKeyUsage:           []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth, x509.ExtKeyUsageServerAuth},
 		BasicConstraintsValid: true,
 	}
 
@@ -135,6 +138,11 @@ func generateCertificates() {
 		log.Fatalf("Failed to create certificate: %s", err)
 	}
 
+	// remove old certificates
+	os.Remove("cert.pem")
+	os.Remove("key.pem")
+	os.Remove("cert.cer")
+
 	certOut, err := os.Create("cert.pem")
 	if err != nil {
 		log.Fatalf("failed to open cert.pem for writing: %s", err)

main.go

@@ -5,20 +5,19 @@ package main
 
 import (
 	"flag"
+	log "github.com/Sirupsen/logrus"
+	"github.com/carlescere/scheduler"
+	"github.com/gin-gonic/gin"
+	"github.com/itsjamie/gin-cors"
+	"github.com/kardianos/osext"
+	"github.com/vharitonsky/iniflags"
 	"os"
 	"os/user"
 	"path/filepath"
 	"runtime/debug"
 	"strconv"
 	"text/template"
 	"time"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/carlescere/scheduler"
-	"github.com/gin-gonic/gin"
-	"github.com/itsjamie/gin-cors"
-	"github.com/kardianos/osext"
-	"github.com/vharitonsky/iniflags"
 	//"github.com/sanbornm/go-selfupdate/selfupdate" #included in update.go to change heavily
 )
 
@@ -75,6 +74,11 @@ func launchSelfLater() {
 	log.Println("Done waiting 2 secs. Now launching...")
 }
 
+func certHandler(c *gin.Context) {
+	c.Header("content-type", "application/x-x509-ca-cert")
+	c.File("cert.cer")
+}
+
 func main() {
 
 	flag.Parse()
@@ -232,6 +236,7 @@ func main() {
 			}))
 
 			r.GET("/", homeHandler)
+			r.GET("/certificate.crt", certHandler)
 			r.POST("/upload", uploadHandler)
 			r.GET("/socket.io/", socketHandler)
 			r.POST("/socket.io/", socketHandler)
@@ -393,7 +398,9 @@ body {
 <form id="form">
     <input type="submit" value="Send" />
     <input type="text" id="msg" size="64"/>
-    <input name="pause" type="checkbox" value="pause" id="myCheck"/> Pause <br>
+    <input name="pause" type="checkbox" value="pause" id="myCheck"/> Pause
+    <input type="button" value="Install Certificate" onclick="window.open('http://localhost:8991/certificate.crt')" />
+</form>
 </form>
 </body>
 </html>