mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-15 21:15:23 +02:00
Code Issues Wiki Activity

[233970] StandardCredentialsProvider ignores ICredentialsValidator message

Browse source 
https://bugs.eclipse.org/bugs/show_bug.cgi?id=233970
This commit is contained in:
David Dykstal 2008-08-25 14:17:26 +00:00
parent eaabbadd92
commit 271001d63b
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/ui/subsystems/StandardCredentialsProvider.java
View file

@ -13,6 +13,7 @@
* David Dykstal (IBM) - [225089][ssh][shells][api] Canceling connection leads to exception * David Dykstal (IBM) - [225089][ssh][shells][api] Canceling connection leads to exception
* Martin Oberhuber (Wind River) - [218304] Improve deferred adapter loading * Martin Oberhuber (Wind River) - [218304] Improve deferred adapter loading
* Richie Yu (IBM) - [241716] Handle change expired password * Richie Yu (IBM) - [241716] Handle change expired password
* Don Yantzi (IBM) - [233970] Handle messages provided by ICredentialsValidator
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.ui.subsystems; package org.eclipse.rse.ui.subsystems;
@ -30,7 +31,6 @@ import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
import org.eclipse.rse.logging.Logger; import org.eclipse.rse.logging.Logger;
import org.eclipse.rse.logging.LoggerFactory; import org.eclipse.rse.logging.LoggerFactory;
import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.dialogs.ICredentialsValidator; import org.eclipse.rse.ui.dialogs.ICredentialsValidator;
import org.eclipse.rse.ui.dialogs.ISystemPasswordPromptDialog; import org.eclipse.rse.ui.dialogs.ISystemPasswordPromptDialog;
@ -206,20 +206,17 @@ public class StandardCredentialsProvider extends AbstractCredentialsProvider {
} }
} }
ICredentialsValidator validator = getSignonValidator(); ICredentialsValidator validator = getSignonValidator();
boolean signonValid = true;
ICredentials credentials = getCredentials(); ICredentials credentials = getCredentials();
if (validator != null) { if (validator != null) {
SystemMessage m = validator.validate(credentials); SystemMessage m = validator.validate(credentials);
// update the password in case an expired password was changed in validate - ry // update the password in case an expired password was changed in validate - ry
password = credentials.getPassword(); password = credentials.getPassword();
signonValid = (m == null); if (m != null) { // If we ran into an invalid stored password we need to tell the user and force reaquire
if (!signonValid) { // If we ran into an invalid stored password we need to tell the user.
Shell shell = getShell(); Shell shell = getShell();
if (shell != null) { if (shell != null) {
SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_PWD_INVALID); SystemMessageDialog dialog = new SystemMessageDialog(shell, m);
msg.makeSubstitution(userId, getConnectorService().getHostName());
SystemMessageDialog dialog = new SystemMessageDialog(shell, msg);
dialog.open(); dialog.open();
reacquire = true;
} }
} }
} }
@ -342,7 +339,7 @@ public class StandardCredentialsProvider extends AbstractCredentialsProvider {
/** /**
* <i>Optionally overridable, not implemented by default.</i><br> * <i>Optionally overridable, not implemented by default.</i><br>
* Get the credentails validator to use to validate the credentials as entered * Get the credentials validator to use to validate the credentials as entered
* in the dialog. This should only do a local validation. * in the dialog. This should only do a local validation.
* @return null indicating that no signon validator exists. * @return null indicating that no signon validator exists.
*/ */