Merge pull request #36 from gdgd009xcd/JOHANNES240530

## [v0.8.10] - 2024-05-31
gdgd009xcd · May 31, 2024 · 403c5ec · 403c5ec
2 parents 06a84b6 + 16234dd
commit 403c5ec
Show file tree

Hide file tree

Showing 7 changed files with 120 additions and 3 deletions.
diff --git a/addOns/customactivescan/CHANGELOG.md b/addOns/customactivescan/CHANGELOG.md
@@ -3,6 +3,10 @@ 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/).
 
+## [v0.8.10] - 2024-05-31
+### Changed
+- bugfix: fixed problemn which can't display this addon's javahelp when user select language except English.
+
 ## [v0.8.9] - 2024-03-28
 ### Changed
 - bugfix: Changed to correctly encode and decode the HttpRequest body based on Content-Encoding.

diff --git a/addOns/customactivescan/customactivescan.gradle.kts b/addOns/customactivescan/customactivescan.gradle.kts
@@ -1,7 +1,7 @@
 import org.zaproxy.gradle.addon.AddOnStatus
 
 
-version = "0.8.9"
+version = "0.8.10"
 description = "a Active Scanner with custmizable rules"
 
 val jar by tasks.getting(Jar::class) {
@@ -20,8 +20,29 @@ zapAddOn {
         url.set("https://gdgd009xcd.github.io/CustomActiveScanForZAP")
         repo.set("https://github.com/gdgd009xcd/CustomActiveScanForZAP")
         helpSet {
-            baseName.set("help%LC%.helpset")
-            localeToken.set("%LC%")
+            // baseName and localToken are used for determinating javahelp helpset(.hs)  file path
+            // In English (default) locale, %LC% token is convert to "" then helpset file path is:
+            // main/java/javahelp/help/helpset.hs
+            // In ja_JP locale, %LC% token is convert to "_ja_JP" then helpset file path is:
+            // main/java/javahelp/help_ja_JP/helpset_ja_JP.hs
+            // * if you use %LC% locale token, then you must provide "all" locale specific helpset files for ZAP.
+            //   otherwise you may remove %LC% to support any locale helpset in English only.
+            // * if you comment out both baseName and localeToken property,
+            //   zaproxy expects the help directory to be in the following path:
+            //
+            //   main/java/javahelp/[addon package dir]/resources/help
+            //                                                    help_ja_JP
+            //                                                    ...
+            //   [addon package dir] = org/zaproxy/zap/extension/customactivescan
+            //
+            //   ** this help directory hierarchy is used for providing localization help by crowdin.
+            //
+            // ----locale supported helpset configurations.---
+            //baseName.set("help%LC%.helpset")
+            //localeToken.set("%LC%")
+            // ---- no locale supported(English only) configurations.---
+            baseName.set("help.helpset")
+            localeToken.set("")
         }
     }
 }

diff --git a/addOns/customactivescan/src/main/javahelp/help_ja_JP/contents/help.html b/addOns/customactivescan/src/main/javahelp/help_ja_JP/contents/help.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<HTML>
+<HEAD>
+<TITLE>
+CustomActiveScanForZAP
+</TITLE>
+</HEAD>
+<BODY>
+<H1>CustomActiveScanForZAP</H1>
+
+<H2>About</H2>
+a ZAP Addon ActiveScan for detecting SQL injection with more better way.
+<p>
+
+<H2>Description</H2>
+<UL>
+    <B>下記のリンクは、次のURLへ遷移します：https://github.com/gdgd009xcd/CustomActiveScanForZAP</B><P></P>
+<LI><A HREF="https://github.com/gdgd009xcd/CustomActiveScanForZAP#customactivescanforzap">Overview</A>
+<LI><A HREF="https://github.com/gdgd009xcd/CustomActiveScanForZAP/wiki/1.0.-Basic-Usage">Basic Usage</A>
+</UL>
+</BODY>
+</HTML>
diff --git a/addOns/customactivescan/src/main/javahelp/help_ja_JP/helpset_ja_JP.hs b/addOns/customactivescan/src/main/javahelp/help_ja_JP/helpset_ja_JP.hs
@@ -0,0 +1,41 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE helpset
+  PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp HelpSet Version 2.0//EN"
+         "http://java.sun.com/products/javahelp/helpset_2_0.dtd">
+<helpset version="2.0" xml:lang="ja-JP">
+  <title>AutoMacroBuilderForZAP Add-On</title>
+
+  <maps>
+     <homeID>customactivescan</homeID>
+     <mapref location="map.jhm"/>
+  </maps>
+
+  <view>
+    <name>TOC</name>
+    <label>Contents</label>
+    <type>org.zaproxy.zap.extension.help.ZapTocView</type>
+    <data>toc.xml</data>
+  </view>
+
+  <view>
+    <name>Index</name>
+    <label>Index</label>
+    <type>javax.help.IndexView</type>
+    <data>index.xml</data>
+  </view>
+
+  <view>
+    <name>Search</name>
+    <label>Search</label>
+    <type>javax.help.SearchView</type>
+    <data engine="com.sun.java.help.search.DefaultSearchEngine">
+      JavaHelpSearch
+    </data>
+  </view>
+
+  <view>
+    <name>Favorites</name>
+    <label>Favorites</label>
+    <type>javax.help.FavoritesView</type>
+  </view>
+</helpset>
diff --git a/addOns/customactivescan/src/main/javahelp/help_ja_JP/index.xml b/addOns/customactivescan/src/main/javahelp/help_ja_JP/index.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE index
+  PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp Index Version 1.0//EN"
+         "http://java.sun.com/products/javahelp/index_2_0.dtd">
+
+<index version="2.0">
+    <!-- index entries are merged (sorted) into core index -->
+	<indexitem text="customactivescan" target="addon.customactivescan" />
+</index>
diff --git a/addOns/customactivescan/src/main/javahelp/help_ja_JP/map.jhm b/addOns/customactivescan/src/main/javahelp/help_ja_JP/map.jhm
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE map
+  PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp Map Version 1.0//EN"
+         "http://java.sun.com/products/javahelp/map_1_0.dtd">
+
+<map version="1.0">
+    <mapID target="addon.customactivescan" url="contents/help.html" />
+</map>
diff --git a/addOns/customactivescan/src/main/javahelp/help_ja_JP/toc.xml b/addOns/customactivescan/src/main/javahelp/help_ja_JP/toc.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE toc
+  PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp TOC Version 2.0//EN"
+         "http://java.sun.com/products/javahelp/toc_2_0.dtd">
+
+<toc version="2.0">
+	<tocitem text="ZAP User Guide" tocid="toplevelitem">
+		<tocitem text="Add Ons" tocid="addons">
+			<tocitem text="CustomActiveScanForZAP" target="addon.customactivescan"/>
+		</tocitem>
+	</tocitem>
+</toc>