Skip to content

Commit

Permalink
v0.2.44
Browse files Browse the repository at this point in the history
- Refactored to work with the updated Mercy crate
- Re-release from the Hifumi1337 repo
  • Loading branch information
Hifumi1337 committed Nov 1, 2022
1 parent c331a80 commit c0f8149
Show file tree
Hide file tree
Showing 17 changed files with 1,391 additions and 0 deletions.
2 changes: 2 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
github: [Hifumi1337]
patreon: hifumitech
16 changes: 16 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Generated by Cargo
# will have compiled files and executables
target/

# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
Cargo.lock

# These are backup files generated by rustfmt
**/*.rs.bk

*.spec
*.hex
# *.txt
*.log
build/
13 changes: 13 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Contribution Guide

All contributions are welcome, but will only be accepted if the following requirements are met.

1. A new branch must be created from the `main` or `master` branch. This can achieved using git:

```bash
git checkout -b BRANCH_NAME
```

2. A pull request will need to be created and no merge conflicts should be present.

For anyone looking to contribute, please do not hesitate to fix or improve anything in the repository.
22 changes: 22 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
[package]
name = "catherine-beta"
description = "The rusty defense framework!"
version = "0.2.44"
authors = ["Hifumi1337"]
edition = "2021"
repository = "https://github.com/hifumitech/catherine"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
os_type = { git = "https://github.com/Hifumi1337/os_type", branch = "main", version = "2.4.1" }
chrono = "0.4"
colored = "2"
serde = "1.0"
serde_json = "1.0"
libloading = "0.7"
prettytable-rs = "0.9.0"
mercy = "1.1.11"

[target.'cfg(target_os = "windows")'.dependencies]
ipconfig = "0.3.0"
49 changes: 49 additions & 0 deletions Catherine_Installer
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
#!/bin/bash

###################################################
# #
# Project: Catherine #
# File: Catherine_Installer #
# #
# Author(s): { #
# Hifumi1337 (https://github.com/Hifumi1337) #
# } #
# #
###################################################

version="1.1.10"
catherineDir=~/.catherine

function info() {
echo ""
echo "[!] Running Installer (+ Updater) v$version"
}

info

function Catherine_Installer() {
if [ -d "$catherineDir" ];
then
echo ""
echo "[+] Configuring cache..."
echo ""

sudo rm -r $catherineDir
mkdir $catherineDir
else
mkdir $catherineDir
fi

echo ""
echo "[+] Downloading external modules..."
echo ""

git clone https://github.com/hifumitech/catherine-modules
mv catherine-modules $catherineDir

echo ""
echo "[+] Installation complete"
echo ""
}

Catherine_Installer
53 changes: 53 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
# Catherine

<div align="center">
<h2>
<i>
The rusty blue team defense framework!
</i>
</h2>
</div>

<div align="center">
<h2>
📚 <a href="https://catherine-docs.hifumi1337.io/">Documentation</a>
</h2>
</div>

---

[![](https://img.shields.io/github/last-commit/hifumitech/catherine.svg?style=flat)]()
[![](https://img.shields.io/github/commit-activity/y/hifumitech/catherine.svg?style=flat)]()

[![](https://img.shields.io/badge/$-support-ff69b4.svg?style=flat)](https://github.com/sponsors/Hifumi1337/)
[![](https://badges.frapsoft.com/os/v1/open-source.svg?v=103)](https://github.com/hifumitech)

## Install
Installing Catherine is easy, all you have to do is run the installer and you're good to go!

First, make sure the installer is setup as an executable:
```bash
chmod +x Catherine_Installer
```

Now run the installation script:
```bash
./Catherine_Installer
```

If you have cURL installed, feel free to run the installer this way:
```bash
curl https://raw.githubusercontent.com/hifumitech/catherine/main/Catherine_Installer | bash
```

Already have Catherine modules installed? Run the installer again to update the modules!

## Issues
If you are unable to run the installation script on WSL, try running these commands:
```bash
chmod +x Catherine_Installer
```

```bash
sed -i -e 's/\r$//' Catherine_Installer
```
2 changes: 2 additions & 0 deletions server/public/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Public Directory
This public directory is available for rendering HTML content when using `start_server`
12 changes: 12 additions & 0 deletions server/public/err/404.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Catherine Framework | 404</title>
</head>
<body>
<h1>404</h1>
</body>
</html>
12 changes: 12 additions & 0 deletions server/public/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Catherine Framework</title>
</head>
<body>
<h1>You know what they say cowboy, easy come easy go.</h1>
</body>
</html>
Loading

0 comments on commit c0f8149

Please sign in to comment.