From eea53ab749ec50e4c0c23bd39b6ae1f4e43c97e2 Mon Sep 17 00:00:00 2001
From: yuli <stremovsky@gmail.com>
Date: Mon, 27 Jan 2025 23:17:27 +0200
Subject: [PATCH] refactor code

---
 docker-build.sh     |  2 +-
 src/userlist_api.go | 40 ++++++++++++++++++++++++++++++++++++++++
 src/users_api.go    | 30 ------------------------------
 3 files changed, 41 insertions(+), 31 deletions(-)
 create mode 100644 src/userlist_api.go

diff --git a/docker-build.sh b/docker-build.sh
index b53ed7c..889ba29 100755
--- a/docker-build.sh
+++ b/docker-build.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 VERSION=$(cat ./version.txt)
-docker build --progress=plain -t securitybunker/databunker:$VERSION .
+BUILDKIT_PROGRESS=plain docker build -t securitybunker/databunker:$VERSION .
 docker tag securitybunker/databunker:$VERSION securitybunker/databunker:latest
diff --git a/src/userlist_api.go b/src/userlist_api.go
new file mode 100644
index 0000000..2a9d6ac
--- /dev/null
+++ b/src/userlist_api.go
@@ -0,0 +1,40 @@
+package main
+
+import (
+	"fmt"
+	"log"
+	"net/http"
+
+	"github.com/julienschmidt/httprouter"
+	"github.com/securitybunker/databunker/src/utils"
+)
+
+func (e mainEnv) userList(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+	if e.EnforceAdmin(w, r, nil) == "" {
+		return
+	}
+	if e.conf.Generic.ListUsers == false {
+		utils.ReturnError(w, r, "access denied", 403, nil, nil)
+		return
+	}
+	var offset int32 = 0
+	var limit int32 = 10
+	args := r.URL.Query()
+	if value, ok := args["offset"]; ok {
+		offset = utils.Atoi(value[0])
+	}
+	if value, ok := args["limit"]; ok {
+		limit = utils.Atoi(value[0])
+	}
+	resultJSON, counter, _ := e.db.getUsers(offset, limit)
+	log.Printf("Total count of events: %d\n", counter)
+	w.Header().Set("Content-Type", "application/json; charset=utf-8")
+	w.WriteHeader(200)
+	if counter == 0 {
+		str := fmt.Sprintf(`{"status":"ok","total":%d,"rows":[]}`, counter)
+		w.Write([]byte(str))
+	} else {
+		str := fmt.Sprintf(`{"status":"ok","total":%d,"rows":%s}`, counter, resultJSON)
+		w.Write([]byte(str))
+	}
+}
diff --git a/src/users_api.go b/src/users_api.go
index c0b10d2..1749af2 100644
--- a/src/users_api.go
+++ b/src/users_api.go
@@ -167,36 +167,6 @@ func (e mainEnv) userGet(w http.ResponseWriter, r *http.Request, ps httprouter.P
 	w.Write([]byte(finalJSON))
 }
 
-func (e mainEnv) userList(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
-	if e.EnforceAdmin(w, r, nil) == "" {
-		return
-	}
-	if e.conf.Generic.ListUsers == false {
-		utils.ReturnError(w, r, "access denied", 403, nil, nil)
-		return
-	}
-	var offset int32 = 0
-	var limit int32 = 10
-	args := r.URL.Query()
-	if value, ok := args["offset"]; ok {
-		offset = utils.Atoi(value[0])
-	}
-	if value, ok := args["limit"]; ok {
-		limit = utils.Atoi(value[0])
-	}
-	resultJSON, counter, _ := e.db.getUsers(offset, limit)
-	log.Printf("Total count of events: %d\n", counter)
-	w.Header().Set("Content-Type", "application/json; charset=utf-8")
-	w.WriteHeader(200)
-	if counter == 0 {
-		str := fmt.Sprintf(`{"status":"ok","total":%d,"rows":[]}`, counter)
-		w.Write([]byte(str))
-	} else {
-		str := fmt.Sprintf(`{"status":"ok","total":%d,"rows":%s}`, counter, resultJSON)
-		w.Write([]byte(str))
-	}
-}
-
 func (e mainEnv) userChange(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 	identity := ps.ByName("identity")
 	mode := ps.ByName("mode")