Skip to content

Commit f48629d

Browse files
author
source
committed
起動時にエンコーディングが設定されないバグ修正
1 parent 2e7847b commit f48629d

File tree

8 files changed

+57
-29
lines changed

8 files changed

+57
-29
lines changed

‎help/help.adoc‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -520,12 +520,21 @@ HTML(<,>,",')::
520520
HTMLのエンコード、デコードを行います。
521521
エンコードは、「<,>,",'」のみ行われます。
522522

523-
&#dd;::
523+
&#d;::
524524
10進数形式の実体参照形式のエンコード、デコードを行います。
525525

526526
&#xhh;::
527527
16進数形式の実体参照形式のエンコード、デコードを行います。
528528

529+
\xhh;::
530+
16進数形式によるエンコード、デコードを行います。
531+
532+
\ddd;::
533+
8進数形式によるエンコード、デコードを行います。
534+
535+
\uhhhh;::
536+
Unicode形式によるエンコード、デコードを行います。
537+
529538
ZLIB::
530539
ZLIBによるdeflate、inflateを行います。
531540

‎help/help.html‎

Lines changed: 38 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="UTF-8">
55
<!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=edge"><![endif]-->
66
<meta name="viewport" content="width=device-width, initial-scale=1.0">
7-
<meta name="generator" content="Asciidoctor 1.5.5">
7+
<meta name="generator" content="Asciidoctor 1.5.6.1">
88
<title>YaguraExtender ヘルプ</title>
99
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400,700">
1010
<style>
@@ -89,13 +89,12 @@
8989
small{font-size:60%;line-height:inherit}
9090
code{font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;font-weight:400;color:rgba(0,0,0,.9)}
9191
ul,ol,dl{font-size:1em;line-height:1.6;margin-bottom:1.25em;list-style-position:outside;font-family:inherit}
92-
ul,ol,ul.no-bullet,ol.no-bullet{margin-left:1.5em}
92+
ul,ol{margin-left:1.5em}
9393
ul li ul,ul li ol{margin-left:1.25em;margin-bottom:0;font-size:1em}
9494
ul.square li ul,ul.circle li ul,ul.disc li ul{list-style:inherit}
9595
ul.square{list-style-type:square}
9696
ul.circle{list-style-type:circle}
9797
ul.disc{list-style-type:disc}
98-
ul.no-bullet{list-style:none}
9998
ol li ul,ol li ol{margin-left:1.25em;margin-bottom:0}
10099
dl dt{margin-bottom:.3125em;font-weight:bold}
101100
dl dd{margin-bottom:1.25em}
@@ -131,7 +130,11 @@
131130
kbd{font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;display:inline-block;color:rgba(0,0,0,.8);font-size:.65em;line-height:1.45;background-color:#f7f7f7;border:1px solid #ccc;-webkit-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 0 rgba(0,0,0,.2),0 0 0 .1em white inset;box-shadow:0 1px 0 rgba(0,0,0,.2),0 0 0 .1em #fff inset;margin:0 .15em;padding:.2em .5em;vertical-align:middle;position:relative;top:-.1em;white-space:nowrap}
132131
.keyseq kbd:first-child{margin-left:0}
133132
.keyseq kbd:last-child{margin-right:0}
134-
.menuseq,.menu{color:rgba(0,0,0,.8)}
133+
.menuseq,.menuref{color:#000}
134+
.menuseq b:not(.caret),.menuref{font-weight:inherit}
135+
.menuseq{word-spacing:-.02em}
136+
.menuseq b.caret{font-size:1.25em;line-height:.8}
137+
.menuseq i.caret{font-weight:bold;text-align:center;width:.45em}
135138
b.button:before,b.button:after{position:relative;top:-1px;font-weight:400}
136139
b.button:before{content:"[";padding:0 3px 0 2px}
137140
b.button:after{content:"]";padding:0 2px 0 3px}
@@ -198,7 +201,7 @@
198201
table.tableblock #preamble>.sectionbody>.paragraph:first-of-type p{font-size:inherit}
199202
.admonitionblock>table{border-collapse:separate;border:0;background:none;width:100%}
200203
.admonitionblock>table td.icon{text-align:center;width:80px}
201-
.admonitionblock>table td.icon img{max-width:none}
204+
.admonitionblock>table td.icon img{max-width:initial}
202205
.admonitionblock>table td.icon .title{font-weight:bold;font-family:"Open Sans","DejaVu Sans",sans-serif;text-transform:uppercase}
203206
.admonitionblock>table td.content{padding-left:1.125em;padding-right:1.25em;border-left:1px solid #ddddd8;color:rgba(0,0,0,.6)}
204207
.admonitionblock>table td.content>:last-child>:last-child{margin-bottom:0}
@@ -254,13 +257,13 @@
254257
table.tableblock{max-width:100%;border-collapse:separate}
255258
table.tableblock td>.paragraph:last-child p>p:last-child,table.tableblock th>p:last-child,table.tableblock td>p:last-child{margin-bottom:0}
256259
table.tableblock,th.tableblock,td.tableblock{border:0 solid #dedede}
257-
table.grid-all th.tableblock,table.grid-all td.tableblock{border-width:0 1px 1px 0}
258-
table.grid-all tfoot>tr>th.tableblock,table.grid-all tfoot>tr>td.tableblock{border-width:1px 1px 0 0}
259-
table.grid-cols th.tableblock,table.grid-cols td.tableblock{border-width:0 1px 0 0}
260-
table.grid-all *>tr>.tableblock:last-child,table.grid-cols *>tr>.tableblock:last-child{border-right-width:0}
261-
table.grid-rows th.tableblock,table.grid-rows td.tableblock{border-width:0 0 1px 0}
262-
table.grid-all tbody>tr:last-child>th.tableblock,table.grid-all tbody>tr:last-child>td.tableblock,table.grid-all thead:last-child>tr>th.tableblock,table.grid-rows tbody>tr:last-child>th.tableblock,table.grid-rows tbody>tr:last-child>td.tableblock,table.grid-rows thead:last-child>tr>th.tableblock{border-bottom-width:0}
263-
table.grid-rows tfoot>tr>th.tableblock,table.grid-rows tfoot>tr>td.tableblock{border-width:1px 0 0 0}
260+
table.grid-all>thead>tr>.tableblock,table.grid-all>tbody>tr>.tableblock{border-width:0 1px 1px 0}
261+
table.grid-all>tfoot>tr>.tableblock{border-width:1px 1px 0 0}
262+
table.grid-cols>*>tr>.tableblock{border-width:0 1px 0 0}
263+
table.grid-rows>thead>tr>.tableblock,table.grid-rows>tbody>tr>.tableblock{border-width:0 0 1px 0}
264+
table.grid-rows>tfoot>tr>.tableblock{border-width:1px 0 0 0}
265+
table.grid-all>*>tr>.tableblock:last-child,table.grid-cols>*>tr>.tableblock:last-child{border-right-width:0}
266+
table.grid-all>tbody>tr:last-child>.tableblock,table.grid-all>thead:last-child>tr>.tableblock,table.grid-rows>tbody>tr:last-child>.tableblock,table.grid-rows>thead:last-child>tr>.tableblock{border-bottom-width:0}
264267
table.frame-all{border-width:1px}
265268
table.frame-sides{border-width:0 1px}
266269
table.frame-topbot{border-width:1px 0}
@@ -281,10 +284,12 @@
281284
dl dd{margin-left:1.125em}
282285
dl dd:last-child,dl dd:last-child>:last-child{margin-bottom:0}
283286
ol>li p,ul>li p,ul dd,ol dd,.olist .olist,.ulist .ulist,.ulist .olist,.olist .ulist{margin-bottom:.625em}
284-
ul.unstyled,ol.unnumbered,ul.checklist,ul.none{list-style-type:none}
285-
ul.unstyled,ol.unnumbered,ul.checklist{margin-left:.625em}
286-
ul.checklist li>p:first-child>.fa-square-o:first-child,ul.checklist li>p:first-child>.fa-check-square-o:first-child{width:1em;font-size:.85em}
287-
ul.checklist li>p:first-child>input[type="checkbox"]:first-child{width:1em;position:relative;top:1px}
287+
ul.checklist,ul.none,ol.none,ul.no-bullet,ol.no-bullet,ol.unnumbered,ul.unstyled,ol.unstyled{list-style-type:none}
288+
ul.no-bullet,ol.no-bullet,ol.unnumbered{margin-left:.625em}
289+
ul.unstyled,ol.unstyled{margin-left:0}
290+
ul.checklist{margin-left:.625em}
291+
ul.checklist li>p:first-child>.fa-square-o:first-child,ul.checklist li>p:first-child>.fa-check-square-o:first-child{width:1.25em;font-size:.8em;position:relative;bottom:.125em}
292+
ul.checklist li>p:first-child>input[type="checkbox"]:first-child{margin-right:.25em}
288293
ul.inline{margin:0 auto .625em auto;margin-left:-1.375em;margin-right:0;padding:0;list-style:none;overflow:hidden}
289294
ul.inline>li{list-style:none;float:left;margin-left:1.375em;display:block}
290295
ul.inline>li>*{display:block}
@@ -301,7 +306,8 @@
301306
td.hdlist1,td.hdlist2{vertical-align:top;padding:0 .625em}
302307
td.hdlist1{font-weight:bold;padding-bottom:1.25em}
303308
.literalblock+.colist,.listingblock+.colist{margin-top:-.5em}
304-
.colist>table tr>td:first-of-type{padding:0 .75em;line-height:1}
309+
.colist>table tr>td:first-of-type{padding:.4em .75em 0 .75em;line-height:1;vertical-align:top}
310+
.colist>table tr>td:first-of-type img{max-width:initial}
305311
.colist>table tr>td:last-of-type{padding:.25em 0}
306312
.thumb,.th{line-height:0;display:inline-block;border:solid 4px #fff;-webkit-box-shadow:0 0 0 1px #ddd;box-shadow:0 0 0 1px #ddd}
307313
.imageblock.left,.imageblock[style*="float: left"]{margin:.25em .625em 1.25em 0}
@@ -364,6 +370,7 @@
364370
.yellow{color:#bfbf00}
365371
.yellow-background{background-color:#fafa00}
366372
span.icon>.fa{cursor:default}
373+
a span.icon>.fa{cursor:inherit}
367374
.admonitionblock td.icon [class^="fa icon-"]{font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
368375
.admonitionblock td.icon .icon-note:before{content:"\f05a";color:#19407c}
369376
.admonitionblock td.icon .icon-tip:before{content:"\f0eb";text-shadow:1px 1px 2px rgba(155,155,0,.8);color:#111}
@@ -1329,14 +1336,26 @@ <h5 id="_encode_decode">Encode/Decode</h5>
13291336
<p>HTMLのエンコード、デコードを行います。
13301337
エンコードは、「&lt;,&gt;,",'」のみ行われます。</p>
13311338
</dd>
1332-
<dt class="hdlist1">&amp;#dd;</dt>
1339+
<dt class="hdlist1">&amp;#d;</dt>
13331340
<dd>
13341341
<p>10進数形式の実体参照形式のエンコード、デコードを行います。</p>
13351342
</dd>
13361343
<dt class="hdlist1">&amp;#xhh;</dt>
13371344
<dd>
13381345
<p>16進数形式の実体参照形式のエンコード、デコードを行います。</p>
13391346
</dd>
1347+
<dt class="hdlist1">\xhh;</dt>
1348+
<dd>
1349+
<p>16進数形式によるエンコード、デコードを行います。</p>
1350+
</dd>
1351+
<dt class="hdlist1">\ddd;</dt>
1352+
<dd>
1353+
<p>8進数形式によるエンコード、デコードを行います。</p>
1354+
</dd>
1355+
<dt class="hdlist1">\uhhhh;</dt>
1356+
<dd>
1357+
<p>Unicode形式によるエンコード、デコードを行います。</p>
1358+
</dd>
13401359
<dt class="hdlist1">ZLIB</dt>
13411360
<dd>
13421361
<p>ZLIBによるdeflate、inflateを行います。</p>
@@ -1637,7 +1656,7 @@ <h3 id="_version">3.10. Version</h3>
16371656
</div>
16381657
<div id="footer">
16391658
<div id="footer-text">
1640-
Last updated 2018-08-29 21:37:04 JST
1659+
Last updated 2018-11-09 05:29:32 JST
16411660
</div>
16421661
</div>
16431662
</body>

‎release/YaguraExtender.jar‎

28 Bytes
Binary file not shown.

‎src/burp/BurpExtender.java‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ public IMessageEditorTab createNewInstance(IMessageEditorController controller,
150150
cb.registerMessageEditorTabFactory(this.generatePoCTab);
151151

152152
} else {
153-
JOptionPane.showMessageDialog(null, "This burp version is not supported.\r\nversion 1.6 required", "Burp Extension", JOptionPane.INFORMATION_MESSAGE);
153+
JOptionPane.showMessageDialog(null, "This burp version is not supported.\r\nversion 1.7 required", "Burp Extension", JOptionPane.INFORMATION_MESSAGE);
154154
}
155155
}
156156

@@ -515,11 +515,6 @@ private void matchAlertMessage(String toolName, boolean messageIsRequest, IHttpR
515515
}
516516
}
517517
}
518-
519-
// private IScannerCheck professionalPassiveScanCheck() {
520-
// MatchAlert scan = new MatchAlert(this.getMatchAlertProperty());
521-
// return scan.passiveScanCheck();
522-
// }
523518

524519
/**
525520
* debugModeの取得

‎src/burp/release.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# YaguraExtender build xml properties
22

33
# version
4-
version=1.7.27.0
4+
version=1.7.27.1
55

66
#lib
7-
asciidoctor-version=1.5.5
7+
asciidoctor-version=1.5.6

‎src/yagura/view/EncodingTab.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ else if (encoding.equals("Korean")) {
304304
else if (encoding.equals("Other")) {
305305
setEncodingList(EncodingProperty.getDefaultEncodingList(Locale.US));
306306
}
307-
307+
this.firePropertyChange(TabbetOption.ENCODING_PROPERTY, null, this.getEncodingProperty());
308308
}//GEN-LAST:event_btnResetActionPerformed
309309

310310
private void renewPopup() {

‎src/yagura/view/TabbetOption.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ public void setProperty(OptionProperty property) {
111111
this.setJTransCoderProperty(property.getJTransCoderProperty());
112112
// common
113113
this.setDebugMode(property.getDebugMode());
114+
this.setJTransCoderProperty(property.getEncodingProperty());
114115
}
115116

116117
public OptionProperty getProperty() {

‎test/yagura/external/TransUtilTest.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,10 @@ public void testToSmartDecode() {
134134
assertEquals(new String(b, "8859_1"), TransUtil.toSmartDecode("\\x82\\xa0\\x82\\xa2\\x82\\xa4\\x82\\xa6\\x82\\xa8", EncodePattern.BYTE_HEX, charset));
135135
assertEquals("8859_1", charset.toString());
136136

137+
byte o[] = new byte[] {(byte)0202,(byte)0240,(byte)0202,(byte)0242,(byte)0202,(byte)0244,(byte)0202,(byte)0246,(byte)0202,(byte)0250,(byte)012};
138+
assertEquals(new String(o, "8859_1"), TransUtil.toSmartDecode("\\202\\240\\202\\242\\202\\244\\202\\246\\202\\250\\12", EncodePattern.BYTE_OCT, charset));
139+
assertEquals("8859_1", charset.toString());
140+
137141
assertEquals("あいうえお", TransUtil.toSmartDecode("\\u3042\\u3044\\u3046\\u3048\\u304a"));
138142
assertEquals("あいうえお", TransUtil.toSmartDecode("\\U3042\\U3044\\U3046\\U3048\\U304A"));
139143

0 commit comments

Comments
 (0)