Learning/mRemoteNG
1
0
Fork 0
mirror of https://github.com/mRemoteNG/mRemoteNG.git synced 2026-02-17 22:11:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

wrapped cred deserialization in try catch

Browse Source
This commit is contained in:
David Sparer
2017-01-20 12:27:05 -07:00
parent 172232be48
commit 4d951c9827
1 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
mRemoteV1/Config/Serializers/XmlCredentialDeserializer.cs
View File

@@ -15,18 +15,27 @@ namespace mRemoteNG.Config.Serializers
public IEnumerable<ICredentialRecord> Deserialize(string xml, SecureString decryptionKey)
{
var xdoc = XDocument.Parse(xml);
ValidateSchemaVersion(xdoc);
var cryptographyProvider = BuildCryptoProvider(xdoc.Root);
var credentials = from element in xdoc.Descendants("Credential")
select new CredentialRecord(Guid.Parse(element.Attribute("Id")?.Value))
{
Title = element.Attribute("Title")?.Value ?? "",
Username = element.Attribute("Username")?.Value ?? "",
Password = cryptographyProvider.Decrypt(element.Attribute("Password")?.Value, decryptionKey).ConvertToSecureString(),
Domain = element.Attribute("Domain")?.Value ?? ""
};
return credentials;
try
{
var xdoc = XDocument.Parse(xml);
ValidateSchemaVersion(xdoc);
var cryptographyProvider = BuildCryptoProvider(xdoc.Root);
var credentials = from element in xdoc.Descendants("Credential")
select new CredentialRecord(Guid.Parse(element.Attribute("Id")?.Value))
{
Title = element.Attribute("Title")?.Value ?? "",
Username = element.Attribute("Username")?.Value ?? "",
Password =
cryptographyProvider.Decrypt(element.Attribute("Password")?.Value, decryptionKey)
.ConvertToSecureString(),
Domain = element.Attribute("Domain")?.Value ?? ""
};
return credentials;
}
catch
{
return new ICredentialRecord[0];
}
}
private void ValidateSchemaVersion(XDocument xdoc)