Skip to content

Commit 6b78a7e

Browse files
Cleanup
1 parent a25c0ce commit 6b78a7e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+90
-90
lines changed

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
[package]
22
name = "catherine"
33
description = "The Catherine Framework is a general-purpose cybersecurity framework built to provide extended support for defense operations."
4-
version = "0.6.0"
5-
authors = ["azazelm3dj3d"]
4+
version = "0.6.1"
5+
authors = ["battleoverflow"]
66
license = "BSD-2-Clause"
77
categories = ["cryptography", "command-line-utilities", "encoding"]
88
keywords = ["cybersecurity", "blueteam", "framework", "security", "defense"]
99
edition = "2021"
10-
repository = "https://github.com/azazelm3dj3d/catherine"
10+
repository = "https://github.com/battleoverflow/catherine"
1111

1212
[build-dependencies]
1313
tauri-build = { version = "1.2.1", features = [] }

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
BSD 2-Clause License
22

3-
Copyright (c) 2022, azazelm3dj3d
3+
Copyright (c) 2022-2024, battleoverflow
44
All rights reserved.
55

66
Redistribution and use in source and binary forms, with or without

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
# Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine)
2-
# Author: azazelm3dj3d (https://github.com/azazelm3dj3d)
1+
# Project: Catherine Framework (https://github.com/battleoverflow/catherine)
2+
# Author: battleoverflow (https://github.com/battleoverflow)
33
# License: BSD 2-Clause
44

55
NAME=catherine
6-
PROJ_VERSION=0.6.0
6+
PROJ_VERSION=0.6.1
77

88
run:
99
@echo "Building $(NAME) v$(PROJ_VERSION)"

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<h1>Catherine</h1>
44
</div>
55

6-
[![Catherine](https://github.com/azazelm3dj3d/catherine/actions/workflows/workflow.yml/badge.svg)](https://github.com/azazelm3dj3d/catherine/actions/workflows/workflow.yml)
6+
[![Catherine](https://github.com/battleoverflow/catherine/actions/workflows/workflow.yml/badge.svg)](https://github.com/battleoverflow/catherine/actions/workflows/workflow.yml)
77

88
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.
99

1010
NOTE: Modules do require Go, Python, and C build utilities to be installed.
1111

1212
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.
1313

14-
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.
14+
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.
1515

1616
## Installation
1717

@@ -26,7 +26,7 @@ If you'd prefer to install from source, you can also do this fairly easily, but
2626
First, clone the repository using `git`:
2727

2828
```bash
29-
git clone https://github.com/azazelm3dj3d/catherine.git
29+
git clone https://github.com/battleoverflow/catherine.git
3030
```
3131

3232
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
4343
make
4444
```
4545

46-
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.
46+
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.
4747

4848
## Usage
4949

@@ -59,6 +59,6 @@ If a GUI is more your style, there is a simple version available with the majori
5959
🦀 Catherine [v0.x.x] (None) ☀️ 〉launch
6060
```
6161

62-
If a bug or issue is found, please report it [here](https://github.com/azazelm3dj3d/catherine/issues).
62+
If a bug or issue is found, please report it [here](https://github.com/battleoverflow/catherine/issues).
6363

64-
*GUI logo provided by Freepik w/ modification from azazelm3dj3d.
64+
*GUI logo provided by Freepik w/ modification from battleoverflow.

build.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
2-
Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine)
3-
Author: azazelm3dj3d (https://github.com/azazelm3dj3d)
2+
Project: Catherine Framework (https://github.com/battleoverflow/catherine)
3+
Author: battleoverflow (https://github.com/battleoverflow)
44
License: BSD 2-Clause
55
*/
66

build_modules.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

3-
# Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine)
4-
# Author: azazelm3dj3d (https://github.com/azazelm3dj3d)
3+
# Project: Catherine Framework (https://github.com/battleoverflow/catherine)
4+
# Author: battleoverflow (https://github.com/battleoverflow)
55
# License: BSD 2-Clause
66

77
# NetScan

modules.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"author": "azazelm3dj3d",
2+
"author": "battleoverflow",
33
"version": "0.1.26",
44
"numOfModules": "6",
55
"ModulesList": [

public/crack_hash.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--
2-
Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine)
3-
Author: azazelm3dj3d (https://github.com/azazelm3dj3d)
2+
Project: Catherine Framework (https://github.com/battleoverflow/catherine)
3+
Author: battleoverflow (https://github.com/battleoverflow)
44
License: BSD 2-Clause
55
-->
66

public/decode.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--
2-
Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine)
3-
Author: azazelm3dj3d (https://github.com/azazelm3dj3d)
2+
Project: Catherine Framework (https://github.com/battleoverflow/catherine)
3+
Author: battleoverflow (https://github.com/battleoverflow)
44
License: BSD 2-Clause
55
-->
66

public/defang.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--
2-
Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine)
3-
Author: azazelm3dj3d (https://github.com/azazelm3dj3d)
2+
Project: Catherine Framework (https://github.com/battleoverflow/catherine)
3+
Author: battleoverflow (https://github.com/battleoverflow)
44
License: BSD 2-Clause
55
-->
66

public/extract_zip.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--
2-
Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine)
3-
Author: azazelm3dj3d (https://github.com/azazelm3dj3d)
2+
Project: Catherine Framework (https://github.com/battleoverflow/catherine)
3+
Author: battleoverflow (https://github.com/battleoverflow)
44
License: BSD 2-Clause
55
-->
66

public/gen_domain.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--
2-
Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine)
3-
Author: azazelm3dj3d (https://github.com/azazelm3dj3d)
2+
Project: Catherine Framework (https://github.com/battleoverflow/catherine)
3+
Author: battleoverflow (https://github.com/battleoverflow)
44
License: BSD 2-Clause
55
-->
66

public/identify.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--
2-
Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine)
3-
Author: azazelm3dj3d (https://github.com/azazelm3dj3d)
2+
Project: Catherine Framework (https://github.com/battleoverflow/catherine)
3+
Author: battleoverflow (https://github.com/battleoverflow)
44
License: BSD 2-Clause
55
-->
66

public/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--
2-
Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine)
3-
Author: azazelm3dj3d (https://github.com/azazelm3dj3d)
2+
Project: Catherine Framework (https://github.com/battleoverflow/catherine)
3+
Author: battleoverflow (https://github.com/battleoverflow)
44
License: BSD 2-Clause
55
-->
66

@@ -94,7 +94,7 @@
9494
<div class="grid place-items-center h-screen">
9595
<img src="catherine_icon.png" class="shadow-2xl" alt="Skull logo representing the Catherine framework">
9696
<p class="text-white text-lg">
97-
Built by azazelm3dj3d (https://github.com/azazelm3dj3d)
97+
Built by battleoverflow (https://github.com/battleoverflow)
9898
</p>
9999
</div>
100100
</main>

public/js/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
2-
Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine)
3-
Author: azazelm3dj3d (https://github.com/azazelm3dj3d)
2+
Project: Catherine Framework (https://github.com/battleoverflow/catherine)
3+
Author: battleoverflow (https://github.com/battleoverflow)
44
License: BSD 2-Clause
55
*/
66

public/parse_email.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--
2-
Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine)
3-
Author: azazelm3dj3d (https://github.com/azazelm3dj3d)
2+
Project: Catherine Framework (https://github.com/battleoverflow/catherine)
3+
Author: battleoverflow (https://github.com/battleoverflow)
44
License: BSD 2-Clause
55
-->
66

public/sysdump.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--
2-
Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine)
3-
Author: azazelm3dj3d (https://github.com/azazelm3dj3d)
2+
Project: Catherine Framework (https://github.com/battleoverflow/catherine)
3+
Author: battleoverflow (https://github.com/battleoverflow)
44
License: BSD 2-Clause
55
-->
66

public/whois.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--
2-
Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine)
3-
Author: azazelm3dj3d (https://github.com/azazelm3dj3d)
2+
Project: Catherine Framework (https://github.com/battleoverflow/catherine)
3+
Author: battleoverflow (https://github.com/battleoverflow)
44
License: BSD 2-Clause
55
-->
66

server/public/err/404.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--
2-
Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine)
3-
Author: azazelm3dj3d (https://github.com/azazelm3dj3d)
2+
Project: Catherine Framework (https://github.com/battleoverflow/catherine)
3+
Author: battleoverflow (https://github.com/battleoverflow)
44
License: BSD 2-Clause
55
-->
66

server/public/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--
2-
Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine)
3-
Author: azazelm3dj3d (https://github.com/azazelm3dj3d)
2+
Project: Catherine Framework (https://github.com/battleoverflow/catherine)
3+
Author: battleoverflow (https://github.com/battleoverflow)
44
License: BSD 2-Clause
55
-->
66

src/catherine.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
2-
Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine)
3-
Author: azazelm3dj3d (https://github.com/azazelm3dj3d)
2+
Project: Catherine Framework (https://github.com/battleoverflow/catherine)
3+
Author: battleoverflow (https://github.com/battleoverflow)
44
License: BSD 2-Clause
55
*/
66

@@ -54,7 +54,7 @@ use crate::ui::controller::launch_gui;
5454
extern crate ipconfig;
5555

5656
pub(crate) static NAME: &str = "Catherine";
57-
pub(crate) static VERSION: &str = "0.6.0";
57+
pub(crate) static VERSION: &str = "0.6.1";
5858

5959
pub(crate) static NETSCAN_PATH: &str = "/opt/catherine/catherine-modules/net/netscan/netscan";
6060
pub(crate) static LINK_PARSER_PATH: &str = "/opt/catherine/catherine-modules/web/parsers/links";
@@ -253,7 +253,7 @@ pub fn init(boot_msg: &str) {
253253

254254
"version" => {
255255
println!("\nCatherine Framework v{}", VERSION);
256-
println!("Author: azazelm3dj3d (https://github.com/azazelm3dj3d)\n");
256+
println!("Author: battleoverflow (https://github.com/battleoverflow)\n");
257257
},
258258

259259
// Installs custom modules
@@ -274,7 +274,7 @@ pub fn init(boot_msg: &str) {
274274
}
275275

276276
// Downloads Catherine modules from GitHub
277-
git_downloader("https://github.com/azazelm3dj3d/catherine-modules.git");
277+
git_downloader("https://github.com/battleoverflow/catherine-modules.git");
278278

279279
if existence("/opt/catherine") {
280280
println!("\nInstallation complete! Modules can be found here: /opt/catherine/catherine-modules\n");

src/core/commands.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
2-
Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine)
3-
Author: azazelm3dj3d (https://github.com/azazelm3dj3d)
2+
Project: Catherine Framework (https://github.com/battleoverflow/catherine)
3+
Author: battleoverflow (https://github.com/battleoverflow)
44
License: BSD 2-Clause
55
*/
66

src/core/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
2-
Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine)
3-
Author: azazelm3dj3d (https://github.com/azazelm3dj3d)
2+
Project: Catherine Framework (https://github.com/battleoverflow/catherine)
3+
Author: battleoverflow (https://github.com/battleoverflow)
44
License: BSD 2-Clause
55
*/
66

src/core/shell.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
2-
Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine)
3-
Author: azazelm3dj3d (https://github.com/azazelm3dj3d)
2+
Project: Catherine Framework (https://github.com/battleoverflow/catherine)
3+
Author: battleoverflow (https://github.com/battleoverflow)
44
License: BSD 2-Clause
55
*/
66

src/core/utils.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
2-
Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine)
3-
Author: azazelm3dj3d (https://github.com/azazelm3dj3d)
2+
Project: Catherine Framework (https://github.com/battleoverflow/catherine)
3+
Author: battleoverflow (https://github.com/battleoverflow)
44
License: BSD 2-Clause
55
*/
66

src/main.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
2-
Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine)
3-
Author: azazelm3dj3d (https://github.com/azazelm3dj3d)
2+
Project: Catherine Framework (https://github.com/battleoverflow/catherine)
3+
Author: battleoverflow (https://github.com/battleoverflow)
44
License: BSD 2-Clause
55
*/
66

src/meta.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
2-
Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine)
3-
Author: azazelm3dj3d (https://github.com/azazelm3dj3d)
2+
Project: Catherine Framework (https://github.com/battleoverflow/catherine)
3+
Author: battleoverflow (https://github.com/battleoverflow)
44
License: BSD 2-Clause
55
*/
66

src/modules/db/redis.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# -*- coding: utf-8 -*-
22

33
"""
4-
Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine)
5-
Author: azazelm3dj3d (https://github.com/azazelm3dj3d)
4+
Project: Catherine Framework (https://github.com/battleoverflow/catherine)
5+
Author: battleoverflow (https://github.com/battleoverflow)
66
License: BSD 2-Clause
77
"""
88

src/modules/formats/exe/win_exe_dump.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""
2-
Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine)
3-
Author: azazelm3dj3d (https://github.com/azazelm3dj3d)
2+
Project: Catherine Framework (https://github.com/battleoverflow/catherine)
3+
Author: battleoverflow (https://github.com/battleoverflow)
44
License: BSD 2-Clause
55
"""
66

src/modules/formats/hex/c_hex_dump.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
2-
Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine)
3-
Author: azazelm3dj3d (https://github.com/azazelm3dj3d)
2+
Project: Catherine Framework (https://github.com/battleoverflow/catherine)
3+
Author: battleoverflow (https://github.com/battleoverflow)
44
License: BSD 2-Clause
55
*/
66

src/modules/formats/hex/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
2-
Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine)
3-
Author: azazelm3dj3d (https://github.com/azazelm3dj3d)
2+
Project: Catherine Framework (https://github.com/battleoverflow/catherine)
3+
Author: battleoverflow (https://github.com/battleoverflow)
44
License: BSD 2-Clause
55
*/
66

src/modules/formats/hex/rs_hex_dump.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
2-
Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine)
3-
Author: azazelm3dj3d (https://github.com/azazelm3dj3d)
2+
Project: Catherine Framework (https://github.com/battleoverflow/catherine)
3+
Author: battleoverflow (https://github.com/battleoverflow)
44
License: BSD 2-Clause
55
*/
66

src/modules/formats/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
2-
Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine)
3-
Author: azazelm3dj3d (https://github.com/azazelm3dj3d)
2+
Project: Catherine Framework (https://github.com/battleoverflow/catherine)
3+
Author: battleoverflow (https://github.com/battleoverflow)
44
License: BSD 2-Clause
55
*/
66

src/modules/mercy/extension.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""
2-
Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine)
3-
Author: azazelm3dj3d (https://github.com/azazelm3dj3d)
2+
Project: Catherine Framework (https://github.com/battleoverflow/catherine)
3+
Author: battleoverflow (https://github.com/battleoverflow)
44
License: BSD 2-Clause
55
"""
66

src/modules/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
2-
Project: Catherine Framework (https://github.com/azazelm3dj3d/catherine)
3-
Author: azazelm3dj3d (https://github.com/azazelm3dj3d)
2+
Project: Catherine Framework (https://github.com/battleoverflow/catherine)
3+
Author: battleoverflow (https://github.com/battleoverflow)
44
License: BSD 2-Clause
55
*/
66

0 commit comments

Comments
 (0)