Revert RootNode Properties

This commit is contained in:
massimo.antonello
2025-10-17 16:18:57 +02:00
parent b0f50b825f
commit 7478537f3e
30 changed files with 19 additions and 213 deletions

View File

@@ -120,7 +120,6 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Xml
private void InitializeRootNode(XmlElement connectionsRootElement)
{
_rootNodeInfo.Name = connectionsRootElement?.Attributes["Name"]?.Value.Trim();
_rootNodeInfo.VaultOpenbaoUrl = connectionsRootElement?.Attributes["VaultOpenbaoUrl"]?.Value.Trim();
}
private void CreateDecryptor(RootNodeInfo rootNodeInfo, XmlElement connectionsRootElement = null)

View File

@@ -15,7 +15,6 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Xml
XElement element = new(xmlNamespace + "Connections");
element.Add(new XAttribute(XNamespace.Xmlns + "mrng", xmlNamespace));
element.Add(new XAttribute(XName.Get("Name"), rootNodeInfo.Name));
element.Add(new XAttribute(XName.Get("VaultOpenbaoUrl"), rootNodeInfo.VaultOpenbaoUrl));
element.Add(new XAttribute(XName.Get("Export"), "false"));
element.Add(new XAttribute(XName.Get("EncryptionEngine"), cryptographyProvider.CipherEngine));
element.Add(new XAttribute(XName.Get("BlockCipherMode"), cryptographyProvider.CipherMode));

View File

@@ -1609,6 +1609,15 @@ namespace mRemoteNG.Resources.Language {
}
}
/// <summary>
/// Looks up a localized string similar to Discard.
/// </summary>
internal static string Discard {
get {
return ResourceManager.GetString("Discard", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Disconnect.
/// </summary>
@@ -5775,24 +5784,6 @@ namespace mRemoteNG.Resources.Language {
}
}
/// <summary>
/// Looks up a localized string similar to Do you want to save the changes made to the options?.
/// </summary>
internal static string SaveOptionsBeforeClosing {
get {
return ResourceManager.GetString("SaveOptionsBeforeClosing", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Discard.
/// </summary>
internal static string Discard {
get {
return ResourceManager.GetString("Discard", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to SaveConnectionsOnExit.
/// </summary>
@@ -5820,6 +5811,15 @@ namespace mRemoteNG.Resources.Language {
}
}
/// <summary>
/// Looks up a localized string similar to Do you want to save the changes made to the options?.
/// </summary>
internal static string SaveOptionsBeforeClosing {
get {
return ResourceManager.GetString("SaveOptionsBeforeClosing", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Screen.
/// </summary>
@@ -6973,24 +6973,6 @@ namespace mRemoteNG.Resources.Language {
}
}
/// <summary>
/// Looks up a localized string similar to Vault/Openbao Url.
/// </summary>
internal static string VaultOpenbaoUrl {
get {
return ResourceManager.GetString("VaultOpenbaoUrl", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to The URL of the Vault/Openbao server to retrieve credentials.
/// </summary>
internal static string VaultOpenbaoUrlPropertyDescription {
get {
return ResourceManager.GetString("VaultOpenbaoUrlPropertyDescription", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Verify:.
/// </summary>

View File

@@ -1900,12 +1900,6 @@ mRemoteNG se nyní ukončí a zahájí instalaci.</value>
<data name="VaultOpenbaoTokenPropertyDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoUrl" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoUrlPropertyDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoSecretEngine" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>

View File

@@ -2069,12 +2069,6 @@ Nightly umfasst Alphas, Betas und Release Candidates.</value>
<data name="VaultOpenbaoTokenPropertyDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoUrl" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoUrlPropertyDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoSecretEngine" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>

View File

@@ -292,12 +292,6 @@
<data name="VaultOpenbaoTokenPropertyDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoUrl" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoUrlPropertyDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoSecretEngine" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>

View File

@@ -331,12 +331,6 @@
<data name="VaultOpenbaoTokenPropertyDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoUrl" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoUrlPropertyDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoSecretEngine" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>

View File

@@ -1560,12 +1560,6 @@ mRemoteNG ahora se cerrará y comenzará la instalación.</value>
<data name="VaultOpenbaoTokenPropertyDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoUrl" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoUrlPropertyDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoSecretEngine" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>

View File

@@ -157,12 +157,6 @@
<data name="VaultOpenbaoTokenPropertyDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoUrl" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoUrlPropertyDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoSecretEngine" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>

View File

@@ -2172,12 +2172,6 @@ Le canal nightly inclut les versions alpha, beta et release candidates.</value>
<data name="VaultOpenbaoTokenPropertyDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoUrl" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoUrlPropertyDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoSecretEngine" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>

View File

@@ -352,12 +352,6 @@
<data name="VaultOpenbaoTokenPropertyDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoUrl" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoUrlPropertyDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoSecretEngine" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>

View File

@@ -1578,12 +1578,6 @@ mRemoteNG verrà chiuso e l'installazione avrà inizio.</value>
<data name="VaultOpenbaoTokenPropertyDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoUrl" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoUrlPropertyDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoSecretEngine" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>

View File

@@ -1735,12 +1735,6 @@ mRemoteNGを終了してインストールを開始します</value>
<data name="VaultOpenbaoTokenPropertyDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoUrl" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoUrlPropertyDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoSecretEngine" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>

View File

@@ -1825,12 +1825,6 @@ mRemoteNG는 이제 종료되고 설치로 시작됩니다.</value>
<data name="VaultOpenbaoTokenPropertyDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoUrl" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoUrlPropertyDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoSecretEngine" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>

View File

@@ -247,12 +247,6 @@ Nightly Channel includes Alphas, Betas &amp; Release Candidates.</value>
<data name="VaultOpenbaoTokenPropertyDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoUrl" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoUrlPropertyDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoSecretEngine" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>

View File

@@ -2024,12 +2024,6 @@ Nightly-kanalen inkluderer alpha-, beta- og release candidate-versjoner.</value>
<data name="VaultOpenbaoTokenPropertyDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoUrl" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoUrlPropertyDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoSecretEngine" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>

View File

@@ -1607,12 +1607,6 @@ mRemoteNG zal nu worden gesloten en beginnen met de installatie.</value>
<data name="VaultOpenbaoTokenPropertyDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoUrl" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoUrlPropertyDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoSecretEngine" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>

View File

@@ -2378,12 +2378,6 @@ Kanał nocny obejmuje wersje alfa, beta i RC (gotowe do wydania).</value>
<data name="VaultOpenbaoTokenPropertyDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoUrl" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoUrlPropertyDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoSecretEngine" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>

View File

@@ -388,12 +388,6 @@
<data name="VaultOpenbaoTokenPropertyDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoUrl" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoUrlPropertyDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoSecretEngine" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>

View File

@@ -1573,12 +1573,6 @@
<data name="VaultOpenbaoTokenPropertyDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoUrl" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoUrlPropertyDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoSecretEngine" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>

View File

@@ -2494,12 +2494,6 @@ Nightly Channel includes Alphas, Betas &amp; Release Candidates.</value>
<data name="VaultOpenbaoTokenPropertyDescription" xml:space="preserve">
<value>Token to access Vault/Openbao server</value>
</data>
<data name="VaultOpenbaoUrl" xml:space="preserve">
<value>Vault/Openbao Url</value>
</data>
<data name="VaultOpenbaoUrlPropertyDescription" xml:space="preserve">
<value>The URL of the Vault/Openbao server to retrieve credentials</value>
</data>
<data name="VaultOpenbaoSecretEngine" xml:space="preserve">
<value>Vault/Openbao Secret Engine</value>
</data>

View File

@@ -2017,12 +2017,6 @@ mRemoteNG сейчас прекратит работу и начнет проц
<data name="VaultOpenbaoTokenPropertyDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoUrl" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoUrlPropertyDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoSecretEngine" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>

View File

@@ -2191,12 +2191,6 @@ Nattliga kanalen inkluderar Alfa, Betor &amp; Utgåvokandidater.</value>
<data name="VaultOpenbaoTokenPropertyDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoUrl" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoUrlPropertyDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoSecretEngine" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>

View File

@@ -2435,12 +2435,6 @@
<data name="VaultOpenbaoTokenPropertyDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoUrl" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoUrlPropertyDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoSecretEngine" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>

View File

@@ -1647,12 +1647,6 @@ MRemoteNG şimdi kapanacak ve kurulum başlayacak.</value>
<data name="VaultOpenbaoTokenPropertyDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoUrl" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoUrlPropertyDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoSecretEngine" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>

View File

@@ -2021,12 +2021,6 @@ mRemoteNG зараз припинить роботу і почне процес
<data name="VaultOpenbaoTokenPropertyDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoUrl" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoUrlPropertyDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoSecretEngine" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>

View File

@@ -2099,12 +2099,6 @@ mRemoteNG 将退出并安装更新。</value>
<data name="VaultOpenbaoTokenPropertyDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoUrl" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoUrlPropertyDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoSecretEngine" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>

View File

@@ -1594,12 +1594,6 @@ mRemoteNG 將立即結束並開始安裝。</value>
<data name="VaultOpenbaoTokenPropertyDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoUrl" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoUrlPropertyDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>
<data name="VaultOpenbaoSecretEngine" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
</data>

View File

@@ -14,8 +14,6 @@ namespace mRemoteNG.Tree.Root
{
private string _name = Language.Connections;
private string _customPassword = "";
private string _vaultOpenbaoToken = "";
private string _vaultOpenbaoUrl = "";
public RootNodeInfo(RootNodeType rootType)
: this(rootType, Guid.NewGuid().ToString())
@@ -63,26 +61,6 @@ namespace mRemoteNG.Tree.Root
? TreeNodeType.Root
: TreeNodeType.PuttyRoot;
}
[LocalizedAttributes.LocalizedCategory(nameof(Language.Miscellaneous)),
Browsable(true),
LocalizedAttributes.LocalizedDefaultValue(nameof(Language.Connections)),
LocalizedAttributes.LocalizedDisplayName(nameof(Language.VaultOpenbaoUrl)),
LocalizedAttributes.LocalizedDescription(nameof(Language.VaultOpenbaoUrlPropertyDescription))]
public string VaultOpenbaoUrl {
get => _vaultOpenbaoUrl;
set => _vaultOpenbaoUrl = value;
}
[LocalizedAttributes.LocalizedCategory(nameof(Language.Miscellaneous)),
Browsable(true),
LocalizedAttributes.LocalizedDefaultValue(nameof(Language.Connections)),
LocalizedAttributes.LocalizedDisplayName(nameof(Language.VaultOpenbaoToken)),
LocalizedAttributes.LocalizedDescription(nameof(Language.VaultOpenbaoTokenPropertyDescription))]
public string VaultOpenbaoToken {
get => _vaultOpenbaoToken;
set => _vaultOpenbaoToken = value;
}
#endregion
}
}

View File

@@ -119,9 +119,7 @@ namespace mRemoteNG.UI.Controls.ConnectionInfoPropertyGrid {
BrowsableProperties = new[]
{
nameof(RootNodeInfo.Name),
nameof(RootNodeInfo.Password),
nameof(RootNodeInfo.VaultOpenbaoUrl),
nameof(RootNodeInfo.VaultOpenbaoToken)
nameof(RootNodeInfo.Password)
};
}