feat: add more configuration

Author: Komalis

easyecs/command/__init__.py

@@ -28,6 +28,8 @@ def create_port_forwards(ecs_manifest, aws_region, aws_account, parsed_container
     for container in containers:
         container_name = container.name
         container_ports = container.port_forward
+        if ecs_manifest.copy_method == "sftp":
+            container_ports.append(f"{container.sftp_config.port}:{container.sftp_config.port}")
         for container_port in container_ports:
             from_port = container_port.split(":")[0]
             to_port = container_port.split(":")[1]
@@ -115,13 +117,16 @@ def run_sftp_sync_thread(ecs_manifest, aws_region, aws_account, parsed_container
     containers = ecs_manifest.task_definition.containers
     for container in containers:
         container_name = container.name
+        port = container.sftp_config.port
+        username = container.sftp_config.user
+        password = container.sftp_config.password
         target = parsed_containers.get(container_name)["ssm_target"]
         if len(container.volumes) > 0:
             observer = Observer()
             for volume in container.volumes:
                 _from, _ = volume.split(":")
                 event_handler = SynchronizeSFTPEventHandler(
-                    target, aws_region, aws_account, volume, container.volumes_excludes
+                    target, aws_region, aws_account, volume, container.volumes_excludes, port, username, password
                 )
                 event_handlers.append(event_handler)
                 observer.schedule(event_handler, _from, recursive=True)
@@ -314,7 +319,7 @@ def install_netcat_command(target, aws_region, aws_account) -> None:
         )
 
 
-def install_sshd_client(target, aws_region, aws_account, auto_install_override) -> None:
+def install_sshd_client(target, aws_region, aws_account, auto_install_override, port, user, password) -> None:
     DEBUG_EASYECS = os.environ.get("DEBUG_EASYECS", None)
     client = boto3.client("ssm")
     if len(auto_install_override) > 0:
@@ -324,25 +329,21 @@ def install_sshd_client(target, aws_region, aws_account, auto_install_override)
                 print(f" - {' '.join(cmd)}")
         commands_server = auto_install_override
     else:
-        if DEBUG_EASYECS:
-            print(f"{Color.YELLOW}Using default auto install commands:{Color.END}")
-            print(" - apt update")
-            print(" - apt install -y openssh-server")
-            print(" - echo 'root:root' | chpasswd")
-            print(" - mkdir /run/sshd")
-            print(' - echo "PermitRootLogin yes" >> /etc/ssh/sshd_config')
-            print(' - echo "Port 2312" >> /etc/ssh/sshd_config')
         commands_server = [
             ["apt update"],
             [
                 "/bin/bash -c 'DEBIAN_FRONTEND=noninteractive apt install -y"
                 " openssh-server'"
             ],
-            ["/bin/bash -c 'echo 'root:root' | chpasswd'"],
+            [f"/bin/bash -c 'echo '{user}:{password}' | chpasswd'"],
             ["mkdir /run/sshd"],
             ["/bin/bash -c 'echo \"PermitRootLogin yes\" >> /etc/ssh/sshd_config'"],
-            ["/bin/bash -c 'echo \"Port 2312\" >> /etc/ssh/sshd_config'"],
+            [f"/bin/bash -c 'echo \"Port {port}\" >> /etc/ssh/sshd_config'"],
         ]
+        if DEBUG_EASYECS:
+            print(f"{Color.YELLOW}Using default auto install commands:{Color.END}")
+            for cmd in commands_server:
+                print(f" - {' '.join(cmd)}")
     for command_server in commands_server:
         parameters_nc_server = {"command": command_server}
         ssm_nc_server = client.start_session(
@@ -446,8 +447,9 @@ def run_sftp_commands(
             else:
                 if not has_sshd and auto_install_sftp:
                     install_sshd_client(
-                        ssm_target, aws_region, aws_account, auto_install_override
+                        ssm_target, aws_region, aws_account, auto_install_override, container.sftp_config.port, container.sftp_config.user, container.sftp_config.password
                     )
+                time.sleep(2) # Wait a bit for sshd to be ready
                 run_sshd_command(
                     parsed_containers,
                     aws_region,

easyecs/command/event/synchronize_event_handler.py

@@ -59,15 +59,15 @@ def netcat(hostname, port, content, input, output):
 
 
 def sftp(
-    target, aws_region, aws_account, hostname, port, input, output, volumes_excludes
+    target, aws_region, aws_account, hostname, port, username, password, input, output, volumes_excludes
 ):
     from easyecs.command import generate_ssm_cmd
 
     DEBUG_EASYECS = os.environ.get("DEBUG_EASYECS", None)
     try:
         ssh = paramiko.SSHClient()
         ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
-        ssh.connect(hostname, port=port, username="root", password="root")
+        ssh.connect(hostname, port=port, username=username, password=password)
 
         with SCPClient(ssh.get_transport()) as scp:
             if DEBUG_EASYECS:
@@ -161,7 +161,7 @@ def dispatch(self, event: FileSystemEvent):
 
 
 class SynchronizeSFTPEventHandler(FileSystemEventHandler):
-    def __init__(self, target, aws_region, aws_account, volume, volumes_excludes):
+    def __init__(self, target, aws_region, aws_account, volume, volumes_excludes, port, username, password):
         super().__init__()
         self.target = target
         self.aws_region = aws_region
@@ -173,14 +173,19 @@ def __init__(self, target, aws_region, aws_account, volume, volumes_excludes):
         self.output_dirname = dirname(self.output)
         self.last_event = datetime.datetime.now().timestamp()
         self.volumes_excludes = volumes_excludes
+        self.port = port
+        self.username = username
+        self.password = password
 
     def synchronize(self):
         sftp(
             self.target,
             self.aws_region,
             self.aws_account,
             "127.0.0.1",
-            2312,
+            self.port,
+            self.username,
+            self.password,
             self.input,
             self.output_dirname,
             self.volumes_excludes,

easyecs/model/ecs.py

@@ -96,6 +96,12 @@ class EcsFileContainerHealthCheckModel(BaseModel):
     timeout: int
 
 
+class EcsSftpConfig(BaseModel):
+    port: int = 2312
+    user: str = "root"
+    password: str = "root"
+
+
 class EcsFileContainerModel(BaseModel):
     name: str
     image: str
@@ -115,6 +121,8 @@ class EcsFileContainerModel(BaseModel):
     healthcheck: Optional[EcsFileContainerHealthCheckModel] = None
     depends_on: Optional[Dict[str, Dict[str, str]]] = None
     ports: Optional[List[str]] = []
+    sftp_config: EcsSftpConfig = EcsSftpConfig()
+
 
     @field_validator("volumes")
     def validate_volumes(cls, volumes):
@@ -218,13 +226,12 @@ def validate_subnets(self):
             )
         return self
 
-
 class EcsFileModel(BaseModel):
     metadata: EcsFileMetadataModel
     role: EcsFileRoleModel
     execution_role: EcsFileRoleModel
     task_definition: EcsTaskDefinitionModel
     load_balancer: Optional[EcsLoadBalancerModel] = None
     security_group_id: Optional[str] = None
-    copy_method: str = "nc"
     auto_install_override: list[list[str]] = []
+    copy_method: str = "nc"