From 0cf7c4f6c0831505963e8c3c23b5bce6f051c1a0 Mon Sep 17 00:00:00 2001 From: amelia <44528100+char-ptr@users.noreply.github.com> Date: Sat, 31 Aug 2024 14:31:00 +0100 Subject: [PATCH] feat: done with gui --- Cargo.lock | 2 +- Cargo.toml | 3 +- gdke-gui/bun.lockb | Bin 92981 -> 104927 bytes gdke-gui/package.json | 2 + gdke-gui/src-tauri/Cargo.toml | 3 +- gdke-gui/src-tauri/capabilities/default.json | 7 +- gdke-gui/src-tauri/src/lib.rs | 21 ++- gdke-gui/src-tauri/tauri.conf.json | 4 +- gdke-gui/src/App.css | 2 +- gdke-gui/src/App.tsx | 140 +++++++++++++++++-- gdke-gui/src/components/ui/dialog.tsx | 120 ++++++++++++++++ gdke-gui/src/components/ui/label.tsx | 24 ++++ src/lib.rs | 6 +- 13 files changed, 311 insertions(+), 23 deletions(-) mode change 100644 => 100755 gdke-gui/bun.lockb create mode 100644 gdke-gui/src/components/ui/dialog.tsx create mode 100644 gdke-gui/src/components/ui/label.tsx diff --git a/Cargo.lock b/Cargo.lock index 3d0cfdc..cb9d8c1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1373,7 +1373,6 @@ dependencies = [ "dll-syringe", "poggers 1.2.1 (git+https://github.com/pozm/poggers.git)", "rust-embed", - "tauri-plugin-dialog", "thiserror", "windows 0.56.0", ] @@ -1382,6 +1381,7 @@ dependencies = [ name = "gdke-gui" version = "0.1.0" dependencies = [ + "anyhow", "serde", "serde_json", "tauri", diff --git a/Cargo.toml b/Cargo.toml index 4a208a8..95eeffc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,4 +1,4 @@ -workspace = { members = ["gdkeinj","gdke-gui/src-tauri"] } +workspace = { members = ["gdkeinj", "gdke-gui/src-tauri"] } [package] name = "gdke" version = "0.2.2" @@ -42,4 +42,3 @@ windows = { features = [ ], version = "0.56" } dll-syringe = "*" poggers = { version = "*", git = "https://github.com/pozm/poggers.git" } -tauri-plugin-dialog = "2.0.0-rc.2" diff --git a/gdke-gui/bun.lockb b/gdke-gui/bun.lockb old mode 100644 new mode 100755 index ed14a5ab26bdddfcae4c8bbfa1957490b44a3126..dcd918782becbd65dff29ec6bff844c5b3cc2d23 GIT binary patch delta 22275 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

^I4 zjRN_vep^y0p`3n^>hibR*30S7%AB=+!c{7(oR@LGf^4&ktIjk&w>QK9C4jj_t_mv-Hi`X=Txs63W3IrBVr5SCP~n?ue1NBNe#H(a7l)ox=8Q4tgQz!QRdA^AH`R|LFU0c>I?jFgFlzDX z*Od~3Lj^w@)UORw0j-Sv{ zdNNl!3(+!9l3zZ?h0YRA4$|)fYYPp1Xjp%Yk$?@l2w-O@kP?=qf z(AAFju2&;QdS+J6BXM!O)xOb$wtJ-#^nGAoj9_r$oh&JSGDg^i(!t8s=;QqLkiuQe|pL))=RqQ3($lpUn?c&6M!~6-pdop>o*C{Q<+rsapi&EuJjIs~~r=tfm~jQB`fJYw%5n zy7m2+V|rzx@7A*Ue5hdKhPPPpW!6;)cHuq$O=IM?2PdmxI zgh|lw-n@o{xDNSqDpz5TE8qUD#%kUjuR@+1AFNl7!`V6MS*+8eB7BfkCZKX2jyfme z;JuD>ci=-qu&+P97I1}~r7u4Pg}Xuzc#o=Q&JRRN6-*Z8%o~sLCx)+%X}VVCD5v5C zRQcnY^U$xc6pLl>v~5rh&PhwyH#5c4W=>@xh2w$CFA$Dtt>PK zIdzfqtSoR~+siMnRpwaJ52CmZ>x6q6zAIlMM7#4|ASocVFWN~9{-rL%mnW~QrMU^7 zo~uT?cB%fxDd_4GVTn7hb9al9l0Oe^evBVh{q+l3X`4Ahg*(5&BRw-EE2m#nUP^lA zFrUKAX5!nOPgY85MwTFW@O7(73z|<}ny=s1?H>HIIzqgT_Y_Jp`Knv5Y59)4a6W;r zA@tYr)q}-i&3sIi_=w-QeGB>(zgtIcUgn_8g3KWqLTP(hftNAOsKl58MSjBI1ir3V zm0q&jC?>H!G#UNhuFR<5-TKpVvI{bX6}+3Ao|!)=Ge18iH7f&dD9XrtSD$O_i|7WkDDLsH##pcH-nA=O~;w6l|J($&%B*! ptm6GF#kg9^{l&N(qmVJKNC~(***S~LvQekJOmA%%#aD0ge*lmseTx79 delta 14993 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 diff --git a/gdke-gui/package.json b/gdke-gui/package.json index 750c86d..3efcee5 100644 --- a/gdke-gui/package.json +++ b/gdke-gui/package.json @@ -10,6 +10,8 @@ "tauri": "tauri" }, "dependencies": { + "@radix-ui/react-dialog": "^1.1.1", + "@radix-ui/react-label": "^2.1.0", "@radix-ui/react-slot": "^1.1.0", "@tauri-apps/api": ">=2.0.0-rc.0", "@tauri-apps/plugin-dialog": "^2.0.0-rc.0", diff --git a/gdke-gui/src-tauri/Cargo.toml b/gdke-gui/src-tauri/Cargo.toml index 3944fe9..4721efa 100644 --- a/gdke-gui/src-tauri/Cargo.toml +++ b/gdke-gui/src-tauri/Cargo.toml @@ -20,4 +20,5 @@ tauri-plugin-shell = "2.0.0-rc" serde = { version = "1", features = ["derive"] } serde_json = "1" tauri-plugin-dialog = "2.0.0-rc" - +anyhow = "*" +# gdke = { path = "../.." } diff --git a/gdke-gui/src-tauri/capabilities/default.json b/gdke-gui/src-tauri/capabilities/default.json index 3bb4cc4..7c37008 100644 --- a/gdke-gui/src-tauri/capabilities/default.json +++ b/gdke-gui/src-tauri/capabilities/default.json @@ -2,9 +2,12 @@ "$schema": "../gen/schemas/desktop-schema.json", "identifier": "default", "description": "Capability for the main window", - "windows": ["main"], + "windows": [ + "main" + ], "permissions": [ "core:default", - "shell:allow-open" + "shell:allow-open", + "dialog:allow-open" ] } diff --git a/gdke-gui/src-tauri/src/lib.rs b/gdke-gui/src-tauri/src/lib.rs index 56d8e27..bd343a1 100644 --- a/gdke-gui/src-tauri/src/lib.rs +++ b/gdke-gui/src-tauri/src/lib.rs @@ -1,7 +1,22 @@ +use std::{ffi::OsStr, path::Path}; + // Learn more about Tauri commands at https://tauri.app/v1/guides/features/command #[tauri::command] -fn greet(name: &str) -> String { - format!("Hello, {}! You've been greeted from Rust!", name) +fn get_secret(program: &Path, sig: &str) -> Result { + spawn_and_inject_sig(program, sig) + .map_err(|e| e.to_string()) + .map(|val| { + let mut hex_str = "0x".to_string(); + for char in val { + hex_str.push_str(&format!("{char:02X}")) + } + hex_str + }) + // String::new() +} +fn spawn_and_inject_sig>(proc: T, sig: &str) -> anyhow::Result<[u8; 32]> { + Ok([62; 32]) + // Err(()) } #[cfg_attr(mobile, tauri::mobile_entry_point)] @@ -9,7 +24,7 @@ pub fn run() { tauri::Builder::default() .plugin(tauri_plugin_shell::init()) .plugin(tauri_plugin_dialog::init()) - .invoke_handler(tauri::generate_handler![greet]) + .invoke_handler(tauri::generate_handler![get_secret]) .run(tauri::generate_context!()) .expect("error while running tauri application"); } diff --git a/gdke-gui/src-tauri/tauri.conf.json b/gdke-gui/src-tauri/tauri.conf.json index e9a0dcf..1546eed 100644 --- a/gdke-gui/src-tauri/tauri.conf.json +++ b/gdke-gui/src-tauri/tauri.conf.json @@ -1,4 +1,5 @@ { + "$schema": "https://github.com/tauri-apps/tauri/releases/download/tauri-build-v2.0.0-beta.13/schema.json", "productName": "gdke-gui", "version": "0.1.0", "identifier": "one.meli.gdke-gui", @@ -30,5 +31,6 @@ "icons/icon.icns", "icons/icon.ico" ] - } + }, + "plugins": {} } diff --git a/gdke-gui/src/App.css b/gdke-gui/src/App.css index c78c8f0..e57a729 100644 --- a/gdke-gui/src/App.css +++ b/gdke-gui/src/App.css @@ -3,5 +3,5 @@ @tailwind utilities; body { - @apply dark:bg-black dark:text-white + @apply dark:bg-black dark:text-white; } diff --git a/gdke-gui/src/App.tsx b/gdke-gui/src/App.tsx index 7d63968..2082585 100644 --- a/gdke-gui/src/App.tsx +++ b/gdke-gui/src/App.tsx @@ -1,23 +1,145 @@ -import { useState } from "react"; -import reactLogo from "./assets/react.svg"; -import { invoke } from "@tauri-apps/api/core"; +import { useEffect, useState } from "react"; import "./App.css"; -import { Input } from "./components/ui/input"; import { open } from "@tauri-apps/plugin-dialog"; +import { event } from "@tauri-apps/api"; +import { invoke } from "@tauri-apps/api/core"; +import { + Dialog, + DialogContent, + DialogTitle, + DialogDescription, + DialogHeader, +} from "./components/ui/dialog"; +import { Label } from "./components/ui/label"; +import { Input } from "./components/ui/input"; +import { Button } from "./components/ui/button"; function App() { - const [greetMsg, setGreetMsg] = useState(""); - const [name, setName] = useState(""); - function get_file() { - open({ + const [drag_over, set_drag_over] = useState(false); + const [show_pre_run, set_show_pre_run] = useState(false); + const [signature, set_signature] = useState(""); + const [program, set_program] = useState(""); + const [loading, set_loading] = useState(false); + const [outcome, set_outcome] = useState( + null, + ); + async function get_file() { + const outcome = await open({ title: "File picker", filters: [{ name: "Applications", extensions: ["exe"] }], directory: false, }); + if (!outcome) return; + ask_for_sig(outcome.path); } + const run_program = () => { + set_loading(true); + invoke("get_secret", { sig: signature, program }).then( + (out) => { + set_outcome([true, out as string]); + set_loading(false); + }, + (e) => { + set_loading(false); + set_outcome([false]); + }, + ); + }; + const ask_for_sig = async (path: string) => { + set_outcome(null); + set_signature(""); + set_show_pre_run(true); + set_program(path); + }; + useEffect(() => { + const listeners: Promise[] = []; + listeners.push( + event.listen<{ paths: string[] }>(event.TauriEvent.DRAG_DROP, (evt) => { + set_drag_over(false); + console.log(evt); + ask_for_sig(evt.payload.paths[0]); + }), + ); + listeners.push( + event.listen(event.TauriEvent.DRAG_LEAVE, (evt) => { + set_drag_over(false); + console.log(evt); + }), + ); + listeners.push( + event.listen(event.TauriEvent.DRAG_ENTER, (evt) => { + set_drag_over(true); + console.log(evt); + }), + ); + return () => { + (async () => { + for await (const off_fn of listeners) { + off_fn(); + } + })(); + }; + }, []); return ( -

+
+ set_show_pre_run(e)}> + + + Extract Secret Key + {outcome === null && !loading && ( + + After entering a sig we will try our hardest to search for the + key with that signature. + + )} + +
+ {outcome === null || loading ? ( +
+ + set_signature(e.currentTarget.value)} + placeholder="59 48 29 ?? 92 47 ?? .." + /> +
+ ) : loading ? ( +
Loading just give us a sec
+ ) : outcome?.[0] === true ? ( + <> +

+ Successfully got Key! +

{" "} + {" "} + + + ) : ( +
failure
+ )} +
+ {outcome?.[0] && ( + + )} + +
+
+ +

👋 Welcome to Gdke

To get started drop your program below: diff --git a/gdke-gui/src/components/ui/dialog.tsx b/gdke-gui/src/components/ui/dialog.tsx new file mode 100644 index 0000000..306cfc3 --- /dev/null +++ b/gdke-gui/src/components/ui/dialog.tsx @@ -0,0 +1,120 @@ +import * as React from "react" +import * as DialogPrimitive from "@radix-ui/react-dialog" +import { X } from "lucide-react" + +import { cn } from "@/lib/utils" + +const Dialog = DialogPrimitive.Root + +const DialogTrigger = DialogPrimitive.Trigger + +const DialogPortal = DialogPrimitive.Portal + +const DialogClose = DialogPrimitive.Close + +const DialogOverlay = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef +>(({ className, ...props }, ref) => ( + +)) +DialogOverlay.displayName = DialogPrimitive.Overlay.displayName + +const DialogContent = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef +>(({ className, children, ...props }, ref) => ( + + + + {children} + + + Close + + + +)) +DialogContent.displayName = DialogPrimitive.Content.displayName + +const DialogHeader = ({ + className, + ...props +}: React.HTMLAttributes) => ( +

+) +DialogHeader.displayName = "DialogHeader" + +const DialogFooter = ({ + className, + ...props +}: React.HTMLAttributes) => ( +
+) +DialogFooter.displayName = "DialogFooter" + +const DialogTitle = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef +>(({ className, ...props }, ref) => ( + +)) +DialogTitle.displayName = DialogPrimitive.Title.displayName + +const DialogDescription = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef +>(({ className, ...props }, ref) => ( + +)) +DialogDescription.displayName = DialogPrimitive.Description.displayName + +export { + Dialog, + DialogPortal, + DialogOverlay, + DialogClose, + DialogTrigger, + DialogContent, + DialogHeader, + DialogFooter, + DialogTitle, + DialogDescription, +} diff --git a/gdke-gui/src/components/ui/label.tsx b/gdke-gui/src/components/ui/label.tsx new file mode 100644 index 0000000..683faa7 --- /dev/null +++ b/gdke-gui/src/components/ui/label.tsx @@ -0,0 +1,24 @@ +import * as React from "react" +import * as LabelPrimitive from "@radix-ui/react-label" +import { cva, type VariantProps } from "class-variance-authority" + +import { cn } from "@/lib/utils" + +const labelVariants = cva( + "text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70" +) + +const Label = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef & + VariantProps +>(({ className, ...props }, ref) => ( + +)) +Label.displayName = LabelPrimitive.Root.displayName + +export { Label } diff --git a/src/lib.rs b/src/lib.rs index 055ceeb..88b3e78 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,6 +1,6 @@ pub mod versioning; use std::{ - ffi::{c_void, CStr, CString}, + ffi::{c_void, CStr, CString, OsStr}, io::{Read, Write}, mem::{size_of, transmute}, net::UdpSocket, @@ -61,8 +61,8 @@ impl Drop for ProcKiller { } } } -pub unsafe fn spawn_and_inject(proc: &str, sig: &str) -> anyhow::Result<[u8; 32]> { - let pth = Path::new(proc); +pub unsafe fn spawn_and_inject>(proc: T, sig: &str) -> anyhow::Result<[u8; 32]> { + let pth = Path::new(&proc); if !pth.is_file() { panic!("file does not exist"); }