louisdevie/mustangproject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved Autoload to validator

Browse Source
This commit is contained in:
Dominik Röschke
2024-07-09 07:12:13 +02:00
parent fb7fe28eca
commit 94b7b75de7
4 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
validator/src/main/java/org/mustangproject/validator/PDFValidator.java
View File

@@ -65,6 +65,7 @@ public class PDFValidator extends Validator {
private String Signature; private String Signature;
private String zfXML = null; private String zfXML = null;
protected boolean autoload=true;
protected static boolean stringArrayContains(String[] arr, String targetValue) { protected static boolean stringArrayContains(String[] arr, String targetValue) {
return Arrays.asList(arr).contains(targetValue); return Arrays.asList(arr).contains(targetValue);
@@ -319,13 +320,13 @@ public class PDFValidator extends Validator {
@Override @Override
public void setFilename(String filename) throws IrrecoverableValidationError { public void setFilename(String filename) throws IrrecoverableValidationError {
this.pdfFilename = filename; this.pdfFilename = filename;
try { if(autoload) {
fileContents=Files.readAllBytes(Paths.get(pdfFilename)); try {
} catch (IOException ex) { fileContents=Files.readAllBytes(Paths.get(pdfFilename));
throw new IrrecoverableValidationError("Could not read file"); } catch (IOException ex) {
throw new IrrecoverableValidationError("Could not read file");
}
} }
} }
public void setFileContents(byte[] fileContents) { public void setFileContents(byte[] fileContents) {

5
validator/src/main/java/org/mustangproject/validator/Validator.java
View File

@@ -19,6 +19,7 @@ public abstract class Validator {
private static final Logger LOGGER = LoggerFactory.getLogger(Validator.class.getCanonicalName()); // log output private static final Logger LOGGER = LoggerFactory.getLogger(Validator.class.getCanonicalName()); // log output
protected ValidationContext context; protected ValidationContext context;
protected boolean autoload=true;
public Validator(ValidationContext ctx){ public Validator(ValidationContext ctx){
this.context=ctx; this.context=ctx;
@@ -77,6 +78,10 @@ public abstract class Validator {
return context; return context;
} }
public void setAutoload(boolean autoload) {
this.autoload = autoload;
}
} }

6
validator/src/main/java/org/mustangproject/validator/XMLValidator.java
View File

@@ -36,7 +36,6 @@ public class XMLValidator extends Validator {
protected String zfXML = ""; protected String zfXML = "";
protected String filename = ""; protected String filename = "";
protected boolean autoload=true;
int firedRules = 0; int firedRules = 0;
int failedRules = 0; int failedRules = 0;
boolean disableNotices = false; boolean disableNotices = false;
@@ -74,11 +73,6 @@ public class XMLValidator extends Validator {
} }
public void disableAutoload() {
// for streaming, which sets a fake filename
autoload=false;
}
/*** /***
* manually set the xml content * manually set the xml content
* @param xml the xml to be checked * @param xml the xml to be checked

3
validator/src/main/java/org/mustangproject/validator/ZUGFeRDValidator.java
View File

@@ -257,6 +257,7 @@ public class ZUGFeRDValidator {
isPDF = ByteArraySearcher.contains(content, new byte[]{'%', 'P', 'D', 'F'}); isPDF = ByteArraySearcher.contains(content, new byte[]{'%', 'P', 'D', 'F'});
XMLValidator xv = new XMLValidator(context); XMLValidator xv = new XMLValidator(context);
if (isPDF) { if (isPDF) {
pdfv.setAutoload(false);
pdfv.setFilename(fileNameOfInputStream); pdfv.setFilename(fileNameOfInputStream);
pdfv.setFileContents(content); pdfv.setFileContents(content);
@@ -296,7 +297,7 @@ public class ZUGFeRDValidator {
if (isXML) { if (isXML) {
pdfValidity = true; pdfValidity = true;
optionsRecognized = true; optionsRecognized = true;
xv.disableAutoload(); xv.setAutoload(false);
xv.setFilename(fileNameOfInputStream); xv.setFilename(fileNameOfInputStream);
sha1Checksum = calcSHA1(inputStream); sha1Checksum = calcSHA1(inputStream);