Missing check when write to "unwriteable" log-file (#228)

claeis · Mar 4, 2020 · 8e5032c · 8e5032c
1 parent 34ca82f
commit 8e5032c
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -20,6 +20,7 @@ configurations {
 //}
 
 dependencies {
+    compile group: 'ch.ehi', name: 'ehibasics', version: '1.3.0+'
     compile group: 'ch.interlis', name: 'iox-ili', version: '1.20.17'
     compile group: 'ch.interlis', name: 'ili2c-tool', version: "5.0.6"
     compile group: 'ch.interlis', name: 'ili2c-core', version: "5.0.6"

diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt
@@ -1,5 +1,7 @@
 LATEST VERSION
 -----------------------------
+- Missing check when write to "unwriteable" log-file (#228)
+- ehibasics-1.3.0-SNAPSHOT
 
 ilivalidator 1.11.4 (2020-03-02)
 -----------------------------

diff --git a/src/org/interlis2/validator/Validator.java b/src/org/interlis2/validator/Validator.java
@@ -91,12 +91,34 @@ public boolean validate(
 		try{
 			// setup logging of validation results
 			if(logFilename!=null){
-				logfile=new FileLogger(new java.io.File(logFilename));
-				EhiLogger.getInstance().addListener(logfile);
+			    File f=new java.io.File(logFilename);
+			    try {
+                    if(isWriteable(f)) {
+                        logfile=new FileLogger(f);
+                        EhiLogger.getInstance().addListener(logfile);
+                    }else {
+                        EhiLogger.logError("failed to write to logfile <"+f.getPath()+">");
+                        return false;
+                    }
+                } catch (IOException e) {
+                    EhiLogger.logError("failed to write to logfile <"+f.getPath()+">",e);
+                    return false;
+                }
 			}
 			if(xtflogFilename!=null){
-				xtflog=new XtfErrorsLogger(new java.io.File(xtflogFilename), Main.APP_NAME+"-"+Main.getVersion());
-				EhiLogger.getInstance().addListener(xtflog);
+			    File f=new java.io.File(xtflogFilename);
+                try {
+                    if(isWriteable(f)) {
+                        xtflog=new XtfErrorsLogger(f, Main.APP_NAME+"-"+Main.getVersion());
+                        EhiLogger.getInstance().addListener(xtflog);
+                    }else {
+                        EhiLogger.logError("failed to write to logfile <"+f.getPath()+">");
+                        return false;
+                    }
+                } catch (IOException e) {
+                    EhiLogger.logError("failed to write to logfile <"+f.getPath()+">",e);
+                    return false;
+                }
 			}
 			if(!TRUE.equals(settings.getValue(SETTING_DISABLE_STD_LOGGER))) {
 				logStderr=new StdLogger(logFilename);
@@ -297,7 +319,12 @@ public boolean validate(
 		return ret;
 	}
 
-	private boolean getVersionControlFormConfigFile(String configFilename) throws IOException {
+	private static boolean isWriteable(File f) throws IOException {
+        f.createNewFile();
+        return f.canWrite();
+    }
+
+    private boolean getVersionControlFormConfigFile(String configFilename) throws IOException {
         if (configFilename != null) {
             ValidationConfig modelConfig=new ValidationConfig();
             modelConfig.mergeConfigFile(new File(configFilename));