Changeset f346e17 in murachi
- Timestamp:
- Oct 6, 2016, 10:51:28 AM (8 years ago)
- Branches:
- master
- Children:
- 28faf1a
- Parents:
- 8105f09
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
murachi/src/main/java/ve/gob/cenditel/murachi/MurachiRESTWS.java
- Property mode changed from 100644 to 100755
r8105f09 rf346e17 127 127 128 128 // debe colocarse la barra al final de la ruta 129 private static final String SERVER_UPLOAD_LOCATION_FOLDER = "/tmp/murachi/";130 //private static final String SERVER_UPLOAD_LOCATION_FOLDER = "/var/lib/tomcat7/murachiWorkingDirectory/";129 //private static final String SERVER_UPLOAD_LOCATION_FOLDER = "/tmp/murachi/"; 130 private static final String SERVER_UPLOAD_LOCATION_FOLDER = "/var/lib/tomcat7/murachiWorkingDirectory/"; 131 131 132 132 private static final String SHA256_MESSAGE_DIGEST = "SHA256"; … … 276 276 if (uploadedInputStream == null) { 277 277 System.out.println("uploadedInputStream == null"); 278 logger.error("uploadedInputStream != null. datos recibidos del formulario son nulos.");278 logger.error("uploadedInputStream == null. datos recibidos del formulario son nulos."); 279 279 //throw new MurachiException("uploadedInputStream != null. datos recibidos del formulario son nulos."); 280 280 … … 1138 1138 System.out.println("Signed on: " + date_format.format(pkcs7.getSignDate().getTime())); 1139 1139 integrityMap.put("signedOn", date_format.format(pkcs7.getSignDate().getTime()).toString()); 1140 1140 /* 1141 1141 if (pkcs7.getTimeStampDate() != null) { 1142 1142 System.out.println("TimeStamp: " + date_format.format(pkcs7.getTimeStampDate().getTime())); … … 1157 1157 integrityMap.put("timeStampVerified", "null"); 1158 1158 } 1159 */ 1160 if (pkcs7.getTimeStampDate() != null) { 1161 System.out.println("TimeStamp: " + date_format.format(pkcs7.getTimeStampDate().getTime())); 1162 integrityMap.put("timeStamp", date_format.format(pkcs7.getTimeStampDate().getTime()).toString()); 1163 //TimeStampToken ts = pkcs7.getTimeStampToken(); 1164 //System.out.println("TimeStamp service: " + ts.getTimeStampInfo().getTsa()); 1165 //integrityMap.put("timeStampService", ts.getTimeStampInfo().getTsa().toString()); 1166 System.out.println("Timestamp verified? " + pkcs7.verifyTimestampImprint()); 1167 integrityMap.put("timeStampVerified", Boolean.toString(pkcs7.verifyTimestampImprint())); 1168 }else{ 1169 System.out.println("TimeStamp: " + "null"); 1170 integrityMap.put("timeStamp", "null"); 1171 1172 //System.out.println("TimeStamp service: " + "null"); 1173 //integrityMap.put("timeStampService", "null"); 1174 1175 System.out.println("Timestamp verified?: " + "null"); 1176 integrityMap.put("timeStampVerified", "null"); 1177 } 1178 if (pkcs7.getTimeStampToken().getTimeStampInfo().getTsa() != null) { 1179 TimeStampToken ts = pkcs7.getTimeStampToken(); 1180 System.out.println("TimeStamp service: " + ts.getTimeStampInfo().getTsa()); 1181 integrityMap.put("timeStampService", ts.getTimeStampInfo().getTsa().toString()); 1182 }else{ 1183 System.out.println("TimeStamp service: " + "null"); 1184 integrityMap.put("timeStampService", "null"); 1185 } 1186 1159 1187 1160 1188 System.out.println("Location: " + pkcs7.getLocation()); … … 1703 1731 session.setAttribute("fileId", fileId); 1704 1732 1733 logger.debug("***** session: " + session.getId()); 1734 1735 1705 1736 presignHash.setHash(hashToSign); 1706 1737 presignHash.setError(""); … … 1943 1974 HttpSession session = req.getSession(false); 1944 1975 1976 logger.debug("***** session: " + session.getId()); 1977 1945 1978 if (session == null) { 1946 1979 // registrar error de firma en estadisticas … … 2176 2209 Container container = null; 2177 2210 2178 Configuration configuration = new Configuration(Configuration.Mode. PROD);2211 Configuration configuration = new Configuration(Configuration.Mode.TEST); 2179 2212 2180 2213 configuration.loadConfiguration(DIGIDOC4J_CONFIGURATION); … … 2236 2269 jsonSignatures.put("numberOfSignatures", numberOfSignatures); 2237 2270 2238 System.out.println(" ->container.validate()");2271 System.out.println("*********************->container.validate()"); 2239 2272 ValidationResult validationResult = container.validate(); 2240 System.out.println(" ...container.validate()");2273 System.out.println("*********************...container.validate()"); 2241 2274 2242 2275 … … 2315 2348 //Container container = null; 2316 2349 2317 Configuration configuration = new Configuration(Configuration.Mode. PROD);2350 Configuration configuration = new Configuration(Configuration.Mode.TEST); 2318 2351 2319 2352 configuration.loadConfiguration(DIGIDOC4J_CONFIGURATION); … … 2707 2740 Container container = null; 2708 2741 2709 Configuration configuration = new Configuration(Configuration.Mode. PROD);2742 Configuration configuration = new Configuration(Configuration.Mode.TEST); 2710 2743 2711 2744 configuration.loadConfiguration(DIGIDOC4J_CONFIGURATION); … … 3350 3383 Security.addProvider(new BouncyCastleProvider()); 3351 3384 3352 Configuration configuration = new Configuration(Configuration.Mode. PROD);3385 Configuration configuration = new Configuration(Configuration.Mode.TEST); 3353 3386 configuration.loadConfiguration(DIGIDOC4J_CONFIGURATION); 3354 3387 configuration.setTslLocation(DIGIDOC4J_TSL_LOCATION); … … 3454 3487 Container container = null; 3455 3488 3456 Configuration configuration = new Configuration(Configuration.Mode. PROD);3489 Configuration configuration = new Configuration(Configuration.Mode.TEST); 3457 3490 configuration.loadConfiguration(DIGIDOC4J_CONFIGURATION); 3458 3491 configuration.setTslLocation(DIGIDOC4J_TSL_LOCATION); … … 3574 3607 Container container = null; 3575 3608 3576 Configuration configuration = new Configuration(Configuration.Mode. PROD);3609 Configuration configuration = new Configuration(Configuration.Mode.TEST); 3577 3610 configuration.loadConfiguration(DIGIDOC4J_CONFIGURATION); 3578 3611 configuration.setTslLocation(DIGIDOC4J_TSL_LOCATION); … … 3712 3745 Security.addProvider(new BouncyCastleProvider()); 3713 3746 3714 Configuration configuration = new Configuration(Configuration.Mode. PROD);3747 Configuration configuration = new Configuration(Configuration.Mode.TEST); 3715 3748 configuration.loadConfiguration(DIGIDOC4J_CONFIGURATION); 3716 3749 configuration.setTslLocation(DIGIDOC4J_TSL_LOCATION); … … 3837 3870 Security.addProvider(new BouncyCastleProvider()); 3838 3871 3839 Configuration configuration = new Configuration(Configuration.Mode. PROD);3872 Configuration configuration = new Configuration(Configuration.Mode.TEST); 3840 3873 configuration.loadConfiguration(DIGIDOC4J_CONFIGURATION); 3841 3874 configuration.setTslLocation(DIGIDOC4J_TSL_LOCATION); … … 3936 3969 Security.addProvider(new BouncyCastleProvider()); 3937 3970 3938 Configuration configuration = new Configuration(Configuration.Mode. PROD);3971 Configuration configuration = new Configuration(Configuration.Mode.TEST); 3939 3972 configuration.loadConfiguration(DIGIDOC4J_CONFIGURATION); 3940 3973 configuration.setTslLocation(DIGIDOC4J_TSL_LOCATION); … … 4084 4117 Security.addProvider(new BouncyCastleProvider()); 4085 4118 4086 Configuration configuration = new Configuration(Configuration.Mode. PROD);4119 Configuration configuration = new Configuration(Configuration.Mode.TEST); 4087 4120 configuration.loadConfiguration(DIGIDOC4J_CONFIGURATION); 4088 4121 configuration.setTslLocation(DIGIDOC4J_TSL_LOCATION); … … 4370 4403 Container container = null; 4371 4404 4372 Configuration configuration = new Configuration(Configuration.Mode. PROD);4405 Configuration configuration = new Configuration(Configuration.Mode.TEST); 4373 4406 4374 4407 configuration.loadConfiguration(DIGIDOC4J_CONFIGURATION); … … 4422 4455 Container container = null; 4423 4456 4424 Configuration configuration = new Configuration(Configuration.Mode. PROD);4457 Configuration configuration = new Configuration(Configuration.Mode.TEST); 4425 4458 configuration.loadConfiguration(DIGIDOC4J_CONFIGURATION); 4426 4459 configuration.setTslLocation(DIGIDOC4J_TSL_LOCATION); … … 4651 4684 //Configuration configuration = initConfig(); // also need to re-initialize configuration settings 4652 4685 4653 Configuration configuration = new Configuration(Configuration.Mode. PROD);4686 Configuration configuration = new Configuration(Configuration.Mode.TEST); 4654 4687 configuration.loadConfiguration(DIGIDOC4J_CONFIGURATION); 4655 4688 configuration.setTslLocation(DIGIDOC4J_TSL_LOCATION); … … 4709 4742 4710 4743 // abrir el contenedor 4711 Configuration configuration = new Configuration(Configuration.Mode. PROD);4744 Configuration configuration = new Configuration(Configuration.Mode.TEST); 4712 4745 configuration.loadConfiguration(DIGIDOC4J_CONFIGURATION); 4713 4746 configuration.setTslLocation(DIGIDOC4J_TSL_LOCATION); … … 4786 4819 Container container = null; 4787 4820 4788 Configuration configuration = new Configuration(Configuration.Mode. PROD);4821 Configuration configuration = new Configuration(Configuration.Mode.TEST); 4789 4822 4790 4823 configuration.loadConfiguration(DIGIDOC4J_CONFIGURATION); … … 4811 4844 Container container = null; 4812 4845 4813 Configuration configuration = new Configuration(Configuration.Mode. PROD);4846 Configuration configuration = new Configuration(Configuration.Mode.TEST); 4814 4847 configuration.loadConfiguration(DIGIDOC4J_CONFIGURATION); 4815 4848 configuration.setTslLocation(DIGIDOC4J_TSL_LOCATION); … … 5184 5217 5185 5218 //Configuration configuration = initConfig(); // also need to re-initialize configuration settings 5186 Configuration configuration = new Configuration(Configuration.Mode. PROD);5219 Configuration configuration = new Configuration(Configuration.Mode.TEST); 5187 5220 configuration.loadConfiguration(DIGIDOC4J_CONFIGURATION); 5188 5221 configuration.setTslLocation(DIGIDOC4J_TSL_LOCATION); … … 5484 5517 //Configuration configuration = initConfig(); // also need to re-initialize configuration settings 5485 5518 5486 Configuration configuration = new Configuration(Configuration.Mode. PROD);5519 Configuration configuration = new Configuration(Configuration.Mode.TEST); 5487 5520 configuration.loadConfiguration("/tmp/digidoc4j.yaml"); 5488 5521 configuration.setTslLocation("file:///tmp/venezuela-tsl.xml"); … … 6011 6044 Security.addProvider(new BouncyCastleProvider()); 6012 6045 6013 Configuration configuration = new Configuration(Configuration.Mode. PROD);6046 Configuration configuration = new Configuration(Configuration.Mode.TEST); 6014 6047 6015 6048 configuration.loadConfiguration("/tmp/digidoc4j.yaml"); … … 6026 6059 container.setSignatureProfile(SignatureProfile.B_BES); 6027 6060 container.addDataFile("/tmp/salida.txt", "text/plain"); 6028 container.sign(new PKCS12Signer("/tmp/ tibisay.p12", "123456".toCharArray()));6061 container.sign(new PKCS12Signer("/tmp/ayzarra.p12", "ayzarra".toCharArray())); 6029 6062 // Container container = Container.open("util/faulty/bdoc21-bad-nonce-content.bdoc"); 6030 6063 container.save("/tmp/signed.bdoc"); … … 6048 6081 Security.addProvider(new BouncyCastleProvider()); 6049 6082 6050 Configuration configuration = new Configuration(Configuration.Mode. PROD);6083 Configuration configuration = new Configuration(Configuration.Mode.TEST); 6051 6084 6052 6085 configuration.loadConfiguration(DIGIDOC4J_CONFIGURATION);
Note: See TracChangeset
for help on using the changeset viewer.