Merge pull request #8975 from BetterAndBetterII/fix/caddy-is-app-listening-gate

Treat is_app_listening as a boolean, not a non-empty string

plugins/caddy-vhosts/docker-args-process-deploy

@@ -86,7 +86,7 @@ trigger-caddy-vhosts-docker-args-process-deploy() {
 
   # add the labels for caddy here
   # prefer the https:443 mapping to http:80 mapping
-  if [[ -n "$is_app_listening" ]] && [[ -n "$caddy_domains" ]]; then
+  if [[ "$is_app_listening" == "true" ]] && [[ -n "$caddy_domains" ]]; then
     has_443_mapping=false
     tls_internal="$(fn-caddy-computed-tls-internal "$APP")"
     if [[ -n "$proxy_container_https_port" ]] || [[ -n "$proxy_container_https_port_candidate" ]]; then

tests/unit/caddy-vhosts-docker-args.bats

@@ -0,0 +1,132 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+# Isolated coverage for plugins/caddy-vhosts/docker-args-process-deploy.
+# Stubs plugn and plugin sources so the trigger can run without a Dokku install.
+
+setup() {
+  TRIGGER="$(cd "$BATS_TEST_DIRNAME/../.." && pwd)/plugins/caddy-vhosts/docker-args-process-deploy"
+  STUB_ROOT="$BATS_TEST_TMPDIR/stub"
+  mkdir -p "$STUB_ROOT/bin" \
+    "$STUB_ROOT/core/common" \
+    "$STUB_ROOT/plugins/proxy" \
+    "$STUB_ROOT/plugins/caddy-vhosts"
+
+  cat >"$STUB_ROOT/core/common/functions" <<'EOF'
+#!/usr/bin/env bash
+dokku_log_warn() { echo "WARN: $*" >&2; }
+EOF
+
+  cat >"$STUB_ROOT/plugins/proxy/functions" <<'EOF'
+#!/usr/bin/env bash
+fn-proxy-get-labels-file-path() {
+  echo "${STUB_LABELS_FILE:-/nonexistent}"
+}
+EOF
+
+  cat >"$STUB_ROOT/plugins/caddy-vhosts/internal-functions" <<'EOF'
+#!/usr/bin/env bash
+fn-caddy-computed-letsencrypt-email() {
+  echo "${STUB_LETSENCRYPT_EMAIL:-}"
+}
+fn-caddy-computed-tls-internal() {
+  echo "${STUB_TLS_INTERNAL:-false}"
+}
+EOF
+
+  cat >"$STUB_ROOT/bin/plugn" <<'EOF'
+#!/usr/bin/env bash
+set -e
+if [[ "$1" != "trigger" ]]; then
+  echo "unexpected plugn command: $*" >&2
+  exit 1
+fi
+shift
+cmd="$1"
+shift
+case "$cmd" in
+  proxy-type)
+    echo "${STUB_PROXY_TYPE:-caddy}"
+    ;;
+  proxy-is-enabled)
+    echo "${STUB_PROXY_ENABLED:-true}"
+    ;;
+  domains-vhost-enabled)
+    [[ "${STUB_VHOST_ENABLED:-true}" == "true" ]]
+    ;;
+  ports-configure)
+    ;;
+  ports-get)
+    if [[ -n "${STUB_PORTS:-}" ]]; then
+      printf '%s\n' "$STUB_PORTS"
+    fi
+    ;;
+  domains-list)
+    if [[ -n "${STUB_DOMAINS:-}" ]]; then
+      printf '%s\n' "$STUB_DOMAINS"
+    fi
+    ;;
+  *)
+    echo "unexpected plugn trigger: $cmd $*" >&2
+    exit 1
+    ;;
+esac
+EOF
+  chmod +x "$STUB_ROOT/bin/plugn"
+}
+
+invoke_caddy_docker_args() {
+  env \
+    PLUGIN_CORE_AVAILABLE_PATH="$STUB_ROOT/core" \
+    PLUGIN_AVAILABLE_PATH="$STUB_ROOT/plugins" \
+    PATH="$STUB_ROOT/bin:$PATH" \
+    STUB_PORTS="${STUB_PORTS:-}" \
+    STUB_DOMAINS="${STUB_DOMAINS:-}" \
+    STUB_TLS_INTERNAL="${STUB_TLS_INTERNAL:-false}" \
+    STUB_LETSENCRYPT_EMAIL="${STUB_LETSENCRYPT_EMAIL:-}" \
+    STUB_PROXY_TYPE="${STUB_PROXY_TYPE:-caddy}" \
+    STUB_PROXY_ENABLED="${STUB_PROXY_ENABLED:-true}" \
+    STUB_VHOST_ENABLED="${STUB_VHOST_ENABLED:-true}" \
+    STUB_LABELS_FILE="${STUB_LABELS_FILE:-/nonexistent}" \
+    bash "$TRIGGER" "${APP_NAME:-testapp}" "dockerfile" "latest" "${PROC_TYPE:-web}" "1" <<<"${STDIN_DATA:-}"
+}
+
+@test "(caddy-vhosts) tls-internal does not leak caddy.tls=internal without http/https ports" {
+  STUB_DOMAINS="example.com"
+  STUB_PORTS=""
+  STUB_TLS_INTERNAL="true"
+
+  run invoke_caddy_docker_args
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  if [[ "$output" == *"caddy.tls=internal"* ]]; then
+    flunk "stray caddy.tls=internal label leaked with no http/https mapping: $output"
+  fi
+}
+
+@test "(caddy-vhosts) is_app_listening gate compares == true not -n" {
+  run grep -F '[[ "$is_app_listening" == "true" ]]' "$TRIGGER"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run grep -F '[[ -n "$is_app_listening" ]]' "$TRIGGER"
+  echo "output: $output"
+  echo "status: $status"
+  assert_failure
+}
+
+@test "(caddy-vhosts) is_app_listening true still emits reverse_proxy labels" {
+  STUB_DOMAINS="example.com"
+  STUB_PORTS="http:80:5000"
+  STUB_TLS_INTERNAL="false"
+
+  run invoke_caddy_docker_args
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output_contains "caddy.reverse_proxy"
+}