FINAL MERGE #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

lucasTrswl merged 96 commits into main from develop

Dec 20, 2024

.github/workflows/tests.yml

-Original file line number
+Diff line change
@@ -0,0 +1,95 @@
+    name: Java CI with JUnit Tests
+    on:
+      push:
+        branches: [ "main", "develop" ]
+      pull_request:
+        branches: [ "main", "develop" ]
+    jobs:
+      test:
+        runs-on: ubuntu-latest
+        steps:
+        - uses: actions/checkout@v3
+        - name: Set up JDK 23
+          uses: actions/setup-java@v3
+          with:
+            java-version: '23'
+            distribution: 'temurin'
+        - name: Show Project Structure
+          run: |
+            echo "Current directory:"
+            pwd
+            echo "Directory contents:"
+            ls -R
+        - name: Download Dependencies
+          run: |
+                mkdir -p lib
+                wget https://repo1.maven.org/maven2/junit/junit/4.13.2/junit-4.13.2.jar -P lib/
+                wget https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar -P lib/
+                wget https://repo1.maven.org/maven2/com/google/code/gson/gson/2.11.0/gson-2.11.0.jar -P lib/
+                wget https://repo1.maven.org/maven2/org/bytedeco/javacv/1.5.11/javacv-1.5.11.jar -P lib/
+                wget https://repo1.maven.org/maven2/org/bytedeco/javacpp/1.5.11/javacpp-1.5.11.jar -P lib/
+                wget https://repo1.maven.org/maven2/org/bytedeco/ffmpeg/7.1-1.5.11/ffmpeg-7.1-1.5.11.jar -P lib/
+                wget https://repo1.maven.org/maven2/org/bytedeco/ffmpeg/7.1-1.5.11/ffmpeg-7.1-1.5.11-linux-x86_64.jar -P lib/
+                wget https://repo1.maven.org/maven2/org/bytedeco/javacpp-platform/1.5.11/javacpp-platform-1.5.11.jar -P lib/
+        - name: Compile
+          run: |
+            mkdir -p out
+            # Liste et compile les fichiers principaux
+            MAIN_FILES=$(find src/Classes -name "*.java")
+            if [ ! -z "$MAIN_FILES" ]; then
+              echo "Compiling main files:"
+              echo "$MAIN_FILES"
+              javac -cp "lib/*" -d out $MAIN_FILES
+            else
+              echo "No main files found"
+            fi
+            # Liste et compile les fichiers de test
+            TEST_FILES=$(find src/Tests -name "*.java")
+            if [ ! -z "$TEST_FILES" ]; then
+              echo "Compiling test files:"
+              echo "$TEST_FILES"
+              javac -cp "out:lib/*" -d out $TEST_FILES
+            else
+              echo "No test files found"
+            fi
+        - name: Run tests
+          run: |
+            # Trouve et exécute tous les tests
+            TEST_CLASSES=$(find out/Tests -name "*Test.class" | sed 's/out\///' | sed 's/\.class$//' | tr '/' '.')
+            if [ ! -z "$TEST_CLASSES" ]; then
+              echo "Running test classes:"
+              echo "$TEST_CLASSES"
+              java -cp "out:lib/*" org.junit.runner.JUnitCore $TEST_CLASSES
+            else
+              echo "No test classes found"
+            fi
+        - name: Generate Test Report
+          if: always()
+          run: |
+            echo "# Test Results" > test-report.md
+            echo "\`\`\`" >> test-report.md
+            TEST_CLASSES=$(find out/Tests -name "*Test.class" | sed 's/out\///' | sed 's/\.class$//' | tr '/' '.')
+            if [ ! -z "$TEST_CLASSES" ]; then
+              java -cp "out:lib/*" org.junit.runner.JUnitCore $TEST_CLASSES >> test-report.md 2>&1 || true
+            else
+              echo "No test classes found" >> test-report.md
+            fi
+            echo "\`\`\`" >> test-report.md
+        - name: Upload Test Report
+          if: always()
+          uses: actions/upload-artifact@v3
+          with:
+            name: test-report
+            path: test-report.md

.idea/artifacts/ByteWarden_jar.xml

Large diffs are not rendered by default.

.idea/libraries/bytedeco_javacv_platform.xml

Large diffs are not rendered by default.

.idea/libraries/fasterxml_jackson_core_databind.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

.idea/libraries/google_code_gson.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

.idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

ByteWarden.iml

-Original file line number
+Diff line change
@@ Expand Up / @@ -17,5 +17,8 @@ @@
             <SOURCES />
           </library>
         </orderEntry>
+        <orderEntry type="library" name="google.code.gson" level="project" />
+        <orderEntry type="library" name="bytedeco.javacv.platform" level="project" />
+        <orderEntry type="library" name="fasterxml.jackson.core.databind" level="project" />
       </component>
     </module>

README.md

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		![Tests](https://github.com/Bilnaa/ByteWarden/actions/workflows/tests.yml/badge.svg)

databases.json

-Original file line number
+Diff line change
@@ -0,0 +1,18 @@
+    {
+      "llucas": {
+        "name": "llucas",
+        "hashPassword": "eebc1115b82aea1ee598f927e19500c75d2e318eaa9d83fa5a7513e26dea608b",
+        "encryptionMap": {
+          "RotX": "12"
+        },
+        "salt": "NTNcG1Mv\u002604K"
+      },
+      "test": {
+        "name": "test",
+        "hashPassword": "6b3fcb519f1dac8495538eed6bf3963faf7d7a6762d6789869a2cb51a9bca91d",
+        "encryptionMap": {
+          "RotX": "12"
+        },
+        "salt": "sP5s3cWwMsOX"
+      }
+    }

llucas.json

-Original file line number
+Diff line change
@@ -0,0 +1,9 @@
+    {
+      "eufqe": [
+        {
+          "bmeeiadp": "rlrqlr",
+          "eufqZmyq": "kagfgnq",
+          "geqdzmyq": "lplp"
+        }
+      ]
+    }

pepper.json

-Original file line number
+Diff line change
@@ -0,0 +1,3 @@
+    {
+      "pepper": "jesuisunpoivre"
+    }

src/Classes/DatabasesManager.java

-Original file line number
+Diff line change
@@ -0,0 +1,124 @@
+    package Classes;
+    import com.fasterxml.jackson.databind.ObjectMapper;
+    import com.google.gson.Gson;
+    import com.google.gson.GsonBuilder;
+    import com.google.gson.reflect.TypeToken;
+    import java.io.File;
+    import java.io.FileReader;
+    import java.io.FileWriter;
+    import java.io.IOException;
+    import java.lang.reflect.Type;
+    import java.util.HashMap;
+    import java.util.Map;
+    public class DatabasesManager {
+        private final File databasesFile;
+        private final Map<String, Database> databases;
+        private final Sha256 sha256 = new Sha256();
+        public DatabasesManager(File databasesFile) {
+            this.databasesFile = databasesFile;
+            this.databases = loadDatabases() != null ? loadDatabases() : new HashMap<>();
+        }
+        //Verify the hashed password with the password entered by the user
+        public boolean verifyDatabase(String dbName, String password) {
+            if (!databases.containsKey(dbName)) return false;
+            Database database = databases.get(dbName);
+            String pepper = readPepperFromJson("pepper.json");
+            String hashedPassword = sha256.calculateHash(database.getSalt() + password + pepper);
+            return database.getHashPassword().equals(hashedPassword);
+        }
+        //create database object with user inputs
+        public void createDatabase(String dbName, String password, Map<String, String> encryptionMap) {
+            if (databases.containsKey(dbName)) {
+                throw new IllegalArgumentException("Database already exists.");
+            }
+            String pepper = readPepperFromJson("pepper.json");
+            String salt = PasswordUtils.generateRandomPassword(12);
+            String hashedPassword = sha256.calculateHash(salt + password + pepper);
+            Database newDatabase = new Database(dbName, hashedPassword, encryptionMap, salt);
+            databases.put(dbName, newDatabase);
+            saveDatabases();
+        }
+        private String readPepperFromJson(String filePath) {
+            ObjectMapper objectMapper = new ObjectMapper();
+            try {
+                Map<String, String> jsonMap = objectMapper.readValue(new File(filePath), Map.class);
+                return jsonMap.get("pepper");
+            } catch (IOException e) {
+                e.printStackTrace();
+                return "";
+            }
+        }
+        private Map<String, Database> loadDatabases() {
+            if (!databasesFile.exists()) return new HashMap<>();
+            try (FileReader reader = new FileReader(databasesFile)) {
+                Gson gson = new Gson();
+                Type type = new TypeToken<Map<String, Database>>() {}.getType();
+                return gson.fromJson(reader, type);
+            } catch (IOException e) {
+                e.printStackTrace();
+                return new HashMap<>();
+            }
+        }
+        private void saveDatabases() {
+            try (FileWriter writer = new FileWriter(databasesFile)) {
+                Gson gson = new GsonBuilder().setPrettyPrinting().create();
+                gson.toJson(databases, writer);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        // class database to make the database manager easy to use
+        public static class Database {
+            private final String name;
+            private final String hashPassword;
+            private final Map<String, String> encryptionMap;
+            private final String salt;
+            public Database(String name, String hashPassword, Map<String, String> encryptionMap, String salt) {
+                this.name = name;
+                this.hashPassword = hashPassword;
+                this.encryptionMap = encryptionMap;
+                this.salt = salt;
+            }
+            public String getName() {
+                return name;
+            }
+            public String getHashPassword() {
+                return hashPassword;
+            }
+            public Map<String, String> getEncryptionMap() {
+                return encryptionMap;
+            }
+            public String getSalt(){
+                return salt;
+            }
+        }
+        //method to get the encryption map for the encryption and decryption during the database user selection
+        public Map<String, String> getEncryptionMap(String dbName) {
+            if (!databases.containsKey(dbName)) { // if the database name doesn't exist
+                throw new IllegalArgumentException("Database does not exist: " + dbName);
+            }
+            try (FileReader reader = new FileReader(databasesFile)) {
+                Gson gson = new Gson();
+                Map<String, Map<String, Object>> allDatabases = gson.fromJson(reader, Map.class);  //get all the databases info from databases.json
+                Map<String, Object> dbData = allDatabases.get(dbName); //get the wanted database
+                return (Map<String, String>) dbData.get("encryptionMap"); // get all the encryption methods from the current database
+            } catch (IOException e) {
+                throw new RuntimeException("Failed to read databases file.", e);
+            }
+        }
+    }

src/Classes/Enigma/Enigma.java

-Original file line number
+Diff line change
@@ -0,0 +1,52 @@
+    package Classes.Enigma;
+    public class Enigma {
+        private Rotors rotors = new Rotors(); // Rotors component
+        private Reflector reflector = new Reflector(); // Reflector component
+        private Plugboard plugboard = new Plugboard(); // Plugboard component
+        public Enigma() {
+        }
+        public Enigma(Rotors rotors, Reflector reflector, Plugboard plugboard) {
+            this.rotors = rotors;
+            this.reflector = reflector;
+            this.plugboard = plugboard;
+        }
+        public Rotors getRotors() {
+            return rotors; // Return the rotors component
+        }
+        public Reflector getReflector() {
+            return reflector; // Return the reflector component
+        }
+        public Plugboard getPlugboard() {
+            return plugboard; // Return the plugboard component
+        }
+        public String encrypt(String message) {
+            StringBuilder encryptedMessage = new StringBuilder();
+            for (char c : message.toCharArray()) {
+                if (Character.isLetter(c)) {
+                    c = Character.toUpperCase(c); // Convert to uppercase
+                    c = plugboard.swap(c); // Swap using plugboard
+                    c = rotors.rotate(c); // Rotate through rotors
+                    c = reflector.reflect(c); // Reflect the character
+                    c = rotors.rotateBack(c); // Rotate back through rotors
+                    c = plugboard.swap(c); // Swap using plugboard again
+                    if (Character.isLowerCase(message.charAt(encryptedMessage.length()))) {
+                        c = Character.toLowerCase(c); // Convert back to lowercase if needed
+                    }
+                }
+                encryptedMessage.append(c); // Append the encrypted character
+            }
+            return encryptedMessage.toString();
+        }
+        public String decrypt(String message) {
+            rotors.resetToInitialPosition(); // Reset rotors to initial positions
+            return encrypt(message); // Decrypt by re-encrypting
+        }
+    }

src/Classes/Enigma/Plugboard.java

-Original file line number
+Diff line change
@@ -0,0 +1,40 @@
+    package Classes.Enigma;
+    import java.util.HashMap;
+    import java.util.Map;
+    public class Plugboard {
+        private Map<Character, Character> connections; // Map to store the letter pairs for swapping
+        public Plugboard() {
+            connections = new HashMap<>(); // Initialize the connections map
+        }
+        /**
+         * Connects two letters in the plugboard
+         * @param a First letter to connect
+         * @param b Second letter to connect
+         * @throws IllegalArgumentException if letters are already connected
+         */
+        public void connect(char a, char b) {
+            a = Character.toUpperCase(a); // Convert to uppercase for consistency
+            b = Character.toUpperCase(b);
+            if (connections.containsKey(a) || connections.containsKey(b)) {
+                throw new IllegalArgumentException("Letters are already connected"); // Check if letters are already connected
+            }
+            connections.put(a, b); // Create bidirectional connection
+            connections.put(b, a);
+        }
+        /**
+         * Swaps a letter according to plugboard connections
+         * @param c Letter to swap
+         * @return Swapped letter if connection exists, original letter otherwise
+         */
+        public char swap(char c) {
+            c = Character.toUpperCase(c); // Convert to uppercase for consistency
+            return connections.getOrDefault(c, c); // Swap the letter if connection exists
+        }
+    }

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

FINAL MERGE #21

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!