Skip to content

Commit f258f50

Browse files
author
isayan
committed
Upgrade BurpExtensionCommons
1 parent 179ac3c commit f258f50

File tree

9 files changed

+44
-10
lines changed

9 files changed

+44
-10
lines changed

gradle.properties

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
netbeans.org-netbeans-modules-javascript2-requirejs.enabled=true
22
release_version_major=3.0
3-
release_version_minor=7.2
3+
release_version_minor=7.3
44
netbeans.license=mit
5-
netbeans.hint.jdkPlatform=JDK_17

help/help-ja.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2384,7 +2384,7 @@ <h3 id="_version">3.10. Version</h3>
23842384
</div>
23852385
<div id="footer">
23862386
<div id="footer-text">
2387-
Last updated 2023-12-19 07:47:29 +0900
2387+
Last updated 2023-12-18 18:00:05 +0900
23882388
</div>
23892389
</div>
23902390
</body>

help/help.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2418,7 +2418,7 @@ <h3 id="_version">3.11. Version</h3>
24182418
</div>
24192419
<div id="footer">
24202420
<div id="footer-text">
2421-
Last updated 2023-12-19 07:47:29 +0900
2421+
Last updated 2023-12-18 18:03:30 +0900
24222422
</div>
24232423
</div>
24242424
</body>
Binary file not shown.

release/YaguraExtension-v3.0.jar

6.38 MB
Binary file not shown.

src/main/java/burp/BurpExtension.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -298,15 +298,15 @@ public List<String> getSelectEncodingList() {
298298
String defaultCharset = HttpUtil.normalizeCharset(StringUtil.DEFAULT_ENCODING);
299299
List<String> list = new ArrayList<>();
300300
list.addAll(this.option.getEncodingProperty().getEncodingList());
301-
// リストにない場合追加(デフォルトエンコーディング)
302-
if (!list.contains(defaultCharset)) {
303-
list.add(defaultCharset);
304-
}
305301
// リストにない場合追加
306302
BurpConfig.CharacterSets burpCharset = BurpConfig.getCharacterSets(api());
307303
if (BurpConfig.CharacterSetMode.SPECIFIC_CHARACTER_SET.toIdent().equals(burpCharset.getMode()) && burpCharset.getCharacterSet() != null && !list.contains(burpCharset.getCharacterSet())) {
308304
list.add(burpCharset.getCharacterSet());
309305
}
306+
// リストにない場合追加(デフォルトエンコーディング)
307+
if (!list.contains(defaultCharset)) {
308+
list.add(defaultCharset);
309+
}
310310
return list;
311311
}
312312

src/test/java/extend/util/external/TransUtilTest.java

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
import extension.helpers.MatchUtil;
66
import extension.helpers.SmartCodec;
77
import extension.helpers.StringUtil;
8+
import java.io.ByteArrayOutputStream;
9+
import java.io.FileNotFoundException;
10+
import java.io.FileOutputStream;
11+
import java.io.IOException;
812
import java.io.UnsupportedEncodingException;
913
import java.nio.ByteBuffer;
1014
import java.util.logging.Level;
@@ -30,6 +34,7 @@
3034
import java.util.Calendar;
3135
import java.util.Date;
3236
import java.util.TimeZone;
37+
import org.apache.commons.codec.digest.Blake3;
3338
import org.apache.commons.codec.digest.Sha2Crypt;
3439
import org.apache.commons.codec.digest.UnixCrypt;
3540

@@ -989,4 +994,35 @@ public void testTranslate() {
989994
}
990995
}
991996

997+
@Test
998+
public void testBlake3_x32() {
999+
System.out.println("testBlake3");
1000+
Blake3 hasher = Blake3.initHash();
1001+
hasher.update("Hello, world!".getBytes(StandardCharsets.UTF_8));
1002+
byte[] hash = new byte[32];
1003+
hasher.doFinalize(hash);
1004+
System.out.println(ConvertUtil.toHexString(hash));
1005+
}
1006+
1007+
@Test
1008+
public void testBlake3_x64() {
1009+
System.out.println("testBlake3");
1010+
Blake3 hasher = Blake3.initHash();
1011+
hasher.update("Hello, world!".getBytes(StandardCharsets.UTF_8));
1012+
byte[] hash = new byte[64];
1013+
hasher.doFinalize(hash);
1014+
System.out.println(ConvertUtil.toHexString(hash));
1015+
}
1016+
1017+
1018+
@Test
1019+
public void testBinary() throws IOException {
1020+
System.out.println("testBinary");
1021+
FileOutputStream fstm = new FileOutputStream("C:\\Windows\\Temp\\output");
1022+
for (int i = 0; i < 256; i++) {
1023+
fstm.write((byte)i);
1024+
}
1025+
}
1026+
1027+
9921028
}

src/test/java/yagura/model/OptoinPropertyTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package yagura.model;
22

3-
import extension.burp.FilterProperty;
43
import java.util.Collections;
54
import java.util.LinkedHashMap;
65
import java.util.Map;

src/test/resources/resources/YaguraExtender.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
"regexp": false,
9191
"match": "https://redirect/",
9292
"type": "auto responder",
93-
"replace": "C:\\Temp\\redirect.txt",
93+
"replace": "C:\\Windows\\Temp\\redirect.txt",
9494
"bodyOnly": false,
9595
"contentType": "text/html"
9696
}]

0 commit comments

Comments
 (0)