From b2eafaa3167ebafe35daf85505661c5459b51f90 Mon Sep 17 00:00:00 2001 From: kingthorin Date: Wed, 5 Mar 2025 17:04:10 -0500 Subject: [PATCH] openapi: Clarify error message Signed-off-by: kingthorin --- addOns/openapi/CHANGELOG.md | 3 +++ .../zaproxy/zap/extension/openapi/automation/OpenApiJob.java | 4 ++-- .../zap/extension/openapi/resources/Messages.properties | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/addOns/openapi/CHANGELOG.md b/addOns/openapi/CHANGELOG.md index d818c1cae21..1365c95c06a 100644 --- a/addOns/openapi/CHANGELOG.md +++ b/addOns/openapi/CHANGELOG.md @@ -7,6 +7,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Fixed - Correct definition detection while spidering. +### Changed +- Clarified an error message which occurs in automation if there's a problem importing. + ## [44] - 2025-01-09 ### Changed - Update minimum ZAP version to 2.16.0. diff --git a/addOns/openapi/src/main/java/org/zaproxy/zap/extension/openapi/automation/OpenApiJob.java b/addOns/openapi/src/main/java/org/zaproxy/zap/extension/openapi/automation/OpenApiJob.java index eafa71dc4ad..ca5559b831a 100644 --- a/addOns/openapi/src/main/java/org/zaproxy/zap/extension/openapi/automation/OpenApiJob.java +++ b/addOns/openapi/src/main/java/org/zaproxy/zap/extension/openapi/automation/OpenApiJob.java @@ -149,7 +149,7 @@ public void runJob(AutomationEnvironment env, AutomationProgress progress) { Constant.messages.getString( "openapi.automation.error.misc", this.getName(), - targetUrl, + targetUrl == null ? file.getAbsolutePath() : targetUrl, error)); } } @@ -178,7 +178,7 @@ public void runJob(AutomationEnvironment env, AutomationProgress progress) { Constant.messages.getString( "openapi.automation.error.misc", this.getName(), - targetUrl, + targetUrl == null ? apiUrl : targetUrl, error)); } } diff --git a/addOns/openapi/src/main/resources/org/zaproxy/zap/extension/openapi/resources/Messages.properties b/addOns/openapi/src/main/resources/org/zaproxy/zap/extension/openapi/resources/Messages.properties index 681368ca7ec..5494cb98621 100644 --- a/addOns/openapi/src/main/resources/org/zaproxy/zap/extension/openapi/resources/Messages.properties +++ b/addOns/openapi/src/main/resources/org/zaproxy/zap/extension/openapi/resources/Messages.properties @@ -21,7 +21,7 @@ openapi.automation.dialog.title = OpenAPI Job openapi.automation.error.file = Job {0} cannot read file: {1} openapi.automation.error.misc = Job {0} target: {1} error: {2} openapi.automation.error.nofile = Cannot access file: {0} -openapi.automation.error.url = Job {0} target: {1} invalid API URL: {2} +openapi.automation.error.url = Job {0} target URL: {1} invalid API URL: {2} openapi.automation.info.urlsadded = Job {0} added {1} URLs openapi.automation.name = OpenAPI Automation