raijin-server 0.2.30__tar.gz → 0.2.32__tar.gz

{raijin_server-0.2.30/src/raijin_server.egg-info → raijin_server-0.2.32}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: raijin-server
-Version: 0.2.30
+Version: 0.2.32
 Summary: CLI para automacao de setup e hardening de servidores Ubuntu Server.
 Home-page: https://example.com/raijin-server
 Author: Equipe Raijin

{raijin_server-0.2.30 → raijin_server-0.2.32}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = raijin-server
-version = 0.2.30
+version = 0.2.32
 description = CLI para automacao de setup e hardening de servidores Ubuntu Server.
 long_description = file: README.md
 long_description_content_type = text/markdown

raijin_server-0.2.32/src/raijin_server/__init__.py

@@ -0,0 +1,5 @@
+"""Pacote principal do CLI Raijin Server."""
+
+__version__ = "0.2.32"
+
+__all__ = ["__version__"]

{raijin_server-0.2.30 → raijin_server-0.2.32}/src/raijin_server/modules/kong.py

@@ -150,23 +150,28 @@ def _uninstall_kong(ctx: ExecutionContext) -> None:
     )
     
     run_cmd(
-        ["kubectl", "delete", "namespace", "kong", "--ignore-not-found"],
+        ["kubectl", "delete", "namespace", "kong", "--ignore-not-found", "--wait=false"],
         ctx,
         check=False,
     )
     
-    # Remove CRDs do Kong tambem
-    crds = _check_orphan_crds(ctx)
-    if crds:
-        typer.echo(f"Removendo {len(crds)} CRDs do Kong...")
-        for crd in crds:
-            run_cmd(
-                ["kubectl", "delete", "crd", crd, "--ignore-not-found"],
-                ctx,
-                check=False,
-            )
+    # Remove CRDs do Kong diretamente (mais confiável)
+    typer.echo("Removendo CRDs do Kong...")
+    run_cmd(
+        ["sh", "-c", "kubectl get crd -o name | grep konghq.com | xargs -r kubectl delete --ignore-not-found"],
+        ctx,
+        check=False,
+    )
+    
+    # Aguarda namespace terminar de deletar
+    typer.echo("Aguardando limpeza completa...")
+    run_cmd(
+        ["kubectl", "wait", "--for=delete", "namespace/kong", "--timeout=60s"],
+        ctx,
+        check=False,
+    )
     
-    time.sleep(5)
+    time.sleep(3)
 
 
 def _wait_for_kong_ready(ctx: ExecutionContext, timeout: int = 180) -> bool:

{raijin_server-0.2.30 → raijin_server-0.2.32}/src/raijin_server/modules/ssh_hardening.py

@@ -43,7 +43,8 @@ def _write_authorized_keys(username: str, content: str, ctx: ExecutionContext) -
 
     ssh_dir.mkdir(parents=True, exist_ok=True)
     os.chmod(ssh_dir, 0o700)
-    auth_file.write_text(AUTHORIZED_KEYS_TEMPLATE.format(key=content.strip()))
+    normalized_key = content.replace("\r\n", "\n").strip()  # normaliza CRLF de chaves geradas no Windows
+    auth_file.write_text(AUTHORIZED_KEYS_TEMPLATE.format(key=normalized_key))
     os.chmod(auth_file, 0o600)
     run_cmd(["chown", "-R", f"{username}:{username}", str(ssh_dir)], ctx)
 
@@ -69,12 +70,16 @@ def run(ctx: ExecutionContext) -> None:
     username = typer.prompt("Usuario administrativo para SSH", default="adminops")
     ssh_port = typer.prompt("Porta SSH", default="22")
     sudo_access = typer.confirm("Adicionar usuario ao grupo sudo?", default=True)
+    extra_users = typer.prompt(
+        "Usuarios adicionais permitidos (opcional, separados por espaco)", default=""
+    ).strip()
     pubkey_path = typer.prompt(
-        "Arquivo com chave publica (ENTER para ~/.ssh/id_ed25519.pub)",
-        default=str(Path.home() / ".ssh/id_ed25519.pub"),
+        "Arquivo com chave publica ou authorized_keys existente",
+        default=str(Path.home() / ".ssh/authorized_keys"),
     )
 
     public_key = _load_public_key(pubkey_path)
+    allow_users = " ".join(part for part in [username, extra_users] if part).strip()
 
     _ensure_user(username, ctx)
     if sudo_access:
@@ -91,7 +96,10 @@ PasswordAuthentication no
 PermitEmptyPasswords no
 ChallengeResponseAuthentication no
 UsePAM yes
-AllowUsers {username}
+KbdInteractiveAuthentication no
+PubkeyAuthentication yes
+AuthorizedKeysFile %h/.ssh/authorized_keys
+AllowUsers {allow_users}
 AuthenticationMethods publickey
 X11Forwarding no
 ClientAliveInterval 300

{raijin_server-0.2.30 → raijin_server-0.2.32/src/raijin_server.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: raijin-server
-Version: 0.2.30
+Version: 0.2.32
 Summary: CLI para automacao de setup e hardening de servidores Ubuntu Server.
 Home-page: https://example.com/raijin-server
 Author: Equipe Raijin

raijin_server-0.2.30/src/raijin_server/__init__.py

@@ -1,5 +0,0 @@
-"""Pacote principal do CLI Raijin Server."""
-
-__version__ = "0.2.30"
-
-__all__ = ["__version__"]