From cc30a8e9b11761b85f0d0f15e4cdc40830bb6257 Mon Sep 17 00:00:00 2001
From: Warren <warren@momentry.ddns.net>
Date: Sat, 20 Jun 2026 12:53:25 +0800
Subject: [PATCH] feat(ssh): Add ScpState state machine for SCP file transfer
 (Phase 8.3 init)

---
 data/auth.sqlite                        | Bin 73728 -> 73728 bytes
 markbase-core/src/ssh_server/channel.rs |  20 ++++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/data/auth.sqlite b/data/auth.sqlite
index d92f7afbae2a3609cb5eb625c3b3212c89d92310..323d51d0f2147307a6b0f0d1102ce07bace6debe 100644
GIT binary patch
delta 296
zcmZoTz|wGlWr8$g>qHr6#@3Aq?J|t1lMhNMOy-ci!zMhXiK9P#^D9|4Mj*Sfu0L(^
zH@QDd!c#VXk$=uF`HYuYmMJ$sH#M)MsFM9TC$lJ1N@{LC`_s)|^gr+mJY!|%WMY5L
zz`z1#07dPwiu(We=W}2{0$iIJ3z!v{9oV-_W<OBR#J**-qJR!Nlf1)Z#gihuX2MgL
zi%XM}Q;Un`?Li`&Umus`V0Pf$I+^`KJrnQN%@Z#e^D+xhaoD`?t{W4x1JBpV><{Xh
zc)o5{RLJGw;bxX*gz9(L%=p$$h*4^?!~acSU;Y2j&p2!Q7k<Y7{JgV}T*LqX3RGTk

delta 252
zcmZoTz|wGlWr8$g!$cWp#)gdv?J|r>lMhNMOy-ci!^Yau#L=I!`IRgiBaq!#*PlH3
zo7^8J)|Sm*<e&3PKIUbXWy;OZP0cGQs$_q{$t=p0lA4>({%G?T{SW*Ck6D>Hnb@B&
zFtC6bKv8?FqW=H=`Ro~x0M};50%iqfd-ki7*$>ojRuu4OXOg#{tawsn^Xuc19L)B-
z`zEtr07@uW@NV9B*Nq7%!Z?}z0Z62pXEWnlJ0V8N$qxTFfnEClKR@Hl?O*sA|MT<C
IM6!he0JH;7UH||9

diff --git a/markbase-core/src/ssh_server/channel.rs b/markbase-core/src/ssh_server/channel.rs
index 8b041e2..2f12dad 100644
--- a/markbase-core/src/ssh_server/channel.rs
+++ b/markbase-core/src/ssh_server/channel.rs
@@ -178,6 +178,7 @@ impl ChannelManager {
             exec_process: None,            // Phase 14: 交互式exec
             sftp_input_buffer: Vec::new(), // ⭐⭐⭐⭐⭐ Phase 14.2修复：SFTP packet累积
             scp_input_buffer: Vec::new(),  // ⭐⭐⭐⭐⭐ Phase 14.4修复：SCP packet累积
+            scp_state: ScpState::Idle,       // ⭐⭐⭐⭐⭐ Phase 8.3: SCP state machine
             direct_tcpip: None,
             forwarded_tcpip: None,
         };
@@ -255,6 +256,7 @@ impl ChannelManager {
             exec_process: None,
             sftp_input_buffer: Vec::new(),
             scp_input_buffer: Vec::new(),
+            scp_state: ScpState::Idle,       // ⭐⭐⭐⭐⭐ Phase 8.3: SCP state machine
             direct_tcpip: Some(direct_tcpip),
             forwarded_tcpip: None,
         };
@@ -329,6 +331,7 @@ impl ChannelManager {
             exec_process: None,            // Phase 14: 交互式exec
             sftp_input_buffer: Vec::new(), // ⭐⭐⭐⭐⭐ Phase 14.2修复
             scp_input_buffer: Vec::new(),  // ⭐⭐⭐⭐⭐ Phase 14.4修复
+            scp_state: ScpState::Idle,       // ⭐⭐⭐⭐⭐ Phase 8.3: SCP state machine
             direct_tcpip: None,
             forwarded_tcpip: Some(forwarded_tcpip),
         };
@@ -1945,6 +1948,8 @@ struct Channel {
     sftp_input_buffer: Vec<u8>, // Phase 14.2修复：累积不完整的SFTP packets
     // ⭐⭐⭐⭐⭐ Phase 14.4：SCP packet累积buffer
     scp_input_buffer: Vec<u8>, // Phase 14.4修复：累积不完整的SCP packets
+    // ⭐⭐⭐⭐⭐ Phase 8.3: SCP file transfer state machine
+    scp_state: ScpState,       // Phase 8.3: SCP state tracking
     // Phase 13.3: 端口转发相关字段
     direct_tcpip: Option<DirectTcpipChannel>, // direct-tcpip channel（Remote forwarding）
     forwarded_tcpip: Option<ForwardedTcpipChannel>, // forwarded-tcpip channel（Local forwarding）
@@ -1957,6 +1962,21 @@ enum ChannelState {
     Closed,
 }
 
+/// ⭐⭐⭐⭐⭐ Phase 8.3: SCP file transfer state machine
+/// Reference: OpenSSH scp.c: sink() (destination mode)
+#[derive(Debug, Clone)]
+enum ScpState {
+    Idle,
+    FileCommandReceived {
+        size: u64,
+        filename: String,
+        remaining: u64,
+    },
+    DirectoryCreated {
+        dirname: String,
+    },
+}
+
 /// SSH string读取辅助函数
 fn read_ssh_string<R: std::io::Read>(reader: &mut R) -> Result<String> {
     let length = reader.read_u32::<BigEndian>()?;