diff --git a/Protest/Front/window.js b/Protest/Front/window.js index 0114f539..cf74e21f 100644 --- a/Protest/Front/window.js +++ b/Protest/Front/window.js @@ -77,31 +77,6 @@ const WIN = { } }, - SetTaskBarPosition: position => { - //TODO: - switch (position) { - case "left": - break; - - case "right": - break; - - case "top": - taskbar.style.top = "0"; - taskbar.style.bottom = ""; - container.style.top = `${WIN.iconSize}px`; - container.style.bottom = "0"; - break; - - default: - taskbar.style.top = ""; - taskbar.style.bottom = "0"; - container.style.top = "0"; - container.style.bottom = `${WIN.iconSize}px`; - break; - } - }, - GridWindows: ()=> { if (WIN.array.length === 0) return; diff --git a/Protest/Front/wmi.js b/Protest/Front/wmi.js index 88db37dc..025f7a42 100644 --- a/Protest/Front/wmi.js +++ b/Protest/Front/wmi.js @@ -483,13 +483,17 @@ class Wmi extends Window { try { const response = await fetch(`wmi/killprocess?target=${encodeURIComponent(targetHost)}&pid=${pid}`); if (response.status !== 200) return; - const text = await response.text(); - if (text === "ok") + const json = await response.json(); + if (json.error) throw(json.error); + + + + if (json.status === "ok") table.removeChild(tr); else { td.removeChild(terminateButton); - td.textContent = text; + td.textContent = json.status; } } catch (ex) { diff --git a/Protest/Protocols/Wmi.cs b/Protest/Protocols/Wmi.cs index f6a16964..1c3e537a 100644 --- a/Protest/Protocols/Wmi.cs +++ b/Protest/Protocols/Wmi.cs @@ -13,13 +13,11 @@ namespace Protest.Protocols; [SupportedOSPlatform("windows")] internal static class Wmi { - //private static readonly ArraySegment CODE_OK = new ArraySegment("ok"u8.ToArray()); - private static readonly ArraySegment CODE_ACCESS_DENIED = new ArraySegment("access denied"u8.ToArray()); - private static readonly ArraySegment CODE_INSUFFICIENT_PRIVILEGE = new ArraySegment("insufficient privilege"u8.ToArray()); - private static readonly ArraySegment CODE_UNKNOWN = new ArraySegment("unknown failure"u8.ToArray()); - private static readonly ArraySegment CODE_PATH_NOT_FOUND = new ArraySegment("path not found"u8.ToArray()); - private static readonly ArraySegment CODE_AUTHENTICATION_FAILED = new ArraySegment("authentication failed"u8.ToArray()); - //private static readonly ArraySegment CODE_INVALID = new ArraySegment("invalid parameter"u8.ToArray()); + private static readonly ArraySegment CODE_ACCESS_DENIED = new ArraySegment("{\"error\":\"access denied\"}"u8.ToArray()); + private static readonly ArraySegment CODE_INSUFFICIENT_PRIVILEGE = new ArraySegment("{\"error\":\"insufficient privilege\"}"u8.ToArray()); + private static readonly ArraySegment CODE_UNKNOWN = new ArraySegment("{\"error\":\"unknown failure\"}"u8.ToArray()); + private static readonly ArraySegment CODE_PATH_NOT_FOUND = new ArraySegment("{\"error\":\"path not found\"}"u8.ToArray()); + private static readonly ArraySegment CODE_AUTHENTICATION_FAILED = new ArraySegment("{\"error\":\"authentication failed\"}"u8.ToArray()); /*public static ManagementScope WmiScope(string host, string impersonation, string username, string password) { ImpersonationLevel impersonationLevel = impersonation.ToLower() switch { @@ -432,7 +430,7 @@ public static byte[] WmiKillProcess(Dictionary parameters) { ManagementObjectCollection moc; try { moc = new ManagementObjectSearcher(scope.Path.ToString(), "SELECT * FROM Win32_Process WHERE ProcessId = " + pid).Get(); - if (moc.Count == 0) return "no such process id"u8.ToArray(); + if (moc.Count == 0) return "{\"error\":\"no such process id\"}"u8.ToArray(); } catch { return CODE_UNKNOWN.Array; diff --git a/Protest/Tasks/Lifeline.cs b/Protest/Tasks/Lifeline.cs index fc5fa591..9a8915f0 100644 --- a/Protest/Tasks/Lifeline.cs +++ b/Protest/Tasks/Lifeline.cs @@ -19,7 +19,7 @@ internal static partial class Lifeline { public static TaskWrapper task; public static void Initialize() { - //TODO: autostart + //TODO: auto-start StartTask("system"); } diff --git a/Protest/Tools/PasswordStrength.cs b/Protest/Tools/PasswordStrength.cs index 7670eda4..bf228529 100644 --- a/Protest/Tools/PasswordStrength.cs +++ b/Protest/Tools/PasswordStrength.cs @@ -114,8 +114,6 @@ public static byte[] GetEntropy() { bool first = true; foreach (Database.Entry entry in DatabaseInstances.users.dictionary.Values) { - //TODO: hasPassword - List words = new List(); foreach (KeyValuePair pair in entry.attributes) { if (pair.Key.Contains("password")) @@ -168,8 +166,6 @@ public static byte[] GetEntropy() { } foreach (Database.Entry entry in DatabaseInstances.devices.dictionary.Values) { - //TODO: hasPassword - List words = new List(); foreach (KeyValuePair pair in entry.attributes) { if (pair.Key.Contains("password"))