diff --git a/build.txt b/build.txt
index 509af9ad9b81ef7f4094df51087dac8b9038f4f3..21342490ff3d708cacb44af4b8fd485fc2a70845 100644
--- a/build.txt
+++ b/build.txt
@@ -1 +1 @@
-14763
\ No newline at end of file
+14764
\ No newline at end of file
diff --git a/capectracer/requirements_capec_tracer.txt b/capectracer/requirements_capec_tracer.txt
index b5c5fc9bf62ba73f52e7e817f40f32ab635963ac..4e44f6d8edd320faa0753aec8e287bb940ec58c8 100644
--- a/capectracer/requirements_capec_tracer.txt
+++ b/capectracer/requirements_capec_tracer.txt
@@ -4,3 +4,4 @@ spacy==3.7.2
xmltodict==0.13.0
nltk==3.7
scipy==1.10.1
+requests==2.25.1
diff --git a/src/main/java/ai/AIInteract.java b/src/main/java/ai/AIInteract.java
index e319ea0befece6912697e6985514d86562e36a23..7866b06e225685f5af15bf87af56279e9ad30431 100644
--- a/src/main/java/ai/AIInteract.java
+++ b/src/main/java/ai/AIInteract.java
@@ -205,6 +205,10 @@ public abstract class AIInteract implements Runnable {
return null;
}
+
+ public String getInfo() {
+ return "";
+ }
}
diff --git a/src/main/java/ai/CAPECTracer.java b/src/main/java/ai/CAPECTracer.java
index 95753adf877e9672d72d835ac0de662f18e0bb77..931271fe85b5bd9fddd45bab63abe032ff307c15 100644
--- a/src/main/java/ai/CAPECTracer.java
+++ b/src/main/java/ai/CAPECTracer.java
@@ -1,5 +1,9 @@
package ai;
+import common.ConfigurationTTool;
+import launcher.LauncherException;
+import launcher.RshClient;
+import launcher.RshClientReader;
import myutil.TraceManager;
import java.io.*;
@@ -18,8 +22,13 @@ public class CAPECTracer extends AIInteract {
public static String QUESTIONTRACECAPECS = "From the provided system specifications, identify all of the possible " +
"attack patterns that an attacker could use to exploit the system.";
+ private String command;
+ private Path projectPath;
+
public CAPECTracer(AIChatData _chatData) {
super(_chatData);
+ projectPath = Paths.get("../capectracer").normalize().toAbsolutePath();
+ command = getCapecCommand(projectPath.toString());
}
@Override
@@ -27,13 +36,16 @@ public class CAPECTracer extends AIInteract {
chatData.feedback.addToChat(QUESTIONTRACECAPECS, true);
String systemSpec = chatData.lastQuestion.trim();
- Path projectPath = Paths.get("../capectracer").normalize().toAbsolutePath();
writeToFile(projectPath + "/system_specs.txt", systemSpec);
String results = runCapecTracer(projectPath.toString());
chatData.feedback.addToChat(results, false);
}
+ public String getInfo() {
+ return "Running command: " + command;
+ }
+
private void writeToFile(String filePath, String content) {
try {
// Create a FileWriter object
@@ -53,34 +65,34 @@ public class CAPECTracer extends AIInteract {
}
}
+ private String getCapecCommand(String capecTracerFolder) {
+ String python = "python3";
+ if (ConfigurationTTool.PythonPathForCapec.length() > 0) {
+ python = ConfigurationTTool.PythonPathForCapec;
+ }
+ return python + " " + capecTracerFolder + "/capec_tracer.py";
+ }
+
private String runCapecTracer(String capecTracerFolder) {
String traces = "";
try {
- String s = null;
-
- // Execute the process
- Process p = Runtime.getRuntime().exec("python3 " + capecTracerFolder + "/capec_tracer.py");
-
- BufferedReader stdInput = new BufferedReader(new
- InputStreamReader(p.getInputStream()));
- BufferedReader stdError = new BufferedReader(new
- InputStreamReader(p.getErrorStream()));
-
- // read the output from the command
- while ((s = stdInput.readLine()) != null) {
- TraceManager.addDev(s);
- }
-
- // read any errors from the attempted command
- while ((s = stdError.readLine()) != null) {
- TraceManager.addDev(s);
+ RshClient rshc = new RshClient("localhost");
+ rshc.setCmd(command);
+ rshc.sendExecuteCommandRequest();
+ RshClientReader data = rshc.getDataReaderFromProcess();
+ int characterInt = data.read();
+ StringBuilder output = new StringBuilder();
+
+ while (characterInt != -1) {
+ output.append((char) characterInt);
+ characterInt = data.read();
}
+ TraceManager.addDev(output.toString());
byte[] bytes = Files.readAllBytes(Path.of(capecTracerFolder + "/traced_capecs.txt"));
-
traces = new String(bytes);
- } catch (IOException e) {
+ } catch (IOException | LauncherException e) {
TraceManager.addDev(e.getMessage());
}
diff --git a/src/main/java/avatartranslator/AvatarBlock.java b/src/main/java/avatartranslator/AvatarBlock.java
index e7ad1e312670c45834f7effbddf7c349e27745fa..8ca4eea5dc403e155432b6170af829b822bd887f 100644
--- a/src/main/java/avatartranslator/AvatarBlock.java
+++ b/src/main/java/avatartranslator/AvatarBlock.java
@@ -1440,4 +1440,8 @@ public class AvatarBlock extends AvatarElement implements AvatarStateMachineOwne
return errors;
}
+
+ public String getInfo() {
+ return "Generating blocks, please wait.";
+ }
}
diff --git a/src/main/java/common/ConfigurationTTool.java b/src/main/java/common/ConfigurationTTool.java
index e4ae215327c852f2ac6f83ba2d2591e5b92f40fc..fb8f79746e15c36dccd5665bc8261bcc4becf5d9 100755
--- a/src/main/java/common/ConfigurationTTool.java
+++ b/src/main/java/common/ConfigurationTTool.java
@@ -152,6 +152,9 @@ public class ConfigurationTTool {
public static String OPENAIKey = "";
public static String OPENAIModel = "";
+ public static String PythonPathForCapec = "";
+
+
// Ontology
//public static String RequirementOntologyWebsite = "";
@@ -508,6 +511,8 @@ public class ConfigurationTTool {
sb.append("Key: " + OPENAIKey + "\n");
sb.append("Model: " + OPENAIModel + "\n");
+ sb.append("Python path for CAPECs: " + PythonPathForCapec + "\n");
+
// Plugins
sb.append("\nPlugins:\n");
//sb.append("Plugin path: " + PLUGIN_PKG + "\n");
@@ -809,6 +814,10 @@ public class ConfigurationTTool {
if (nl.getLength() > 0)
openAIModel(nl);
+ nl = doc.getElementsByTagName("PythonPathForCapecs");
+ if (nl.getLength() > 0)
+ setPythonPathForCapecs(nl);
+
// Ontologies
/*nl = doc.getElementsByTagName("RequirementOntologyWebsite");
@@ -1611,6 +1620,15 @@ public class ConfigurationTTool {
}
}
+ private static void setPythonPathForCapecs(NodeList nl) throws MalformedConfigurationException {
+ try {
+ Element elt = (Element) (nl.item(0));
+ PythonPathForCapec = elt.getAttribute("data");
+ } catch (Exception e) {
+ throw new MalformedConfigurationException(e.getMessage());
+ }
+ }
+
private static void Plugin(NodeList nl) throws MalformedConfigurationException {
PLUGIN = new String[nl.getLength()];
PLUGIN_PKG = new String[nl.getLength()];
diff --git a/src/main/java/ui/util/DefaultText.java b/src/main/java/ui/util/DefaultText.java
index c4772a430a99392f72ffc6b06204f9bf7db8ea8e..bc7a7faa08b6e12a821b81d73b3409122108b553 100755
--- a/src/main/java/ui/util/DefaultText.java
+++ b/src/main/java/ui/util/DefaultText.java
@@ -50,8 +50,8 @@ package ui.util;
*/
public class DefaultText {
- public static String BUILD = "14762";
- public static String DATE = "2024/04/28 03:22:03 CET";
+ public static String BUILD = "14763";
+ public static String DATE = "2024/04/29 03:22:04 CET";
public static StringBuffer sbAbout = makeAbout();
diff --git a/src/main/java/ui/window/JFrameAI.java b/src/main/java/ui/window/JFrameAI.java
index a96d201015341831e966f492dd6230dbcf94f5ee..549eaddb5b20752c6a452559179ed016367ca8a7 100644
--- a/src/main/java/ui/window/JFrameAI.java
+++ b/src/main/java/ui/window/JFrameAI.java
@@ -545,6 +545,11 @@ public class JFrameAI extends JFrame implements ActionListener {
selected.aiInteract.makeRequest(question.getText());
+ String info = selected.aiInteract.getInfo();
+ if (info.length() > 0) {
+ inform(info + "\n");
+ }
+
//question.setText("Total time: " + (endTime - startTime) + " ms");
} else {
diff --git a/src/main/resources/help/ai.html b/src/main/resources/help/ai.html
index e01b14f72a86de0c07d0b2ce70a6ad71b75c10e8..fc46902342c925c5a7940443cd2c4fd900af4438 100644
--- a/src/main/resources/help/ai.html
+++ b/src/main/resources/help/ai.html
@@ -11,8 +11,11 @@
div.columns{display: flex; gap: min(4vw, 1.5em);}
div.column{flex: auto; overflow-x: auto;}
div.hanging-indent{margin-left: 1.5em; text-indent: -1.5em;}
- ul.task-list{list-style: none;}
+ /* The extra [class] is a hack that increases specificity enough to
+ override a similar rule in reveal.js */
+ ul.task-list[class]{list-style: none;}
ul.task-list li input[type="checkbox"] {
+ font-size: inherit;
width: 0.8em;
margin: 0 0.8em 0.2em -1.6em;
vertical-align: middle;
@@ -20,7 +23,7 @@
.display.math{display: block; text-align: center; margin: 0.5rem auto;}
/* CSS for syntax highlighting */
pre > code.sourceCode { white-space: pre; position: relative; }
- pre > code.sourceCode > span { display: inline-block; line-height: 1.25; }
+ pre > code.sourceCode > span { line-height: 1.25; }
pre > code.sourceCode > span:empty { height: 1.2em; }
.sourceCode { overflow: visible; }
code.sourceCode > span { color: inherit; text-decoration: inherit; }
@@ -31,7 +34,7 @@
}
@media print {
pre > code.sourceCode { white-space: pre-wrap; }
- pre > code.sourceCode > span { text-indent: -5em; padding-left: 5em; }
+ pre > code.sourceCode > span { display: inline-block; text-indent: -5em; padding-left: 5em; }
}
pre.numberSource code
{ counter-reset: source-line 0; }
@@ -84,9 +87,6 @@
code span.wa { color: #60a0b0; font-weight: bold; font-style: italic; } /* Warning */
</style>
<link rel="stylesheet" href="help.css" />
- <!--[if lt IE 9]>
- <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
- <![endif]-->
</head>
<body>
<h1 id="ai">AI</h1>
@@ -123,5 +123,10 @@ instance “add four integer attributes to [name of a block in your model]
with names of Crocodilia or Zebra species.†4. If the mutation list
generated by the AI suits you, click on “Apply response†to update the
opened AVATAR model.</p>
+<h3 id="capecs">CAPECs</h3>
+<p>To use CAPECs, you may need to position the path to the python
+version you wish to use. For instance:</p>
+<div class="sourceCode" id="cb2"><pre
+class="sourceCode xml"><code class="sourceCode xml"><span id="cb2-1"><a href="#cb2-1" aria-hidden="true" tabindex="-1"></a><<span class="kw">PythonPathForCapecs</span><span class="ot"> data=</span><span class="st">"/usr/bin/python3.10"</span> /></span></code></pre></div>
</body>
</html>
diff --git a/src/main/resources/help/ai.md b/src/main/resources/help/ai.md
index 709a02d688670a0d7bbeef2847ae8abbe0877c21..2ccbb4ca4c259a3c2967c7a3091211a8c8a154a5 100644
--- a/src/main/resources/help/ai.md
+++ b/src/main/resources/help/ai.md
@@ -30,4 +30,12 @@ follow these steps:
2. Perform a syntax checking.
3. Write your request in the AI window, for instance "add four integer attributes to [name of a block in your model] with names of Crocodilia or
Zebra species."
-4. If the mutation list generated by the AI suits you, click on "Apply response" to update the opened AVATAR model.
\ No newline at end of file
+4. If the mutation list generated by the AI suits you, click on "Apply response" to update the opened AVATAR model.
+
+### CAPECs
+
+To use CAPECs, you may need to position the path to the python version you wish to use. For instance:
+```xml
+<PythonPathForCapecs data="/usr/bin/python3.10" />
+```
+
diff --git a/src/main/resources/help/avatarsecuritypragmas.html b/src/main/resources/help/avatarsecuritypragmas.html
index fb7a9cebab9ba0c62c704510fc7ec10feb3e1f8f..ab9defe8198aa23ac8783e4b369f2e2df92d73e7 100644
--- a/src/main/resources/help/avatarsecuritypragmas.html
+++ b/src/main/resources/help/avatarsecuritypragmas.html
@@ -23,9 +23,6 @@
.display.math{display: block; text-align: center; margin: 0.5rem auto;}
</style>
<link rel="stylesheet" href="help.css" />
- <!--[if lt IE 9]>
- <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
- <![endif]-->
</head>
<body>
<h1 id="avatar-security-pragmas">AVATAR Security pragmas</h1>
@@ -107,7 +104,7 @@ backtraced to TTool</p>
pragma. - Green means “confidentiality satisfied†- Red means
“confidentiality not satisfied†- Grey means that the property could not
be proved</p>
-<h3 id="weak-and-strong-authenticity">Weak and strong authenticity</h3>
+<h4 id="weak-and-strong-authenticity">Weak and strong authenticity</h4>
<p>A lock is drawn next to each “Authenticity†pragma. the lock is
divided into two parts. The upper right part refers to weak
authenticity, and lower left part refers to the strong authenticity.</p>
@@ -116,7 +113,7 @@ authenticity, and lower left part refers to the strong authenticity.</p>
<li>Red means property not satisfied</li>
<li>Grey means that the property could not be proved</li>
</ul>
-<p>For instance, the Figure below, taken from the AliceAndBob model
+<p>For instance, the Figure below, taken from the “AliceAndBob†model
illustrates an authenticity property after security proof: the lock
shows that weak authenticity is satisfied, but not strong
authenticity.</p>