Home Explore Help
Register Sign In
coolbeer
/
cryptomator
mirror of https://github.com/cryptomator/cryptomator.git
1
0
Fork 0
Files Issues 0 Wiki
Browse Source

More resilient loading of settings.json

Sebastian Stenzel 5 years ago
parent
243c74b0cb
commit
3b690dfc6e
2 changed files with 24 additions and 5 deletions
Split View Show Diff Stats
  1. 10 5
      main/commons/src/main/java/org/cryptomator/common/settings/SettingsProvider.java
  2. 14 0
      main/commons/src/test/java/org/cryptomator/common/settings/SettingsJsonAdapterTest.java

+ 10 - 5
main/commons/src/main/java/org/cryptomator/common/settings/SettingsProvider.java
View File 

@@ -10,7 +10,9 @@ package org.cryptomator.common.settings;
 
 
 import com.google.gson.Gson;
 
 import com.google.gson.GsonBuilder;
 
+import com.google.gson.JsonElement;
 
 import com.google.gson.JsonParseException;
 
+import com.google.gson.JsonParser;
 
 import org.cryptomator.common.Environment;
 
 import org.cryptomator.common.LazyInitializer;
 
 import org.slf4j.Logger;
 
@@ -77,12 +79,15 @@ public class SettingsProvider implements Supplier<Settings> {
 
 		LOG.debug("Attempting to load settings from {}", path);
 
 		try (InputStream in = Files.newInputStream(path, StandardOpenOption.READ); //
 
 			 Reader reader = new InputStreamReader(in, StandardCharsets.UTF_8)) {
 
-			Settings settings = gson.fromJson(reader, Settings.class);
 
-			if (settings == null) {
 
-				throw new IOException("Unexpected EOF");
 
+			JsonElement json = JsonParser.parseReader(reader);
 
+			if (json.isJsonObject()) {
 
+				Settings settings = gson.fromJson(json, Settings.class);
 
+				LOG.info("Settings loaded from {}", path);
 
+				return Stream.of(settings);
 
+			} else {
 
+				LOG.warn("Invalid json file {}", path);
 
+				return Stream.empty();
 
 			}
 
-			LOG.info("Settings loaded from {}", path);
 
-			return Stream.of(settings);
 
 		} catch (NoSuchFileException e) {
 
 			return Stream.empty();
 
 		} catch (IOException e) {

+ 14 - 0
main/commons/src/test/java/org/cryptomator/common/settings/SettingsJsonAdapterTest.java
View File 

@@ -7,6 +7,8 @@ package org.cryptomator.common.settings;
 
 
 import org.junit.jupiter.api.Assertions;
 
 import org.junit.jupiter.api.Test;
 
+import org.junit.jupiter.params.ParameterizedTest;
 
+import org.junit.jupiter.params.provider.ValueSource;
 
 
 import java.io.IOException;
 
 
@@ -34,4 +36,16 @@ public class SettingsJsonAdapterTest {
 
 		Assertions.assertEquals(VolumeImpl.FUSE, settings.preferredVolumeImpl().get());
 
 	}
 
 
+	@ParameterizedTest(name = "fromJson() should throw IOException for input: {0}")
 
+	@ValueSource(strings = {
 
+			"",
 
+			"<html>",
 
+			"{invalidjson}"
 
+	})
 
+	public void testDeserializeMalformed(String input) {
 
+		Assertions.assertThrows(IOException.class, () -> {
 
+			adapter.fromJson(input);
 
+		});
 
+	}
 
+
 
 }