From 60943adc6623e2469ead7e3997047d5f507e3903 Mon Sep 17 00:00:00 2001
From: Paul Lecuq <paul@paulbsd.com>
Date: Sun, 10 Apr 2022 12:43:28 +0200
Subject: [PATCH] updated ipbl api endpoints

---
 src/models/cfg.go     | 8 ++++++++
 src/routers/funcs.go  | 4 ++++
 src/zmqrouter/main.go | 2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/models/cfg.go b/src/models/cfg.go
index b597693..9764b62 100644
--- a/src/models/cfg.go
+++ b/src/models/cfg.go
@@ -64,6 +64,14 @@ func GetSets(cfg config.Config) (res []CfgSet, err error) {
 	return
 }
 
+func GetGlobalConfig(cfg config.Config) (res []Cfg, err error) {
+	var w = []Cfg{}
+	if err := cfg.Db.Find(&w); err == nil {
+		return w, err
+	}
+	return
+}
+
 func InsertOrUpdateSets(cfg config.Config, folders []CfgSet) (res string, err error) {
 	var w = Cfg{Key: "folders"}
 	if exists, _ := cfg.Db.Get(&w); exists {
diff --git a/src/routers/funcs.go b/src/routers/funcs.go
index 28bd751..880e3f4 100644
--- a/src/routers/funcs.go
+++ b/src/routers/funcs.go
@@ -73,6 +73,10 @@ func RegisterRoutes(e *echo.Echo, ctx *context.Context, cfg *config.Config) {
 		log.Println(msg)
 		return Result(c, err, msg)
 	})
+	e.GET("/config", func(c echo.Context) (err error) {
+		trustlists, err := models.GetGlobalConfig(*cfg)
+		return Result(c, err, trustlists)
+	})
 	e.GET("/config/trustlist", func(c echo.Context) (err error) {
 		trustlists, err := models.GetTrustlists(*cfg)
 		return Result(c, err, trustlists)
diff --git a/src/zmqrouter/main.go b/src/zmqrouter/main.go
index 919c72d..77847d3 100644
--- a/src/zmqrouter/main.go
+++ b/src/zmqrouter/main.go
@@ -48,7 +48,7 @@ func Handle(cfg *config.Config, reqsock *goczmq.Sock, pubsock *goczmq.Sock, chan
 			if err != nil {
 				log.Println(err)
 			}
-			log.Println(fmt.Sprintf("zmq: Inserted %d IP, Updated %d IP", numinsert, numupdate))
+			log.Printf("zmq: Inserted %d IP, Updated %d IP\n", numinsert, numupdate)
 			tmpval := fmt.Sprintf("%s %s", channel, string(val))
 			val = []byte(tmpval)
 			topub = append(topub, val)