Skip to content

fix(nginx): harden error handling in bash and PowerShell installers #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Stensel8 merged 2 commits into from
May 26, 2026
Merged

fix(nginx): harden error handling in bash and PowerShell installers #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f31a456
fix(nginx): harden error handling in bash and PowerShell installers
claude May 26, 2026
f3fde3d
fix(nginx): address Copilot review — improve ACME error messages, abs…
claude May 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 32 additions & 6 deletions nginx/nginx_installer.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ function Update-SystemPackages {
}
'pacman' {
& pacman -Syu --noconfirm 2>&1 | Out-Null
if ($LASTEXITCODE -ne 0) { Stop-Script 'pacman upgrade failed' }
if ($LASTEXITCODE -ne 0) { Write-Log 'WARN' 'pacman upgrade failed' }
}
default {
Write-Log 'WARN' 'Unable to detect package manager'
Expand Down Expand Up @@ -425,7 +425,15 @@ export LDFLAGS='-lzstd'
}

New-Item -ItemType Directory -Path "$Script:BUILD_DIR/nginx-acme/objs" -Force | Out-Null
Copy-Item 'target/release/libnginx_acme.so' -Destination "$Script:BUILD_DIR/nginx-acme/objs/ngx_http_acme_module.so" -Force -ErrorAction SilentlyContinue
$acmeSo = 'target/release/libnginx_acme.so'
if (-not (Test-Path $acmeSo)) {
Stop-Script "ACME module not built: $acmeSo missing (cargo build may have failed)"
}
try {
Copy-Item $acmeSo -Destination "$Script:BUILD_DIR/nginx-acme/objs/ngx_http_acme_module.so" -Force -ErrorAction Stop
} catch {
Stop-Script "Failed to stage ACME module: $($_.Exception.Message)"
}

Pop-Location # nginx-acme
Pop-Location # nginx
Expand Down Expand Up @@ -742,15 +750,15 @@ WantedBy=multi-user.target

bash -c 'systemctl daemon-reload' | Out-Null
bash -c 'systemctl enable nginx' 2>&1 | Out-Null
bash -c 'nginx -t && systemctl start nginx' | Out-Null
bash -c '/usr/sbin/nginx -t && systemctl start nginx' | Out-Null
if ($LASTEXITCODE -ne 0) { Stop-Script 'Failed to start nginx' }

$opensslVer = (bash -c 'openssl version 2>/dev/null').Trim()
if (-not $opensslVer) { $opensslVer = 'OpenSSL unknown' }
Write-Log 'INFO' "Nginx $Script:NGINX_VERSION with $opensslVer (system) installed"
Write-Log 'INFO' 'Access: https://localhost'
Write-Log 'INFO' 'Manage nginx with: systemctl {start|stop|reload|restart|status} nginx'
bash -c 'nginx -V 2>&1 | head -n1'
bash -c '/usr/sbin/nginx -V 2>&1 | head -n1'

$testResult = Test-NginxInstallation
if (-not $testResult) {
Expand All @@ -773,7 +781,7 @@ function Test-NginxInstallation {
Write-Log 'INFO' 'ACME module present'
}

$nginxTest = bash -c 'nginx -t 2>&1'
$nginxTest = bash -c '/usr/sbin/nginx -t 2>&1'
if ($LASTEXITCODE -ne 0) {
Write-Log 'ERROR' "nginx -t failed: $nginxTest"
$ok = $false
Expand Down Expand Up @@ -819,8 +827,25 @@ function Remove-Nginx {
function Test-RunningWebServers {
$portsInUse = [System.Collections.Generic.List[string]]::new()

$portTool = (bash -c '(command -v lsof >/dev/null 2>&1 && echo lsof) || (command -v ss >/dev/null 2>&1 && echo ss) || echo none').Trim()
if ($portTool -eq 'none') {
Write-Log 'WARN' 'Neither lsof nor ss available; skipping port conflict check'
return
}

foreach ($port in @(80, 443)) {
$procId = (bash -c "lsof -ti :$port 2>/dev/null | head -n1" 2>$null)?.Trim()
$detectPid = @'
tool=$1; port=$2
if [ "$tool" = "lsof" ]; then
lsof -ti ":$port" 2>/dev/null | head -n1
else
ss -tlnp 2>/dev/null | awk -v p="$port" '
$0 ~ ":"p"[[:space:]]" {
if (match($0, /pid=[0-9]+/)) { print substr($0, RSTART+4, RLENGTH-4); exit }
}'
fi
'@
$procId = (bash -c $detectPid 'detect-port' $portTool $port 2>$null)?.Trim()
if ($procId) {
$proc = (bash -c "ps -p $procId -o comm= 2>/dev/null || echo unknown").Trim()
$portsInUse.Add("$port ($proc)")
Expand Down Expand Up @@ -862,5 +887,6 @@ try {
}
}
} finally {
Stop-Transcript -ErrorAction SilentlyContinue
Remove-Item $Script:BUILD_DIR -Recurse -Force -ErrorAction SilentlyContinue
}
35 changes: 29 additions & 6 deletions nginx/nginx_installer.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,10 @@ Build-Nginx() {
fi

mkdir -p "$BUILD_DIR/nginx-acme/objs"
cp target/release/libnginx_acme.so "$BUILD_DIR/nginx-acme/objs/ngx_http_acme_module.so" || true
local acme_so="target/release/libnginx_acme.so"
[[ -f "$acme_so" ]] || Stop-Script "ACME module not built: $acme_so missing (cargo build may have failed)"
cp "$acme_so" "$BUILD_DIR/nginx-acme/objs/ngx_http_acme_module.so" \
|| Stop-Script "Failed to stage ACME module: cp failed (check disk space or permissions)"

Write-Log INFO "ACME module built successfully"
Write-Log INFO "Build complete"
Expand Down Expand Up @@ -553,7 +556,7 @@ Install-Nginx() {
fi

# Install binaries
cd "$BUILD_DIR/nginx"
cd "$BUILD_DIR/nginx" || Stop-Script "Cannot cd to $BUILD_DIR/nginx"
local output
if ! output=$(make install 2>&1); then
Write-Log ERROR "Install output: $(echo "$output" | tail -10)"
Expand Down Expand Up @@ -646,14 +649,17 @@ EOF

systemctl daemon-reload
systemctl enable nginx >/dev/null 2>&1
nginx -t && systemctl start nginx
if ! /usr/sbin/nginx -t; then
Stop-Script "nginx configuration test failed — check the error above"
fi
systemctl start nginx || Stop-Script "Failed to start nginx service"

local openssl_ver
openssl_ver=$(openssl version 2>/dev/null | awk '{print $1" "$2}' || echo "OpenSSL unknown")
Write-Log INFO "Nginx ${NGINX_VERSION} with ${openssl_ver} (system) installed"
Write-Log INFO "Access: https://localhost"
Write-Log INFO "Manage nginx with: systemctl {start|stop|reload|restart|status} nginx"
nginx -V 2>&1 | head -n1 || true
/usr/sbin/nginx -V 2>&1 | head -n1 || true

Test-NginxInstallation || Write-Log WARN "Post-install checks detected issues"
}
Expand All @@ -672,7 +678,7 @@ Test-NginxInstallation() {
Write-Log INFO "ACME module present"
fi

if ! nginx -t >/dev/null 2>&1; then
if ! /usr/sbin/nginx -t >/dev/null 2>&1; then
Write-Log ERROR "nginx -t failed"
return 1
fi
Expand Down Expand Up @@ -713,10 +719,27 @@ Remove-Nginx() {

Test-RunningWebServers() {
local ports_in_use=()
local has_lsof=0 has_ss=0
command -v lsof >/dev/null 2>&1 && has_lsof=1
command -v ss >/dev/null 2>&1 && has_ss=1

if [[ $has_lsof -eq 0 && $has_ss -eq 0 ]]; then
Write-Log WARN "Neither lsof nor ss available; skipping port conflict check"
return 0
fi

for port in 80 443; do
local pid
pid=$(lsof -ti :"$port" 2>/dev/null | head -n1 || true)
if [[ $has_lsof -eq 1 ]]; then
pid=$(lsof -ti :"$port" 2>/dev/null | head -n1 || true)
else
pid=$(ss -tlnp 2>/dev/null \
| awk -v p="${port}" '
$0 ~ ":"p"[[:space:]]" {
if (match($0, /pid=[0-9]+/)) { print substr($0, RSTART+4, RLENGTH-4); exit }
}' \
|| true)
Comment thread
Stensel8 marked this conversation as resolved.
fi
if [[ -n "$pid" ]]; then
local proc
proc=$(ps -p "$pid" -o comm= 2>/dev/null || echo "unknown")
Expand Down