Skip to content

Commit 2fab54f

Browse files
author
isayan
committed
Base64URLSafe のNewLine 指定を無視するように修正
1 parent ae59c18 commit 2fab54f

File tree

7 files changed

+55
-68
lines changed

7 files changed

+55
-68
lines changed

‎help/help-ja.html‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@
440440
<div id="header">
441441
<h1>YaguraExtension ヘルプ</h1>
442442
<div class="details">
443-
<span id="revnumber">version v3.1.5.1</span>
443+
<span id="revnumber">version v3.1.6.0</span>
444444
</div>
445445
<div id="toc" class="toc2">
446446
<div id="toctitle">Table of Contents</div>
@@ -462,10 +462,9 @@ <h1>YaguraExtension ヘルプ</h1>
462462
<li><a href="#_yaguraタブ">3. Yaguraタブ</a>
463463
<ul class="sectlevel2">
464464
<li><a href="#_universal_viewタブ">3.1. Universal Viewタブ</a>
465-
<ul class="sectlevel4">
466-
<li><a href="#_cjk_view">CJK View</a></li>
467-
<li><a href="#_cjk_message_view">3.1.2. CJK Message View</a></li>
468-
<li><a href="#_burp_view_タブ">3.1.3. Burp View タブ</a></li>
465+
<ul class="sectlevel3">
466+
<li><a href="#_cjk_view">3.1.1. CJK View</a></li>
467+
<li><a href="#_burp_view_タブ">3.1.2. Burp View タブ</a></li>
469468
</ul>
470469
</li>
471470
<li><a href="#_matchreplaceタブ">3.2. MatchReplaceタブ</a>
@@ -762,8 +761,8 @@ <h2 id="_yaguraタブ">3. Yaguraタブ</h2>
762761
<div class="sectionbody">
763762
<div class="sect2">
764763
<h3 id="_universal_viewタブ">3.1. Universal Viewタブ</h3>
765-
<div class="sect4">
766-
<h5 id="_cjk_view">CJK View</h5>
764+
<div class="sect3">
765+
<h4 id="_cjk_view">3.1.1. CJK View</h4>
767766
<div class="paragraph">
768767
<p><span class="image"><img src="images/custom_encoding.png" alt="CJK Viewタブ"></span></p>
769768
</div>
@@ -802,9 +801,8 @@ <h5 id="_cjk_view">CJK View</h5>
802801
</dd>
803802
</dl>
804803
</div>
805-
</div>
806-
<div class="sect3">
807-
<h4 id="_cjk_message_view">3.1.2. CJK Message View</h4>
804+
<div class="sect4">
805+
<h5 id="_cjk_message_view">CJK Message View</h5>
808806
<div class="dlist">
809807
<dl>
810808
<dt class="hdlist1">[Cenerate PoC] チェックボックス</dt>
@@ -852,8 +850,9 @@ <h4 id="_cjk_message_view">3.1.2. CJK Message View</h4>
852850
</dl>
853851
</div>
854852
</div>
853+
</div>
855854
<div class="sect3">
856-
<h4 id="_burp_view_タブ">3.1.3. Burp View タブ</h4>
855+
<h4 id="_burp_view_タブ">3.1.2. Burp View タブ</h4>
857856
<div class="paragraph">
858857
<p><span class="image"><img src="images/custom_burpview.png" alt="Burp View tab"></span></p>
859858
</div>
@@ -2995,8 +2994,8 @@ <h3 id="_version">3.11. Version</h3>
29952994
</div>
29962995
<div id="footer">
29972996
<div id="footer-text">
2998-
Version v3.1.5.1<br>
2999-
Last updated 2024-11-30 08:19:26 +0900
2997+
Version v3.1.6.0<br>
2998+
Last updated 2024-12-11 21:59:52 +0900
30002999
</div>
30013000
</div>
30023001
</body>

‎help/help.html‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@
440440
<div id="header">
441441
<h1>YaguraExtension Help</h1>
442442
<div class="details">
443-
<span id="revnumber">version v3.1.5.1</span>
443+
<span id="revnumber">version v3.1.6.0</span>
444444
</div>
445445
<div id="toc" class="toc2">
446446
<div id="toctitle">Table of Contents</div>
@@ -464,8 +464,7 @@ <h1>YaguraExtension Help</h1>
464464
<li><a href="#_universal_view_tab">3.1. Universal View tab</a>
465465
<ul class="sectlevel3">
466466
<li><a href="#_cjk_view_tab">3.1.1. CJK View tab</a></li>
467-
<li><a href="#_cjk_message_view">3.1.2. CJK Message View</a></li>
468-
<li><a href="#_burp_view_tab">3.1.3. Burp View tab</a></li>
467+
<li><a href="#_burp_view_tab">3.1.2. Burp View tab</a></li>
469468
</ul>
470469
</li>
471470
<li><a href="#_matchreplace_tab">3.2. MatchReplace tab</a>
@@ -803,9 +802,8 @@ <h4 id="_cjk_view_tab">3.1.1. CJK View tab</h4>
803802
</dd>
804803
</dl>
805804
</div>
806-
</div>
807-
<div class="sect3">
808-
<h4 id="_cjk_message_view">3.1.2. CJK Message View</h4>
805+
<div class="sect4">
806+
<h5 id="_cjk_message_view">CJK Message View</h5>
809807
<div class="dlist">
810808
<dl>
811809
<dt class="hdlist1">[Cenerate PoC] check box</dt>
@@ -853,8 +851,9 @@ <h4 id="_cjk_message_view">3.1.2. CJK Message View</h4>
853851
</dl>
854852
</div>
855853
</div>
854+
</div>
856855
<div class="sect3">
857-
<h4 id="_burp_view_tab">3.1.3. Burp View tab</h4>
856+
<h4 id="_burp_view_tab">3.1.2. Burp View tab</h4>
858857
<div class="paragraph">
859858
<p><span class="image"><img src="images/custom_burpview.png" alt="Burp View tab"></span></p>
860859
</div>
@@ -3007,8 +3006,8 @@ <h3 id="_version">3.11. Version</h3>
30073006
</div>
30083007
<div id="footer">
30093008
<div id="footer-text">
3010-
Version v3.1.5.1<br>
3011-
Last updated 2024-11-30 08:08:25 +0900
3009+
Version v3.1.6.0<br>
3010+
Last updated 2024-12-11 22:00:49 +0900
30123011
</div>
30133012
</div>
30143013
</body>

‎release/YaguraExtension-v3.1.jar‎

-45 Bytes
Binary file not shown.

‎src/main/help/help-ja.adoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ Burpの [User Interface] -> [Inspector and Message Editor] の Charsetsの切り
118118

119119
=== Universal Viewタブ
120120

121-
===== CJK View
121+
==== CJK View
122122

123123
image:images/custom_encoding.png[CJK Viewタブ]
124124

@@ -147,7 +147,7 @@ Select::
147147
クリップボード内のバイト文字列から文字コードを推測しているため、判定に失敗する場合があります。 +
148148
現在のバージョンではサポートされていません。
149149

150-
==== CJK Message View
150+
===== CJK Message View
151151

152152
[Cenerate PoC] チェックボックス::
153153
メッセージタブにCenerate PoCタブを表示するようにします。

‎src/main/help/help.adoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ Select::
147147
Judgment may fail because the character code is inferred from the byte string in the clipboard. +
148148
Not supported in current version.
149149

150-
==== CJK Message View
150+
===== CJK Message View
151151

152152
[Cenerate PoC] check box::
153153
Display the "Cenerate PoC" tab in the message tab.

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -786,23 +786,6 @@
786786
<Property name="text" type="java.lang.String" value="Base64"/>
787787
</Properties>
788788
</Component>
789-
<Component class="javax.swing.JRadioButton" name="rdoBase64URLSafe">
790-
<Properties>
791-
<Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
792-
<ComponentRef name="rdoEncodeDecodeGrp"/>
793-
</Property>
794-
<Property name="text" type="java.lang.String" value="Base64URLSafe"/>
795-
</Properties>
796-
</Component>
797-
</SubComponents>
798-
</Container>
799-
<Container class="javax.swing.JPanel" name="pnlBase64Setting">
800-
801-
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridLayout">
802-
<Property name="columns" type="int" value="0"/>
803-
<Property name="rows" type="int" value="1"/>
804-
</Layout>
805-
<SubComponents>
806789
<Component class="javax.swing.JCheckBox" name="chk76Newline">
807790
<Properties>
808791
<Property name="text" type="java.lang.String" value="76 newline"/>
@@ -827,6 +810,23 @@
827810
</Component>
828811
</SubComponents>
829812
</Container>
813+
<Container class="javax.swing.JPanel" name="pnlBase64URLSafe">
814+
815+
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridLayout">
816+
<Property name="columns" type="int" value="1"/>
817+
<Property name="rows" type="int" value="1"/>
818+
</Layout>
819+
<SubComponents>
820+
<Component class="javax.swing.JRadioButton" name="rdoBase64URLSafe">
821+
<Properties>
822+
<Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
823+
<ComponentRef name="rdoEncodeDecodeGrp"/>
824+
</Property>
825+
<Property name="text" type="java.lang.String" value="Base64URLSafe"/>
826+
</Properties>
827+
</Component>
828+
</SubComponents>
829+
</Container>
830830
<Container class="javax.swing.JPanel" name="pnlBaseN">
831831

832832
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridLayout">

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

Lines changed: 15 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -458,11 +458,11 @@ private void initComponents() {
458458
rdoUrlUnicode = new javax.swing.JRadioButton();
459459
pnlBase64 = new javax.swing.JPanel();
460460
rdoBase64 = new javax.swing.JRadioButton();
461-
rdoBase64URLSafe = new javax.swing.JRadioButton();
462-
pnlBase64Setting = new javax.swing.JPanel();
463461
chk76Newline = new javax.swing.JCheckBox();
464462
chk64Newline = new javax.swing.JCheckBox();
465463
chkPadding = new javax.swing.JCheckBox();
464+
pnlBase64URLSafe = new javax.swing.JPanel();
465+
rdoBase64URLSafe = new javax.swing.JRadioButton();
466466
pnlBaseN = new javax.swing.JPanel();
467467
rdoBase32 = new javax.swing.JRadioButton();
468468
rdoBase16 = new javax.swing.JRadioButton();
@@ -1131,35 +1131,35 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
11311131
rdoBase64.setText("Base64");
11321132
pnlBase64.add(rdoBase64);
11331133

1134-
rdoEncodeDecodeGrp.add(rdoBase64URLSafe);
1135-
rdoBase64URLSafe.setText("Base64URLSafe");
1136-
pnlBase64.add(rdoBase64URLSafe);
1137-
1138-
pnlEncodeDecode.add(pnlBase64);
1139-
1140-
pnlBase64Setting.setLayout(new java.awt.GridLayout(1, 0));
1141-
11421134
chk76Newline.setText("76 newline");
11431135
chk76Newline.addActionListener(new java.awt.event.ActionListener() {
11441136
public void actionPerformed(java.awt.event.ActionEvent evt) {
11451137
chk76NewlineActionPerformed(evt);
11461138
}
11471139
});
1148-
pnlBase64Setting.add(chk76Newline);
1140+
pnlBase64.add(chk76Newline);
11491141

11501142
chk64Newline.setText("64 newline");
11511143
chk64Newline.addActionListener(new java.awt.event.ActionListener() {
11521144
public void actionPerformed(java.awt.event.ActionEvent evt) {
11531145
chk64NewlineActionPerformed(evt);
11541146
}
11551147
});
1156-
pnlBase64Setting.add(chk64Newline);
1148+
pnlBase64.add(chk64Newline);
11571149

11581150
chkPadding.setSelected(true);
11591151
chkPadding.setText("Padding");
1160-
pnlBase64Setting.add(chkPadding);
1152+
pnlBase64.add(chkPadding);
1153+
1154+
pnlEncodeDecode.add(pnlBase64);
11611155

1162-
pnlEncodeDecode.add(pnlBase64Setting);
1156+
pnlBase64URLSafe.setLayout(new java.awt.GridLayout(1, 1));
1157+
1158+
rdoEncodeDecodeGrp.add(rdoBase64URLSafe);
1159+
rdoBase64URLSafe.setText("Base64URLSafe");
1160+
pnlBase64URLSafe.add(rdoBase64URLSafe);
1161+
1162+
pnlEncodeDecode.add(pnlBase64URLSafe);
11631163

11641164
pnlBaseN.setLayout(new java.awt.GridLayout(1, 0));
11651165

@@ -3062,17 +3062,6 @@ private void btnEncodeActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIR
30623062
}
30633063
} else if (this.rdoBase64URLSafe.isSelected()) {
30643064
encode = CodecUtil.toBase64URLSafeEncode(value, this.getSelectEncode());
3065-
if (this.chk76Newline.isSelected()) {
3066-
if (!this.chkRawMode.isSelected()) {
3067-
encode = TransUtil.newLine(TransUtil.getNewLine(this.getSelectNewLine()), encode, 76);
3068-
// encode = CodecUtil.toBase64URLSafeEncode(value, this.getSelectEncode(), this.chkPadding.isSelected(), 76, TransUtil.getNewLine(this.getSelectNewLine()));
3069-
}
3070-
} else if (this.chk64Newline.isSelected()) {
3071-
if (!this.chkRawMode.isSelected()) {
3072-
encode = TransUtil.newLine(TransUtil.getNewLine(this.getSelectNewLine()), encode, 64);
3073-
// encode = CodecUtil.toBase64URLSafeEncode(value, this.getSelectEncode(), this.chkPadding.isSelected(), 64, TransUtil.getNewLine(this.getSelectNewLine()));
3074-
}
3075-
}
30763065
} else if (this.rdoBase32.isSelected()) {
30773066
encode = CodecUtil.toBase32Encode(value, this.getSelectEncode(), this.chkNPadding.isSelected());
30783067
} else if (this.rdoBase16.isSelected()) {
@@ -4706,7 +4695,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
47064695
private javax.swing.JLabel lblZoneDate;
47074696
private javax.swing.JLabel lblmaximum;
47084697
private javax.swing.JPanel pnlBase64;
4709-
private javax.swing.JPanel pnlBase64Setting;
4698+
private javax.swing.JPanel pnlBase64URLSafe;
47104699
private javax.swing.JPanel pnlBaseN;
47114700
private javax.swing.JPanel pnlCharacter;
47124701
private javax.swing.JPanel pnlCheckSumTrans;

0 commit comments

Comments
 (0)