- removed throwing exceptions in Chrome, Opera

This commit is contained in:
makikvues 2021-02-02 17:19:31 +01:00
parent 86bf58f45c
commit 80288c568a
3 changed files with 78 additions and 73 deletions

View File

@ -313,10 +313,7 @@ namespace winPEAS.KnownFileCreds.Browsers.Chrome
database.CloseDatabase(); database.CloseDatabase();
} }
} }
else
{
throw new FileNotFoundException("Cannot find chrome logins file");
}
return result; return result;
} }
} }

View File

@ -6,8 +6,8 @@ using System.Text.RegularExpressions;
using winPEAS.Checks; using winPEAS.Checks;
using winPEAS.Helpers; using winPEAS.Helpers;
using winPEAS.KnownFileCreds.Browsers.Models; using winPEAS.KnownFileCreds.Browsers.Models;
using winPEAS._3rdParty.MicroJson;
using winPEAS._3rdParty.SQLite; using winPEAS._3rdParty.SQLite;
using System.Web.Script.Serialization;
namespace winPEAS.KnownFileCreds.Browsers.Firefox namespace winPEAS.KnownFileCreds.Browsers.Firefox
{ {
@ -230,15 +230,21 @@ namespace winPEAS.KnownFileCreds.Browsers.Firefox
public override IEnumerable<CredentialModel> GetSavedCredentials() public override IEnumerable<CredentialModel> GetSavedCredentials()
{ {
var logins = new List<CredentialModel>();
string signonsFile = null; string signonsFile = null;
string loginsFile = null; string loginsFile = null;
bool signonsFound = false; bool signonsFound = false;
bool loginsFound = false; bool loginsFound = false;
try
{
string[] dirs = Directory.GetDirectories(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Mozilla\\Firefox\\Profiles")); string[] dirs = Directory.GetDirectories(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Mozilla\\Firefox\\Profiles"));
var logins = new List<CredentialModel>();
if (dirs.Length == 0) if (dirs.Length == 0)
{
return logins; return logins;
}
foreach (string dir in dirs) foreach (string dir in dirs)
{ {
@ -301,7 +307,7 @@ namespace winPEAS.KnownFileCreds.Browsers.Firefox
{ {
string json = sr.ReadToEnd(); string json = sr.ReadToEnd();
ffLoginData = new JsonSerializer().Deserialize<Browsers.Firefox.FFLogins>(json); ffLoginData = new JavaScriptSerializer().Deserialize<FFLogins>(json);
} }
foreach (Browsers.Firefox.LoginData loginData in ffLoginData.logins) foreach (Browsers.Firefox.LoginData loginData in ffLoginData.logins)
@ -316,6 +322,11 @@ namespace winPEAS.KnownFileCreds.Browsers.Firefox
}); });
} }
} }
}
catch (Exception e)
{
}
return logins; return logins;
} }
} }

View File

@ -57,10 +57,7 @@ namespace winPEAS.KnownFileCreds.Browsers.Opera
database.CloseDatabase(); database.CloseDatabase();
} }
} }
else
{
throw new FileNotFoundException("Cannot find Opera logins file");
}
return result; return result;
} }
} }