Merge pull request #107 from mttaggart/dev

v1.2.0

.github/workflows/rust.yml

@@ -18,7 +18,17 @@ jobs:
     - uses: actions/checkout@v2
     - name: Update Rust
       run: rustup update stable
-    - name: Build 
+    - name: Build Debug
+      working-directory: ./agent
+      run: cargo build
+      env:
+        LITCRYPT_ENCRYPT_KEY: offensivenotion
+    - name: Upload artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: offensive_notion_linux_amd64_debug 
+        path: agent/target/debug/offensive_notion
+    - name: Build Release
       working-directory: ./agent
       run: cargo build --release
       env:
@@ -37,11 +47,17 @@ jobs:
     - uses: actions/checkout@v2
     - name: Update Rust
       run: rustup update stable
-    - name: Add macOS Triple
-      run: rustup target add x86_64-pc-windows-gnu 
-    - name: Set LitCrypt Key
-      run: export LITCRYPT_ENCRYPT_KEY="offensivenotion"
-    - name: Build 
+    - name: Build Debug
+      working-directory: ./agent
+      run: cargo build
+      env:
+        LITCRYPT_ENCRYPT_KEY: offensivenotion
+    - name: Upload artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: offensive_notion_darwin_amd64_debug 
+        path: agent/target/debug/offensive_notion
+    - name: Build Release
       working-directory: ./agent
       run: cargo build --release --target x86_64-apple-darwin
       env:
@@ -64,7 +80,17 @@ jobs:
       run: sudo apt install -y mingw-w64
     - name: Add Windows Triple
       run: rustup target add x86_64-pc-windows-gnu 
-    - name: Build 
+    - name: Build Debug
+      working-directory: ./agent
+      run: cargo build --target x86_64-pc-windows-gnu
+      env:
+        LITCRYPT_ENCRYPT_KEY: offensivenotion
+    - name: Upload artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: offensive_notion_win_64_debug.exe
+        path: agent/target/x86_64-pc-windows-gnu/debug/offensive_notion.exe
+    - name: Build Release
       working-directory: ./agent
       run: cargo build --release --target x86_64-pc-windows-gnu
       env:

.gitignore

@@ -13,7 +13,4 @@ Dockerfile.bak
 utils/www/*
 offensive_notion
 offensive_notion.exe
-
-
-# Excluding for experimentation
 agent/src/config.rs

README.md

@@ -64,7 +64,21 @@ Please see the [Wiki][wiki] for setup, usage, commands, and more!
 >
 >-Taggart
 
+## Contributors
+The dev team would like to thank the following contributors for their work on OffensiveNotion:
 
+| Contributor                                 | Contribution |
+| -----------                                 | ------------ |
+| [@MEhrn00](https://github.com/MEhrn00)      | Execution guardrails for domain name/joined status 🚀    |
+
+---
+
+| Legend |
+| ------ |
+| 🚀 - Issue/PR submitted and code landed |
+|💡 - Cool ideas |
+|🤔 - Consultation/Inspiration |
+| 🐛- Bug submission/fix |
 
 
 ## Disclaimer

agent/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "offensive_notion"
-version = "1.1.0"
+version = "1.2.0"
 edition = "2021"
 build = "build.rs"
 
@@ -19,15 +19,24 @@ rand = "0.8.0"
 is-root = "0.1.2"
 base64 = "0.13.0"
 cidr-utils = "0.5.5"
+litcrypt = "0.3"
 
 [build-dependencies]
 embed-resource = "1.6"
 
 [target.'cfg(windows)'.dependencies]
-kernel32-sys = "0.2.2"
-winapi = { version = "0.3.8", features = ["winnt","winuser", "handleapi", "processthreadsapi", "securitybaseapi"] }
 winreg = "0.10"
 houdini = "1.0.2"
+windows = { version = "0.34.0", features = [
+    "Win32_System_SystemInformation",
+    "Win32_Foundation",
+    "Win32_NetworkManagement_NetManagement",
+    "Win32_Security",
+    "Win32_System_Memory",
+    "Win32_System_Diagnostics_Debug",
+    "Win32_System_Threading",
+    "Win32_System_WindowsProgramming"
+  ] }
 
 [profile.dev]
 opt-level = 0