mirror of
https://github.com/doublecmd/doublecmd.git
synced 2026-06-28 10:02:14 +00:00
ADD: FTP - Simple SFTP support
This commit is contained in:
Alexander Koblov
parent
340852b2f2
commit
307621b2a1
3 changed files with 44 additions and 32 deletions
|
|
@ -29,7 +29,7 @@
|
|||
</Target>
|
||||
<SearchPaths>
|
||||
<IncludeFiles Value="$(ProjOutDir);..\..\..\..\sdk;..\synapse"/>
|
||||
<OtherUnitFiles Value="..\synapse;..\..\..\..\sdk"/>
|
||||
<OtherUnitFiles Value="..\synapse;..\..\..\..\sdk;sftp"/>
|
||||
<UnitOutputDirectory Value="..\lib"/>
|
||||
</SearchPaths>
|
||||
<Conditionals Value="if (TargetCPU <> 'arm') then
|
||||
|
|
@ -95,7 +95,7 @@ end;"/>
|
|||
<PackageName Value="LazUtils"/>
|
||||
</Item2>
|
||||
</RequiredPackages>
|
||||
<Units Count="5">
|
||||
<Units Count="6">
|
||||
<Unit0>
|
||||
<Filename Value="ftp.dpr"/>
|
||||
<IsPartOfProject Value="True"/>
|
||||
|
|
@ -122,6 +122,11 @@ end;"/>
|
|||
<IsPartOfProject Value="True"/>
|
||||
<UnitName Value="FtpAdv"/>
|
||||
</Unit4>
|
||||
<Unit5>
|
||||
<Filename Value="sftp\sftpsend.pas"/>
|
||||
<IsPartOfProject Value="True"/>
|
||||
<UnitName Value="SftpSend"/>
|
||||
</Unit5>
|
||||
</Units>
|
||||
</ProjectOptions>
|
||||
<CompilerOptions>
|
||||
|
|
@ -132,7 +137,7 @@ end;"/>
|
|||
</Target>
|
||||
<SearchPaths>
|
||||
<IncludeFiles Value="$(ProjOutDir);..\..\..\..\sdk;..\synapse"/>
|
||||
<OtherUnitFiles Value="..\synapse;..\..\..\..\sdk"/>
|
||||
<OtherUnitFiles Value="..\synapse;..\..\..\..\sdk;sftp"/>
|
||||
<UnitOutputDirectory Value="..\lib"/>
|
||||
</SearchPaths>
|
||||
<Conditionals Value="if (TargetCPU <> 'arm') then
|
||||
|
|
|
|||
|
|
@ -43,6 +43,7 @@ type
|
|||
PassiveMode: Boolean;
|
||||
AutoTLS: Boolean;
|
||||
FullSSL: Boolean;
|
||||
OpenSSH: Boolean;
|
||||
UseAllocate: Boolean;
|
||||
Encoding: AnsiString;
|
||||
InitCommands: AnsiString;
|
||||
|
|
@ -105,7 +106,7 @@ implementation
|
|||
|
||||
uses
|
||||
IniFiles, StrUtils, FtpAdv, FtpUtils, FtpConfDlg, syncobjs, LazFileUtils,
|
||||
LazUTF8, DCClassesUtf8;
|
||||
LazUTF8, DCClassesUtf8, SftpSend;
|
||||
|
||||
var
|
||||
DefaultIniName: String;
|
||||
|
|
@ -154,6 +155,7 @@ begin
|
|||
Connection.PassiveMode:= IniFile.ReadBool('FTP', 'Connection' + sIndex + 'PassiveMode', True);
|
||||
Connection.AutoTLS:= IniFile.ReadBool('FTP', 'Connection' + sIndex + 'AutoTLS', False);
|
||||
Connection.FullSSL:= IniFile.ReadBool('FTP', 'Connection' + sIndex + 'FullSSL', False);
|
||||
Connection.OpenSSH:= IniFile.ReadBool('FTP', 'Connection' + sIndex + 'OpenSSH', False);
|
||||
Connection.UseAllocate:= IniFile.ReadBool('FTP', 'Connection' + sIndex + 'UseAllocate', False);
|
||||
Connection.InitCommands := IniFile.ReadString('FTP', 'Connection' + sIndex + 'InitCommands', EmptyStr);
|
||||
// add connection to connection list
|
||||
|
|
@ -188,6 +190,7 @@ begin
|
|||
IniFile.WriteBool('FTP', 'Connection' + sIndex + 'PassiveMode', Connection.PassiveMode);
|
||||
IniFile.WriteBool('FTP', 'Connection' + sIndex + 'AutoTLS', Connection.AutoTLS);
|
||||
IniFile.WriteBool('FTP', 'Connection' + sIndex + 'FullSSL', Connection.FullSSL);
|
||||
IniFile.WriteBool('FTP', 'Connection' + sIndex + 'OpenSSH', Connection.OpenSSH);
|
||||
IniFile.WriteBool('FTP', 'Connection' + sIndex + 'UseAllocate', Connection.UseAllocate);
|
||||
IniFile.WriteString('FTP', 'Connection' + sIndex + 'InitCommands', Connection.InitCommands);
|
||||
end;
|
||||
|
|
@ -295,7 +298,11 @@ begin
|
|||
if I >= 0 then
|
||||
begin
|
||||
Connection := TConnection(ConnectionList.Objects[I]);
|
||||
FtpSend := TFTPSendEx.Create(Connection.Encoding);
|
||||
if Connection.OpenSSH then
|
||||
FtpSend := TSftpSend.Create(Connection.Encoding)
|
||||
else begin
|
||||
FtpSend := TFTPSendEx.Create(Connection.Encoding);
|
||||
end;
|
||||
FtpSend.TargetHost := Connection.Host;
|
||||
FtpSend.PassiveMode:= Connection.PassiveMode;
|
||||
FtpSend.AutoTLS:= Connection.AutoTLS;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
unit SFtpSend;
|
||||
unit SftpSend;
|
||||
|
||||
{$mode delphi}
|
||||
|
||||
|
|
@ -9,9 +9,9 @@ uses
|
|||
|
||||
type
|
||||
|
||||
{ TSFtpSend }
|
||||
{ TSftpSend }
|
||||
|
||||
TSFtpSend = class(TFTPSendEx)
|
||||
TSftpSend = class(TFTPSendEx)
|
||||
private
|
||||
FLastError: Integer;
|
||||
SourceName, TargetName: PWideChar;
|
||||
|
|
@ -59,9 +59,9 @@ procedure userauth_kbdint(const name: PAnsiChar; name_len: cint;
|
|||
responses: PLIBSSH2_USERAUTH_KBDINT_RESPONSE; abstract: PPointer); cdecl;
|
||||
var
|
||||
I: Integer;
|
||||
Sender: TSFtpSend;
|
||||
Sender: TSftpSend;
|
||||
begin
|
||||
Sender:= TSFtpSend(abstract^);
|
||||
Sender:= TSftpSend(abstract^);
|
||||
for I:= 0 to num_prompts - 1 do
|
||||
begin
|
||||
if (I = 0) and (Length(Sender.FPassword) > 0) then
|
||||
|
|
@ -73,15 +73,15 @@ begin
|
|||
end;
|
||||
end;
|
||||
|
||||
{ TSFtpSend }
|
||||
{ TSftpSend }
|
||||
|
||||
procedure TSFtpSend.DoProgress(Percent: Int64);
|
||||
procedure TSftpSend.DoProgress(Percent: Int64);
|
||||
begin
|
||||
if ProgressProc(PluginNumber, SourceName, TargetName, Percent) = 1 then
|
||||
raise EUserAbort.Create(EmptyStr);
|
||||
end;
|
||||
|
||||
function TSFtpSend.FileClose(Handle: Pointer): Boolean;
|
||||
function TSftpSend.FileClose(Handle: Pointer): Boolean;
|
||||
begin
|
||||
FLastError:= 0;
|
||||
if Assigned(Handle) then
|
||||
|
|
@ -92,7 +92,7 @@ begin
|
|||
Result:= (FLastError = 0);
|
||||
end;
|
||||
|
||||
function TSFtpSend.Connect: Boolean;
|
||||
function TSftpSend.Connect: Boolean;
|
||||
const
|
||||
HOSTKEY_SIZE = 20;
|
||||
var
|
||||
|
|
@ -162,7 +162,7 @@ begin
|
|||
Result:= Assigned(FSFTPSession);
|
||||
end;
|
||||
|
||||
constructor TSFtpSend.Create(const Encoding: String);
|
||||
constructor TSftpSend.Create(const Encoding: String);
|
||||
begin
|
||||
FCurrentDir:= '/';
|
||||
inherited Create(Encoding);
|
||||
|
|
@ -170,12 +170,12 @@ begin
|
|||
FCanResume := True;
|
||||
end;
|
||||
|
||||
function TSFtpSend.Login: Boolean;
|
||||
function TSftpSend.Login: Boolean;
|
||||
begin
|
||||
Result:= Connect;
|
||||
end;
|
||||
|
||||
function TSFtpSend.Logout: Boolean;
|
||||
function TSftpSend.Logout: Boolean;
|
||||
begin
|
||||
Result:= libssh2_sftp_shutdown(FSFTPSession) = 0;
|
||||
libssh2_session_disconnect(FSession, 'Thank you for using sshtest');
|
||||
|
|
@ -183,12 +183,12 @@ begin
|
|||
FSock.CloseSocket;
|
||||
end;
|
||||
|
||||
function TSFtpSend.GetCurrentDir: String;
|
||||
function TSftpSend.GetCurrentDir: String;
|
||||
begin
|
||||
Result:= FCurrentDir;
|
||||
end;
|
||||
|
||||
function TSFtpSend.FileSize(const FileName: String): Int64;
|
||||
function TSftpSend.FileSize(const FileName: String): Int64;
|
||||
var
|
||||
Attributes: LIBSSH2_SFTP_ATTRIBUTES;
|
||||
begin
|
||||
|
|
@ -200,7 +200,7 @@ begin
|
|||
Result:= -1;
|
||||
end;
|
||||
|
||||
function TSFtpSend.CreateDir(const Directory: string): Boolean;
|
||||
function TSftpSend.CreateDir(const Directory: string): Boolean;
|
||||
var
|
||||
Return: Integer;
|
||||
Attributes: LIBSSH2_SFTP_ATTRIBUTES;
|
||||
|
|
@ -216,22 +216,22 @@ begin
|
|||
Result:= (Return = 0);
|
||||
end;
|
||||
|
||||
function TSFtpSend.DeleteDir(const Directory: string): Boolean;
|
||||
function TSftpSend.DeleteDir(const Directory: string): Boolean;
|
||||
begin
|
||||
Result:= libssh2_sftp_rmdir(FSFTPSession, PAnsiChar(Directory)) = 0;
|
||||
end;
|
||||
|
||||
function TSFtpSend.DeleteFile(const FileName: string): Boolean;
|
||||
function TSftpSend.DeleteFile(const FileName: string): Boolean;
|
||||
begin
|
||||
Result:= libssh2_sftp_unlink(FSFTPSession, PAnsiChar(FileName)) = 0;
|
||||
end;
|
||||
|
||||
function TSFtpSend.ExecuteCommand(const Command: String): Boolean;
|
||||
function TSftpSend.ExecuteCommand(const Command: String): Boolean;
|
||||
begin
|
||||
Result:= False;
|
||||
end;
|
||||
|
||||
function TSFtpSend.ChangeWorkingDir(const Directory: string): Boolean;
|
||||
function TSftpSend.ChangeWorkingDir(const Directory: string): Boolean;
|
||||
var
|
||||
Attributes: LIBSSH2_SFTP_ATTRIBUTES;
|
||||
begin
|
||||
|
|
@ -239,12 +239,12 @@ begin
|
|||
if Result then FCurrentDir:= Directory;
|
||||
end;
|
||||
|
||||
function TSFtpSend.RenameFile(const OldName, NewName: string): Boolean;
|
||||
function TSftpSend.RenameFile(const OldName, NewName: string): Boolean;
|
||||
begin
|
||||
Result:= libssh2_sftp_rename(FSFTPSession, PAnsiChar(OldName), PAnsiChar(NewName)) = 0;
|
||||
end;
|
||||
|
||||
function TSFtpSend.ChangeMode(const FileName, Mode: String): Boolean;
|
||||
function TSftpSend.ChangeMode(const FileName, Mode: String): Boolean;
|
||||
var
|
||||
Attributes: LIBSSH2_SFTP_ATTRIBUTES;
|
||||
begin
|
||||
|
|
@ -253,7 +253,7 @@ begin
|
|||
Result:= libssh2_sftp_setstat(FSFTPSession, PAnsiChar(FileName), @Attributes) = 0;
|
||||
end;
|
||||
|
||||
function TSFtpSend.StoreFile(const FileName: string; Restore: Boolean): Boolean;
|
||||
function TSftpSend.StoreFile(const FileName: string; Restore: Boolean): Boolean;
|
||||
var
|
||||
Index: PtrInt;
|
||||
FBuffer: PByte;
|
||||
|
|
@ -338,7 +338,7 @@ begin
|
|||
end;
|
||||
end;
|
||||
|
||||
function TSFtpSend.RetrieveFile(const FileName: string; FileSize: Int64;
|
||||
function TSftpSend.RetrieveFile(const FileName: string; FileSize: Int64;
|
||||
Restore: Boolean): Boolean;
|
||||
var
|
||||
FBuffer: PByte;
|
||||
|
|
@ -407,13 +407,13 @@ begin
|
|||
end;
|
||||
end;
|
||||
|
||||
function TSFtpSend.FsFindFirstW(const Path: String; var FindData: TWin32FindDataW): Pointer;
|
||||
function TSftpSend.FsFindFirstW(const Path: String; var FindData: TWin32FindDataW): Pointer;
|
||||
begin
|
||||
Result := libssh2_sftp_opendir(FSFTPSession, PAnsiChar(Path));
|
||||
if Assigned(Result) then FsFindNextW(Result, FindData);
|
||||
end;
|
||||
|
||||
function TSFtpSend.FsFindNextW(Handle: Pointer; var FindData: TWin32FindDataW): BOOL;
|
||||
function TSftpSend.FsFindNextW(Handle: Pointer; var FindData: TWin32FindDataW): BOOL;
|
||||
var
|
||||
Return: Integer;
|
||||
Attributes: LIBSSH2_SFTP_ATTRIBUTES;
|
||||
|
|
@ -436,12 +436,12 @@ begin
|
|||
end;
|
||||
end;
|
||||
|
||||
function TSFtpSend.FsFindClose(Handle: Pointer): Integer;
|
||||
function TSftpSend.FsFindClose(Handle: Pointer): Integer;
|
||||
begin
|
||||
Result:= libssh2_sftp_closedir(Handle);
|
||||
end;
|
||||
|
||||
function TSFtpSend.FsSetTime(const FileName: String; LastAccessTime,
|
||||
function TSftpSend.FsSetTime(const FileName: String; LastAccessTime,
|
||||
LastWriteTime: WfxPlugin.PFileTime): BOOL;
|
||||
var
|
||||
Attributes: LIBSSH2_SFTP_ATTRIBUTES;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue