feat: version 1.0.0 avec corrections critiques et nommage de packages
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>
This commit is contained in:
@ -25,11 +25,14 @@ RUN mkdir -p dist && \
|
||||
ARG ARCH=amd64
|
||||
RUN mkdir -p /app/packages && \
|
||||
./packaging/build-deb.sh "${VERSION}" "${ARCH}" "debian" && \
|
||||
cp /app/build/deb/*.deb /app/packages/
|
||||
cp /app/build/deb/*.deb /app/packages/ && \
|
||||
cp /app/build/deb/*.sha256 /app/packages/ 2>/dev/null || true
|
||||
|
||||
# Final stage - minimal image with just the DEB
|
||||
# Final stage - minimal image with just the packages
|
||||
FROM alpine:latest
|
||||
|
||||
WORKDIR /packages
|
||||
COPY --from=builder /app/packages/ /packages/
|
||||
|
||||
CMD ["ls", "-la", "/packages/"]
|
||||
# Output list of packages
|
||||
CMD ["sh", "-c", "ls -la /packages/ && echo '---' && cat /packages/*.sha256 2>/dev/null || true"]
|
||||
|
||||
@ -12,13 +12,9 @@ DIST="${3:-debian}"
|
||||
PACKAGE_NAME="ja4sentinel"
|
||||
|
||||
# Convert git version to Debian-compatible format
|
||||
if [[ "$VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+ ]]; then
|
||||
DEB_VERSION="$VERSION"
|
||||
elif [[ "$VERSION" =~ ^v([0-9]+\.[0-9]+\.[0-9]+) ]]; then
|
||||
DEB_VERSION="${BASH_REMATCH[1]}"
|
||||
else
|
||||
DEB_VERSION="0.0.0+${VERSION//[^a-zA-Z0-9+.-]/_}"
|
||||
fi
|
||||
# Remove 'v' prefix if present, replace invalid chars with '-'
|
||||
DEB_VERSION="${VERSION#v}"
|
||||
DEB_VERSION="${DEB_VERSION//+/-}"
|
||||
|
||||
echo "=== Building ${PACKAGE_NAME} ${DEB_VERSION} for ${DIST} (${ARCH}) ==="
|
||||
|
||||
|
||||
@ -12,13 +12,9 @@ DIST="${3:-rocky}"
|
||||
PACKAGE_NAME="ja4sentinel"
|
||||
|
||||
# Convert git version to RPM-compatible format
|
||||
if [[ "$VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+ ]]; then
|
||||
RPM_VERSION="$VERSION"
|
||||
elif [[ "$VERSION" =~ ^v([0-9]+\.[0-9]+\.[0-9]+) ]]; then
|
||||
RPM_VERSION="${BASH_REMATCH[1]}"
|
||||
else
|
||||
RPM_VERSION="0.0.0.${VERSION//[^a-zA-Z0-9.]/_}"
|
||||
fi
|
||||
# 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}) ==="
|
||||
|
||||
|
||||
Reference in New Issue
Block a user