From c06e4ef08662e152b6bbf56c40d98cee2e87beb8 Mon Sep 17 00:00:00 2001
From: apvrille <ludovic.apvrille@eurecom.fr>
Date: Mon, 6 Mar 2017 15:58:21 +0100
Subject: [PATCH] Adding ProVerif directory verification
---
src/myutil/FileUtils.java | 15 ++++++++++-----
src/ui/window/JDialogProverifVerification.java | 9 ++++++++-
2 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/myutil/FileUtils.java b/src/myutil/FileUtils.java
index ecae482a39..fbe24343a3 100755
--- a/src/myutil/FileUtils.java
+++ b/src/myutil/FileUtils.java
@@ -46,7 +46,7 @@
package myutil;
import java.io.*;
-
+import java.nio.file.*;
public class FileUtils {
@@ -78,9 +78,14 @@ public class FileUtils {
return ext;
}
+
+ public static boolean checkPath(String path) {
+ return new File(path).isDirectory();
+ }
+
public static boolean checkFileForSave(File file) throws FileException {
- // boolean ok = true;
- // String pb = "";
+ // boolean ok = true;
+ // String pb = "";
if (file == null) {
return false;
@@ -238,8 +243,8 @@ public class FileUtils {
}
public static void saveFile(String name, String data) throws FileException {
- File f = new File(name);
- saveFile(f, data);
+ File f = new File(name);
+ saveFile(f, data);
}
diff --git a/src/ui/window/JDialogProverifVerification.java b/src/ui/window/JDialogProverifVerification.java
index da0d72a957..75e6a890d0 100644
--- a/src/ui/window/JDialogProverifVerification.java
+++ b/src/ui/window/JDialogProverifVerification.java
@@ -383,7 +383,14 @@ public class JDialogProverifVerification extends javax.swing.JDialog implements
if (pathCode.isEmpty()){
pathCode="pvspec";
- }
+ } else {
+ if (!FileUtils.checkPath(pathCode)) {
+ jta.append("Error: invalid directory: " + pathCode + "\n");
+ mode = STOPPED;
+ setButtons();
+ return;
+ }
+ }
testFile = new File(pathCode);
--
GitLab