# 1.3.5

+ updated aliases (added args and kwargs)

Author: gfelber

Makefile

@@ -11,15 +11,16 @@ test :
 		source ./venv/bin/activate; \
 	fi; \
 	cd test; \
-	mkdir bin 2> /dev/null; \
+	mkdir -p bin; \
 	gcc sysinfo.c -o bin/sysinfo; \
+	gcc sysinfo.c -static -o bin/sysinfo_stat; \
 	vagd clean; \
 	echo STARTING TEST; \
 	if python ./test.py GDB; then \
-    	echo "successful"; \
-    else \
-    	echo "test unsuccessful, pls fix"; \
-    fi;
+		echo "successful"; \
+	else \
+		echo "test unsuccessful, pls fix"; \
+	fi;
 
 clean:
 	rm -r build dist src/*.egg-info || true

pyproject.toml

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

src/vagd/res/aliases.txt

@@ -1,7 +1,9 @@
-linfo = lambda x: log.info(x)
-lwarn = lambda x: log.warn(x)
-lerror = lambda x: log.error(x)
-lprog = lambda x: log.progress(x)
+cst = constants
+
+linfo = lambda x, *a: log.info(x, *a)
+lwarn = lambda x, *a: log.warn(x, *a)
+lerror = lambda x, *a: log.error(x, *a)
+lprog = lambda x, *a: log.progress(x, *a)
 
 byt = lambda x: x if isinstance(x, bytes) else x.encode() if isinstance(x, str) else repr(x).encode()
 phex = lambda x, y='': print(y + hex(x))
@@ -23,14 +25,16 @@ cto = lambda x: cyc(cfd(x))
 
 t = None
 gt = lambda at=None: at if at else t
-sl = lambda x, t=None: gt(t).sendline(byt(x))
-se = lambda x, t=None: gt(t).send(byt(x))
-sla = lambda x, y, t=None: gt(t).sendlineafter(byt(x), byt(y))
-sa = lambda x, y, t=None: gt(t).sendafter(byt(x), byt(y))
-ra = lambda t=None: gt(t).recvall()
-rl = lambda t=None: gt(t).recvline()
-rls = lambda t=None: rl(t)[:-1]
-re = lambda x, t=None: gt(t).recv(x)
-ru = lambda x, t=None: gt(t).recvuntil(byt(x))
-it = lambda t=None: gt(t).interactive()
-cl = lambda t=None: gt(t).close()
+sl = lambda x, t=None, *a, **kw: gt(t).sendline(byt(x), *a, **kw)
+se = lambda x, t=None, *a, **kw: gt(t).send(byt(x), *a, **kw)
+ss = lambda x, s, t=None, *a, **kw: sl(x, t, *a, **kw) if len(y) < s else se(x, *a, **kw)
+sla = lambda x, y, t=None, *a, **kw: gt(t).sendlineafter(byt(x), byt(y), *a, **kw)
+sa = lambda x, y, t=None, *a, **kw: gt(t).sendafter(byt(x), byt(y), *a, **kw)
+sas = lambda x, y, s, t=None, *a, **kw: sla(x, y, t, *a, **kw) if len(y) < s else sa(x, y, *a, **kw)
+ra = lambda t=None, *a, **kw: gt(t).recvall(*a, **kw)
+rl = lambda t=None, *a, **kw: gt(t).recvline(*a, **kw)
+rls = lambda t=None, *a, **kw: rl(t=t, *a, **kw)[:-1]
+re = lambda x, t=None, *a, **kw: gt(t).recv(x, *a, **kw)
+ru = lambda x, t=None, *a, **kw: gt(t).recvuntil(byt(x), *a, **kw)
+it = lambda t=None, *a, **kw: gt(t).interactive(*a, **kw)
+cl = lambda t=None, *a, **kw: gt(t).close(*a, **kw)

test/test.py

@@ -1,11 +1,11 @@
-#!/bin/python
+#!/bin/env python3
 import os
 
 from pwn import *
 import vagd.virts.pwngd
 from vagd import Vagd, Qegd, Shgd, Dogd, Logd, wrapper, Box
 
-GDB_OFF = 0x555555555000
+GDB_OFF = 0x555555554000
 IP = ''
 PORT = 0
 BINARY = './bin/sysinfo'
@@ -69,37 +69,38 @@ def virts():
         os.system("vagd clean")
 
 
-    if os.path.exists(Dogd.LOCKFILE):
-        os.remove(Dogd.LOCKFILE)
-    log.info("Testing Docker for Ubuntu")
-    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 + "_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()
-
-    os.system("vagd clean")
-    log.info("Testing Docker for Alpine")
-    vm = Dogd(exe.path + "_stat", image=Box.DOCKER_ALPINE_316, tmp=True, ex=True, fast=True)
-    assert vm.is_new, "vm should be new"
-    yield vm
-    vm._ssh.close()
-
-    log.info("Testing Docker for Alpine restore")
-    vm = Dogd(exe.path + "_stat", image=Box.DOCKER_ALPINE_316, tmp=True, ex=True, fast=True)
-    assert not vm.is_new, "vm shouldn't be new, restored"
-    yield vm
-    vm._ssh.close()
-
-    os.system("vagd clean")
+    if not args.NODOGD:
+      if os.path.exists(Dogd.LOCKFILE):
+          os.remove(Dogd.LOCKFILE)
+      log.info("Testing Docker for Ubuntu")
+      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 + "_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()
+
+      os.system("vagd clean")
+      log.info("Testing Docker for Alpine")
+      vm = Dogd(exe.path + "_stat", image=Box.DOCKER_ALPINE_316, tmp=True, ex=True, fast=True)
+      assert vm.is_new, "vm should be new"
+      yield vm
+      vm._ssh.close()
+
+      log.info("Testing Docker for Alpine restore")
+      vm = Dogd(exe.path + "_stat", image=Box.DOCKER_ALPINE_316, tmp=True, ex=True, fast=True)
+      assert not vm.is_new, "vm shouldn't be new, restored"
+      yield vm
+      vm._ssh.close()
+
+      os.system("vagd clean")
     log.info("Testing Qemu")
-    vm = Qegd(exe.path + "_stat", img=Box.QEMU_NOBLE, tmp=True, packages=['cowsay'], ex=True, fast=True, detach=True)
+    vm = Qegd(exe.path + "_stat", img=Box.QEMU_NOBLE, tmp=True, packages=['cowsay'], ex=True, fast=True)
     assert vm.is_new, "vm should be new"
     assert vm._ssh.which('cowsay'), "cowsay wasn't installed"
     yield vm