mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-21 09:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

FIX: Ftp redirect to global address if server reports local instead

Browse source
This commit is contained in:
Alexander Koblov 2015-09-07 08:29:23 +00:00
commit cb7d69a130
2 changed files with 60 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

17
plugins/wfx/ftp/src/ftpadv.pas
View file

@ -85,6 +85,7 @@ type
public
constructor Create; reintroduce;
function Login: Boolean; override;
procedure ParseRemote(Value: string); override;
function List(Directory: String; NameList: Boolean): Boolean; override;
function SetTime(const FileName: String; FileTime: TDateTime): Boolean;
function StoreFile(const FileName: string; Restore: Boolean): Boolean; override;
@ -95,7 +96,7 @@ type
implementation
uses
LazUTF8, FtpFunc;
LazUTF8, FtpFunc, FtpUtils;
function Dummy(const S: String): String;
begin
@ -219,6 +220,20 @@ begin
end;
end;
procedure TFTPSendEx.ParseRemote(Value: string);
var
RemoteIP: String;
begin
inherited ParseRemote(Value);
RemoteIP:= FSock.GetRemoteSinIP;
if FDataIP = '0.0.0.0' then FDataIP:= RemoteIP
else if IsIpPrivate(FDataIP) and (IsIpPrivate(RemoteIP) = False) then
begin
FDataIP:= RemoteIP;
DoStatus(False, 'Server reports local IP -> Redirect to: ' + FDataIP);
end;
end;
function TFTPSendEx.List(Directory: String; NameList: Boolean): Boolean;
var
Message: String;

45
plugins/wfx/ftp/src/ftputils.pas
View file

@ -72,6 +72,8 @@ const
const
ftpProtocol = 'ftp://';
function IsIpPrivate(Value: String): Boolean;
function ModeStr2Mode(const sMode: String): Integer;
function EncodeBase64(Data: AnsiString): AnsiString;
@ -89,7 +91,7 @@ function DateTimeToFileTime(dt : TDateTime) : TFileTime;
implementation
uses
Base64
Base64, synautil
{$IFDEF MSWINDOWS}
, Windows
{$ELSE}
@ -97,6 +99,47 @@ uses
{$ENDIF}
;
function StrToIp(Value: String): LongWord;
var
S: String;
I, X: LongWord;
begin
Result := 0;
for X := 0 to 3 do
begin
S := Fetch(Value, '.');
I := StrToIntDef(S, 0);
Result := (256 * Result) + I;
end;
end;
function IsIpPrivate(Value: String): Boolean;
var
Index: Integer;
Binary: LongWord;
const
PrivAddr: array [0..4, 0..1] of LongWord = (
// 10.0.0.0 - 10.255.255.255
(167772160, 184549375), // Single Class A network
// 172.16.0.0 - 172.31.255.255
(2886729728, 2887778303), // Contiguous range of 16 Class B blocks
// 192.168.0.0 - 192.168.255.255
(3232235520, 3232301055), // Contiguous range of 256 Class C blocks
// 169.254.0.0 - 169.254.255.255
(2851995648, 2852061183), // Link-local address
// 127.0.0.0 - 127.255.255.255
(2130706432, 2147483647) // Loopback (localhost)
);
begin
Binary:= StrToIp(Value);
for Index:= 0 to 4 do
begin
if (Binary >= PrivAddr[Index][0]) and (Binary <= PrivAddr[Index][1]) then
Exit(True)
end;
Result:= False;
end;
function ModeStr2Mode(const sMode: String): Integer;
begin
Result:= 0;