Version 1.1.0

Author: yash145-gpu

src/main/java/AuthenticationModule.java

@@ -3,6 +3,11 @@
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 
+/** AuthenticationModule.java
+ * For user & admin login and keeping last-login time
+ * @author Yash Shinde
+ * @version 1.1.0
+ */
 public class AuthenticationModule {
     private static String typequery;
 

src/main/java/BackupManager.java

@@ -2,6 +2,10 @@
 import java.io.*;
 import java.sql.*;
 
+/** BackupManager.java
+ * Storing and retrieving user files in embedded database
+ * max file size limit = 900mb (SQLite blob)
+ */
 public class BackupManager {
     static final String DB_URL = "jdbc:sqlite:unified.db";
     static final long MAX_FILE_SIZE = 900 * 1024 * 1024; 

src/main/java/DbHandler.java

@@ -13,16 +13,18 @@
 * Methods for handling backend of database operations
 * Creates necessary tables on startup of system
 * @author Yash Shinde
-*/
+* @version 1.1.0
+ */
 
 public class DbHandler {
     protected static final String DB_URL = "jdbc:sqlite:unified.db"; //Database URL , name : unified.db
     private static final String CREATE_USERDATA_TABLE_SQL = "CREATE TABLE IF NOT EXISTS userdata (id INTEGER PRIMARY KEY AUTOINCREMENT ,username TEXT NOT NULL UNIQUE , password TEXT NOT NULL, Last_Login TEXT)";
     private static final String CREATE_FILES_TABLE_SQL = "CREATE TABLE IF NOT EXISTS files(id INTEGER PRIMARY KEY AUTOINCREMENT,filename TEXT NOT NULL,filedata BLOB NOT NULL,username TEXT NOT NULL, isEncrypted INTEGER NOT NULL DEFAULT 0)";
-    private static final String CREATE_KEYS_TABLE_SQL = "CREATE TABLE IF NOT EXISTS keys (keyId INTEGER PRIMARY KEY AUTOINCREMENT,id INTEGER, username TEXT NOT NULL , filename TEXT NOT NULL, key TEXT NOT NULL,IniVec VARBINARY(16) NOT NULL,FOREIGN KEY (id) REFERENCES files(id) ON DELETE CASCADE,FOREIGN KEY (username) REFERENCES userdata(username) ON DELETE CASCADE)";
+    private static final String CREATE_KEYS_TABLE_SQL = "CREATE TABLE IF NOT EXISTS keys (keyId INTEGER PRIMARY KEY AUTOINCREMENT,id INTEGER, username TEXT NOT NULL , filename TEXT NOT NULL, key TEXT NOT NULL,IniVec TEXT NOT NULL,FOREIGN KEY (id) REFERENCES files(id) ON DELETE CASCADE,FOREIGN KEY (username) REFERENCES userdata(username) ON DELETE CASCADE)";
     private static final String CREATE_ADMIN_DATA_TABLE_SQL = "CREATE TABLE IF NOT EXISTS Admindata (id INTEGER PRIMARY KEY AUTOINCREMENT ,AdminName TEXT NOT NULL UNIQUE , password TEXT NOT NULL, Last_Login TEXT)";
+
     static void setupDatabase() {
-     
+        //Initializes all tables and adds default admin if no admins exist
         try (Connection conn = DriverManager.getConnection(DB_URL);
                 Statement stmt = conn.createStatement()) {
             stmt.execute("PRAGMA foreign_keys = ON"); //Foreign key support
@@ -35,7 +37,8 @@ static void setupDatabase() {
             JOptionPane.showMessageDialog(null,"Error setting up database: \n" + e.getMessage() + "\n");
         }
     }
-static void AdminInit(){  //Initializes default Admin 
+static void AdminInit(){
+        //Initializes default Admin
     String initAdm = UserManager.hashPassword("Admin");
     String checkAdminSQL = "SELECT COUNT(*) FROM Admindata";
     try (Connection conn = DriverManager.getConnection(DB_URL); PreparedStatement pstmtCheck = conn.prepareStatement(checkAdminSQL)) { 

src/main/java/GUI.java

@@ -9,7 +9,7 @@
 import java.net.URISyntaxException;
 
 /**Project : Secure Storage Manager
- * @version 1.0.0
+ * @version 1.1.0
  * This is the main class to the project
  * @author Yash Shinde
  */
@@ -143,22 +143,23 @@ public void mouseExited(MouseEvent e) {
         login.setVisible(true);
 
         help.addActionListener(e ->{JOptionPane.showMessageDialog(null,"Secure Storage Manager release 1.0.0 \n\n"
-        +"AES 256 : Symmetric encryption of files with any extension type , files can be stored on embedded database or local directory based on size ,\ngenerates secure random key and initialization vector.\n\n"
+        +"NEW! : Custom AES Decryption CBC+ECB\n\n"+"AES 256 : Symmetric encryption of files with any extension type , files can be stored on embedded database or local directory based on size ,\ngenerates secure random key and initialization vector.\n\n"
         +"SHA File Checksum : Generates SHA256/512 hash for a file.\n\n"+
         "File Database Backup : Encodes file data and stores directly on embedded database without encryption.\n\n"
         +"Admin login : For directly manipulating database with predefined tools (Default ID,Password : (Admin,Admin) , can be updated).\n\n"
         +"User login : Credentials are hashed and stored securely.\n\n");});
 
 /*User login , default Admin is created at startup
-  *creadentials for Admin can be changed in program aswell as in source (DbHandler.java)
+  *credentials for Admin can be changed in program as well as in source (DbHandler.java)
   * Default Admin login : username = Admin , password = Admin
  */
         Log.addActionListener(e -> {AuthenticationModule.loginUser(0); });  
         Admlog.addActionListener(e -> {AuthenticationModule.loginUser(1);});
         Reg.addActionListener(e -> UserManager.registerUser(userField,passwdField));
     }
 
-    private JButton getButton() {       //Custom JButton for link to source 
+    private JButton getButton() {
+        //Custom JButton for link to source
         JButton yp = new JButton();
         yp.setBounds(0, 0, 570,(int)screenSize.getHeight());
         yp.setOpaque(false);

src/main/java/MainFrame.java

@@ -23,6 +23,7 @@
 /** MainFrame.java
  *  User GUI with all cryptographic,file management functionalities
  *  @author Yash Shinde
+ * @version 1.1.0
  */
 
 public class MainFrame {
@@ -80,6 +81,7 @@ public MainFrame(){
 
         JButton enc = new JButton("AES File Encryption");
         JButton dec = new JButton("AES File Decryption");
+        JButton custDec = new JButton("Custom AES Decryption");
         JButton vf = new JButton("View Files");
         JButton rm_file = new JButton("Remove Files");
         JButton SHA2 = new JButton("SHA-256 File Checksum");
@@ -92,13 +94,14 @@ public MainFrame(){
         fileButtonPanel.add(vk);
         fileButtonPanel.add(enc);
         fileButtonPanel.add(dec);
+        fileButtonPanel.add(custDec);
         fileButtonPanel.add(rm_file);
         fileButtonPanel.add(reset);
         fileButtonPanel.add(saveFileButton);
         fileButtonPanel.add(retrieveFileButton);
         for (Component component : fileButtonPanel.getComponents()) {
                 component.setBackground(Color.GRAY);
-                component.setPreferredSize(new Dimension(200,55));
+                component.setPreferredSize(new Dimension(200,50));
                 component.setFocusable(false);
         }
 
@@ -115,6 +118,9 @@ public MainFrame(){
 
         Logout.addActionListener(e-> {  //logs out to login GUI
             feedbackArea.setText(" ");
+            mode=0;
+            feedbackArea.setBackground(null);
+            feedbackArea.setForeground(null);
             mainframe.dispose(); 
             GUI.login.setVisible(true); 
         });
@@ -138,7 +144,7 @@ else if(choice==1){
         //Fetches keys for user
         vk.addActionListener(e -> DbHandler.executeSQLQuery(feedbackArea,"SELECT* FROM keys WHERE username="+"'"+GUI.loggedInUser+"'",tableModel)); 
 
-        enc.addActionListener(e -> SecurityTools.encryptFileToDatabase()); //AES Encryption
+        enc.addActionListener(e -> SecurityTools.encryptFileToDatabase(null)); //AES Encryption
         dec.addActionListener(e -> SecurityTools.decryptFile()); //AES Decryption
 
         //Fetches files for user
@@ -249,6 +255,7 @@ else if(choice==1){
                     resultTable.setFillsViewportHeight(true);
                     tableScrollPane.getViewport().setBackground(Color.WHITE);
                     });
+        custDec.addActionListener(e-> SecurityTools.customDecryption());
 
     }