Skip to content

Commit

Permalink
Moderately sized update
Browse files Browse the repository at this point in the history 
- Refactored extract method to now include email parsing
- Added some simple language detection
- Now includes all functionality from Mercy v2.0.1
- Minor refactor to the UI to be a bit easier to use + now includes email parsing
- New logo across the entire project
  • Loading branch information
@battleoverflow
battleoverflow committed Oct 9, 2023
1 parent e2400b2 commit 78a46e2
Show file tree
Hide file tree
Showing 25 changed files with 766 additions and 537 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/workflow.yml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: Catherine Workflow
name: Catherine

on:
push:
branches: ["main", "v0.6"]
branches: ["main"]
pull_request:
branches: ["main"]

Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ serde = "1.0"
serde_json = "1.0"
libloading = "0.7"
prettytable-rs = "0.10.0"
mercy = "2.0.0"
mercy = "2.0.1"
rand = "0.7.2"
tauri = { version = "1.2.4", features = [] }

Expand Down
10 changes: 5 additions & 5 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
<div align="center">
<img src="https://raw.githubusercontent.com/azazelm3dj3d/catherine/main/assets/catherine_icon.png" width="40%" />
<img src="assets/catherine_banner.png" />
</div>

<h1 align="center">
Catherine
</h1>
[![Catherine](https://github.com/azazelm3dj3d/catherine/actions/workflows/workflow.yml/badge.svg)](https://github.com/azazelm3dj3d/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.

Expand All @@ -30,7 +28,7 @@ First, clone the repository using `git`:
git clone https://github.com/azazelm3dj3d/catherine.git
```

Once you've cloned the repository and you're in the correct directory, simply run the following command:
Once you've cloned the repository, and you're in the correct directory, simply run the following command:

```bash
cargo build
Expand Down Expand Up @@ -61,3 +59,5 @@ If a GUI is more your style, there is a simple version available with the majori
```

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

*GUI logo provided by Freepik w/ modification from azazelm3dj3d.
Binary file added assets/catherine_banner.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/catherine_icon.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/catherine_icon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icons/icon.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified icons/icon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/catherine_icon.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/catherine_icon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
122 changes: 64 additions & 58 deletions public/crack_hash.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,68 +19,74 @@
<div class="hidden lg:fixed lg:inset-y-0 lg:z-50 lg:flex lg:w-72 lg:flex-col">
<div class="flex grow flex-col gap-y-5 overflow-y-auto bg-zinc-900 px-6">
<div class="flex h-16 shrink-0 items-center">
<img class="h-8 w-auto" src="catherine_icon.png" alt="Catherine">
<img class="h-20 w-auto shadow-2xl pt-5" src="catherine_icon.png" alt="Catherine">
</div>
<nav class="flex flex-1 flex-col">
<ul role="list" class="flex flex-1 flex-col gap-y-7">
<li>
<ul role="list" class="-mx-2 space-y-1">
<li>
<a href="index.html" class="text-white hover:bg-zinc-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold">
Home
</a>
</li>
<li>
<a href="decode.html" class="text-white hover:bg-zinc-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold">
Decode
</a>
</li>
<li>
<a href="sysdump.html" class="text-white hover:bg-zinc-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold">
Dump System Information (Linux only)
</a>
</li>
<li>
<a href="defang.html" class="text-white hover:bg-zinc-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold">
Defang
</a>
</li>
<li>
<a href="whois.html" class="text-white hover:bg-zinc-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold">
WHOIS Lookup
</a>
</li>
<li>
<a href="identify.html" class="text-white hover:bg-zinc-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold">
Identify Unknown String
</a>
</li>
<li>
<a href="crack_hash.html" class="bg-zinc-800 text-white group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold">
Crack Hash
</a>
</li>
<li>
<a href="gen_domain.html" class="text-white hover:bg-zinc-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold">
Generate a Domain
</a>
</li>
<li>
<a href="extract_zip.html" class="text-white hover:bg-zinc-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold">
Extract Zip File
</a>
</li>
</ul>
</li>
<li>
<button onclick="exitCatherine()">
<span class="text-white hover:bg-zinc-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold">
Exit Catherine
</span>
</button>
</li>
<ul role="list" class="-mx-2 space-y-1">
<li>
<a href="index.html" class="text-white hover:bg-zinc-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold">
Home
</a>
</li>
<li>
<a href="decode.html" class="text-white hover:bg-zinc-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold">
Decode
</a>
</li>
<li>
<a href="sysdump.html" class="text-white hover:bg-zinc-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold">
Dump System Information (Linux only)
</a>
</li>
<li>
<a href="defang.html" class="text-white hover:bg-zinc-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold">
Defang
</a>
</li>
<li>
<a href="whois.html" class="text-white hover:bg-zinc-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold">
WHOIS Lookup
</a>
</li>
<li>
<a href="identify.html" class="text-white hover:bg-zinc-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold">
Identify Unknown String
</a>
</li>
<li>
<a href="crack_hash.html" class="bg-zinc-800 text-white group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold">
Crack Hash
</a>
</li>
<li>
<a href="gen_domain.html" class="text-white hover:bg-zinc-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold">
Generate a Domain
</a>
</li>
<li>
<a href="extract_zip.html" class="text-white hover:bg-zinc-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold">
Extract Zip File
</a>
</li>
<li>
<a href="parse_email.html" class="text-white hover:bg-zinc-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold">
Parse Email File
</a>
</li>
<li>
<button onclick="exitCatherine()">
<span class="text-white hover:bg-zinc-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold">
Exit Catherine
</span>
</button>
</li>
</ul>
</ul>
</nav>
<p class="text-white text-xl pb-3">
Catherine v0.6
</p>
</div>
</div>

Expand All @@ -101,7 +107,7 @@
</div>

<div class="justify-center mt-2">
<button class="peer block min-h-[auto] rounded bg-transparent py-[0.32rem] px-3 border-2 border-black w-full text-black bg-white hover:bg-black hover:text-white hover:border-white" onclick="crackHash()">
<button class="peer block min-h-[auto] rounded bg-transparent py-[0.32rem] px-3 border-2 border-black w-full text-black bg-white hover:bg-black hover:text-white hover:border-white transition ease-in-out duration-300" onclick="crackHash()">
Crack
</button>
</div>
Expand Down
122 changes: 64 additions & 58 deletions public/decode.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,68 +19,74 @@
<div class="hidden lg:fixed lg:inset-y-0 lg:z-50 lg:flex lg:w-72 lg:flex-col">
<div class="flex grow flex-col gap-y-5 overflow-y-auto bg-zinc-900 px-6">
<div class="flex h-16 shrink-0 items-center">
<img class="h-8 w-auto" src="catherine_icon.png" alt="Catherine">
<img class="h-20 w-auto shadow-2xl pt-5" src="catherine_icon.png" alt="Catherine">
</div>
<nav class="flex flex-1 flex-col">
<ul role="list" class="flex flex-1 flex-col gap-y-7">
<li>
<ul role="list" class="-mx-2 space-y-1">
<li>
<a href="index.html" class="text-white hover:bg-zinc-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold">
Home
</a>
</li>
<li>
<a href="decode.html" class="bg-zinc-800 text-white group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold">
Decode
</a>
</li>
<li>
<a href="sysdump.html" class="text-white hover:bg-zinc-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold">
Dump System Information (Linux only)
</a>
</li>
<li>
<a href="defang.html" class="text-white hover:bg-zinc-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold">
Defang
</a>
</li>
<li>
<a href="whois.html" class="text-white hover:bg-zinc-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold">
WHOIS Lookup
</a>
</li>
<li>
<a href="identify.html" class="text-white hover:bg-zinc-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold">
Identify Unknown String
</a>
</li>
<li>
<a href="crack_hash.html" class="text-white hover:bg-zinc-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold">
Crack Hash
</a>
</li>
<li>
<a href="gen_domain.html" class="text-white hover:bg-zinc-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold">
Generate a Domain
</a>
</li>
<li>
<a href="extract_zip.html" class="text-white hover:bg-zinc-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold">
Extract Zip File
</a>
</li>
</ul>
</li>
<li>
<button onclick="exitCatherine()">
<span class="text-white hover:bg-zinc-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold">
Exit Catherine
</span>
</button>
</li>
<ul role="list" class="-mx-2 space-y-1">
<li>
<a href="index.html" class="text-white hover:bg-zinc-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold">
Home
</a>
</li>
<li>
<a href="decode.html" class="bg-zinc-800 text-white group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold">
Decode
</a>
</li>
<li>
<a href="sysdump.html" class="text-white hover:bg-zinc-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold">
Dump System Information (Linux only)
</a>
</li>
<li>
<a href="defang.html" class="text-white hover:bg-zinc-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold">
Defang
</a>
</li>
<li>
<a href="whois.html" class="text-white hover:bg-zinc-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold">
WHOIS Lookup
</a>
</li>
<li>
<a href="identify.html" class="text-white hover:bg-zinc-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold">
Identify Unknown String
</a>
</li>
<li>
<a href="crack_hash.html" class="text-white hover:bg-zinc-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold">
Crack Hash
</a>
</li>
<li>
<a href="gen_domain.html" class="text-white hover:bg-zinc-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold">
Generate a Domain
</a>
</li>
<li>
<a href="extract_zip.html" class="text-white hover:bg-zinc-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold">
Extract Zip File
</a>
</li>
<li>
<a href="parse_email.html" class="text-white hover:bg-zinc-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold">
Parse Email File
</a>
</li>
<li>
<button onclick="exitCatherine()">
<span class="text-white hover:bg-zinc-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold">
Exit Catherine
</span>
</button>
</li>
</ul>
</ul>
</nav>
<p class="text-white text-xl pb-3">
Catherine v0.6
</p>
</div>
</div>

Expand Down Expand Up @@ -114,7 +120,7 @@
</div>

<div class="justify-center mt-2">
<button class="peer block min-h-[auto] rounded bg-transparent py-[0.32rem] px-3 border-2 border-black w-full text-black bg-white hover:bg-black hover:text-white hover:border-white" onclick="decodeString()">
<button class="peer block min-h-[auto] rounded bg-transparent py-[0.32rem] px-3 border-2 border-black w-full text-black bg-white hover:bg-black hover:text-white hover:border-white transition ease-in-out duration-300" onclick="decodeString()">
Decode
</button>
</div>
Expand Down
Loading

0 comments on commit 78a46e2

Please sign in to comment.