Getting back revision number - displayed like in GitHub commits (Issue #52)

stamparm · stamparm · commit 8eefe4b71fe5 · 2012-07-02T13:01:20.000+02:00
diff --git a/lib/core/common.py b/lib/core/common.py
@@ -2489,7 +2489,7 @@ def unhandledExceptionMessage():
     errMsg += "and any information required to reproduce the bug. The "
     errMsg += "developers will try to reproduce the bug, fix it accordingly "
     errMsg += "and get back to you.\n"
-    errMsg += "sqlmap version: %s%s\n" % (VERSION, " (r%d)" % REVISION if REVISION else "")
+    errMsg += "sqlmap version: %s%s\n" % (VERSION, " (%s)" % REVISION if REVISION else "")
     errMsg += "Python version: %s\n" % PYVERSION
     errMsg += "Operating system: %s\n" % PLATFORM
     errMsg += "Command line: %s\n" % " ".join(sys.argv)
diff --git a/lib/core/revision.py b/lib/core/revision.py
@@ -12,50 +12,29 @@
 from subprocess import Popen as execute
 
 def getRevisionNumber():
-    curDir = os.path.dirname(os.path.realpath(__file__))
     retVal = None
-
-    try:
-        import pysvn
-
-        client = pysvn.Client()
-        if client.info(curDir):
-            retVal = client.info(curDir).revision.number
-    except ImportError:
-        process = execute("svn info %s" % curDir, shell=True, stdout=PIPE, stderr=PIPE)
-        svnStdout, svnStderr = process.communicate()
-
-        if svnStdout:
-            revision = re.search("Revision:\s+([\d]+)", svnStdout)
-
-            if revision:
-                retVal = revision.group(1)
-    except:
-        pass
-
-    if not retVal:
-        # Reference: http://stackoverflow.com/questions/242295/how-does-one-add-a-svn-repository-build-number-to-python-code
-        entriesPath = '%s/.svn/entries' % curDir
-
-        if os.path.exists(entriesPath):
-            entries = open(entriesPath, 'r').read()
-            # Versions >= 7 of the entries file are flat text.  The first line is
-            # the version number. The next set of digits after 'dir' is the revision.
-            if re.match('(\d+)', entries):
-                match = re.search('\d+\s+dir\s+(\d+)', entries)
-                if match:
-                    retVal = match.groups()[0]
-            # Older XML versions of the file specify revision as an attribute of
-            # the first entries node.
+    filePath = None
+
+    _ = os.path.dirname(__file__)
+    while True:
+        filePath = os.path.join(_, ".git/refs/heads/master").replace('/', os.path.sep)
+        if os.path.exists(filePath):
+            break
+        else:
+            filePath = None
+            if _ == os.path.dirname(_):
+                break
             else:
-                from xml.dom import minidom
-                dom = minidom.parse(entriesPath)
-                retVal = dom.getElementsByTagName('entry')[0].getAttribute('revision')
+                _ = os.path.dirname(_)
+    if filePath:
+        with open(filePath, "r") as f:
+            match = re.match(r"(?i)[0-9a-f]{32}", f.read())
+            retVal = match.group(0) if match else None
 
-    if retVal:
-        try:
-            retVal = int(retVal)
-        except ValueError:
-            retVal = None
+    if not retVal:
+        process = execute("git rev-parse --verify HEAD", shell=True, stdout=PIPE, stderr=PIPE)
+        stdout, _ = process.communicate()
+        match = re.search(r"(?i)[0-9a-f]{32}", stdout or "")
+        retVal = match.group(0) if match else None
 
-    return retVal
+    return retVal[:10] if retVal else None
diff --git a/lib/core/settings.py b/lib/core/settings.py
@@ -20,7 +20,7 @@
 # sqlmap version and site
 VERSION = "1.0-dev"
 REVISION = getRevisionNumber()
-VERSION_STRING = "sqlmap/%s%s" % (VERSION, " (r%s)" % REVISION if REVISION else "")
+VERSION_STRING = "sqlmap/%s%s" % (VERSION, " (%s)" % REVISION if REVISION else "")
 DESCRIPTION = "automatic SQL injection and database takeover tool"
 SITE = "http://www.sqlmap.org"
 ML = "sqlmap-users@lists.sourceforge.net"
diff --git a/lib/utils/deps.py b/lib/utils/deps.py
@@ -73,17 +73,6 @@ def checkDependencies():
         logger.warn(warnMsg)
         missing_libraries.add('python-ntlm')
 
-    try:
-        import pysvn
-        debugMsg = "'python-svn' third-party library is found"
-        logger.debug(debugMsg)
-    except ImportError, _:
-        warnMsg = "sqlmap requires 'python-svn' third-party library for "
-        warnMsg += "if you want to use the sqlmap update functionality. "
-        warnMsg += "Download from http://pysvn.tigris.org/"
-        logger.warn(warnMsg)
-        missing_libraries.add('python-svn')
-
     if IS_WIN:
         try:
             import pyreadline
