d469e39da7
Services: - ja4sentinel: TLS/JA4 fingerprint capture daemon (Go, libpcap) - logcorrelator: JA4 log correlation engine (Go, ClickHouse) - mod_reqin_log: Apache module (C, JSON request logging) - bot_detector: ML bot detection pipeline (Python) - dashboard: FastAPI/Streamlit analytics UI (Python) Shared libraries: - shared/go/ja4common: logger, config, shutdown, ipfilter (Go module) - shared/python/ja4_common: ClickHouseClient, ClickHouseSettings (Python package) - shared/clickhouse/: canonical SQL migrations (10 files) Build & packaging: - Unified 3-stage Dockerfile.package for Go RPMs (el8/el9/el10) - go.work workspace linking sentinel, correlator, ja4common - Makefile with test-all, build-all, rpm-* targets Fixes applied: - go.work: 1.21 → 1.24.6 (required by sentinel) - correlator Dockerfiles: golang:1.21 → golang:1.24 - replace directives in go.mod for ja4common local path - pyproject.toml: setuptools.backends → setuptools.build_meta - Removed static libpcap linking (unavailable on Rocky 9) - Fixed data races in output/writers_test.go (sync.Mutex + atomic.Int32) - Rewrote corrupted test files (logger_test.go × 2) Test coverage: - correlator: 67.1% total (unixsocket 80.5%, config 91.7%, app 83.3%, multi 87.7%, stdout 100%) - sentinel: all 10 packages pass (api, capture, config, fingerprint, ipfilter, logging, output, tlsparse) Documentation: - README.md + docs/ (architecture, development, 5 services, shared libs, DB schema & migrations) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
111 lines
4.9 KiB
Docker
111 lines
4.9 KiB
Docker
# syntax=docker/dockerfile:1
|
||
# =============================================================================
|
||
# correlator — Dockerfile de packaging RPM (Rocky Linux 8/9, AlmaLinux 10)
|
||
# Build context: monorepo root (ja4-platform/)
|
||
# Méthode: 1 builder Go → 1 rpm-builder (rpmbuild, 3 × dist) → 1 output alpine
|
||
# =============================================================================
|
||
|
||
# =============================================================================
|
||
# Stage 1: Builder — compilation du binaire Go
|
||
# golang:1.21 officiel (statiquement lié, CGO_ENABLED=0 → binaire portable)
|
||
# =============================================================================
|
||
FROM golang:1.24 AS builder
|
||
|
||
WORKDIR /build
|
||
|
||
RUN apt-get update && apt-get install -y --no-install-recommends git bc && \
|
||
rm -rf /var/lib/apt/lists/*
|
||
|
||
# Copie du workspace Go et du module partagé en premier (meilleur cache)
|
||
COPY go.work go.work.sum* ./
|
||
COPY shared/go/ja4common/ ./shared/go/ja4common/
|
||
COPY services/sentinel/go.mod services/sentinel/go.sum* ./services/sentinel/
|
||
COPY services/correlator/go.mod services/correlator/go.sum* ./services/correlator/
|
||
|
||
WORKDIR /build/services/correlator
|
||
RUN --mount=type=cache,target=/go/pkg/mod go mod download
|
||
|
||
COPY services/correlator/ /build/services/correlator/
|
||
|
||
ARG VERSION=dev
|
||
RUN --mount=type=cache,target=/go/pkg/mod \
|
||
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 \
|
||
go build -ldflags="-w -s -X main.Version=${VERSION}" \
|
||
-o /tmp/correlator \
|
||
./cmd/logcorrelator
|
||
|
||
# =============================================================================
|
||
# Stage 2: rpm-builder — construction des RPMs avec rpmbuild
|
||
# Un seul stage, trois appels rpmbuild successifs (el8, el9, el10).
|
||
# Le spec lit les fichiers depuis %{_builddir} (répertoire BUILD de rpmbuild).
|
||
# =============================================================================
|
||
FROM rockylinux:9 AS rpm-builder
|
||
|
||
WORKDIR /package
|
||
|
||
ARG VERSION=dev
|
||
|
||
RUN dnf install -y rpm-build rpmdevtools && dnf clean all
|
||
|
||
RUN mkdir -p /root/rpmbuild/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS} && \
|
||
mkdir -p /packages/rpm/{el8,el9,el10}
|
||
|
||
# Disposition des fichiers dans BUILD/ (attendue par le spec correlator)
|
||
RUN mkdir -p /root/rpmbuild/BUILD/usr/bin \
|
||
/root/rpmbuild/BUILD/etc/logcorrelator \
|
||
/root/rpmbuild/BUILD/etc/systemd/system \
|
||
/root/rpmbuild/BUILD/etc/logrotate.d
|
||
|
||
COPY --from=builder /tmp/correlator /root/rpmbuild/BUILD/usr/bin/logcorrelator
|
||
COPY services/correlator/config.example.yml /root/rpmbuild/BUILD/etc/logcorrelator/logcorrelator.yml
|
||
COPY services/correlator/config.example.yml /root/rpmbuild/BUILD/etc/logcorrelator/logcorrelator.yml.example
|
||
COPY services/correlator/logcorrelator.service /root/rpmbuild/BUILD/etc/systemd/system/logcorrelator.service
|
||
COPY services/correlator/packaging/rpm/logrotate /root/rpmbuild/BUILD/etc/logrotate.d/logcorrelator
|
||
|
||
RUN chmod 755 /root/rpmbuild/BUILD/usr/bin/logcorrelator && \
|
||
chmod 640 /root/rpmbuild/BUILD/etc/logcorrelator/logcorrelator.yml && \
|
||
chmod 640 /root/rpmbuild/BUILD/etc/logcorrelator/logcorrelator.yml.example && \
|
||
chmod 644 /root/rpmbuild/BUILD/etc/systemd/system/logcorrelator.service && \
|
||
chmod 644 /root/rpmbuild/BUILD/etc/logrotate.d/logcorrelator
|
||
|
||
COPY services/correlator/packaging/rpm/logcorrelator.spec /root/rpmbuild/SPECS/logcorrelator.spec
|
||
|
||
# el8
|
||
RUN rpmbuild --define "_topdir /root/rpmbuild" \
|
||
--define "dist .el8" \
|
||
--define "version ${VERSION}" \
|
||
--target x86_64 \
|
||
-bb /root/rpmbuild/SPECS/logcorrelator.spec && \
|
||
cp /root/rpmbuild/RPMS/x86_64/*.el8.x86_64.rpm /packages/rpm/el8/
|
||
|
||
# el9
|
||
RUN rpmbuild --define "_topdir /root/rpmbuild" \
|
||
--define "dist .el9" \
|
||
--define "version ${VERSION}" \
|
||
--target x86_64 \
|
||
-bb /root/rpmbuild/SPECS/logcorrelator.spec && \
|
||
cp /root/rpmbuild/RPMS/x86_64/*.el9.x86_64.rpm /packages/rpm/el9/
|
||
|
||
# el10
|
||
RUN rpmbuild --define "_topdir /root/rpmbuild" \
|
||
--define "dist .el10" \
|
||
--define "version ${VERSION}" \
|
||
--target x86_64 \
|
||
-bb /root/rpmbuild/SPECS/logcorrelator.spec && \
|
||
cp /root/rpmbuild/RPMS/x86_64/*.el10.x86_64.rpm /packages/rpm/el10/
|
||
|
||
# =============================================================================
|
||
# Stage 3: output — image finale contenant uniquement les RPMs
|
||
# =============================================================================
|
||
FROM alpine:latest AS output
|
||
|
||
WORKDIR /packages
|
||
COPY --from=rpm-builder /packages/rpm/el8/*.rpm /packages/rpm/el8/
|
||
COPY --from=rpm-builder /packages/rpm/el9/*.rpm /packages/rpm/el9/
|
||
COPY --from=rpm-builder /packages/rpm/el10/*.rpm /packages/rpm/el10/
|
||
|
||
CMD ["sh", "-c", \
|
||
"echo '=== RPM el8 ===' && ls -la /packages/rpm/el8/ && \
|
||
echo '' && echo '=== RPM el9 ===' && ls -la /packages/rpm/el9/ && \
|
||
echo '' && echo '=== RPM el10 ===' && ls -la /packages/rpm/el10/"]
|