improve checks

main.go

@@ -8,6 +8,7 @@ import (
 	"context"
 	"crypto/tls"
 	"fmt"
+	"io"
 	"log"
 	"net/http"
 	"os"
@@ -18,7 +19,22 @@ import (
 	"github.com/gin-gonic/gin"
 )
 
+// For build numbers, from https://blog.kowalczyk.info/article/vEja/embedding-build-number-in-go-executable.html
+var sha1ver string   // sha1 revision used to build the program
+var buildTime string // when the executable was built
+
 func main() {
+	// Open connection to logfile
+	// From https://ispycode.com/GO/Logging/Logging-to-multiple-destinations
+	logFile := os.Getenv("LOG_FILE")
+	if logFile == "" {
+		logFile = "./ccsecrets.log"
+	}
+	logfileWriter, err := os.OpenFile(logFile, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666)
+	if err != nil {
+		fmt.Println("Unable to write logfile", err)
+		os.Exit(1)
+	}
 
 	// Initiate connection to sqlite and make sure our schema is up to date
 	models.ConnectDatabase()
@@ -27,10 +43,22 @@ func main() {
 	ctx, stop := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
 	defer stop()
 
-	router := gin.Default()
+	// Creates a router without any middleware by default
+	router := gin.New()
+
+	// Global middleware
+	// Logger middleware will write the logs to gin.DefaultWriter even if you set with GIN_MODE=release.
+	// By default gin.DefaultWriter = os.Stdout
+	gin.DefaultWriter = io.MultiWriter(logfileWriter, os.Stdout)
+	router.Use(gin.Logger())
+
+	// Recovery middleware recovers from any panics and writes a 500 if there was one.
+	router.Use(gin.Recovery())
+
+	// TODO - think of a better default landing page
 	router.GET("/", func(c *gin.Context) {
 		//time.Sleep(10 * time.Second)
-		c.String(http.StatusOK, "Hello World.")
+		c.String(http.StatusOK, fmt.Sprintf("Built on %s from sha1 %s\n", buildTime, sha1ver))
 	})
 
 	// Set some options for TLS
@@ -90,6 +118,7 @@ func main() {
 	protected := router.Group("/api/secret")
 	protected.Use(middlewares.JwtAuthMiddleware())
 	protected.GET("/retrieve", controllers.RetrieveSecret)
+	protected.GET("/retrieveMultiple", controllers.RetrieveMultpleSecrets)
 	protected.POST("/store", controllers.StoreSecret)
 
 	// Initializing the server in a goroutine so that
@@ -118,26 +147,4 @@ func main() {
 	}
 
 	log.Println("Server exiting")
-
-	/*
-		r := gin.Default()
-
-		// Define our routes underneath /api
-		public := r.Group("/api")
-		public.POST("/register", controllers.Register)
-		public.POST("/login", controllers.Login)
-
-		// This is just PoC really, we can get rid of it
-		//protected := r.Group("/api/admin")
-		//protected.Use(middlewares.JwtAuthMiddleware())
-		//protected.GET("/user", controllers.CurrentUser)
-
-		// Get secrets
-		protected := r.Group("/api/secret")
-		protected.Use(middlewares.JwtAuthMiddleware())
-		protected.GET("/device", controllers.CurrentUser)
-
-		r.Run(":8443")
-	*/
-
 }