Skip to content

Commit c0d343b

Browse files
stamparmstamparm
committed
Some XML updates
1 parent de87b28 commit c0d343b

6 files changed

Lines changed: 232 additions & 7 deletions

File tree

‎data/txt/sha256sums.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ c5b9d622aca6da735e7ed9906e28c7e061e97c223ef92ba1a5d5028ecbb16962 data/udf/postg
6565
8f7f59a6896ae5b39e2afbfe8479a1f2637fb52220cc1e7158921e570d15fb2a data/udf/postgresql/windows/32/8.4/lib_postgresqludf_sys.dll_
6666
7c2511b47ab9d0de1d77f1d775c6522285687ee82fec0edc11cada75ac3f29ae data/udf/postgresql/windows/32/9.0/lib_postgresqludf_sys.dll_
6767
0a6d5fc399e9958477c8a71f63b7c7884567204253e0d2389a240d83ed83f241 data/udf/README.txt
68-
288592bbc7115870516865d5a92c2e1d1d54f11a26a86998f8829c13724e2551 data/xml/banner/generic.xml
69-
2adcdd08d2c11a5a23777b10c132164ed9e856f2a4eca2f75e5e9b6615d26a97 data/xml/banner/mssql.xml
70-
14b18da611d4bfad50341df89f893edf47cd09c41c9662e036e817055eaa0cfb data/xml/banner/mysql.xml
68+
f52cd86ed1a1a710e10f2e85faa7c8c85892398c60ad6324f320f826a6ba46e3 data/xml/banner/generic.xml
69+
99f8f7311642bab38e1ffd59ca8f9a6110c4e3449d6c65b4812f2822088fd217 data/xml/banner/mssql.xml
70+
332d38de02c04f5d99fe3fd894c93aafd70032ee6de217c76dfaab2133d9eca9 data/xml/banner/mysql.xml
7171
6d1ab53eeac4fae6d03b67fb4ada71b915e1446a9c1cc4d82eafc032800a68fd data/xml/banner/oracle.xml
7272
9f4ca1ff145cfbe3c3a903a21bf35f6b06ab8b484dad6b7c09e95262bf6bfa05 data/xml/banner/postgresql.xml
7373
86da6e90d9ccf261568eda26a6455da226c19a42cc7cd211e379cab528ec621e data/xml/banner/server.xml
@@ -189,7 +189,7 @@ ccc4a717e887652b1fcce073d9409d9c59a3b28548c703a9e453d15845f90cd7 lib/core/patch
189189
9bf174058f15d14e24e94f9aaf42df045119d3617c6c54bd2f3af79b462f331d lib/core/replication.py
190190
0b8c38a01bb01f843d94a6c5f2075ee47520d0c4aa799cecea9c3e2c5a4a23a6 lib/core/revision.py
191191
888daba83fd4a34e9503fe21f01fef4cc730e5cde871b1d40e15d4cbc847d56c lib/core/session.py
192-
4075b759ee9084605db70288b41f282fe3d4224f62d9b382ce3139e572145b97 lib/core/settings.py
192+
5938c26ca808b908c2af438498ae9aafedbea9e3db999857bf318dd630b2ab68 lib/core/settings.py
193193
c7804223319e18eb0b8e2cbf0a8b6896d1cefb7b0b1a2e9f1cf826a8a3b56750 lib/core/shell.py
194194
a2e98a94b231432736d6b304fc75525c8b5fdb4768c418387c5b4c1a610dad64 lib/core/subprocessng.py
195195
19f1e3c5e3ba703d28d510cd7a9ab8284d5fbe9df5ce7e77c86e5931571364b7 lib/core/target.py
@@ -581,7 +581,7 @@ a48c411fea864e6bcd6a1c7e1a35094b8cda8d15088fd9e7b0270542ae20daa9 tests/test_com
581581
899bc085e96d68f8a8cbe0d7e55863e98ef37b73ab0e4234f7d969e31ea2d23a tests/test_comparison_json.py
582582
7b72d4f850bbd059b8e95fceb45a58470354cb7270c99b0e9981aaa189af20d1 tests/test_comparison.py
583583
8593f14a18c4445c58b2e59462adcb761074ac7217cd7c3808519a90ba279bda tests/test_convert.py
584-
5016119bdb57094381afdca35ef29a4a6641e26e4b48a9119f1db633e6123d29 tests/test_datafiles.py
584+
c17544be5e945dc8c4fbb5c3b922da8eceec30b0fb239c32fb5f40e1660a197f tests/test_datafiles.py
585585
9c240d4f796e56376374d4ce46f358ceb7d48cc6a7427760c5bfb89ff01cb545 tests/test_datatypes.py
586586
3804eb2d730220360f9dc07d5994eb64e9f65acf3b0d8648df8df2a2177ba8fd tests/test_decodepage.py
587587
9c0a0cd0b2d52a53f75c98c60f87a022354b7c3dc4baaf3fe1e272a0af5b7f0a tests/test_dialectdbms.py

‎data/xml/banner/generic.xml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<!-- Reference: https://msdn.microsoft.com/en-us/library/windows/desktop/ms724832%28v=vs.85%29.aspx -->
3535

3636
<regexp value="Windows.*\b10\.0">
37-
<info type="Windows" distrib="2016|2019|2022|10|11"/>
37+
<info type="Windows" distrib="2016|2019|2022|2025|10|11"/>
3838
</regexp>
3939

4040
<regexp value="Windows.*\b6\.3">
@@ -179,6 +179,10 @@
179179
<info type="Linux" distrib="Rocky"/>
180180
</regexp>
181181

182+
<regexp value="AlmaLinux">
183+
<info type="Linux" distrib="Alma"/>
184+
</regexp>
185+
182186
<!-- BSD -->
183187

184188
<regexp value="FreeBSD">

‎data/xml/banner/mssql.xml‎

Lines changed: 190 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,195 @@
11
<?xml version="1.0" ?>
2+
<!--
3+
Release/Service Pack anchors for SQL Server 2012-2022.
4+
Each release leads with a coarse "major.minor" signature (matches any patch
5+
level, so the product year is always resolved) followed by exact RTM/SP base
6+
builds (last match wins, so the specific entry overrides the coarse fallback
7+
and adds Service Pack identification). 2017+ use the CU servicing model (no SPs).
8+
Reference: https://learn.microsoft.com/en-us/troubleshoot/sql/releases/download-and-install-latest-updates
9+
-->
210
<root>
11+
<signatures release="2022">
12+
<signature>
13+
<version>
14+
16.0
15+
</version>
16+
<servicepack>
17+
</servicepack>
18+
</signature>
19+
<signature>
20+
<version>
21+
16.0.1000.6
22+
</version>
23+
<servicepack>
24+
0
25+
</servicepack>
26+
</signature>
27+
</signatures>
28+
<signatures release="2019">
29+
<signature>
30+
<version>
31+
15.0
32+
</version>
33+
<servicepack>
34+
</servicepack>
35+
</signature>
36+
<signature>
37+
<version>
38+
15.0.2000.5
39+
</version>
40+
<servicepack>
41+
0
42+
</servicepack>
43+
</signature>
44+
</signatures>
45+
<signatures release="2017">
46+
<signature>
47+
<version>
48+
14.0
49+
</version>
50+
<servicepack>
51+
</servicepack>
52+
</signature>
53+
<signature>
54+
<version>
55+
14.0.1000.169
56+
</version>
57+
<servicepack>
58+
0
59+
</servicepack>
60+
</signature>
61+
</signatures>
62+
<signatures release="2016">
63+
<signature>
64+
<version>
65+
13.0
66+
</version>
67+
<servicepack>
68+
</servicepack>
69+
</signature>
70+
<signature>
71+
<version>
72+
13.0.1601.5
73+
</version>
74+
<servicepack>
75+
0
76+
</servicepack>
77+
</signature>
78+
<signature>
79+
<version>
80+
13.0.4001.0
81+
</version>
82+
<servicepack>
83+
1
84+
</servicepack>
85+
</signature>
86+
<signature>
87+
<version>
88+
13.0.5026.0
89+
</version>
90+
<servicepack>
91+
2
92+
</servicepack>
93+
</signature>
94+
<signature>
95+
<version>
96+
13.0.6300.2
97+
</version>
98+
<servicepack>
99+
3
100+
</servicepack>
101+
</signature>
102+
</signatures>
103+
<signatures release="2014">
104+
<signature>
105+
<version>
106+
12.0
107+
</version>
108+
<servicepack>
109+
</servicepack>
110+
</signature>
111+
<signature>
112+
<version>
113+
12.0.2000.8
114+
</version>
115+
<servicepack>
116+
0
117+
</servicepack>
118+
</signature>
119+
<signature>
120+
<version>
121+
12.0.4100.1
122+
</version>
123+
<servicepack>
124+
1
125+
</servicepack>
126+
</signature>
127+
<signature>
128+
<version>
129+
12.0.5000.0
130+
</version>
131+
<servicepack>
132+
2
133+
</servicepack>
134+
</signature>
135+
<signature>
136+
<version>
137+
12.0.6024.0
138+
</version>
139+
<servicepack>
140+
3
141+
</servicepack>
142+
</signature>
143+
</signatures>
144+
<signatures release="2012">
145+
<signature>
146+
<version>
147+
11.0
148+
</version>
149+
<servicepack>
150+
</servicepack>
151+
</signature>
152+
<signature>
153+
<version>
154+
11.0.2100.60
155+
</version>
156+
<servicepack>
157+
0
158+
</servicepack>
159+
</signature>
160+
<signature>
161+
<version>
162+
11.0.3000.0
163+
</version>
164+
<servicepack>
165+
1
166+
</servicepack>
167+
</signature>
168+
<signature>
169+
<version>
170+
11.0.5058.0
171+
</version>
172+
<servicepack>
173+
2
174+
</servicepack>
175+
</signature>
176+
<signature>
177+
<version>
178+
11.0.6020.0
179+
</version>
180+
<servicepack>
181+
3
182+
</servicepack>
183+
</signature>
184+
<signature>
185+
<version>
186+
11.0.7001.0
187+
</version>
188+
<servicepack>
189+
4
190+
</servicepack>
191+
</signature>
192+
</signatures>
3193
<signatures release="2008 R2">
4194
<signature>
5195
<version>

‎data/xml/banner/mysql.xml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<!--
44
References:
55
* https://en.wikipedia.org/wiki/Debian_version_history
6+
* https://en.wikipedia.org/wiki/Ubuntu_version_history
67
-->
78

89
<root>
@@ -76,4 +77,30 @@
7677
<info dbms_version="1" type="Linux" distrib="Debian" codename="testing"/>
7778
</regexp>
7879

80+
<!-- Ubuntu (release embedded in the package version, e.g. 8.0.36-0ubuntu0.22.04.1) -->
81+
82+
<regexp value="^([\d\.]+)[\-\_].*ubuntu\d+\.14\.04">
83+
<info dbms_version="1" type="Linux" distrib="Ubuntu" release="14.04" codename="trusty"/>
84+
</regexp>
85+
86+
<regexp value="^([\d\.]+)[\-\_].*ubuntu\d+\.16\.04">
87+
<info dbms_version="1" type="Linux" distrib="Ubuntu" release="16.04" codename="xenial"/>
88+
</regexp>
89+
90+
<regexp value="^([\d\.]+)[\-\_].*ubuntu\d+\.18\.04">
91+
<info dbms_version="1" type="Linux" distrib="Ubuntu" release="18.04" codename="bionic"/>
92+
</regexp>
93+
94+
<regexp value="^([\d\.]+)[\-\_].*ubuntu\d+\.20\.04">
95+
<info dbms_version="1" type="Linux" distrib="Ubuntu" release="20.04" codename="focal"/>
96+
</regexp>
97+
98+
<regexp value="^([\d\.]+)[\-\_].*ubuntu\d+\.22\.04">
99+
<info dbms_version="1" type="Linux" distrib="Ubuntu" release="22.04" codename="jammy"/>
100+
</regexp>
101+
102+
<regexp value="^([\d\.]+)[\-\_].*ubuntu\d+\.24\.04">
103+
<info dbms_version="1" type="Linux" distrib="Ubuntu" release="24.04" codename="noble"/>
104+
</regexp>
105+
79106
</root>

‎lib/core/settings.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
from thirdparty import six
2121

2222
# sqlmap version (<major>.<minor>.<month>.<monthly commit>)
23-
VERSION = "1.10.6.148"
23+
VERSION = "1.10.6.149"
2424
TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
2525
TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
2626
VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)

‎tests/test_datafiles.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,10 @@ def test_core_xml_parses(self):
8383
path = os.path.join(ROOT, "data", "xml", rel)
8484
ET.parse(path) # raises on malformed
8585

86+
def test_banner_xml_parses(self):
87+
for path in glob.glob(os.path.join(ROOT, "data", "xml", "banner", "*.xml")):
88+
ET.parse(path) # raises on malformed
89+
8690

8791
class TestSourceAsciiSafety(unittest.TestCase):
8892
# sqlmap source files carry NO coding header, so any non-ASCII byte breaks py2 parsing.

0 commit comments

Comments
 (0)