RafayAhmad/flux-sftp
1
0
Fork 0
Code Issues Pull requests Projects Releases 3 Packages Wiki Activity Actions

update fstat and fix exclude opening files

Browse source
This commit is contained in:
RafayAhmad7548 2025-07-06 14:45:01 +05:00
parent f1bc7e9a1b
commit 649263ff5f
1 changed files with 32 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/sftp.rs
View file

@ -61,7 +61,12 @@ impl SftpHandler for SftpSession {
_attrs: FileAttributes, _attrs: FileAttributes,
) -> Result<SftpHandle, Self::Error> { ) -> Result<SftpHandle, Self::Error> {
println!("open called, path: {}", filename); println!("open called, path: {}", filename);
let filename = format!("{}/{}", self.jail_dir, filename); println!("pflags raw: {:b}", pflags.bits());
println!("pflags: read: {}, write: {}, append: {}, create: {}, truncate: {}", pflags.contains(OpenFlags::READ), pflags.contains(OpenFlags::WRITE), pflags.contains(OpenFlags::APPEND), pflags.contains(OpenFlags::CREATE), pflags.contains(OpenFlags::TRUNCATE));
let path = format!("{}{}", self.jail_dir, filename);
if pflags.contains(OpenFlags::EXCLUDE) && fs::metadata(&path).await.is_ok() {
return Err(StatusCode::Failure)
}
let mut options = OpenOptions::new(); let mut options = OpenOptions::new();
options options
.read(pflags.contains(OpenFlags::READ)) .read(pflags.contains(OpenFlags::READ))
@ -69,7 +74,7 @@ impl SftpHandler for SftpSession {
.append(pflags.contains(OpenFlags::APPEND)) .append(pflags.contains(OpenFlags::APPEND))
.create(pflags.contains(OpenFlags::CREATE)) .create(pflags.contains(OpenFlags::CREATE))
.truncate(pflags.contains(OpenFlags::TRUNCATE)); .truncate(pflags.contains(OpenFlags::TRUNCATE));
match options.open(&filename).await { match options.open(&path).await {
Ok(file) => { Ok(file) => {
self.handles.insert(filename.clone(), Handle::File(file)); self.handles.insert(filename.clone(), Handle::File(file));
Ok(SftpHandle { id, handle: filename }) Ok(SftpHandle { id, handle: filename })
@ -133,8 +138,8 @@ impl SftpHandler for SftpSession {
offset: u64, offset: u64,
data: Vec<u8>, data: Vec<u8>,
) -> Result<Status, Self::Error> { ) -> Result<Status, Self::Error> {
println!("write called, offset: {}, data: {:?}", offset, String::from_utf8(data.clone()));
if let Handle::File(file) = self.handles.get_mut(&handle).unwrap() { if let Handle::File(file) = self.handles.get_mut(&handle).unwrap() {
match file.seek(SeekFrom::Start(offset)).await { match file.seek(SeekFrom::Start(offset)).await {
Ok(_) => { Ok(_) => {
match file.write_all(&data).await { match file.write_all(&data).await {
@ -170,7 +175,7 @@ impl SftpHandler for SftpSession {
path: String, path: String,
) -> Result<SftpHandle, Self::Error> { ) -> Result<SftpHandle, Self::Error> {
println!("opendir called: {}", path); println!("opendir called: {}", path);
let path = format!("{}/{}", self.jail_dir, path); let path = format!("{}{}", self.jail_dir, path);
match fs::read_dir(&path).await { match fs::read_dir(&path).await {
Ok(entries) => { Ok(entries) => {
self.handles.insert(path.clone(), Handle::Dir(entries)); self.handles.insert(path.clone(), Handle::Dir(entries));
@ -247,7 +252,7 @@ impl SftpHandler for SftpSession {
path: String, path: String,
) -> Result<Attrs, Self::Error> { ) -> Result<Attrs, Self::Error> {
println!("stat called: {}", path); println!("stat called: {}", path);
let path = format!("{}/{}", self.jail_dir, path); let path = format!("{}{}", self.jail_dir, path);
match fs::metadata(path).await { match fs::metadata(path).await {
Ok(metadata) => Ok(Attrs { id, attrs: FileAttributes { Ok(metadata) => Ok(Attrs { id, attrs: FileAttributes {
size: Some(metadata.size()), size: Some(metadata.size()),
@ -270,7 +275,7 @@ impl SftpHandler for SftpSession {
path: String, path: String,
) -> Result<Attrs, Self::Error> { ) -> Result<Attrs, Self::Error> {
println!("lstat called: {}", path); println!("lstat called: {}", path);
let path = format!("{}/{}", self.jail_dir, path); let path = format!("{}{}", self.jail_dir, path);
match fs::symlink_metadata(path).await { match fs::symlink_metadata(path).await {
Ok(metadata) => Ok(Attrs { id, attrs: FileAttributes { Ok(metadata) => Ok(Attrs { id, attrs: FileAttributes {
size: Some(metadata.size()), size: Some(metadata.size()),
@ -293,8 +298,22 @@ impl SftpHandler for SftpSession {
id: u32, id: u32,
handle: String, handle: String,
) -> Result<Attrs, Self::Error> { ) -> Result<Attrs, Self::Error> {
println!("fstat called"); println!("fstat called: {}", handle);
self.stat(id, handle).await if let Handle::File(file) = self.handles.get(&handle).unwrap() {
let metadata = file.metadata().await.unwrap();
Ok(Attrs { id, attrs: FileAttributes {
size: Some(metadata.size()),
permissions: Some(metadata.mode()),
atime: Some(metadata.atime() as u32),
mtime: Some(metadata.mtime() as u32),
..Default::default()
}})
}
else {
println!("handle is not a filehandle");
Err(StatusCode::Failure)
}
} }
async fn remove( async fn remove(
@ -303,7 +322,7 @@ impl SftpHandler for SftpSession {
filename: String, filename: String,
) -> Result<Status, Self::Error> { ) -> Result<Status, Self::Error> {
println!("remove called: {}", filename); println!("remove called: {}", filename);
let filename = format!("{}/{}", self.jail_dir, filename); let filename = format!("{}{}", self.jail_dir, filename);
match fs::remove_file(filename).await { match fs::remove_file(filename).await {
Ok(()) => Ok(Status { id, status_code: StatusCode::Ok, error_message: "Ok".to_string(), language_tag: "en-US".to_string() }), Ok(()) => Ok(Status { id, status_code: StatusCode::Ok, error_message: "Ok".to_string(), language_tag: "en-US".to_string() }),
Err(e) => { Err(e) => {
@ -326,7 +345,7 @@ impl SftpHandler for SftpSession {
_attrs: FileAttributes, _attrs: FileAttributes,
) -> Result<Status, Self::Error> { ) -> Result<Status, Self::Error> {
println!("mkdir called: {}", path); println!("mkdir called: {}", path);
let path = format!("{}/{}", self.jail_dir, path); let path = format!("{}{}", self.jail_dir, path);
match fs::create_dir(&path).await { match fs::create_dir(&path).await {
Ok(()) => Ok(Status { id, status_code: StatusCode::Ok, error_message: "Ok".to_string(), language_tag: "en-US".to_string() }), Ok(()) => Ok(Status { id, status_code: StatusCode::Ok, error_message: "Ok".to_string(), language_tag: "en-US".to_string() }),
Err(e) => { Err(e) => {
@ -348,7 +367,7 @@ impl SftpHandler for SftpSession {
path: String, path: String,
) -> Result<Status, Self::Error> { ) -> Result<Status, Self::Error> {
println!("rmdir called: {}", path); println!("rmdir called: {}", path);
let path = format!("{}/{}", self.jail_dir, path); let path = format!("{}{}", self.jail_dir, path);
match fs::remove_dir(path).await { match fs::remove_dir(path).await {
Ok(()) => Ok(Status { id, status_code: StatusCode::Ok, error_message: "Ok".to_string(), language_tag: "en-US".to_string() }), Ok(()) => Ok(Status { id, status_code: StatusCode::Ok, error_message: "Ok".to_string(), language_tag: "en-US".to_string() }),
Err(e) => { Err(e) => {
@ -371,8 +390,8 @@ impl SftpHandler for SftpSession {
newpath: String, newpath: String,
) -> Result<Status, Self::Error> { ) -> Result<Status, Self::Error> {
println!("rename called from: {}, to: {}", oldpath, newpath); println!("rename called from: {}, to: {}", oldpath, newpath);
let oldpath = format!("{}/{}", self.jail_dir, oldpath); let oldpath = format!("{}{}", self.jail_dir, oldpath);
let newpath = format!("{}/{}", self.jail_dir, newpath); let newpath = format!("{}{}", self.jail_dir, newpath);
match fs::rename(oldpath, newpath).await { match fs::rename(oldpath, newpath).await {
Ok(()) => Ok(Status { id, status_code: StatusCode::Ok, error_message: "Ok".to_string(), language_tag: "en-US".to_string() }), Ok(()) => Ok(Status { id, status_code: StatusCode::Ok, error_message: "Ok".to_string(), language_tag: "en-US".to_string() }),