update3

Author: GErP83

README.md

@@ -263,7 +263,7 @@ Runs a security scan of an OpenAPI specification using OWASP ZAP.
 
 * Executes inside Docker
 * Accepts an OpenAPI file or directory (default: `openapi`)
-* Relative `-f` paths are resolved from the git repository root (fallback: current working directory)
+* Relative `-f` paths are resolved from the git repository root first, then current working directory
 * For file paths, supports `.yml`/`.yaml` extension fallback
 * Skips execution if no OpenAPI specification can be resolved
 
@@ -297,7 +297,7 @@ Validates an OpenAPI specification for schema correctness.
 
 * Runs the OpenAPI validator in Docker
 * Accepts an OpenAPI file or directory (default: `openapi`)
-* Relative `-f` paths are resolved from the git repository root (fallback: current working directory)
+* Relative `-f` paths are resolved from the git repository root first, then current working directory
 * For file paths, supports `.yml`/`.yaml` extension fallback
 * Skips execution if no OpenAPI specification can be resolved
 
@@ -591,7 +591,7 @@ Serves OpenAPI documentation locally using Docker.
 #### Behavior
 
 * Accepts an OpenAPI file or directory (default: `openapi`)
-* Relative `-f` paths are resolved from the git repository root (fallback: current working directory)
+* Relative `-f` paths are resolved from the git repository root first, then current working directory
 * If a file is provided, mounts its parent directory
 * For file paths, supports `.yml`/`.yaml` extension fallback
 * Runs Nginx in the foreground

scripts/check-openapi-security.sh

@@ -74,9 +74,18 @@ if [[ "${OPENAPI_PATH}" = /* ]]; then
     # Absolute paths are used as-is.
     OPENAPI_ABS_PATH="${OPENAPI_PATH}"
 else
-    # Relative paths are resolved from repository root.
+    # Relative paths prefer repository root, then current working directory.
     REPO_ROOT="$(resolve_repo_root)"
-    OPENAPI_ABS_PATH="${REPO_ROOT}/${OPENAPI_PATH}"
+    REPO_OPENAPI_PATH="${REPO_ROOT}/${OPENAPI_PATH}"
+    CWD_OPENAPI_PATH="$(pwd)/${OPENAPI_PATH}"
+
+    if [ -e "${REPO_OPENAPI_PATH}" ]; then
+        OPENAPI_ABS_PATH="${REPO_OPENAPI_PATH}"
+    elif [ -e "${CWD_OPENAPI_PATH}" ]; then
+        OPENAPI_ABS_PATH="${CWD_OPENAPI_PATH}"
+    else
+        OPENAPI_ABS_PATH="${REPO_OPENAPI_PATH}"
+    fi
 fi
 
 # Allow extension fallback between .yml and .yaml.

scripts/check-openapi-validation.sh

@@ -76,9 +76,18 @@ if [[ "${OPENAPI_PATH}" = /* ]]; then
     # Absolute paths are used as-is.
     OPENAPI_ABS_PATH="${OPENAPI_PATH}"
 else
-    # Relative paths are resolved from repository root.
+    # Relative paths prefer repository root, then current working directory.
     REPO_ROOT="$(resolve_repo_root)"
-    OPENAPI_ABS_PATH="${REPO_ROOT}/${OPENAPI_PATH}"
+    REPO_OPENAPI_PATH="${REPO_ROOT}/${OPENAPI_PATH}"
+    CWD_OPENAPI_PATH="$(pwd)/${OPENAPI_PATH}"
+
+    if [ -e "${REPO_OPENAPI_PATH}" ]; then
+        OPENAPI_ABS_PATH="${REPO_OPENAPI_PATH}"
+    elif [ -e "${CWD_OPENAPI_PATH}" ]; then
+        OPENAPI_ABS_PATH="${CWD_OPENAPI_PATH}"
+    else
+        OPENAPI_ABS_PATH="${REPO_OPENAPI_PATH}"
+    fi
 fi
 
 # Allow extension fallback between .yml and .yaml.

scripts/run-openapi-docker.sh

@@ -95,9 +95,18 @@ if [[ "${OPENAPI_PATH}" = /* ]]; then
     # Absolute paths are used as-is.
     OPENAPI_ABS_PATH="${OPENAPI_PATH}"
 else
-    # Relative paths are resolved from repository root.
+    # Relative paths prefer repository root, then current working directory.
     REPO_ROOT="$(resolve_repo_root)"
-    OPENAPI_ABS_PATH="${REPO_ROOT}/${OPENAPI_PATH}"
+    REPO_OPENAPI_PATH="${REPO_ROOT}/${OPENAPI_PATH}"
+    CWD_OPENAPI_PATH="$(pwd)/${OPENAPI_PATH}"
+
+    if [ -e "${REPO_OPENAPI_PATH}" ]; then
+        OPENAPI_ABS_PATH="${REPO_OPENAPI_PATH}"
+    elif [ -e "${CWD_OPENAPI_PATH}" ]; then
+        OPENAPI_ABS_PATH="${CWD_OPENAPI_PATH}"
+    else
+        OPENAPI_ABS_PATH="${REPO_OPENAPI_PATH}"
+    fi
 fi
 
 # Allow extension fallback between .yml and .yaml.

tests/bats/openapi-scripts.bats

@@ -189,3 +189,29 @@ YAML
     docker_call="$(cat "$DOCKER_LOG")"
     [[ "$docker_call" == *"/mail-examples/mail-example-openapi/openapi/openapi.yaml:/openapi.yaml"* ]]
 }
+
+@test "check-openapi-validation default path works for copied script in nested project scripts folder" {
+    repo="$(make_temp_repo)"
+    install_docker_stub "$repo"
+
+    mkdir -p "$repo/mail-examples/mail-example-openapi/scripts"
+    mkdir -p "$repo/mail-examples/mail-example-openapi/openapi"
+    cp "$PROJECT_ROOT/scripts/check-openapi-validation.sh" \
+        "$repo/mail-examples/mail-example-openapi/scripts/check-openapi-validation.sh"
+    chmod +x "$repo/mail-examples/mail-example-openapi/scripts/check-openapi-validation.sh"
+
+    cat >"$repo/mail-examples/mail-example-openapi/openapi/openapi.yaml" <<'YAML'
+openapi: 3.0.0
+info:
+  title: Nested Local API
+  version: 1.0.0
+paths: {}
+YAML
+
+    export DOCKER_LOG="$repo/docker.log"
+    run bash -c "cd '$repo/mail-examples/mail-example-openapi' && bash ./scripts/check-openapi-validation.sh"
+
+    [ "$status" -eq 0 ]
+    docker_call="$(cat "$DOCKER_LOG")"
+    [[ "$docker_call" == *"/mail-example-openapi/openapi/openapi.yaml:/openapi.yaml"* ]]
+}