Log decrypted response

* add log4j.properties and remove log4j.xml
* scrape the logfile for decrypted soap response
* update java to set log filename dynamically
* fix log4j warning by including lib
* uncomment handle_response and clean it up

Author: llimllib

lib/log4j.properties

@@ -0,0 +1,7 @@
+log4j.rootCategory=DEBUG, R
+log4j.appender.R=org.apache.log4j.RollingFileAppender
+log4j.appender.R.File=${logfilename}
+log4j.appender.R.MaxFileSize=100KB
+log4j.appender.R.MaxBackupIndex=1
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=[%t:%p] %c: %m%n

lib/log4j.xml

@@ -13,6 +13,7 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 
 import java.util.List;
+import java.util.Properties;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.io.IOException;
@@ -27,14 +28,16 @@ public static void main(String[] args)
   {
     try 
     {
+      System.setProperty("logfilename", args[2]);
+
       List<String> lines = Files.readAllLines(Paths.get(args[0]), Charset.defaultCharset());
       String encrypted_xml = "";
       for (String line : lines)
       {
         encrypted_xml += line;
       }
 
-      String document = decrypt(encrypted_xml);
+      String document = decrypt(encrypted_xml, args[1]);
       System.out.println(document);
     }
     catch (Exception e)
@@ -53,12 +56,35 @@ public static Document getSOAPDoc(String document) throws Exception
     return doc;
   }
 
-  public static String decrypt(String encryptedXml) throws Exception {
-    Crypto crypto = CryptoFactory.getInstance();
+  public static Crypto getSigningCrypto(String keyfile) throws Exception {
+    Properties properties = new Properties();
+    properties.setProperty("org.apache.ws.security.crypto.provider", "org.apache.ws.security.components.crypto.Merlin");
+    properties.setProperty("org.apache.ws.security.crypto.merlin.keystore.file", keyfile);
+    properties.setProperty("org.apache.ws.security.crypto.merlin.keystore.password", "importkey");
+    properties.setProperty("org.apache.ws.security.crypto.merlin.keystore.private.password", "importkey");
+    properties.setProperty("org.apache.ws.security.crypto.merlin.keystore.alias", "vbms_server_key");
+
+    return CryptoFactory.getInstance(properties);
+  }
+
+  public static Crypto getDecryptionCrypto(String keyfile) throws Exception {
+    Properties properties = new Properties();
+    properties.setProperty("org.apache.ws.security.crypto.provider", "org.apache.ws.security.components.crypto.Merlin");
+    properties.setProperty("org.apache.ws.security.crypto.merlin.keystore.file", keyfile);
+    properties.setProperty("org.apache.ws.security.crypto.merlin.keystore.password", "importkey");
+    properties.setProperty("org.apache.ws.security.crypto.merlin.keystore.private.password", "importkey");
+
+    return CryptoFactory.getInstance(properties);
+  }
+
+  public static String decrypt(String encryptedXml, String keyfile) throws Exception {
+    Crypto signCrypto = getSigningCrypto(keyfile);
+    Crypto deCrypto = getDecryptionCrypto(keyfile);
     CallbackHandler handler = new WSSCallbackHandler();
     WSSecurityEngine secEngine = new WSSecurityEngine();
+
     Document doc = getSOAPDoc(encryptedXml);
-    java.util.List<WSSecurityEngineResult> results = secEngine.processSecurityHeader(doc, null, handler, crypto, crypto);
+    java.util.List<WSSecurityEngineResult> results = secEngine.processSecurityHeader(doc, null, handler, signCrypto, deCrypto);
     return XMLUtils.PrettyDocumentToString(doc);
   }
 

src/main/java/DecryptMessage.java

@@ -27,6 +27,8 @@ public class UploadDocumentWithAssociations
 {
   public static void main(String[] args)
   {
+    System.setProperty("logfilename", "../log/upload.log");
+
     Properties properties = new Properties();
     properties.setProperty("org.apache.ws.security.crypto.provider", "org.apache.ws.security.components.crypto.Merlin");
     properties.setProperty("org.apache.ws.security.crypto.merlin.keystore.file", args[1]);

src/main/java/UploadDocumentWithAssociations.java

@@ -75,7 +75,7 @@ def upload_doc(options)
     file = prepare_xml(options[:pdf], options[:file_number], options[:received_dt], options[:first_name], options[:middle_name], options[:last_name], options[:exam_name])
     encrypted_xml = prepare_upload(file, env)
     response = send_document(encrypted_xml, env, options)
-    #handle_response(response)
+    puts handle_response(response, env, options)
   rescue Exception => e
     puts e.backtrace
     log(e.backtrace)
@@ -210,23 +210,25 @@ def get_soap(txt)
   XML::Parser.string(soap).parse
 end
 
-def handle_response(response)
+def handle_response(response, env, options)
   doc = get_soap(response)
   log("Response from VBMS:\n#{doc.to_s}")
 
   soap = "http://schemas.xmlsoap.org/soap/envelope/"
   if doc.find_first("//soap:Fault", soap)
-    $stderr.write("Received error from VBMS:\n#{soap.to_s}\nCheck logfile in #{$logfile}")
+    $stderr.write("Received error from VBMS:\n#{doc.to_s}\nCheck logfile in #{$logfile}\n")
     exit
   end
 
-  file = write_tempfile(soap.to_s)
+  file = write_tempfile(doc.to_s)
 
   # now here's the hackiest thing in the world. This command is going to fail,
   # because we can't get the signatures to properly get decrypted. So run the
   # command, handle the error, and pull the message out of the file >:|
-  sh "java -classpath '../classes:../lib/*' DecryptMessage", true
+  fname = rel("../log/#{options[:file_number]}.decrypt.log")
+  sh "java -classpath '../classes:../lib/*:../lib' DecryptMessage #{file.path} #{env[:keyfile]} '#{fname}'", true
 
+  File.read(fname).match(/<soap.*?<\/soap.*?>/)[0]
 end
 
 def parse(args)
@@ -286,4 +288,4 @@ def parse(args)
 end
 
 options = parse(ARGV)
-upload_doc(options)
+upload_doc(options)