添加--unstable, --results-file选项

Author: needle-wang

handlers.py

@@ -277,6 +277,8 @@ def _collect_opts(self):
                                 m._page1_general_output_dir_entry),
       self._get_text_only_ckbtn("--skip-waf",
                                 m._page1_misc_skip_waf_ckbtn),
+      self._get_text_only_ckbtn("--unstable",
+                                m._page1_misc_unstable_ckbtn),
       self._get_text_only_ckbtn("--list-tampers",
                                 m._page1_misc_list_tampers_ckbtn),
       self._get_text_only_ckbtn("--sqlmap-shell",
@@ -310,6 +312,9 @@ def _collect_opts(self):
       self._get_text_from_entry("-z ",
                                 m._page1_misc_z_ckbtn,
                                 m._page1_misc_z_entry),
+      self._get_text_from_entry("--results-file=",
+                                m._page1_misc_results_file_ckbtn,
+                                m._page1_misc_results_file_entry),
     ]
 
     _file_opts = [

model.py

@@ -355,6 +355,7 @@ def __init__(self):
     self._page1_general_output_dir_chooser = btn.new_with_label('打开')
     # 杂项
     self._page1_misc_skip_waf_ckbtn = cb('跳过WAF/IPS侦测')
+    self._page1_misc_unstable_ckbtn = cb('为不稳定的连接调整选项')
     self._page1_misc_list_tampers_ckbtn = cb('列出可用的tamper脚本')
     self._page1_misc_sqlmap_shell_ckbtn = cb('打开sqlmap交互shell')
     self._page1_misc_disable_color_ckbtn = cb('禁用终端输出的颜色')
@@ -375,6 +376,9 @@ def __init__(self):
     self._page1_misc_answers_entry = et(text = 'quit=N,follow=N')
     self._page1_misc_z_ckbtn = cb('使用短的助记符')
     self._page1_misc_z_entry = et(text = 'flu,bat,ban,tec=EU...')
+    self._page1_misc_results_file_ckbtn = cb('指定CSV文件位置:')
+    self._page1_misc_results_file_entry = FileEntry()
+    self._page1_misc_results_file_chooser = btn.new_with_label('打开')
   # 输出区(2)
     # self._page2_cmdline_str_label = label.new('')
     self._page2_respwan_btn = btn.new_with_label('重开终端')

opts_gtk.py

@@ -1050,9 +1050,10 @@ def _build_page1_other_general(self, m):
   def _build_page1_other_misc(self, m):
     f = Frame.new('杂项')
 
-    _boxes = [Box() for _ in range(4)]
+    _boxes = [Box() for _ in range(5)]
 
     _boxes[0].pack_start(m._page1_misc_skip_waf_ckbtn, False, True, 5)
+    _boxes[0].pack_start(m._page1_misc_unstable_ckbtn, False, True, 5)
     _boxes[0].pack_start(m._page1_misc_list_tampers_ckbtn, False, True, 5)
     _boxes[0].pack_start(m._page1_misc_sqlmap_shell_ckbtn, False, True, 5)
     _boxes[0].pack_start(m._page1_misc_disable_color_ckbtn, False, True, 5)
@@ -1070,7 +1071,6 @@ def _build_page1_other_misc(self, m):
       self._handlers.set_file_entry_text,
       [m._page1_misc_tmp_dir_entry, '选择 本地临时目录']
     )
-
     _boxes[2].pack_start(m._page1_misc_alert_ckbtn, False, True, 5)
     _boxes[2].pack_start(m._page1_misc_alert_entry, True, True, 5)
     _boxes[2].pack_start(m._page1_misc_tmp_dir_ckbtn, False, True, 5)
@@ -1081,6 +1081,15 @@ def _build_page1_other_misc(self, m):
     _boxes[3].pack_start(m._page1_misc_z_ckbtn, False, True, 5)
     _boxes[3].pack_start(m._page1_misc_z_entry, True, True, 5)
 
+    m._page1_misc_results_file_chooser.connect(
+      'clicked',
+      self._handlers.set_file_entry_text,
+      [m._page1_misc_results_file_entry]
+    )
+    _boxes[4].pack_start(m._page1_misc_results_file_ckbtn, False, True, 5)
+    _boxes[4].pack_start(m._page1_misc_results_file_entry, True, True, 0)
+    _boxes[4].pack_start(m._page1_misc_results_file_chooser, False, True, 5)
+
     _page1_other_misc_opts = Box(orientation=VERTICAL, spacing=6)
     for _ in _boxes:
       _page1_other_misc_opts.add(_)

tooltips.py

@@ -147,7 +147,7 @@ def set_all_tooltips(self, m):
         '另外: sqlmap不会针对(伪)静态网页(/param1/value1/),\n'
         '在任意(get/post/header等)可能的注入参数后加*即可',
                       m._inject_area_skip_static_ckbtn)
-    self._set_tooltip('--skip=...,...\tSkip testing for given parameter(s)',
+    self._set_tooltip('--skip=...,...  Skip testing for given parameter(s)',
                       m._inject_area_skip_ckbtn,
                       m._inject_area_skip_entry)
     self._set_tooltip('--param-exclude=.. Regexp to exclude parameters from testing',
@@ -394,7 +394,7 @@ def set_all_tooltips(self, m):
     self._set_tooltip('--safe-req=',
                       m._request_area_safe_req_ckbtn,
                       m._request_area_safe_req_entry)
-    self._set_tooltip('--safe-freq=SAFE.. Test requests between two visits to a given safe URL',
+    self._set_tooltip('--safe-freq=SAFE..  Test requests between two visits to a given safe URL',
                       m._request_area_safe_freq_ckbtn,
                       m._request_area_safe_freq_entry)
     self._set_tooltip('--ignore-proxy',
@@ -662,10 +662,10 @@ def set_all_tooltips(self, m):
     self._set_tooltip('--crawl-exclude=',
                       m._page1_general_crawl_exclude_ckbtn,
                       m._page1_general_crawl_exclude_entry)
-    self._set_tooltip('-t TRAFFICFILE      Log all HTTP traffic into a textual file',
+    self._set_tooltip('-t TRAFFICFILE  Log all HTTP traffic into a textual file',
                       m._page1_general_traffic_file_ckbtn,
                       m._page1_general_traffic_file_entry)
-    self._set_tooltip('--har=HARFILE       Log all HTTP traffic into a HAR file',
+    self._set_tooltip('--har=HARFILE  Log all HTTP traffic into a HAR file',
                       m._page1_general_har_ckbtn,
                       m._page1_general_har_entry)
     self._set_tooltip('--flush-session',
@@ -676,10 +676,10 @@ def set_all_tooltips(self, m):
     self._set_tooltip('--csv-del=',
                       m._page1_general_csv_del_ckbtn,
                       m._page1_general_csv_del_entry)
-    self._set_tooltip('--save=SAVECONFIG Save options to a configuration INI file',
+    self._set_tooltip('--save=SAVECONFIG  Save options to a configuration INI file',
                       m._page1_general_save_ckbtn,
                       m._page1_general_save_entry)
-    self._set_tooltip('-s SESSIONFILE      Load session from a stored (.sqlite) file',
+    self._set_tooltip('-s SESSIONFILE  Load session from a stored (.sqlite) file',
                       m._page1_general_session_file_ckbtn,
                       m._page1_general_session_file_entry)
     self._set_tooltip('--output-dir=',
@@ -689,6 +689,8 @@ def set_all_tooltips(self, m):
         '默认情况, 会发送一个可疑的payload(所以有时明显没有防护还报警告)\n'
         '勾选以禁用此默认机制',
                       m._page1_misc_skip_waf_ckbtn)
+    self._set_tooltip('--unstable  Adjust options for unstable connections',
+                      m._page1_misc_unstable_ckbtn)
     self._set_tooltip('--list-tampers',
                       m._page1_misc_list_tampers_ckbtn)
     self._set_tooltip('--sqlmap-shell',
@@ -722,6 +724,9 @@ def set_all_tooltips(self, m):
     self._set_tooltip('-z MNEMONICS Use short mnemonics (e.g. "flu,bat,ban,tec=EU")',
                       m._page1_misc_z_ckbtn,
                       m._page1_misc_z_entry)
+    self._set_tooltip('--results-file=R..  Location of CSV results file in multiple targets mode',
+                      m._page1_misc_results_file_ckbtn,
+                      m._page1_misc_results_file_entry)
     # 二、日志区(page3)
     self._set_tooltip('不会修改文件',
                       m._page3_clear_btn)