9280cb545c
Ajout du point d'entrée principal : - cmd/ja4sentinel/main.go : pipeline complet avec gestion des signaux - Intégration des modules (capture, tlsparse, fingerprint, output) - Shutdown propre avec context.Context Corrections du parsing TLS : - Flow key unidirectionnel (client → serveur uniquement) - Timeout de flux configurable via FlowTimeoutSec - Structure ConnectionFlow simplifiée Améliorations de l'API : - Champs TCPMSS et TCPWScale en pointeurs (omitempty correct) - NewLogRecord mis à jour pour les champs optionnels Mise à jour de l'architecture : - architecture.yml : documentation des champs optionnels - Règles de flux unidirectionnel documentées Système de packages : - Version par défaut : 1.0.0 - Nommage cohérent : ja4sentinel_1.0.0_amd64.deb - Scripts build-deb.sh et build-rpm.sh simplifiés - Extraction correcte des checksums Tests : - TestFlowKey mis à jour pour le format unidirectionnel - Tous les tests passent (go test ./...) - go vet clean Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
170 lines
5.9 KiB
Makefile
170 lines
5.9 KiB
Makefile
.PHONY: build build-docker test test-docker test-integration lint clean help docker-build-dev docker-build-runtime package package-deb package-rpm
|
|
|
|
# Docker parameters
|
|
DOCKER=docker
|
|
DOCKER_BUILD=$(DOCKER) build
|
|
DOCKER_RUN=$(DOCKER) run
|
|
DOCKER_COMPOSE=docker compose
|
|
|
|
# Image names
|
|
DEV_IMAGE=ja4sentinel-dev:latest
|
|
RUNTIME_IMAGE=ja4sentinel-runtime:latest
|
|
TEST_SERVER_IMAGE=ja4sentinel-test-server:latest
|
|
|
|
# Binary name
|
|
BINARY_NAME=ja4sentinel
|
|
BINARY_PATH=./cmd/ja4sentinel
|
|
DIST_DIR=dist
|
|
BUILD_DIR=build
|
|
|
|
# Package version (strip 'v' prefix from git tags)
|
|
# Set to explicit version for release builds, or use git-based version for dev builds
|
|
PKG_VERSION ?= 1.0.0
|
|
# Alternative git-based version (uncomment for dev builds):
|
|
# PKG_VERSION=$(shell git describe --tags --always --dirty 2>/dev/null | sed 's/^v//')
|
|
|
|
# Build flags
|
|
VERSION=$(PKG_VERSION)
|
|
BUILD_TIME=$(shell date -u '+%Y-%m-%d_%H:%M:%S')
|
|
GIT_COMMIT=$(shell git rev-parse --short HEAD 2>/dev/null || echo "unknown")
|
|
|
|
LDFLAGS=-ldflags "-X main.Version=$(VERSION) -X main.BuildTime=$(BUILD_TIME) -X main.GitCommit=$(GIT_COMMIT)"
|
|
|
|
# Default target
|
|
all: docker-build-dev test-docker
|
|
|
|
## build: Build the ja4sentinel binary locally
|
|
build:
|
|
mkdir -p $(DIST_DIR)
|
|
go build -buildvcs=false $(LDFLAGS) -o $(DIST_DIR)/$(BINARY_NAME) $(BINARY_PATH)
|
|
|
|
## build-linux: Build for Linux (amd64)
|
|
build-linux:
|
|
mkdir -p $(DIST_DIR)
|
|
GOOS=linux GOARCH=amd64 go build -buildvcs=false $(LDFLAGS) -o $(DIST_DIR)/$(BINARY_NAME)-linux-amd64 $(BINARY_PATH)
|
|
|
|
## docker-build-dev: Build the development Docker image
|
|
docker-build-dev:
|
|
$(DOCKER_BUILD) -t $(DEV_IMAGE) -f Dockerfile.dev .
|
|
|
|
## docker-build-runtime: Build the runtime Docker image (multi-stage build)
|
|
docker-build-runtime:
|
|
$(DOCKER_BUILD) -t $(RUNTIME_IMAGE) -f Dockerfile .
|
|
|
|
## docker-build-test-server: Build the test server image
|
|
docker-build-test-server:
|
|
$(DOCKER_BUILD) -t $(TEST_SERVER_IMAGE) -f Dockerfile.test-server .
|
|
|
|
## test: Run unit tests locally
|
|
test:
|
|
go test -v ./...
|
|
|
|
## test-docker: Run unit tests inside Docker container
|
|
test-docker: docker-build-dev
|
|
$(DOCKER_RUN) --rm -v $(PWD):/app -w /app $(DEV_IMAGE) go test -v ./...
|
|
|
|
## test-race: Run tests with race detector in Docker
|
|
test-race: docker-build-dev
|
|
$(DOCKER_RUN) --rm -v $(PWD):/app -w /app $(DEV_IMAGE) go test -race -v ./...
|
|
|
|
## test-coverage: Run tests with coverage report in Docker
|
|
test-coverage: docker-build-dev
|
|
$(DOCKER_RUN) --rm -v $(PWD):/app -w /app $(DEV_IMAGE) sh -c \
|
|
"go test -v -coverprofile=coverage.out ./... && go tool cover -html=coverage.out -o coverage.html"
|
|
|
|
## test-integration: Run integration tests in Docker
|
|
test-integration: docker-build-dev docker-build-test-server
|
|
$(DOCKER_COMPOSE) -f docker-compose.test.yml up --build --abort-on-container-exit --exit-code-from ja4sentinel-test
|
|
|
|
## test-integration-clean: Run integration tests and clean up afterward
|
|
test-integration-clean: docker-build-dev docker-build-test-server
|
|
$(DOCKER_COMPOSE) -f docker-compose.test.yml up --build --abort-on-container-exit --exit-code-from ja4sentinel-test
|
|
$(DOCKER_COMPOSE) -f docker-compose.test.yml down -v
|
|
|
|
## lint: Run linters in Docker
|
|
lint: docker-build-dev
|
|
$(DOCKER_RUN) --rm -v $(PWD):/app -w /app $(DEV_IMAGE) sh -c \
|
|
"go vet ./... && echo 'Running gofmt check...' && gofmt -l . | grep -v '^vendor/' | grep -v '^path/' || true"
|
|
|
|
## fmt: Format all Go files
|
|
fmt:
|
|
gofmt -w .
|
|
|
|
## package: Build all packages (deb + rpm)
|
|
package: package-deb package-rpm
|
|
|
|
## package-deb: Build DEB package (requires Docker)
|
|
package-deb: build-linux
|
|
mkdir -p build/deb
|
|
docker build --no-cache -t ja4sentinel-packager-deb \
|
|
--build-arg VERSION=$(PKG_VERSION) \
|
|
--build-arg ARCH=amd64 \
|
|
-f packaging/Dockerfile.deb .
|
|
@echo "Extracting DEB packages from Docker image..."
|
|
@for f in $$(docker run --rm ja4sentinel-packager-deb sh -c 'ls /packages/*.deb 2>/dev/null'); do \
|
|
docker run --rm ja4sentinel-packager-deb sh -c "cat $$f" > build/deb/$$(basename $$f); \
|
|
done
|
|
@for f in $$(docker run --rm ja4sentinel-packager-deb sh -c 'ls /packages/*.sha256 2>/dev/null'); do \
|
|
docker run --rm ja4sentinel-packager-deb sh -c "cat $$f" > build/deb/$$(basename $$f); \
|
|
done || true
|
|
@echo "DEB packages created:"
|
|
ls -la build/deb/
|
|
|
|
## package-rpm: Build RPM package (requires Docker)
|
|
package-rpm: build-linux
|
|
mkdir -p build/rpm
|
|
docker build --no-cache -t ja4sentinel-packager-rpm \
|
|
--build-arg VERSION=$(PKG_VERSION) \
|
|
--build-arg ARCH=x86_64 \
|
|
-f packaging/Dockerfile.rpm .
|
|
@echo "Extracting RPM from Docker image..."
|
|
docker run --rm ja4sentinel-packager-rpm sh -c 'cat /packages/*.rpm' > build/rpm/ja4sentinel.rpm
|
|
@echo "RPM package created: build/rpm/ja4sentinel.rpm"
|
|
ls -la build/rpm/*.rpm
|
|
|
|
## test-package-deb: Test DEB package installation in Docker
|
|
test-package-deb: package-deb
|
|
./packaging/test/test-deb.sh
|
|
|
|
## test-package-rpm: Test RPM package installation in Docker
|
|
test-package-rpm: package-rpm
|
|
./packaging/test/test-rpm.sh
|
|
|
|
## test-package: Test all packages installation
|
|
test-package: test-package-deb test-package-rpm
|
|
|
|
## ci: Full CI pipeline (tests, build, packages, package tests)
|
|
ci: ci-test ci-build ci-package ci-package-test
|
|
|
|
## ci-test: Run all tests for CI
|
|
ci-test: test lint
|
|
|
|
## ci-build: Build for CI (production binary)
|
|
ci-build: build-linux
|
|
|
|
## ci-package: Build all packages for CI
|
|
ci-package: package
|
|
|
|
## ci-package-test: Test all packages for CI
|
|
ci-package-test: test-package
|
|
|
|
## clean: Clean build artifacts and Docker images
|
|
clean:
|
|
rm -rf $(DIST_DIR)/
|
|
rm -rf $(BUILD_DIR)/
|
|
rm -f coverage.out coverage.html
|
|
$(DOCKER) rmi $(DEV_IMAGE) 2>/dev/null || true
|
|
$(DOCKER) rmi $(RUNTIME_IMAGE) 2>/dev/null || true
|
|
$(DOCKER) rmi $(TEST_SERVER_IMAGE) 2>/dev/null || true
|
|
|
|
## clean-all: Clean everything including containers and volumes
|
|
clean-all: clean
|
|
$(DOCKER_COMPOSE) -f docker-compose.test.yml down -v --remove-orphans
|
|
|
|
## help: Show this help message
|
|
help:
|
|
@echo "Usage: make [target]"
|
|
@echo ""
|
|
@echo "Targets:"
|
|
@sed -n 's/^##//p' $(MAKEFILE_LIST) | column -t -s ':' | sed -e 's/^/ /'
|