Skip to content

Commit

Permalink
bugfix: correct pin string construction from JPasswordField contents (#…
Browse files Browse the repository at this point in the history 
…45)
  • Loading branch information
@resoli @M0Rf30
resoli authored and M0Rf30 committed Jan 4, 2023
1 parent bf0f061 commit 396140e
Showing 1 changed file with 14 additions and 62 deletions.
76 changes: 14 additions & 62 deletions cie-java/src/it/ipzs/cieid/MainFrame.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,6 @@ public MainFrame(String[] args) {
MainFrame.class.getResource(
"/it/ipzs/cieid/res/[email protected]")))));
} catch (IOException e2) {
// TODO Auto-generated catch block
e2.printStackTrace();
}
label_2.setHorizontalAlignment(SwingConstants.CENTER);
Expand Down Expand Up @@ -692,7 +691,6 @@ public void actionPerformed(ActionEvent e) {
btnAbbina.setForeground(Color.WHITE);
btnAbbina.setBackground(new Color(30, 144, 255));
btnAbbina.setBounds(258, 524, 114, 25);
// panel_1.add(btnAbbina);
passwordFields[0] = passwordField = new JPasswordField();
passwordField.setHorizontalAlignment(SwingConstants.CENTER);
passwordField.setFont(new Font("Dialog", Font.BOLD, 25));
Expand Down Expand Up @@ -829,7 +827,7 @@ public void keyTyped(KeyEvent e) {
passwordField_6.requestFocus();
} else if (e.getKeyChar() < '0' || e.getKeyChar() > '9') {
e.consume();
} else if (passwordField_7.getText().length() > 0) {
} else if (passwordField_7.getPassword().length > 0) {
e.consume();
}
}
Expand Down Expand Up @@ -1967,7 +1965,6 @@ public void mouseClicked(MouseEvent e) {
panel_19.add(imgPdf);

lblPadesTitle = new JLabel("Firma PADES");
// lblPadesTitle.addMouseListener(panel_19.getMouseListeners()[0]);
lblPadesTitle.setForeground(SystemColor.activeCaptionBorder);
lblPadesTitle.setFont(new Font("Dialog", Font.PLAIN, 17));
lblPadesTitle.setBounds(60, 11, 126, 31);
Expand Down Expand Up @@ -2495,7 +2492,7 @@ public void keyTyped(KeyEvent e) {
passwordField_10.requestFocus();
} else if (e.getKeyChar() < '0' || e.getKeyChar() > '9') {
e.consume();
} else if (passwordField_11.getText().length() > 0) {
} else if (passwordField_11.getPassword().length > 0) {
e.consume();
}
}
Expand Down Expand Up @@ -3115,9 +3112,10 @@ public void actionPerformed(ActionEvent arg0) {

SaveLogConfigToFile();

if ((txtUsername.getText().equals("") && !txtPassword.getText().equals(""))
if ((txtUsername.getText().equals("")
&& txtPassword.getPassword().length != 0)
|| (!txtUsername.getText().equals("")
&& txtPassword.getText().equals(""))) {
&& txtPassword.getPassword().length == 0)) {
JOptionPane.showMessageDialog(
btnSalva.getParent(),
"Campo username o password mancante",
Expand All @@ -3143,7 +3141,7 @@ public void actionPerformed(ActionEvent arg0) {
String credentials =
String.format(
"cred=%s:%s",
txtUsername.getText(), txtPassword.getText());
txtUsername.getText(), txtPassword.getPassword());
ProxyInfoManager proxyInfoManager = new ProxyInfoManager();
String encryptedCredentials = proxyInfoManager.encrypt(credentials);
Utils.setProperty("credentials", encryptedCredentials);
Expand Down Expand Up @@ -3273,13 +3271,6 @@ private void drawText(String text, String path) {

text = toFirstCharUpperAll(toTitleCase(text).toLowerCase());

/*
System.out.println(MainFrame.class.getResource("/it/ipzs/cieid/res/Allura-Regular.ttf").toExternalForm());
File file = new File(MainFrame.class.getResource("/it/ipzs/cieid/res/Allura-Regular.ttf").toExternalForm());
//File file = new File("/usr/share/CIEID/cieid.jar/it/ipzs/cieid/res/Allura-Regular.ttf");
InputStream is = new FileInputStream(file);
*/

File file = null;
String resource = "/it/ipzs/cieid/res/Allura-Regular.ttf";
URL res = getClass().getResource(resource);
Expand Down Expand Up @@ -3346,7 +3337,7 @@ private void firma(String outFilePath) {

for (i = 0; i < passwordSignFields.length; i++) {
JPasswordField field = passwordSignFields[i];
pin += field.getText();
pin += new String(field.getPassword());
}

if (pin.length() != 4) {
Expand Down Expand Up @@ -3626,7 +3617,7 @@ private void abbinaCIE() {
int i;
for (i = 0; i < passwordFields.length; i++) {
JPasswordField field = passwordFields[i];
pin += field.getText();
pin += String.valueOf(field.getPassword());
}

if (pin.length() != 8) {
Expand Down Expand Up @@ -3836,9 +3827,9 @@ public void run() {

private void cambiaPIN() {
logger.Info("Inizia - cambiaPIN()");
final String pin = oldpin.getText();
final String pin1 = newpin1.getText();
final String pin2 = newpin2.getText();
final String pin = new String(oldpin.getPassword());
final String pin1 = new String(newpin1.getPassword());
final String pin2 = new String(newpin2.getPassword());

int i;

Expand Down Expand Up @@ -4083,9 +4074,9 @@ public void run() {

private void sbloccaPIN() {
logger.Info("Inizia - sbloccaPIN()");
final String puk = puk01.getText();
final String pin1 = pin01.getText();
final String pin2 = pin02.getText();
final String puk = new String(puk01.getPassword());
final String pin1 = new String(pin01.getPassword());
final String pin2 = new String(pin02.getPassword());

int i;

Expand Down Expand Up @@ -4470,44 +4461,6 @@ private void configureHomeButtons(Map<String, Cie> cieDictionary) {

private void selectHome() {
logger.Info("Inizia - selectHome()");
/*
if(Utils.getProperty("ef_seriale", "").equals("") && !Utils.getProperty("cardholder", "").equals("") )
{
labelSerial.setText("<html>Per visualizzarlo<br/>occorre riabilitare la CIE<html>");
labelCardholder.setText(Utils.getProperty("cardholder", ""));
if(JOptionPane.showConfirmDialog(this.getContentPane(), "E' necessario effettuare un nuovo abbinamento. Procedere?", "Abbinare nuovamente la CIE", JOptionPane.YES_NO_OPTION) != JOptionPane.YES_OPTION)
{
tabbedPane.setSelectedIndex(2);
}
else
{
tabbedPane.setSelectedIndex(0);
}
}
else if(!Utils.getProperty("ef_seriale", "").equals(""))
{
labelSerial.setText(Utils.getProperty("ef_seriale", ""));
labelCardholder.setText(Utils.getProperty("cardholder", ""));
tabbedPane.setSelectedIndex(2);
}
else
{
tabbedPane.setSelectedIndex(0);
EventQueue.invokeLater(new Runnable()
{
public void run()
{
passwordField.requestFocus();
}
});
}*/

// Utils.setProperty("cieDictionary", "");

txtpnCieAbbinataCon.setText("Carta di Identità Elettronica abbinata correttamente");
txtpnCieAbbinataCon.setHighlighter(null);
lblCieId.setText("CIE ID");
Expand Down Expand Up @@ -4605,7 +4558,6 @@ private String toFirstCharUpperAll(String string) {

private void selectCardholder() {
logger.Info("Inizia - selectCardholder()");
// tabbedPane.setSelectedIndex(2);
selectHome();
configureHomeButtons(cieDictionary);
selectButton(btnHome);
Expand Down

0 comments on commit 396140e

Please sign in to comment.