Merge pull request #2833 from gpotter2/autorun-log

Catch logging in autorun

Author: guedou

scapy/autorun.py

@@ -11,9 +11,11 @@
 import code
 import sys
 import importlib
+import logging
+
 from scapy.config import conf
 from scapy.themes import NoTheme, DefaultTheme, HTMLTheme2, LatexTheme2
-from scapy.error import Scapy_Exception
+from scapy.error import log_scapy, Scapy_Exception
 from scapy.utils import tex_escape
 import scapy.modules.six as six
 
@@ -109,6 +111,9 @@ def autorun_get_interactive_session(cmds, **kargs):
     """
     sstdout, sstderr = sys.stdout, sys.stderr
     sw = StringWriter()
+    h_old = log_scapy.handlers[0]
+    log_scapy.removeHandler(h_old)
+    log_scapy.addHandler(logging.StreamHandler(stream=sw))
     try:
         try:
             sys.stdout = sys.stderr = sw
@@ -118,6 +123,8 @@ def autorun_get_interactive_session(cmds, **kargs):
             raise
     finally:
         sys.stdout, sys.stderr = sstdout, sstderr
+        log_scapy.removeHandler(log_scapy.handlers[0])
+        log_scapy.addHandler(h_old)
     return sw.s, res
 
 

test/regression.uts

@@ -784,6 +784,12 @@ assert(ret == ("\\textcolor{blue}{{\\tt\\char62}{\\tt\\char62}{\\tt\\char62} }IP
 ret = autorun_get_text_interactive_session("scapy_undefined")
 assert "NameError" in ret[0]
 
+= Test autorun with logging
+
+cmds = """log_runtime.info(hex_bytes("446166742050756e6b"))\n"""
+ret = autorun_get_text_interactive_session(cmds)
+assert "Daft Punk" in ret[0]
+
 = Test utility TEX functions
 
 assert tex_escape("{scapy}\\^$~#_&%|><") == "{\\tt\\char123}scapy{\\tt\\char125}{\\tt\\char92}\\^{}\\${\\tt\\char126}\\#\\_\\&\\%{\\tt\\char124}{\\tt\\char62}{\\tt\\char60}"