Fixing CI/CD errors

Author: stamparm

.github/workflows/tests.yml

@@ -111,6 +111,12 @@ jobs:
         # 'binary' instead of 'text'. Keeping this step byte-compile-free leaves --smoke clean.
         run: python -B -m unittest discover -s tests -p "test_*.py"
 
+      - name: Esperanto self-test
+        # offline, deterministic engine check against an in-memory SQLite boolean oracle: all
+        # compare modes + identify + bytes/text + noisy-oracle quorum + integrity + strategy
+        # handoff (a failed assertion exits non-zero)
+        run: python extra/esperanto/run.py --self-test
+
       - name: Coverage
         if: matrix.python-version != 'pypy-2.7'
         run: |

extra/esperanto/__init__.py

@@ -24,3 +24,5 @@
 from .handler import buildHandler
 from .records import Cap, ExtractResult, BulkResult, Dialect, InferenceStrategy
 from .records import OracleUndecided, QueryBudgetExceeded
+
+__all__ = ["Esperanto", "hostExtract", "buildHandler", "Cap", "ExtractResult", "BulkResult", "Dialect", "InferenceStrategy", "OracleUndecided", "QueryBudgetExceeded"]

extra/esperanto/atlas.py

@@ -418,12 +418,18 @@ def _isSingleUnicodeScalar(value):
 except NameError:
     _unichr = chr                       # py3
 
+# py2/py3 shim: the py2 unicode text type (str on py3)
+try:
+    _unicode = unicode                  # py2
+except NameError:
+    _unicode = str                      # py3
+
 
 def _native(s):
     # embed a literal as the native str type: on py2 a unicode value is encoded to
     # utf-8 bytes so the byte-string SQL templates ('{expr}'.format(...)) don't force
     # an ascii encode of non-ASCII data; on py3 str is already unicode-clean.
-    if str is bytes and isinstance(s, unicode):     # py2 only (unicode unresolved on py3)
+    if str is bytes and isinstance(s, _unicode):    # py2 only
         return s.encode("utf-8")
     return s
 

extra/esperanto/discovery.py

@@ -5,8 +5,25 @@
 See the file 'LICENSE' for copying permission
 """
 
-from .atlas import *
-from .records import *
+from .atlas import _BANNER_KEYWORDS
+from .atlas import _BANNERS
+from .atlas import _BINWRAP
+from .atlas import _BYTELEN
+from .atlas import _CATALOGS
+from .atlas import _CHARCODE
+from .atlas import _CHARFROM
+from .atlas import _COALESCE
+from .atlas import _CONCAT
+from .atlas import _DUAL
+from .atlas import _DUAL_IMPLIES
+from .atlas import _HEXFN
+from .atlas import _IDENTITY
+from .atlas import _LENGTH
+from .atlas import _PREFIX
+from .atlas import _SUBSTRING
+from .atlas import _TEXTCAST
+from .records import Cap
+from .records import OracleUndecided
 
 
 class _Discovery(object):

extra/esperanto/engine.py

@@ -5,8 +5,11 @@
 See the file 'LICENSE' for copying permission
 """
 
-from .atlas import *
-from .records import *
+from .atlas import _FREQ_ORDER
+from .atlas import _PRINTABLE_SORTED
+from .atlas import _REPL
+from .atlas import _unichr
+from .records import Dialect
 from .oracle import _OracleCore
 from .discovery import _Discovery
 from .extraction import _Extraction

extra/esperanto/enumeration.py

@@ -5,8 +5,18 @@
 See the file 'LICENSE' for copying permission
 """
 
-from .atlas import *
-from .records import *
+from .atlas import _BULK_AGG
+from .atlas import _COLUMN_SPECS
+from .atlas import _HEX_PAYLOAD_CODES
+from .atlas import _IDENT_QUOTE
+from .atlas import _KEY_SPECS
+from .atlas import _REPL
+from .atlas import _ROWID
+from .atlas import _ROWID_LITBOUND
+from .records import BulkResult
+from .records import Cap
+from .records import InferenceStrategy
+from .records import OracleUndecided
 from .wordlist import commonColumns
 from .wordlist import commonTables
 

extra/esperanto/extraction.py

@@ -5,8 +5,23 @@
 See the file 'LICENSE' for copying permission
 """
 
-from .atlas import *
-from .records import *
+import binascii
+
+from .atlas import _FREQ_ORDER
+from .atlas import _HEX_Q_ENCODINGS
+from .atlas import _HEXDIGITS
+from .atlas import _HEXFN
+from .atlas import _isSingleUnicodeScalar
+from .atlas import _MAX_HEX_CHAR_NIBBLES
+from .atlas import _native
+from .atlas import _PRINTABLE_SORTED
+from .atlas import _REPL
+from .atlas import _SIMILAR_META
+from .atlas import _UNICODE_MAX
+from .atlas import _unhexlify
+from .atlas import _unichr
+from .records import Cap
+from .records import ExtractResult
 
 
 class _Extraction(object):

extra/esperanto/oracle.py

@@ -7,8 +7,8 @@
 
 from contextlib import contextmanager
 
-from .atlas import *
-from .records import *
+from .records import OracleUndecided
+from .records import QueryBudgetExceeded
 
 
 class _OracleCore(object):

extra/esperanto/records.py

@@ -5,9 +5,6 @@
 See the file 'LICENSE' for copying permission
 """
 
-from .atlas import *
-
-
 class OracleUndecided(RuntimeError):
     """The oracle gave no reliable True/False after retries/voting - a transport or
     observation failure, NOT a definitive answer. Raised so blind extraction fails

lib/core/settings.py

@@ -20,7 +20,7 @@
 from thirdparty import six
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.10.7.107"
+VERSION = "1.10.7.108"
 TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
 TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
 VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)