sqlmapproject/sqlmap
1
1
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2024-11-23 10:03:47 +03:00
Code Issues Packages Projects Releases Wiki Activity
5,606 Commits 4 Branches 117 Tags 97 MiB
1c47b33020
Commit Graph

3925 Commits

Author SHA1 Message Date
Miroslav Stampar
9428d1819e Fix for an Issue #346 2013-01-17 12:03:02 +01:00
Miroslav Stampar
3ab4a5e36d Fix for an Issue #345 2013-01-17 11:50:12 +01:00
Miroslav Stampar
51a77d1fe2 Minor update for an Issue #8 2013-01-17 11:37:45 +01:00
Miroslav Stampar
14b7e655a9 Minor refactoring 2013-01-16 16:33:04 +01:00
Miroslav Stampar
053b7d12b4 Minor language update 2013-01-16 16:07:12 +01:00
Miroslav Stampar
fb7243c237 Cleaning a mess where multi-threaded HTTP requests (in log) had sometimes same UIDs 2013-01-16 16:04:00 +01:00
Miroslav Stampar
c0a6e1c3a7 Finishing first usable prototype for an Issue #8 2013-01-16 14:54:37 +01:00
Miroslav Stampar
ff5ec48abd Minor update for an Issue #8 2013-01-16 14:16:22 +01:00
Bernardo Damele
3464a70ac2 bug fix: without this generic concatenation of strings in concatQuery(), detection of UNION query SQLi only (--technique U) when the page did not disclose any DBMS error message and it was not MySQL (for which there are UNION SQLi specific payloads) was not detected 2013-01-16 01:53:33 +00:00
Bernardo Damele
542f6de72e typo fix 2013-01-16 01:31:03 +00:00
Bernardo Damele
e16ad38d3e more work on #342 2013-01-15 18:15:07 +00:00
Bernardo Damele
329047fc12 restored fix for #210 to keep --hex work with --technique B 2013-01-15 17:51:40 +00:00
Bernardo Damele
2a751e075d more work on #342 2013-01-15 17:14:44 +00:00
Bernardo Damele
ec076f5f8a write console output to temporary folder in any case the test case fails, even if no traceback is raised 2013-01-15 15:51:03 +00:00
Bernardo Damele
4eaa0d17aa Fix in forging query to calculate query output length - closes issue #342 2013-01-15 15:50:20 +00:00
Miroslav Stampar
7a1d484115 Implementation for an Issue #340 2013-01-15 16:05:33 +01:00
Bernardo Damele
3f84cefc77 Merge branch 'master' of github.com:sqlmapproject/sqlmap 2013-01-15 14:59:22 +00:00
Bernardo Damele
c51358953a add more Oracle system dbs 2013-01-15 14:51:29 +00:00
Miroslav Stampar
04aa39f0c6 Minor update 2013-01-15 13:51:19 +01:00
Miroslav Stampar
5ee653dd89 Merging commit 57bcbb458eade2850a6d7623ecddbe49c69cf334 from @morisson 2013-01-15 10:14:02 +01:00
Miroslav Stampar
2cac7e860e Minor refactoring 2013-01-14 16:27:50 +01:00
Miroslav Stampar
31302eb707 Minor update 2013-01-14 16:26:07 +01:00
Miroslav Stampar
2a86c1cadc Another cosmetics 2013-01-14 16:24:55 +01:00
Miroslav Stampar
1e1f560d0c Minor cosmetics 2013-01-14 16:24:28 +01:00
Miroslav Stampar
0c2474cc22 Minor update 2013-01-14 16:21:40 +01:00
Miroslav Stampar
a5a309212a Fix for an Issue #339 2013-01-14 16:18:03 +01:00
Bernardo Damele
3e2c3851f3 Make --live-test Metasploit integration cases work, added more test cases for PostgreSQL and code refactoring (issue #312) 2013-01-14 13:42:50 +00:00
Bernardo Damele
515c1c6205 removed leftover 2013-01-14 10:26:22 +00:00
Bernardo Damele
83000de9e1 improved handling and storing of exceptions with --live-test (#312) 2013-01-14 10:23:40 +00:00
Bernardo Damele
8125fe90a7 code refactoring 2013-01-14 10:22:38 +00:00
Bernardo Damele
036b612bcb bug fix to be able to write unicode chars to debug file 2013-01-14 01:11:42 +00:00
Miroslav Stampar
fc560f2b75 Minor revert and proper fix 2013-01-14 00:47:29 +01:00
Bernardo Damele
b74cfbf336 minor enhancements for debug purposes (issue #312) 2013-01-13 23:15:56 +00:00
Bernardo Damele
fdd6075859 temporary patch to fix UNION query enumeration 2013-01-13 23:08:23 +00:00
Miroslav Stampar
92ea8841f8 Merge branch 'master' of github.com:sqlmapproject/sqlmap 2013-01-13 16:23:09 +01:00
Miroslav Stampar
03dd958d96 Implementation for an Issue #48 2013-01-13 16:22:43 +01:00
Miroslav Stampar
81848c723d Minor cleanup (we officially support Python >= 2.6) 2013-01-11 16:01:48 +01:00
Bernardo Damele
675e4a026b Merge branch 'master' of github.com:sqlmapproject/sqlmap 2013-01-11 13:31:49 +00:00
Bernardo Damele
41834e7a5b working on #8 - still not usable though 2013-01-11 13:31:44 +00:00
Miroslav Stampar
bc4d8d3e02 Implementation for an Issue #332 2013-01-11 11:17:41 +01:00
Miroslav Stampar
5571d09354 Minor revert 2013-01-11 11:13:55 +01:00
Miroslav Stampar
4b79269608 Minor bug fix 2013-01-11 11:10:18 +01:00
Miroslav Stampar
ec4e49d771 Minor refactoring 2013-01-10 16:09:28 +01:00
Miroslav Stampar
1363f26367 Minor refactoring 2013-01-10 15:59:02 +01:00
Miroslav Stampar
834be1eddc Restyling redundant 'except Exception' form 2013-01-10 15:54:28 +01:00
Miroslav Stampar
acfeeb4f51 Restyling old form of urlparse 2013-01-10 15:41:07 +01:00
Miroslav Stampar
8686c20fa5 Removing one obsolete instantiation line 2013-01-10 15:27:35 +01:00
Miroslav Stampar
934d41dac2 Minor style update (PEP8) 2013-01-10 15:02:28 +01:00
Miroslav Stampar
ca3d35a878 Some PEP8 related style cleaning 2013-01-10 13:18:44 +01:00
Miroslav Stampar
6cfa9cb0b3 Removing unused imports 2013-01-10 12:15:12 +01:00
Miroslav Stampar
05705857a9 Merge branch 'master' of github.com:sqlmapproject/sqlmap 2013-01-10 12:09:48 +01:00
Miroslav Stampar
ca1c0c2a1d Minor style update 2013-01-10 11:54:07 +01:00
Bernardo Damele
ca337159f5 added reminder TODO 2013-01-10 01:11:22 +00:00
Bernardo Damele
8093f3950d properly distinguish stdout from stderr with a separate pipe (tracebacks go to stderr) - issue #297 2013-01-10 00:52:44 +00:00
Bernardo Damele
10f1099944 remove logging handler that shows logging messages to stdout - issue #297 2013-01-10 00:51:56 +00:00
Bernardo Damele
ccc3c3d1a3 minor fix to distinguish stdout from stderr 2013-01-10 00:51:05 +00:00
Bernardo Damele
ef40779ad3 upgraded to use custom subprocessng for non-blocking send and read functions for spawned processes. Added new method to display range of log messages, just in case and improved parsing/unpickling of read log messages 2013-01-10 00:01:28 +00:00
Bernardo Damele
2126a5ba12 minor index fix 2013-01-10 00:00:00 +00:00
Bernardo Damele
9766f6025e logging is now handled in a separate file descriptor :) - issue #297 2013-01-09 22:09:50 +00:00
Bernardo Damele
794700eb37 preparing to handle logging calls by a separate file descriptor when sqlmap is executed by the REST API - issue #297 2013-01-09 22:08:50 +00:00
Bernardo Damele
d120dc18d1 cleanup 2013-01-09 22:06:27 +00:00
Bernardo Damele
58a60562ac avoid exiting with a traceback for missing dependency, handle properly at some point 2013-01-09 16:05:55 +00:00
Bernardo Damele
7f4ce4afbb Merge branch 'master' of github.com:sqlmapproject/sqlmap 2013-01-09 16:04:29 +00:00
Bernardo Damele
510ceb6e19 first attempt to have --os-pwn and other takeover switches work across Windows and Linux - issue #28 2013-01-09 16:04:23 +00:00
Miroslav Stampar
bf5544903b Minor style update 2013-01-09 16:10:26 +01:00
Miroslav Stampar
9bdcb1176d Update for an Issue #169 2013-01-09 15:58:13 +01:00
Miroslav Stampar
25f01a419f Minor style update (for the sake of consistency over the code and our PEP8 adaptation) 2013-01-09 15:38:41 +01:00
Miroslav Stampar
bdd2592848 Merge branch 'master' of github.com:sqlmapproject/sqlmap 2013-01-09 15:22:30 +01:00
Miroslav Stampar
3d4f381ab5 Patch for an Issue #169 2013-01-09 15:22:21 +01:00
Bernardo Damele
c44a829b9b pass a pickled options object to sqlmap engine when called from API 2013-01-09 12:34:45 +00:00
Bernardo Damele
8457cff278 added variable to store the live test traceback if any 2013-01-09 12:33:18 +00:00
Bernardo Damele
f11747732e added missing command line options 2013-01-09 12:30:13 +00:00
Miroslav Stampar
55a552ddc4 Update for an Issue #24 2013-01-08 10:55:25 +01:00
Miroslav Stampar
ad85c4c964 Minor refactoring for an Issue #295 2013-01-08 10:23:02 +01:00
Bernardo Damele
c155c6df84 minor bug fix for user's provided LIMIT'd statement when technique is full UNION SQLi 2013-01-07 23:31:11 +00:00
Miroslav Stampar
3abe87ac89 Minor fix with status update (Issue #305) 2013-01-07 18:53:08 +01:00
Miroslav Stampar
a8f02916a9 Minor fix (Issue #305) 2013-01-07 18:39:35 +01:00
Miroslav Stampar
e219fad8bf Added a short comment 2013-01-07 18:19:48 +01:00
Bernardo Damele
1e35b3c8c9 proper link 2013-01-07 16:59:59 +00:00
Miroslav Stampar
96e5d5d178 Some more updates for an Issue #295 2013-01-07 16:55:41 +01:00
Miroslav Stampar
74552bea87 Cleaning some garbage (hard coded paths with linux native slashes) 2013-01-07 16:51:00 +01:00
Miroslav Stampar
425df067eb Fix for an --os-pwn with ICMPsh (it was crashing because methods interleaved with Metasploit ones) 2013-01-07 16:44:22 +01:00
Miroslav Stampar
ac407ae4a1 Implementation for an Issue #295 2013-01-07 15:55:40 +01:00
Miroslav Stampar
76839ff9d6 Fix for an Issue #305 2013-01-07 12:52:55 +01:00
Bernardo Damele
1e1892c962 prep for subprocess.. 2013-01-07 11:10:33 +00:00
Bernardo Damele
7fa75792dd Merge branch 'master' of github.com:sqlmapproject/sqlmap 2013-01-07 11:10:08 +00:00
Bernardo Damele
a30d7014b9 removed unused var 2013-01-07 11:05:33 +00:00
Miroslav Stampar
87e923613f Minor adjustment (URI (marked with custom injection char) has precedence over GET/POST) 2013-01-05 21:16:47 +01:00
Miroslav Stampar
dc21f3ce67 Minor just in case filtering of union results 2013-01-04 17:09:07 +01:00
Miroslav Stampar
5b77b20e2e Removing trailing whitespaces (PEP8) 2013-01-03 23:57:07 +01:00
Miroslav Stampar
82b468211d Minor update 2013-01-03 23:38:29 +01:00
Miroslav Stampar
f340ce8b4b Minor style update 2013-01-03 23:35:29 +01:00
Miroslav Stampar
1712603dce Replacing deprecated has_key() with operator in (PEP8) 2013-01-03 23:28:07 +01:00
Miroslav Stampar
e4a3c015e5 Replacing old and deprecated raise Exception style (PEP8) 2013-01-03 23:20:55 +01:00
Bernardo Damele
3a11d36c66 minor bug fix 2013-01-02 21:49:15 +00:00
Miroslav Stampar
cb15fcc8af Fix for an Issue #329 2013-01-02 22:17:06 +01:00
Miroslav Stampar
304e52cb4d Minor language update 2013-01-02 22:11:59 +01:00
Miroslav Stampar
09f1cdd8e1 Minor style update 2013-01-02 21:52:50 +01:00
Miroslav Stampar
0795760255 Minor fix 2012-12-30 11:22:23 +01:00
Miroslav Stampar
75edb84a71 Minor update 2012-12-30 11:10:32 +01:00
Miroslav Stampar
58ad2f1c5d Revert of last commit and proper fix 2012-12-29 10:35:05 +01:00
Miroslav Stampar
0e18fa9c5f Minor fix 2012-12-28 23:43:47 +01:00
Miroslav Stampar
648d91d790 Distinguishing invalid unicode from safe encoded characters (for proper potential decoding) 2012-12-27 22:43:39 +01:00
Miroslav Stampar
3d01890147 Patch for an Issue #56 (full target url is now being written to a output .CSV file in multi target mode) 2012-12-27 21:15:44 +01:00
Miroslav Stampar
cb91729913 Fix for an Issue #324 (crawling when HTML is not well-formed) 2012-12-27 20:55:37 +01:00
Miroslav Stampar
127b880577 Minor update 2012-12-27 15:14:40 +01:00
Miroslav Stampar
6ae4590edc Removing problematic per-MySQL LIMIT prefix 2012-12-26 19:48:01 +01:00
Miroslav Stampar
a77b7f00d9 Fix for an Issue #323 2012-12-23 19:34:35 +01:00
Bernardo Damele
832567ecf6 import order 2012-12-21 23:34:37 +00:00
Miroslav Stampar
77625e5af7 Minor revert 2012-12-21 19:31:05 +01:00
Miroslav Stampar
00e55828e4 Minor style update 2012-12-21 15:06:03 +01:00
Miroslav Stampar
8b3e17ed4d Minor update (better approach for those old NOT IN cases in MsSQL - instead of standard pivot dump table) 2012-12-21 14:52:47 +01:00
Miroslav Stampar
6c1ec9b54f Fix for an Issue #318 2012-12-21 11:10:05 +01:00
Miroslav Stampar
35728fa443 Fix (and some hidden bug fixes/improvements) regarding an Issue #317 2012-12-21 10:51:35 +01:00
Miroslav Stampar
352e516400 Bottle is a 3rd party tool (not going to extra folder) 2012-12-21 10:18:30 +01:00
Miroslav Stampar
b94a5d42d4 Removing a leftover 2012-12-21 09:49:09 +01:00
Miroslav Stampar
0a122ccce4 Related to an Issue #319 2012-12-21 09:47:58 +01:00
Miroslav Stampar
0d5d84edc7 Minor cleanup 2012-12-20 21:03:41 +01:00
Miroslav Stampar
712cf4e4db Fix for an Issue #316 2012-12-20 20:55:59 +01:00
Miroslav Stampar
1073ebc697 Merge branch 'master' of github.com:sqlmapproject/sqlmap 2012-12-20 20:51:41 +01:00
Bernardo Damele
89d8c58fd1 poor attempt at forking a child process for sqlmap engine execution, output is not handled yet 2012-12-20 17:56:53 +00:00
Bernardo Damele
912323c12d minor bug fix (#297) 2012-12-20 17:05:44 +00:00
Bernardo Damele
7adaffa71b fixed options initiation 2012-12-20 16:53:43 +00:00
Miroslav Stampar
1c4d438aff Merge branch 'master' of github.com:sqlmapproject/sqlmap 2012-12-20 16:37:03 +01:00
Bernardo Damele
b0635bddcc adjustments 2012-12-20 15:29:23 +00:00
Miroslav Stampar
8efe056671 Minor refactoring 2012-12-20 15:51:03 +01:00
Bernardo Damele
e9ab33e9dd standalone REST API, code cleanup (#297) 2012-12-20 14:35:02 +00:00
Bernardo Damele
5632279bf7 removed deprecated feature (#287) 2012-12-20 13:21:07 +00:00
Miroslav Stampar
63d9b7a1f8 No character shall be left forgotten (no more ? in case that character was not properly being decoded by used charset) 2012-12-20 12:23:37 +01:00
Miroslav Stampar
c2c4601d6e Minor restyling 2012-12-20 11:06:52 +01:00
Bernardo Damele
076b4063e6 these edits got overwritten from last commits 2012-12-20 09:42:44 +00:00
Miroslav Stampar
3cbe60b586 Proper fix 2012-12-20 10:37:20 +01:00
Miroslav Stampar
0d1ea7f05a Merge branch 'master' of github.com:sqlmapproject/sqlmap 
Conflicts:
	lib/core/testing.py
 2012-12-20 10:37:11 +01:00
Miroslav Stampar
da93e77eb2 Proper fix 2012-12-20 10:34:51 +01:00
Bernardo Damele
ac77724970 attempt to handle standard input from --live-test 2012-12-20 09:30:48 +00:00
Bernardo Damele
2b6ee06de0 minor bug fix to correctly parse unicode chars 2012-12-20 09:30:13 +00:00
Miroslav Stampar
69310e47ce Merge branch 'master' of github.com:sqlmapproject/sqlmap 2012-12-20 09:54:39 +01:00
Miroslav Stampar
06d8213ffd minor fix (reading of unicode xml files) 2012-12-20 09:53:08 +01:00
Bernardo Damele
86872956d5 minor bug fix (for PostgreSQL) 2012-12-19 22:55:31 +00:00
Bernardo Damele
77843f44fb minor bug fix (issue #314) 2012-12-19 22:49:02 +00:00
Bernardo Damele
357da43cea slight improvement of live test engine and added misc test cases to xml 2012-12-19 17:28:41 +00:00
Bernardo Damele
85fcd27e2d added support for random global variables 2012-12-19 15:58:06 +00:00
Bernardo Damele
12d34587cc minor restyling 2012-12-19 14:34:34 +00:00
Bernardo Damele
326ff404fc Merge branch 'master' of github.com:sqlmapproject/sqlmap 2012-12-19 14:25:35 +00:00
Bernardo Damele
12eed58485 pointless restyling 2012-12-19 14:25:29 +00:00
Miroslav Stampar
37346fe8a3 Merge branch 'master' of github.com:sqlmapproject/sqlmap 2012-12-19 15:23:57 +01:00
Miroslav Stampar
7ee98c7bff Just for one girl out there waiting for this patch ;) 2012-12-19 15:23:38 +01:00
Bernardo Damele
3be90c97aa forgot these 2012-12-19 14:12:45 +00:00
Bernardo Damele
cefb03c835 fixed bug related to issue #223 2012-12-19 14:12:09 +00:00
Bernardo Damele
27a12ae85b restyling 2012-12-19 13:47:17 +00:00
Bernardo Damele
4b3b4eb374 commented out partial work 2012-12-19 13:47:04 +00:00
Bernardo Damele
3655d1f12a revert change of name for now 2012-12-19 13:45:52 +00:00
Bernardo Damele
874e2176c6 Merge branch 'master' of github.com:sqlmapproject/sqlmap 2012-12-19 13:43:00 +00:00
Bernardo Damele
4f0f729982 be more specific in standard output message as to whether or not the read file is same as remote file 2012-12-19 13:42:56 +00:00
Miroslav Stampar
23153e8088 Merge branch 'master' of github.com:sqlmapproject/sqlmap 2012-12-19 14:29:08 +01:00
Miroslav Stampar
244901eda0 During --flush-session log file should be cleaned too (especially because of --live-tests) 2012-12-19 14:28:54 +01:00
Bernardo Damele
282aeb734f ORDER BY does not play well with UNION query SQLi (related to issue #313) 2012-12-19 13:21:16 +00:00
Bernardo Damele
259b345f1f catch ImportError exception if libmagic is not installed 2012-12-19 13:10:54 +00:00
Bernardo Damele
128597ee7e --run-case is now case insensitive 2012-12-19 12:45:46 +00:00
Bernardo Damele
b91c829103 minor bug fix (issue #310) 2012-12-19 12:42:31 +00:00
Bernardo Damele
2bc2c0431c fixed test cases 2012-12-19 12:33:37 +00:00
Bernardo Damele
9149d77cc8 removed duplicate code - fixes issue #310 2012-12-19 12:17:56 +00:00
Bernardo Damele
d80744d3d5 preparation for issue #310 2012-12-19 11:40:00 +00:00
Bernardo Damele
f5450e9f0e layout adjustment 2012-12-19 11:39:38 +00:00
Bernardo Damele
dee56b17c3 handle "LIMIT num" as well as "LIMIT num, num" across all techniques - fixes issue #308 2012-12-19 10:50:15 +00:00
Miroslav Stampar
155c1eddae Debug message with declared page charset 2012-12-19 11:16:42 +01:00
Miroslav Stampar
d29dddf5b2 Merge branch 'master' of github.com:sqlmapproject/sqlmap 2012-12-19 10:51:25 +01:00
Miroslav Stampar
92e338251a Finally working inference against MySQL/international letters (even chinese) 2012-12-19 10:44:02 +01:00
Bernardo Damele
65ed2304fd comment update 2012-12-19 09:38:03 +00:00
Bernardo Damele
0037d52098 typo fix 2012-12-19 01:11:18 +00:00
Miroslav Stampar
c9b8b51c9c Update lib/core/common.py 
Revert of last commit and try 2
 2012-12-19 01:48:53 +01:00
Bernardo Damele
8e95470415 minor refactoring 2012-12-19 00:46:23 +00:00
Bernardo Damele
318fcee49c Merge branch 'master' of github.com:sqlmapproject/sqlmap 2012-12-19 00:30:26 +00:00
Bernardo Damele
3c7007097a minor refactoring 2012-12-19 00:30:22 +00:00
Miroslav Stampar
50b846b5af Update lib/core/common.py 
Fixing wrong assumption in case of MySQL inference international character retrieval
 2012-12-19 01:26:12 +01:00
Miroslav Stampar
9e2f0131b9 Update lib/core/agent.py 2012-12-18 20:25:00 +01:00
Bernardo Damele
326ed33f31 added support for comma separated list of files for --file-read - fixes issue #223 2012-12-18 17:55:21 +00:00
Bernardo Damele
58656bbeb5 minor bug fix, union query has to be limited 0, 0 2012-12-18 16:36:30 +00:00
Bernardo Damele
61a838bb35 added more test cases 2012-12-18 15:59:48 +00:00
Miroslav Stampar
88d8494b5a Implementation for an Issue #307 2012-12-18 16:03:35 +01:00
Miroslav Stampar
7f47623876 Minor patch 2012-12-18 11:10:06 +01:00
Miroslav Stampar
2b64c10710 Patch for an Issue #304 2012-12-18 09:36:26 +01:00
Miroslav Stampar
4ea0c9e922 Another implementation for an Issue #302 2012-12-17 15:08:54 +01:00
Bernardo Damele
3c1b696bd6 removed more print statements 2012-12-17 13:35:32 +00:00
Bernardo Damele
1fdd804e94 replaced instances of dataToStdout with logger 2012-12-17 13:30:21 +00:00
Bernardo Damele
9f47eb0a59 cleaner 2012-12-17 13:29:37 +00:00
Bernardo Damele
0500712a03 removed unuseful prints 2012-12-17 13:29:19 +00:00
Bernardo Damele
ac44cf3ec0 minor fix: add also back-end DBMS and web app fingerprint output to log file 2012-12-17 13:02:09 +00:00
Bernardo Damele
bbd2adb5fb improvements to --live-test and added --stop-fail switch 2012-12-17 11:41:43 +00:00
Bernardo Damele
064d443d60 replaced unnecessary dataToStdout() call with appropriate logger.info() call 2012-12-17 11:30:08 +00:00
Bernardo Damele
2926c815bf improved test switch --live-test and minor refactoring 2012-12-17 11:29:33 +00:00
Bernardo Damele
f40c52cc17 comment adjustment 2012-12-17 11:28:03 +00:00
Bernardo Damele
2442a58884 minor leftover of deprecated XMLRPC service 2012-12-17 11:26:31 +00:00
Miroslav Stampar
60baf5071e Patch for an Issue #302 2012-12-17 00:40:01 +01:00
Bernardo Damele
d4a061d0c3 code cleanup - #297 2012-12-15 00:29:35 +00:00
Bernardo Damele
0c3da5c7eb code refactoring and first time logger is handled by a separate file descriptor (issue #297) 2012-12-15 00:12:22 +00:00
Bernardo Damele
2f6a31605c code refactoring (#279) 2012-12-14 22:00:42 +00:00
Bernardo Damele
8dee8355c2 on our way to make it thread safe.. it is a long way actually (issue #297) 2012-12-14 18:13:21 +00:00
Bernardo Damele
21ecffb750 added more comments, improved cleanup method 2012-12-14 17:21:19 +00:00
Bernardo Damele
1421e6a9d4 implemented cleanup and status admin methods 2012-12-14 16:18:45 +00:00
Bernardo Damele
4fa2f400ec minor fix 2012-12-14 15:55:30 +00:00
Bernardo Damele
4c4cb856ff minor bug fix to the /scan/<taskid>output method, forced each taskid to have its own temporary folder for output - issue #297 2012-12-14 15:52:35 +00:00
Bernardo Damele
27906f388f added first methods to interact with sqlmap core, it is now possible to launch a scan from the API, hurray! (issue #297) 2012-12-14 14:51:01 +00:00
Bernardo Damele
f52d81c834 Merge branch 'master' of github.com:sqlmapproject/sqlmap 2012-12-14 13:40:36 +00:00
Bernardo Damele
0b71c85d95 refactoring, code cleanup, more security-related headers and first /scan method implementation (issue #297) 2012-12-14 13:40:25 +00:00
Bernardo Damele
a2a71bb37b cleanup from XML-RPC related stuff 2012-12-14 13:37:36 +00:00
Miroslav Stampar
a3acf72e52 Fix for argparse issue 2012-12-14 14:35:11 +01:00
Miroslav Stampar
235631808f Merge branch 'master' of github.com:sqlmapproject/sqlmap 2012-12-14 14:25:02 +01:00
Bernardo Damele
3d9779ffd4 further improvements to RESTful API: enforce security headers across all HTTP responses properly and make consistent responses across methods (#297) 2012-12-14 12:15:04 +00:00
Bernardo Damele
7b43837238 cleaner solution for imports as standalone client/server (issue #297) 2012-12-14 12:04:44 +00:00
Bernardo Damele
90d5696b25 enhanced RESTful API to support JSON requests and improved standalone client/server skeleton (issue #297) 2012-12-14 12:01:13 +00:00
Bernardo Damele
156a291e2d typo fix 2012-12-14 11:55:54 +00:00
Miroslav Stampar
c41618416c Removing trailing blanks 2012-12-14 12:00:45 +01:00
Bernardo Damele
2e97405ffa bundle bottle library in sqlmap (it is MIT license) - issue #297 2012-12-14 03:00:30 +00:00
Bernardo Damele
0ec420cc70 leftovers 2012-12-14 02:54:16 +00:00
Bernardo Damele
a1b83cd56f added first implementation of REST-JSON API library - issue #297 2012-12-14 02:52:31 +00:00
Bernardo Damele
6e31e87de1 added initial support (hidden from -hh and not yet usable) for REST-JSON API 2012-12-14 02:49:25 +00:00
Miroslav Stampar
c040323821 Minor update 2012-12-13 14:55:20 +01:00
Miroslav Stampar
df0f08bc6a Cleaning some (web upload based) garbage 2012-12-13 13:19:47 +01:00
Miroslav Stampar
5150172178 Minor update 2012-12-13 10:03:21 +01:00
Miroslav Stampar
b78b56d782 Update for an Issue #287 regarding read_output returning values 2012-12-12 17:17:36 +01:00
Miroslav Stampar
fc4be0a77c Minor fix 2012-12-12 16:45:29 +01:00
Miroslav Stampar
e381158058 Hmmm... Let me guess. Update for an Issue #287 2012-12-12 16:31:20 +01:00
Miroslav Stampar
921000bd87 Another update for an Issue #287 2012-12-12 14:22:24 +01:00
Miroslav Stampar
c3f20a136f Minor update for an Issue #287 2012-12-12 14:03:03 +01:00
Miroslav Stampar
32b39c72e4 Minor update 2012-12-12 12:07:56 +01:00
Miroslav Stampar
af52e8e8c2 Minor update for an Issue #287 2012-12-12 12:01:18 +01:00
Miroslav Stampar
a6448e8768 Update for an Issue #287 2012-12-12 11:54:59 +01:00
Miroslav Stampar
ef33729381 Writing only unique hashes to an output file (for eventual cracking with 3rd party tools) 2012-12-12 09:59:24 +01:00
Miroslav Stampar
b9f6fc5f4e First commit (and working one) for an Issue #287 (XML-RPC server) 2012-12-11 16:02:06 +01:00
Miroslav Stampar
b5884c7eda Minor language update 2012-12-11 15:24:02 +01:00
Miroslav Stampar
760519dbe9 Removing redundant piece of code 2012-12-11 15:21:27 +01:00
Miroslav Stampar
a54c261496 Minor update for Issues #292 & #293 (only single alert per target) 2012-12-11 14:44:43 +01:00
Miroslav Stampar
5c2451d83c Implementation for an Issue #293 2012-12-11 12:48:58 +01:00
Miroslav Stampar
562044577b Implementation for an Issue #292 2012-12-11 12:02:06 +01:00
Miroslav Stampar
6433be8b3d Style update 2012-12-10 17:20:04 +01:00
Miroslav Stampar
996e882e78 Minor update 2012-12-10 17:13:00 +01:00
Miroslav Stampar
013dc8bc98 Another minor update for an Issue #267 2012-12-10 13:07:36 +01:00
Miroslav Stampar
8bd0080bf4 Minor update for an Issue #267 2012-12-10 13:05:41 +01:00
Miroslav Stampar
96df0ba061 Implemented support for plain , chars too (Issue #267) 2012-12-10 12:58:17 +01:00
Miroslav Stampar
d0ea4c65c5 Minor styl eupdate for an Issue #267 2012-12-10 12:54:01 +01:00
Miroslav Stampar
5677db02b7 Minor update 2012-12-10 12:40:28 +01:00
Miroslav Stampar
5606a860ce Oracle supports inline comments too (Issue #267) 2012-12-10 12:00:15 +01:00
Miroslav Stampar
a024884ca7 Support for a HTTP parameter pollution (Issue #267) 2012-12-10 11:55:31 +01:00
Miroslav Stampar
42f4c2bac9 Minor fix when --dbms is enforced 2012-12-10 11:42:10 +01:00
Miroslav Stampar
1f7644a691 Minor fix when user doesn't want custom injection char marker to be processed 2012-12-08 21:23:30 +01:00
Miroslav Stampar
0cbdaaecfa Revert of 99e9412f74 (because of an Issue #289) 2012-12-08 08:53:25 +01:00
Miroslav Stampar
73968a448c Minor update 2012-12-07 15:29:54 +01:00
Miroslav Stampar
e129a30e6b Removing redundant code in redirect handler (related to an Issue #288) 2012-12-07 12:40:19 +01:00
Miroslav Stampar
fccad15cfa Minor update for an Issue #288 2012-12-07 12:14:33 +01:00
Miroslav Stampar
75e6d77fbc Minor refactoring 2012-12-07 11:54:34 +01:00
Miroslav Stampar
fbaeecdaf9 Patch for an Issue #288 2012-12-07 11:52:21 +01:00
Miroslav Stampar
c0fc12beb2 Minor update for an Issue #288 2012-12-07 11:23:18 +01:00
Miroslav Stampar
1028afce37 Removal of leftovers 2012-12-06 14:15:44 +01:00
Miroslav Stampar
974407396e Doing some more style updating (capitalization of exception classes; using _ is enough for private members - __ is used in Python specific methods) 2012-12-06 14:14:19 +01:00
Miroslav Stampar
003d21e962 Minor style update (capitalization of leftover class names) 2012-12-06 13:46:24 +01:00
Miroslav Stampar
baccbd6f48 Implementation for an Issue #283 2012-12-06 11:57:57 +01:00
Miroslav Stampar
ab67344448 Removed unused imports and variables (pyflake-ing) 2012-12-06 11:15:05 +01:00
Miroslav Stampar
b6650add46 Introducing 'new style classes' (idea from Pull request #284) 2012-12-06 10:42:53 +01:00
Miroslav Stampar
0f191f624c Taking some goodies from Pull request #284 2012-12-06 10:21:53 +01:00
Miroslav Stampar
6b39e661a7 Fix for an issue #279 2012-12-05 12:15:14 +01:00
Miroslav Stampar
775e0df04b Update for an Issue #278 2012-12-05 10:45:17 +01:00
Miroslav Stampar
949fcb77cf Minor style update 2012-12-05 10:22:16 +01:00
Miroslav Stampar
d4b5133df7 Update for an Issue #272 2012-12-04 17:04:32 +01:00
Miroslav Stampar
a14697e8cf Implementation for an Issue #272 2012-12-04 16:47:34 +01:00
Miroslav Stampar
6b007ab188 Minor patch for an Issue #274 (just in case to avoid this kind of problems) 2012-12-04 16:14:14 +01:00
Miroslav Stampar
e2aa695655 Minor update 2012-12-03 17:20:18 +01:00
Miroslav Stampar
42a8234c6f Update for an Issue #12 2012-12-03 14:27:01 +01:00
Miroslav Stampar
79fca8e9d5 Fix for an Issue #268 2012-12-03 12:13:59 +01:00
Miroslav Stampar
8410fc5a9d Minor update 2012-12-02 08:00:55 +01:00
redshark1802
1675386093 fixed typo that created an invalid configuration file with the option '--save' 2012-11-30 23:00:03 +01:00
Miroslav Stampar
0664e72bea Minor fix for an Issue #230 2012-11-30 12:13:34 +01:00
Miroslav Stampar
5b61e9ce12 Minor update for an Issue #254 2012-11-30 11:43:50 +01:00
Miroslav Stampar
7e2db762d6 Minor update 2012-11-29 15:45:04 +01:00
Miroslav Stampar
8f10023523 Fix for an Issue #266 2012-11-29 15:44:14 +01:00
Miroslav Stampar
3b961c2550 Update for an Issue #254 2012-11-29 15:36:38 +01:00
Miroslav Stampar
605d73cc3d Minor refactoring 2012-11-29 12:21:12 +01:00
Miroslav Stampar
7304971544 Patch for ORDER BY test on MsSQL on cases with 'The text, ntext, and image data types cannot be compared or sorted, except when using IS NULL or LIKE operator' 2012-11-29 11:43:49 +01:00
Miroslav Stampar
7c16bfe025 Fix for error-based MsSQL dumping (in some cases failed because of wrong order - e.g. MIN(SUBSTRING( instead of SUBSTRING(MIN ) 2012-11-29 10:51:59 +01:00
Miroslav Stampar
a7e1e856d4 Fix for an Issue #260 2012-11-28 17:00:26 +01:00
Miroslav Stampar
35d1146fd1 Minor update for an (Issue #254) 2012-11-28 12:53:11 +01:00
Miroslav Stampar
753d0f18bf First CSS style added for a HTML table dump format (Issue #254) 2012-11-28 12:46:43 +01:00
Miroslav Stampar
b6ea337937 First style-less prototype for an HTML dump output (Issue #254) 2012-11-28 12:28:42 +01:00
Miroslav Stampar
e2d8b53e97 Minor update for an Issue #264 2012-11-28 11:45:33 +01:00
Miroslav Stampar
cff0c59630 Implementation for an Issue #264 2012-11-28 11:41:39 +01:00
Miroslav Stampar
5bf5b95588 More refactoring for an Issue #254 2012-11-28 11:16:00 +01:00
Miroslav Stampar
87a92ab330 Deprecating --replicate (Issue #254) 2012-11-28 11:10:57 +01:00
Miroslav Stampar
f08eb0fd9f Minor style update 2012-11-28 10:59:15 +01:00
Miroslav Stampar
d95dd2d16e Preparation for an Issue #254 2012-11-28 10:58:18 +01:00
Miroslav Stampar
621ae587c7 Fix for an Issue #263 2012-11-28 00:03:17 +01:00
Miroslav Stampar
d490ffb163 Fix for an Issue #259 2012-11-27 11:45:22 +01:00
Miroslav Stampar
bd33128085 Fix for an Issue #262 2012-11-27 10:08:22 +01:00
Miroslav Stampar
38c96a366b Patch for an Issue #260 2012-11-26 11:16:59 +01:00
Miroslav Stampar
ef2038f1c8 Implementation for an Issue #253 2012-11-21 10:16:13 +01:00
Miroslav Stampar
c40dded28c Fix for an Issue #250 2012-11-20 12:10:29 +01:00
Miroslav Stampar
93e071fc33 Fix for an Issue #251 2012-11-20 11:19:23 +01:00
Miroslav Stampar
302348b0cd Minor update 2012-11-19 11:59:28 +01:00
Miroslav Stampar
a40d7a5bca Minor improvement (safer to use column name in COUNT than *, especially when only one column is needed) 2012-11-15 15:06:54 +01:00
Miroslav Stampar
d37be5f97b Fix for an Issue #248 2012-11-14 15:54:24 +01:00
Miroslav Stampar
9a54a911a8 Patch for an Issue #231 2012-11-14 11:30:29 +01:00
Miroslav Stampar
5b3fe25211 Improving comparison engine (removing shared prelude part to further sharpen if pages are identical - especially noticable in small test pages) 2012-11-13 15:22:59 +01:00
Miroslav Stampar
6f7f9dd8eb Patch for an Issue #242 2012-11-13 10:41:13 +01:00
Miroslav Stampar
a52dbc575b Patch for an Issue #246 2012-11-13 10:21:11 +01:00
Miroslav Stampar
f305dde413 Patch for an Issue #235 2012-11-10 11:01:29 +01:00
Miroslav Stampar
181c3534f0 Patch for an Issue #237 2012-11-08 19:16:37 +01:00
Miroslav Stampar
e7e83defaa Minor update 2012-11-08 11:09:34 +01:00
Miroslav Stampar
1ee0d9ce5e Fix for an Issue #229 2012-11-05 15:58:54 +01:00
Miroslav Stampar
3cf5fc2f5a Fix for an Issue #230 2012-11-05 15:10:49 +01:00
Miroslav Stampar
2de52927f3 Code refactoring (epecially Google search code) 2012-10-30 18:38:10 +01:00
Miroslav Stampar
76b793b199 Fix for an Issue #228 2012-10-30 18:08:25 +01:00
Miroslav Stampar
6e2041bc13 Better language than in last commit 2012-10-30 11:54:21 +01:00
Miroslav Stampar
1bbeb92eb6 Better language (used formation 'not required' in case of help for --dependencies while 'required'->'needs' in a check itself) 2012-10-30 11:19:39 +01:00
Miroslav Stampar
5cfc066ac4 Minor update 2012-10-30 10:30:22 +01:00
Miroslav Stampar
7c7aff12c6 Update for an Issue #225 2012-10-30 01:26:19 +01:00
Miroslav Stampar
b0f5b4f9bc Update for an Issue #225 2012-10-30 00:59:31 +01:00
Miroslav Stampar
726de868e2 Fix for an Issue #225 2012-10-30 00:37:43 +01:00
Miroslav Stampar
a9094a35fe Fix for an Issue #227 2012-10-30 00:20:49 +01:00
Miroslav Stampar
1d07b93730 Bug fix for --os-shell on MySQL (it was not working for a long time because of this) 2012-10-29 15:45:30 +01:00
Miroslav Stampar
5358d85d37 Important refactoring for web-based functionality 2012-10-29 15:09:05 +01:00
Miroslav Stampar
81ccf28785 Minor refactoring 2012-10-29 14:08:48 +01:00
Miroslav Stampar
d6e16e8641 Minor update 2012-10-29 11:08:02 +01:00
Miroslav Stampar
359e734954 Minor refactoring 2012-10-29 10:48:49 +01:00
Miroslav Stampar
919f75db9b Improvement and fix for pivotDumpTable mechanism 2012-10-28 23:09:35 +01:00
Miroslav Stampar
d7973c3e32 Improvement of pivotDumpTable mechanism (no more fail on first entry) 2012-10-28 22:18:22 +01:00
Miroslav Stampar
c1eb803ef5 Bug fix for MsSQL --hex --technique=E (NOT IN based queries were not working properly) 2012-10-28 21:16:51 +01:00
Miroslav Stampar
b75c52f93c Minor display fix (in --hex mode) 2012-10-28 12:30:21 +01:00
Miroslav Stampar
25a5073281 Bug fix for --hex/--technique=B (especially MsSQL) 2012-10-28 12:22:33 +01:00
Miroslav Stampar
8617fe0d65 Bug fix for international letters decoded with --hex on MsSQL 2012-10-28 11:50:16 +01:00
Miroslav Stampar
ca427af8b3 Minor refactoring/improvement 2012-10-28 01:42:08 +02:00
Miroslav Stampar
43ddf39bea Minor refactoring 2012-10-28 01:16:02 +02:00
Miroslav Stampar
bcdba7b7bb Dealing with rare cases when getIdentifiedDbms is needed prior to DBMS isfingerprinted and there are multiples of dbmses inside details 2012-10-28 01:11:50 +02:00
Miroslav Stampar
c1b8226329 Massive renaming (proper naming is inband = union & error techniques! - query naming stays as they are/in code things like forgeInbandQuery are renamed to forgeUnionQuery) 2012-10-28 00:36:09 +02:00
Miroslav Stampar
a435ba6863 Minor fix 2012-10-28 00:19:00 +02:00
Miroslav Stampar
0aeb9dbe8b Bug fix (in --dump mode if error/inband failed with None other techniques were ignored) 2012-10-27 23:42:52 +02:00
Miroslav Stampar
06805b27f2 Bug fix (time was also meant to be disabled in case of error/inband getvalues) 2012-10-27 23:16:25 +02:00
Miroslav Stampar
7207cf29dd Minor update 2012-10-26 11:05:44 +02:00
Miroslav Stampar
965d7eee17 Minor bug fix for a reflection removal mechanism 2012-10-26 00:06:15 +02:00
Miroslav Stampar
235cc656b9 Fix for an Issue #224 2012-10-25 15:25:31 +02:00
Miroslav Stampar
bcf708f4b1 Minor update 2012-10-25 13:37:33 +02:00
Miroslav Stampar
fdcdd11cb9 Minor update for an Issue #222 2012-10-25 13:35:44 +02:00
Miroslav Stampar
8a5844a364 Implementation for an Issue #222 2012-10-25 13:21:32 +02:00
Miroslav Stampar
afd82b92dd Patch for an Issue #221 2012-10-25 10:21:36 +02:00
Miroslav Stampar
12fc9442b9 Tamper function(s) refactoring (really no need for returning headers as they are passed by reference) 2012-10-25 10:10:23 +02:00
Miroslav Stampar
54fbb22ab8 Minor refactoring 2012-10-25 09:56:36 +02:00
Miroslav Stampar
65ec715828 Fix for an Issue #218 2012-10-25 00:03:00 +02:00
Miroslav Stampar
5477c9f7ba Fix for an Issue #216 2012-10-24 22:59:46 +02:00
Miroslav Stampar
056be32ac1 Fix for Issue #213 2012-10-23 17:06:31 +02:00
Miroslav Stampar
99ceea5eae Fix for an Issue #214 2012-10-23 17:05:45 +02:00
Miroslav Stampar
f3aa09c794 Minor language fix 2012-10-23 15:52:43 +02:00
Miroslav Stampar
eb6f17b561 Fix for --dump and -d=mssql 2012-10-23 15:02:43 +02:00
Miroslav Stampar
4365c48e83 Minor style update 2012-10-23 14:38:24 +02:00
Miroslav Stampar
06f226c494 Fix for an Issue #211 2012-10-23 14:37:45 +02:00
Miroslav Stampar
b82eb3a1ae Fix for an Issue #210 2012-10-23 13:58:25 +02:00
Miroslav Stampar
f2bbf1ead9 Fix for raw_input raising EOFError and KeyboardInterrupt on Ctrl-C (Windows platform) 2012-10-23 11:05:00 +02:00
Miroslav Stampar
5ff2e33c43 Minor fix 2012-10-23 10:54:26 +02:00
Miroslav Stampar
68d5faa287 Minor update 2012-10-23 10:46:17 +02:00
Miroslav Stampar
54d086f409 Minor fix 2012-10-23 10:02:10 +02:00
Miroslav Stampar
f11a640e99 Undo of a previous commit (pdb left inside) 2012-10-22 14:39:35 +02:00
Miroslav Stampar
b913e2123d Displaying hex-decoded resulting output in --hex mode 2012-10-22 14:39:11 +02:00
Miroslav Stampar
029143880a Displaying hex-decoded resulting output in --hex mode 2012-10-22 14:36:01 +02:00
Miroslav Stampar
39f565533a In case on --no-cast DUMP_REPLACEMENTS should not be used 2012-10-22 14:13:30 +02:00
Miroslav Stampar
3f596cda85 Minor fix for --dump --technique=B when empty strings are returned 2012-10-22 11:49:23 +02:00
Miroslav Stampar
21481df239 Minor update for Issue #209 2012-10-21 19:00:37 +02:00
Miroslav Stampar
fb1497aa89 Minor update for Issue #209 2012-10-21 18:53:31 +02:00
Miroslav Stampar
261b286021 Fix for an Issue #209 2012-10-20 13:17:45 +02:00
Miroslav Stampar
6a271fe800 Update for an Issue #2 2012-10-19 11:29:03 +02:00
Miroslav Stampar
998eb70288 Minor update 2012-10-19 11:05:10 +02:00
Miroslav Stampar
987f167e12 Minor update 2012-10-19 11:03:54 +02:00
Miroslav Stampar
d65d9e25cd Implementation for an Issue #2 2012-10-19 11:02:14 +02:00
Miroslav Stampar
688a2db27a Fix for an Issue #208 2012-10-19 10:04:09 +02:00
Miroslav Stampar
64b4586883 Minor update 2012-10-18 11:36:12 +02:00
Miroslav Stampar
ea49fa2db2 Fix for an Issue #206 2012-10-18 11:11:20 +02:00
Miroslav Stampar
1cb2ca4195 Minor update 2012-10-18 10:55:27 +02:00
Miroslav Stampar
b5060c0010 Fix for an Issue #205 2012-10-16 14:28:46 +02:00
Miroslav Stampar
2cb1b054bb Implementation for an Issue #79 2012-10-16 12:32:58 +02:00
Miroslav Stampar
3e64ab214e Minor update 2012-10-16 10:28:59 +02:00
Miroslav Stampar
9ad58cb531 Implementation for an Issue #204 2012-10-16 10:24:05 +02:00
Miroslav Stampar
8b57e1fce6 Minor update for an Issue #203 2012-10-15 23:15:52 +02:00
Miroslav Stampar
42b2c85517 Minor cosmetics 2012-10-15 18:45:13 +02:00
Miroslav Stampar
c7cf8b2e80 Minor refactoring of direct() 2012-10-15 18:41:41 +02:00
Miroslav Stampar
048e720f69 Minor refactoring for an Issue #203 2012-10-15 17:55:57 +02:00
Miroslav Stampar
9aba690a60 Patch for an Issue #203 2012-10-15 16:23:41 +02:00
Miroslav Stampar
e440b096c5 Fix for an Issue #202 2012-10-15 12:24:30 +02:00
Miroslav Stampar
56832fe9c4 Better adjustTimeDelay() candidate algorithm 2012-10-11 14:23:53 +02:00
Miroslav Stampar
e61c4c22c9 Implementation for an Issue #200 2012-10-09 15:19:47 +02:00
Miroslav Stampar
cd9a47835b Minor consistency update 2012-10-09 14:48:26 +02:00
Miroslav Stampar
8c5fb1b064 Minor update 2012-10-09 14:46:45 +02:00
Miroslav Stampar
ea12ccec77 Minor refactoring 2012-10-09 11:33:19 +02:00
Miroslav Stampar
10b0fd21dc Fix for an Issue #198 2012-10-09 11:27:19 +02:00
Miroslav Stampar
5a91b6e622 Minor cleanup 2012-10-09 10:21:52 +02:00
Miroslav Stampar
8e7449ccd5 Minor update 2012-10-07 20:28:24 +02:00
Miroslav Stampar
ff205f088b Minor update 2012-10-07 20:12:55 +02:00
Miroslav Stampar
cc3f387551 Patch for an Issue #127 2012-10-05 10:49:31 +02:00
Miroslav Stampar
ebc7088f94 Implementation for an Issue #128 2012-10-05 10:24:09 +02:00
Miroslav Stampar
098e446ca4 Adding support for generic XML POST data 2012-10-04 18:44:12 +02:00
Miroslav Stampar
f71b937add Minor language cleanup 2012-10-04 18:28:36 +02:00
Miroslav Stampar
8865fe69d7 Minor cleanup 2012-10-04 18:26:07 +02:00
Miroslav Stampar
2fbd05c98f Minor language update 2012-10-04 18:04:55 +02:00
Miroslav Stampar
d464678e10 Minor update for an Issue #49 2012-10-04 18:01:42 +02:00
Miroslav Stampar
84b05e2d18 Better treating of numeric values (Issue #49) 2012-10-04 16:08:37 +02:00