make it possible to disable loading from specified filename if a stre…

…am is validated
ZUGFeRD · Jul 8, 2024 · fb7fe28 · fb7fe28
1 parent 3904caf
commit fb7fe28
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 10 deletions.
diff --git a/validator/src/main/java/org/mustangproject/validator/XMLValidator.java b/validator/src/main/java/org/mustangproject/validator/XMLValidator.java
@@ -36,6 +36,7 @@ public class XMLValidator extends Validator {
 
 	protected String zfXML = "";
 	protected String filename = "";
+	protected boolean autoload=true;
 	int firedRules = 0;
 	int failedRules = 0;
 	boolean disableNotices = false;
@@ -55,19 +56,27 @@ public XMLValidator(ValidationContext ctx) {
 	public void setFilename(String name) throws IrrecoverableValidationError { // from XML Filename
 		filename = name;
 		// file existence must have been checked before
+		if (autoload) {
+			try {
+				zfXML = new String(XMLTools.removeBOM(Files.readAllBytes(Paths.get(filename))), StandardCharsets.UTF_8);
+			} catch (final IOException e) {
 
-		try {
-			zfXML = new String(XMLTools.removeBOM(Files.readAllBytes(Paths.get(name))), StandardCharsets.UTF_8);
-		} catch (final IOException e) {
-
-			final ValidationResultItem vri = new ValidationResultItem(ESeverity.exception, e.getMessage()).setSection(9)
+				final ValidationResultItem vri = new ValidationResultItem(ESeverity.exception, e.getMessage()).setSection(9)
 					.setPart(EPart.fx);
-			final StringWriter sw = new StringWriter();
-			final PrintWriter pw = new PrintWriter(sw);
-			e.printStackTrace(pw);
-			vri.setStacktrace(sw.toString());
-			context.addResultItem(vri);
+				final StringWriter sw = new StringWriter();
+				final PrintWriter pw = new PrintWriter(sw);
+				e.printStackTrace(pw);
+				vri.setStacktrace(sw.toString());
+				context.addResultItem(vri);
+			}
+
 		}
+
+	}
+
+	public void disableAutoload() {
+		// for streaming, which sets a fake filename
+		autoload=false;
 	}
 
 	/***

diff --git a/validator/src/main/java/org/mustangproject/validator/ZUGFeRDValidator.java b/validator/src/main/java/org/mustangproject/validator/ZUGFeRDValidator.java
@@ -296,6 +296,7 @@ public String validate(InputStream inputStream, String fileNameOfInputStream) {
 					if (isXML) {
 						pdfValidity = true;
 						optionsRecognized = true;
+						xv.disableAutoload();
 						xv.setFilename(fileNameOfInputStream);
 						sha1Checksum = calcSHA1(inputStream);