Added option to remove temporary certs on start.

scottgl9 · May 22, 2017 · 61d08d6 · 61d08d6
1 parent 15482c4
commit 61d08d6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/ProxyRewrite.py b/ProxyRewrite.py
@@ -64,6 +64,7 @@ class ProxyRewrite:
     usejbca = False
     unique_log_dir = False
     use_rewrite_pubkey = False
+    remove_certs = False
     changeClientID = False
     changePushToken = False
     changeBackupDeviceUUID = False
@@ -1218,8 +1219,10 @@ def decode_escrowproxy_record(body):
         if 'SecureBackupStableMetadata' in metaplist:
             escrowkey = metaplist['SecureBackupStableMetadata']['EscrowKey']
             print("EscrowKey = %s" % binascii.hexlify(escrowkey))
-        print("BackupKeybagDigest = %s" % binascii.hexlify(metaplist['BackupKeybagDigest']))
-
+            ProxyRewrite.add_info_summary('EscrowKey', binascii.hexlify(escrowkey))
+        backupkeybagdigest = binascii.hexlify(metaplist['BackupKeybagDigest'])
+        print("BackupKeybagDigest = %s" % backupkeybagdigest)
+        ProxyRewrite.add_info_summary('BackupKeybagDigest', backupkeybagdigest)
 
     # add / update info parsed from requests/responses to logs/summary.plist
     @staticmethod

diff --git a/proxy2.py b/proxy2.py
@@ -814,6 +814,7 @@ def test(HandlerClass=ProxyRequestHandler, ServerClass=ThreadingHTTPServer, prot
     if config.has_option('proxy2', 'usejbca'): ProxyRewrite.usejbca = config.getboolean('proxy2', 'usejbca')
     if config.has_option('proxy2', 'unique_log_dir'): ProxyRewrite.unique_log_dir = config.getboolean('proxy2', 'unique_log_dir')
     if config.has_option('proxy2', 'use_rewrite_pubkey'): ProxyRewrite.use_rewrite_pubkey = config.getboolean('proxy2', 'use_rewrite_pubkey')
+    if config.has_option('proxy2', 'remove_certs'): ProxyRewrite.remove_certs = config.getboolean('proxy2', 'remove_certs')
     ProxyRewrite.changeClientID = config.getboolean('proxy2', 'change_clientid')
     ProxyRewrite.changeBackupDeviceUUID = config.getboolean('proxy2', 'change_backupdeviceuuid')
     ProxyRewrite.rewriteOSVersion = config.getboolean('proxy2', 'rewrite_osversion')