Merge pull request #34 from gdgd009xcd/ARCADIUS240302

## [v1.1.18] - 2024-03-12
gdgd009xcd · Mar 12, 2024 · 1e846ea · 1e846ea
2 parents 64b630e + 16b16dd
commit 1e846ea
Show file tree

Hide file tree

Showing 99 changed files with 221 additions and 741 deletions.
diff --git 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
@@ -1,6 +1,6 @@
 import org.zaproxy.gradle.addon.AddOnStatus
 
-version = "1.1.17"
+version = "1.1.18"
 description = "AutoMacroBuilder for ZAP"
 
 tasks.withType<JavaCompile> {

diff --git a/...utomacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/AppParmsIni.java b/...utomacrobuilder/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/...s/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/AppValue.java b/...s/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/.../automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/CSVParser.java b/.../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/.../automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/CastUtils.java b/.../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/.../automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/CookieKey.java b/.../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/...omacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/CookieManager.java b/...omacrobuilder/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/...acrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/CookiePathValue.java b/...acrobuilder/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/.../automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/DeepClone.java b/.../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
@@ -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/...uilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/EnvironmentVariables.java b/...uilder/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/...crobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/FetchResponseVal.java b/...crobuilder/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/...s/automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/FileInfo.java b/...s/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/...tomacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/FileReadLine.java b/...tomacrobuilder/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/...macrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/GSONSaveObject.java b/...macrobuilder/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/...crobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/GSONSaveObjectV2.java b/...crobuilder/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/.../automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/GsonEntry.java b/.../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/...tomacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/GsonIterator.java b/...tomacrobuilder/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/...automacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/GsonParser.java b/...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/...obuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/GsonParserListener.java b/...obuilder/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/...acrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/HashMapDeepCopy.java b/...acrobuilder/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/...omacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/HeaderPattern.java b/...omacrobuilder/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/...acrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/InterfaceAction.java b/...acrobuilder/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/...builder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/InterfaceCollection.java b/...builder/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/...robuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/InterfaceDoAction.java b/...robuilder/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/...r/src/main/java/org/zaproxy/zap/extension/automacrobuilder/InterfaceDoActionProvider.java b/...r/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/...obuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/InterfaceEndAction.java b/...obuilder/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/...robuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/InterfaceLangOKNG.java b/...robuilder/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/...ava/org/zaproxy/zap/extension/automacrobuilder/InterfaceParmGenRegexSaveCancelAction.java b/...ava/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/...macrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/InterfaceRegex.java b/...macrobuilder/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/...crobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/LineWrapRenderer.java b/...crobuilder/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/...tomacrobuilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/ListDeepCopy.java b/...tomacrobuilder/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/...main/java/org/zaproxy/zap/extension/automacrobuilder/MacroBuilderUIRequestListRender.java b/...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.