fix: change base64 encode to standard with pad

.prettierignore

@@ -7,3 +7,6 @@ bun.lockb
 
 # Miscellaneous
 /static/
+
+# Tauri
+/src-tauri/

.prettierrc

@@ -9,7 +9,7 @@
   "tabWidth": 2,
   "useTabs": false,
   "bracketSpacing": true,
-  "plugins": ["prettier-plugin-svelte", "prettier-plugin-rust"],
+  "plugins": ["prettier-plugin-svelte"],
   "overrides": [
     {
       "files": "*.svelte",

.vscode/settings.json

@@ -1,7 +1,7 @@
 {
   "svelte.enable-ts-plugin": true,
   "editor.defaultFormatter": "esbenp.prettier-vscode",
-  "[rust]":{
+  "[rust]": {
     "editor.defaultFormatter": "rust-lang.rust-analyzer"
   }
 }

README.md

@@ -27,10 +27,10 @@ It enhances the osu! experience with quality-of-life features and integration sp
 
 ## 💻 Supported Platforms
 
-| Platform | Status           |
+| Platform | Status                                   |
-| -------- | ---------------- |
+| -------- | ---------------------------------------- |
-| Windows  | ✅ Supported     |
+| Windows  | ✅ Supported                             |
-| macOS    | ❌ Not supported |
+| macOS    | ❌ Not supported                         |
 | Linux    | 🕧 Partially supported (via osu-winello) |
 
 > Currently, only **Windows** is fully supported. Support for other platforms may be considered in the future.

src-tauri/Cargo.lock

@@ -1094,7 +1094,7 @@ dependencies = [
 
 [[package]]
 name = "ezpplauncher"
-version = "3.0.0"
+version = "3.0.1"
 dependencies = [
  "base64 0.21.7",
  "discord-rich-presence",
@@ -1116,6 +1116,7 @@ dependencies = [
  "tauri-plugin-single-instance",
  "tauri-plugin-sql",
  "tokio",
+ "widestring",
  "winapi",
  "windows-sys 0.60.2",
  "winreg 0.55.0",
@@ -5799,6 +5800,12 @@ dependencies = [
  "wasite",
 ]
 
+[[package]]
+name = "widestring"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd7cf3379ca1aac9eea11fba24fd7e315d621f8dfe35c8d7d2be8b793726e07d"
+
 [[package]]
 name = "winapi"
 version = "0.3.9"

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ezpplauncher"
-version = "3.0.0"
+version = "3.0.1"
 description = "EZPPLauncher redefined."
 authors = ["HorizonCode"]
 edition = "2024"
@@ -41,6 +41,7 @@ once_cell = "1.21.3"
 winreg = "0.55.0"
 winapi = { version = "0.3", features = ["winuser", "wincrypt", "memoryapi", "winbase", "dpapi"] }
 base64 = "0.21"
+widestring = "1.0"
 
 [target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
 tauri-plugin-single-instance = "2.3.0"

src-tauri/src/commands.rs

@@ -13,9 +13,9 @@ use tokio::time::{Duration, sleep};
 
 use crate::presence;
 use crate::utils::{
-    check_folder_completeness, get_osu_config, get_osu_user_config, get_window_title_by_pid,
+    check_folder_completeness, encrypt_password, get_osu_config, get_osu_user_config,
-    is_net8_installed, is_osuwinello_available, is_wmctrl_available, set_osu_config_vals,
+    get_window_title_by_pid, is_net8_installed, is_osuwinello_available, is_wmctrl_available,
-    set_osu_user_config_vals,
+    set_osu_config_vals, set_osu_user_config_vals,
 };
 
 #[tauri::command]
@@ -719,3 +719,21 @@ pub fn has_osuwinello() -> bool {
 pub async fn has_net8() -> bool {
     is_net8_installed().await
 }
+
+#[cfg(windows)]
+#[tauri::command]
+pub fn encrypt_string(string: String, entropy: String) -> String {
+    let encrypted = encrypt_password(&string, &entropy);
+
+    match encrypted {
+        Ok(encrypted_vec) => encrypted_vec,
+        Err(_) => string,
+    }
+}
+
+// NOTE: should not be called by tauri on non windows systems, return the string nonthenless
+#[cfg(not(windows))]
+#[tauri::command]
+pub fn encrypt_string(string: String, _entropy: String) -> String {
+    string
+}

src-tauri/src/lib.rs

@@ -5,18 +5,17 @@ pub mod commands;
 pub mod presence;
 pub mod utils;
 use crate::commands::{
-    check_for_corruption, download_ezpp_launcher_update_files, exit, find_osu_installation,
+    check_for_corruption, download_ezpp_launcher_update_files, encrypt_string, exit,
-    get_beatmapsets_count, get_ezpp_launcher_update_files, get_hwid, get_launcher_version,
+    find_osu_installation, get_beatmapsets_count, get_ezpp_launcher_update_files, get_hwid,
-    get_osu_release_stream, get_osu_skin, get_osu_version, get_platform, get_skins_count,
+    get_launcher_version, get_osu_release_stream, get_osu_skin, get_osu_version, get_platform,
-    is_osu_running, open_url_in_browser, presence_connect, presence_disconnect,
+    get_skins_count, has_net8, has_osuwinello, has_wmctrl, is_osu_running, open_url_in_browser,
-    presence_is_connected, presence_update_status, presence_update_user, replace_ui_files, run_osu,
+    presence_connect, presence_disconnect, presence_is_connected, presence_update_status,
-    run_osu_updater, set_osu_config_values, set_osu_user_config_values, valid_osu_folder, has_osuwinello, has_wmctrl,
+    presence_update_user, replace_ui_files, run_osu, run_osu_updater, set_osu_config_values,
-    has_net8
+    set_osu_user_config_values, valid_osu_folder,
 };
 
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
-
     #[cfg(target_os = "linux")]
     unsafe {
         std::env::set_var("WEBKIT_DISABLE_DMABUF_RENDERER", "1");
@@ -61,7 +60,8 @@ pub fn run() {
             presence_is_connected,
             has_osuwinello,
             has_wmctrl,
-            has_net8
+            has_net8,
+            encrypt_string
         ])
         .plugin(tauri_plugin_fs::init())
         .plugin(tauri_plugin_dialog::init())

src-tauri/src/utils.rs

@@ -308,17 +308,20 @@ pub async fn is_net8_installed() -> bool {
     }
 }
 
-//TODO: maybe switch to this crate: https://crates.io/crates/windows-dpapi
-
 #[cfg(windows)]
-pub fn encrypt_password(password: &str) -> Result<String, String> {
+pub fn encrypt_password(password: &str, entropy: &str) -> Result<String, String> {
+    use base64::{Engine as _, engine::general_purpose};
+    use std::ffi::OsStr;
+    use std::os::windows::ffi::OsStrExt;
     use std::ptr;
     use std::slice;
     use winapi::shared::minwindef::{BYTE, DWORD, LPVOID};
+    use winapi::shared::ntdef::LPCWSTR;
     use winapi::um::dpapi::{CRYPTPROTECT_UI_FORBIDDEN, CryptProtectData};
     use winapi::um::winbase::LocalFree;
     use winapi::um::wincrypt::DATA_BLOB;
-    use base64::{engine::general_purpose, Engine as _};
+
+    let description = "Encrypted";
 
     let password_bytes = password.as_bytes();
     let mut input_blob = DATA_BLOB {
@@ -326,16 +329,28 @@ pub fn encrypt_password(password: &str) -> Result<String, String> {
         pbData: password_bytes.as_ptr() as *mut BYTE,
     };
 
+    let entropy_bytes = entropy.as_bytes();
+    let mut entropy_blob = DATA_BLOB {
+        cbData: entropy_bytes.len() as DWORD,
+        pbData: entropy_bytes.as_ptr() as *mut BYTE,
+    };
+
     let mut output_blob = DATA_BLOB {
         cbData: 0,
         pbData: ptr::null_mut(),
     };
 
+    let wide_description: Vec<u16> = OsStrExt::encode_wide(OsStr::new(description))
+        .chain(Some(0))
+        .collect();
+
+    let p_description: LPCWSTR = wide_description.as_ptr();
+
     let result = unsafe {
         CryptProtectData(
             &mut input_blob,
-            ptr::null(),
+            p_description,
-            ptr::null_mut(),
+            &mut entropy_blob,
             ptr::null_mut(),
             ptr::null_mut(),
             CRYPTPROTECT_UI_FORBIDDEN,
@@ -357,63 +372,4 @@ pub fn encrypt_password(password: &str) -> Result<String, String> {
     let base64_string = general_purpose::STANDARD.encode(&encrypted_data);
 
     Ok(base64_string)
-}
+}
-
-#[cfg(windows)]
-pub fn decrypt_password(encrypted_password_base64: &str) -> Result<String, String> {
-  use std::ptr;
-    use std::slice;
-    use winapi::shared::minwindef::{BYTE, DWORD, LPVOID};
-    use winapi::um::dpapi::{CRYPTPROTECT_UI_FORBIDDEN, CryptUnprotectData};
-    use winapi::um::winbase::LocalFree;
-    use winapi::um::wincrypt::DATA_BLOB;
-    use base64::{engine::general_purpose, Engine as _};
-
-    // 1. Decode the Base64 string back into raw bytes
-    let encrypted_password_bytes = general_purpose::STANDARD.decode(encrypted_password_base64)
-        .map_err(|e| format!("Base64 decoding failed: {}", e))?;
-
-    // 2. Prepare the input data structure
-    let mut input_blob = DATA_BLOB {
-        cbData: encrypted_password_bytes.len() as DWORD,
-        pbData: encrypted_password_bytes.as_ptr() as *mut BYTE,
-    };
-
-    // 3. Prepare the output data structure
-    let mut output_blob = DATA_BLOB {
-        cbData: 0,
-        pbData: ptr::null_mut(),
-    };
-
-    // 4. Call the Windows API function
-    let result = unsafe {
-        CryptUnprotectData(
-            &mut input_blob,
-            ptr::null_mut(),
-            ptr::null_mut(),
-            ptr::null_mut(),
-            ptr::null_mut(),
-            CRYPTPROTECT_UI_FORBIDDEN,
-            &mut output_blob,
-        )
-    };
-
-    // 5. Check the result
-    if result == 0 {
-        return Err("CryptUnprotectData failed".to_string());
-    }
-
-    // 6. Copy the decrypted data into a safe Rust Vec
-    let decrypted_bytes = unsafe {
-        slice::from_raw_parts(output_blob.pbData, output_blob.cbData as usize).to_vec()
-    };
-
-    // 7. Free the memory allocated by the Windows API
-    unsafe {
-        LocalFree(output_blob.pbData as LPVOID);
-    }
-
-    // 8. Convert the decrypted bytes back to a UTF-8 string
-    String::from_utf8(decrypted_bytes)
-        .map_err(|e| format!("UTF-8 conversion failed: {}", e))
-}

src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "ezpplauncher",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "identifier": "farm.ezpp.launcher",
   "build": {
     "beforeDevCommand": "bun run vite:dev",

src/lib/components/ui/titlebar/titlebar.svelte

@@ -20,10 +20,14 @@
 </script>
 
 <div data-tauri-drag-region class="titlebar z-[60] border-b border-theme-800/90">
-  <div class="mr-auto ms-2 flex flex-row gap-2 items-center text-[1.05rem] font-semibold pointer-events-none">
+  <div
+    class="mr-auto ms-2 flex flex-row gap-2 items-center text-[1.05rem] font-semibold pointer-events-none"
+  >
     <img src={Logo} alt="EZPP Launcher Logo" class="h-11 w-11 inline-block" />
     <span>EZPPLauncher</span>
-    <Badge class="!text-[0.6rem] py-[0.5px] bg-primary-500 hover:bg-primary-500">{$launcherVersion}</Badge>
+    <Badge class="!text-[0.6rem] py-[0.5px] bg-primary-500 hover:bg-primary-500"
+      >{$launcherVersion}</Badge
+    >
   </div>
   <div class="titlebar-button rounded-lg transition-colors duration-75" id="titlebar-minimize">
     <Minimize size={18} />

src/lib/global.ts

@@ -1,12 +1,12 @@
 import { writable } from 'svelte/store';
 import { ezppfarm } from './api/ezpp';
 import type { Component } from 'svelte';
-import Loading from '../pages/Loading.svelte';
+import Loading from '../screens/Loading.svelte';
 import type { Release } from './types';
 
 export const currentView = writable<Component>(Loading);
 
-export const platform = writable<string>("");
+export const platform = writable<string>('');
 
 export const launcherVersion = writable<string>('');
 export const newVersion = writable<Release | undefined>(undefined);

src/lib/osuUtil.ts

@@ -133,9 +133,8 @@ export const exit = async () => await invoke('exit');
 export const getPlatform = async () => await invoke<string>('get_platform');
 export const isOsuCorrupted = async (folder: string) =>
   await invoke<boolean>('check_for_corruption', { folder });
-export const hasWMCTRL = async () =>
+export const hasWMCTRL = async () => await invoke<boolean>('has_wmctrl');
-  await invoke<boolean>('has_wmctrl');
+export const hasOsuWinello = async () => await invoke<boolean>('has_osuwinello');
-export const hasOsuWinello = async () =>
+export const hasNet8 = async () => await invoke<boolean>('has_net8');
-  await invoke<boolean>('has_osuwinello');
+export const encryptString = async (str: string, entropy: string) =>
-export const hasNet8 = async () =>
+  await invoke<string>('encrypt_string', { string: str, entropy });
-  await invoke<boolean>('has_net8');

src/routes/+layout.svelte

@@ -26,7 +26,7 @@
   import { Buffer } from 'buffer';
   import { Toaster } from '@/components/ui/sonner';
   import { userAuth } from '@/userAuthentication';
-  import { exit, getLauncherVersion, getPlatform } from '@/osuUtil';
+  import { encryptString, exit, getLauncherVersion, getPlatform } from '@/osuUtil';
   import Button from '@/components/ui/button/button.svelte';
   import * as presence from '@/presence';
 
@@ -92,7 +92,7 @@
     setupValues();
     launcherVersion.set(await getLauncherVersion());
     platform.set(await getPlatform());
-    if ($platform !== "windows" && $platform !== "linux") unsupported_platform = true;
+    if ($platform !== 'windows' && $platform !== 'linux') unsupported_platform = true;
     const isFirstStartup = await $userSettings.init();
     $userAuth.init();
 

src/screens/Launch.svelte

@@ -83,6 +83,7 @@
   import { osuapi } from '@/api/osuapi';
   import {
     downloadEZPPLauncherUpdateFiles,
+    encryptString,
     exit,
     getBeatmapSetsCount,
     getEZPPLauncherUpdateFiles,
@@ -296,7 +297,10 @@
             },
             {
               key: 'Password',
-              value: password,
+              value:
+                $platform === 'windows'
+                  ? await encryptString(password, 'cu24180ncjeiu0ci1nwui')
+                  : password,
             },
             {
               key: 'SaveUsername',
@@ -531,7 +535,11 @@
 </AlertDialog.Root>
 
 <AlertDialog.Root open={$newVersion !== undefined}>
-  <AlertDialog.Content class="bg-theme-950 border-theme-800 p-0">
+  <AlertDialog.Content
+    class="bg-theme-950 border-theme-800 p-0"
+    escapeKeydownBehavior="ignore"
+    interactOutsideBehavior="ignore"
+  >
     <div
       class="flex flex-col items-center justify-center border-b border-theme-800 bg-black/40 rounded-t-lg p-3"
     >
@@ -567,7 +575,11 @@
 </AlertDialog.Root>
 
 <AlertDialog.Root bind:open={$launching}>
-  <AlertDialog.Content class="bg-theme-950 border-theme-800 p-0">
+  <AlertDialog.Content
+    class="bg-theme-950 border-theme-800 p-0"
+    escapeKeydownBehavior="ignore"
+    interactOutsideBehavior="ignore"
+  >
     <div
       class="flex flex-col items-center justify-center border-b border-theme-800 bg-black/40 rounded-t-lg p-3"
     >