From 448a1aaf5b5feca667852a0e3d177e80d003b0f7 Mon Sep 17 00:00:00 2001 From: makikvues Date: Thu, 14 Jan 2021 23:50:19 +0100 Subject: [PATCH] - fixed getting data from clipboard - fixed GetExecutableFromPath - unified exception logging - cleanup --- winPEAS/winPEASexe/winPEAS/Checks/Checks.cs | 2 +- winPEAS/winPEASexe/winPEAS/Checks/UserInfo.cs | 2 +- .../winPEAS/Helpers/DomainHelper.cs | 2 +- winPEAS/winPEASexe/winPEAS/Helpers/MyUtils.cs | 8 ++ .../winPEAS/Helpers/PermissionsHelper.cs | 12 ++- .../winPEAS/Helpers/Search/SearchHelper.cs | 41 +------ .../winPEAS/Info/ApplicationInfo/AutoRuns.cs | 2 +- .../Info/ApplicationInfo/InstalledApps.cs | 100 +++++++----------- .../Info/NetworkInfo/NetworkInfoHelper.cs | 8 +- .../winPEAS/Info/ProcessInfo/ProcessesInfo.cs | 2 +- .../Info/ServicesInfo/ServicesInfoHelper.cs | 10 +- .../winPEAS/Info/SystemInfo/SystemInfo.cs | 10 +- .../winPEAS/Info/UserInfo/UserInfoHelper.cs | 6 +- .../KnownFileCreds/Kerberos/Kerberos.cs | 8 +- .../KnownFileCreds/KnownFileCredsInfo.cs | 4 +- .../winPEAS/KnownFileCreds/Vault/VaultCli.cs | 2 +- 16 files changed, 89 insertions(+), 130 deletions(-) diff --git a/winPEAS/winPEASexe/winPEAS/Checks/Checks.cs b/winPEAS/winPEASexe/winPEAS/Checks/Checks.cs index 217367c..1d24f46 100644 --- a/winPEAS/winPEASexe/winPEAS/Checks/Checks.cs +++ b/winPEAS/winPEASexe/winPEAS/Checks/Checks.cs @@ -239,7 +239,7 @@ namespace winPEAS.Checks // create the file lists try { - Beaprint.GrayPrint(" - Files/directories list for search..."); + Beaprint.GrayPrint(" - Creating files/directories list for search..."); SearchHelper.CreateSearchDirectoriesList(); } catch (Exception ex) diff --git a/winPEAS/winPEASexe/winPEAS/Checks/UserInfo.cs b/winPEAS/winPEASexe/winPEAS/Checks/UserInfo.cs index 66f2e54..64bccbc 100644 --- a/winPEAS/winPEASexe/winPEAS/Checks/UserInfo.cs +++ b/winPEAS/winPEASexe/winPEAS/Checks/UserInfo.cs @@ -114,7 +114,7 @@ namespace winPEAS.Checks { Beaprint.MainPrint("Clipboard text"); string clipboard = Info.UserInfo.UserInfoHelper.GetClipboardText(); - if (string.IsNullOrEmpty(clipboard)) + if (!string.IsNullOrEmpty(clipboard)) { Beaprint.BadPrint(clipboard); } diff --git a/winPEAS/winPEASexe/winPEAS/Helpers/DomainHelper.cs b/winPEAS/winPEASexe/winPEAS/Helpers/DomainHelper.cs index f25dca7..8736591 100644 --- a/winPEAS/winPEASexe/winPEAS/Helpers/DomainHelper.cs +++ b/winPEAS/winPEASexe/winPEAS/Helpers/DomainHelper.cs @@ -78,7 +78,7 @@ namespace winPEAS.Helpers } catch (Exception ex) { - Beaprint.GrayPrint(String.Format(" [X] Exception: {0}", ex.Message)); + Beaprint.PrintException(ex.Message); } //By default local return ""; diff --git a/winPEAS/winPEASexe/winPEAS/Helpers/MyUtils.cs b/winPEAS/winPEASexe/winPEAS/Helpers/MyUtils.cs index 7f346f1..c80c264 100644 --- a/winPEAS/winPEASexe/winPEAS/Helpers/MyUtils.cs +++ b/winPEAS/winPEASexe/winPEAS/Helpers/MyUtils.cs @@ -55,7 +55,15 @@ namespace winPEAS.Helpers string binaryPath = ""; Match match_path = Regex.Match(path, @"^\W*([a-z]:\\.+?(\.exe|\.dll|\.sys))\W*", RegexOptions.RightToLeft | RegexOptions.IgnoreCase); if (match_path.Groups.Count > 1) + { binaryPath = match_path.Groups[1].ToString(); + } + + if (binaryPath.Contains('"')) + { + binaryPath = binaryPath.Split('"')[0]; + binaryPath = binaryPath.Trim(); + } //Check if rundll32 string[] binaryPathdll32 = binaryPath.Split(new string[] {"Rundll32.exe"}, StringSplitOptions.None); diff --git a/winPEAS/winPEASexe/winPEAS/Helpers/PermissionsHelper.cs b/winPEAS/winPEASexe/winPEAS/Helpers/PermissionsHelper.cs index c799a6a..a433dc9 100644 --- a/winPEAS/winPEASexe/winPEAS/Helpers/PermissionsHelper.cs +++ b/winPEAS/winPEASexe/winPEAS/Helpers/PermissionsHelper.cs @@ -87,7 +87,9 @@ namespace winPEAS.Helpers int current_perm = (int)rule.FileSystemRights; string current_perm_str = PermInt2Str(current_perm, false); if (current_perm_str == "") + { continue; + } foreach (KeyValuePair mySID in SIDs) { @@ -99,7 +101,9 @@ namespace winPEAS.Helpers if (container.ContainsKey(SID_name)) { if (!container[SID_name].Contains(current_perm_str)) + { container[SID_name] += " " + current_perm_str; + } } else container[SID_name] = current_perm_str; @@ -161,7 +165,7 @@ namespace winPEAS.Helpers } catch (Exception ex) { - Beaprint.GrayPrint(String.Format(" [X] Exception: {0}", ex.Message)); + Beaprint.PrintException(ex.Message); } return results; } @@ -215,7 +219,9 @@ namespace winPEAS.Helpers foreach (KeyValuePair entry in interesting_perms) { if ((entry.Value & current_perm) == entry.Value) - return entry.Key; + { + return entry.Key; + } } } catch (Exception ex) @@ -249,7 +255,9 @@ namespace winPEAS.Helpers Dictionary results = new Dictionary(); int max_dir_recurse = 130; if (cont > max_dir_recurse) + { return results; //"Limit" for apps with hundreds of thousands of folders + } results[path] = ""; //If you cant open, then there are no privileges for you (and the try will explode) try diff --git a/winPEAS/winPEASexe/winPEAS/Helpers/Search/SearchHelper.cs b/winPEAS/winPEASexe/winPEAS/Helpers/Search/SearchHelper.cs index c62a0bc..8b45050 100644 --- a/winPEAS/winPEASexe/winPEAS/Helpers/Search/SearchHelper.cs +++ b/winPEAS/winPEASexe/winPEAS/Helpers/Search/SearchHelper.cs @@ -248,31 +248,15 @@ namespace winPEAS.Helpers.Search } internal static List SearchUsersInterestingFiles() - { - //SearchHelper.FindFiles(searchPath, _patternsFileCreds, colorF); - //string patterns = string.Join(";", patternsFileCreds); - + { var result = new List(); foreach (var file in SearchHelper.RootDirCurrentUser) { - // !!! too slow - regexp - //foreach (var pattern in Patterns.PatternsFileCreds2) - //{ - // if (Regex.IsMatch(file, pattern, RegexOptions.IgnoreCase)) - // { - // //files2.Add(file + $" [pattern: '{pattern}']"); - // files2.Add(file); - // break; - // } - //} - string extLower = file.Extension.ToLower(); string nameLower = file.Filename.ToLower(); - // string nameExtLower = nameLower + "." + extLower; if (Patterns.WhitelistExtensions.Contains(extLower) || - // Patterns.WhiteListFilenames.Contains(nameLower) || Patterns.WhiteListExactfilenamesWithExtensions.Contains(nameLower)) { result.Add(file.FullPath); @@ -296,9 +280,6 @@ namespace winPEAS.Helpers.Search internal static List FindCachedGPPPassword() { - //SearchHelper.FindFiles(searchPath, _patternsFileCreds, colorF); - //string patterns = string.Join(";", patternsFileCreds); - var result = new List(); var allowedExtensions = new HashSet @@ -307,13 +288,13 @@ namespace winPEAS.Helpers.Search }; foreach (var file in SearchHelper.GroupPolicyHistory) - { - string extLower = file.Extension.ToLower(); + { + string extLower = file.Extension.ToLower(); if (allowedExtensions.Contains(extLower)) { result.Add(file.FullPath); - } + } } return result; @@ -328,14 +309,6 @@ namespace winPEAS.Helpers.Search "sitelist.xml" }; - //string[] searchLocations = - //{ - // $"{drive}\\Program Files\\", - // $"{drive}\\Program Files (x86)\\", - // $"{drive}\\Documents and Settings\\", - // $"{drive}\\Users\\", - //}; - var searchFiles = new List(); searchFiles.AddRange(SearchHelper.ProgramFiles); searchFiles.AddRange(SearchHelper.ProgramFilesX86); @@ -359,8 +332,6 @@ namespace winPEAS.Helpers.Search { var result = new List(); - string patterns = "*diagram*;*.pdf;*.vsd;*.doc;*docx;*.xls;*.xlsx"; - var allowedRegexp = new List { ".*diagram.*", @@ -380,7 +351,6 @@ namespace winPEAS.Helpers.Search { string extLower = file.Extension.ToLower(); string nameLower = file.Filename.ToLower(); - // string nameExtLower = nameLower + "." + extLower; if (allowedExtensions.Contains(extLower)) { @@ -407,8 +377,6 @@ namespace winPEAS.Helpers.Search { var result = new List(); - string patterns = "*diagram*;*.pdf;*.vsd;*.doc;*docx;*.xls;*.xlsx"; - var allowedRegexp = new List { ".*diagram.*", @@ -428,7 +396,6 @@ namespace winPEAS.Helpers.Search { string extLower = file.Extension.ToLower(); string nameLower = file.Filename.ToLower(); - // string nameExtLower = nameLower + "." + extLower; if (allowedExtensions.Contains(extLower)) { diff --git a/winPEAS/winPEASexe/winPEAS/Info/ApplicationInfo/AutoRuns.cs b/winPEAS/winPEASexe/winPEAS/Info/ApplicationInfo/AutoRuns.cs index 8ca0f18..dc68be9 100644 --- a/winPEAS/winPEASexe/winPEAS/Info/ApplicationInfo/AutoRuns.cs +++ b/winPEAS/winPEASexe/winPEAS/Info/ApplicationInfo/AutoRuns.cs @@ -242,7 +242,7 @@ namespace winPEAS.Info.ApplicationInfo } catch (Exception ex) { - Beaprint.GrayPrint(string.Format(" [X] Exception: {0}", ex.Message)); + Beaprint.PrintException(ex.Message); } return results; } diff --git a/winPEAS/winPEASexe/winPEAS/Info/ApplicationInfo/InstalledApps.cs b/winPEAS/winPEASexe/winPEAS/Info/ApplicationInfo/InstalledApps.cs index d25926c..ff54d79 100644 --- a/winPEAS/winPEASexe/winPEAS/Info/ApplicationInfo/InstalledApps.cs +++ b/winPEAS/winPEASexe/winPEAS/Info/ApplicationInfo/InstalledApps.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.IO; using System.Linq; using winPEAS.Helpers; -using winPEAS.KnownFileCreds; namespace winPEAS.Info.ApplicationInfo { @@ -12,76 +11,53 @@ namespace winPEAS.Info.ApplicationInfo public static SortedDictionary> GetInstalledAppsPerms() { //Get from Program Files - SortedDictionary> results = GetInstalledAppsPermsPath(@Path.GetPathRoot(Environment.SystemDirectory) + "Program Files"); - SortedDictionary> results2 = GetInstalledAppsPermsPath(@Path.GetPathRoot(Environment.SystemDirectory) + "Program Files (x86)"); + SortedDictionary> results = GetInstalledAppsPermsPath(Path.GetPathRoot(Environment.SystemDirectory) + "Program Files"); + SortedDictionary> results2 = GetInstalledAppsPermsPath(Path.GetPathRoot(Environment.SystemDirectory) + "Program Files (x86)"); results.Concat(results2).ToDictionary(kvp => kvp.Key, kvp => kvp.Value); - //Get from Uninstall - string[] subkeys = RegistryHelper.GetRegSubkeys("HKLM", @"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall"); - if (subkeys != null) + string[] registryPaths = new string[] { - foreach (string app in subkeys) + @"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall", + @"SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall" + }; + + foreach (var registryPath in registryPaths) + { + string[] subkeys = RegistryHelper.GetRegSubkeys("HKLM", registryPath); + if (subkeys != null) { - string installLocation = RegistryHelper.GetRegValue("HKLM", String.Format(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{0}", app), "InstallLocation"); - if (string.IsNullOrEmpty(installLocation)) + foreach (string app in subkeys) { - continue; - } - - installLocation = installLocation.Replace("\"", ""); - - if (installLocation.EndsWith(@"\")) - installLocation = installLocation.Substring(0, installLocation.Length - 1); - - if (!results.ContainsKey(installLocation) && Directory.Exists(installLocation)) - { - bool already = false; - foreach (string path in results.Keys) + string installLocation = RegistryHelper.GetRegValue("HKLM", string.Format(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{0}", app), "InstallLocation"); + if (string.IsNullOrEmpty(installLocation)) { - if (installLocation.IndexOf(path) != -1) //Check for subfoldres of already found folders + continue; + } + + installLocation = installLocation.Replace("\"", ""); + + if (installLocation.EndsWith(@"\")) + { + installLocation = installLocation.Substring(0, installLocation.Length - 1); + } + + if (!results.ContainsKey(installLocation) && Directory.Exists(installLocation)) + { + bool already = false; + foreach (string path in results.Keys) { - already = true; - break; + if (installLocation.IndexOf(path) != -1) //Check for subfoldres of already found folders + { + already = true; + break; + } + } + + if (!already) + { + results[installLocation] = PermissionsHelper.GetRecursivePrivs(installLocation); } } - - if (!already) - { - results[installLocation] = PermissionsHelper.GetRecursivePrivs(installLocation); - } - } - } - } - - subkeys = RegistryHelper.GetRegSubkeys("HKLM", @"SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall"); - if (subkeys != null) - { - foreach (string app in subkeys) - { - string installLocation = RegistryHelper.GetRegValue("HKLM", String.Format(@"SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\{0}", app), "InstallLocation"); - if (string.IsNullOrEmpty(installLocation)) - { - continue; - } - - installLocation = installLocation.Replace("\"", ""); - - if (installLocation.EndsWith(@"\")) - installLocation = installLocation.Substring(0, installLocation.Length - 1); - - if (!results.ContainsKey(installLocation) && Directory.Exists(installLocation)) - { - bool already = false; - foreach (string path in results.Keys) - { - if (installLocation.IndexOf(path) != -1) //Check for subfoldres of already found folders - { - already = true; - break; - } - } - if (!already) - results[installLocation] = PermissionsHelper.GetRecursivePrivs(installLocation); } } } diff --git a/winPEAS/winPEASexe/winPEAS/Info/NetworkInfo/NetworkInfoHelper.cs b/winPEAS/winPEASexe/winPEAS/Info/NetworkInfo/NetworkInfoHelper.cs index 56730d6..950ab23 100644 --- a/winPEAS/winPEASexe/winPEAS/Info/NetworkInfo/NetworkInfoHelper.cs +++ b/winPEAS/winPEASexe/winPEAS/Info/NetworkInfo/NetworkInfoHelper.cs @@ -170,7 +170,7 @@ namespace winPEAS.Info.NetworkInfo } catch (Exception ex) { - Beaprint.GrayPrint(String.Format(" [X] Exception: {0}", ex.Message)); + Beaprint.PrintException(ex.Message); } results = adapters.Values.ToList(); return results; @@ -213,7 +213,7 @@ namespace winPEAS.Info.NetworkInfo } catch (Exception ex) { - Beaprint.GrayPrint(String.Format(" [X] Exception: {0}", ex.Message)); + Beaprint.PrintException(ex.Message); } return results; @@ -258,7 +258,7 @@ namespace winPEAS.Info.NetworkInfo } catch (Exception ex) { - Beaprint.GrayPrint(String.Format(" [X] Exception: {0}", ex.Message)); + Beaprint.PrintException(ex.Message); } return results; } @@ -291,7 +291,7 @@ namespace winPEAS.Info.NetworkInfo } catch (Exception ex) { - Beaprint.GrayPrint(String.Format(" [X] Exception: {0}", ex.Message)); + Beaprint.PrintException(ex.Message); } return results; } diff --git a/winPEAS/winPEASexe/winPEAS/Info/ProcessInfo/ProcessesInfo.cs b/winPEAS/winPEASexe/winPEAS/Info/ProcessInfo/ProcessesInfo.cs index ea9df6c..98897c1 100644 --- a/winPEAS/winPEASexe/winPEAS/Info/ProcessInfo/ProcessesInfo.cs +++ b/winPEAS/winPEASexe/winPEAS/Info/ProcessInfo/ProcessesInfo.cs @@ -95,7 +95,7 @@ namespace winPEAS.Info.ProcessInfo } catch (Exception ex) { - Beaprint.GrayPrint(String.Format(" [X] Exception: {0}", ex.Message)); + Beaprint.PrintException(ex.Message); } return f_results; } diff --git a/winPEAS/winPEASexe/winPEAS/Info/ServicesInfo/ServicesInfoHelper.cs b/winPEAS/winPEASexe/winPEAS/Info/ServicesInfo/ServicesInfoHelper.cs index 0c78147..a232a53 100644 --- a/winPEAS/winPEASexe/winPEAS/Info/ServicesInfo/ServicesInfoHelper.cs +++ b/winPEAS/winPEASexe/winPEAS/Info/ServicesInfo/ServicesInfoHelper.cs @@ -65,7 +65,7 @@ namespace winPEAS.Info.ServicesInfo } catch (Exception ex) { - Beaprint.GrayPrint(String.Format(" [X] Exception: {0}", ex.Message)); + Beaprint.PrintException(ex.Message); } return results; } @@ -147,7 +147,7 @@ namespace winPEAS.Info.ServicesInfo } catch (Exception ex) { - Beaprint.GrayPrint(String.Format(" [X] Exception: {0}", ex.Message)); + Beaprint.PrintException(ex.Message); } return results; } @@ -233,7 +233,7 @@ namespace winPEAS.Info.ServicesInfo } catch (Exception) { - //Beaprint.GrayPrint(String.Format(" [X] Exception: {0}", ex.Message)); + //Beaprint.PrintException(ex.Message) } } return results; @@ -264,7 +264,7 @@ namespace winPEAS.Info.ServicesInfo } catch (Exception ex) { - Beaprint.GrayPrint(String.Format(" [X] Exception: {0}", ex.Message)); + Beaprint.PrintException(ex.Message); } return results; } @@ -292,7 +292,7 @@ namespace winPEAS.Info.ServicesInfo } catch (Exception ex) { - Beaprint.GrayPrint(String.Format(" [X] Exception: {0}", ex.Message)); + Beaprint.PrintException(ex.Message); } return results; } diff --git a/winPEAS/winPEASexe/winPEAS/Info/SystemInfo/SystemInfo.cs b/winPEAS/winPEASexe/winPEAS/Info/SystemInfo/SystemInfo.cs index fab8093..507acd8 100644 --- a/winPEAS/winPEASexe/winPEAS/Info/SystemInfo/SystemInfo.cs +++ b/winPEAS/winPEASexe/winPEAS/Info/SystemInfo/SystemInfo.cs @@ -39,7 +39,7 @@ namespace winPEAS.Info.SystemInfo } catch (Exception ex) { - Beaprint.GrayPrint(String.Format(" [X] Exception: {0}", ex.Message)); + Beaprint.PrintException(ex.Message); } return false; } @@ -103,7 +103,7 @@ namespace winPEAS.Info.SystemInfo } catch (Exception ex) { - Beaprint.GrayPrint(String.Format(" [X] Exception: {0}", ex.Message)); + Beaprint.PrintException(ex.Message); } return results; } @@ -138,7 +138,7 @@ namespace winPEAS.Info.SystemInfo } catch (Exception ex) { - Beaprint.GrayPrint(String.Format(" [X] Exception: {0}", ex.Message)); + Beaprint.PrintException(ex.Message); } return results; } @@ -163,7 +163,7 @@ namespace winPEAS.Info.SystemInfo } catch (Exception ex) { - Beaprint.GrayPrint(String.Format(" [X] Exception: {0}", ex.Message)); + Beaprint.PrintException(ex.Message); } if (!String.IsNullOrEmpty(whitelistpaths)) results["whitelistpaths"] = " " + whitelistpaths; //Add this info the last @@ -454,7 +454,7 @@ namespace winPEAS.Info.SystemInfo } catch (Exception ex) { - Beaprint.GrayPrint(String.Format(" [X] Exception: {0}", ex.Message)); + Beaprint.PrintException(ex.Message); } return result; } diff --git a/winPEAS/winPEASexe/winPEAS/Info/UserInfo/UserInfoHelper.cs b/winPEAS/winPEASexe/winPEAS/Info/UserInfo/UserInfoHelper.cs index e18e4fb..f1ae5fe 100644 --- a/winPEAS/winPEASexe/winPEAS/Info/UserInfo/UserInfoHelper.cs +++ b/winPEAS/winPEASexe/winPEAS/Info/UserInfo/UserInfoHelper.cs @@ -48,7 +48,7 @@ namespace winPEAS.Info.UserInfo } catch { - Beaprint.GrayPrint(String.Format(" [X] Exception: {0}", ex.Message)); + Beaprint.PrintException(ex.Message); } } @@ -61,7 +61,7 @@ namespace winPEAS.Info.UserInfo } catch (Exception ex) { - Beaprint.GrayPrint(String.Format(" [X] Exception: {0}", ex.Message)); + Beaprint.PrintException(ex.Message); } } return groupName; @@ -78,7 +78,7 @@ namespace winPEAS.Info.UserInfo } catch (Exception ex) { - Beaprint.GrayPrint(String.Format(" [X] Exception: {0}", ex.Message)); + Beaprint.PrintException(ex.Message); } return groupName; } diff --git a/winPEAS/winPEASexe/winPEAS/KnownFileCreds/Kerberos/Kerberos.cs b/winPEAS/winPEASexe/winPEAS/KnownFileCreds/Kerberos/Kerberos.cs index 2cf4c62..798a803 100644 --- a/winPEAS/winPEASexe/winPEAS/KnownFileCreds/Kerberos/Kerberos.cs +++ b/winPEAS/winPEASexe/winPEAS/KnownFileCreds/Kerberos/Kerberos.cs @@ -171,7 +171,7 @@ namespace winPEAS.KnownFileCreds.Kerberos } catch (Exception ex) { - Beaprint.GrayPrint(String.Format(" [X] Exception: {0}", ex.Message)); + Beaprint.PrintException(ex.Message); } return results; } @@ -260,7 +260,7 @@ namespace winPEAS.KnownFileCreds.Kerberos } catch (Exception ex) { - Beaprint.GrayPrint(String.Format(" [X] Exception: {0}", ex.Message)); + Beaprint.PrintException(ex.Message); } return results; } @@ -449,7 +449,7 @@ namespace winPEAS.KnownFileCreds.Kerberos } catch (Exception ex) { - Beaprint.GrayPrint(String.Format(" [X] Exception: {0}", ex.Message)); + Beaprint.PrintException(ex.Message); } return results; } @@ -560,7 +560,7 @@ namespace winPEAS.KnownFileCreds.Kerberos } catch (Exception ex) { - Beaprint.GrayPrint(String.Format(" [X] Exception: {0}", ex.Message)); + Beaprint.PrintException(ex.Message); } return results; } diff --git a/winPEAS/winPEASexe/winPEAS/KnownFileCreds/KnownFileCredsInfo.cs b/winPEAS/winPEASexe/winPEAS/KnownFileCreds/KnownFileCredsInfo.cs index 4ce99d2..42eb13a 100644 --- a/winPEAS/winPEASexe/winPEAS/KnownFileCreds/KnownFileCredsInfo.cs +++ b/winPEAS/winPEASexe/winPEAS/KnownFileCreds/KnownFileCredsInfo.cs @@ -425,7 +425,7 @@ namespace winPEAS.KnownFileCreds } catch (Exception ex) { - Beaprint.GrayPrint(String.Format(" [X] Exception: {0}", ex.Message)); + Beaprint.PrintException(ex.Message); } return results; } @@ -585,7 +585,7 @@ namespace winPEAS.KnownFileCreds } catch (Exception ex) { - Beaprint.GrayPrint(String.Format(" [X] Exception: {0}", ex.Message)); + Beaprint.PrintException(ex.Message); } return results; } diff --git a/winPEAS/winPEASexe/winPEAS/KnownFileCreds/Vault/VaultCli.cs b/winPEAS/winPEASexe/winPEAS/KnownFileCreds/Vault/VaultCli.cs index 1f1a35d..85ec04a 100644 --- a/winPEAS/winPEASexe/winPEAS/KnownFileCreds/Vault/VaultCli.cs +++ b/winPEAS/winPEASexe/winPEAS/KnownFileCreds/Vault/VaultCli.cs @@ -193,7 +193,7 @@ namespace winPEAS.KnownFileCreds.Vault } catch (Exception ex) { - Beaprint.GrayPrint(String.Format(" [X] Exception: {0}", ex.Message)); + Beaprint.PrintException(ex.Message); } return results; }