Merge pull request #11 from bamboo-firewall/v2

V2
bamboo-firewall · Oct 22, 2024 · eebee21 · eebee21
2 parents 251ac64 + 02a0f7a
commit eebee21
Show file tree

Hide file tree

Showing 151 changed files with 5,359 additions and 3,533 deletions.
diff --git a/.env.example b/.env.example
@@ -0,0 +1,8 @@
+HTTP_SERVER_HOST=0.0.0.0
+HTTP_SERVER_PORT=8080
+HTTP_SERVER_READ_TIMEOUT=5s
+HTTP_SERVER_READ_HEADER_TIMEOUT=5s
+HTTP_SERVER_WRITE_TIMEOUT=5s
+HTTP_SERVER_IDLE_TIMEOUT=2m
+DB_URI="mongodb://admin:password@localhost:27017/bambooFirewall?authSource=admin&?w=majority&socketTimeoutMS=3000"
+LOGGING=false
diff --git a/.gitignore b/.gitignore
@@ -1,47 +1,26 @@
+# If you prefer the allow list template instead of the deny list, see community template:
+# https://github.com/github/gitignore/blob/main/community/Golang/Go.AllowList.gitignore
+#
 # Binaries for programs and plugins
 *.exe
 *.exe~
 *.dll
 *.so
 *.dylib
-create_admin
+_output/
 
-# Test binary, build with `go test -c`
+# Test binary, built with `go test -c`
 *.test
 
 # Output of the go coverage tool, specifically when used with LiteIDE
 *.out
 
-# Dependency directories (created by `go get`)
-/bin/
-/pkg/
+# Dependency directories (remove the comment below to include it)
+# vendor/
 
-# Generated files
-*.pb.go
-*.pb.gw.go
-*.swagger.json
+# Go workspace file
+go.work
+go.work.sum
 
-# IDE-specific files (e.g., Visual Studio Code, IntelliJ IDEA)
-.vscode/
-.idea/
-
-# Logs and error files
-*.log
-*.log.*
-
-# Operating System-generated files
-.DS_Store
-Thumbs.db
-
-# Output directories for coverage and profiling tools
-/cover
-/profile
-
-# Binary release files
-/dist/
-
-# Go module cache directory
-/go.sum
-
-# Ignore vendor folder if using dep or Go modules
-/vendor/
+# env file
+.env
diff --git a/Makefile b/Makefile
@@ -0,0 +1,24 @@
+SERVER_DIR = ./cmd/server
+SERVER_BIN_NAME = bamboo-apiserver
+CLI_DIR = ./cmd/bamboofwcli
+CLI_BIN_NAME = bbfw
+
+.PHONY: all-platform
+all-platform:
+	build/build.sh $(SERVER_DIR) $(SERVER_BIN_NAME) all
+	build/build.sh $(CLI_DIR) $(CLI_BIN_NAME) all
+
+.PHONY: all
+all: build-server build-bbfw
+
+.PHONY: build-server
+build-server:
+	build/build.sh $(SERVER_DIR) $(SERVER_BIN_NAME)
+
+.PHONY: build-bbfw
+build-bbfw:
+	build/build.sh $(CLI_DIR) $(CLI_BIN_NAME)
+
+.PHONY: clean
+clean:
+	build/clean.sh
diff --git a/api/handler/gns_handler.go b/api/handler/gns_handler.go
diff --git a/api/handler/hep_handler.go b/api/handler/hep_handler.go
diff --git a/api/handler/login_handler.go b/api/handler/login_handler.go
diff --git a/api/handler/option_handler.go b/api/handler/option_handler.go
diff --git a/api/handler/policy_handler.go b/api/handler/policy_handler.go