Merge branch 'pkg-reorg'

This branch is a rework of nsploit's intended package imports.  User
scripts need only import a given nsploit subpackage to obtain that
package's full collection of classes, functions, etc.  This is the new
intended style for exploit scripts.

Along the way, some modules are reorganized into different packages, the
"builder" package is renamed to "payload", and some unnecessary files
are consolidated.

* pkg-reorg:
  main: Automatically provide top-level sploit modules to user scripts
  sploit: Expose modules' contents through package
  Remove extra "main.py" file
  comm: Promote from module to package
  log: Move to sploit.util package
  util: Promote from module to package
  builder: Rename package to payload and expose contents
  rev: Expose modules' contents through package
  Remove outer __init__.py file

1 files changed, 32 insertions, 0 deletions

diff --git a/sploit/util/log.py b/sploit/util/log.py
new file mode 100644
index 0000000..823b252
--- /dev/null
+++ b/sploit/util/log.py
@@ -0,0 +1,32 @@
+import codecs
+import sys
+
+# https://docs.python.org/3/library/codecs.html#standard-encodings
+ENCODING = None
+
+ERROR   = 31
+WARNING = 33
+STATUS  = 32
+NORMAL  =  0
+ALT     = 90
+
+def enc_value(value, enc):
+    if type(value) is bytes:
+        if enc is not None:
+            value = codecs.encode(value, enc)
+        elif ENCODING is not None:
+            value = codecs.encode(value, ENCODING)
+        value = str(value)[2:-1] # strip b''
+    return str(value)
+
+def generic_log(*values, sep, end, file, flush, enc, color):
+    string = sep.join([ enc_value(x, enc) for x in values ])
+    print(f'\033[{color}m{string}\033[0m', end=end, file=file, flush=flush)
+
+# For library internal use
+def ilog(*values, sep=' ', end='\n', file=sys.stderr, flush=True, enc=None, color=STATUS):
+    generic_log(*values, sep=sep, end=end, file=file, flush=flush, enc=enc, color=color)
+
+# For external use in user script (via print = elog)
+def elog(*values, sep=' ', end='\n', file=sys.stdout, flush=True, enc=None, color=ALT):
+    generic_log(*values, sep=sep, end=end, file=file, flush=flush, enc=enc, color=color)