efd4481729
Nouveaux modules: - cmd/ja4sentinel/main.go : point d'entrée avec pipeline capture→parse→fingerprint→output - internal/config/loader.go : chargement YAML + env (JA4SENTINEL_*) + validation - internal/tlsparse/parser.go : extraction ClientHello avec suivi d'état de flux (NEW/WAIT_CLIENT_HELLO/JA4_DONE) - internal/fingerprint/engine.go : génération JA4/JA3 via psanford/tlsfingerprint - internal/output/writers.go : StdoutWriter, FileWriter, UnixSocketWriter, MultiWriter Infrastructure: - Dockerfile (multi-stage), Dockerfile.dev, Dockerfile.test-server - Makefile (build, test, lint, docker-build-*) - docker-compose.test.yml pour tests d'intégration - README.md (276 lignes) avec architecture, config, exemples API (api/types.go): - Ajout Close() aux interfaces Capture et Parser - Ajout FlowTimeoutSec dans Config (défaut: 30s, env: JA4SENTINEL_FLOW_TIMEOUT) - ServiceLog: +Timestamp, +TraceID, +ConnID - LogRecord: champs flatten (ip_meta_*, tcp_meta_*, ja4*) - Helper NewLogRecord() pour conversion TLSClientHello+Fingerprints→LogRecord Architecture (architecture.yml): - Documentation module logging + interfaces LoggerFactory/Logger - Section service.systemd complète (unit, security, capabilities) - Section logging.strategy (JSON lines, champs, règles) - api.Config: +FlowTimeoutSec documenté Fixes/cleanup: - Suppression internal/api/types.go (consolidé dans api/types.go) - Correction imports logging (ja4sentinel/api) - .dockerignore / .gitignore - config.yml.example Tests: - Tous les modules ont leurs tests (*_test.go) - Tests unitaires : capture, config, fingerprint, output, tlsparse - Tests d'intégration via docker-compose.test.yml Build: - Binaires dans dist/ (make build → dist/ja4sentinel) - Docker runtime avec COPY --from=builder /app/dist/ Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
104 lines
3.6 KiB
Makefile
104 lines
3.6 KiB
Makefile
.PHONY: build build-docker test test-docker test-integration lint clean help docker-build-dev docker-build-runtime
|
|
|
|
# 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 flags
|
|
VERSION=$(shell git describe --tags --always --dirty 2>/dev/null || echo "dev")
|
|
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 .
|
|
|
|
## clean: Clean build artifacts and Docker images
|
|
clean:
|
|
rm -rf $(DIST_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/^/ /'
|