mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-09 17:25:38 +02:00
Code Issues Wiki Activity

Fixing 164009 - FTP connection shows as connected when login fails

Browse source 
Fixing 164306 - [ftp] FTP console shows plaintext passwords
This commit is contained in:
Javier Montalvo Orus 2006-11-14 14:28:36 +00:00
parent 8f55908c06
commit 27be3324d0
1 changed files with 35 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
rse/plugins/org.eclipse.rse.services.files.ftp/src/org/eclipse/rse/services/files/ftp/FTPService.java
View file

@ -28,6 +28,8 @@
* Javier Montalvo Orus (Symbian) - Fixing 163264 - FTP Only can not delete first subfolder * Javier Montalvo Orus (Symbian) - Fixing 163264 - FTP Only can not delete first subfolder
* Michael Scharf (Wind River) - Fix 164223 - Wrong call for setting binary transfer mode * Michael Scharf (Wind River) - Fix 164223 - Wrong call for setting binary transfer mode
* Martin Oberhuber (Wind River) - Add Javadoc for getFTPClient(), modify move() to use single connected session * Martin Oberhuber (Wind River) - Add Javadoc for getFTPClient(), modify move() to use single connected session
* Javier Montalvo Orus (Symbian) - Fixing 164009 - FTP connection shows as connected when login fails
* Javier Montalvo Orus (Symbian) - Fixing 164306 - [ftp] FTP console shows plaintext passwords
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.services.files.ftp; package org.eclipse.rse.services.files.ftp;
@ -138,7 +140,39 @@ public class FTPService extends AbstractFileService implements IFileService, IFT
} else { } else {
_ftpClient.connect(_hostName, _portNumber); _ftpClient.connect(_hostName, _portNumber);
} }
_ftpClient.login(_userId, _password);
int userReply = _ftpClient.user(_userId);
if(FTPReply.isPositiveIntermediate(userReply))
{
//intermediate response, provide password and hide it from the console
String newLine = System.getProperty("line.separator"); //$NON-NLS-1$
_ftpClient.registerSpyStream(null);
_ftpLoggingOutputStream.write(("PASS ******"+newLine).getBytes()); //$NON-NLS-1$
int passReply = _ftpClient.pass(_password);
_ftpLoggingOutputStream.write((_ftpClient.getReplyString()+newLine).getBytes());
if(_ftpLoggingOutputStream!=null)
{
_ftpClient.registerSpyStream(_ftpLoggingOutputStream);
}
if(!FTPReply.isPositiveCompletion(passReply))
{
String lastMessage = _ftpClient.getReplyString();
disconnect();
throw new Exception(lastMessage);
}
}
else if(!FTPReply.isPositiveCompletion(userReply))
{
String lastMessage = _ftpClient.getReplyString();
disconnect();
throw new Exception(lastMessage);
}
_userHome = _ftpClient.printWorkingDirectory(); _userHome = _ftpClient.printWorkingDirectory();
} }