Skip to content

Commit f9e832b

Browse files
author
isayan
committed
MacOS OpenComand対応
1 parent 61efba8 commit f9e832b

28 files changed

+175
-110
lines changed

help/help-ja.html

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1335,11 +1335,9 @@ <h5 id="_http_connection_設定ダイヤログ">HTTP Connection 設定ダイヤ
13351335
</li>
13361336
</ul>
13371337
</div>
1338-
<div class="literalblock">
1338+
<div class="paragraph">
13391339
<div class="title">Protocol</div>
1340-
<div class="content">
1341-
<pre>HTTPのプロトコルを指定します。</pre>
1342-
</div>
1340+
<p> HTTPのプロトコルを指定します。</p>
13431341
</div>
13441342
<div class="dlist">
13451343
<div class="title">Timeout</div>
@@ -3072,7 +3070,7 @@ <h3 id="_version">3.11. Version</h3>
30723070
<div id="footer">
30733071
<div id="footer-text">
30743072
Version v3.1.7.0<br>
3075-
Last updated 2024-12-18 20:44:35 +0900
3073+
Last updated 2024-12-30 04:07:38 +0900
30763074
</div>
30773075
</div>
30783076
</body>
-7.59 KB
Loading
247 Bytes
Binary file not shown.

release/YaguraExtension-v3.1.jar

1.09 KB
Binary file not shown.

src/main/help/help-ja.adoc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -450,8 +450,7 @@ image:images/custom_sendto_server_connection.png[SendToItem編集 SendTo Connect
450450
** SendToの送信に独自のHTTPクライアントを利用します。
451451

452452
.Protocol
453-
454-
HTTPのプロトコルを指定します。
453+
 HTTPのプロトコルを指定します。
455454

456455
.Timeout
457456

-7.59 KB
Loading

src/main/java/burp/BurpExtension.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,8 @@
4848
import extend.util.external.ThemeUI;
4949
import extension.burp.BurpConfig;
5050
import extension.burp.BurpExtensionImpl;
51-
import static extension.burp.BurpExtensionImpl.api;
5251
import extension.burp.BurpUtil;
5352
import extension.burp.BurpVersion;
54-
import extension.burp.FilterProperty;
5553
import extension.burp.IBurpTab;
5654
import extension.helpers.HttpUtil;
5755
import extension.helpers.StringUtil;
@@ -290,6 +288,7 @@ public void registerView() {
290288
this.setSendToMenu(new SendToMenu(api, this.option.getSendToProperty()));
291289
this.registerContextMenu = api.userInterface().registerContextMenuItemsProvider(this.getSendToMenu());
292290
final Registration registerContextMenuItemsProvider = api.userInterface().registerContextMenuItemsProvider(new ContextMenuItemsProvider() {
291+
@Override
293292
public List<Component> provideMenuItems(ContextMenuEvent event) {
294293
List<Component> menuList = new ArrayList<>();
295294
JMenuItem item = new JMenuItem();

src/main/java/extend/util/external/BurpBrowser.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package extend.util.external;
22

3-
import burp.BurpExtension;
43
import burp.api.montoya.MontoyaApi;
54
import com.google.gson.JsonArray;
65
import com.google.gson.JsonElement;
@@ -55,9 +54,7 @@ public class BurpBrowser {
5554
static {
5655
try {
5756
chromium_prop.load(BurpBrowser.class.getResourceAsStream(BURP_CHROMIUM_PROPERTIES));
58-
} catch (IOException ex) {
59-
logger.log(Level.SEVERE, ex.getMessage(), ex);
60-
} catch (java.lang.NullPointerException ex) {
57+
} catch (IOException | java.lang.NullPointerException ex) {
6158
logger.log(Level.SEVERE, ex.getMessage(), ex);
6259
}
6360
}

src/main/java/yagura/model/SendToArgsProperty.java

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,15 @@
1414
* @author isayan
1515
*/
1616
public class SendToArgsProperty {
17+
1718
private final static Logger logger = Logger.getLogger(SendToArgsProperty.class.getName());
1819

1920
private boolean useOverride = false;
2021

2122
private final List<String> argsList = new ArrayList<>();
2223

24+
private boolean useMacOpenCommand = false;
25+
2326
/**
2427
* @return the useOverride
2528
*/
@@ -43,26 +46,43 @@ public List<String> getArgsList() {
4346
return this.argsList;
4447
}
4548

49+
/**
50+
* @return the useMacOpenCommand
51+
*/
52+
public boolean isUseMacOpenCommand() {
53+
return useMacOpenCommand;
54+
}
55+
56+
/**
57+
* @param useMacOpenCommand the useMacOpenCommand to set
58+
*/
59+
public void setUseMacOpenCommand(boolean useMacOpenCommand) {
60+
this.useMacOpenCommand = useMacOpenCommand;
61+
}
62+
4663
public void setProperty(SendToArgsProperty property) {
4764
this.useOverride = property.useOverride;
4865
this.argsList.clear();
4966
this.argsList.addAll(property.argsList);
67+
this.useMacOpenCommand = property.useMacOpenCommand;
5068
}
5169

52-
public void setProperties(Properties prop) {
53-
this.useOverride = ConvertUtil.parseBooleanDefault(prop.getProperty("SendToArgs.useOverride"), false);
54-
String propArgs = prop.getProperty("SendToArgs.argsList", "[]");
70+
public void setProperties(Properties property) {
71+
this.useOverride = ConvertUtil.parseBooleanDefault(property.getProperty("SendToArgs.useOverride"), false);
72+
String propArgs = property.getProperty("SendToArgs.argsList", "[]");
5573
Type listType = new TypeToken<List<String>>() {
5674
}.getType();
5775
List<String> paramArgs = JsonUtil.jsonFromString(propArgs, listType, true);
5876
this.argsList.clear();
5977
this.argsList.addAll(paramArgs);
78+
this.useMacOpenCommand = ConvertUtil.parseBooleanDefault(property.getProperty("SendToArgs.useMacOpenCommand"), false);
6079
}
6180

6281
public Properties getProperties() {
6382
Properties prop = new Properties();
6483
prop.setProperty("SendToArgs.useOverride", Boolean.toString(this.useOverride));
6584
prop.setProperty("SendToArgs.argsList", JsonUtil.jsonToString(this.argsList, true));
85+
prop.setProperty("SendToArgs.useMacOpenCommand", Boolean.toString(this.useMacOpenCommand));
6686
return prop;
6787
}
6888

src/main/java/yagura/model/SendToExtend.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import java.io.UnsupportedEncodingException;
2020
import java.net.MalformedURLException;
2121
import java.net.URI;
22-
import java.net.URL;
2322
import java.util.Arrays;
2423
import java.util.List;
2524
import java.util.logging.Level;
@@ -55,8 +54,7 @@ public void sendToEvent(ContextMenuEvent contextMenu) {
5554
List<HttpRequestResponse> messageInfo = null;
5655
if (contextMenu.messageEditorRequestResponse().isPresent()) {
5756
messageInfo = List.of(contextMenu.messageEditorRequestResponse().get().requestResponse());
58-
}
59-
else {
57+
} else {
6058
messageInfo = contextMenu.selectedRequestResponses();
6159
}
6260
if (messageInfo != null) {
@@ -165,7 +163,6 @@ private void saveAsMessage(SendToItem.MessageType messageType, SendToMessage sen
165163
}
166164
}
167165

168-
169166
private void saveAsMessageBody(SendToItem.MessageType messageType, SendToMessage sendToMessage) {
170167
final HttpRequestResponse messageItem = sendToMessage.getSelectedMessages().get(0);
171168
try {
@@ -256,7 +253,7 @@ public boolean isEnabled() {
256253
break;
257254
}
258255
case MESSAGE_INFO_COPY:
259-
enabled = (this.contextMenu.invocationType() == InvocationType.PROXY_HISTORY)
256+
enabled = (this.contextMenu.invocationType() == InvocationType.PROXY_HISTORY)
260257
|| (this.contextMenu.invocationType() == InvocationType.SEARCH_RESULTS)
261258
|| (this.contextMenu.invocationType() == InvocationType.MESSAGE_VIEWER_REQUEST)
262259
|| (this.contextMenu.invocationType() == InvocationType.MESSAGE_VIEWER_RESPONSE)

0 commit comments

Comments
 (0)