# 1.3.4

+ removed separate local template
+ fixed dogd hash
+ updated test script

Author: gfelber

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "vagd"
-version = "1.3.3"
+version = "1.3.4"
 authors = [
   { name="0x6fe1be2"},
 ]

src/vagd/cli.py

@@ -16,14 +16,14 @@
 from vagd.virts.vagd import Vagd
 
 DOGD_BOX = "Box.DOCKER_JAMMY"
-DOGD = "vm = Dogd(exe.path, image={box}, {args})  # Docker"
+DOGD = "vm = Dogd(BINARY, image={box}, {args})  # Docker"
 QEGD_BOX = "Box.QEMU_JAMMY"
-QEGD = "vm = Qegd(exe.path, img={box}, {args})  # Qemu"
-SHGD = "vm = Shgd(exe.path, user='user', host='localhost', port=22, {args})  # SSH"
+QEGD = "vm = Qegd(BINARY, img={box}, {args})  # Qemu"
+SHGD = "vm = Shgd(BINARY, user='user', host='localhost', port=22, {args})  # SSH"
 
 # deprecated
 VAGD_BOX = "Box.VAGRANT_JAMMY64"
-VAGD = "vm = Vagd(exe.path, {box}, {args})  # Vagrant"
+VAGD = "vm = Vagd(BINARY, {box}, {args})  # Vagrant"
 
 app = typer.Typer(context_settings={"help_option_names": ["-h", "--help"]})
 
@@ -107,7 +107,7 @@ def template(
     templatePath = os.path.dirname(os.path.realpath(__file__))
     templateChunks = []
     aliasesPath = templatePath + "/res/aliases.txt"
-    templatePath += '/res/local_template.txt' if local else '/res/template.txt'
+    templatePath += '/res/template.txt'
     multi = False
     if not any((dogd, qegd, vagd, shgd)):
         dogd = qegd = True
@@ -166,6 +166,7 @@ def template(
                                                   env=env,
                                                   libc=libc,
                                                   aslr=aslr,
+                                                  is_local=True if local else 'args.LOCAL',
                                                   dependencies=', '.join(dependencies),
                                                   vms=('\n' + ' ' * 4).join(vms))
 

src/vagd/res/local_template.txt

@@ -6,7 +6,7 @@ IP = '{ip}'
 PORT = {port}
 BINARY = '{binary}'
 ARGS = []
-ENV = {env}
+ENV = {env} # os.environ
 GDB = f"""
 set follow-fork-mode parent
 
@@ -26,10 +26,10 @@ def get_target(**kw):
     # context.log_level = 'debug'
     return remote(IP, PORT)
 
-  if args.LOCAL:
+  if {is_local}:
     if args.GDB:
-      return gdb.debug([exe.path] + ARGS, env=ENV, gdbscript=GDB, **kw)
-    return process([exe.path] + ARGS, env=ENV, **kw)
+      return gdb.debug([BINARY] + ARGS, env=ENV, gdbscript=GDB, **kw)
+    return process([BINARY] + ARGS, env=ENV, **kw)
 
   try:
     from vagd import {dependencies}, Box # only load vagd if needed

src/vagd/res/template.txt

@@ -117,7 +117,7 @@ def _build_image(self):
         helper.info('building docker image')
         hash = self._image.find('@')
         if hash != -1:
-            tag = self._image[:min(self._image[:hash].find(':'), hash)]
+            tag = self._image[:hash]
             # add first 8 characters of hash
             tag += self._image[self._image.rfind(':'):][:8]
         else:

src/vagd/virts/dogd.py

@@ -72,14 +72,14 @@ def virts():
     if os.path.exists(Dogd.LOCKFILE):
         os.remove(Dogd.LOCKFILE)
     log.info("Testing Docker for Ubuntu")
-    vm = Dogd(exe.path, image=Box.DOCKER_NOBLE, packages=['cowsay'], tmp=True, ex=True, fast=True)
+    vm = Dogd(exe.path + "_stat", image=Box.DOCKER_NOBLE, packages=['cowsay'], tmp=True, ex=True, fast=True)
     assert vm.is_new, "vm should be new"
     assert vm._ssh.which('cowsay'), "cowsay wasn't installed"
     yield vm
     vm._ssh.close()
 
     log.info("Testing Docker for Ubuntu restore")
-    vm = Dogd(exe.path, image=Box.DOCKER_NOBLE, tmp=True, ex=True, fast=True)
+    vm = Dogd(exe.path + "_stat", image=Box.DOCKER_NOBLE, tmp=True, ex=True, fast=True)
     assert not vm.is_new, "vm shouldn't be new, restored"
     yield vm
     vm._ssh.close()
@@ -99,22 +99,22 @@ def virts():
 
     os.system("vagd clean")
     log.info("Testing Qemu")
-    vm = Qegd(exe.path, img=Box.QEMU_NOBLE, tmp=True, packages=['cowsay'], ex=True, fast=True)
+    vm = Qegd(exe.path + "_stat", img=Box.QEMU_NOBLE, tmp=True, packages=['cowsay'], ex=True, fast=True, detach=True)
     assert vm.is_new, "vm should be new"
     assert vm._ssh.which('cowsay'), "cowsay wasn't installed"
     yield vm
     vm._ssh.close()
 
     log.info("Testing Qemu restore")
-    vm = Qegd(exe.path, img=Box.QEMU_NOBLE, tmp=True, ex=True, fast=True)
+    vm = Qegd(exe.path + "_stat", img=Box.QEMU_NOBLE, tmp=True, ex=True, fast=True)
     assert not vm.is_new, "vm shouldn't be new, restored"
     yield vm
     vm._ssh.close()
     user = vm._user
     port = vm._port
 
     log.info("Testing SSH")
-    yield Shgd(exe.path, user=user, port=port, keyfile=vm._ssh.keyfile, tmp=True, ex=True, fast=True)
+    yield Shgd(exe.path + "_stat", user=user, port=port, keyfile=vm._ssh.keyfile, tmp=True, ex=True, fast=True)
 
 
 for virt in virts():