From 9ef17b47e13c9dff31a5d751f743d043914d367b Mon Sep 17 00:00:00 2001 From: thc202 Date: Thu, 3 Aug 2023 13:26:31 +0100 Subject: [PATCH] Misc name updates Remove OWASP references in docs, exception messages, search query. Signed-off-by: thc202 --- RELEASING.md | 2 +- .../zap/extension/ascanrules/RemoteFileIncludeScanRule.java | 4 ++-- .../org/zaproxy/zap/extension/ascanrulesBeta/GitMetadata.java | 4 ++-- .../extension/ascanrulesBeta/resources/Messages.properties | 2 +- .../beanshell/resources/help/contents/beanshell.html | 2 +- .../addon/client/resources/help/contents/internals.html | 2 +- .../zaproxy/zap/extension/plugnhack/ExtensionPlugNHack.java | 4 ++-- .../zap/extension/plugnhack/resources/Messages.properties | 2 +- .../zaproxy/zap/extension/plugnhack/resources/manifest.json | 2 +- .../zaproxy/zap/extension/plugnhack/resources/service.json | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/RELEASING.md b/RELEASING.md index 2a252b07b57..723df827b6a 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -11,7 +11,7 @@ will create the tag(s), create the release(s), trigger the update of the marketp ## Localized Resources -The resources that require localization (e.g. `Messages.properties`, help pages) are uploaded to the OWASP ZAP projects in +The resources that require localization (e.g. `Messages.properties`, help pages) are uploaded to the ZAP projects in [Crowdin](https://crowdin.com/) when the add-ons are released, if required (for pre-translation) the resources can be uploaded manually at anytime by running the workflow [Crowdin Upload Files](https://github.com/zaproxy/zap-extensions/actions/workflows/crowdin-upload-files.yml) indicating, with a comma separated list, the IDs of the add-ons that should have the files uploaded (e.g. `reveal, ascanrules`). diff --git a/addOns/ascanrules/src/main/java/org/zaproxy/zap/extension/ascanrules/RemoteFileIncludeScanRule.java b/addOns/ascanrules/src/main/java/org/zaproxy/zap/extension/ascanrules/RemoteFileIncludeScanRule.java index 2152fed72cb..71022f2ad22 100644 --- a/addOns/ascanrules/src/main/java/org/zaproxy/zap/extension/ascanrules/RemoteFileIncludeScanRule.java +++ b/addOns/ascanrules/src/main/java/org/zaproxy/zap/extension/ascanrules/RemoteFileIncludeScanRule.java @@ -77,8 +77,8 @@ public class RemoteFileIncludeScanRule extends AbstractAppParamPlugin { "www.google.com/", "www.google.com:80/", "www.google.com", - "www.google.com/search?q=OWASP%20ZAP", - "www.google.com:80/search?q=OWASP%20ZAP", + "www.google.com/search?q=ZAP", + "www.google.com:80/search?q=ZAP", }; /** the patterns to look for, associated with the equivalent remote file targets above */ diff --git a/addOns/ascanrulesBeta/src/main/java/org/zaproxy/zap/extension/ascanrulesBeta/GitMetadata.java b/addOns/ascanrulesBeta/src/main/java/org/zaproxy/zap/extension/ascanrulesBeta/GitMetadata.java index 9b8546028bd..c2dac955242 100644 --- a/addOns/ascanrulesBeta/src/main/java/org/zaproxy/zap/extension/ascanrulesBeta/GitMetadata.java +++ b/addOns/ascanrulesBeta/src/main/java/org/zaproxy/zap/extension/ascanrulesBeta/GitMetadata.java @@ -416,7 +416,7 @@ public byte[] getObjectData( throw new Exception( "Only Git Pack File versions 2, 3, and 4 are currently supported. Git Pack File Version " + packFileVersion - + " was found. Contact the zaproxy (OWASP Zap) dev team"); + + " was found. Contact the ZAP dev team"); } // for pack file version 4, read the SHA1 tables from the "pack" file at this point @@ -749,7 +749,7 @@ private byte[] getPackedObjectData( // TODO :support Packed Objects of type 'DELTA_ENCODED object with base // BINARY_OBJ_ID' throw new Exception( - "Packed Objects of type 'DELTA_ENCODED object with base BINARY_OBJ_ID' are not yet supported. If you have a test case, please let the OWASP Zap dev team know!"); + "Packed Objects of type 'DELTA_ENCODED object with base BINARY_OBJ_ID' are not yet supported. If you have a test case, please let the ZAP dev team know!"); } // Note that 0x7F is 0111 1111 in binary. Useful to mask off all but the top bit of a diff --git a/addOns/ascanrulesBeta/src/main/resources/org/zaproxy/zap/extension/ascanrulesBeta/resources/Messages.properties b/addOns/ascanrulesBeta/src/main/resources/org/zaproxy/zap/extension/ascanrulesBeta/resources/Messages.properties index 8e2e6c92155..cb520e0e991 100644 --- a/addOns/ascanrulesBeta/src/main/resources/org/zaproxy/zap/extension/ascanrulesBeta/resources/Messages.properties +++ b/addOns/ascanrulesBeta/src/main/resources/org/zaproxy/zap/extension/ascanrulesBeta/resources/Messages.properties @@ -130,7 +130,7 @@ ascanbeta.oobxss.skipped = no Active Scan OAST service is selected. ascanbeta.proxydisclosure.attack = TRACE, OPTIONS methods with 'Max-Forwards' header. TRACK method. ascanbeta.proxydisclosure.desc = {0} proxy server(s) were detected or fingerprinted. This information helps a potential attacker to determine \n - A list of targets for an attack against the application.\n - Potential vulnerabilities on the proxy servers that service the application.\n - The presence or absence of any proxy-based components that might cause attacks against the application to be detected, prevented, or mitigated. ascanbeta.proxydisclosure.extrainfo.proxyserver = - {0} -ascanbeta.proxydisclosure.extrainfo.proxyserver.header = Using the TRACE, OPTIONS, and TRACK methods, the following proxy servers have been identified between OWASP ZAP and the application/web server: +ascanbeta.proxydisclosure.extrainfo.proxyserver.header = Using the TRACE, OPTIONS, and TRACK methods, the following proxy servers have been identified between ZAP and the application/web server: ascanbeta.proxydisclosure.extrainfo.silentproxyserver = - {0} ascanbeta.proxydisclosure.extrainfo.silentproxyserver.header = The following 'silent' proxy servers were identified. Due to their behaviour, it is not known at which point in the network topology these proxy servers reside: ascanbeta.proxydisclosure.extrainfo.traceenabled = The 'TRACE' method is enabled on one or more of the proxy servers, or on the origin server. This method leaks all information submitted from the web browser and proxies back to the user agent. This may facilitate 'Cross Site Tracing' attacks. diff --git a/addOns/beanshell/src/main/javahelp/org/zaproxy/zap/extension/beanshell/resources/help/contents/beanshell.html b/addOns/beanshell/src/main/javahelp/org/zaproxy/zap/extension/beanshell/resources/help/contents/beanshell.html index 8841807fa37..7bfffa4814c 100644 --- a/addOns/beanshell/src/main/javahelp/org/zaproxy/zap/extension/beanshell/resources/help/contents/beanshell.html +++ b/addOns/beanshell/src/main/javahelp/org/zaproxy/zap/extension/beanshell/resources/help/contents/beanshell.html @@ -12,7 +12,7 @@

Bean Shell Console

The BeanShell is an interactive Java shell that can be used to execute BeanShell scripts. These scripts are a simplified form of Java that use many elements from Java syntax, but in a simpler scripting format. All Java code is also valid BeanShell code.
- BeanShell integration in OWASP ZAP enables you to write scripts using the ZAP functions and + BeanShell integration in ZAP enables you to write scripts using the ZAP functions and data set. This can be a very powerful feature for analyzing web applications.

BeanShell Console

diff --git a/addOns/client/src/main/javahelp/org/zaproxy/addon/client/resources/help/contents/internals.html b/addOns/client/src/main/javahelp/org/zaproxy/addon/client/resources/help/contents/internals.html index afdec28e372..86b64daca8d 100644 --- a/addOns/client/src/main/javahelp/org/zaproxy/addon/client/resources/help/contents/internals.html +++ b/addOns/client/src/main/javahelp/org/zaproxy/addon/client/resources/help/contents/internals.html @@ -41,7 +41,7 @@

Manual Browser Launch

diff --git a/addOns/plugnhack/src/main/java/org/zaproxy/zap/extension/plugnhack/ExtensionPlugNHack.java b/addOns/plugnhack/src/main/java/org/zaproxy/zap/extension/plugnhack/ExtensionPlugNHack.java index 67ef88201fc..43251368fdc 100644 --- a/addOns/plugnhack/src/main/java/org/zaproxy/zap/extension/plugnhack/ExtensionPlugNHack.java +++ b/addOns/plugnhack/src/main/java/org/zaproxy/zap/extension/plugnhack/ExtensionPlugNHack.java @@ -91,7 +91,7 @@ public class ExtensionPlugNHack extends ExtensionAdaptor private static final String REPLACE_ID_TOKEN = "__REPLACE_ID__"; private static final String REPLACE_NONCE = "__REPLACE_NONCE__"; private static final String SCRIPT_START = - "\n" + "\n"; public static final String NAME = "ExtensionPlugNHack"; diff --git a/addOns/plugnhack/src/main/resources/org/zaproxy/zap/extension/plugnhack/resources/Messages.properties b/addOns/plugnhack/src/main/resources/org/zaproxy/zap/extension/plugnhack/resources/Messages.properties index 0b20bcc8b97..5e28d65d20e 100644 --- a/addOns/plugnhack/src/main/resources/org/zaproxy/zap/extension/plugnhack/resources/Messages.properties +++ b/addOns/plugnhack/src/main/resources/org/zaproxy/zap/extension/plugnhack/resources/Messages.properties @@ -32,7 +32,7 @@ plugnhack.failure = Configuration failed plugnhack.firefox = Add to Firefox -plugnhack.header = Welcome to the OWASP Zed Attack Proxy (ZAP) +plugnhack.header = Welcome to the Zed Attack Proxy (ZAP) plugnhack.intro1 = ZAP is an easy to use integrated penetration testing tool for finding vulnerabilities in web applications. diff --git a/addOns/plugnhack/src/main/resources/org/zaproxy/zap/extension/plugnhack/resources/manifest.json b/addOns/plugnhack/src/main/resources/org/zaproxy/zap/extension/plugnhack/resources/manifest.json index eb66c156c5b..7cdc9fec21e 100644 --- a/addOns/plugnhack/src/main/resources/org/zaproxy/zap/extension/plugnhack/resources/manifest.json +++ b/addOns/plugnhack/src/main/resources/org/zaproxy/zap/extension/plugnhack/resources/manifest.json @@ -1,5 +1,5 @@ { - "toolName":"OWASP ZAP", + "toolName":"ZAP", "protocolVersion":"0.2", "features":{ "proxy":{ diff --git a/addOns/plugnhack/src/main/resources/org/zaproxy/zap/extension/plugnhack/resources/service.json b/addOns/plugnhack/src/main/resources/org/zaproxy/zap/extension/plugnhack/resources/service.json index c821abeff22..efa571db168 100644 --- a/addOns/plugnhack/src/main/resources/org/zaproxy/zap/extension/plugnhack/resources/service.json +++ b/addOns/plugnhack/src/main/resources/org/zaproxy/zap/extension/plugnhack/resources/service.json @@ -1,6 +1,6 @@ { "commands":[{ - "description":"OWASP ZAP Commands" + "description":"ZAP Commands" }, { "name":"session",