qwe/keepass2android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfix for issue #2350 - SFTP fails to connect to IPv6 address

Browse Source 
Since IPv6 addresses contain colons, they break the host:port URI
parsing logic, since "host" will have colons in it.

This fix adds URL encoding/decoding of the "host" parameter, thus
removing any possible colons in that parameter that could conflict
with the host:port separator.
This commit is contained in:
Rick Brown
2023-06-16 19:18:47 -04:00
parent 3f6e51b126
commit 03ea073426
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/SftpStorage.java
View File

@@ -400,12 +400,16 @@ public class SftpStorage extends JavaFileStorageBase {
ci.password = decode(userPwd.substring(userPwd.indexOf(":")+1)); ci.password = decode(userPwd.substring(userPwd.indexOf(":")+1));
ci.host = ci.host.substring(ci.host.indexOf('@') + 1); ci.host = ci.host.substring(ci.host.indexOf('@') + 1);
ci.port = DEFAULT_SFTP_PORT; ci.port = DEFAULT_SFTP_PORT;
int portSeparatorIndex = ci.host.indexOf(":"); int portSeparatorIndex = ci.host.lastIndexOf(":");
if (portSeparatorIndex >= 0) if (portSeparatorIndex >= 0)
{ {
ci.port = Integer.parseInt(ci.host.substring(portSeparatorIndex+1)); ci.port = Integer.parseInt(ci.host.substring(portSeparatorIndex+1));
ci.host = ci.host.substring(0, portSeparatorIndex); ci.host = ci.host.substring(0, portSeparatorIndex);
} }
// Encode/decode required to support IPv6 (colons break host:port parse logic)
// See Bug #2350
ci.host = decode(ci.host);
ci.localPath = extractSessionPath(filename); ci.localPath = extractSessionPath(filename);
return ci; return ci;
} }
@@ -476,6 +480,10 @@ public class SftpStorage extends JavaFileStorageBase {
public String buildFullPath( String host, int port, String localPath, String username, String password) throws UnsupportedEncodingException public String buildFullPath( String host, int port, String localPath, String username, String password) throws UnsupportedEncodingException
{ {
// Encode/decode required to support IPv6 (colons break host:port parse logic)
// See Bug #2350
host = encode(host);
if (port != DEFAULT_SFTP_PORT) if (port != DEFAULT_SFTP_PORT)
host += ":"+String.valueOf(port); host += ":"+String.valueOf(port);
return getProtocolPrefix()+encode(username)+":"+encode(password)+"@"+host+localPath; return getProtocolPrefix()+encode(username)+":"+encode(password)+"@"+host+localPath;