1.6.0 libc-dbg without upgrade

+ fixed #8, prevent libc upgrades with debug symbols
+ added some more type hinting
+ now using apt instead of apt-get

Author: gfelber

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "vagd"
-version = "1.5.8"
+version = "1.6.0"
 authors = [{ name = "0x6fe1be2" }]
 description = "VirtuAlization GDb integrations in pwntools"
 readme = "README.md"

src/vagd/templates.py

@@ -9,15 +9,23 @@
 
 end"""
 
+LOCK_PACKAGES = """
+ADD https://raw.githubusercontent.com/reproducible-containers/repro-sources-list.sh/v0.1.4/repro-sources-list.sh \
+    /usr/local/bin/repro-sources-list.sh
+RUN bash /usr/local/bin/repro-sources-list.sh
+"""
 
 DOCKER_TEMPLATE = """FROM {image}
 
 USER root
 
+{lock}
+
 # install packages
 ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get update
-RUN apt-get install -y {packages}
+RUN apt update
+RUN apt install -y {packages}
+RUN apt clean && rm -rf /var/lib/apt/lists/*
 
 # init user and ssh
 EXPOSE 22

src/vagd/virts/dogd.py

@@ -1,5 +1,5 @@
 import os
-from typing import Dict, List, Optional
+from typing import Dict, List, Optional, Any
 
 import docker
 
@@ -89,12 +89,12 @@ def __init__(
     user: str = DEFAULT_USER,
     forward: Optional[Dict[str, int]] = None,
     packages: Optional[List[str]] = None,
-    symbols=True,
-    rm=True,
+    symbols: bool = True,
+    rm: bool = True,
     ex: bool = False,
     fast: bool = False,
     alpine: bool = False,
-    **kwargs,
+    **kwargs: Any,
   ):
     self._image = image
     self._name = Dogd.VAGD_PREFIX + os.path.basename(binary)
@@ -152,6 +152,7 @@ def _create_dockerfile(self):
       dockerfile.write(
         template.format(
           image=self._image,
+          lock=templates.LOCK_PACKAGES if self._symbols else "",
           packages=" ".join(self._packages),
           user=self._user if self._user != "root" else Dogd.DEFAULT_USER,
           keyfile=os.path.basename(self._dockerdir + "keyfile.pub"),

src/vagd/virts/logd.py

@@ -1,4 +1,4 @@
-from typing import Iterable, Optional
+from typing import Iterable, Optional, Any
 
 import pwnlib.args
 import pwnlib.tubes
@@ -28,7 +28,7 @@ def _ssh_setup(self) -> None:
     """
     helper.error("NOT IMPLEMENTED")
 
-  def __init__(self, binary: str, **kwargs):
+  def __init__(self, binary: str, **kwargs: Any):
     """
     :param binary: binary to execute
     """
@@ -70,15 +70,17 @@ def put(self, file: str, remote: Optional[str] = None):
     """
     helper.error("NOT IMPLEMENTED")
 
-  def debug(self, **kwargs) -> pwnlib.tubes.process.process:
+  def debug(self, **kwargs: Any) -> pwnlib.tubes.process.process:
     """
     run binary with gdb locally
     :param kwargs: pwntool arguments
     :rtype: pwnlib.tubes.process.process
     """
     return self.pwn_debug(**kwargs)
 
-  def pwn_debug(self, argv: Optional[list[str]] = None, **kwargs) -> pwnlib.tubes.process.process:
+  def pwn_debug(
+    self, argv: Optional[list[str]] = None, **kwargs: Any
+  ) -> pwnlib.tubes.process.process:
     """
     run binary with gdb locally
     :param argv: comandline arguments for binary
@@ -87,7 +89,9 @@ def pwn_debug(self, argv: Optional[list[str]] = None, **kwargs) -> pwnlib.tubes.
     """
     return pwnlib.gdb.debug([self._binary] + argv, **kwargs)
 
-  def process(self, argv: Optional[list[str]] = None, **kwargs) -> pwnlib.tubes.process.process:
+  def process(
+    self, argv: Optional[list[str]] = None, **kwargs: Any
+  ) -> pwnlib.tubes.process.process:
     """
     run binary locally
     :param argv: comandline arguments for binary
@@ -101,7 +105,7 @@ def start(
     argv: Optional[list[str]] = None,
     gdbscript: str = "",
     api: bool = False,
-    **kwargs,
+    **kwargs: Any,
   ) -> pwnlib.tubes.process.process:
     """
     start binary locally and return pwnlib.tubes.process.process

src/vagd/virts/pwngd.py

@@ -1,7 +1,7 @@
 import os
 from abc import ABC, abstractmethod
 from shutil import which
-from typing import Iterable, List, Union, Optional
+from typing import Iterable, List, Union, Optional, Any
 
 import pwnlib.args
 import pwnlib.filesystem
@@ -237,7 +237,7 @@ def debug(
     gdbscript: str = "",
     sysroot: Optional[str] = None,
     sysroot_debug: Optional[str] = None,
-    **kwargs,
+    **kwargs: Any,
   ) -> pwnlib.tubes.ssh.ssh_channel:
     """
     run binary in vm with gdb (pwnlib feature set)
@@ -281,7 +281,9 @@ def debug(
       **kwargs,
     )
 
-  def process(self, argv: Optional[list[str]] = None, **kwargs) -> pwnlib.tubes.ssh.ssh_channel:
+  def process(
+    self, argv: Optional[list[str]] = None, **kwargs: Any
+  ) -> pwnlib.tubes.ssh.ssh_channel:
     """
     run binary in vm as process
 
@@ -301,7 +303,7 @@ def start(
     sysroot: Optional[str] = None,
     sysroot_debug: Optional[str] = None,
     gdb_args: Optional[list[str]] = None,
-    **kwargs,
+    **kwargs: Any,
   ) -> pwnlib.tubes.ssh.ssh_channel:
     """
     start binary on remote and return pwnlib.tubes.process.process

src/vagd/virts/qegd.py

@@ -1,7 +1,7 @@
 import os
 import time
 from shutil import copyfile, which
-from typing import Dict, List, Optional
+from typing import Dict, List, Optional, Any
 from urllib.parse import urlparse
 from urllib.request import urlretrieve
 
@@ -121,7 +121,7 @@ def __init__(
     bios: Optional[str] = None,
     detach: bool = False,
     custom: str = "",
-    **kwargs,
+    **kwargs: Any,
   ):
     if not which(qemu):
       helper.error(qemu + " isn't installed")

src/vagd/virts/shgd.py

@@ -1,6 +1,7 @@
 import time
 
 import pwnlib.tubes.ssh
+from typing import Any
 
 from vagd import helper
 from vagd.virts.pwngd import Pwngd
@@ -87,7 +88,7 @@ def __init__(
     host: str = DEFAULT_HOST,
     port: int = DEFAULT_PORT,
     keyfile: str = Pwngd.KEYFILE,
-    **kwargs,
+    **kwargs: Any,
   ):
     """
 

src/vagd/virts/vagd.py

@@ -2,7 +2,7 @@
 import os
 import re
 from shutil import which
-from typing import List, Optional
+from typing import List, Optional, Any
 
 from vagd import helper, templates
 from vagd.box import Box
@@ -95,7 +95,7 @@ def __init__(
     vagrantfile: str = VAGRANTFILE_PATH,
     vbox: Optional[str] = None,
     packages: Optional[List[str]] = None,
-    **kwargs,
+    **kwargs: Any,
   ):
     """