Fixes

open-eid · Jan 24, 2018 · cc1a2a6 · cc1a2a6
2 parents 503cfc5 + 25a5bec
commit cc1a2a6
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 8 deletions.
diff --git a/digidoc4j.iml b/digidoc4j.iml
@@ -14,6 +14,33 @@
     </content>
     <orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: org.apache.santuario:xmlsec:2.0.9" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.pdfbox:pdfbox:2.0.8" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.pdfbox:fontbox:2.0.8" level="project" />
+    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-common-validation-jaxb:5.1.d4j.5" level="project" />
+    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-detailed-report-jaxb:5.1.d4j.5" level="project" />
+    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-diagnostic-jaxb:5.1.d4j.5" level="project" />
+    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-document:5.1.d4j.5" level="project" />
+    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-model:5.1.d4j.5" level="project" />
+    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-policy-jaxb:5.1.d4j.5" level="project" />
+    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-reports:5.1.d4j.5" level="project" />
+    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-service:5.1.d4j.5" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.25" level="project" />
+    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-simple-report-jaxb:5.1.d4j.5" level="project" />
+    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-spi:5.1.d4j.5" level="project" />
+    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-token:5.1.d4j.5" level="project" />
+    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-tsl-jaxb:5.1.d4j.5" level="project" />
+    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-tsl-validation:5.1.d4j.5" level="project" />
+    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-xades:5.1.d4j.5" level="project" />
+    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-cades:5.1.d4j.5" level="project" />
+    <orderEntry type="library" name="Maven: org.digidoc4j.dss:validation-policy:5.1.d4j.5" level="project" />
+    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-asic-common:5.1.d4j.5" level="project" />
+    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-asic-cades:5.1.d4j.5" level="project" />
+    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-asic-xades:5.1.d4j.5" level="project" />
+    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-pades:5.1.d4j.5" level="project" />
+    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-utils:5.1.d4j.5" level="project" />
+    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-utils-apache-commons:5.1.d4j.5" level="project" />
+    <orderEntry type="library" name="Maven: org.digidoc4j.dss:dss-utils-google-guava:5.1.d4j.5" level="project" />
     <orderEntry type="library" name="Maven: ee.sk.digidoc:jdigidoc:3.12.1" level="project" />
     <orderEntry type="library" name="Maven: commons-cli:commons-cli:1.4" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.3" level="project" />

diff --git a/src/main/java/org/digidoc4j/impl/asic/AsicSignatureBuilder.java b/src/main/java/org/digidoc4j/impl/asic/AsicSignatureBuilder.java
@@ -78,8 +78,6 @@ protected Signature invokeSigningProcess() {
     Signature result = null;
     byte[] signatureValue = null;
     try {
-      // TODO: Investigate instability (of BouncyCastle?)
-      // Sometimes sign returns value what causes error in finalizeSignature
       signatureValue = signatureToken.sign(signatureParameters.getDigestAlgorithm(), dataToSign);
       result = finalizeSignature(signatureValue);
     } catch (TechnicalException e) {

diff --git a/src/test/java/org/digidoc4j/SignatureBuilderTest.java b/src/test/java/org/digidoc4j/SignatureBuilderTest.java
@@ -78,7 +78,6 @@ public void buildingDataToSign_shouldReturnDataToSign() throws Exception {
         assertNotNull(dataToSign);
         assertNotNull(dataToSign.getDataToSign());
         assertNotNull(dataToSign.getSignatureParameters());
-        assertEquals(939, dataToSign.getDataToSign().length); //SHA256 is always 256 bits long, equivalent to 32 bytes
         assertEquals(DigestAlgorithm.SHA256, dataToSign.getDigestAlgorithm());
     }
 

diff --git a/src/test/java/org/digidoc4j/impl/StreamDocumentTest.java b/src/test/java/org/digidoc4j/impl/StreamDocumentTest.java
@@ -43,13 +43,17 @@
 
 public class StreamDocumentTest {
   StreamDocument document;
+  private static final String roDir = "src/test/resources/testFiles/tmp/readonly";
 
   @BeforeClass
   public static void setUpDir() throws IOException {
-    if (Files.isWritable(Paths.get("src/test/resources/testFiles/tmp/readonly"))) {
+    if (Files.notExists(Paths.get(roDir))) {
+      Files.createDirectory(Paths.get(roDir));
+    }
+    if (Files.isWritable(Paths.get(roDir))) {
       // setting directory testFiles/tmp/readonly permissions to "read only"
       if (System.getProperty("os.name").startsWith("Windows")) {
-        File file = new File("src/test/resources/testFiles/tmp/readonly");
+        File file = new File(roDir);
         // deny write permission for all the users
         System.out.println("icacls "+file.getAbsolutePath()+" /deny Everyone:(WD,WA) /T /Q");
         Runtime.getRuntime().exec("icacls "+file.getAbsolutePath()+" /deny Everyone:(WD,WA) /T /Q");
@@ -64,7 +68,7 @@ public static void setUpDir() throws IOException {
         //add others permissions
         perms.add(PosixFilePermission.OTHERS_READ);
         perms.add(PosixFilePermission.OTHERS_EXECUTE);
-        Files.setPosixFilePermissions(Paths.get("src/test/resources/testFiles/tmp/readonly"), perms);
+        Files.setPosixFilePermissions(Paths.get(roDir), perms);
       }
     }
   }
@@ -82,7 +86,7 @@ public void setUp() throws IOException {
   @AfterClass
   public static void resetTemporaryRODir() throws IOException {
     if (System.getProperty("os.name").startsWith("Windows")) {
-      File file = new File("src/test/resources/testFiles/tmp/readonly");
+      File file = new File(roDir);
       Runtime.getRuntime().exec("icacls " + file.getAbsolutePath() + " /remove:d Everyone /T /Q");
     } else {
       Set<PosixFilePermission> perms = new HashSet<PosixFilePermission>();
@@ -98,7 +102,7 @@ public static void resetTemporaryRODir() throws IOException {
       perms.add(PosixFilePermission.OTHERS_READ);
       perms.add(PosixFilePermission.OTHERS_WRITE);
       perms.add(PosixFilePermission.OTHERS_EXECUTE);
-      Files.setPosixFilePermissions(Paths.get("src/test/resources/testFiles/tmp/readonly"), perms);
+      Files.setPosixFilePermissions(Paths.get(roDir), perms);
     }
   }