Skip to content

Commit 37348f6

Browse files
author
isayan
committed
bugfix decode JSON meta
1 parent d6de9bf commit 37348f6

File tree

8 files changed

+47
-15
lines changed

8 files changed

+47
-15
lines changed

help/help-ja.html

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1250,6 +1250,14 @@ <h5 id="_サーバチェック時にサーバに送信される形式">サーバ
12501250
Content-Disposition: form-data; name="comment"
12511251

12521252

1253+
-----------------------------265001916915724
1254+
Content-Disposition: form-data; name="reqName"
1255+
1256+
1257+
-----------------------------265001916915724
1258+
Content-Disposition: form-data; name="reqComment"
1259+
1260+
12531261
-----------------------------265001916915724
12541262
Content-Disposition: form-data; name="highlight"
12551263

@@ -2416,7 +2424,7 @@ <h3 id="_version">3.10. Version</h3>
24162424
</div>
24172425
<div id="footer">
24182426
<div id="footer-text">
2419-
Last updated 2024-02-03 21:42:58 +0900
2427+
Last updated 2024-02-22 20:23:18 +0900
24202428
</div>
24212429
</div>
24222430
</body>

help/help.html

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1266,6 +1266,14 @@ <h5 id="_the_format_sent_to_the_server_when_checking_the_server">The format sent
12661266
Content-Disposition: form-data; name="comment"
12671267

12681268

1269+
-----------------------------265001916915724
1270+
Content-Disposition: form-data; name="reqName"
1271+
1272+
1273+
-----------------------------265001916915724
1274+
Content-Disposition: form-data; name="reqComment"
1275+
1276+
12691277
-----------------------------265001916915724
12701278
Content-Disposition: form-data; name="highlight"
12711279

@@ -2450,7 +2458,7 @@ <h3 id="_version">3.11. Version</h3>
24502458
</div>
24512459
<div id="footer">
24522460
<div id="footer-text">
2453-
Last updated 2024-02-03 21:42:58 +0900
2461+
Last updated 2024-02-22 20:22:38 +0900
24542462
</div>
24552463
</div>
24562464
</body>
Binary file not shown.

release/YaguraExtension-v3.0.jar

3.03 KB
Binary file not shown.

src/main/help/help-ja.adoc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -453,6 +453,14 @@ http://example.jp/
453453
Content-Disposition: form-data; name="comment"
454454
455455
456+
-----------------------------265001916915724
457+
Content-Disposition: form-data; name="reqName"
458+
459+
460+
-----------------------------265001916915724
461+
Content-Disposition: form-data; name="reqComment"
462+
463+
456464
-----------------------------265001916915724
457465
Content-Disposition: form-data; name="highlight"
458466

src/main/help/help.adoc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -456,6 +456,14 @@ http://example.jp/
456456
Content-Disposition: form-data; name="comment"
457457
458458
459+
-----------------------------265001916915724
460+
Content-Disposition: form-data; name="reqName"
461+
462+
463+
-----------------------------265001916915724
464+
Content-Disposition: form-data; name="reqComment"
465+
466+
459467
-----------------------------265001916915724
460468
Content-Disposition: form-data; name="highlight"
461469

src/main/java/burp/BurpExtension.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -839,7 +839,7 @@ public String translate(String allText, String selectedText) {
839839
JMenuItem yaguraDecoderMetacharMenu = createMenuItem("JSON with Meta", KeyEvent.VK_M, new ITranslateAction() {
840840
@Override
841841
public String translate(String allText, String selectedText) {
842-
return TransUtil.encodeJsonLiteral(selectedText, true);
842+
return TransUtil.decodeJsonLiteral(selectedText, true);
843843
}
844844
});
845845

src/main/java/yagura/model/SendToServer.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -611,20 +611,20 @@ public String getSendToParameter(SendToParameterType type, HttpRequestResponse m
611611
break;
612612
case RESPONSE_TITLE:
613613
if (messageInfo.response() != null) {
614-
try {
615-
HttpResponseWapper wrapResponse = new HttpResponseWapper(messageInfo.response());
616-
String body = wrapResponse.getBodyString(false, wrapResponse.getGuessCharset(StandardCharsets.UTF_8.name()));
617-
value = HttpUtil.extractHTMLTitle(body);
618-
if (value != null) {
619-
EncodePattern patern = TransUtil.getSmartDecode(value);
620-
if (patern == EncodePattern.HTML) {
621-
value = SmartCodec.toHtmlUnicodeDecode(value);
622-
}
623-
}
624-
} catch (UnsupportedEncodingException ex) {
625-
logger.log(Level.SEVERE, ex.getMessage(), ex);
614+
try {
615+
HttpResponseWapper wrapResponse = new HttpResponseWapper(messageInfo.response());
616+
String body = wrapResponse.getBodyString(wrapResponse.getGuessCharset(StandardCharsets.UTF_8.name()), false);
617+
value = HttpUtil.extractHTMLTitle(body);
618+
if (value != null) {
619+
EncodePattern patern = TransUtil.getSmartDecode(value);
620+
if (patern == EncodePattern.HTML) {
621+
value = SmartCodec.toHtmlUnicodeDecode(value);
626622
}
627623
}
624+
} catch (UnsupportedEncodingException ex) {
625+
logger.log(Level.SEVERE, ex.getMessage(), ex);
626+
}
627+
}
628628
break;
629629
case HISTORY_NUMBER:
630630
break;

0 commit comments

Comments
 (0)