Skip to content

Commit

Permalink
use BurpExtlib 1.9,2
Browse files Browse the repository at this point in the history
  • Loading branch information
isayan committed Jul 28, 2019
1 parent 4489504 commit 743f940
Show file tree
Hide file tree
Showing 72 changed files with 1,006 additions and 1,073 deletions.
2 changes: 1 addition & 1 deletion .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.4/apache-maven-3.5.4-bin.zip
distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.6.1/apache-maven-3.6.1-bin.zip
2 changes: 1 addition & 1 deletion Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Burp Suiteは主にアジア圏のエンコーディング周りが弱いため

## 必須ライブラリ
ビルドには別途 [BurpExtLib](https://github.com/raise-isayan/BurpExtLib) のライブラリを必要とします。
* BurpExtlib v1.7.43
* BurpExtlib v1.9.2

## 注意事項
このツールは、私個人が勝手に開発したもので、PortSwigger社は一切関係ありません。本ツールを使用したことによる不具合等についてPortSwiggerに問い合わせないようお願いします。
Expand Down
46 changes: 23 additions & 23 deletions help/help.html
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,7 @@ <h2 id="_動作環境">1. 動作環境</h2>
<div class="title">Java</div>
<ul>
<li>
<p>JRE(JDK) 1.8以上(Oracle JRE を推奨)(<a href="http://www.oracle.com/technetwork/java/javase/downloads/index.html" class="bare">http://www.oracle.com/technetwork/java/javase/downloads/index.html</a>)</p>
<p>JRE(JDK) 8 (Open JDK を推奨)(<a href="https://openjdk.java.net/" class="bare">https://openjdk.java.net/</a>)</p>
</li>
</ul>
</div>
Expand All @@ -479,10 +479,10 @@ <h2 id="_動作環境">1. 動作環境</h2>
<div class="title">開発環境</div>
<ul>
<li>
<p>NetBean 8.2 (<a href="http://netbeans.org/" class="bare">http://netbeans.org/</a>)</p>
<p>NetBean 11.0 (<a href="https://netbeans.apache.org/" class="bare">https://netbeans.apache.org/</a>)</p>
</li>
<li>
<p>Apache ant 1.9 (<a href="http://ant.apache.org/" class="bare">http://ant.apache.org/</a>)</p>
<p>Meven 3.6.1 (<a href="https://maven.apache.org/" class="bare">https://maven.apache.org/</a>)</p>
</li>
<li>
<p>asciidoc (<a href="http://asciidoc.org/" class="bare">http://asciidoc.org/</a>)</p>
Expand Down Expand Up @@ -585,7 +585,7 @@ <h2 id="_start_up">2. Start up</h2>
各種設定はこちらから行えるようになっています。</p>
</div>
<div class="paragraph">
<p><span class="image"><img src="images/images/Extender_Yagura.png" alt="Extender"></span></p>
<p><span class="image"><img src="./images/Extender_Yagura.png" alt="Extender"></span></p>
</div>
</div>
</div>
Expand All @@ -595,7 +595,7 @@ <h2 id="_yaguraextenderタブ">3. YaguraExtenderタブ</h2>
<div class="sect2">
<h3 id="_cjk_viewタブ">3.1. CJK Viewタブ</h3>
<div class="paragraph">
<p><span class="image"><img src="images/images/custom_encoding.png" alt="CJK Viewタブ"></span></p>
<p><span class="image"><img src="./images/custom_encoding.png" alt="CJK Viewタブ"></span></p>
</div>
<div class="paragraph">
<p>いわゆるCJK(中国語、日本語、韓国語)に対応するための設定を行うタブです。
Expand Down Expand Up @@ -672,7 +672,7 @@ <h4 id="_cjk_message_view">3.1.2. CJK Message View</h4>
<div class="sect2">
<h3 id="_matchreplaceタブ">3.2. MatchReplaceタブ</h3>
<div class="paragraph">
<p><span class="image"><img src="images/images/custom_matchreplace.png" alt="MatchReplaceタブ"></span></p>
<p><span class="image"><img src="./images/custom_matchreplace.png" alt="MatchReplaceタブ"></span></p>
</div>
<div class="paragraph">
<p>Burp sute 本体の Proxy &#8658; Optionタブの <strong> Match and Replace </strong> の拡張になります。複数の <strong> Match and Replace </strong> を作成して切り替えられます。
Expand Down Expand Up @@ -711,7 +711,7 @@ <h4 id="_matchreplace">3.2.1. MatchReplace</h4>
<div class="sect3">
<h4 id="_matchreplace_ダイヤログ">3.2.2. MatchReplace ダイヤログ</h4>
<div class="paragraph">
<p><span class="image"><img src="images/images/custom_matchreplace_edit.png" alt="MatchReplaceItemダイヤログ"></span></p>
<p><span class="image"><img src="./images/custom_matchreplace_edit.png" alt="MatchReplaceItemダイヤログ"></span></p>
</div>
<div class="dlist">
<dl>
Expand Down Expand Up @@ -750,7 +750,7 @@ <h4 id="_matchreplace_ダイヤログ">3.2.2. MatchReplace ダイヤログ</h4>
<div class="sect3">
<h4 id="_matchreplace_item_編集ダイヤログ">3.2.3. MatchReplace Item 編集ダイヤログ</h4>
<div class="paragraph">
<p><span class="image"><img src="images/images/custom_matchreplace_item.png" alt="MatchReplaceItem編集ダイヤログ"></span></p>
<p><span class="image"><img src="./images/custom_matchreplace_item.png" alt="MatchReplaceItem編集ダイヤログ"></span></p>
</div>
<div class="dlist">
<dl>
Expand Down Expand Up @@ -836,7 +836,7 @@ <h4 id="_matchreplace_item_編集ダイヤログ">3.2.3. MatchReplace Item 編
<div class="sect2">
<h3 id="_matchalertタブ">3.3. MatchAlertタブ</h3>
<div class="paragraph">
<p><span class="image"><img src="images/images/custom_matchalert.png" alt="MatchAlertタブ"></span></p>
<p><span class="image"><img src="./images/custom_matchalert.png" alt="MatchAlertタブ"></span></p>
</div>
<div class="paragraph">
<p>指定した文字列にマッチする文字がレスポンスに現れた場合に通知してくれます。 ExceptionなどのErrorCode系の文字列を登録することを想定しています。
Expand Down Expand Up @@ -890,7 +890,7 @@ <h4 id="_matchalert">3.3.1. MatchAlert</h4>
<div class="sect3">
<h4 id="_matchalert_item_編集ダイヤログ">3.3.2. MatchAlert Item 編集ダイヤログ</h4>
<div class="paragraph">
<p><span class="image"><img src="images/images/custom_matchalert_item.png" alt="MatchAlertItem編集ダイヤログ"></span></p>
<p><span class="image"><img src="./images/custom_matchalert_item.png" alt="MatchAlertItem編集ダイヤログ"></span></p>
</div>
<div class="dlist">
<dl>
Expand Down Expand Up @@ -945,7 +945,7 @@ <h4 id="_matchalert_item_編集ダイヤログ">3.3.2. MatchAlert Item 編集ダ
<div class="sect2">
<h3 id="_autoresponderタブ">3.4. AutoResponderタブ</h3>
<div class="paragraph">
<p><span class="image"><img src="images/images/custom_autoresponder.png" alt="AutoResponderタブ"></span></p>
<p><span class="image"><img src="./images/custom_autoresponder.png" alt="AutoResponderタブ"></span></p>
</div>
<div class="paragraph">
<p>指定したURLにマッチする場合に指定したファイルの内容でレスポンスを返します。
Expand Down Expand Up @@ -980,7 +980,7 @@ <h4 id="_autoresponder">3.4.1. AutoResponder</h4>
<div class="sect3">
<h4 id="_autoresponder_item_編集ダイヤログ">3.4.2. AutoResponder Item 編集ダイヤログ</h4>
<div class="paragraph">
<p><span class="image"><img src="images/images/custom_autoresponder_item.png" alt="AutoResponder Item 編集ダイヤログ"></span></p>
<p><span class="image"><img src="./images/custom_autoresponder_item.png" alt="AutoResponder Item 編集ダイヤログ"></span></p>
</div>
<div class="dlist">
<dl>
Expand Down Expand Up @@ -1012,7 +1012,7 @@ <h4 id="_autoresponder_item_編集ダイヤログ">3.4.2. AutoResponder Item 編
<div class="sect2">
<h3 id="_sendtoタブ">3.5. SendToタブ</h3>
<div class="paragraph">
<p><span class="image"><img src="images/images/custom_sendto.png" alt="SendToタブ"></span></p>
<p><span class="image"><img src="./images/custom_sendto.png" alt="SendToタブ"></span></p>
</div>
<div class="paragraph">
<p>Burpがもつ拡張メニューを利用した機能です。
Expand Down Expand Up @@ -1060,7 +1060,7 @@ <h4 id="_sendtoitem_編集ダイヤログ">3.5.2. SendToItem 編集ダイヤロ
<div class="sect3">
<h4 id="_baseタブ">3.5.3. Baseタブ</h4>
<div class="paragraph">
<p><span class="image"><img src="images/images/custom_sendto_base.png" alt="SendToItem編集 Base ダイヤログ"></span></p>
<p><span class="image"><img src="./images/custom_sendto_base.png" alt="SendToItem編集 Base ダイヤログ"></span></p>
</div>
<div class="dlist">
<dl>
Expand Down Expand Up @@ -1184,7 +1184,7 @@ <h5 id="_送信される_multipart_のデータ">送信される multipart の
<div class="sect3">
<h4 id="_extendタブ">3.5.4. Extendタブ</h4>
<div class="paragraph">
<p><span class="image"><img src="images/images/custom_sendto_extend.png" alt="SendToItem編集 Extend ダイヤログ"></span></p>
<p><span class="image"><img src="./images/custom_sendto_extend.png" alt="SendToItem編集 Extend ダイヤログ"></span></p>
</div>
<div class="dlist">
<dl>
Expand Down Expand Up @@ -1215,7 +1215,7 @@ <h4 id="_extendタブ">3.5.4. Extendタブ</h4>
<div class="sect2">
<h3 id="_loggingタブ">3.6. Loggingタブ</h3>
<div class="paragraph">
<p><span class="image"><img src="images/images/custom_logging.png" alt="Loggingタブ"></span></p>
<p><span class="image"><img src="./images/custom_logging.png" alt="Loggingタブ"></span></p>
</div>
<div class="paragraph">
<p>ログの自動ロギング機能です。
Expand Down Expand Up @@ -1282,7 +1282,7 @@ <h5 id="_logging_target">Logging target</h5>
<div class="sect2">
<h3 id="_jsearchタブ">3.7. JSearchタブ</h3>
<div class="paragraph">
<p><span class="image"><img src="images/images/custom_jsearch.png" alt="JSearchタブ"></span></p>
<p><span class="image"><img src="./images/custom_jsearch.png" alt="JSearchタブ"></span></p>
</div>
<div class="paragraph">
<p>JSearch タブはProxyのHistory一覧から文字を検索するための機能です。</p>
Expand Down Expand Up @@ -1340,7 +1340,7 @@ <h3 id="_jtranscoderタブ">3.8. JTransCoderタブ</h3>
<div class="sect3">
<h4 id="_translator">3.8.1. Translator</h4>
<div class="paragraph">
<p><span class="image"><img src="images/images/custom_jtranscoder.png" alt="Translatorタブ"></span></p>
<p><span class="image"><img src="./images/custom_jtranscoder.png" alt="Translatorタブ"></span></p>
</div>
<div class="dlist">
<dl>
Expand Down Expand Up @@ -1605,7 +1605,7 @@ <h4 id="_generaterタブ">3.8.2. Generaterタブ</h4>
<p>sequenceタブは連続する文字リストを生成するための簡易的な機能です。</p>
</div>
<div class="paragraph">
<p><span class="image"><img src="images/images/custom_gene_seq.png" alt="Generaterタブ"></span></p>
<p><span class="image"><img src="./images/custom_gene_seq.png" alt="Generaterタブ"></span></p>
</div>
<div class="dlist">
<div class="title">sequence-Numbersタブ</div>
Expand All @@ -1631,7 +1631,7 @@ <h4 id="_generaterタブ">3.8.2. Generaterタブ</h4>
</div>
<div class="paragraph">
<div class="title">sequence-Dateタブ</div>
<p><span class="image"><img src="images/images/custom_gene_date.png" alt="Generaterタブ"></span></p>
<p><span class="image"><img src="./images/custom_gene_date.png" alt="Generaterタブ"></span></p>
</div>
<div class="dlist">
<dl>
Expand Down Expand Up @@ -1670,7 +1670,7 @@ <h4 id="_generaterタブ">3.8.2. Generaterタブ</h4>
<p>randomタブはランダムな文字リストを生成するための簡易的な機能です。</p>
</div>
<div class="paragraph">
<p><span class="image"><img src="images/images/custom_gene_random.png" alt="randomタブ"></span></p>
<p><span class="image"><img src="./images/custom_gene_random.png" alt="randomタブ"></span></p>
</div>
<div class="dlist">
<dl>
Expand Down Expand Up @@ -1712,7 +1712,7 @@ <h3 id="_generate_csrf_poc">3.9. Generate CSRF PoC</h3>
選択したリクエストがPOSTリクエスト場合に表示されます。</p>
</div>
<div class="paragraph">
<p><span class="image"><img src="images/images/custom_CSRF_PoC.png" alt="YaguraExtender CSRF-PoC"></span></p>
<p><span class="image"><img src="./images/custom_CSRF_PoC.png" alt="YaguraExtender CSRF-PoC"></span></p>
</div>
<div class="dlist">
<dl>
Expand Down Expand Up @@ -1808,7 +1808,7 @@ <h3 id="_version">3.10. Version</h3>
</div>
<div id="footer">
<div id="footer-text">
Last updated 2019-05-07 19:26:55 +0900
Last updated 2019-07-28 03:51:43 +0900
</div>
</div>
</body>
Expand Down
14 changes: 12 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<version>1.9</version>
<packaging>jar</packaging>
<properties>
<releaseVersion>${project.version}.3.0</releaseVersion>
<releaseVersion>${project.version}.4.0</releaseVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
Expand All @@ -33,6 +33,13 @@
</testResource>
</testResources>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<configuration>
<compilerArgument>${compilerArgument}</compilerArgument>
</configuration>
</plugin>
<!-- asciidoc -->
<plugin>
<groupId>org.asciidoctor</groupId>
Expand All @@ -43,6 +50,9 @@
<sourceDocumentName>help.adoc</sourceDocumentName>
<outputDirectory>${project.basedir}/help</outputDirectory>
<sourceHighlighter>rouge</sourceHighlighter>
<attributes>
<imagesdir>./</imagesdir>
</attributes>
</configuration>
<executions>
<execution>
Expand Down Expand Up @@ -110,7 +120,7 @@
<dependency>
<groupId>burp</groupId>
<artifactId>BurpExtlib</artifactId>
<version>1.9</version>
<version>1.9.2</version>
</dependency>
<dependency>
<groupId>javax.json</groupId>
Expand Down
Binary file modified release/YaguraExtender-v1.9.jar
Binary file not shown.
6 changes: 3 additions & 3 deletions src/main/help/help.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
== 動作環境

.Java
* JRE(JDK) 1.8以上(Oracle JRE を推奨)(http://www.oracle.com/technetwork/java/javase/downloads/index.html)
* JRE(JDK) 8 (Open JDK を推奨)(https://openjdk.java.net/)

.Burp suite
* 1.7以上 (http://www.portswigger.net/burp/)

.開発環境
* NetBean 8.2 (http://netbeans.org/)
* Apache ant 1.9 (http://ant.apache.org/)
* NetBean 11.0 (https://netbeans.apache.org/)
* Meven 3.6.1 (https://maven.apache.org/)
* asciidoc (http://asciidoc.org/)

.利用ライブラリ
Expand Down
23 changes: 13 additions & 10 deletions src/main/java/burp/BurpExtender.java
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@
* @author isayan
*/
public class BurpExtender extends BurpExtenderImpl
implements IHttpListener, IProxyListener,IExtensionStateListener {
implements IHttpListener, IProxyListener, IExtensionStateListener {

public BurpExtender() {
}

/**
* ログ設定プロパティファイルのファイル名
*/
Expand Down Expand Up @@ -95,7 +95,7 @@ public static BurpExtender getInstance() {
public Component getUiComponent() {
return this.tabbetOption;
}

private final TabbetOption tabbetOption = new TabbetOption();
private final JWTViewTab jwtViewTab = new JWTViewTab();

Expand Down Expand Up @@ -141,25 +141,25 @@ public IMessageEditorTab createNewInstance(IMessageEditorController controller,
return tab;
}
};
private final KeyEventPostProcessor dispatcher = new KeyEventPostProcessor() {

private final KeyEventPostProcessor dispatcher = new KeyEventPostProcessor() {
@Override
public boolean postProcessKeyEvent(KeyEvent e) {
SendToMenu menu = getSendToMenu();
menu.doKeyEventAction(e);
return false;
}
};

@Override
public void registerExtenderCallbacks(IBurpExtenderCallbacks cb) {
super.registerExtenderCallbacks(cb);
Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
@Override
public void uncaughtException(Thread t, Throwable e) {
Logger.getLogger(BurpExtender.class.getName()).log(Level.SEVERE, null, e);
}
});
}
});
if (this.getBurpVersion().isExtendSupport()) {
// 設定ファイル読み込み
try {
Expand Down Expand Up @@ -193,7 +193,7 @@ public void uncaughtException(Thread t, Throwable e) {

//
DefaultKeyboardFocusManager.getCurrentKeyboardFocusManager().addKeyEventPostProcessor(dispatcher);

} else {
JOptionPane.showMessageDialog(null, "This burp version is not supported.\r\nversion 1.7 required", "Burp Extension", JOptionPane.INFORMATION_MESSAGE);
}
Expand All @@ -203,7 +203,7 @@ public void uncaughtException(Thread t, Throwable e) {
public void extensionUnloaded() {
DefaultKeyboardFocusManager.getCurrentKeyboardFocusManager().removeKeyEventPostProcessor(dispatcher);
}

public void registerView() {
IBurpExtenderCallbacks cb = getCallbacks();
cb.registerMessageEditorTabFactory(this.requestRawTab);
Expand Down Expand Up @@ -760,6 +760,7 @@ protected void applyOptionProperty() {

/**
* Send to JTransCoder
*
* @param text
*/
public void sendToJTransCoder(String text) {
Expand All @@ -772,6 +773,7 @@ public byte[] receiveFromJTransCoder() {

/**
* Message Info Copy
*
* @param contextMenu
* @param messageInfoList
*/
Expand Down Expand Up @@ -852,6 +854,7 @@ public String copyJTable(JTable table) {

/**
* Add Host To Scope
*
* @param contextMenu
* @param messageInfoList
*/
Expand Down
Loading

0 comments on commit 743f940

Please sign in to comment.