External/patterns
1
0
Fork 0
mirror of https://github.com/fabriziosalmi/patterns.git synced 2025-12-17 17:55:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

action

Browse Source
This commit is contained in:
fabriziosalmi 2025-01-16 14:19:16 +01:00
parent 99ee7c07fb
commit cc0a8de6c2
1 changed files with 41 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
.github/workflows/nginx.yml vendored
View File

@ -44,34 +44,23 @@ jobs:
- name: Patch .conf files to fix directives - name: Patch .conf files to fix directives
run: | run: |
for file in waf_rules/waf_patterns/nginx/*.conf; do for file in waf_rules/waf_patterns/nginx/*.conf; do
echo "Patching $file to ensure proper context for 'map' and 'if' directives..." echo "Patching $file to ensure proper context for directives..."
# Create a temporary file for the patched content # Create a temporary file for the patched content
temp_file=$(mktemp) temp_file=$(mktemp)
# Add http block if not present # Remove any existing http or server blocks
if ! grep -q "http {" "$file"; then grep -v "http {" "$file" | grep -v "server {" > "$temp_file"
echo "Adding http block to $file..."
echo "http {" >> "$temp_file" # Add server block if 'if' directive is present
if grep -q "if " "$temp_file"; then
echo "Adding server block to $file for 'if' directives..."
echo "server {" >> "$temp_file"
cat "$file" >> "$temp_file" cat "$file" >> "$temp_file"
echo "}" >> "$temp_file" echo "}" >> "$temp_file"
else else
cat "$file" >> "$temp_file" cat "$file" >> "$temp_file"
fi fi
# Add server block if not present
if ! grep -q "server {" "$temp_file"; then
echo "Adding server block to $file..."
sed -i '/http {/a \ server {' "$temp_file"
sed -i '/^}/i \ }' "$temp_file"
fi
# Add location block for 'if' directives if not present
if grep -q "if " "$temp_file" && ! grep -q "location / {" "$temp_file"; then
echo "Adding location block to $file for 'if' directives..."
sed -i '/server {/a \ location / {' "$temp_file"
sed -i '/^}/i \ }' "$temp_file"
fi
# Replace the original file with the patched content # Replace the original file with the patched content
mv "$temp_file" "$file" mv "$temp_file" "$file"
echo "Patched $file:" echo "Patched $file:"
@ -111,11 +100,38 @@ jobs:
fi fi
done done
- name: Validate Nginx configuration using Docker - name: Merge all WAF rules into a single file
run: | run: |
# Copy the map directives, merged WAF rules, and nginx.conf to a Docker volume echo "Merging all WAF rules into a single file..."
docker run --rm -v $(pwd)/map_directives.conf:/etc/nginx/map_directives.conf:ro \ echo "http {" > merged_waf_rules.conf
-v $(pwd)/merged_waf_rules.conf:/etc/nginx/merged_waf_rules.conf:ro \ for file in waf_rules/waf_patterns/nginx/*.conf; do
-v $(pwd)/tests/nginx.conf:/etc/nginx/tests/nginx.conf:ro \ echo "Merging $file..."
cat "$file" >> merged_waf_rules.conf
echo "" >> merged_waf_rules.conf
done
echo "}" >> merged_waf_rules.conf
echo "Contents of merged_waf_rules.conf:"
cat merged_waf_rules.conf
- name: Validate merged WAF rules
run: |
echo "Validating merged WAF rules..."
# Create a temporary nginx.conf file for validation
echo "events {" > temp_nginx.conf
echo " worker_connections 1024;" >> temp_nginx.conf
echo "}" >> temp_nginx.conf
cat merged_waf_rules.conf >> temp_nginx.conf
# Debug: Print the temporary nginx.conf
echo "Temporary nginx.conf for validation:"
cat temp_nginx.conf
# Validate the merged file using Docker
docker run --rm -v $(pwd)/merged_waf_rules.conf:/etc/nginx/merged_waf_rules.conf:ro \
-v $(pwd)/temp_nginx.conf:/etc/nginx/nginx.conf:ro \ -v $(pwd)/temp_nginx.conf:/etc/nginx/nginx.conf:ro \
nginx nginx -t nginx nginx -t
if [ $? -ne 0 ]; then
echo "Error: Validation failed for merged WAF rules"
exit 1
fi