Skip to content

Commit

Permalink
設定ファイルが保存されないバグ対応
Browse files Browse the repository at this point in the history
  • Loading branch information
isayan committed May 31, 2022
1 parent 8a49ef9 commit 4374676
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 17 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
netbeans.org-netbeans-modules-javascript2-requirejs.enabled=true
release_version_major=2.2
release_version_minor=13.2
release_version_minor=13.3
Binary file not shown.
Binary file modified release/YaguraExtender-v2.2.jar
Binary file not shown.
13 changes: 7 additions & 6 deletions src/main/java/burp/BurpExtender.java
Original file line number Diff line number Diff line change
Expand Up @@ -201,8 +201,8 @@ public void mouseClicked(MouseEvent e) {
getSendToMenu().showBurpMenu(controller, e);
}
};
}
}

@Override
public void registerExtenderCallbacks(IBurpExtenderCallbacks callbacks) {
super.registerExtenderCallbacks(callbacks);
Expand All @@ -216,9 +216,9 @@ public void registerExtenderCallbacks(IBurpExtenderCallbacks callbacks) {
}
} catch (IOException ex) {
logger.log(Level.SEVERE, ex.getMessage(), ex);
}
}
this.option.setProperty(config);

try {
// 自動ログ作成時のみディレクトリ作成
if (this.option.getLoggingProperty().isAutoLogging()) {
Expand Down Expand Up @@ -594,7 +594,7 @@ private void matchAlertMessage(String toolName, boolean messageIsRequest, IHttpR
}
}
}

/**
* 選択可能なエンコーディングリストの取得
*
Expand Down Expand Up @@ -742,7 +742,8 @@ protected void applyOptionProperty() {
}

try {
Map<String, String> config = this.option.loadConfigSetting();
// Map<String, String> config = this.option.loadConfigSetting();
Map<String, String> config = this.option.getProperty();
Config.saveToJson(CONFIG_FILE, config);
} catch (IOException ex) {
logger.log(Level.SEVERE, ex.getMessage(), ex);
Expand Down
20 changes: 10 additions & 10 deletions src/main/java/yagura/model/OptionProperty.java
Original file line number Diff line number Diff line change
Expand Up @@ -144,16 +144,16 @@ public void setDebugMode(boolean debugMode) {
// * IOptionProperty
// * @param property
// */
// public void setProperty(IOptionProperty property) {
// this.setEncodingProperty(property.getEncodingProperty());
// this.setMatchReplaceProperty(property.getMatchReplaceProperty());
// this.setMatchAlertProperty(property.getMatchAlertProperty());
// this.setSendToProperty(property.getSendToProperty());
// this.setLoggingProperty(property.getLoggingProperty());
// this.setJSearchProperty(property.getJSearchProperty());
// this.setJTransCoderProperty(property.getJTransCoderProperty());
// this.setDebugMode(property.getDebugMode());
// }
public Map<String, String> getProperty() {
this.config.put(this.universalViewProperty.getSettingName(), this.universalViewProperty.loadSetting());
this.config.put(this.matchReplaceProperty.getSettingName(), this.matchReplaceProperty.loadSetting());
this.config.put(this.matchAlertProperty.getSettingName(), this.matchAlertProperty.loadSetting());
this.config.put(this.sendToProperty.getSettingName(), this.sendToProperty.loadSetting());
this.config.put(this.logProperty.getSettingName(), this.logProperty.loadSetting());
this.config.put(this.searchProperty.getSettingName(), this.searchProperty.loadSetting());
this.config.put(this.transcoderProperty.getSettingName(), this.transcoderProperty.loadSetting());
return this.config;
}

public void setProperty(Map<String, String> config) {
String configUniversalViewProperty = config.get(this.universalViewProperty.getSettingName());
Expand Down

0 comments on commit 4374676

Please sign in to comment.