nginx-lens 0.3.1__tar.gz → 0.3.3__tar.gz

{nginx_lens-0.3.1/nginx_lens.egg-info → nginx_lens-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nginx-lens
-Version: 0.3.1
+Version: 0.3.3
 Summary: CLI-инструмент для анализа, визуализации и диагностики конфигураций Nginx
 Author: Daniil Astrouski
 Author-email: shelovesuastra@gmail.com
@@ -9,6 +9,7 @@ License-File: LICENSE
 Requires-Dist: typer[all]>=0.9.0
 Requires-Dist: rich>=13.0.0
 Requires-Dist: requests>=2.25.0
+Requires-Dist: dnspython>=2.0.0
 Dynamic: author
 Dynamic: author-email
 Dynamic: license-file

{nginx_lens-0.3.1 → nginx_lens-0.3.3}/commands/health.py

@@ -1,3 +1,4 @@
+import sys
 import typer
 from rich.console import Console
 from rich.table import Table
@@ -22,14 +23,16 @@ def health(
         nginx-lens health /etc/nginx/nginx.conf --timeout 5 --retries 3 --mode http
         nginx-lens health /etc/nginx/nginx.conf --resolve
     """
+    exit_code = 0
+    
     try:
         tree = parse_nginx_config(config_path)
     except FileNotFoundError:
         console.print(f"[red]Файл {config_path} не найден. Проверьте путь к конфигу.[/red]")
-        return
+        sys.exit(1)
     except Exception as e:
         console.print(f"[red]Ошибка при разборе {config_path}: {e}[/red]")
-        return
+        sys.exit(1)
 
     upstreams = tree.get_upstreams()
     results = check_upstreams(upstreams, timeout=timeout, retries=retries, mode=mode.lower())
@@ -50,6 +53,10 @@ def health(
             status = "Healthy" if srv["healthy"] else "Unhealthy"
             color = "green" if srv["healthy"] else "red"
             
+            # Проверяем статус здоровья
+            if not srv["healthy"]:
+                exit_code = 1
+            
             if resolve:
                 resolved_list = []
                 if name in resolved_info:
@@ -61,10 +68,17 @@ def health(
                 if resolved_list:
                     # Показываем все IP-адреса через запятую
                     resolved_str = ", ".join(resolved_list)
-                    table.add_row(srv["address"], f"[{color}]{status}[/{color}]", f"[green]{resolved_str}[/green]")
+                    # Если есть "invalid resolve", показываем красным, иначе зеленым
+                    if any("invalid resolve" in r for r in resolved_list):
+                        table.add_row(srv["address"], f"[{color}]{status}[/{color}]", f"[red]{resolved_str}[/red]")
+                        exit_code = 1
+                    else:
+                        table.add_row(srv["address"], f"[{color}]{status}[/{color}]", f"[green]{resolved_str}[/green]")
                 else:
                     table.add_row(srv["address"], f"[{color}]{status}[/{color}]", "[yellow]Failed to resolve[/yellow]")
+                    exit_code = 1
             else:
                 table.add_row(srv["address"], f"[{color}]{status}[/{color}]")
 
     console.print(table)
+    sys.exit(exit_code)

{nginx_lens-0.3.1 → nginx_lens-0.3.3}/commands/resolve.py

@@ -1,3 +1,4 @@
+import sys
 import typer
 from rich.console import Console
 from rich.table import Table
@@ -16,19 +17,21 @@ def resolve(
     Пример:
         nginx-lens resolve /etc/nginx/nginx.conf
     """
+    exit_code = 0
+    
     try:
         tree = parse_nginx_config(config_path)
     except FileNotFoundError:
         console.print(f"[red]Файл {config_path} не найден. Проверьте путь к конфигу.[/red]")
-        return
+        sys.exit(1)
     except Exception as e:
         console.print(f"[red]Ошибка при разборе {config_path}: {e}[/red]")
-        return
+        sys.exit(1)
 
     upstreams = tree.get_upstreams()
     if not upstreams:
         console.print("[yellow]Не найдено ни одного upstream в конфигурации.[/yellow]")
-        return
+        sys.exit(0)  # Нет upstream - это не ошибка, просто нет чего проверять
     
     results = resolve_upstreams(upstreams)
 
@@ -44,9 +47,16 @@ def resolve(
             if resolved_list:
                 # Показываем все IP-адреса через запятую
                 resolved_str = ", ".join(resolved_list)
-                table.add_row(upstream_name, srv["address"], f"[green]{resolved_str}[/green]")
+                # Если есть "invalid resolve", показываем красным, иначе зеленым
+                if any("invalid resolve" in r for r in resolved_list):
+                    table.add_row(upstream_name, srv["address"], f"[red]{resolved_str}[/red]")
+                    exit_code = 1
+                else:
+                    table.add_row(upstream_name, srv["address"], f"[green]{resolved_str}[/green]")
             else:
                 table.add_row(upstream_name, srv["address"], "[red]Failed to resolve[/red]")
+                exit_code = 1
 
     console.print(table)
+    sys.exit(exit_code)
 

{nginx_lens-0.3.1 → nginx_lens-0.3.3/nginx_lens.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nginx-lens
-Version: 0.3.1
+Version: 0.3.3
 Summary: CLI-инструмент для анализа, визуализации и диагностики конфигураций Nginx
 Author: Daniil Astrouski
 Author-email: shelovesuastra@gmail.com
@@ -9,6 +9,7 @@ License-File: LICENSE
 Requires-Dist: typer[all]>=0.9.0
 Requires-Dist: rich>=13.0.0
 Requires-Dist: requests>=2.25.0
+Requires-Dist: dnspython>=2.0.0
 Dynamic: author
 Dynamic: author-email
 Dynamic: license-file

{nginx_lens-0.3.1 → nginx_lens-0.3.3}/nginx_lens.egg-info/requires.txt

@@ -1,3 +1,4 @@
 typer[all]>=0.9.0
 rich>=13.0.0
 requests>=2.25.0
+dnspython>=2.0.0

{nginx_lens-0.3.1 → nginx_lens-0.3.3}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="nginx-lens",
-    version="0.3.1",
+    version="0.3.3",
     description="CLI-инструмент для анализа, визуализации и диагностики конфигураций Nginx",
     author="Daniil Astrouski",
     author_email="shelovesuastra@gmail.com",
@@ -12,6 +12,7 @@ setup(
         "typer[all]>=0.9.0",
         "rich>=13.0.0",
         "requests>=2.25.0",
+        "dnspython>=2.0.0",
     ],
     entry_points={
         "console_scripts": [

{nginx_lens-0.3.1 → nginx_lens-0.3.3}/upstream_checker/checker.py

@@ -4,6 +4,12 @@ import socket
 import time
 import http.client
 from typing import Dict, List
+try:
+    import dns.resolver
+    import dns.exception
+    DNS_AVAILABLE = True
+except ImportError:
+    DNS_AVAILABLE = False
 
 
 def check_tcp(address: str, timeout: float, retries: int) -> bool:
@@ -51,13 +57,17 @@ def check_http(address: str, timeout: float, retries: int) -> bool:
 
 def resolve_address(address: str) -> List[str]:
     """
-    Резолвит адрес upstream сервера в IP-адреса.
+    Резолвит адрес upstream сервера в IP-адреса с информацией о CNAME.
     
     Args:
         address: Адрес в формате "host:port" или "host:port параметры"
         
     Returns:
-        Список IP-адресов в формате "ip:port" или пустой список, если резолвинг не удался
+        Список строк в формате:
+        - "ip:port" - если резолвинг успешен без CNAME
+        - "ip:port (via cname.example.com)" - если есть CNAME и все ок
+        - "invalid resolve (via cname.example.com -> TXT)" - если CNAME ведет на невалидную запись
+        Пустой список, если резолвинг не удался
     """
     try:
         host_port = address.split()[0]
@@ -70,14 +80,12 @@ def resolve_address(address: str) -> List[str]:
             return []
         host, port = parts
         
-        # Если это уже IPv4 адрес, возвращаем как есть
         try:
             socket.inet_aton(host)
             return [host_port]
         except socket.error:
             pass
         
-        # Проверяем IPv6 (в квадратных скобках)
         if host.startswith("[") and host.endswith("]"):
             ipv6_host = host[1:-1]
             try:
@@ -86,23 +94,93 @@ def resolve_address(address: str) -> List[str]:
             except (socket.error, OSError):
                 pass
         
-        # Пытаемся резолвить DNS имя - получаем все IP-адреса
+        if DNS_AVAILABLE:
+            return _resolve_with_dns(host, port)
+        else:
+            return _resolve_with_socket(host, port)
+    except (ValueError, IndexError, AttributeError):
+        return []
+
+
+def _resolve_with_dns(host: str, port: str) -> List[str]:
+    """Резолвит DNS с использованием dnspython для получения информации о CNAME."""
+    try:
+        cname_info = None
+        invalid_type = None
+        
         try:
-            # gethostbyname_ex возвращает (hostname, aliaslist, ipaddrlist)
-            _, _, ipaddrlist = socket.gethostbyname_ex(host)
-            # Фильтруем только IPv4 адреса (IPv6 обрабатываются отдельно)
-            resolved_ips = []
-            for ip in ipaddrlist:
+            cname_answer = dns.resolver.resolve(host, 'CNAME', raise_on_no_answer=False)
+            if cname_answer:
+                cname_target = str(cname_answer[0].target).rstrip('.')
+                cname_info = cname_target
+                
                 try:
-                    # Проверяем, что это IPv4
-                    socket.inet_aton(ip)
+                    a_answer = dns.resolver.resolve(cname_target, 'A', raise_on_no_answer=False)
+                    if a_answer:
+                        resolved_ips = []
+                        for rdata in a_answer:
+                            ip = str(rdata.address)
+                            resolved_ips.append(f"{ip}:{port} (via {cname_info})")
+                        return resolved_ips
+                    else:
+                        try:
+                            txt_answer = dns.resolver.resolve(cname_target, 'TXT', raise_on_no_answer=False)
+                            if txt_answer:
+                                invalid_type = 'TXT'
+                        except:
+                            pass
+                        if not invalid_type:
+                            try:
+                                mx_answer = dns.resolver.resolve(cname_target, 'MX', raise_on_no_answer=False)
+                                if mx_answer:
+                                    invalid_type = 'MX'
+                            except:
+                                pass
+                        if not invalid_type:
+                            try:
+                                ns_answer = dns.resolver.resolve(cname_target, 'NS', raise_on_no_answer=False)
+                                if ns_answer:
+                                    invalid_type = 'NS'
+                            except:
+                                pass
+                        if invalid_type:
+                            return [f"invalid resolve (via {cname_info} -> {invalid_type})"]
+                        else:
+                            return [f"invalid resolve (via {cname_info})"]
+                except Exception:
+                    return [f"invalid resolve (via {cname_info})"]
+        except Exception:
+            pass
+        
+        try:
+            a_answer = dns.resolver.resolve(host, 'A', raise_on_no_answer=False)
+            if a_answer:
+                resolved_ips = []
+                for rdata in a_answer:
+                    ip = str(rdata.address)
                     resolved_ips.append(f"{ip}:{port}")
-                except socket.error:
-                    pass
-            return resolved_ips if resolved_ips else []
-        except (socket.gaierror, OSError):
-            return []
-    except (ValueError, IndexError, AttributeError):
+                return resolved_ips if resolved_ips else []
+        except Exception:
+            pass
+        
+        return []
+    except Exception:
+        return []
+
+
+def _resolve_with_socket(host: str, port: str) -> List[str]:
+    """Fallback резолвинг через socket (без информации о CNAME)."""
+    try:
+        _, _, ipaddrlist = socket.gethostbyname_ex(host)
+        resolved_ips = []
+        for ip in ipaddrlist:
+            try:
+                socket.inet_aton(ip)
+                resolved_ips.append(f"{ip}:{port}")
+            except socket.error:
+                pass
+        return resolved_ips if resolved_ips else []
+    except (socket.gaierror, OSError):
         return []