Changeset aa89290 in murachi

Timestamp:

Jun 30, 2015, 10:41:00 AM (9 years ago)

Author:

antonioaraujob <aaraujo@…>

Branches:

master

Children:

ce3da18

Parents:

6bb4976

Message:

Agregados los archivos de configuración digidoc4j.yaml y venezuela-tsl.xml al directorio de recursos.

Location:

murachi

Files:

• pom.xml (modified) (1 diff)
• src/main/java/ve/gob/cenditel/murachi/MurachiRESTWS.java (modified) (12 diffs)
• src/main/resources/digidoc4j.yaml (added)
• src/main/resources/venezuela-tsl.xml (added)

murachi/pom.xml

@@ -105 +105 @@
                 </dependency>
                 
+                <dependency>
+                <groupId>org.apache.tika</groupId>
+                <artifactId>tika-core</artifactId>
+                <version>1.9</version>
+                </dependency>
                 
         </dependencies>

murachi/src/main/java/ve/gob/cenditel/murachi/MurachiRESTWS.java

@@ -115 +115 @@
 
 import org.apache.log4j.Logger;
+import org.apache.tika.Tika;
 
 @Path("/archivos")
@@ -130 +131 @@
         private static final String RSA_DIGEST_ENCRYPTION_ALGORITHM = "RSA";
         
+        private final String DIGIDOC4J_CONFIGURATION = getAbsolutePathOfResource("digidoc4j.yaml");
+        
+        private final String DIGIDOC4J_TSL_LOCATION = "file://" + getAbsolutePathOfResource("venezuela-tsl.xml");
+        
+
+
         // para reportes de advertencias de BDOC
         private static boolean bdocWarnings = true;
@@ -360 +367 @@
          * @apiDescription Carga un archivo a través de un formulario y retorna un json con la información de la firma.
          * 
+         * @apiSuccess {String} fileId Identificador único del archivo en el servidor
          * @apiSuccess {Boolean} fileExist El archivo se cargó exitosamente en el servidor.
          * @apiSuccess {String} error Extension not supported. En caso de que el archivo sea diferente de PDF y BDOC.
@@ -588 +596 @@
                 JSONObject jsonObject = new JSONObject();
                 
+                jsonObject.put("fileId", idFile);
+                
                 if (!tmpFile.exists()) {
                         System.out.println("File : " + file + " does not exists.");
@@ -597 +607 @@
                         jsonObject.put("fileExist", "true");
                         
-                        String mime = getMimeType(file);
+                        //String mime = getMimeType(file);
+                        String mime = getMimeTypeWithTika(file);
+                                                
                         System.out.println("mimetype : " + mime);
                         
@@ -633 +645 @@
                 logger.debug("verifySignaturesInPdf: "+ pdfFile);
                 
+                java.nio.file.Path path = Paths.get(pdfFile);
+                String idFile = path.getFileName().toString();
+                
+                
                 JSONObject jsonSignatures = new JSONObject();
                 JSONArray jsonArray = new JSONArray();
@@ -644 +660 @@
                         ArrayList<String> names = af.getSignatureNames();
                         if (names.size() <= 0) {
-                                jsonSignatures.put("signatureNumber", "0");
+                                jsonSignatures.put("fileExist", "true");
+                                jsonSignatures.put("fileId", idFile);
+                                jsonSignatures.put("numberOfSignatures", "0");
+                                jsonSignatures.put("mimeType", "application/pdf");
                         }else{
                                 
                                 jsonSignatures.put("fileExist", "true");
+                                jsonSignatures.put("fileId", idFile);
                                 jsonSignatures.put("numberOfSignatures", names.size());
+                                jsonSignatures.put("mimeType", "application/pdf");
                                                                 
                                 HashMap<String, String> signatureInformation;
@@ -1514 +1535 @@
         private JSONObject verifySignaturesInBdoc(String bdocFile) {
         
+                System.out.println("verifySignaturesInBdoc(String bdocFile)");
                 JSONObject jsonSignatures = new JSONObject();
 
@@ -1519 +1541 @@
                 JSONArray jsonContainerValidationExceptionArray = new JSONArray();
                 
+                java.nio.file.Path path = Paths.get(bdocFile);
+                String idFile = path.getFileName().toString();
+                
+                
                 Security.addProvider(new BouncyCastleProvider());
-                Container container;
-                container = Container.open(bdocFile);
+                Container container = null;
+                
+                Configuration configuration = new Configuration(Configuration.Mode.PROD);
+                
+                configuration.loadConfiguration(DIGIDOC4J_CONFIGURATION);
+                
+                configuration.setTslLocation(DIGIDOC4J_TSL_LOCATION);
+                try
+                {
+                        container = Container.open(bdocFile, configuration);
+                } catch(DigiDoc4JException e) 
+                {
+                        jsonSignatures.put("error", "File is not a valid BDOC container");
+                        return jsonSignatures;
+                }
+                
                 
                 int numberOfSignatures = container.getSignatures().size();
                 if (numberOfSignatures == 0){
                         jsonSignatures.put("signatureNumber", "0");
+                        System.out.println("signatureNumber: 0");
                 }else{
                         jsonSignatures.put("fileExist", "true");
+                        System.out.println("fileExist: true");
+                        
+                        jsonSignatures.put("fileId", idFile);
+                        jsonSignatures.put("mimeType", "application/pdf");
                         
                         // informacion de archivos dentro del contenedor
@@ -2276 +2321 @@
                 Security.addProvider(new BouncyCastleProvider());
                 
-                Configuration configuration = new Configuration(Configuration.Mode.TEST);
-                
-                configuration.loadConfiguration("/home/aaraujo/desarrollo/2015/workspace-luna/JAXRS-Murachi/WebContent/WEB-INF/lib/digidoc4j.yaml");
-                configuration.setTslLocation("http://localhost/trusted-test-mp.xml");
+                Configuration configuration = new Configuration(Configuration.Mode.PROD);
+                
+                configuration.loadConfiguration("/tmp/digidoc4j.yaml");
+                //configuration.setTslLocation("http://localhost/trusted-test-mp.xml");
+                configuration.setTslLocation("file:///tmp/venezuela-tsl.xml");
                 
             Container container = Container.create(configuration);
@@ -2289 +2335 @@
             container.setSignatureParameters(signatureParameters);
             container.setSignatureProfile(SignatureProfile.B_BES);
-            container.addDataFile("/tmp/01311213-5756-4707-a73d-6d42b09b26fd", "text/plain");
-            container.sign(new PKCS12Signer("/tmp/JuanHilario.p12", "123456".toCharArray()));
+            container.addDataFile("/tmp/salida.txt", "text/plain");
+            container.sign(new PKCS12Signer("/tmp/tibisay.p12", "123456".toCharArray()));
 //          Container container = Container.open("util/faulty/bdoc21-bad-nonce-content.bdoc");
             container.save("/tmp/signed.bdoc");
@@ -2572 +2618 @@
                 return result;           
         }
+        
+        /**
+         * Retorna el mimeType del archivo pasado como argumento
+         * @param absolutFilePath ruta absoluta del archivo
+         * @return mimeType del archivo pasado como argumento
+         */
+        public String getMimeTypeWithTika(String absolutFilePath) {
+                                
+                String mimeType = "";           
+                
+                Tika tika = new Tika();
+                File file = new File(absolutFilePath);
+                try {
+                        mimeType = tika.detect(file);
+                } catch (IOException e1) {
+                        // TODO Auto-generated catch block
+                        e1.printStackTrace();
+                }
+                
+                /*
+                java.nio.file.Path source = Paths.get(absolutFilePath);
+                try {
+                        result = Files.probeContentType(source);                        
+                        System.out.println(result);
+                } catch (IOException e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                }
+                */              
+                return mimeType;                 
+        }
+        
         
         /**