Update codefactor due to merge conflict (#110)

## Pull Request Template ### Prerequisites  - [x] I have [searched](https://github.com/DefinetlyNotAI/Logicytics/pulls) for duplicate or closed issues. - [x] I have read the [contributing guidelines](https://github.com/DefinetlyNotAI/Logicytics/blob/main/CONTRIBUTING.md). - [x] I have followed the instructions in the [wiki](https://github.com/DefinetlyNotAI/Logicytics/wiki) about contributions. - [x] I have updated the documentation accordingly, if required. - [ ] I have added tests to cover my changes, and they have passed, if required. - [ ] I have tested my code with the `--dev` flag, if required. ### PR Type  - [ ] Bug fix  - [ ] New feature  - [ ] Refactoring  - [ ] Documentation update  - [x] ⚠️ Breaking change ⚠️  ### Description Updating the branch to mitigate future merge conflict ### Motivation and Context Merge conflict update ### Binaries Not now ### Issues Fixed Will be linked to #107
DefinetlyNotAI · Sep 21, 2024 · af8a269 · af8a269
2 parents 0fbb37f + 89d4bfa
commit af8a269
Show file tree

Hide file tree

Showing 11 changed files with 63 additions and 22 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -50,7 +50,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
+        uses: github/codeql-action/init@294a9d92911152fe08befb9ec03e240add280cb3 # v3.26.8
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -60,7 +60,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
+        uses: github/codeql-action/autobuild@294a9d92911152fe08befb9ec03e240add280cb3 # v3.26.8
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -73,6 +73,6 @@ jobs:
       #   ./location_of_script_within_repo/buildscript.sh
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
+        uses: github/codeql-action/analyze@294a9d92911152fe08befb9ec03e240add280cb3 # v3.26.8
         with:
           category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/powershell.yml b/.github/workflows/powershell.yml
@@ -49,6 +49,6 @@ jobs:
 
       # Upload the SARIF file generated in the previous step
       - name: Upload SARIF results file
-        uses: github/codeql-action/upload-sarif@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
+        uses: github/codeql-action/upload-sarif@294a9d92911152fe08befb9ec03e240add280cb3 # v3.26.8
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
@@ -73,6 +73,6 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
+        uses: github/codeql-action/upload-sarif@294a9d92911152fe08befb9ec03e240add280cb3 # v3.26.8
         with:
           sarif_file: results.sarif
diff --git a/CODE/Logicytics.py b/CODE/Logicytics.py
@@ -195,6 +195,9 @@
 
 # Zip generated files
 if action == "modded":
+
+    zip_loc_mod, hash_loc, deleted_files_zip, deleted_files_hash = zip_and_hash("..\\MODS", "MODS", action)
+    log.info(zip_loc_mod)
     zip_values = Zip().and_hash("..\\MODS", "MODS", action)
     if isinstance(zip_values, str):
         log.error(zip_values)
@@ -211,6 +214,14 @@
     zip_loc, hash_loc = zip_values
     log.info(zip_loc)
     log.debug(hash_loc)
+    log.debug(deleted_files_zip)
+    log.debug(deleted_files_hash)
+
+zip_loc, hash_loc, deleted_files_zip, deleted_files_hash = zip_and_hash("..\\CODE", "CODE", action)
+log.info(zip_loc)
+log.debug(hash_loc)
+log.debug(deleted_files_zip)
+log.debug(deleted_files_hash)
 
 # Attempt event log deletion
 attempt_hide()

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -148,6 +148,8 @@ the [MIT License](https://github.com/DefinetlyNotAI/Logicytics/blob/main/LICENSE
 By contributing to the documentation, you agree to license your contribution under
 the [Creative Commons Attribution 3.0 Unported License](https://creativecommons.org/licenses/by/3.0/).
 
+You also agree to the [Developer Certificate of Origin](DCO.md).
+
 ## Communication 🗣️
 
 - **Issues**: Use GitHub issues for bug reports and feature requests. Keep the discussion focused and relevant.

diff --git a/Developer_Certificate_of_Origin.md → DCO.md b/Developer_Certificate_of_Origin.md → DCO.md
@@ -1,22 +1,21 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<!-- saved from url=(0033)https://developercertificate.org/ -->
-<html><!--
-    File:   index.html
-    Editor: None, you wimpy wysiwyg people...this is hand crafted!
-            What are you doing reading this anyway???
---><head><meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-# Developer Certificate of Origin
-
-<pre>Developer Certificate of Origin
+<!--
+    File:   Developer_Certificate_of_Origin.md
+    Editor: None, you wimpy wysiwyg people...this is handcrafted!
+            What are you doing reading this anyway??? - Original Authors message
+-->
+
+<pre>
+Developer Certificate of Origin
 Version 1.1
 
-Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
+Copyright (C) 2024 Logicytics and its contributors.
 
 Everyone is permitted to copy and distribute verbatim copies of this
 license document, but changing it is not allowed.
 
 
-Developer's Certificate of Origin 1.1
+Developer's Certificate of Origin 1.0
 
 By making a contribution to this project, I certify that:
 
@@ -40,4 +39,5 @@ By making a contribution to this project, I certify that:
     are public and that a record of the contribution (including all
     personal information I submit with it, including my sign-off) is
     maintained indefinitely and may be redistributed consistent with
-    this project or the open source license(s) involved.
+    this project or the open source license(s) involved. 
+</pre>
diff --git a/README.md b/README.md
@@ -287,6 +287,20 @@ special tools
 
 Check out the [contributing guidlines](CONTRIBUTING.md) file for more info
 
+### Want More?
+
+If there is a specific piece of data that you would like to see extracted by Logicytics,
+please let us know. We are constantly working to improve the project and adding new features.
+
+![Extra Tools](IMG/ExtraTools.png "Here is the inbuilt extra tools menu {BETA}")
+
+Other than mods, some prefixed tools are in the `EXTRA` directory, use the `--extra` flag to traverse these
+special tools
+
+### Want to create your own mod?
+
+Check out the [contributing guidlines](CONTRIBUTING.md) file for more info
+
 ## 🌟 Conclusion 🌟
 
 Logicytics is a powerful tool that can extract a wide variety of data from a Windows system.
@@ -305,6 +319,12 @@ Always obtain proper authorization before extracting any data from a system.
 - [Project's Wiki](https://github.com/DefinetlyNotAI/Logicytics/wiki)
 - [Project's License](LICENSE)
 
+### License
+
+- [Developer Certificate of Origin](DCO.md)
+- [MIT License](LICENSE.md)
+
+
 ### 📃 GitHub Actions Status
 
 [![CodeQL](https://github.com/DefinetlyNotAI/Logicytics/actions/workflows/github-code-scanning/codeql/badge.svg)](https://github.com/DefinetlyNotAI/Logicytics/actions/workflows/github-code-scanning/codeql)

diff --git a/WEB/install.html b/WEB/install.html
@@ -25,7 +25,7 @@ <h3>Prerequisites</h3>
             <li><strong>Command Line Knowledge:</strong> Basic understanding of command line options is recommended.</li>
         </ul>
         <h3>Step-by-Step Installation</h3>
-        <li> Learn the installation Steps On my <a class="github" href="https://github.com/DefinetlyNotAI/Logicytics?tab=readme-ov-file#%EF%B8%8F-installation-and-setup-%EF%B8%8F">GitHub</a></li>
+        <li> Learn the instalation Steps On my <a class="github" href="https://github.com/DefinetlyNotAI/Logicytics?tab=readme-ov-file#%EF%B8%8F-installation-and-setup-%EF%B8%8F">Github</a></li>
 
         <a href="../index.html" class="install-link">Back to Home</a>
     </div>

diff --git a/WEB/wiki2.html b/WEB/wiki2.html
@@ -33,7 +33,7 @@ <h1>How to Contribute</h1>
                 <h2>Getting Started</h2>
                 <p>Contributing to open-source projects is a rewarding way to give back to the community while enhancing your skills. Here's how you can get started:</p>
                 <ol>
-                    <li><strong>Fork the Repository:</strong> Visit the project's GitHub page and click on the 'Fork' button in the top right corner. This creates a copy of the repository in your GitHub account.</li>
+                    <li><strong>Fork the Repository:</strong> Visit the project's GitHub page and click on the 'Fork' button at the top right corner. This creates a copy of the repository in your GitHub account.</li>
                     <li><strong>Clone the Repository:</strong> Clone the forked repository to your local machine using Git. Open your terminal or command prompt and run:<br>
                         <code style="color: black; font-weight: 800;">git clone https://github.com/DefinetlyNotAI/Logicytics.git</code>
                     </li>
@@ -93,8 +93,8 @@ <h3>Printing Rules</h3>
                 <h3>For Python's CRITICAL Method:</h3>
                 <ul>
                     <li><strong>Filecode:</strong> First letter of the filename, except if the file starts with an underscore, then use the first two letters.</li>
-                    <li><strong>Error-code:</strong> U for Unknown, G for General (exceptions), P for Privileges error, C for Corruption, O for OS errors, L for Library Errors.</li>
-                    <li><strong>Function-code:</strong> X for Unknown, first letter of the function name, BA for base code, C# for class and first function letter, CC# for nested class in a method.</li>
+                    <li><strong>Errorcode:</strong> U for Unknown, G for General (exceptions), P for Privileges error, C for Corruption, O for OS errors, L for Library Errors.</li>
+                    <li><strong>Functioncode:</strong> X for Unknown, first letter of the function name, BA for base code, C# for class and first function letter, CC# for nested class in a method.</li>
                 </ul>
             </section>
 

diff --git a/WEB/wiki4.html b/WEB/wiki4.html
@@ -40,7 +40,7 @@ <h3>2. Debug Mode</h3>
                 <p>Debug mode enhances the live feedback mechanism by providing more detailed information during runtime. This involves inspecting variable values at specific points and offering extra insights into the main program to aid developers in understanding how their code is executing. To activate debug mode, set <code style="color: black; font-weight: 800;">debug</code> to <code style="color: black; font-weight: 800;">true</code> in the <code style="color: black; font-weight: 800;">config.json</code> file. This mode is particularly useful when troubleshooting complex issues or when additional context is needed during the program's operation.</p>
 
                 <h3>3. Debugger</h3>
-                <p>The debugger component is a powerful tool for analyzing the state of a program at various points in time. It checks for file integrity, updates, and file structure, ensuring that the codebase is consistent and up-to-date. Additionally, the debugger can analyze the operating system and other external factors that might affect the application's behaviour. Debuggers are essential for diagnosing subtle bugs that are difficult to reproduce consistently. You can run the debugger by using the <code style="color: black; font-weight: 800;">--debug</code> flag.</p>
+                <p>The debugger component is a powerful tool for analyzing the state of a program at various points in time. It checks for file integrity, updates, and file structure, ensuring that the codebase is consistent and up-to-date. Additionally, the debugger can analyse the operating system and other external factors that might affect the application's behaviour. Debuggers are essential for diagnosing subtle bugs that are difficult to reproduce consistently. You can run the debugger by using the <code style="color: black; font-weight: 800;">--debug</code> flag.</p>
             </section>
 
             <a href="../index.html" class="install-link">Back to Home</a>

diff --git a/index_PURGED.html → index.html b/index_PURGED.html → index.html
@@ -5,13 +5,21 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Logicytics - Forensic Analysis Tool</title>
+
+    <!-- Styles and Fonts -->
     <link rel="stylesheet" href="WEB/styles.css">
     <link rel="preconnect" href="https://fonts.googleapis.com">
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
     <link href="https://fonts.googleapis.com/css2?family=Poppins:wght@300;600&display=swap" rel="stylesheet">
     <!-- Add Font Awesome -->
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0-beta3/css/all.min.css">
+
+    <!-- Security Headers (as meta tags) -->
+    <meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self' https://cdnjs.cloudflare.com; style-src 'self' https://fonts.googleapis.com; font-src 'self' https://fonts.gstatic.com;">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+
 </head>
+
 <!-- Main Content -->
 <body>
     <div class="hero">