Skip to content

Commit 6002b27

Browse files
author
isayan
committed
SmartCodec修正
1 parent 37cced1 commit 6002b27

File tree

8 files changed

+28
-26
lines changed

8 files changed

+28
-26
lines changed

‎libs/BurpExtensionCommons-v3.1.3.2.jar‎ renamed to ‎libs/BurpExtensionCommons-v3.1.3.3.jar‎

217 KB
Binary file not shown.

‎release/YaguraExtension-v3.0.jar‎

409 Bytes
Binary file not shown.

‎src/main/java/extend/util/external/TransUtil.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public static Pattern getEncodeTypePattern(EncodeType type) {
102102
}
103103

104104
public enum EncodePattern {
105-
NONE, BASE64, BASE64_URLSAFE, BASE64_MIME, BASE32, BASE16, UUENCODE, QUOTEDPRINTABLE, PUNYCODE, URL_STANDARD, HTML, BYTE_HTML, URL_UNICODE, UNICODE, UNICODE2, BYTE_HEX, BYTE_HEX1, BYTE_HEX2, BYTE_OCT, GZIP, ZLIB, ZLIB_NOWRAP, UTF7, UTF8_ILL, C_LANG, JSON, SQL_LANG, REGEX,
105+
NONE, BASE64, BASE64_URLSAFE, BASE64_MIME, BASE32, BASE16, UUENCODE, QUOTEDPRINTABLE, PUNYCODE, URL_STANDARD, HTML, HTML_UNICODE, HTML_BYTE, URL_UNICODE, UNICODE, UNICODE2, BYTE_HEX, BYTE_HEX1, BYTE_HEX2, BYTE_OCT, GZIP, ZLIB, ZLIB_NOWRAP, UTF7, UTF8_ILL, C_LANG, JSON, SQL_LANG, REGEX,
106106
};
107107

108108
// private final static Pattern PTN_URLENCODE = Pattern.compile("(%[0-9a-fA-F][0-9a-fA-F]|[0-9a-zA-Z\\*_\\+\\.-])+");
@@ -389,7 +389,10 @@ public static String toSmartDecode(String value, TransUtil.EncodePattern encodeP
389389
case HTML:
390390
decode = SmartCodec.toHtmlDecode(value, SmartCodec.ENCODE_PATTERN_ALL);
391391
break;
392-
case BYTE_HTML: {
392+
case HTML_UNICODE:
393+
decode = SmartCodec.toHtmlUnicodeDecode(value, SmartCodec.ENCODE_PATTERN_ALL);
394+
break;
395+
case HTML_BYTE: {
393396
String guessCode = (charset == null) ? HttpUtil.getUniversalGuessCode(StringUtil.getBytesRaw(SmartCodec.toHtmlDecode(value, StandardCharsets.ISO_8859_1.name()))) : charset;
394397
if (guessCode != null) {
395398
applyCharset = guessCode;

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

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

3-
import burp.BurpExtender;
43
import burp.BurpExtension;
54
import burp.api.montoya.core.ByteArray;
65
import burp.api.montoya.core.HighlightColor;
@@ -614,10 +613,10 @@ public String getSendToParameter(SendToParameterType type, HttpRequestResponse m
614613
String body = wrapResponse.getBodyString(true, StandardCharsets.ISO_8859_1.name());
615614
value = HttpUtil.extractHTMLTitle(body);
616615
if (value != null) {
617-
value = SmartCodec.toHtmlDecode(value, wrapResponse.getGuessCharset(StandardCharsets.ISO_8859_1.name()));
616+
value = SmartCodec.toHtmlUnicodeDecode(value);
618617
}
619618
} catch (UnsupportedEncodingException ex) {
620-
logger.log(Level.SEVERE, null, ex);
619+
logger.log(Level.SEVERE, ex.getMessage(), ex);
621620
}
622621
}
623622
break;

‎src/main/java/yagura/view/JTransCoderTab.form‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -299,15 +299,15 @@
299299
<Property name="rows" type="int" value="1"/>
300300
</Layout>
301301
<SubComponents>
302-
<Component class="javax.swing.JRadioButton" name="rdoHtmlHex">
302+
<Component class="javax.swing.JRadioButton" name="rdoHtmlUnicode">
303303
<Properties>
304304
<Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
305305
<ComponentRef name="rdoEncodeDecodeGrp"/>
306306
</Property>
307307
<Property name="text" type="java.lang.String" value="&amp;#xhh;(unicode)"/>
308308
</Properties>
309309
<Events>
310-
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="rdoHtmlHexActionPerformed"/>
310+
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="rdoHtmlUnicodeActionPerformed"/>
311311
</Events>
312312
</Component>
313313
<Component class="javax.swing.JRadioButton" name="rdoHtmlByteHex">

‎src/main/java/yagura/view/JTransCoderTab.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ private void initComponents() {
424424
rdoHtml = new javax.swing.JRadioButton();
425425
rdoHtmlDec = new javax.swing.JRadioButton();
426426
pnlHtmlHex = new javax.swing.JPanel();
427-
rdoHtmlHex = new javax.swing.JRadioButton();
427+
rdoHtmlUnicode = new javax.swing.JRadioButton();
428428
rdoHtmlByteHex = new javax.swing.JRadioButton();
429429
pnlJSUnicodeEnc = new javax.swing.JPanel();
430430
rdoUnicodeHex = new javax.swing.JRadioButton();
@@ -794,14 +794,14 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
794794

795795
pnlHtmlHex.setLayout(new java.awt.GridLayout(1, 2));
796796

797-
rdoEncodeDecodeGrp.add(rdoHtmlHex);
798-
rdoHtmlHex.setText("&#xhh;(unicode)");
799-
rdoHtmlHex.addActionListener(new java.awt.event.ActionListener() {
797+
rdoEncodeDecodeGrp.add(rdoHtmlUnicode);
798+
rdoHtmlUnicode.setText("&#xhh;(unicode)");
799+
rdoHtmlUnicode.addActionListener(new java.awt.event.ActionListener() {
800800
public void actionPerformed(java.awt.event.ActionEvent evt) {
801-
rdoHtmlHexActionPerformed(evt);
801+
rdoHtmlUnicodeActionPerformed(evt);
802802
}
803803
});
804-
pnlHtmlHex.add(rdoHtmlHex);
804+
pnlHtmlHex.add(rdoHtmlUnicode);
805805

806806
rdoEncodeDecodeGrp.add(rdoHtmlByteHex);
807807
rdoHtmlByteHex.setText("&#xhh;(byte)");
@@ -2601,8 +2601,8 @@ private void btnEncodeActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIR
26012601
encode = TransUtil.toByteOctEncode(value, this.getSelectEncode(), TransUtil.getEncodeTypePattern(this.getEncodeType()));
26022602
} else if (this.rdoHtmlDec.isSelected()) {
26032603
encode = SmartCodec.toHtmlDecEncode(value, TransUtil.getEncodeTypePattern(this.getEncodeType()));
2604-
} else if (this.rdoHtmlHex.isSelected()) {
2605-
encode = SmartCodec.toHtmlHexEncode(value, TransUtil.getEncodeTypePattern(this.getEncodeType()), this.rdoUpperCase.isSelected());
2604+
} else if (this.rdoHtmlUnicode.isSelected()) {
2605+
encode = SmartCodec.toHtmlUnicodeEncode(value, TransUtil.getEncodeTypePattern(this.getEncodeType()), this.rdoUpperCase.isSelected());
26062606
} else if (this.rdoHtmlByteHex.isSelected()) {
26072607
encode = SmartCodec.toHtmlByteHexEncode(value, this.getSelectEncode(), TransUtil.getEncodeTypePattern(this.getEncodeType()), this.rdoUpperCase.isSelected());
26082608
} else if (this.rdoGzip.isSelected()) {
@@ -2678,9 +2678,9 @@ private void btnDecodeActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIR
26782678
} else if (this.rdoHtmlDec.isSelected()) {
26792679
encodePattern = TransUtil.EncodePattern.HTML;
26802680
} else if (this.rdoHtmlByteHex.isSelected()) {
2681-
encodePattern = TransUtil.EncodePattern.BYTE_HTML;
2682-
} else if (this.rdoHtmlHex.isSelected()) {
2683-
encodePattern = TransUtil.EncodePattern.HTML;
2681+
encodePattern = TransUtil.EncodePattern.HTML_BYTE;
2682+
} else if (this.rdoHtmlUnicode.isSelected()) {
2683+
encodePattern = TransUtil.EncodePattern.HTML_UNICODE;
26842684
} else if (this.rdoGzip.isSelected()) {
26852685
encodePattern = TransUtil.EncodePattern.GZIP;
26862686
} else if (this.rdoZLIB.isSelected()) {
@@ -3115,9 +3115,9 @@ private void btnOutputCopyActionPerformed(java.awt.event.ActionEvent evt) {//GEN
31153115
SwingUtil.systemClipboardCopy(this.txtOutputRaw.getText());
31163116
}//GEN-LAST:event_btnOutputCopyActionPerformed
31173117

3118-
private void rdoHtmlHexActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_rdoHtmlHexActionPerformed
3118+
private void rdoHtmlUnicodeActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_rdoHtmlUnicodeActionPerformed
31193119
// TODO add your handling code here:
3120-
}//GEN-LAST:event_rdoHtmlHexActionPerformed
3120+
}//GEN-LAST:event_rdoHtmlUnicodeActionPerformed
31213121

31223122
private void rdoHtmlByteHexActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_rdoHtmlByteHexActionPerformed
31233123
// TODO add your handling code here:
@@ -3788,7 +3788,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
37883788
private javax.swing.JRadioButton rdoHtml;
37893789
private javax.swing.JRadioButton rdoHtmlByteHex;
37903790
private javax.swing.JRadioButton rdoHtmlDec;
3791-
private javax.swing.JRadioButton rdoHtmlHex;
3791+
private javax.swing.JRadioButton rdoHtmlUnicode;
37923792
private javax.swing.JRadioButton rdoILLUTF8;
37933793
private javax.swing.JRadioButton rdoJSON;
37943794
private javax.swing.JRadioButton rdoLF;

‎src/main/java/yagura/view/ResultFilterDlg.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -683,13 +683,13 @@ public static void main(String args[]) {
683683
}
684684
}
685685
} catch (ClassNotFoundException ex) {
686-
logger.log(java.util.logging.Level.SEVERE, null, ex);
686+
logger.log(java.util.logging.Level.SEVERE, ex.getMessage(), ex);
687687
} catch (InstantiationException ex) {
688-
logger.log(java.util.logging.Level.SEVERE, null, ex);
688+
logger.log(java.util.logging.Level.SEVERE, ex.getMessage(), ex);
689689
} catch (IllegalAccessException ex) {
690-
logger.log(java.util.logging.Level.SEVERE, null, ex);
690+
logger.log(java.util.logging.Level.SEVERE, ex.getMessage(), ex);
691691
} catch (javax.swing.UnsupportedLookAndFeelException ex) {
692-
logger.log(java.util.logging.Level.SEVERE, null, ex);
692+
logger.log(java.util.logging.Level.SEVERE, ex.getMessage(), ex);
693693
}
694694
//</editor-fold>
695695
//</editor-fold>

‎src/test/java/yagura/model/okHttpClientTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ public void testSendtoProxy() {
251251
}
252252
}
253253
} catch (NoSuchAlgorithmException | KeyManagementException ex) {
254-
logger.log(Level.SEVERE, null, ex);
254+
logger.log(Level.SEVERE, ex.getMessage(), ex);
255255
}
256256

257257
}

0 commit comments

Comments
 (0)