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

fixed some issues with the CSV exporter

Browse Source
This commit is contained in:
David Sparer
2017-03-06 14:46:36 -07:00
parent 788f597a3f
commit 8b44815b70
5 changed files with 170 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
mRemoteNGTests/Config/Serializers/CsvConnectionsSerializerMremotengFormatTests.cs Normal file
View File

@@ -0,0 +1,87 @@
using System;
using mRemoteNG.Config.Serializers;
using mRemoteNG.Connection;
using mRemoteNG.Credential;
using mRemoteNG.Security;
using mRemoteNG.Tree;
using NSubstitute;
using NUnit.Framework;
namespace mRemoteNGTests.Config.Serializers
{
public class CsvConnectionsSerializerMremotengFormatTests
{
private const string ConnectionName = "myconnection";
private const string Username = "myuser";
private const string Domain = "mydomain";
private const string Password = "mypass123";
[TestCase(Username)]
[TestCase(Domain)]
[TestCase(Password)]
[TestCase("InheritColors")]
public void CreatesCsv(string valueThatShouldExist)
{
var serializer = new CsvConnectionsSerializerMremotengFormat(new SaveFilter());
var connectionInfo = BuildConnectionInfo();
var csv = serializer.Serialize(connectionInfo);
Assert.That(csv, Does.Match(valueThatShouldExist));
}
[TestCase(Username)]
[TestCase(Domain)]
[TestCase(Password)]
[TestCase("InheritColors")]
public void SerializerRespectsSaveFilterSettings(string valueThatShouldntExist)
{
var saveFilter = new SaveFilter(true);
var serializer = new CsvConnectionsSerializerMremotengFormat(saveFilter);
var connectionInfo = BuildConnectionInfo();
var csv = serializer.Serialize(connectionInfo);
Assert.That(csv, Does.Not.Match(valueThatShouldntExist));
}
[Test]
public void CanSerializeEmptyConnectionInfo()
{
var serializer = new CsvConnectionsSerializerMremotengFormat(new SaveFilter());
var connectionInfo = new ConnectionInfo();
var csv = serializer.Serialize(connectionInfo);
Assert.That(csv, Is.Not.Empty);
}
[Test]
public void CantPassNullToConstructor()
{
Assert.Throws<ArgumentNullException>(() => new CsvConnectionsSerializerMremotengFormat(null));
}
[Test]
public void CantPassNullToSerializeConnectionInfo()
{
var serializer = new CsvConnectionsSerializerMremotengFormat(new SaveFilter());
Assert.Throws<ArgumentNullException>(() => serializer.Serialize((ConnectionInfo)null));
}
[Test]
public void CantPassNullToSerializeConnectionTreeModel()
{
var serializer = new CsvConnectionsSerializerMremotengFormat(new SaveFilter());
Assert.Throws<ArgumentNullException>(() => serializer.Serialize((ConnectionTreeModel)null));
}
private ConnectionInfo BuildConnectionInfo()
{
var credRecord = Substitute.For<ICredentialRecord>();
credRecord.Username.Returns(Username);
credRecord.Domain.Returns(Domain);
credRecord.Password.Returns(Password.ConvertToSecureString());
return new ConnectionInfo
{
Name = ConnectionName,
CredentialRecord = credRecord,
Inheritance = {Colors = true}
};
}
}
}

1
mRemoteNGTests/mRemoteNGTests.csproj
View File

@@ -113,6 +113,7 @@
<Compile Include="Config\CredentialHarvesterTests.cs" />
<Compile Include="Config\Serializers\ConfConsEnsureConnectionsHaveIdsTests.cs" />
<Compile Include="Config\Serializers\CredentialProviderSerializerTests.cs" />
<Compile Include="Config\Serializers\CsvConnectionsSerializerMremotengFormatTests.cs" />
<Compile Include="Config\Serializers\DataTableSerializerTests.cs" />
<Compile Include="Config\Serializers\PortScanDeserializerTests.cs" />
<Compile Include="Config\Serializers\PuttyConnectionManagerDeserializerTests.cs" />

5
mRemoteV1/App/Export.cs
View File

@@ -84,10 +84,7 @@ namespace mRemoteNG.App
serializer = new XmlConnectionsSerializer(cryptographyProvider, connectionNodeSerializer);
break;
case ConnectionsSaver.Format.mRCSV:
serializer = new CsvConnectionsSerializerMremotengFormat
{
SaveFilter = saveFilter
};
serializer = new CsvConnectionsSerializerMremotengFormat(saveFilter);
break;
default:
throw new ArgumentOutOfRangeException(nameof(saveFormat), saveFormat, null);

2
mRemoteV1/Config/Connections/ConnectionsSaver.cs
View File

@@ -264,7 +264,7 @@ namespace mRemoteNG.Config.Connections
private void SaveToMremotengFormattedCsv()
{
var csvConnectionsSerializer = new CsvConnectionsSerializerMremotengFormat { SaveFilter = SaveFilter };
var csvConnectionsSerializer = new CsvConnectionsSerializerMremotengFormat(SaveFilter);
var dataProvider = new FileDataProvider(ConnectionFileName);
var csvContent = csvConnectionsSerializer.Serialize(ConnectionTreeModel);
dataProvider.Save(csvContent);

94
mRemoteV1/Config/Serializers/CsvConnectionsSerializerMremotengFormat.cs
View File

@@ -12,17 +12,30 @@ namespace mRemoteNG.Config.Serializers
{
private string _csv = "";
private ConnectionInfo _serializationTarget;
private readonly SaveFilter _saveFilter;
public SaveFilter SaveFilter { get; set; }
public CsvConnectionsSerializerMremotengFormat(SaveFilter saveFilter)
{
if (saveFilter == null)
throw new ArgumentNullException(nameof(saveFilter));
_saveFilter = saveFilter;
}
public string Serialize(ConnectionTreeModel connectionTreeModel)
{
if (connectionTreeModel == null)
throw new ArgumentNullException(nameof(connectionTreeModel));
var rootNode = connectionTreeModel.RootNodes.First(node => node is RootNodeInfo);
return Serialize(rootNode);
}
public string Serialize(ConnectionInfo serializationTarget)
{
if (serializationTarget == null)
throw new ArgumentNullException(nameof(serializationTarget));
_csv = "";
_serializationTarget = serializationTarget;
WriteCsvHeader();
@@ -34,14 +47,14 @@ namespace mRemoteNG.Config.Serializers
{
var csvHeader = string.Empty;
csvHeader += "Name;Folder;Description;Icon;Panel;";
if (SaveFilter.SaveUsername)
if (_saveFilter.SaveUsername)
csvHeader += "Username;";
if (SaveFilter.SavePassword)
if (_saveFilter.SavePassword)
csvHeader += "Password;";
if (SaveFilter.SaveDomain)
if (_saveFilter.SaveDomain)
csvHeader += "Domain;";
csvHeader += "Hostname;Protocol;PuttySession;Port;ConnectToConsole;UseCredSsp;RenderingEngine;ICAEncryptionStrength;RDPAuthenticationLevel;LoadBalanceInfo;Colors;Resolution;AutomaticResize;DisplayWallpaper;DisplayThemes;EnableFontSmoothing;EnableDesktopComposition;CacheBitmaps;RedirectDiskDrives;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;RedirectKeys;PreExtApp;PostExtApp;MacAddress;UserField;ExtApp;VNCCompression;VNCEncoding;VNCAuthMode;VNCProxyType;VNCProxyIP;VNCProxyPort;VNCProxyUsername;VNCProxyPassword;VNCColors;VNCSmartSizeMode;VNCViewOnly;RDGatewayUsageMethod;RDGatewayHostname;RDGatewayUseConnectionCredentials;RDGatewayUsername;RDGatewayPassword;RDGatewayDomain;";
if (SaveFilter.SaveInheritance)
if (_saveFilter.SaveInheritance)
csvHeader += "InheritCacheBitmaps;InheritColors;InheritDescription;InheritDisplayThemes;InheritDisplayWallpaper;InheritEnableFontSmoothing;InheritEnableDesktopComposition;InheritDomain;InheritIcon;InheritPanel;InheritPassword;InheritPort;InheritProtocol;InheritPuttySession;InheritRedirectDiskDrives;InheritRedirectKeys;InheritRedirectPorts;InheritRedirectPrinters;InheritRedirectSmartCards;InheritRedirectSound;InheritResolution;InheritAutomaticResize;InheritUseConsoleSession;InheritUseCredSsp;InheritRenderingEngine;InheritUsername;InheritICAEncryptionStrength;InheritRDPAuthenticationLevel;InheritLoadBalanceInfo;InheritPreExtApp;InheritPostExtApp;InheritMacAddress;InheritUserField;InheritExtApp;InheritVNCCompression;InheritVNCEncoding;InheritVNCAuthMode;InheritVNCProxyType;InheritVNCProxyIP;InheritVNCProxyPort;InheritVNCProxyUsername;InheritVNCProxyPassword;InheritVNCColors;InheritVNCSmartSizeMode;InheritVNCViewOnly;InheritRDGatewayUsageMethod;InheritRDGatewayHostname;InheritRDGatewayUseConnectionCredentials;InheritRDGatewayUsername;InheritRDGatewayPassword;InheritRDGatewayDomain";
_csv += csvHeader;
}
@@ -70,18 +83,64 @@ namespace mRemoteNG.Config.Serializers
csvLine += con.Name + ";" + GetNodePath(con) + ";" + con.Description + ";" + con.Icon + ";" + con.Panel + ";";
if (SaveFilter.SaveUsername)
csvLine += con.Username + ";";
if (_saveFilter.SaveUsername)
csvLine += con.CredentialRecord?.Username + ";";
if (SaveFilter.SavePassword)
csvLine += con.Password + ";";
if (_saveFilter.SavePassword)
csvLine += con.CredentialRecord?.Password.ConvertToUnsecureString() + ";";
if (SaveFilter.SaveDomain)
csvLine += con.Domain + ";";
if (_saveFilter.SaveDomain)
csvLine += con.CredentialRecord?.Domain + ";";
csvLine += con.Hostname + ";" + con.Protocol + ";" + con.PuttySession + ";" + Convert.ToString(con.Port) + ";" + Convert.ToString(con.UseConsoleSession) + ";" + Convert.ToString(con.UseCredSsp) + ";" + con.RenderingEngine + ";" + con.ICAEncryptionStrength + ";" + con.RDPAuthenticationLevel + ";" + con.LoadBalanceInfo + ";" + con.Colors + ";" + con.Resolution + ";" + Convert.ToString(con.AutomaticResize) + ";" + Convert.ToString(con.DisplayWallpaper) + ";" + Convert.ToString(con.DisplayThemes) + ";" + Convert.ToString(con.EnableFontSmoothing) + ";" + Convert.ToString(con.EnableDesktopComposition) + ";" + Convert.ToString(con.CacheBitmaps) + ";" + Convert.ToString(con.RedirectDiskDrives) + ";" + Convert.ToString(con.RedirectPorts) + ";" + Convert.ToString(con.RedirectPrinters) + ";" + Convert.ToString(con.RedirectSmartCards) + ";" + con.RedirectSound + ";" + Convert.ToString(con.RedirectKeys) + ";" + con.PreExtApp + ";" + con.PostExtApp + ";" + con.MacAddress + ";" + con.UserField + ";" + con.ExtApp + ";" + con.VNCCompression + ";" + con.VNCEncoding + ";" + con.VNCAuthMode + ";" + con.VNCProxyType + ";" + con.VNCProxyIP + ";" + Convert.ToString(con.VNCProxyPort) + ";" + con.VNCProxyUsername + ";" + con.VNCProxyPassword + ";" + con.VNCColors + ";" + con.VNCSmartSizeMode + ";" + Convert.ToString(con.VNCViewOnly) + ";";
csvLine += con.Hostname + ";" +
con.Protocol + ";" +
con.PuttySession + ";" +
Convert.ToString(con.Port) + ";" +
Convert.ToString(con.UseConsoleSession) + ";" +
Convert.ToString(con.UseCredSsp) + ";" +
con.RenderingEngine + ";" +
con.ICAEncryptionStrength + ";" +
con.RDPAuthenticationLevel + ";" +
con.LoadBalanceInfo + ";" +
con.Colors + ";" +
con.Resolution + ";" +
Convert.ToString(con.AutomaticResize) + ";" +
Convert.ToString(con.DisplayWallpaper) + ";" +
Convert.ToString(con.DisplayThemes) + ";" +
Convert.ToString(con.EnableFontSmoothing) + ";" +
Convert.ToString(con.EnableDesktopComposition) + ";" +
Convert.ToString(con.CacheBitmaps) + ";" +
Convert.ToString(con.RedirectDiskDrives) + ";" +
Convert.ToString(con.RedirectPorts) + ";" +
Convert.ToString(con.RedirectPrinters) + ";" +
Convert.ToString(con.RedirectSmartCards) + ";" +
con.RedirectSound + ";" +
Convert.ToString(con.RedirectKeys) + ";" +
con.PreExtApp + ";" +
con.PostExtApp + ";" +
con.MacAddress + ";" +
con.UserField + ";" +
con.ExtApp + ";" +
con.VNCCompression + ";" +
con.VNCEncoding + ";" +
con.VNCAuthMode + ";" +
con.VNCProxyType + ";" +
con.VNCProxyIP + ";" +
Convert.ToString(con.VNCProxyPort) + ";" +
con.VNCProxyUsername + ";" +
con.VNCProxyPassword + ";" +
con.VNCColors + ";" +
con.VNCSmartSizeMode + ";" +
Convert.ToString(con.VNCViewOnly) + ";" +
con.RDGatewayUsageMethod + ";" +
con.RDGatewayHostname + ";" +
con.RDGatewayUseConnectionCredentials + ";" +
con.RDGatewayUsername + ";" +
con.RDGatewayPassword + ";" +
con.RDGatewayDomain + ";";
if (SaveFilter.SaveInheritance)
if (_saveFilter.SaveInheritance)
{
csvLine += con.Inheritance.CacheBitmaps + ";" +
con.Inheritance.Colors + ";" +
@@ -127,7 +186,13 @@ namespace mRemoteNG.Config.Serializers
con.Inheritance.VNCProxyPassword + ";" +
con.Inheritance.VNCColors + ";" +
con.Inheritance.VNCSmartSizeMode + ";" +
con.Inheritance.VNCViewOnly;
con.Inheritance.VNCViewOnly +
con.Inheritance.RDGatewayUsageMethod + ";" +
con.Inheritance.RDGatewayHostname + ";" +
con.Inheritance.RDGatewayUseConnectionCredentials + ";" +
con.Inheritance.RDGatewayUsername + ";" +
con.Inheritance.RDGatewayPassword + ";" +
con.Inheritance.RDGatewayDomain + ";";
}
_csv += csvLine;
@@ -137,6 +202,7 @@ namespace mRemoteNG.Config.Serializers
{
var nodePath = "";
var container = connectionInfo.Parent;
if (container == null) return nodePath;
while (container != _serializationTarget)
{
container = container.Parent;