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>
77 lines
2.3 KiB
Bash
Executable File
77 lines
2.3 KiB
Bash
Executable File
#!/bin/bash
|
|
# Build script for .rpm package
|
|
# Usage: ./build-rpm.sh [version] [architecture] [distribution]
|
|
# distribution: rocky, rhel, centos (default: rocky)
|
|
|
|
set -e
|
|
|
|
# Sanitize version for RPM package (must start with digit)
|
|
VERSION="${1:-1.0.0}"
|
|
ARCH="${2:-x86_64}"
|
|
DIST="${3:-rocky}"
|
|
PACKAGE_NAME="ja4sentinel"
|
|
|
|
# Convert git version to RPM-compatible format
|
|
# Remove 'v' prefix if present, replace invalid chars with '-'
|
|
RPM_VERSION="${VERSION#v}"
|
|
RPM_VERSION="${RPM_VERSION//+/-}"
|
|
|
|
echo "=== Building ${PACKAGE_NAME} ${RPM_VERSION} for ${DIST} (${ARCH}) ==="
|
|
|
|
# Directories
|
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
|
PROJECT_ROOT="$(dirname "$SCRIPT_DIR")"
|
|
BUILD_DIR="${PROJECT_ROOT}/build/rpm"
|
|
RPMBUILD_DIR="${BUILD_DIR}/rpmbuild"
|
|
|
|
# Clean and create build directory
|
|
rm -rf "${BUILD_DIR}"
|
|
mkdir -p "${RPMBUILD_DIR}/BUILD"
|
|
mkdir -p "${RPMBUILD_DIR}/RPMS"
|
|
mkdir -p "${RPMBUILD_DIR}/SOURCES"
|
|
mkdir -p "${RPMBUILD_DIR}/SPECS"
|
|
mkdir -p "${RPMBUILD_DIR}/SRPMS"
|
|
|
|
# Copy binary (build if not exists)
|
|
if [ ! -f "${PROJECT_ROOT}/dist/ja4sentinel-linux-amd64" ]; then
|
|
echo "Building binary..."
|
|
cd "${PROJECT_ROOT}"
|
|
make build-linux
|
|
fi
|
|
cp "${PROJECT_ROOT}/dist/ja4sentinel-linux-amd64" "${RPMBUILD_DIR}/SOURCES/ja4sentinel"
|
|
chmod 755 "${RPMBUILD_DIR}/SOURCES/ja4sentinel"
|
|
|
|
# Copy systemd service
|
|
cp "${SCRIPT_DIR}/systemd/ja4sentinel.service" "${RPMBUILD_DIR}/SOURCES/ja4sentinel.service"
|
|
chmod 644 "${RPMBUILD_DIR}/SOURCES/ja4sentinel.service"
|
|
|
|
# Copy default config
|
|
cp "${SCRIPT_DIR}/systemd/config.yml" "${RPMBUILD_DIR}/SOURCES/config.yml"
|
|
chmod 640 "${RPMBUILD_DIR}/SOURCES/config.yml"
|
|
|
|
# Copy spec file and update version
|
|
sed "s/Version: .*/Version: ${RPM_VERSION}/" "${SCRIPT_DIR}/rpm/ja4sentinel.spec" > "${RPMBUILD_DIR}/SPECS/ja4sentinel.spec"
|
|
|
|
# Build the RPM package
|
|
echo "Building .rpm package..."
|
|
rpmbuild -bb \
|
|
--define "_topdir ${RPMBUILD_DIR}" \
|
|
--define "_arch ${ARCH}" \
|
|
"${RPMBUILD_DIR}/SPECS/ja4sentinel.spec"
|
|
|
|
# Copy RPM to build directory
|
|
find "${RPMBUILD_DIR}/RPMS" -name "*.rpm" -exec cp {} "${BUILD_DIR}/" \;
|
|
|
|
# Calculate checksum
|
|
cd "${BUILD_DIR}"
|
|
for rpm_file in *.rpm; do
|
|
if [ -f "$rpm_file" ]; then
|
|
sha256sum "$rpm_file" > "${rpm_file}.sha256"
|
|
fi
|
|
done
|
|
|
|
echo ""
|
|
echo "=== Build complete ==="
|
|
echo "Package: ${BUILD_DIR}/${PACKAGE_NAME}-${VERSION}-1.${ARCH}.rpm"
|
|
ls -la "${BUILD_DIR}"/*.rpm 2>/dev/null || true
|