Skip to content

Commit

Permalink
Bugfix Effect version: 1.7.42.0 - 1.9.8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
isayan committed Aug 9, 2019
1 parent 13dc825 commit f1f5a14
Show file tree
Hide file tree
Showing 11 changed files with 41 additions and 36 deletions.
20 changes: 18 additions & 2 deletions help/help.html
View file
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) 8 (Open JDK を推奨)(<a href="https://openjdk.java.net/" class="bare">https://openjdk.java.net/</a>)</p>
<p>JRE(JDK) 8, 11 (Open JDK を推奨)(<a href="https://openjdk.java.net/" class="bare">https://openjdk.java.net/</a>)</p>
</li>
</ul>
</div>
Expand Down Expand Up @@ -557,6 +557,22 @@ <h2 id="_動作環境">1. 動作環境</h2>
</div>
</li>
<li>
<p>gson</p>
<div class="ulist">
<ul>
<li>
<p><a href="https://github.com/google/gson" class="bare">https://github.com/google/gson</a></p>
</li>
<li>
<p>Apache +License</p>
</li>
<li>
<p><a href="https://github.com/google/gson/blob/master/LICENSE" class="bare">https://github.com/google/gson/blob/master/LICENSE</a></p>
</li>
</ul>
</div>
</li>
<li>
<p>Use Icon</p>
<div class="ulist">
<ul>
Expand Down Expand Up @@ -1808,7 +1824,7 @@ <h3 id="_version">3.10. Version</h3>
</div>
<div id="footer">
<div id="footer-text">
Last updated 2019-08-06 10:15:57 +0900
Last updated 2019-08-09 21:10:02 +0900
</div>
</div>
</body>
Expand Down
18 changes: 0 additions & 18 deletions nb-configuration.xml
View file

This file was deleted.

7 changes: 4 additions & 3 deletions pom.xml
View file
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}.8.0</releaseVersion>
<releaseVersion>${project.version}.9.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 Down Expand Up @@ -38,6 +38,7 @@
<version>3.3</version>
<configuration>
<compilerArgument>${compilerArgument}</compilerArgument>
<showDeprecation>true</showDeprecation>
</configuration>
</plugin>
<!-- asciidoc -->
Expand Down Expand Up @@ -161,7 +162,7 @@
<dependency>
<groupId>burp</groupId>
<artifactId>BurpExtlib</artifactId>
<version>1.9.2</version>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
Expand All @@ -186,7 +187,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<version>4.12</version>
<scope>test</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/httpunit/httpunit -->
Expand Down
Binary file modified release/YaguraExtender-v1.9.jar
View file
Binary file not shown.
7 changes: 6 additions & 1 deletion src/main/help/help.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
== 動作環境

.Java
* JRE(JDK) 8 (Open JDK を推奨)(https://openjdk.java.net/)
* JRE(JDK) 8, 11 (Open JDK を推奨)(https://openjdk.java.net/)

.Burp suite
* 1.7以上 (http://www.portswigger.net/burp/)
Expand Down Expand Up @@ -38,6 +38,11 @@
** MPL 1.1, GPL 2.0 License
** https://code.google.com/archive/p/juniversalchardet/

* gson
** https://github.com/google/gson
** Apache +License
** https://github.com/google/gson/blob/master/LICENSE

* Use Icon
** http://www.famfamfam.com/lab/icons/silk/
** Creative Commons Attribution 2.5 License
Expand Down
7 changes: 3 additions & 4 deletions src/main/java/burp/BurpExtender.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import extend.util.external.gson.XMatchItemAdapter;
import extend.view.base.HttpResponse;
import java.awt.Component;
import java.awt.DefaultKeyboardFocusManager;
import java.awt.KeyEventPostProcessor;
import java.awt.KeyboardFocusManager;
import java.awt.TrayIcon;
Expand Down Expand Up @@ -199,7 +198,7 @@ public void uncaughtException(Thread t, Throwable e) {
this.registerView();

//
DefaultKeyboardFocusManager.getCurrentKeyboardFocusManager().addKeyEventPostProcessor(dispatcher);
// 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 @@ -208,7 +207,7 @@ public void uncaughtException(Thread t, Throwable e) {

@Override
public void extensionUnloaded() {
DefaultKeyboardFocusManager.getCurrentKeyboardFocusManager().removeKeyEventPostProcessor(dispatcher);
// DefaultKeyboardFocusManager.getCurrentKeyboardFocusManager().removeKeyEventPostProcessor(dispatcher);
}

public void registerView() {
Expand Down Expand Up @@ -332,7 +331,7 @@ protected synchronized void writeProxyMessage(
boolean includeLog = true;
if (this.option.getLoggingProperty().isExclude()) {
Pattern patternExclude = Pattern.compile(BurpWrap.parseFilterPattern(this.option.getLoggingProperty().getExcludeExtension()));
Matcher matchExclude = patternExclude.matcher(BurpWrap.getURL(request).getFile());
Matcher matchExclude = patternExclude.matcher(BurpWrap.getURL(httpService, request).getFile());
if (matchExclude.find()) {
includeLog = false;
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/yagura/model/SendToMenu.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ public void doKeyEventAction(KeyEvent evt) {
for (SendToMenuItem item : sendToList) {
if (item.isSelected() && item.getHotkey() != null) {
KeyEvent hotKey = item.getHotkey();
if (evt.getModifiers() == hotKey.getModifiers()
if (evt.getModifiersEx() == hotKey.getModifiersEx()
&& evt.getKeyCode() == hotKey.getKeyCode()) {
if (historyList.size() > 0) {
IHttpRequestResponse[] messageInfo = historyList.toArray(new IHttpRequestResponse[0]);
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/yagura/view/JTransCoderTab.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2462,9 +2462,7 @@ public void caretUpdate(javax.swing.JTextArea textArea) {
}

String sttmsg = STATUS_TEXT_FORMAT.format(new Object[]{
new Integer(this.txtInputRaw.getText().length()),
new Integer(this.txtInputRaw.getCaret().getDot()),
new Integer(this.txtInputRaw.getSelectionEnd() - this.txtInputRaw.getSelectionStart())});
this.txtInputRaw.getText().length(), this.txtInputRaw.getCaret().getDot(), this.txtInputRaw.getSelectionEnd() - this.txtInputRaw.getSelectionStart()});
this.lblPositionStatus.setText(sttmsg);

/*
Expand Down
1 change: 1 addition & 0 deletions src/main/java/yagura/view/SendToTab.form
View file
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,7 @@
<Component class="javax.swing.JButton" name="btnEditHotkey">
<Properties>
<Property name="text" type="java.lang.String" value="Edit Hotkey"/>
<Property name="doubleBuffered" type="boolean" value="true"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnEditHotkeyActionPerformed"/>
Expand Down
9 changes: 6 additions & 3 deletions src/main/java/yagura/view/SendToTab.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ public void keyPressed(java.awt.event.KeyEvent evt) {
}

btnEditHotkey.setText("Edit Hotkey");
btnEditHotkey.setDoubleBuffered(true);
btnEditHotkey.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
btnEditHotkeyActionPerformed(evt);
Expand Down Expand Up @@ -298,17 +299,19 @@ public void valueChanged(ListSelectionEvent e) {
this.tableSendTo.getColumnModel().getColumn(8).setMaxWidth(0);

// Hotkey
// this.tableSendTo.getColumnModel().getColumn(9).setMinWidth(100);
this.tableSendTo.getColumnModel().getColumn(9).setMinWidth(0);
// this.tableSendTo.getColumnModel().getColumn(9).setPreferredWidth(80);
// this.tableSendTo.getColumnModel().getColumn(9).setMaxWidth(180);
this.tableSendTo.getColumnModel().getColumn(9).setMaxWidth(0);

// Extend
this.tableSendTo.getColumnModel().getColumn(10).setMinWidth(0);
this.tableSendTo.getColumnModel().getColumn(10).setPreferredWidth(0);
this.tableSendTo.getColumnModel().getColumn(10).setMaxWidth(0);

//
this.tableSendTo.setSelectionMode(javax.swing.ListSelectionModel.SINGLE_SELECTION);

this.btnEditHotkey.setVisible(false);

}

private void btnSendToEditActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnSendToEditActionPerformed
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/yagura/ConfigTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public void testConfig() {
try {
URL url = this.getClass().getResource("/resources/default_project_burp.json");
byte [] test = Util.bytesFromFile(new File(url.toURI()));
JsonElement json = JsonUtil.parse(Util.decodeMessage(test, "UTF-8"));
JsonElement json = JsonUtil.parse(Util.decodeMessage(test, StandardCharsets.UTF_8));
String value = JsonUtil.prettyJson(json, true);
System.out.println(value);
} catch (IOException ex) {
Expand Down

0 comments on commit f1f5a14

Please sign in to comment.