sipwise
/
jitsi
mirror of https://github.com/sipwise/jitsi.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Adds option in provisioning configuration for deleting stored password.

Browse Source
cusax-fix
Damian Minkov 14 years ago
parent 9ce2158b0a
commit d6c331712e
4 changed files with 111 additions and 14 deletions
Show Stats Download Patch File Download Diff File

2
resources/languages/resources.properties
Unescape View File

@ -1267,6 +1267,8 @@ plugin.provisioning.UUID=UUID
plugin.provisioning.COPYTOCLIPBOARD=Copy UUID to clipboard
plugin.provisioning.CLIPBOARD_FAILED=Failed to copy UUID to clipboard
plugin.provisioning.EXIT_ON_FAIL=Exit the application if the provisioning fails
plugin.provisioning.CREDENTIALS=Last stored provisioning credentials
plugin.provisioning.REMOVE_CREDENTIALS_MESSAGE=Are you sure you want to remove provisioning password?
# packet logging service
plugin.loggingutils.PACKET_LOGGING_CONFIG=Logging

4
src/net/java/sip/communicator/plugin/provisioning/ProvisioningActivator.java
Unescape View File

@ -52,14 +52,14 @@ public class ProvisioningActivator
* Name of the provisioning username in the configuration service
* authentication).
*/
private static final String PROPERTY_PROVISIONING_USERNAME
static final String PROPERTY_PROVISIONING_USERNAME
= "net.java.sip.communicator.plugin.provisioning.auth.USERNAME";
/**
* Name of the provisioning password in the configuration service (HTTP
* authentication).
*/
private static final String PROPERTY_PROVISIONING_PASSWORD
static final String PROPERTY_PROVISIONING_PASSWORD
= "net.java.sip.communicator.plugin.provisioning.auth";
/**

106
src/net/java/sip/communicator/plugin/provisioning/ProvisioningForm.java
Unescape View File

@ -14,6 +14,7 @@
import javax.swing.event.*;
import net.java.sip.communicator.service.configuration.*;
import net.java.sip.communicator.service.gui.*;
import net.java.sip.communicator.service.resources.*;
import net.java.sip.communicator.util.swing.*;
@ -60,6 +61,21 @@ public class ProvisioningForm
*/
private final SIPCommTextField uriField;
/**
* The field used to show the username.
*/
private final JTextField usernameField;
/**
* A field to show the password.
*/
private final JPasswordField passwordField;
/**
* The button that will delete the password.
*/
private final JButton forgetPasswordButton;
/**
* Creates an instance of the <tt>ProvisioningForm</tt>.
*/
@ -205,6 +221,40 @@ public void actionPerformed(ActionEvent evt)
c.gridy = 5;
mainPanel.add(clipboardBtn, c);
JPanel userPassPanel = new TransparentPanel(new BorderLayout());
userPassPanel.setBorder(BorderFactory.createTitledBorder(
ProvisioningActivator.getResourceService().getI18NString(
"plugin.provisioning.CREDENTIALS")));
JPanel labelPanel = new TransparentPanel(new GridLayout(0, 1));
labelPanel.setBorder(BorderFactory.createEmptyBorder(4, 8, 4, 0));
JPanel valuesPanel = new TransparentPanel(new GridLayout(0, 1));
valuesPanel.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 0));
labelPanel.add(new JLabel(
ProvisioningActivator.getResourceService().getI18NString(
"plugin.simpleaccregwizz.LOGIN_USERNAME")));
labelPanel.add(new JLabel(
ProvisioningActivator.getResourceService().getI18NString(
"service.gui.PASSWORD")));
usernameField = new JTextField();
usernameField.setEditable(false);
passwordField = new JPasswordField();
passwordField.setEditable(false);
valuesPanel.add(usernameField);
valuesPanel.add(passwordField);
userPassPanel.add(labelPanel, BorderLayout.WEST);
userPassPanel.add(valuesPanel, BorderLayout.CENTER);
JPanel buttonPanel = new TransparentPanel(new FlowLayout(FlowLayout.RIGHT));
forgetPasswordButton = new JButton("Forget Password!");
buttonPanel.add(forgetPasswordButton);
userPassPanel.add(buttonPanel, BorderLayout.SOUTH);
c.fill = GridBagConstraints.HORIZONTAL;
c.weightx = 1.0;
c.insets = new Insets(5, 10, 0, 0);
c.gridwidth = 0;
c.gridx = 0;
c.gridy = 6;
mainPanel.add(userPassPanel, c);
JTextPane pane = new JTextPane();
pane.setForeground(Color.RED);
pane.setEditable(false);
@ -214,12 +264,7 @@ public void actionPerformed(ActionEvent evt)
new String[]{ProvisioningActivator.getResourceService()
.getSettingsString("service.gui.APPLICATION_NAME")}));
c.fill = GridBagConstraints.HORIZONTAL;
c.weightx = 1.0;
c.insets = new Insets(5, 10, 0, 0);
c.gridwidth = 0;
c.gridx = 0;
c.gridy = 6;
c.gridy = 7;
mainPanel.add(pane, c);
initButtonStates();
@ -262,6 +307,21 @@ else if (provMethod.equals("Manual"))
uriField.setEnabled(manualButton.isSelected());
bonjourButton.setEnabled(isProvEnabled);
dnsButton.setEnabled(false);
// creadentials
forgetPasswordButton.setEnabled(isProvEnabled);
usernameField.setText(ProvisioningActivator.getConfigurationService()
.getString(ProvisioningActivator.PROPERTY_PROVISIONING_USERNAME));
if(ProvisioningActivator.getCredentialsStorageService()
.isStoredEncrypted(
ProvisioningActivator.PROPERTY_PROVISIONING_PASSWORD))
{
passwordField.setText(
ProvisioningActivator.getCredentialsStorageService()
.loadPassword(
ProvisioningActivator.PROPERTY_PROVISIONING_PASSWORD));
}
}
/**
@ -379,5 +439,39 @@ public void focusLost(FocusEvent e)
public void focusGained(FocusEvent e) {}
});
forgetPasswordButton.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent actionEvent)
{
if(passwordField.getPassword() == null
|| passwordField.getPassword().length == 0)
{
return;
}
int result = JOptionPane.showConfirmDialog(
(Component)ProvisioningActivator.getUIService()
.getExportedWindow(ExportedWindow.MAIN_WINDOW).getSource(),
ProvisioningActivator.getResourceService().getI18NString(
"plugin.provisioning.REMOVE_CREDENTIALS_MESSAGE"),
ProvisioningActivator.getResourceService().getI18NString(
"service.gui.REMOVE"),
JOptionPane.YES_NO_OPTION);
if (result == JOptionPane.YES_OPTION)
{
ProvisioningActivator.getCredentialsStorageService()
.removePassword(
ProvisioningActivator.PROPERTY_PROVISIONING_PASSWORD);
ProvisioningActivator.getConfigurationService()
.removeProperty(
ProvisioningActivator.PROPERTY_PROVISIONING_USERNAME);
usernameField.setText("");
passwordField.setText("");
}
}
});
}
}

13
src/net/java/sip/communicator/plugin/securityconfig/masterpassword/SavedPasswordsDialog.java
Unescape View File

@ -474,12 +474,13 @@ private void initContent()
SecurityConfigActivator.getConfigurationService();
String uname = configurationService
.getString(PROVISIONING_PROPERTIES_PREFIX + ".USERNAME");
model.savedPasswords.add(
new PasswordsTableRow(
PROVISIONING_PROPERTIES_PREFIX,
resources.getI18NString(
"plugin.provisioning.PROVISIONING"),
uname));
if(uname != null && uname.length() > 0)
model.savedPasswords.add(
new PasswordsTableRow(
PROVISIONING_PROPERTIES_PREFIX,
resources.getI18NString(
"plugin.provisioning.PROVISIONING"),
uname));
// load http passwords
String HTTP_PROPERTIES_PREFIX =

Write Preview
Loading…
Cancel
Save