From 16b16dd9dbef72fd75d3bd7a4ba548ac1d6f6866 Mon Sep 17 00:00:00 2001 From: gdgd009xcd Date: Tue, 12 Mar 2024 15:10:03 +0900 Subject: [PATCH] ## [v1.1.18] - 2024-03-12 ### Changed - bugfix: Changed ActiveScan behavior when scan is started again. the current request has modified after previous scanning, so scanning again might failed. - maintenance: Updated copyright message Signed-off-by: gdgd009xcd --- addOns/automacrobuilder/CHANGELOG.md | 6 + .../automacrobuilder.gradle.kts | 2 +- .../automacrobuilder/AppParmsIni.java | 6 +- .../extension/automacrobuilder/AppValue.java | 6 +- .../extension/automacrobuilder/CSVParser.java | 6 +- .../extension/automacrobuilder/CastUtils.java | 6 +- .../extension/automacrobuilder/CookieKey.java | 6 +- .../automacrobuilder/CookieManager.java | 6 +- .../automacrobuilder/CookiePathValue.java | 6 +- .../extension/automacrobuilder/DeepClone.java | 6 +- .../extension/automacrobuilder/Encode.java | 6 +- .../EnvironmentVariables.java | 6 +- .../automacrobuilder/FetchResponseVal.java | 6 +- .../extension/automacrobuilder/FileInfo.java | 6 +- .../automacrobuilder/FileReadLine.java | 6 +- .../automacrobuilder/GSONSaveObject.java | 6 +- .../automacrobuilder/GSONSaveObjectV2.java | 6 +- .../extension/automacrobuilder/GsonEntry.java | 6 +- .../automacrobuilder/GsonIterator.java | 6 +- .../automacrobuilder/GsonParser.java | 6 +- .../automacrobuilder/GsonParserListener.java | 6 +- .../automacrobuilder/HashMapDeepCopy.java | 6 +- .../automacrobuilder/HeaderPattern.java | 6 +- .../automacrobuilder/InterfaceAction.java | 6 +- .../automacrobuilder/InterfaceCollection.java | 6 +- .../automacrobuilder/InterfaceDoAction.java | 6 +- .../InterfaceDoActionProvider.java | 6 +- .../automacrobuilder/InterfaceEndAction.java | 6 +- .../automacrobuilder/InterfaceLangOKNG.java | 6 +- ...InterfaceParmGenRegexSaveCancelAction.java | 6 +- .../automacrobuilder/InterfaceRegex.java | 8 +- .../automacrobuilder/LineWrapRenderer.java | 8 +- .../automacrobuilder/ListDeepCopy.java | 6 +- .../MacroBuilderUIRequestListRender.java | 6 +- .../automacrobuilder/OneThreadProcessor.java | 6 +- .../zap/extension/automacrobuilder/PLog.java | 6 +- .../extension/automacrobuilder/PRequest.java | 6 +- .../automacrobuilder/PRequestResponse.java | 8 +- .../extension/automacrobuilder/PResponse.java | 6 +- .../automacrobuilder/ParmFileFilter.java | 8 +- .../extension/automacrobuilder/ParmGen.java | 6 +- .../automacrobuilder/ParmGenArrayList.java | 6 +- .../automacrobuilder/ParmGenBeen.java | 6 +- .../automacrobuilder/ParmGenBinUtil.java | 106 ++++++-- .../automacrobuilder/ParmGenGSON.java | 6 +- .../automacrobuilder/ParmGenGSONDecoder.java | 6 +- .../automacrobuilder/ParmGenGSONSaveV2.java | 6 +- .../automacrobuilder/ParmGenHashMap.java | 6 +- .../automacrobuilder/ParmGenHeader.java | 6 +- .../automacrobuilder/ParmGenMacroTrace.java | 10 +- .../ParmGenMacroTraceProvider.java | 6 +- .../automacrobuilder/ParmGenParseURL.java | 6 +- .../automacrobuilder/ParmGenParser.java | 8 +- .../automacrobuilder/ParmGenReadFile.java | 6 +- .../automacrobuilder/ParmGenRequestToken.java | 6 +- .../ParmGenRequestTokenKey.java | 6 +- .../automacrobuilder/ParmGenResToken.java | 6 +- .../ParmGenResTokenCollections.java | 6 +- .../automacrobuilder/ParmGenSession.java | 8 +- .../automacrobuilder/ParmGenStack.java | 6 +- .../automacrobuilder/ParmGenString.java | 6 +- .../automacrobuilder/ParmGenStringDiffer.java | 6 +- .../automacrobuilder/ParmGenTWait.java | 6 +- .../automacrobuilder/ParmGenToken.java | 6 +- .../automacrobuilder/ParmGenTokenKey.java | 6 +- .../automacrobuilder/ParmGenTokenValue.java | 6 +- .../ParmGenTrackKeyPerThread.java | 6 +- .../ParmGenTrackingParam.java | 6 +- .../ParmGenTrackingToken.java | 6 +- .../automacrobuilder/ParmGenUtil.java | 6 +- .../automacrobuilder/ParmGenWriteFile.java | 6 +- .../automacrobuilder/ParseHTTPHeaders.java | 19 -- .../automacrobuilder/PathComparator.java | 6 +- .../automacrobuilder/StrSelectInfo.java | 8 +- .../automacrobuilder/ThreadManager.java | 6 +- .../ThreadManagerProvider.java | 6 +- .../automacrobuilder/UUIDGenerator.java | 6 +- .../generated/MacroBuilderUI.java | 9 +- .../generated/ParmGenAttackListDialog.form | 240 ------------------ .../generated/ParmGenAttackListDialog.java | 2 +- .../generated/ParmGenCSVLoader.java | 2 +- .../generated/ResponseTracker.java | 2 +- .../generated/SelectRequest.java | 2 +- .../automacrobuilder/interfaceParmGenWin.java | 8 +- .../mdepend/ClientDependMessageContainer.java | 6 +- .../mdepend/ClientDependent.java | 6 +- .../view/JTextPaneContents.java | 6 +- .../view/TextPaneLineWrapper.java | 6 +- .../zap/CustomScanDialogForMacroBuilder.java | 6 +- .../zap/ExtensionActiveScanWrapper.java | 6 +- .../zap/MyFirstScannerHook.java | 6 +- .../zap/MyFirstSenderListener.java | 6 +- .../automacrobuilder/zap/MyWorkPanel.java | 6 +- .../zap/PopUpItemActiveScan.java | 8 +- .../zap/PopUpItemSingleSend.java | 2 +- .../automacrobuilder/zap/ZapUtil.java | 31 ++- .../zap/generated/MyFirstJPanel.java | 6 +- .../src/main/resources/burp/Bundle.properties | 2 + gradle/spotless/license.java | 5 +- 99 files changed, 221 insertions(+), 741 deletions(-) delete mode 100644 addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/generated/ParmGenAttackListDialog.form diff --git a/addOns/automacrobuilder/CHANGELOG.md b/addOns/automacrobuilder/CHANGELOG.md index 4bc4254..0d01b6a 100644 --- a/addOns/automacrobuilder/CHANGELOG.md +++ b/addOns/automacrobuilder/CHANGELOG.md @@ -2,6 +2,12 @@ All notable changes to this add-on will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). +## [v1.1.18] - 2024-03-12 +### Changed +- bugfix: Changed ActiveScan behavior when scan is started again. + the current request has modified after previous scanning, so scanning again might failed. +- maintenance: Updated copyright message + ## [v1.1.17] - 2024-02-29 ### Changed - bugfix: fixed bug in strange text cursor caret movement in the StyledDocumentWithChunk which has JComponents. diff --git a/addOns/automacrobuilder/automacrobuilder.gradle.kts b/addOns/automacrobuilder/automacrobuilder.gradle.kts index ec7b846..3e0bc0b 100644 --- a/addOns/automacrobuilder/automacrobuilder.gradle.kts +++ b/addOns/automacrobuilder/automacrobuilder.gradle.kts @@ -1,6 +1,6 @@ import org.zaproxy.gradle.addon.AddOnStatus -version = "1.1.17" +version = "1.1.18" description = "AutoMacroBuilder for ZAP" tasks.withType { diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/AppParmsIni.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/AppParmsIni.java index 7ab011f..3dbc170 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/AppParmsIni.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/AppParmsIni.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/AppValue.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/AppValue.java index 24805e6..b1c41e4 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/AppValue.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/AppValue.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/CSVParser.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/CSVParser.java index 0a769ae..38ac054 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/CSVParser.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/CSVParser.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/CastUtils.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/CastUtils.java index 9ca6a60..78e460b 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/CastUtils.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/CastUtils.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/CookieKey.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/CookieKey.java index 2c76437..f5db077 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/CookieKey.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/CookieKey.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/CookieManager.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/CookieManager.java index 5e86867..9f5a8fd 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/CookieManager.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/CookieManager.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/CookiePathValue.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/CookiePathValue.java index 4a695b4..8560c8a 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/CookiePathValue.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/CookiePathValue.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/DeepClone.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/DeepClone.java index 02facfb..b88e186 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/DeepClone.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/DeepClone.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/Encode.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/Encode.java index 11b6f81..5139fe7 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/Encode.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/Encode.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/EnvironmentVariables.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/EnvironmentVariables.java index f100bf4..e85f6bf 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/EnvironmentVariables.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/EnvironmentVariables.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/FetchResponseVal.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/FetchResponseVal.java index 8a4fdab..a84cfbe 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/FetchResponseVal.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/FetchResponseVal.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/FileInfo.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/FileInfo.java index 847ebd1..47c4783 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/FileInfo.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/FileInfo.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/FileReadLine.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/FileReadLine.java index 0aa2dfc..ff90ce9 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/FileReadLine.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/FileReadLine.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/GSONSaveObject.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/GSONSaveObject.java index b23c88b..328b3df 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/GSONSaveObject.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/GSONSaveObject.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/GSONSaveObjectV2.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/GSONSaveObjectV2.java index c2f79c1..8f5ec8a 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/GSONSaveObjectV2.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/GSONSaveObjectV2.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/GsonEntry.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/GsonEntry.java index 6d4b811..2775a26 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/GsonEntry.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/GsonEntry.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/GsonIterator.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/GsonIterator.java index d69b195..1ff7310 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/GsonIterator.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/GsonIterator.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/GsonParser.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/GsonParser.java index f3f51c9..fd64358 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/GsonParser.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/GsonParser.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/GsonParserListener.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/GsonParserListener.java index d59a8c6..6023ec1 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/GsonParserListener.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/GsonParserListener.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/HashMapDeepCopy.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/HashMapDeepCopy.java index f18964d..498ebbb 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/HashMapDeepCopy.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/HashMapDeepCopy.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/HeaderPattern.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/HeaderPattern.java index 0cd98d2..e079db0 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/HeaderPattern.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/HeaderPattern.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/InterfaceAction.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/InterfaceAction.java index 3ba8aff..e5af00a 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/InterfaceAction.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/InterfaceAction.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/InterfaceCollection.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/InterfaceCollection.java index 87f3152..8310927 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/InterfaceCollection.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/InterfaceCollection.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/InterfaceDoAction.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/InterfaceDoAction.java index 405a5d4..78e6091 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/InterfaceDoAction.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/InterfaceDoAction.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/InterfaceDoActionProvider.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/InterfaceDoActionProvider.java index 0d961df..161209c 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/InterfaceDoActionProvider.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/InterfaceDoActionProvider.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/InterfaceEndAction.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/InterfaceEndAction.java index 68e8a0d..557dc3d 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/InterfaceEndAction.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/InterfaceEndAction.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/InterfaceLangOKNG.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/InterfaceLangOKNG.java index caa7e92..6573aa1 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/InterfaceLangOKNG.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/InterfaceLangOKNG.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/InterfaceParmGenRegexSaveCancelAction.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/InterfaceParmGenRegexSaveCancelAction.java index 51759d4..f139acd 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/InterfaceParmGenRegexSaveCancelAction.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/InterfaceParmGenRegexSaveCancelAction.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/InterfaceRegex.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/InterfaceRegex.java index 514ab71..d8e47d5 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/InterfaceRegex.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/InterfaceRegex.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,7 +15,7 @@ */ package org.zaproxy.zap.extension.automacrobuilder; -/** @author tms783 */ +/** @author gdgd009xcd */ public interface InterfaceRegex { public String getRegex(); diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/LineWrapRenderer.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/LineWrapRenderer.java index 7428957..2a9c9fe 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/LineWrapRenderer.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/LineWrapRenderer.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,7 +20,7 @@ import javax.swing.JTextArea; import javax.swing.table.TableCellRenderer; -/** @author tms783 */ +/** @author gdgd009xcd */ @SuppressWarnings("serial") public class LineWrapRenderer extends JTextArea implements TableCellRenderer { private static org.apache.logging.log4j.Logger LOGGER4J = diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ListDeepCopy.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ListDeepCopy.java index 5e4608a..89f1d67 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ListDeepCopy.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ListDeepCopy.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/MacroBuilderUIRequestListRender.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/MacroBuilderUIRequestListRender.java index dfccd54..b36e73b 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/MacroBuilderUIRequestListRender.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/MacroBuilderUIRequestListRender.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/OneThreadProcessor.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/OneThreadProcessor.java index 52597fe..2463e4d 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/OneThreadProcessor.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/OneThreadProcessor.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/PLog.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/PLog.java index ab5ba7b..cc0b032 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/PLog.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/PLog.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/PRequest.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/PRequest.java index fa46949..cee896f 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/PRequest.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/PRequest.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/PRequestResponse.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/PRequestResponse.java index 7c88a40..37e7812 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/PRequestResponse.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/PRequestResponse.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,7 +19,7 @@ import java.util.logging.Logger; import org.zaproxy.zap.extension.automacrobuilder.mdepend.ClientDependMessageContainer; -/** @author tms783 */ +/** @author gdgd009xcd */ public class PRequestResponse implements DeepClone { public PRequest request; public PResponse response; diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/PResponse.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/PResponse.java index 0af7f10..ad8e67d 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/PResponse.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/PResponse.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmFileFilter.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmFileFilter.java index f98c73e..962c7bc 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmFileFilter.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmFileFilter.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,7 +19,7 @@ import java.util.ResourceBundle; import javax.swing.filechooser.FileFilter; -/** @author tms783 */ +/** @author gdgd009xcd */ public class ParmFileFilter extends FileFilter { private static final ResourceBundle bundle = ResourceBundle.getBundle("burp/Bundle"); diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGen.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGen.java index b61d71c..e60c33c 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGen.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGen.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenArrayList.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenArrayList.java index 5c15fff..150c164 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenArrayList.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenArrayList.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenBeen.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenBeen.java index ed086ae..e63ee20 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenBeen.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenBeen.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenBinUtil.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenBinUtil.java index 142548d..86bc4eb 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenBinUtil.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenBinUtil.java @@ -1,28 +1,9 @@ -/* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ package org.zaproxy.zap.extension.automacrobuilder; import java.io.ByteArrayOutputStream; import java.io.IOException; -/** @author youtube */ +/** @author gdgd009xcd */ // // ByteArray // @@ -47,7 +28,12 @@ public int length() { return bstream.size(); } - /** streamにバイトを追加 */ + /** + * add byte array to bstream + * + * @param bin + * @return + */ public boolean concat(byte[] bin) { if ((bin == null)) { @@ -70,7 +56,14 @@ public byte[] getBytes() { return bstream.toByteArray(); } - /** substring のバイナリ版 org[beginIndex] - org[endIndex-1] length = endIndex - beginIndex > 0 */ + /** + * get byte array between beginIndex and endIndex within bstream + * org[beginIndex] - org[endIndex-1] length = endIndex - beginIndex > 0 + * + * @param beginIndex + * @param endIndex + * @return + */ public byte[] subBytes(int beginIndex, int endIndex) { int length = endIndex - beginIndex; // 戻り値配列の要素数 @@ -84,13 +77,20 @@ public byte[] subBytes(int beginIndex, int endIndex) { return null; } - /** org[beginIndex] to last */ + + /** + * get byte array from beginIndex until last. + * + * @param beginIndex + * @return + */ public byte[] subBytes(int beginIndex) { return subBytes(beginIndex, length()); } /** indexOf */ - public int indexOf(byte[] dest, int startpos) { + @Deprecated + public int indexOfobsolete(byte[] dest, int startpos) { int idx = -1; byte[] seqbin = getBytes(); byte[] keybin = dest; @@ -120,6 +120,49 @@ public int indexOf(byte[] dest, int startpos) { return idx; } + /** + * get index of first occurrence of dest sequence ｗithin this byte sequence + * + * @param dest + * @param startpos + * @return + */ + public int indexOf(byte[] dest, int startpos) { + byte[] seqbin = getBytes(); + byte[] keybin = dest; + + if (seqbin == null || keybin == null) return -1; + + int seqLen = seqbin.length; + int keyLen = keybin.length; + int endpos = seqLen - keyLen + 1; + + if (seqLen < 1 || keyLen < 1) return -1; + + if (endpos > 0 && startpos < endpos) { + byte c = keybin[0]; + int i = startpos; + + if (keyLen == 1) { + return nextFirstBytePos(i, seqbin, c, keyLen); + } else { + while ((i = nextFirstBytePos(i, seqbin, c, keyLen)) != -1) { + int j; + for (j = 1; j < keyLen; j++) { + if (seqbin[i + j] != keybin[j]) { + break; + } + } + if (j == keyLen) { + return i; + } + i++; + } + } + } + return -1; + } + /** */ public int indexOf(byte[] dest) { return indexOf(dest, 0); @@ -134,4 +177,19 @@ public int indexOf(byte dest) { public void clear() { bstream.reset(); } + + private int nextFirstBytePos(int start, byte[] src, byte c, int destLen) { + int srcLen = src.length; + int minLen = srcLen - destLen; + for(int i=start; i < srcLen; i++) { + if(src[i] == c ){ + if(i <= minLen){ + return i; + } else { + break; + } + } + } + return -1; + } } diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenGSON.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenGSON.java index 3b1edc1..7409315 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenGSON.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenGSON.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenGSONDecoder.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenGSONDecoder.java index f2df8a8..25fe99f 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenGSONDecoder.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenGSONDecoder.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenGSONSaveV2.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenGSONSaveV2.java index 33b0200..87e4977 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenGSONSaveV2.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenGSONSaveV2.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenHashMap.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenHashMap.java index f762ea7..1374ec3 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenHashMap.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenHashMap.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenHeader.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenHeader.java index 66146c1..ff504e4 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenHeader.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenHeader.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenMacroTrace.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenMacroTrace.java index 907a32e..7d1ebc9 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenMacroTrace.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenMacroTrace.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -478,7 +474,7 @@ public void updateRequestCurrentList(int idx, PRequest request) { } } - public PRequestResponse getOriginalRequest(int idx) { + public PRequestResponse getOriginalPRequestResponse(int idx) { if (originalrlist != null && originalrlist.size() > 0 && idx > -1 @@ -490,7 +486,7 @@ public PRequestResponse getOriginalRequest(int idx) { } public PRequestResponse getCurrentOriginalRequest() { - return getOriginalRequest(getCurrentRequestPos()); + return getOriginalPRequestResponse(getCurrentRequestPos()); } // 1) Start Pre Macros diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenMacroTraceProvider.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenMacroTraceProvider.java index 2bec7c0..2ff25f8 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenMacroTraceProvider.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenMacroTraceProvider.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenParseURL.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenParseURL.java index cfc087b..1df0fa8 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenParseURL.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenParseURL.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenParser.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenParser.java index 35e1d82..7041e6f 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenParser.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenParser.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,7 +23,7 @@ import org.jsoup.nodes.Element; import org.jsoup.select.Elements; -/** @author tms783 */ +/** @author gdgd009xcd */ public class ParmGenParser implements DeepClone { final private static org.apache.logging.log4j.Logger LOGGER4J = diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenReadFile.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenReadFile.java index fdcf23b..209d9ad 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenReadFile.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenReadFile.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenRequestToken.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenRequestToken.java index e911ea1..9d79c54 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenRequestToken.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenRequestToken.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenRequestTokenKey.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenRequestTokenKey.java index 67907d0..3911ab7 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenRequestTokenKey.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenRequestTokenKey.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenResToken.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenResToken.java index 72cd22d..e317f34 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenResToken.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenResToken.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenResTokenCollections.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenResTokenCollections.java index 69c6836..e98a9c1 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenResTokenCollections.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenResTokenCollections.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenSession.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenSession.java index 315a9a6..a2a338f 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenSession.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenSession.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,7 +17,7 @@ import java.util.HashMap; -/** @author tms783 */ +/** @author gdgd009xcd */ public class ParmGenSession { HashMap map; // names diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenStack.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenStack.java index 61aacf2..d47c102 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenStack.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenStack.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenString.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenString.java index 2e0d762..2138b76 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenString.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenString.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenStringDiffer.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenStringDiffer.java index 1e066bf..bbdf5ad 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenStringDiffer.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenStringDiffer.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenTWait.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenTWait.java index a583690..8333884 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenTWait.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenTWait.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenToken.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenToken.java index 655faa5..da82eb3 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenToken.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenToken.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenTokenKey.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenTokenKey.java index 7e22425..64ea38f 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenTokenKey.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenTokenKey.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenTokenValue.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenTokenValue.java index 7c20a43..235c8e6 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenTokenValue.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenTokenValue.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenTrackKeyPerThread.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenTrackKeyPerThread.java index 8308241..e702e95 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenTrackKeyPerThread.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenTrackKeyPerThread.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenTrackingParam.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenTrackingParam.java index 0cfe0f0..c82e463 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenTrackingParam.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenTrackingParam.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenTrackingToken.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenTrackingToken.java index df939c0..d4e0198 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenTrackingToken.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenTrackingToken.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenUtil.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenUtil.java index 25265aa..4efc612 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenUtil.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenUtil.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenWriteFile.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenWriteFile.java index 743093b..9011ef4 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenWriteFile.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParmGenWriteFile.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParseHTTPHeaders.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParseHTTPHeaders.java index fbd6f97..2bc614d 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParseHTTPHeaders.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ParseHTTPHeaders.java @@ -1,22 +1,3 @@ -/* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ package org.zaproxy.zap.extension.automacrobuilder; import static org.zaproxy.zap.extension.automacrobuilder.HashMapDeepCopy.hashMapDeepCopyStrKStrV; diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/PathComparator.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/PathComparator.java index 6ad15e4..5760c37 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/PathComparator.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/PathComparator.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/StrSelectInfo.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/StrSelectInfo.java index 097b858..eef448a 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/StrSelectInfo.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/StrSelectInfo.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,7 +15,7 @@ */ package org.zaproxy.zap.extension.automacrobuilder; -/** @author tms783 */ +/** @author gdgd009xcd */ public class StrSelectInfo { public String val; public int start; diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ThreadManager.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ThreadManager.java index 4b738f6..ab5b3df 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ThreadManager.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ThreadManager.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ThreadManagerProvider.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ThreadManagerProvider.java index cc7e3d7..4feaeb6 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ThreadManagerProvider.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ThreadManagerProvider.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/UUIDGenerator.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/UUIDGenerator.java index 03d7572..bd6e2a1 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/UUIDGenerator.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/UUIDGenerator.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/generated/MacroBuilderUI.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/generated/MacroBuilderUI.java index 558d165..1f01a80 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/generated/MacroBuilderUI.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/generated/MacroBuilderUI.java @@ -24,7 +24,6 @@ import java.util.regex.Pattern; import javax.swing.*; import javax.swing.border.LineBorder; -import javax.swing.text.DefaultStyledDocument; import javax.swing.text.JTextComponent; import javax.swing.text.StyledDocument; import com.google.gson.JsonElement; @@ -559,6 +558,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { RequestEdit.add(edit); restore.setText(bundle.getString("MacroBuilderUI.restore.text")); // NOI18N + restore.setToolTipText(bundle.getString("MacroBuilderUI.restore.tooltip.text")); restore.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { restoreActionPerformed(evt); @@ -567,6 +567,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { RequestEdit.add(restore); update.setText(bundle.getString("MacroBuilderUI.update.text")); // NOI18N + update.setToolTipText(bundle.getString("MacroBuilderUI.update.tooltip.text")); update.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { updateActionPerformed(evt); @@ -2069,7 +2070,7 @@ private void restoreActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST if (requestJList == null) return; int idx = requestJList.getSelectedIndex(); if (idx > -1 && prequestResponseList != null && idx < prequestResponseList.size()) { - PRequestResponse prr = pmt.getOriginalRequest(idx);// get original PRequestResponse in originalrlist + PRequestResponse prr = pmt.getOriginalPRequestResponse(idx);// get original PRequestResponse in originalrlist if (prr != null) { PRequestResponse current = pmt.getRequestResponseCurrentList(idx); current.updateRequestResponse(prr.request.clone(), prr.response.clone());// clone original PRequestResponse to CurrentList(rlist) @@ -2103,7 +2104,7 @@ private void updateActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST: PRequest newrequest = doc.reBuildPRequestFromDocTextAndChunks(); // request newly created from DocText and Chunks current.request = newrequest; - PRequestResponse original = pmt.getOriginalRequest(idx); + PRequestResponse original = pmt.getOriginalPRequestResponse(idx); original.updateRequestResponse(current.request, current.response);// copy current PRequestResponse to original list(originalrlist) if (EnvironmentVariables.isSaved()) { // if you have been saved params. then overwrite. ParmGenGSONSaveV2 gson = new ParmGenGSONSaveV2(pmtProvider); @@ -2629,7 +2630,7 @@ public void restoreAllCurrentSelectedMacroRequestFromOriginal() { int selectedIndex = requestJList.getSelectedIndex(); for (int index = 0; index < prequestResponseList.size(); index++) { - PRequestResponse prr = pmt.getOriginalRequest(index);// get original PRequestResponse in original + PRequestResponse prr = pmt.getOriginalPRequestResponse(index);// get original PRequestResponse in original PRequestResponse current = pmt.getRequestResponseCurrentList(index); current.updateRequestResponse(prr.request.clone(), prr.response.clone());// clone original PRequestResponse to CurrentList(rlist) diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/generated/ParmGenAttackListDialog.form b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/generated/ParmGenAttackListDialog.form deleted file mode 100644 index 28c898c..0000000 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/generated/ParmGenAttackListDialog.form +++ /dev/null @@ -1,240 +0,0 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/generated/ParmGenAttackListDialog.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/generated/ParmGenAttackListDialog.java index 88a1e0a..10ee0f9 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/generated/ParmGenAttackListDialog.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/generated/ParmGenAttackListDialog.java @@ -95,7 +95,7 @@ public void valueChanged(javax.swing.event.ListSelectionEvent evt) { jScrollPane1.setViewportView(PatternList); AttackList.setEditable(true); - AttackList.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] { "C:\\Users\\daike\\Desktop\\ParmGenParms\\SQL Injection.txt", "C:\\Users\\daike\\Desktop\\ParmGenParms\\XSS.txt", "C:\\Users\\daike\\Desktop\\ParmGenParms\\HTTP Response Divide.txt", "C:\\Users\\daike\\Desktop\\ParmGenParms\\OS command injection.txt" })); + AttackList.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] { "C:\\Users\\xxxx\\Desktop\\ParmGenParms\\SQL Injection.txt", "C:\\Users\\xxxx\\Desktop\\ParmGenParms\\XSS.txt", "C:\\Users\\xxxxx\\Desktop\\ParmGenParms\\HTTP Response Divide.txt", "C:\\Users\\xxxxx\\Desktop\\ParmGenParms\\OS command injection.txt" })); jLabel1.setText("Attack Pattern List"); diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/generated/ParmGenCSVLoader.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/generated/ParmGenCSVLoader.java index 6763761..38645af 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/generated/ParmGenCSVLoader.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/generated/ParmGenCSVLoader.java @@ -16,7 +16,7 @@ /** * - * @author tms783 + * @author gdgd009xcd */ @SuppressWarnings("serial") public class ParmGenCSVLoader extends javax.swing.JFrame { diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/generated/ResponseTracker.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/generated/ResponseTracker.java index b0e49d7..d5f63f0 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/generated/ResponseTracker.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/generated/ResponseTracker.java @@ -27,7 +27,7 @@ /** * - * @author tms783 + * @author gdgd009xcd */ @SuppressWarnings("serial") public class ResponseTracker extends javax.swing.JFrame implements InterfaceRegex, interfaceParmGenWin { diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/generated/SelectRequest.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/generated/SelectRequest.java index 9e5c917..be64b6b 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/generated/SelectRequest.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/generated/SelectRequest.java @@ -19,7 +19,7 @@ /** * - * @author tms783 + * @author gdgd009xcd */ @SuppressWarnings("serial") public class SelectRequest extends javax.swing.JDialog { diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/interfaceParmGenWin.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/interfaceParmGenWin.java index 5fd42ac..d6cfacd 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/interfaceParmGenWin.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/interfaceParmGenWin.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,7 +15,7 @@ */ package org.zaproxy.zap.extension.automacrobuilder; -/** @author tms783 */ +/** @author gdgd009xcd */ public interface interfaceParmGenWin { public void updateMessageAreaInSelectedModel(int panel); diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/mdepend/ClientDependMessageContainer.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/mdepend/ClientDependMessageContainer.java index 4d4a78d..4140d19 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/mdepend/ClientDependMessageContainer.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/mdepend/ClientDependMessageContainer.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/mdepend/ClientDependent.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/mdepend/ClientDependent.java index bb1b654..c435d12 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/mdepend/ClientDependent.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/mdepend/ClientDependent.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/view/JTextPaneContents.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/view/JTextPaneContents.java index 2c02605..6fe1e7e 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/view/JTextPaneContents.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/view/JTextPaneContents.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/view/TextPaneLineWrapper.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/view/TextPaneLineWrapper.java index dd57672..9f7c479 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/view/TextPaneLineWrapper.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/view/TextPaneLineWrapper.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/zap/CustomScanDialogForMacroBuilder.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/zap/CustomScanDialogForMacroBuilder.java index 60fe745..fc095af 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/zap/CustomScanDialogForMacroBuilder.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/zap/CustomScanDialogForMacroBuilder.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/zap/ExtensionActiveScanWrapper.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/zap/ExtensionActiveScanWrapper.java index b7dbfd5..1eecf93 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/zap/ExtensionActiveScanWrapper.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/zap/ExtensionActiveScanWrapper.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/zap/MyFirstScannerHook.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/zap/MyFirstScannerHook.java index 9a4385d..d5d46dd 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/zap/MyFirstScannerHook.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/zap/MyFirstScannerHook.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/zap/MyFirstSenderListener.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/zap/MyFirstSenderListener.java index 8455b20..5685cca 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/zap/MyFirstSenderListener.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/zap/MyFirstSenderListener.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/zap/MyWorkPanel.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/zap/MyWorkPanel.java index 0f7680d..b11193d 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/zap/MyWorkPanel.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/zap/MyWorkPanel.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/zap/PopUpItemActiveScan.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/zap/PopUpItemActiveScan.java index 9162303..2a373f8 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/zap/PopUpItemActiveScan.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/zap/PopUpItemActiveScan.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -58,7 +54,7 @@ public class PopUpItemActiveScan extends JMenuItem { addActionListener( ev -> { - PRequest newrequest = ZapUtil.getPRequestFromMacroRequest(this.mbui); + PRequest newrequest = ZapUtil.getPRequestFromMacroRequest(this.mbui, true); if (newrequest != null) { int selectedTabIndex = this.mbui.getSelectedTabIndexOfMacroRequestList(); int currentSelectedPos = diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/zap/PopUpItemSingleSend.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/zap/PopUpItemSingleSend.java index 97310c2..38c4b94 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/zap/PopUpItemSingleSend.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/zap/PopUpItemSingleSend.java @@ -60,7 +60,7 @@ public class PopUpItemSingleSend extends JMenuItem { */ private void singleSendSelectedRequest(MacroBuilderUI f_mbui, StartedActiveScanContainer f_acon) { - PRequest newrequest = ZapUtil.getPRequestFromMacroRequest(f_mbui); + PRequest newrequest = ZapUtil.getPRequestFromMacroRequest(f_mbui, false); if (newrequest != null) { diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/zap/ZapUtil.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/zap/ZapUtil.java index 3f2ec56..6e4576e 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/zap/ZapUtil.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/zap/ZapUtil.java @@ -98,12 +98,18 @@ public static HttpMessage getHttpMessage(PRequest preq) { } /** - * Get PRequest from Contents of MacroRequest in mbui + * * * @param mbui * @return null or PRequest */ - public static PRequest getPRequestFromMacroRequest(MacroBuilderUI mbui) { + /** + * Get PRequest from Contents of MacroRequest in mbui + * @param mbui + * @param isOriginalRequest - if true then this function returns original PRequest instead of current viewed request. + * @return + */ + public static PRequest getPRequestFromMacroRequest(MacroBuilderUI mbui, boolean isOriginalRequest) { int selectedTabIndex = mbui.getSelectedTabIndexOfMacroRequestList(); int pos = mbui.getRequestJListSelectedIndexAtTabIndex(selectedTabIndex); ParmGenMacroTrace pmt = mbui.getParmGenMacroTraceAtTabIndex(selectedTabIndex); @@ -112,12 +118,21 @@ public static PRequest getPRequestFromMacroRequest(MacroBuilderUI mbui) { pmt.setCurrentRequest(pos); - StyledDocumentWithChunk doc = mbui.getStyledDocumentOfSelectedMessageRequest(); - if (doc != null) { - PRequestResponse prr = pmt.getRequestResponseCurrentList(pos); - PRequest newrequest = doc.reBuildPRequestFromDocTextAndChunks(); - prr.updateRequest(newrequest.clone()); - return newrequest; + PRequestResponse currentPRequestResponse = pmt.getRequestResponseCurrentList(pos); + + if (!isOriginalRequest) { + StyledDocumentWithChunk doc = mbui.getStyledDocumentOfSelectedMessageRequest(); + if (doc != null) { + PRequest newrequest = doc.reBuildPRequestFromDocTextAndChunks(); + currentPRequestResponse.updateRequest(newrequest.clone()); + return newrequest; + } + } else { + PRequestResponse originalPRequestRespose = pmt.getOriginalPRequestResponse(pos); + if (originalPRequestRespose != null) { + currentPRequestResponse.updateRequest(originalPRequestRespose.request.clone()); + return currentPRequestResponse.request; + } } } return null; diff --git a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/zap/generated/MyFirstJPanel.java b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/zap/generated/MyFirstJPanel.java index 0cbb554..dff9e72 100644 --- a/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/zap/generated/MyFirstJPanel.java +++ b/addOns/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/zap/generated/MyFirstJPanel.java @@ -1,9 +1,5 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. - * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright 2020 The ZAP Development Team + * Copyright 2024 gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/addOns/automacrobuilder/src/main/resources/burp/Bundle.properties b/addOns/automacrobuilder/src/main/resources/burp/Bundle.properties index 008e957..433ebe3 100644 --- a/addOns/automacrobuilder/src/main/resources/burp/Bundle.properties +++ b/addOns/automacrobuilder/src/main/resources/burp/Bundle.properties @@ -51,7 +51,9 @@ MacroBuilderUI.TrackingParamterConfig.text=· baseline(experimental) MacroBuilderUI.TakeOverCache.text=Initialize Cookie / Tracking Parameter value from cache at start MacroBuilderUI.TrackingParamBorder.text=Tracking Parameter(e.g. CSRF token) MacroBuilderUI.restore.text=Restore +MacroBuilderUI.restore.tooltip.text=Restore the viewing current contents of request from original store MacroBuilderUI.update.text=Update +MacroBuilderUI.update.tooltip.text=Update(Save) the viewing current contents of request to original store MacroBuilderUI.describeMessageView.text=this area's component(messageView) was moved to "The information window"
which attached such as history tab.
You can display from menu:View->Show Tab->messageView Tab
or select popup menu "messageView" in above MacroRequestList area. MacroBuilderUI.burpTrackingParameterPanelDisabledLabel.text=This area's component(Tracking Parameter) is disabled because this addon doesn't require it. ParmGenAddParms.DialogTitle.text=Select Request parameter diff --git a/gradle/spotless/license.java b/gradle/spotless/license.java index 6c2dca3..a0485b5 100644 --- a/gradle/spotless/license.java +++ b/gradle/spotless/license.java @@ -1,9 +1,6 @@ /* - * Zed Attack Proxy (ZAP) and its related class files. * - * ZAP is an HTTP/HTTPS proxy for assessing web application security. - * - * Copyright $YEAR The ZAP Development Team + * Copyright $YEAR gdgd009xcd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License.