d0ca0a7e4c
Correctifs de bugs critiques: - Overflow entier dans le calcul du timestamp (nanoseconds) - Validation des composantes temporelles dans format_iso8601 - Race condition mutex: échec dur pour MPM threadés (worker/event) - Rejet des espaces en tête dans parse_int_strict Nouveaux tests unitaires (38 ajoutés): - Overflow timestamp, limites ISO8601, format fixe 20 chars - Limite de taille JSON 64KB - Détection headers sensibles (blacklist) - Validation parse_int_strict - dynbuf NULL handling et strlen mode Migration packaging: - Suppression CentOS 7 (EOL) - Ajout AlmaLinux 10 (el10) - RPMs supportés: el8, el9, el10 Mise à jour CI/CD et documentation: - .gitlab-ci.yml: jobs verify pour el8/el9/el10 - architecture.yml: OS supportés à jour - 70/70 tests pass Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
162 lines
5.7 KiB
Makefile
162 lines
5.7 KiB
Makefile
# Makefile for mod_reqin_log
|
|
# Apache HTTPD module for logging HTTP requests as JSON to Unix socket
|
|
|
|
# APXS tool path (can be overridden)
|
|
APXS ?= apxs
|
|
|
|
# Compiler settings
|
|
CC ?= gcc
|
|
CFLAGS ?= -Wall -Wextra -O2 -std=gnu11 -x c
|
|
|
|
# Directories
|
|
SRC_DIR = src
|
|
BUILD_DIR = build
|
|
INSTALL_DIR = modules
|
|
DIST_DIR = dist
|
|
|
|
# Source files
|
|
SRCS = $(SRC_DIR)/mod_reqin_log.c
|
|
|
|
# Module name
|
|
MODULE_NAME = mod_reqin_log
|
|
|
|
# Package version
|
|
VERSION ?= 1.0.0
|
|
|
|
.PHONY: all clean install uninstall test package package-deb package-rpm
|
|
|
|
all: $(MODULE_NAME).so
|
|
|
|
# Build the module using apxs
|
|
# Note: Use -Wc to pass flags to the C compiler through apxs
|
|
$(MODULE_NAME).so: $(SRCS)
|
|
@mkdir -p $(BUILD_DIR)
|
|
$(APXS) -c -Wc,"$(CFLAGS)" -o $(BUILD_DIR)/$(MODULE_NAME).so $(SRCS)
|
|
@mkdir -p $(INSTALL_DIR)
|
|
@if [ -f $(BUILD_DIR)/.libs/$(MODULE_NAME).so ]; then \
|
|
cp $(BUILD_DIR)/.libs/$(MODULE_NAME).so $(INSTALL_DIR)/; \
|
|
elif [ -f $(BUILD_DIR)/$(MODULE_NAME).so ]; then \
|
|
cp $(BUILD_DIR)/$(MODULE_NAME).so $(INSTALL_DIR)/; \
|
|
fi
|
|
|
|
# Install the module
|
|
install: $(MODULE_NAME).so
|
|
@echo "Installing $(MODULE_NAME).so..."
|
|
@mkdir -p $(DESTDIR)/usr/lib/apache2/modules
|
|
@if [ -f $(INSTALL_DIR)/$(MODULE_NAME).so ]; then \
|
|
cp $(INSTALL_DIR)/$(MODULE_NAME).so $(DESTDIR)/usr/lib/apache2/modules/; \
|
|
elif [ -f $(BUILD_DIR)/.libs/$(MODULE_NAME).so ]; then \
|
|
cp $(BUILD_DIR)/.libs/$(MODULE_NAME).so $(DESTDIR)/usr/lib/apache2/modules/; \
|
|
elif [ -f $(BUILD_DIR)/$(MODULE_NAME).so ]; then \
|
|
cp $(BUILD_DIR)/$(MODULE_NAME).so $(DESTDIR)/usr/lib/apache2/modules/; \
|
|
else \
|
|
echo "Error: $(MODULE_NAME).so not found"; \
|
|
exit 1; \
|
|
fi
|
|
@echo "Installation complete."
|
|
@echo "Enable the module by adding to your httpd.conf:"
|
|
@echo " LoadModule reqin_log_module modules/mod_reqin_log.so"
|
|
|
|
# Uninstall the module
|
|
uninstall:
|
|
rm -f $(DESTDIR)/usr/lib/apache2/modules/$(MODULE_NAME).so
|
|
@echo "Uninstallation complete."
|
|
|
|
# Clean build artifacts
|
|
clean:
|
|
rm -rf $(BUILD_DIR) $(INSTALL_DIR)
|
|
rm -f .libs/*.o .libs/*.la .libs/*.so
|
|
rm -f *.o *.la *.lo
|
|
rm -rf .libs
|
|
|
|
# Run unit tests (requires cmocka)
|
|
test:
|
|
@mkdir -p build/tests
|
|
cd build/tests && cmake ../../ -DCMAKE_BUILD_TYPE=Debug
|
|
$(MAKE) -C build/tests run_tests
|
|
|
|
# Build with debug symbols
|
|
debug: CFLAGS += -g -DDEBUG
|
|
debug: clean all
|
|
|
|
# =============================================================================
|
|
# Packaging (DEB + RPM with Docker + fpm)
|
|
# Dockerfile.package builds all packages in a single multi-stage build:
|
|
# - 1 DEB package (Debian/Ubuntu)
|
|
# - 3 RPM packages (el8, el9, el10 for RHEL/Rocky/AlmaLinux compatibility)
|
|
# =============================================================================
|
|
|
|
## package: Build all packages (deb + rpm for el8, el9, el10)
|
|
package:
|
|
mkdir -p $(DIST_DIR)/deb $(DIST_DIR)/rpm
|
|
docker build --target output -t mod_reqin_log:packager \
|
|
--build-arg VERSION=$(VERSION) \
|
|
-f Dockerfile.package .
|
|
@echo "Extracting packages from Docker image..."
|
|
docker run --rm -v $(PWD)/$(DIST_DIR):/output mod_reqin_log:packager \
|
|
sh -c 'cp -r /packages/deb/* /output/deb/ && cp -r /packages/rpm/* /output/rpm/'
|
|
@echo "Packages created:"
|
|
@echo " DEB:"
|
|
@ls -la $(DIST_DIR)/deb/
|
|
@echo " RPM (el8, el9, el10):"
|
|
@ls -la $(DIST_DIR)/rpm/
|
|
|
|
## package-deb: Build DEB package (built together with RPMs in Dockerfile.package)
|
|
package-deb: package
|
|
@echo "DEB package built together with RPMs in Dockerfile.package"
|
|
|
|
## package-rpm: Build RPM packages (el8, el9, el10 built together in Dockerfile.package)
|
|
package-rpm: package
|
|
@echo "RPM packages built together with DEB in Dockerfile.package"
|
|
|
|
## test-package-deb: Test DEB package installation in Docker
|
|
test-package-deb: package
|
|
docker run --rm -v $(PWD)/$(DIST_DIR)/deb:/packages:ro debian:latest \
|
|
sh -c "apt-get update && apt-get install -y /packages/*.deb && echo 'DEB install OK'"
|
|
|
|
## test-package-rpm: Test RPM package installation in Docker (tests el9 by default)
|
|
test-package-rpm: package
|
|
docker run --rm -v $(PWD)/$(DIST_DIR)/rpm:/packages:ro rockylinux:9 \
|
|
sh -c "dnf install -y /packages/*.el9.*.rpm && echo 'RPM el9 install OK'"
|
|
|
|
## test-package-rpm-el8: Test el8 RPM installation
|
|
test-package-rpm-el8: package
|
|
docker run --rm -v $(PWD)/$(DIST_DIR)/rpm:/packages:ro rockylinux:8 \
|
|
sh -c "dnf install -y /packages/*.el8.*.rpm && echo 'RPM el8 install OK'"
|
|
|
|
## test-package-rpm-el9: Test el9 RPM installation
|
|
test-package-rpm-el9: package
|
|
docker run --rm -v $(PWD)/$(DIST_DIR)/rpm:/packages:ro rockylinux:9 \
|
|
sh -c "dnf install -y /packages/*.el9.*.rpm && echo 'RPM el9 install OK'"
|
|
|
|
## test-package-rpm-el10: Test el10 RPM installation
|
|
test-package-rpm-el10: package
|
|
docker run --rm -v $(PWD)/$(DIST_DIR)/rpm:/packages:ro almalinux:10 \
|
|
sh -c "dnf install -y /packages/*.el10.*.rpm && echo 'RPM el10 install OK'"
|
|
|
|
## test-package: Test all packages installation
|
|
test-package: test-package-deb test-package-rpm-el8 test-package-rpm-el9 test-package-rpm-el10
|
|
|
|
# Help target
|
|
help:
|
|
@echo "mod_reqin_log Makefile"
|
|
@echo ""
|
|
@echo "Targets:"
|
|
@echo " all - Build the module (default)"
|
|
@echo " install - Install the module to DESTDIR"
|
|
@echo " uninstall - Remove the module from DESTDIR"
|
|
@echo " clean - Remove build artifacts"
|
|
@echo " test - Run unit tests"
|
|
@echo " debug - Build with debug symbols"
|
|
@echo " package - Build all packages (deb + rpm for el8, el9, el10)"
|
|
@echo " package-deb - Build DEB package"
|
|
@echo " package-rpm - Build RPM packages"
|
|
@echo " test-package - Test package installation"
|
|
@echo ""
|
|
@echo "Variables:"
|
|
@echo " APXS - Path to apxs tool (default: apxs)"
|
|
@echo " CC - C compiler (default: gcc)"
|
|
@echo " CFLAGS - Compiler flags (default: -Wall -Wextra -O2)"
|
|
@echo " DESTDIR - Installation destination (default: /)"
|
|
@echo " VERSION - Package version (default: 1.0.0)"
|