Update and cleanup common_environment.py

Author: vrutkovs

ctf_cli/common_environment_content.py

@@ -11,6 +11,7 @@
 import inspect
 import copy
 
+
 def _invoke_other_environment_hooks(*args):
     # we need a copy of current frame becase it will change
     frame_globals = copy.copy(inspect.currentframe().f_globals)
@@ -47,89 +48,109 @@ def open_file(path):
                 ret_file = open(value['dest'])
                 return ret_file
             except KeyError:
-                print ("ansible output: {0}".format(ret))
+                print("ansible output: {0}".format(ret))
                 raise Exception(value['msg'])
     context.open_file = open_file
 
     def run(command):
-        logging.debug("Running '%s'" % command)
+        if '{{' in command:
+            command = command.replace("{{", "{{ '{{").replace("}}", "}}' }}")
+        logging.info("Running '%s'" % command)
         context.result = ansible.runner.Runner(
-            module_name='shell',
+            module_name="shell",
             inventory=inventory,
             module_args="{0} chdir={1}".format(command, remote_dir)
         ).run()
-        passed = True
         # dark means not responding
         if context.result['dark']:
-            passed = False
-            print("dark")
             print(context.result)
         if not context.result['contacted']:
-            passed = False
-            print ("no contacted hosts")
+            print("no contacted hosts")
         for host, values in context.result['contacted'].iteritems():
             if values['rc'] != 0:
                 print("On {0} returned {1}".format(host, values['rc']))
                 print("stderr: {0}".format(values['stderr']))
                 print("cmd: {0}".format(values['cmd']))
                 assert False
+            logging.info('stdout:\\n%s' % values['stdout'])
+            if values['stderr']:
+                logging.info('stderr\\n:%s' % values['stderr'])
             return values['stdout']
     context.run = run
 
-    # copy dockerfile
-    dockerfile = context.config.userdata['DOCKERFILE']
-    dockerfile_dir = os.path.dirname(dockerfile)
-    # create remote directory
-    ansible.runner.Runner(
-        module_name='file',
-        inventory=inventory,
-        module_args='dest={0} state=directory'.format(remote_dir)
-        ).run()
-    # copy dockerfile
-    ansible.runner.Runner(
-        module_name='copy',
-        inventory=inventory,
-        module_args='src={0} dest={1}'.format(dockerfile, remote_dir)
-        ).run()
-    # copy files from dockerfile
-    f_in = open(dockerfile)
-    for path in re.findall('(?:ADD|COPY) ([^ ]+) ', f_in.read()):
-        for glob_path in glob.glob(os.path.join(dockerfile_dir,path)):
-            # TODO Is there a nicer way to keep permissions?
+    def copy_dockerfile():
+
+        try:
+            # copy dockerfile
+            dockerfile = context.config.userdata['DOCKERFILE']
+            dockerfile_dir = os.path.dirname(dockerfile)
+            # create remote directory
+            ansible.runner.Runner(
+                module_name='file',
+                inventory=inventory,
+                module_args='dest={0} state=directory'.format(remote_dir)
+                ).run()
+            # copy dockerfile
             ansible.runner.Runner(
                 module_name='copy',
                 inventory=inventory,
-                module_args='src={0} dest={1} directory_mode mode={2}'.format(glob_path, remote_dir,
-                    oct(stat.S_IMODE(os.stat(glob_path).st_mode)))
-            ).run()
+                module_args='src={0} dest={1}'.format(dockerfile, remote_dir)
+                ).run()
+            # copy files from dockerfile
+            f_in = open(dockerfile)
+            for path in re.findall('(?:ADD|COPY) ([^ ]+) ', f_in.read()):
+                for glob_path in glob.glob(os.path.join(dockerfile_dir, path)):
+                    # TODO Is there a nicer way to keep permissions?
+                    ansible.runner.Runner(
+                        module_name='copy',
+                        inventory=inventory,
+                        module_args='src={0} dest={1} directory_mode mode={2}'.format(
+                            glob_path, remote_dir,
+                            oct(stat.S_IMODE(os.stat(glob_path).st_mode)))
+                    ).run()
+        except Exception as e:
+            logging.warning("copy_dockerfile:%s" % e)
+
+    copy_dockerfile()
 
     # build image if not exist
     try:
         context.image = context.config.userdata['IMAGE']
+        run('docker pull {0}'.format(context.image))
+    except AssertionError:
+        pass
     except KeyError:
         context.image = 'ctf'
-        run('docker build -t {0} .'.format(context.image))
+        try:
+            run('docker build -t {0} .'.format(context.image))
+        except AssertionError:
+            pass
 
     cid_file_name = re.sub(r'\W+', '', context.image)
     context.cid_file = "/tmp/%s.cid" % cid_file_name
 
+
 def after_scenario(context, scenario):
-    _invoke_other_environment_hooks(context ,scenario)
+    _invoke_other_environment_hooks(context, scenario)
     try:
         if context.config.userdata['KEEP_CONTAINER_AFTER_TEST']:
             return
-    except KeyError, e:
+    except KeyError as e:
         pass
 
     try:
         cid = context.run('cat %s' % context.cid_file)
-    except AssertionError, e:
-        logging.debug("before_scenario: {0}".format(e))
+    except AssertionError as e:
+        logging.info("before_scenario: {0}".format(e))
         return
     if cid:
-        context.run("docker stop %s" % cid)
-        context.run("docker kill %s" % cid)
-        context.run("docker rm %s" % cid)
+        context.run("docker logs %s" % cid)
+        try:
+            context.run("docker stop %s" % cid)
+            context.run("docker kill %s" % cid)
+            context.run("docker rm -v %s" % cid)
+        except AssertionError:
+            pass
         if hasattr(context, 'cid'):
             del context.cid
         context.run('rm {0}'.format(context.cid_file))
@@ -138,4 +159,4 @@ def after_scenario(context, scenario):
 def after_all(context):
     _invoke_other_environment_hooks(context)
     if hasattr(context, 'temp_dir'):
-        shutil.rmtree(context.temp_dir) #FIXME catch exception
+        shutil.rmtree(context.temp_dir)  # FIXME catch exception