From 6b78a7e8ab722182e15e82716b040c4afae2053e Mon Sep 17 00:00:00 2001 From: battleoverflow <56496067+battleoverflow@users.noreply.github.com> Date: Mon, 15 Apr 2024 01:56:24 -0500 Subject: [PATCH] Cleanup --- Cargo.toml | 6 +++--- LICENSE | 2 +- Makefile | 6 +++--- README.md | 12 ++++++------ build.rs | 4 ++-- build_modules.sh | 4 ++-- modules.json | 2 +- public/crack_hash.html | 4 ++-- public/decode.html | 4 ++-- public/defang.html | 4 ++-- public/extract_zip.html | 4 ++-- public/gen_domain.html | 4 ++-- public/identify.html | 4 ++-- public/index.html | 6 +++--- public/js/index.js | 4 ++-- public/parse_email.html | 4 ++-- public/sysdump.html | 4 ++-- public/whois.html | 4 ++-- server/public/err/404.html | 4 ++-- server/public/index.html | 4 ++-- src/catherine.rs | 10 +++++----- src/core/commands.rs | 4 ++-- src/core/mod.rs | 4 ++-- src/core/shell.rs | 4 ++-- src/core/utils.rs | 4 ++-- src/main.rs | 4 ++-- src/meta.rs | 4 ++-- src/modules/db/redis.py | 4 ++-- src/modules/formats/exe/win_exe_dump.py | 4 ++-- src/modules/formats/hex/c_hex_dump.c | 4 ++-- src/modules/formats/hex/mod.rs | 4 ++-- src/modules/formats/hex/rs_hex_dump.rs | 4 ++-- src/modules/formats/mod.rs | 4 ++-- src/modules/mercy/extension.py | 4 ++-- src/modules/mod.rs | 4 ++-- src/modules/net/netscan/src/cmds/cli/commands.go | 4 ++-- src/modules/net/netscan/src/main.go | 4 ++-- src/modules/web/parsers/links.py | 4 ++-- src/ui/controller.rs | 4 ++-- src/ui/mod.rs | 4 ++-- tauri.conf.json | 4 ++-- 41 files changed, 90 insertions(+), 90 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index ea4ed83..aefa040 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,13 +1,13 @@ [package] name = "catherine" description = "The Catherine Framework is a general-purpose cybersecurity framework built to provide extended support for defense operations." -version = "0.6.0" -authors = ["azazelm3dj3d"] +version = "0.6.1" +authors = ["battleoverflow"] license = "BSD-2-Clause" categories = ["cryptography", "command-line-utilities", "encoding"] keywords = ["cybersecurity", "blueteam", "framework", "security", "defense"] edition = "2021" -repository = "https://github.com/azazelm3dj3d/catherine" +repository = "https://github.com/battleoverflow/catherine" [build-dependencies] tauri-build = { version = "1.2.1", features = [] } diff --git a/LICENSE b/LICENSE index f2b9ab0..3d7cbf8 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ BSD 2-Clause License -Copyright (c) 2022, azazelm3dj3d +Copyright (c) 2022-2024, battleoverflow All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/Makefile b/Makefile index 31e06ab..fcb68be 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,9 @@ -# Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine) -# Author: azazelm3dj3d (https://github.com/azazelm3dj3d) +# Project: Catherine Framework (https://github.com/battleoverflow/catherine) +# Author: battleoverflow (https://github.com/battleoverflow) # License: BSD 2-Clause NAME=catherine -PROJ_VERSION=0.6.0 +PROJ_VERSION=0.6.1 run: @echo "Building $(NAME) v$(PROJ_VERSION)" diff --git a/README.md b/README.md index 489450f..d9edf19 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@

Catherine

-[![Catherine](https://github.com/azazelm3dj3d/catherine/actions/workflows/workflow.yml/badge.svg)](https://github.com/azazelm3dj3d/catherine/actions/workflows/workflow.yml) +[![Catherine](https://github.com/battleoverflow/catherine/actions/workflows/workflow.yml/badge.svg)](https://github.com/battleoverflow/catherine/actions/workflows/workflow.yml) The Catherine Framework is a general-purpose cybersecurity framework built to provide extended support for defense operations. Catherine currently collects information from dumping hexadecimal content from files, validates malicious domains & IP addresses, attempts to crack unknown hashes, handles real-time database analysis, various types of decoding, and much more in a quick CLI utility. Thanks to Catherine being built in an easily packaged executable, you can quickly download the tool by running `cargo install catherine` via the `Cargo` ecosystem. Catherine can also be quickly compiled by pulling down the source code from `git` and simply running `cargo build` or `make` to build alongside modules. @@ -11,7 +11,7 @@ NOTE: Modules do require Go, Python, and C build utilities to be installed. Catherine provides a Command Line Interface (CLI) and Graphical User Interface (GUI) built into the executable. This means whether you install from source or `Cargo`, you can choose your method of use. -This project will most likely be in an experimental state for a long time. This project is a personal endeavor to explore different ways to control or manipulate data utilizing Rust. A more stable and production-oriented crate is available [here](https://github.com/azazelm3dj3d/mercy). Mercy is an open-source Rust crate and CLI designed for building cybersecurity utilities and projects. +This project will most likely be in an experimental state for a long time. This project is a personal endeavor to explore different ways to control or manipulate data utilizing Rust. A more stable and production-oriented crate is available [here](https://github.com/battleoverflow/mercy). Mercy is an open-source Rust crate and CLI designed for building cybersecurity utilities and projects. ## Installation @@ -26,7 +26,7 @@ If you'd prefer to install from source, you can also do this fairly easily, but First, clone the repository using `git`: ```bash -git clone https://github.com/azazelm3dj3d/catherine.git +git clone https://github.com/battleoverflow/catherine.git ``` Once you've cloned the repository, and you're in the correct directory, simply run the following command: @@ -43,7 +43,7 @@ If you're interested in working with the Catherine modules, you can use the `mak make ``` -I am working on converting all external [modules](https://github.com/azazelm3dj3d/catherine-modules) (Python, C, Go) into native modules (Rust) to offer everything in a built-in executable via `Cargo` without any extra steps, but for now, I've made sure to keep them accessible (excluding the GUI) for extended functionality. +I am working on converting all external [modules](https://github.com/battleoverflow/catherine-modules) (Python, C, Go) into native modules (Rust) to offer everything in a built-in executable via `Cargo` without any extra steps, but for now, I've made sure to keep them accessible (excluding the GUI) for extended functionality. ## Usage @@ -59,6 +59,6 @@ If a GUI is more your style, there is a simple version available with the majori 🦀 Catherine [v0.x.x] (None) ☀️ 〉launch ``` -If a bug or issue is found, please report it [here](https://github.com/azazelm3dj3d/catherine/issues). +If a bug or issue is found, please report it [here](https://github.com/battleoverflow/catherine/issues). -*GUI logo provided by Freepik w/ modification from azazelm3dj3d. +*GUI logo provided by Freepik w/ modification from battleoverflow. diff --git a/build.rs b/build.rs index dbd46db..da4dc6e 100644 --- a/build.rs +++ b/build.rs @@ -1,6 +1,6 @@ /* - Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine) - Author: azazelm3dj3d (https://github.com/azazelm3dj3d) + Project: Catherine Framework (https://github.com/battleoverflow/catherine) + Author: battleoverflow (https://github.com/battleoverflow) License: BSD 2-Clause */ diff --git a/build_modules.sh b/build_modules.sh index ea72d2c..eeff138 100755 --- a/build_modules.sh +++ b/build_modules.sh @@ -1,7 +1,7 @@ #!/bin/bash -# Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine) -# Author: azazelm3dj3d (https://github.com/azazelm3dj3d) +# Project: Catherine Framework (https://github.com/battleoverflow/catherine) +# Author: battleoverflow (https://github.com/battleoverflow) # License: BSD 2-Clause # NetScan diff --git a/modules.json b/modules.json index e68040a..7b9c2de 100644 --- a/modules.json +++ b/modules.json @@ -1,5 +1,5 @@ { - "author": "azazelm3dj3d", + "author": "battleoverflow", "version": "0.1.26", "numOfModules": "6", "ModulesList": [ diff --git a/public/crack_hash.html b/public/crack_hash.html index 098aade..0cb43b1 100644 --- a/public/crack_hash.html +++ b/public/crack_hash.html @@ -1,6 +1,6 @@ diff --git a/public/decode.html b/public/decode.html index f76802c..ccc3a3b 100644 --- a/public/decode.html +++ b/public/decode.html @@ -1,6 +1,6 @@ diff --git a/public/defang.html b/public/defang.html index f276369..0fae3d9 100644 --- a/public/defang.html +++ b/public/defang.html @@ -1,6 +1,6 @@ diff --git a/public/extract_zip.html b/public/extract_zip.html index d4601a7..ca15bd5 100644 --- a/public/extract_zip.html +++ b/public/extract_zip.html @@ -1,6 +1,6 @@ diff --git a/public/gen_domain.html b/public/gen_domain.html index 5908112..bc77507 100644 --- a/public/gen_domain.html +++ b/public/gen_domain.html @@ -1,6 +1,6 @@ diff --git a/public/identify.html b/public/identify.html index c203e56..69d2c3f 100644 --- a/public/identify.html +++ b/public/identify.html @@ -1,6 +1,6 @@ diff --git a/public/index.html b/public/index.html index 17c9855..cb14bb9 100644 --- a/public/index.html +++ b/public/index.html @@ -1,6 +1,6 @@ @@ -94,7 +94,7 @@
Skull logo representing the Catherine framework

- Built by azazelm3dj3d (https://github.com/azazelm3dj3d) + Built by battleoverflow (https://github.com/battleoverflow)

diff --git a/public/js/index.js b/public/js/index.js index 5fdd517..7a117bd 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -1,6 +1,6 @@ /* - Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine) - Author: azazelm3dj3d (https://github.com/azazelm3dj3d) + Project: Catherine Framework (https://github.com/battleoverflow/catherine) + Author: battleoverflow (https://github.com/battleoverflow) License: BSD 2-Clause */ diff --git a/public/parse_email.html b/public/parse_email.html index 43f9831..af5c529 100644 --- a/public/parse_email.html +++ b/public/parse_email.html @@ -1,6 +1,6 @@ diff --git a/public/sysdump.html b/public/sysdump.html index d0f29d2..ad5f908 100644 --- a/public/sysdump.html +++ b/public/sysdump.html @@ -1,6 +1,6 @@ diff --git a/public/whois.html b/public/whois.html index 9b78e68..dafb029 100644 --- a/public/whois.html +++ b/public/whois.html @@ -1,6 +1,6 @@ diff --git a/server/public/err/404.html b/server/public/err/404.html index 675d1cc..d4783f8 100644 --- a/server/public/err/404.html +++ b/server/public/err/404.html @@ -1,6 +1,6 @@ diff --git a/server/public/index.html b/server/public/index.html index a05cbe3..f27cfea 100644 --- a/server/public/index.html +++ b/server/public/index.html @@ -1,6 +1,6 @@ diff --git a/src/catherine.rs b/src/catherine.rs index 7d4d6a0..0de8de5 100644 --- a/src/catherine.rs +++ b/src/catherine.rs @@ -1,6 +1,6 @@ /* - Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine) - Author: azazelm3dj3d (https://github.com/azazelm3dj3d) + Project: Catherine Framework (https://github.com/battleoverflow/catherine) + Author: battleoverflow (https://github.com/battleoverflow) License: BSD 2-Clause */ @@ -54,7 +54,7 @@ use crate::ui::controller::launch_gui; extern crate ipconfig; pub(crate) static NAME: &str = "Catherine"; -pub(crate) static VERSION: &str = "0.6.0"; +pub(crate) static VERSION: &str = "0.6.1"; pub(crate) static NETSCAN_PATH: &str = "/opt/catherine/catherine-modules/net/netscan/netscan"; pub(crate) static LINK_PARSER_PATH: &str = "/opt/catherine/catherine-modules/web/parsers/links"; @@ -253,7 +253,7 @@ pub fn init(boot_msg: &str) { "version" => { println!("\nCatherine Framework v{}", VERSION); - println!("Author: azazelm3dj3d (https://github.com/azazelm3dj3d)\n"); + println!("Author: battleoverflow (https://github.com/battleoverflow)\n"); }, // Installs custom modules @@ -274,7 +274,7 @@ pub fn init(boot_msg: &str) { } // Downloads Catherine modules from GitHub - git_downloader("https://github.com/azazelm3dj3d/catherine-modules.git"); + git_downloader("https://github.com/battleoverflow/catherine-modules.git"); if existence("/opt/catherine") { println!("\nInstallation complete! Modules can be found here: /opt/catherine/catherine-modules\n"); diff --git a/src/core/commands.rs b/src/core/commands.rs index 9145488..432101b 100644 --- a/src/core/commands.rs +++ b/src/core/commands.rs @@ -1,6 +1,6 @@ /* - Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine) - Author: azazelm3dj3d (https://github.com/azazelm3dj3d) + Project: Catherine Framework (https://github.com/battleoverflow/catherine) + Author: battleoverflow (https://github.com/battleoverflow) License: BSD 2-Clause */ diff --git a/src/core/mod.rs b/src/core/mod.rs index ac696c1..4a382c2 100644 --- a/src/core/mod.rs +++ b/src/core/mod.rs @@ -1,6 +1,6 @@ /* - Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine) - Author: azazelm3dj3d (https://github.com/azazelm3dj3d) + Project: Catherine Framework (https://github.com/battleoverflow/catherine) + Author: battleoverflow (https://github.com/battleoverflow) License: BSD 2-Clause */ diff --git a/src/core/shell.rs b/src/core/shell.rs index d570884..cc61648 100644 --- a/src/core/shell.rs +++ b/src/core/shell.rs @@ -1,6 +1,6 @@ /* - Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine) - Author: azazelm3dj3d (https://github.com/azazelm3dj3d) + Project: Catherine Framework (https://github.com/battleoverflow/catherine) + Author: battleoverflow (https://github.com/battleoverflow) License: BSD 2-Clause */ diff --git a/src/core/utils.rs b/src/core/utils.rs index 0d78a22..223c898 100644 --- a/src/core/utils.rs +++ b/src/core/utils.rs @@ -1,6 +1,6 @@ /* - Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine) - Author: azazelm3dj3d (https://github.com/azazelm3dj3d) + Project: Catherine Framework (https://github.com/battleoverflow/catherine) + Author: battleoverflow (https://github.com/battleoverflow) License: BSD 2-Clause */ diff --git a/src/main.rs b/src/main.rs index eff2d97..be6445b 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,6 +1,6 @@ /* - Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine) - Author: azazelm3dj3d (https://github.com/azazelm3dj3d) + Project: Catherine Framework (https://github.com/battleoverflow/catherine) + Author: battleoverflow (https://github.com/battleoverflow) License: BSD 2-Clause */ diff --git a/src/meta.rs b/src/meta.rs index e7983bc..ef9ef02 100644 --- a/src/meta.rs +++ b/src/meta.rs @@ -1,6 +1,6 @@ /* - Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine) - Author: azazelm3dj3d (https://github.com/azazelm3dj3d) + Project: Catherine Framework (https://github.com/battleoverflow/catherine) + Author: battleoverflow (https://github.com/battleoverflow) License: BSD 2-Clause */ diff --git a/src/modules/db/redis.py b/src/modules/db/redis.py index 9aeb9d0..0fe0faf 100644 --- a/src/modules/db/redis.py +++ b/src/modules/db/redis.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- """ - Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine) - Author: azazelm3dj3d (https://github.com/azazelm3dj3d) + Project: Catherine Framework (https://github.com/battleoverflow/catherine) + Author: battleoverflow (https://github.com/battleoverflow) License: BSD 2-Clause """ diff --git a/src/modules/formats/exe/win_exe_dump.py b/src/modules/formats/exe/win_exe_dump.py index 458c1fb..39a09cc 100644 --- a/src/modules/formats/exe/win_exe_dump.py +++ b/src/modules/formats/exe/win_exe_dump.py @@ -1,6 +1,6 @@ """ - Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine) - Author: azazelm3dj3d (https://github.com/azazelm3dj3d) + Project: Catherine Framework (https://github.com/battleoverflow/catherine) + Author: battleoverflow (https://github.com/battleoverflow) License: BSD 2-Clause """ diff --git a/src/modules/formats/hex/c_hex_dump.c b/src/modules/formats/hex/c_hex_dump.c index 5e0da9e..a12a5d2 100644 --- a/src/modules/formats/hex/c_hex_dump.c +++ b/src/modules/formats/hex/c_hex_dump.c @@ -1,6 +1,6 @@ /* - Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine) - Author: azazelm3dj3d (https://github.com/azazelm3dj3d) + Project: Catherine Framework (https://github.com/battleoverflow/catherine) + Author: battleoverflow (https://github.com/battleoverflow) License: BSD 2-Clause */ diff --git a/src/modules/formats/hex/mod.rs b/src/modules/formats/hex/mod.rs index 5737edf..0a48896 100644 --- a/src/modules/formats/hex/mod.rs +++ b/src/modules/formats/hex/mod.rs @@ -1,6 +1,6 @@ /* - Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine) - Author: azazelm3dj3d (https://github.com/azazelm3dj3d) + Project: Catherine Framework (https://github.com/battleoverflow/catherine) + Author: battleoverflow (https://github.com/battleoverflow) License: BSD 2-Clause */ diff --git a/src/modules/formats/hex/rs_hex_dump.rs b/src/modules/formats/hex/rs_hex_dump.rs index a46ba96..044ab12 100644 --- a/src/modules/formats/hex/rs_hex_dump.rs +++ b/src/modules/formats/hex/rs_hex_dump.rs @@ -1,6 +1,6 @@ /* - Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine) - Author: azazelm3dj3d (https://github.com/azazelm3dj3d) + Project: Catherine Framework (https://github.com/battleoverflow/catherine) + Author: battleoverflow (https://github.com/battleoverflow) License: BSD 2-Clause */ diff --git a/src/modules/formats/mod.rs b/src/modules/formats/mod.rs index a5bf447..0fca007 100644 --- a/src/modules/formats/mod.rs +++ b/src/modules/formats/mod.rs @@ -1,6 +1,6 @@ /* - Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine) - Author: azazelm3dj3d (https://github.com/azazelm3dj3d) + Project: Catherine Framework (https://github.com/battleoverflow/catherine) + Author: battleoverflow (https://github.com/battleoverflow) License: BSD 2-Clause */ diff --git a/src/modules/mercy/extension.py b/src/modules/mercy/extension.py index b5fd9c7..4d4fff5 100644 --- a/src/modules/mercy/extension.py +++ b/src/modules/mercy/extension.py @@ -1,6 +1,6 @@ """ - Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine) - Author: azazelm3dj3d (https://github.com/azazelm3dj3d) + Project: Catherine Framework (https://github.com/battleoverflow/catherine) + Author: battleoverflow (https://github.com/battleoverflow) License: BSD 2-Clause """ diff --git a/src/modules/mod.rs b/src/modules/mod.rs index 10c059b..efaae2a 100644 --- a/src/modules/mod.rs +++ b/src/modules/mod.rs @@ -1,6 +1,6 @@ /* - Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine) - Author: azazelm3dj3d (https://github.com/azazelm3dj3d) + Project: Catherine Framework (https://github.com/battleoverflow/catherine) + Author: battleoverflow (https://github.com/battleoverflow) License: BSD 2-Clause */ diff --git a/src/modules/net/netscan/src/cmds/cli/commands.go b/src/modules/net/netscan/src/cmds/cli/commands.go index 5f0bc82..b678591 100644 --- a/src/modules/net/netscan/src/cmds/cli/commands.go +++ b/src/modules/net/netscan/src/cmds/cli/commands.go @@ -1,6 +1,6 @@ /* - Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine) - Author: azazelm3dj3d (https://github.com/azazelm3dj3d) + Project: Catherine Framework (https://github.com/battleoverflow/catherine) + Author: battleoverflow (https://github.com/battleoverflow) License: BSD 2-Clause */ diff --git a/src/modules/net/netscan/src/main.go b/src/modules/net/netscan/src/main.go index 4a82ee0..00b5659 100644 --- a/src/modules/net/netscan/src/main.go +++ b/src/modules/net/netscan/src/main.go @@ -1,6 +1,6 @@ /* - Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine) - Author: azazelm3dj3d (https://github.com/azazelm3dj3d) + Project: Catherine Framework (https://github.com/battleoverflow/catherine) + Author: battleoverflow (https://github.com/battleoverflow) License: BSD 2-Clause */ diff --git a/src/modules/web/parsers/links.py b/src/modules/web/parsers/links.py index 6c30b74..5f96b03 100644 --- a/src/modules/web/parsers/links.py +++ b/src/modules/web/parsers/links.py @@ -1,6 +1,6 @@ """ - Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine) - Author: azazelm3dj3d (https://github.com/azazelm3dj3d) + Project: Catherine Framework (https://github.com/battleoverflow/catherine) + Author: battleoverflow (https://github.com/battleoverflow) License: BSD 2-Clause """ diff --git a/src/ui/controller.rs b/src/ui/controller.rs index b56416b..b7ae8e6 100644 --- a/src/ui/controller.rs +++ b/src/ui/controller.rs @@ -1,6 +1,6 @@ /* - Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine) - Author: azazelm3dj3d (https://github.com/azazelm3dj3d) + Project: Catherine Framework (https://github.com/battleoverflow/catherine) + Author: battleoverflow (https://github.com/battleoverflow) License: BSD 2-Clause */ diff --git a/src/ui/mod.rs b/src/ui/mod.rs index b55dba1..87129b0 100644 --- a/src/ui/mod.rs +++ b/src/ui/mod.rs @@ -1,6 +1,6 @@ /* - Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine) - Author: azazelm3dj3d (https://github.com/azazelm3dj3d) + Project: Catherine Framework (https://github.com/battleoverflow/catherine) + Author: battleoverflow (https://github.com/battleoverflow) License: BSD 2-Clause */ diff --git a/tauri.conf.json b/tauri.conf.json index 30513ba..beaf530 100644 --- a/tauri.conf.json +++ b/tauri.conf.json @@ -8,7 +8,7 @@ }, "package": { "productName": "catherine", - "version": "0.6.0" + "version": "0.6.1" }, "tauri": { "allowlist": { @@ -25,7 +25,7 @@ "icon": [ "icons/icon.png" ], - "identifier": "com.azazelm3dj3d.catherine", + "identifier": "com.battleoverflow.catherine", "longDescription": "", "macOS": { "entitlements": null,