fix(cli): implement block format for clickable full URLs and fix safe_print kwargs (v1.3.1)

Author: brgkdm

exc_analyzer/commands/actions_audit.py

@@ -128,12 +128,10 @@ def _print_audit_results(repo, results):
         else:
             safe_print(Print.colorize(note_line, '96'))
         _write_output(note_line)
-        url_display = result['url']
-        if len(url_display) > 55:
-            url_display = url_display[:52] + "..."
-        url_line = f"         URL: {url_display}"
-        safe_print(Print.colorize(url_line, '90'))
-        _write_output(url_line)
+        link_line_prefix = "         -> "
+        safe_print(Print.colorize(link_line_prefix, '90'), end="")
+        safe_print(Print.colorize(result['url'], '33'))
+        _write_output(f"         -> {result['url']}")
         if i < len(results):
             safe_print("")
             _write_output("")

exc_analyzer/commands/advanced_secrets.py

@@ -73,22 +73,10 @@ async def _scan_with_sem(url, path, source):
                     source_line = f"    {t('commands.advanced_secrets.output.source')}: {source}"
                     safe_print(Print.colorize(source_line, '97'))
                     _write_output(source_line)
-                    display_url = url
-                    if "github.com" in url and len(url) > 60:
-                        for marker in ["/raw/", "/blob/", "/commit/"]:
-                            if marker in url:
-                                parts = url.split(marker)
-                                if len(parts) == 2:
-                                    base = parts[0]
-                                    rest = parts[1]
-                                    if len(rest) > 20:
-                                        display_url = f"{base}{marker}.../{rest.split('/')[-1]}"
-                                        break
-                        if display_url == url: 
-                             display_url = url[:50] + "..." + url[-10:]
-                    indent = "    "
-                    safe_print(indent, end="") 
-                    Print.hyperlink(display_url, url)
+                    link_label = "    -> "
+                    safe_print(Print.colorize(link_label, '90'), end="") 
+                    safe_print(Print.colorize(url, '33'))
+                    _write_output(f"    -> {url}")
                     _write_output(f"    {url}")
                     print()
                     _write_output("")

exc_analyzer/commands/dork_scan.py

@@ -6,7 +6,7 @@
 import math
 from collections import Counter
 from urllib.parse import quote, unquote
-from ..print_utils import Print, _write_output
+from ..print_utils import Print, _write_output, safe_print, colorize
 from ..api import api_get, get_auth_header
 from ..i18n import t
 from .dork_presets import PRESETS, get_preset_choices
@@ -193,30 +193,28 @@ def _calculate_entropy(text):
         entropy -= probability * math.log2(probability)
     return entropy
 def _print_results(results, verify_enabled=False):
-    columns = [
-        {'header': t("commands.dork_scan.table_header.repo"), 'width': 25, 'color': '94'},
-        {'header': t("commands.dork_scan.table_header.file"), 'width': None, 'color': '97'}, 
-        {'header': t("commands.dork_scan.table_header.link"), 'width': 35, 'color': '33'}
-    ]
-    if verify_enabled:
-        columns.append({'header': t("commands.dork_scan.table_header.status"), 'width': 20, 'color': '92'})
     safe_print("")
-    printer = TablePrinter(columns)
-    printer.print_header()
-    w_repo = columns[0]['_actual_width']
-    w_file = columns[1]['_actual_width']
-    w_link = columns[2]['_actual_width']
-    w_stat = columns[3]['_actual_width'] if verify_enabled else 0
-    for i, res in enumerate(results):
-        display_repo = _truncate(res['repo'], w_repo)
-        display_file = smart_truncate_path(res['path'], w_file)
-        display_link = shorten_display_url(res['url'], w_link)
-        row = [display_repo, display_file, (display_link, res['url'])]
+    _write_output("")
+    for i, res in enumerate(results, 1):
+        # Header for the result item
+        status_part = ""
         if verify_enabled:
-            row.append(_truncate(res['status'], w_stat))
-        style = "2;" if i % 2 == 1 else ""
-        printer.print_row(row, style_prefix=style)
+            status = res.get('status', 'Unknown')
+            color = '92' if status == '200 OK' else '91'
+            status_part = f" [{Print.colorize(status, color)}]"
+        header = f"[+] {Print.colorize(res['repo'], '94')} | {Print.colorize(res['path'], '97')}{status_part}"
+        safe_print(header)
+        _write_output(f"[+] {res['repo']} | {res['path']} {res.get('status', '')}")
+        # Link part with symbolic link look
+        link_line_prefix = "    -> "
+        safe_print(Print.colorize(link_line_prefix, '90'), end="")
+        safe_print(Print.colorize(res['url'], '33'))
+        _write_output(f"    -> {res['url']}")
+        if i < len(results):
+            safe_print("")
+            _write_output("")
     safe_print("")
+    _write_output("")
     Print.info(t("commands.dork_scan.total", count=len(results)))
     Print.warn(t("commands.dork_scan.disclaimer"))
     safe_print("")
@@ -247,6 +245,10 @@ def _list_presets():
         print(f"  - {k:<10} : {examples}")
     print()
 def shorten_display_url(full_url, max_len):
+    """
+    Returns a shortened display text for the URL.
+    The actual hyperlink will use the full URL (passed separately as tuple).
+    """
     try:
        full_url = unquote(full_url)
     except:
@@ -258,7 +260,7 @@ def shorten_display_url(full_url, max_len):
         rest = parts[1]
         sha_parts = rest.split("/", 1)
         filename = sha_parts[1].split("/")[-1] if len(sha_parts) > 1 else "file"
-        prefix = "github.com/.../"
+        prefix = "https://github.com/.../"
         available = max_len - len(prefix)
         if len(filename) > available:
             filename = _truncate(filename, available)
@@ -305,6 +307,4 @@ def _smart_quote_query(query):
         if f"{mod}:" in query:
             return query
     return f'"{query}"'
-def safe_print(msg=""):
-    print(msg)
-    _write_output(msg)
+

exc_analyzer/print_utils.py

@@ -116,95 +116,95 @@ def safe_print(text='', **kwargs):
     _write_output(text)
 class Print:
     @staticmethod
-    def success(msg):
+    def success(msg, **kwargs):
         from exc_analyzer.i18n import t
         prefix = t("log_levels.success")
         colored_msg = colorize(f"[{prefix}] {msg}", '92')
         try:
-            print(colored_msg)
+            print(colored_msg, **kwargs)
         except UnicodeEncodeError:
-            print(colored_msg.encode('utf-8', errors='replace').decode('utf-8'))
+            print(colored_msg.encode('utf-8', errors='replace').decode('utf-8'), **kwargs)
         _write_output(f"[{prefix}] {msg}")
     @staticmethod
-    def error(msg):
+    def error(msg, **kwargs):
         from exc_analyzer.i18n import t
         prefix = t("log_levels.error")
         colored_msg = colorize(f"[{prefix}] {msg}", '91')
         try:
-            print(colored_msg)
+            print(colored_msg, **kwargs)
         except UnicodeEncodeError:
-            print(colored_msg.encode('utf-8', errors='replace').decode('utf-8'))
+            print(colored_msg.encode('utf-8', errors='replace').decode('utf-8'), **kwargs)
         _write_output(f"[{prefix}] {msg}")
     @staticmethod
-    def warn(msg):
+    def warn(msg, **kwargs):
         from exc_analyzer.i18n import t
         prefix = t("log_levels.warn")
         colored_msg = colorize(f"[{prefix}] {msg}", '93')
         try:
-            print(colored_msg)
+            print(colored_msg, **kwargs)
         except UnicodeEncodeError:
-            print(colored_msg.encode('utf-8', errors='replace').decode('utf-8'))
+            print(colored_msg.encode('utf-8', errors='replace').decode('utf-8'), **kwargs)
         _write_output(f"[{prefix}] {msg}")
     @staticmethod
-    def info(msg):
+    def info(msg, **kwargs):
         from exc_analyzer.i18n import t
         prefix = t("log_levels.info")
         colored_msg = colorize(f"[{prefix}] {msg}", '96')
         try:
-            print(colored_msg)
+            print(colored_msg, **kwargs)
         except UnicodeEncodeError:
-            print(colored_msg.encode('utf-8', errors='replace').decode('utf-8'))
+            print(colored_msg.encode('utf-8', errors='replace').decode('utf-8'), **kwargs)
         _write_output(f"[{prefix}] {msg}")
     @staticmethod
-    def action(msg):
+    def action(msg, **kwargs):
         from exc_analyzer.i18n import t
         prefix = t("log_levels.action")
         colored_msg = colorize(f"[{prefix}] {msg}", '90')
         try:
-            print(colored_msg)
+            print(colored_msg, **kwargs)
         except UnicodeEncodeError:
-            print(colored_msg.encode('utf-8', errors='replace').decode('utf-8'))
+            print(colored_msg.encode('utf-8', errors='replace').decode('utf-8'), **kwargs)
         _write_output(f"[{prefix}] {msg}")
     @staticmethod
-    def critical_error(msg):
+    def critical_error(msg, **kwargs):
         from exc_analyzer.i18n import t
         prefix = t("log_levels.critical_error")
         colored_msg = colorize(f"[{prefix}] {msg}", '1;91')
         try:
-            print(colored_msg)
+            print(colored_msg, **kwargs)
         except UnicodeEncodeError:
-            print(colored_msg.encode('utf-8', errors='replace').decode('utf-8'))
+            print(colored_msg.encode('utf-8', errors='replace').decode('utf-8'), **kwargs)
         _write_output(f"[{prefix}] {msg}")
     @staticmethod
-    def cancelled(msg):
+    def cancelled(msg, **kwargs):
         from exc_analyzer.i18n import t
         prefix = t("log_levels.cancelled")
         colored_msg = colorize(f"[{prefix}] {msg}", '90')
         try:
-            print(colored_msg)
+            print(colored_msg, **kwargs)
         except UnicodeEncodeError:
-            print(colored_msg.encode('utf-8', errors='replace').decode('utf-8'))
+            print(colored_msg.encode('utf-8', errors='replace').decode('utf-8'), **kwargs)
         _write_output(f"[{prefix}] {msg}")
     @staticmethod
-    def link(url):
+    def link(url, **kwargs):
         colored_msg = colorize(url, '94')
         try:
-            print(colored_msg)
+            print(colored_msg, **kwargs)
         except UnicodeEncodeError:
-            print(colored_msg.encode('utf-8', errors='replace').decode('utf-8'))
+            print(colored_msg.encode('utf-8', errors='replace').decode('utf-8'), **kwargs)
         _write_output(url)
     @staticmethod
-    def hyperlink(text, url):
+    def hyperlink(text, url, **kwargs):
         """Print clickable hyperlink (OSC 8) with shortened text."""
         colored_text = colorize(text, '33')
         if COLOR_ENABLED:
             link_seq = f"\033]8;;{url}\033\\{colored_text}\033]8;;\033\\"
         else:
             link_seq = f"{text} ({url})"
         try:
-            print(link_seq)
+            print(link_seq, **kwargs)
         except UnicodeEncodeError:
-            print(link_seq.encode('utf-8', errors='replace').decode('utf-8'))
+            print(link_seq.encode('utf-8', errors='replace').decode('utf-8'), **kwargs)
         _write_output(f"{text} ({url})")
     @staticmethod
     def colorize(text, color_code):