Changeset 1252 for trunk

Timestamp:

03/18/19 13:16:46 (5 years ago)

Author:

bln4

Message:

KeyStore instantiation now specifically uses the SunJSSE provider as all versions of Java from 5.0 onwards should have this included. Testing on David's PC to follow.

File:

• trunk/src/org/expeditee/auth/Authenticator.java (modified) (4 diffs)

trunk/src/org/expeditee/auth/Authenticator.java

@@ -14 +14 @@
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
 import java.security.PublicKey;
 import java.security.SecureRandom;
@@ -68 +69 @@
         public static boolean Authenticated = false;
         
-        private final KeyStore keyStore = KeyStore.getInstance(KeystoreType);
+        private KeyStore keyStore;//KeyStore.getInstance(KeystoreType);
                 
         private static final byte[] TRUE = "yes".getBytes();
@@ -82 +83 @@
         
         private Authenticator() throws KeyStoreException, FileNotFoundException, IOException, NoSuchAlgorithmException, CertificateException, ClassNotFoundException, SQLException {
+                
+                try {
+                        keyStore = KeyStore.getInstance(KeystoreType, "SunJSSE");
+                } catch (NoSuchProviderException e) {
+                        e.printStackTrace();
+                        return;
+                }
+                
                 UserSettings.setupDefaultFolders();
-                
+                        
                 // initialise keystore and actions
                 loadKeystore();
@@ -111 +120 @@
                 Stream<Text> usernameItemsStream = authFrame.getTextItems().stream().filter(t -> t.getData() != null && t.getData().contains("txtUsername"));
                 Stream<Text> passwordItemsStream = authFrame.getTextItems().stream().filter(t -> t.getData() != null && t.getData().contains("txtPassword"));
-                usernameItemsStream.forEach(txtUsername -> txtUsername.setText(System.getProperty("user.name", "")));
-                passwordItemsStream.forEach(txtPassword -> txtPassword.setText(System.getProperty("user.password", "")));
+                usernameItemsStream.forEach(txtUsername -> txtUsername.setText(System.getProperty("startinguser.name", "")));
+                passwordItemsStream.forEach(txtPassword -> { txtPassword.setText(""); txtPassword.invalidateAll(); });
                                                 
                 MessageBay.warningMessages(org.expeditee.actions.Actions.Init());