diff --git a/gradle.properties b/gradle.properties index 0e5b5da2..9d70da21 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,4 @@ netbeans.org-netbeans-modules-javascript2-requirejs.enabled=true release_version_major=3.0 -release_version_minor=7.2 +release_version_minor=7.3 netbeans.license=mit -netbeans.hint.jdkPlatform=JDK_17 diff --git a/help/help-ja.html b/help/help-ja.html index 6b8324a1..1283771e 100644 --- a/help/help-ja.html +++ b/help/help-ja.html @@ -2384,7 +2384,7 @@

3.10. Version

diff --git a/help/help.html b/help/help.html index 0f27cafb..f5da62fc 100644 --- a/help/help.html +++ b/help/help.html @@ -2418,7 +2418,7 @@

3.11. Version

diff --git a/libs/BurpExtensionCommons-v3.1.2.2.jar b/libs/BurpExtensionCommons-v3.1.3.0.jar similarity index 74% rename from libs/BurpExtensionCommons-v3.1.2.2.jar rename to libs/BurpExtensionCommons-v3.1.3.0.jar index 88bf309b..6ed80847 100644 Binary files a/libs/BurpExtensionCommons-v3.1.2.2.jar and b/libs/BurpExtensionCommons-v3.1.3.0.jar differ diff --git a/release/YaguraExtension-v3.0.jar b/release/YaguraExtension-v3.0.jar new file mode 100644 index 00000000..f63ffeb6 Binary files /dev/null and b/release/YaguraExtension-v3.0.jar differ diff --git a/src/main/java/burp/BurpExtension.java b/src/main/java/burp/BurpExtension.java index 9411d64c..3cd56269 100644 --- a/src/main/java/burp/BurpExtension.java +++ b/src/main/java/burp/BurpExtension.java @@ -298,15 +298,15 @@ public List getSelectEncodingList() { String defaultCharset = HttpUtil.normalizeCharset(StringUtil.DEFAULT_ENCODING); List list = new ArrayList<>(); list.addAll(this.option.getEncodingProperty().getEncodingList()); - // リストにない場合追加(デフォルトエンコーディング) - if (!list.contains(defaultCharset)) { - list.add(defaultCharset); - } // リストにない場合追加 BurpConfig.CharacterSets burpCharset = BurpConfig.getCharacterSets(api()); if (BurpConfig.CharacterSetMode.SPECIFIC_CHARACTER_SET.toIdent().equals(burpCharset.getMode()) && burpCharset.getCharacterSet() != null && !list.contains(burpCharset.getCharacterSet())) { list.add(burpCharset.getCharacterSet()); } + // リストにない場合追加(デフォルトエンコーディング) + if (!list.contains(defaultCharset)) { + list.add(defaultCharset); + } return list; } diff --git a/src/test/java/extend/util/external/TransUtilTest.java b/src/test/java/extend/util/external/TransUtilTest.java index 54bc74e8..8b60a195 100644 --- a/src/test/java/extend/util/external/TransUtilTest.java +++ b/src/test/java/extend/util/external/TransUtilTest.java @@ -5,6 +5,10 @@ import extension.helpers.MatchUtil; import extension.helpers.SmartCodec; import extension.helpers.StringUtil; +import java.io.ByteArrayOutputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; import java.io.UnsupportedEncodingException; import java.nio.ByteBuffer; import java.util.logging.Level; @@ -30,6 +34,7 @@ import java.util.Calendar; import java.util.Date; import java.util.TimeZone; +import org.apache.commons.codec.digest.Blake3; import org.apache.commons.codec.digest.Sha2Crypt; import org.apache.commons.codec.digest.UnixCrypt; @@ -989,4 +994,35 @@ public void testTranslate() { } } + @Test + public void testBlake3_x32() { + System.out.println("testBlake3"); + Blake3 hasher = Blake3.initHash(); + hasher.update("Hello, world!".getBytes(StandardCharsets.UTF_8)); + byte[] hash = new byte[32]; + hasher.doFinalize(hash); + System.out.println(ConvertUtil.toHexString(hash)); + } + + @Test + public void testBlake3_x64() { + System.out.println("testBlake3"); + Blake3 hasher = Blake3.initHash(); + hasher.update("Hello, world!".getBytes(StandardCharsets.UTF_8)); + byte[] hash = new byte[64]; + hasher.doFinalize(hash); + System.out.println(ConvertUtil.toHexString(hash)); + } + + + @Test + public void testBinary() throws IOException { + System.out.println("testBinary"); + FileOutputStream fstm = new FileOutputStream("C:\\Windows\\Temp\\output"); + for (int i = 0; i < 256; i++) { + fstm.write((byte)i); + } + } + + } diff --git a/src/test/java/yagura/model/OptoinPropertyTest.java b/src/test/java/yagura/model/OptoinPropertyTest.java index 3ee10d82..a2d20892 100644 --- a/src/test/java/yagura/model/OptoinPropertyTest.java +++ b/src/test/java/yagura/model/OptoinPropertyTest.java @@ -1,6 +1,5 @@ package yagura.model; -import extension.burp.FilterProperty; import java.util.Collections; import java.util.LinkedHashMap; import java.util.Map; diff --git a/src/test/resources/resources/YaguraExtender.json b/src/test/resources/resources/YaguraExtender.json index 4c234ee2..28c9d905 100644 --- a/src/test/resources/resources/YaguraExtender.json +++ b/src/test/resources/resources/YaguraExtender.json @@ -90,7 +90,7 @@ "regexp": false, "match": "https://redirect/", "type": "auto responder", - "replace": "C:\\Temp\\redirect.txt", + "replace": "C:\\Windows\\Temp\\redirect.txt", "bodyOnly": false, "contentType": "text/html" }]