nginx-lens 0.3.1__py3-none-any.whl → 0.3.2__py3-none-any.whl

commands/health.py

@@ -61,7 +61,11 @@ 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]")
+                    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]")
             else:

commands/resolve.py

@@ -44,7 +44,11 @@ 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]")
+                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]")
 

{nginx_lens-0.3.1.dist-info → nginx_lens-0.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nginx-lens
-Version: 0.3.1
+Version: 0.3.2
 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.dist-info → nginx_lens-0.3.2.dist-info}/RECORD

@@ -15,10 +15,10 @@ commands/analyze.py,sha256=W6begSgXNjgKJGoGeguR3WKgHPLkClWXxxpDcqvsJdc,8343
 commands/cli.py,sha256=brzp6xDDWIrm7ibaoT4x94hgAdBB2DVWniXoK8dRylE,782
 commands/diff.py,sha256=C7gRIWh6DNWHzjiQBPVTn-rZ40m2KCY75Zd6Q4URJIE,2076
 commands/graph.py,sha256=xB6KjXBkLmm5gII3e-5BMRGO7WeTwc7EFxRGzYgnme4,5947
-commands/health.py,sha256=ZGc42Ak4xoZt9r9DJ_84AvgQ8yXCO-CzWppvsOww1Yo,3086
+commands/health.py,sha256=JAlUKx2kXhi2eigSQXG7GxuQMPydYzojgV2qaRcoLWw,3429
 commands/include.py,sha256=5PTYG5C00-AlWfIgpQXLq9E7C9yTFSv7HrZkM5ogDps,2224
 commands/logs.py,sha256=RkPUdIpbO9dOVL56lemreYRuAjMjcqqMxRCKOFv2gC4,3691
-commands/resolve.py,sha256=hdbvB88bgivNt1v5LMyhf--2mwfI_IUXyi4b1IUB62A,1841
+commands/resolve.py,sha256=LVfp-cva-XlKOOIS5Da908mBGgjq1DtZlsahMUylAsk,2151
 commands/route.py,sha256=-x_71u6ENl3iO-oxK3bdE8v5eZKf4xRCydeUyXMFVrY,3163
 commands/syntax.py,sha256=ZWFdaL8LVv9S694wlk2aV3HJKb0OSKjw3wNgTlNvFR8,3418
 commands/tree.py,sha256=mDfx0Aeg1EDQSYQoJ2nJIkSd_uP7ZR7pEqy7Cw3clQ0,2161
@@ -26,13 +26,13 @@ exporter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 exporter/graph.py,sha256=WYUrqUgCaK6KihgxAcRHaQn4oMo6b7ybC8yb_36ZIsA,3995
 exporter/html.py,sha256=uquEM-WvBt2aV9GshgaI3UVhYd8sD0QQ-OmuNtvYUdU,798
 exporter/markdown.py,sha256=_0mXQIhurGEZ0dO-eq9DbsuKNrgEDIblgtL3DAgYNo8,724
-nginx_lens-0.3.1.dist-info/licenses/LICENSE,sha256=g8QXKdvZZC56rU8E12vIeYF6R4jeTWOsblOnYAda3K4,1073
+nginx_lens-0.3.2.dist-info/licenses/LICENSE,sha256=g8QXKdvZZC56rU8E12vIeYF6R4jeTWOsblOnYAda3K4,1073
 parser/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 parser/nginx_parser.py,sha256=Sa9FtGAkvTqNzoehBvgLUWPJHLLIZYWH9ugSHW50X8s,3699
 upstream_checker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-upstream_checker/checker.py,sha256=Th49U6OF-egTH145XOyrfIUUHtygBJiOtqqD9ZT1lKo,5261
-nginx_lens-0.3.1.dist-info/METADATA,sha256=Z-8Ke06GaHt1iVb4zvhX5G3RiJMHwW7bdHRuwKi9Wd8,520
-nginx_lens-0.3.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nginx_lens-0.3.1.dist-info/entry_points.txt,sha256=qEcecjSyLqcJjbIVlNlTpqAhPqDyaujUV5ZcBTAr3po,48
-nginx_lens-0.3.1.dist-info/top_level.txt,sha256=mxLJO4rZg0rbixVGhplF3fUNFs8vxDIL25ronZNvRy4,51
-nginx_lens-0.3.1.dist-info/RECORD,,
+upstream_checker/checker.py,sha256=ZwAlIW6yh0OVdeI44dpZUeSUbByE04gBxTUsRMRUgU8,9496
+nginx_lens-0.3.2.dist-info/METADATA,sha256=DanBz8o77g84wsKtgPzMKCa2IrX8VVrq78DOFuJeTdA,552
+nginx_lens-0.3.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nginx_lens-0.3.2.dist-info/entry_points.txt,sha256=qEcecjSyLqcJjbIVlNlTpqAhPqDyaujUV5ZcBTAr3po,48
+nginx_lens-0.3.2.dist-info/top_level.txt,sha256=mxLJO4rZg0rbixVGhplF3fUNFs8vxDIL25ronZNvRy4,51
+nginx_lens-0.3.2.dist-info/RECORD,,

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]
@@ -86,23 +96,104 @@ def resolve_address(address: str) -> List[str]:
             except (socket.error, OSError):
                 pass
         
-        # Пытаемся резолвить DNS имя - получаем все IP-адреса
+        # Используем dnspython для детального DNS резолвинга
+        if DNS_AVAILABLE:
+            return _resolve_with_dns(host, port)
+        else:
+            # Fallback на стандартный socket, если dnspython недоступен
+            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
+        
+        # Сначала проверяем CNAME для исходного хоста
         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
+                
+                # Если есть CNAME, проверяем A записи для CNAME цели (не для исходного хоста)
                 try:
-                    # Проверяем, что это IPv4
-                    socket.inet_aton(ip)
+                    a_answer = dns.resolver.resolve(cname_target, 'A', raise_on_no_answer=False)
+                    if a_answer:
+                        # CNAME ведет на валидные A записи
+                        resolved_ips = []
+                        for rdata in a_answer:
+                            ip = str(rdata.address)
+                            resolved_ips.append(f"{ip}:{port} (via {cname_info})")
+                        return resolved_ips
+                    else:
+                        # Нет A записей для CNAME цели, проверяем другие типы
+                        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
+        
+        # Если нет CNAME, получаем A записи для исходного хоста
+        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:
+        # gethostbyname_ex возвращает (hostname, aliaslist, ipaddrlist)
+        _, _, ipaddrlist = socket.gethostbyname_ex(host)
+        # Фильтруем только IPv4 адреса (IPv6 обрабатываются отдельно)
+        resolved_ips = []
+        for ip in ipaddrlist:
+            try:
+                # Проверяем, что это IPv4
+                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 []