Changeset 1504 for trunk/src/org/expeditee/auth/account/Authenticate.java

Timestamp:

01/29/20 13:20:24 (4 years ago)

Author:

bnemhaus

Message:

Revised implementation of authenticated Expeditee mail. Motivated by bugs relating to messages not being marked as read and incorrect counting of new messages for users, the Expeditee mail system has been rewritten. The new code not only does not exhibit the previous bugs but is also better engineered. Whilst the MailBay is static (which is in line with the MessageBay), the Mail class is no longer static and must be initialised for each user as they log in.

File:

• trunk/src/org/expeditee/auth/account/Authenticate.java (modified) (5 diffs)

trunk/src/org/expeditee/auth/account/Authenticate.java

@@ -1 +1 @@
 package org.expeditee.auth.account;
 
-import java.io.IOException;
-import java.security.InvalidKeyException;
-import java.security.KeyFactory;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.PrivateKey;
-import java.security.cert.CertificateException;
-import java.security.spec.InvalidKeySpecException;
-import java.security.spec.PKCS8EncodedKeySpec;
-import java.sql.SQLException;
-import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Base64;
@@ -18 +7 @@
 import java.util.Map;
 
-import javax.crypto.BadPaddingException;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.NoSuchPaddingException;
 import javax.crypto.SecretKey;
 
@@ -96 +82 @@
                         MessageBay.clear();
                         MessageBay.updateFramesetLocation();
-                        MailBay.disconnect();
+                        MailBay.reconnectToUser(UserSettings.UserName.get());
                         
                         // Parse the users profile to refresh settings.
@@ -108 +94 @@
                         AuthenticationResult res = AuthenticationResult.SuccessLogin;
                         
-                        // Check mail and update last read files.
-                        MailBay.clear();
-                        try {
-                                Text keyItem = KeyList.PrivateKey.get();
-                                if (keyItem.getData() != null) {
-                                        // Check mail.
-                                        String keyEncoded = keyItem.getData().get(0);
-                                        byte[] keyBytes = Base64.getDecoder().decode(keyEncoded);
-                                        PrivateKey key = KeyFactory.getInstance(AsymmetricAlgorithm).generatePrivate(new PKCS8EncodedKeySpec(keyBytes));
-                                        org.expeditee.auth.mail.Mail.checkMail(key);
-                                } else {
-                                        res.additionalInfo.add("No private key present: your communication with other Expeditee users will be limited until this is resolved.");
-                                }
-                        } catch (KeyStoreException | NoSuchAlgorithmException | CertificateException | ClassNotFoundException
-                                        | SQLException | ParseException | IOException | InvalidKeyException | NoSuchPaddingException | 
-                                        IllegalBlockSizeException | BadPaddingException e) {
-                                res.additionalInfo.add("An error occured while attempting to load in mail sent to you by other Expeditee users.  See the exception for more information.");
-                                e.printStackTrace();
-                        } catch (InvalidKeySpecException e) {
-                                res.additionalInfo.add("Stored data cannot be used to create a private key.  See exception for more information.");
-                                e.printStackTrace();
-                        }
+                        // Check mail for new user.             
+                        MailBay.checkMail();
                         
                         Collection<Item> usernameFields = Actions.getByData(FrameIO.LoadFrame("multiuser1"), "txtUsername");
@@ -155 +121 @@
                 UserSettings.setupDefaultFolders();
                 MessageBay.updateFramesetLocation();
-                MailBay.disconnect();
                 
                 // Reset all of the settings.