From 47e0fc36c713650a9bc36302048c90b013b07686 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Tue, 18 Apr 2017 14:02:25 +0200 Subject: [PATCH] Minor consistency update --- extra/runcmd/README.txt | 6 +++--- {shell => extra/runcmd}/runcmd.exe_ | Bin extra/runcmd/{windows => src}/README.txt | 0 extra/runcmd/{windows => src}/runcmd.sln | Bin extra/runcmd/{windows => src}/runcmd/runcmd.cpp | 0 extra/runcmd/{windows => src}/runcmd/runcmd.vcproj | Bin extra/runcmd/{windows => src}/runcmd/stdafx.cpp | 0 extra/runcmd/{windows => src}/runcmd/stdafx.h | 0 lib/core/settings.py | 2 +- lib/takeover/web.py | 2 +- txt/checksum.md5 | 6 +++--- 11 files changed, 8 insertions(+), 8 deletions(-) rename {shell => extra/runcmd}/runcmd.exe_ (100%) rename extra/runcmd/{windows => src}/README.txt (100%) rename extra/runcmd/{windows => src}/runcmd.sln (100%) rename extra/runcmd/{windows => src}/runcmd/runcmd.cpp (100%) rename extra/runcmd/{windows => src}/runcmd/runcmd.vcproj (100%) rename extra/runcmd/{windows => src}/runcmd/stdafx.cpp (100%) rename extra/runcmd/{windows => src}/runcmd/stdafx.h (100%) diff --git a/extra/runcmd/README.txt b/extra/runcmd/README.txt index 717800aa4..4d4caa8f8 100644 --- a/extra/runcmd/README.txt +++ b/extra/runcmd/README.txt @@ -1,3 +1,3 @@ -Files in this folder can be used to compile auxiliary program that can -be used for running command prompt commands skipping standard "cmd /c" way. -They are licensed under the terms of the GNU Lesser General Public License. +runcmd.exe is an auxiliary program that can be used for running command prompt +commands skipping standard "cmd /c" way. It is licensed under the terms of the +GNU Lesser General Public License. diff --git a/shell/runcmd.exe_ b/extra/runcmd/runcmd.exe_ similarity index 100% rename from shell/runcmd.exe_ rename to extra/runcmd/runcmd.exe_ diff --git a/extra/runcmd/windows/README.txt b/extra/runcmd/src/README.txt similarity index 100% rename from extra/runcmd/windows/README.txt rename to extra/runcmd/src/README.txt diff --git a/extra/runcmd/windows/runcmd.sln b/extra/runcmd/src/runcmd.sln similarity index 100% rename from extra/runcmd/windows/runcmd.sln rename to extra/runcmd/src/runcmd.sln diff --git a/extra/runcmd/windows/runcmd/runcmd.cpp b/extra/runcmd/src/runcmd/runcmd.cpp similarity index 100% rename from extra/runcmd/windows/runcmd/runcmd.cpp rename to extra/runcmd/src/runcmd/runcmd.cpp diff --git a/extra/runcmd/windows/runcmd/runcmd.vcproj b/extra/runcmd/src/runcmd/runcmd.vcproj similarity index 100% rename from extra/runcmd/windows/runcmd/runcmd.vcproj rename to extra/runcmd/src/runcmd/runcmd.vcproj diff --git a/extra/runcmd/windows/runcmd/stdafx.cpp b/extra/runcmd/src/runcmd/stdafx.cpp similarity index 100% rename from extra/runcmd/windows/runcmd/stdafx.cpp rename to extra/runcmd/src/runcmd/stdafx.cpp diff --git a/extra/runcmd/windows/runcmd/stdafx.h b/extra/runcmd/src/runcmd/stdafx.h similarity index 100% rename from extra/runcmd/windows/runcmd/stdafx.h rename to extra/runcmd/src/runcmd/stdafx.h diff --git a/lib/core/settings.py b/lib/core/settings.py index da0460c3f..7c0b36172 100755 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -19,7 +19,7 @@ from lib.core.enums import DBMS_DIRECTORY_NAME from lib.core.enums import OS # sqlmap version (...) -VERSION = "1.1.4.28" +VERSION = "1.1.4.29" 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) diff --git a/lib/takeover/web.py b/lib/takeover/web.py index 23b81f6a2..b1d907156 100644 --- a/lib/takeover/web.py +++ b/lib/takeover/web.py @@ -371,7 +371,7 @@ class Web: _ = "tmpe%s.exe" % randomStr(lowercase=True) if self.webUpload(backdoorName, backdoorDirectory, content=backdoorContent.replace("WRITABLE_DIR", backdoorDirectory).replace("RUNCMD_EXE", _)): - self.webUpload(_, backdoorDirectory, filepath=os.path.join(paths.SQLMAP_SHELL_PATH, 'runcmd.exe_')) + self.webUpload(_, backdoorDirectory, filepath=os.path.join(paths.SQLMAP_EXTRAS_PATH, "runcmd", "runcmd.exe_")) self.webBackdoorUrl = "%s/Scripts/%s" % (self.webBaseUrl, backdoorName) self.webDirectory = backdoorDirectory else: diff --git a/txt/checksum.md5 b/txt/checksum.md5 index 4905a7f11..393de4ffa 100644 --- a/txt/checksum.md5 +++ b/txt/checksum.md5 @@ -9,6 +9,7 @@ acba8b5dc93db0fe6b2b04ff0138c33c extra/icmpsh/icmpsh.exe_ 2d020d2bdcee1170805f48839fdb89df extra/icmpsh/__init__.py 310efc965c862cfbd7b0da5150a5ad36 extra/__init__.py f31ab783fd49a9e29ec34dd0a8e3873d extra/mssqlsig/update.py +ff90cb0366f7cefbdd6e573e27e6238c extra/runcmd/runcmd.exe_ 310efc965c862cfbd7b0da5150a5ad36 extra/safe2bin/__init__.py d3e99da5b5c2209e97836af9098124ee extra/safe2bin/safe2bin.py d229479d02d21b29f209143cb0547780 extra/shellcodeexec/linux/shellcodeexec.x32_ @@ -45,7 +46,7 @@ dd19b4d930d418f8aef498941346ab2d lib/core/option.py d8e9250f3775119df07e9070eddccd16 lib/core/replication.py 785f86e3f963fa3798f84286a4e83ff2 lib/core/revision.py 40c80b28b3a5819b737a5a17d4565ae9 lib/core/session.py -0ae439cda905701a68a8cdca5a4c9109 lib/core/settings.py +c8ce602340b0b6757b4c97f30ad41bd5 lib/core/settings.py d91291997d2bd2f6028aaf371bf1d3b6 lib/core/shell.py 2ad85c130cc5f2b3701ea85c2f6bbf20 lib/core/subprocessng.py 2571146b71f487a3d11867746c033e40 lib/core/target.py @@ -84,7 +85,7 @@ c6bc7961a186baabe0a9f5b7e0d8974b lib/takeover/icmpsh.py c90c993b020a6ae0f0e497fd84f37466 lib/takeover/metasploit.py ac541a0d38e4ecb4e41e97799a7235f4 lib/takeover/registry.py 4cd0322f22fbc26284cffa9f8f7545ef lib/takeover/udf.py -c131528696edb96695aa1b58803bd6ae lib/takeover/web.py +affad1bb6be45ebed882a02773d08473 lib/takeover/web.py e5a82481947e798d0c11f3acf3e9db60 lib/takeover/xp_cmdshell.py 9f03972ea5ce2df74d43be5f30f068eb lib/techniques/blind/inference.py 310efc965c862cfbd7b0da5150a5ad36 lib/techniques/blind/__init__.py @@ -217,7 +218,6 @@ b04db3e861edde1f9dd0a3850d5b96c8 shell/backdoor.asp_ 158bfa168128393dde8d6ed11fe9a1b8 shell/backdoor.aspx_ 1add5a9a67539e7fd1999c8c20a69d15 shell/backdoor.jsp_ 09fc3ed6543f4d1885e338b271e5e97a shell/backdoor.php_ -ff90cb0366f7cefbdd6e573e27e6238c shell/runcmd.exe_ 0e7aba05423c272f051f31165b0e416d shell/stager.asp_ c3cc8b7727161e64ab59f312c33b541a shell/stager.aspx_ 1f7f125f30e0e800beb21e2ebbab18e1 shell/stager.jsp_