Skip to content

Commit

Permalink
fix: config file loading bug making GUI crash
Browse files Browse the repository at this point in the history 
- fix: removed required tag "result" in tests, as it is not for passive
  • Loading branch information
@mattebit
mattebit committed Nov 24, 2023
1 parent 946168b commit 724b954
Show file tree
Hide file tree
Showing 3 changed files with 83 additions and 99 deletions.
169 changes: 73 additions & 96 deletions tool/src/main/java/migt/GUI.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,11 @@ public class GUI extends JSplitPane {
private final Object[][] foundData = {};
private final Object lock2 = new Object();
public ArrayList<HTTPReqRes> interceptedMessages;
String SAVE_FILE_PATH = "";
String RECORD_FILE_PATH = "";
boolean FILTERING = true;
String MSG_DEF_PATH = "msg_def.json";
String CONFIG_FILE_PATH = "config.json";
//GUI
JTable resultTable;
JTable testTable;
Expand Down Expand Up @@ -106,21 +111,16 @@ public class GUI extends JSplitPane {
boolean recording = false;
boolean OFFLINE = false;
boolean SAVE_TO_FILE = false;
String SAVE_FILE_PATH = "";
String RECORD_FILE_PATH = "";
boolean FILTERING = true;
String MSG_DEF_PATH = "msg_def.json";
String CONFIG_FILE_PATH = "config.json";
Operation act_active_op;
ExecuteActives ex;
List<MessageType> messageTypes;
private Integer DEFAULT_PORT = 8080;
private String DRIVER_PATH = "";
private List<Test> actives;
private Map<String, Component> sessions_text;
private List<Test> passives;
private String DRIVER_PATH = "";
private Thread active_ex;
private boolean active_ex_finished = false;
private Integer DEFAULT_PORT = 8080;

/**
* Constructor of the plugin UI
Expand Down Expand Up @@ -216,7 +216,7 @@ public void init() {
}

/**
* Set a redirect of the stdout and stderr to the txtboxes in the GUI
* Set a redirect of the stdout and stderr to the txtboxes in the debug tab of the GUI
*/
private void set_std_out_redirect() {
// Stdout out redirect
Expand All @@ -236,29 +236,25 @@ private void set_std_out_redirect() {
private void readMsgDefFile() {
File msg_def_file = new File(MSG_DEF_PATH);
try {
if (!msg_def_file.createNewFile()) {
Scanner myReader = null;
String tmp = "";
try {
myReader = new Scanner(msg_def_file);
while (myReader.hasNextLine()) {
tmp += myReader.nextLine();
}
myReader.close();
messageTypes = Tools.readMsgTypesFromJson(tmp);
} catch (ParsingException e) {
lblOutput.setText("Invalid message type in message type definition file");
e.printStackTrace();
} catch (FileNotFoundException e) {
lblOutput.setText("Cannot find message definition file");
}
} else {
if (msg_def_file.createNewFile()) {
// if file does not exist
FileWriter w = new FileWriter(MSG_DEF_PATH);
w.write(Tools.getDefaultJSONMsgType());
w.close();
messageTypes = Tools.readMsgTypesFromJson(Tools.getDefaultJSONMsgType());
}

// read content
StringBuilder content = new StringBuilder();
Scanner myReader = new Scanner(msg_def_file);

while (myReader.hasNextLine()) {
content.append(myReader.nextLine());
}
myReader.close();
messageTypes = Tools.readMsgTypesFromJson(content.toString()); // load messsage types

} catch (ParsingException e) {
lblOutput.setText("Invalid message type in message type definition file");
e.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
Expand All @@ -273,51 +269,43 @@ private void readConfigFile() {
File config_file = new File(CONFIG_FILE_PATH);
try {
if (!config_file.createNewFile()) {
Scanner myReader = null;
String tmp = "";
try {
myReader = new Scanner(config_file);
while (myReader.hasNextLine()) {
tmp += myReader.nextLine();
}
myReader.close();
StringBuilder content = new StringBuilder();
Scanner myReader = new Scanner(config_file);
while (myReader.hasNextLine()) {
content.append(myReader.nextLine());
}
myReader.close();

JSONObject obj = new JSONObject(tmp);
String last_driver_path = obj.getString("last_driver_path");
String last_used_browser = obj.getString("last_browser_used");
DEFAULT_PORT = obj.getInt("default_port");
JSONObject obj = new JSONObject(content.toString());
String last_driver_path = obj.getString("last_driver_path");
String last_used_browser = obj.getString("last_browser_used");
DEFAULT_PORT = obj.getInt("default_port");

if (!last_driver_path.isEmpty()) {
DRIVER_PATH = last_driver_path;
}

if (!last_driver_path.equals("")) {
DRIVER_PATH = last_driver_path;
switch (last_used_browser) {
case "firefox": {
btnselectChrome.setEnabled(true);
btnselectFirefox.setEnabled(false);
break;
}

switch (last_used_browser) {
case "firefox": {
btnselectChrome.setEnabled(true);
btnselectFirefox.setEnabled(false);
break;
}
case "chrome": {
btnselectChrome.setEnabled(false);
btnselectFirefox.setEnabled(true);
break;
}
case "chrome": {
btnselectChrome.setEnabled(false);
btnselectFirefox.setEnabled(true);
break;
}

} catch (JSONException e) {
lblOutput.setText("Invalid config file");
} catch (FileNotFoundException e) {
lblOutput.setText("Cannot find config file");
}
} else {
FileWriter w = new FileWriter(CONFIG_FILE_PATH);
w.write(Tools.getDefaultJSONConfig());
w.close();
}
} catch (IOException e) {
e.printStackTrace();
lblOutput.setText("cannot create message definition file");
lblOutput.setText("cannot create message definition file: " + e);
} catch (JSONException e) {
lblOutput.setText("Invalid config file: " + e);
}
}

Expand All @@ -330,38 +318,30 @@ private void readConfigFile() {
private void editConfigFile(String key, String value) {
File config_file = new File(CONFIG_FILE_PATH);
try {
if (!config_file.createNewFile()) {
Scanner myReader = null;
String tmp = "";
try {
myReader = new Scanner(config_file);
while (myReader.hasNextLine()) {
tmp += myReader.nextLine();
}
myReader.close();

JSONObject obj = new JSONObject(tmp);
obj.remove(key);
obj.put(key, value);

FileWriter w = new FileWriter(CONFIG_FILE_PATH);
w.write(obj.toString());
w.close();


} catch (JSONException e) {
lblOutput.setText("Invalid config file");
} catch (FileNotFoundException e) {
lblOutput.setText("Cannot find config file");
}
} else {
if (config_file.createNewFile()) {
FileWriter w = new FileWriter(CONFIG_FILE_PATH);
w.write(Tools.getDefaultJSONConfig());
w.close();
}

StringBuilder content = new StringBuilder();
Scanner myReader = new Scanner(config_file);
while (myReader.hasNextLine()) {
content.append(myReader.nextLine());
}
myReader.close();

JSONObject obj = new JSONObject(content.toString());
obj.remove(key);
obj.put(key, value);

FileWriter w = new FileWriter(CONFIG_FILE_PATH);
w.write(obj.toString());
w.close();
} catch (IOException e) {
e.printStackTrace();
lblOutput.setText("cannot create message definition file");
lblOutput.setText("cannot create message definition file: " + e);
} catch (JSONException e) {
lblOutput.setText("Invalid config file: " + e);
}
}

Expand Down Expand Up @@ -389,8 +369,6 @@ private void readJSONinput(String jsonInput) {

//Array of Tests
JSONArray arrTests = obj.getJSONArray("tests");

//scorro tutti i test
for (int i = 0; i < arrTests.length(); i++) {
JSONObject act_test = arrTests.getJSONObject(i).getJSONObject("test");

Expand All @@ -406,7 +384,6 @@ private void readJSONinput(String jsonInput) {
}
updateSessionTabs();
updateTxtSessionConfig();
//JSONArray result = obj.getJSONArray("Test Suite Result Table");

this.testSuite = new TestSuite(suite_name, suite_description, tests);
lblInfo.setText("JSON read successfully, Test Suite Object has been created");
Expand All @@ -418,9 +395,8 @@ private void readJSONinput(String jsonInput) {
} catch (Exception e) {
e.printStackTrace();

setJSONError(true, "PROBLEM IN READING JSON, check it please");
setJSONError(true, "problem in reading json test suite");
}

}

/**
Expand Down Expand Up @@ -494,15 +470,14 @@ private void executeSuite() {
}
*/

if (actives.size() == 0) {
if (actives.isEmpty()) {
synchronized (lock2) {
active_ex_finished = true;
}
}

//FIXME: Passives thread starts without waiting for the end of actives one
// Execute active tests
if (actives.size() != 0) {
if (!actives.isEmpty()) {
try {
for (String key : session_port.keySet()) {
if (session_port.get(key).equals("")) {
Expand All @@ -526,7 +501,6 @@ public void onExecuteStart() {
public void onExecuteDone() {
if (passives.size() == 0) {
update_gui_test_results();
testSuite.log_test_suite(LOG_FOLDER);

lblOutput.setText("Done. Executed Passive Tests: "
+ (passives.isEmpty() ? 0 : passives.size())
Expand Down Expand Up @@ -614,7 +588,7 @@ public void onError(Test actual_test) {
}

// Execute passive tests
if (passives.size() != 0) {
if (!passives.isEmpty()) {
// TODO: Add offline clause
/*
if (defaultSession.messages.size() == 0) {
Expand All @@ -626,6 +600,7 @@ public void onError(Test actual_test) {
ExecutePassiveListener listener = new ExecutePassiveListener() {
@Override
public boolean onWaitToStart() {
// waits for active test execution to finish before doing passives
synchronized (lock2) {
return active_ex_finished;
}
Expand Down Expand Up @@ -854,6 +829,8 @@ private void update_gui_test_results() {
addItem(tmp);
}

testSuite.log_test_suite(LOG_FOLDER);

btnExecuteSuite.setEnabled(false);
}

Expand Down
2 changes: 1 addition & 1 deletion tool/src/main/java/migt/Test.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ public void init() {
violated_properties = "";
mitigations = "";

mandatory_keys.add("result");
//mandatory_keys.add("result") // for manuals is not required
mandatory_keys.add("name");
mandatory_keys.add("type");
mandatory_keys.add("sessions");
Expand Down
11 changes: 9 additions & 2 deletions tool/src/main/java/migt/Tools.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import com.jayway.jsonpath.JsonPath;
import com.jayway.jsonpath.PathNotFoundException;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;

import java.nio.charset.StandardCharsets;
Expand Down Expand Up @@ -193,13 +194,19 @@ public static List<EditOperation> parseEditsFromJSON(JSONArray edits_array) thro
* Function used to parse the message types from a string
*
* @param input a string containing the msg types in JSON
* @return a List of messagetype objects
* @return a List of MessageType objects
* @throws ParsingException if the input is malformed
*/
public static List<MessageType> readMsgTypesFromJson(String input) throws ParsingException {
List<MessageType> msg_types = new ArrayList<>();

JSONObject obj = new JSONObject(input);
JSONObject obj = null;

try {
obj = new JSONObject(input);
} catch (JSONException e) {
throw new ParsingException("Invalid JSON in message definition file: " + e);
}
JSONArray message_types = obj.getJSONArray("message_types");

for (int i = 0; i < message_types.length(); i++) {
Expand Down

0 comments on commit 724b954

Please sign in to comment.