Less problematic regexes for MsSQL errors

stamparm · stamparm · commit 7ad49f418543 · 2016-07-05T09:32:08.000+02:00
diff --git a/lib/core/settings.py b/lib/core/settings.py
@@ -19,7 +19,7 @@
 from lib.core.revision import getRevisionNumber
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.0.7.6"
+VERSION = "1.0.7.7"
 REVISION = getRevisionNumber()
 STABLE = VERSION.count('.') <= 2
 VERSION_STRING = "sqlmap/%s#%s" % (VERSION, "stable" if STABLE else "dev")
diff --git a/lib/parse/html.py b/lib/parse/html.py
@@ -42,6 +42,8 @@ def startElement(self, name, attrs):
 
         elif name == "error":
             regexp = attrs.get("regexp")
+            if "SQL" in regexp:
+                print regexp
             if regexp not in kb.cache.regex:
                 keywords = re.findall("\w+", re.sub(r"\\.", " ", regexp))
                 keywords = sorted(keywords, key=len)
diff --git a/xml/errors.xml b/xml/errors.xml
@@ -29,10 +29,10 @@
         <error regexp="OLE DB.* SQL Server"/>
         <error regexp="\bSQL Server[^&lt;&quot;]+Driver"/>
         <error regexp="Warning.*(mssql|sqlsrv)_"/>
-        <error regexp="\bSQL Server.*[0-9a-fA-F]{8}"/>
+        <error regexp="\bSQL Server[^&lt;&quot;]+[0-9a-fA-F]{8}"/>
         <error regexp="(?s)Exception.*\WSystem\.Data\.SqlClient\."/>
         <error regexp="(?s)Exception.*\WRoadhouse\.Cms\."/>
-        <error regexp="Microsoft SQL Native Client.*[0-9a-fA-F]{8}"/>
+        <error regexp="Microsoft SQL Native Client error '[0-9a-fA-F]{8}"/>
         <error regexp="com\.microsoft\.sqlserver\.jdbc\.SQLServerException"/>
         <error regexp="ODBC SQL Server Driver"/>
         <error regexp="SQLServer JDBC Driver"/>
