Changeset 1279 for trunk/src

Timestamp:

04/04/19 11:07:45 (5 years ago)

Author:

bln4

Message:

Stopped exception from being printed to err upon incorrect username+password combination.

When logging in, each user now removes mail from each colleagues database file if the colleague has read it (as determined by the date stored alongside the database file).

Location:

trunk/src/org/expeditee/auth

Files:

• Actions.java (modified) (1 diff)
• Authenticator.java (modified) (5 diffs)

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

@@ -495 +495 @@
                 }
                 
-                SecretKey personalKey = Authenticator.getInstance().getSecretKey(username, password);
+                SecretKey personalKey = null;
+                
+                try {
+                        personalKey = Authenticator.getInstance().getSecretKey(username, password);
+                } catch (Exception e) {
+                        // leave personalKey null
+                }
+
                 if (personalKey == null) {
                         // Incorrect username and password

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

@@ -29 +29 @@
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Base64;
@@ -35 +34 @@
 import java.util.Date;
 import java.util.HashMap;
-import java.util.List;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Scanner;
+import java.util.Set;
 import java.util.stream.Stream;
 
@@ -273 +273 @@
                 PreparedStatement query = c.prepareStatement(sql);
                 ResultSet allMail = query.executeQuery();
-                List<String> oldTimestamps = new ArrayList<String>();
+                Set<String> oldTimestamps = new HashSet<String>();
                 
                 while (allMail.next()) {
@@ -283 +283 @@
                 }
                 
-                System.err.println("Found " + oldTimestamps.size() + " messages to delete.");
-                // TODO delete the messages from database.
+                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();
+                }               
         }
          
@@ -295 +303 @@
                         secret_key = (SecretKey) keyStore.getKey(label, password_ca);                   
                 } catch (final UnrecoverableEntryException e) {
-                        e.printStackTrace();
-                        secret_key = null;
+                        return null;
                 }