Improve logging file

cme/cli.py

@@ -51,7 +51,6 @@ def gen_cli_args():
     std_parser.add_argument("-p", metavar="PASSWORD", dest='password', nargs='+', default=[], help="password(s) or file(s) containing passwords")
     std_parser.add_argument("-k", "--kerberos", action='store_true', help="Use Kerberos authentication")
     std_parser.add_argument("--use-kcache", action='store_true', help="Use Kerberos authentication from ccache file (KRB5CCNAME)")
-    std_parser.add_argument("--export", metavar="EXPORT", nargs='+', help="Export result into a file, probably buggy")
     std_parser.add_argument("--aesKey",  metavar="AESKEY", nargs='+', help="AES key to use for Kerberos Authentication (128 or 256 bits)")
     std_parser.add_argument("--kdcHost", metavar="KDCHOST", help="FQDN of the domain controller. If omitted it will use the domain part (FQDN) specified in the target parameter")
 

cme/connection.py

@@ -50,7 +50,6 @@ class connection(object):
         self.kerberos = True if self.args.kerberos or self.args.use_kcache else False
         self.aesKey = None if not self.args.aesKey else self.args.aesKey
         self.kdcHost = None if not self.args.kdcHost else self.args.kdcHost
-        self.export = None if not self.args.export else self.args.export
         self.use_kcache = None if not self.args.use_kcache else self.args.use_kcache
         self.failed_logins = 0
         self.local_ip = None
@@ -111,9 +110,6 @@ class connection(object):
                 if v is not False and v is not None:
                     logging.debug('Calling {}()'.format(k))
                     r = getattr(self, k)()
-                    if self.export:
-                        r2 = str(r).replace("'", '"')
-                        write_log(str(r2), self.export[0])
 
     def call_modules(self):
         module_logger = CMEAdapter(extra={

cme/first_run.py

@@ -80,6 +80,7 @@ def first_run_setup(logger):
             config.get('CME', 'pwn3d_label')
             config.get('CME', 'audit_mode')
             config.get('BloodHound', 'bh_enabled')
+            config.get('CME', 'log_mode')
         except (NoSectionError, NoOptionError):
             logger.info('Old configuration file detected, replacing with new version')
             default_path = os.path.join(os.path.dirname(cme.__file__), 'data', 'cme.conf')

cme/logger.py

@@ -113,10 +113,11 @@ class CMEAdapter(logging.LoggerAdapter):
     def setup_logfile(self):
         formatter = logging.Formatter("%(message)s")
         self.outputfile = init_log_file()
-        open(self.outputfile, 'x')
+        if not os.path.isfile(self.outputfile):
+            open(self.outputfile, 'x')
         fileHandler = logging.FileHandler(filename=self.outputfile, mode="a")
         with fileHandler._open() as f:
-            f.write("> %s\n\n" % " ".join(sys.argv))
+            f.write("\n> %s\n\n" % " ".join(sys.argv))
         fileHandler.setFormatter(formatter)
         self.logger.addHandler(fileHandler)
 
@@ -146,5 +147,5 @@ def setup_logger(level=logging.INFO, logger_name='CME'):
     return cme_logger
 
 def init_log_file():
-    log_filename = os.path.join(os.path.expanduser('~/.cme'), 'logs','full-log_{}.log'.format(datetime.now().strftime('%Y-%m-%d_%H-%M-%S')))
+    log_filename = os.path.join(os.path.expanduser('~/.cme'), 'logs','full-log_{}.log'.format(datetime.now().strftime('%Y-%m-%d')))
     return log_filename