Changeset 1504 for trunk/src/org/expeditee/auth/AuthenticatorBrowser.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/AuthenticatorBrowser.java (modified) (5 diffs)

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

@@ -2 +2 @@
 
 import java.io.File;
-import java.io.FileFilter;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
-import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
-import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.security.KeyFactory;
@@ -22 +19 @@
 import java.security.spec.InvalidKeySpecException;
 import java.security.spec.X509EncodedKeySpec;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.Base64;
 import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
 import java.util.Scanner;
-import java.util.Set;
 import java.util.stream.Stream;
 
@@ -44 +30 @@
 
 import org.expeditee.actions.Actions;
-import org.expeditee.auth.mail.Mail;
 import org.expeditee.core.Dimension;
 import org.expeditee.core.Point;
@@ -67 +52 @@
 import org.expeditee.settings.UserSettings;
 import org.expeditee.settings.identity.secrets.KeyList;
-import org.expeditee.stats.Formatter;
 
 public final class AuthenticatorBrowser extends Browser implements CryptographyConstants {
@@ -195 +179 @@
                         }
                 }
-        }
-        
-        final void loadMailFromFile(Path dbFile) throws SQLException {
-                // Load in all mail.
-                Connection c = DriverManager.getConnection("jdbc:sqlite:" + dbFile.toAbsolutePath().toString());
-                String sql = "SELECT * FROM EXPMAIL";
-                PreparedStatement query = c.prepareStatement(sql);
-                ResultSet allMail = query.executeQuery();
-
-                // Construct all mail objects using content from database.
-                while(allMail.next()) {
-                        String timestamp = allMail.getString("time");
-                        String from = allMail.getString("snd");
-                        String to = allMail.getString("rec");
-                        String msg = allMail.getString("msg");
-                        String msg2 = allMail.getString("msg2");
-                        String[] opts = allMail.getString("opts").split(",");
-                        opts[0] = opts[0].replace("[", "");
-                        opts[opts.length - 1] = opts[opts.length - 1].replace("]", "");
-                        String[] optsVal = allMail.getString("optsval").split(",");
-                        optsVal[0] = optsVal[0].replace("[", "");
-                        optsVal[optsVal.length - 1] = optsVal[optsVal.length - 1].replace("]", "");
-                        
-                        Map<String, String> options = new HashMap<String, String>();
-                        for (int i = 0, o = 0; i < opts.length && o < optsVal.length; i++, o++) {
-                                String key = opts[i].trim();
-                                String val = optsVal[o].trim();
-                                options.put(key, val);
-                        }
-                        
-                        Mail.MailEntry mail = new Mail.MailEntry(timestamp, from, to, msg, msg2, options);
-                        mail.deadDropSource = dbFile;
-                        Mail.addEntry(mail);
-                }
-                
-                // Disconnect from database.
-                allMail.close();
-                query.close();
-                c.close();
-        }
-        
-        public final void loadMailDatabase() throws SQLException, FileNotFoundException, ParseException {
-                Path deadDropPath = Paths.get(FrameIO.DEAD_DROPS_PATH);
-                for (File connectionDir: deadDropPath.toFile().listFiles()) {
-                        if (connectionDir.isDirectory()) {
-                                Path deaddropforcontactPath = Paths.get(connectionDir.getAbsolutePath());
-                                Path dbFile = deaddropforcontactPath.resolve(UserSettings.UserName.get() + ".db");
-                                if (dbFile.toFile().exists()) {
-                                        loadMailFromFile(dbFile);
-                                }
-                                clearOldMailFromDatabase(deaddropforcontactPath);
-                        }
-                }
-        }
-
-        public final void updateLastReadMailTime(Path deaddropforcontactPath) {
-                Path timestamp = deaddropforcontactPath.resolve(UserSettings.UserName.get() + ".last-accessed");
-                try(FileWriter out = new FileWriter(timestamp.toFile())) {
-                        out.write(Formatter.getDateTime() + System.getProperty("line.separator"));
-                } catch (IOException e) {
-                        e.printStackTrace();
-                }
-        }
-        
-        private void clearOldMailFromDatabase(Path directory) throws FileNotFoundException, ParseException, SQLException {
-                File[] files = directory.toFile().listFiles(new FileFilter() {
-                        @Override
-                        public boolean accept(File file) {
-                                return !file.getName().startsWith(UserSettings.UserName.get());
-                        }
-                });
-                
-                File dbFile = null;
-                File lastAccessedFile = null;
-                for (File file: files) {
-                        if (file.getName().endsWith(".db")) {
-                                dbFile = file;
-                        } else {
-                                lastAccessedFile = file;
-                        }
-                }
-                
-                if (dbFile == null || lastAccessedFile == null) {
-                        return; // Not the end of the world if we cannot clear out old messages, these files may not be present yet if the others are recently new.
-                }
-                
-                SimpleDateFormat format = new SimpleDateFormat("ddMMMyyyy[HH:mm]");
-                Date timestamp = null;
-                try(Scanner in = new Scanner(lastAccessedFile)) {
-                        timestamp = format.parse(in.nextLine());
-                } catch (ParseException e) {
-                        return; // Not the end of the world if we cannot clear out old messages, the database might be empty.
-                }
-                
-                Connection c = DriverManager.getConnection("jdbc:sqlite:" + dbFile.getAbsolutePath());
-                String sql = "SELECT * FROM EXPMAIL";
-                PreparedStatement query = c.prepareStatement(sql);
-                ResultSet allMail = query.executeQuery();
-                Set<String> oldTimestamps = new HashSet<String>();
-                
-                while (allMail.next()) {
-                        String time = allMail.getString("time");
-                        Date messageTimestamp = format.parse(time);
-                        if (timestamp.after(messageTimestamp)) {
-                                oldTimestamps.add(time);
-                        }
-                }
-                
-                if (oldTimestamps.isEmpty()) {
-                        return;
-                }
-                
-                for(String oldTimestamp: oldTimestamps) {
-                        System.out.println("Deleting message with timestamp: " + oldTimestamp);
-                        sql = "DELETE FROM EXPMAIL WHERE time='" + oldTimestamp + "'";
-                        query = c.prepareStatement(sql);
-                        query.executeUpdate();
-                }               
         }