upstreaming vagd, pwntools virtualization

CHANGELOG.md

@@ -88,6 +88,7 @@ The table below shows which release corresponds to each branch, and what date th
 - [#2405][2405] Add "none" ssh authentication method
 - [#2427][2427] Document behaviour of remote()'s sni argument as string.
 - [#2382][2382] added optional port, gdb_args and gdbserver_args parameters to gdb.debug()
+- [#2434][2434] upstreaming [vagd](https://github.com/gfelber/vagd) functionality #2434 
 
 [2360]: https://github.com/Gallopsled/pwntools/pull/2360
 [2356]: https://github.com/Gallopsled/pwntools/pull/2356
@@ -105,6 +106,7 @@ The table below shows which release corresponds to each branch, and what date th
 [2405]: https://github.com/Gallopsled/pwntools/pull/2405
 [2427]: https://github.com/Gallopsled/pwntools/pull/2405
 [2382]: https://github.com/Gallopsled/pwntools/pull/2382
+[2434]: https://github.com/Gallopsled/pwntools/pull/2434
 
 ## 4.13.0 (`beta`)
 

docs/source/globals.rst

@@ -54,6 +54,9 @@ This is a quick list of most of the objects and routines imported, in rough orde
 - ``ROP``
     - :mod:`pwnlib.rop`
     - Automatically generate ROP chains using a DSL to describe what you want to do, rather than raw addresses
+- ``Virtualization``
+    - :mod:`pwnlib.virtualization`
+    - Automatically virtualize our exploit in different environments
 - ``gdb.debug`` and ``gdb.attach``
     - :mod:`pwnlib.gdb`
     - Launch a binary under GDB and pop up a new terminal to interact with it.  Automates setting breakpoints and makes iteration on exploits MUCH faster.

docs/source/index.rst

@@ -77,6 +77,8 @@ Each of the ``pwntools`` modules is documented here.
    update
    useragents
    util/*
+   virtualization
+   virtualization/*
    windbg
 
 .. toctree::

docs/source/virtualization.rst

@@ -0,0 +1,28 @@
+.. testsetup:: *
+
+   from pwn import *
+
+:mod:`pwnlib.virtualization` --- Virtualizing your exploits
+=============================================================
+
+.. automodule:: pwnlib.tubes
+
+
+Types of Virtualization
+----------------------------
+
+.. toctree::
+    :maxdepth: 3
+    :glob:
+
+    virtualization/*
+
+
+:mod:`pwnlib.virtualization.pwnvirt` --- Base class
+-----------------------------------------------------
+
+
+.. automodule:: pwnlib.virtualization.pwnvirt
+
+  .. autoclass:: pwnlib.virtualization.pwnvirt.pwnvirt()
+     :members:

docs/source/virtualization/sshvirt.rst

@@ -0,0 +1,11 @@
+.. testsetup:: *
+
+    from pwn import *
+    context.arch = 'amd64'
+    context.terminal = [os.path.join(os.path.dirname(pwnlib.__file__), 'gdb_faketerminal.py')]
+
+:mod:`pwnlib.virtualization.sshvirt` --- Working with Sshvirt
+===============================================================
+
+.. automodule:: pwnlib.virtualization.sshvirt
+   :members:

pwn/toplevel.py

@@ -70,6 +70,7 @@
 from pwnlib.util.sh_string import sh_string, sh_prepare, sh_command_with
 from pwnlib.util.splash import *
 from pwnlib.util.web import *
+from pwnlib.virtualization.sshvirt import sshvirt
 
 # Promote these modules, so that "from pwn import *" will let you access them
 

pwnlib/tubes/ssh.py

@@ -597,6 +597,9 @@ def __init__(self, user=None, host=None, port=22, password=None, key=None,
         NOTE: The proxy_command and proxy_sock arguments is only available if a
         fairly new version of paramiko is used.
 
+        Note: alternativly use :meth:`.virtulization.sshvirt`.
+
+
         Example proxying:
 
         .. doctest::

pwnlib/virtualization/__init__.py

@@ -0,0 +1,3 @@
+from __future__ import absolute_import
+
+__all__ = ['sshvirt']