mirror of
https://github.com/mRemoteNG/mRemoteNG.git
synced 2026-02-17 14:07:46 +08:00
More RD Gateway support additions.
This commit is contained in:
3
.gitignore
vendored
3
.gitignore
vendored
@@ -6,4 +6,5 @@ mRemoteV1/publish
|
|||||||
*.suo
|
*.suo
|
||||||
*.vbproj.user
|
*.vbproj.user
|
||||||
Thumbs.db
|
Thumbs.db
|
||||||
_ReSharper.mRemoteV1/*
|
_ReSharper.*
|
||||||
|
*.resharper.user
|
||||||
|
|||||||
@@ -1433,7 +1433,11 @@ Namespace App
|
|||||||
Dim ReasonCode As String = Reason(0)
|
Dim ReasonCode As String = Reason(0)
|
||||||
Dim ReasonDescription As String = Reason(1)
|
Dim ReasonDescription As String = Reason(1)
|
||||||
If ReasonCode > 3 Then
|
If ReasonCode > 3 Then
|
||||||
mC.AddMessage(Messages.MessageClass.WarningMsg, "RDP Disconnected!" & vbNewLine & ReasonDescription & vbNewLine & "Error code " & ReasonCode & ".")
|
If ReasonDescription <> "" Then
|
||||||
|
mC.AddMessage(Messages.MessageClass.WarningMsg, "RDP Disconnected!" & vbNewLine & ReasonDescription & vbNewLine & "Error code " & ReasonCode & ".")
|
||||||
|
Else
|
||||||
|
mC.AddMessage(Messages.MessageClass.WarningMsg, "RDP Disconnected!" & vbNewLine & "Error code " & ReasonCode & ".")
|
||||||
|
End If
|
||||||
End If
|
End If
|
||||||
End If
|
End If
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
|
|||||||
@@ -9,6 +9,7 @@
|
|||||||
Added F11 shortcut key to View->Full Screen
|
Added F11 shortcut key to View->Full Screen
|
||||||
Improved RDP error reporting
|
Improved RDP error reporting
|
||||||
Added support for Credential Security Support Provider (CredSSP) which is required for Network Level Authentication (NLA)
|
Added support for Credential Security Support Provider (CredSSP) which is required for Network Level Authentication (NLA)
|
||||||
|
Added support for connecting through Remote Desktop Gateway servers
|
||||||
|
|
||||||
1.62:
|
1.62:
|
||||||
Switched to VncSharp, an open source VNC component
|
Switched to VncSharp, an open source VNC component
|
||||||
|
|||||||
@@ -977,8 +977,9 @@ Namespace Config
|
|||||||
If Me.confVersion > 2.1 Then '2.2
|
If Me.confVersion > 2.1 Then '2.2
|
||||||
conI.RDGatewayUsageMethod = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.RDP.RDGatewayUsageMethod), .Attributes("RDGatewayUsageMethod").Value)
|
conI.RDGatewayUsageMethod = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.RDP.RDGatewayUsageMethod), .Attributes("RDGatewayUsageMethod").Value)
|
||||||
conI.RDGatewayHostname = .Attributes("RDGatewayHostname").Value
|
conI.RDGatewayHostname = .Attributes("RDGatewayHostname").Value
|
||||||
|
conI.RDGatewayUseConnectionCredentials = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.RDP.RDGatewayUseConnectionCredentials), .Attributes("RDGatewayUseConnectionCredentials").Value)
|
||||||
conI.RDGatewayUsername = .Attributes("RDGatewayUsername").Value
|
conI.RDGatewayUsername = .Attributes("RDGatewayUsername").Value
|
||||||
conI.RDGatewayPassword = .Attributes("RDGatewayPassword").Value
|
conI.RDGatewayPassword = Security.Crypt.Decrypt(.Attributes("RDGatewayPassword").Value, pW)
|
||||||
conI.RDGatewayDomain = .Attributes("RDGatewayDomain").Value
|
conI.RDGatewayDomain = .Attributes("RDGatewayDomain").Value
|
||||||
conI.Inherit.RDGatewayUsageMethod = .Attributes("InheritRDGatewayUsageMethod").Value
|
conI.Inherit.RDGatewayUsageMethod = .Attributes("InheritRDGatewayUsageMethod").Value
|
||||||
conI.Inherit.RDGatewayHostname = .Attributes("InheritRDGatewayHostname").Value
|
conI.Inherit.RDGatewayHostname = .Attributes("InheritRDGatewayHostname").Value
|
||||||
|
|||||||
@@ -640,9 +640,26 @@ Namespace Config
|
|||||||
|
|
||||||
xW.WriteAttributeString("RDGatewayUsageMethod", "", curConI.RDGatewayUsageMethod.ToString)
|
xW.WriteAttributeString("RDGatewayUsageMethod", "", curConI.RDGatewayUsageMethod.ToString)
|
||||||
xW.WriteAttributeString("RDGatewayHostname", "", curConI.RDGatewayHostname)
|
xW.WriteAttributeString("RDGatewayHostname", "", curConI.RDGatewayHostname)
|
||||||
xW.WriteAttributeString("RDGatewayUsername", "", curConI.RDGatewayUsername)
|
|
||||||
xW.WriteAttributeString("RDGatewayPassword", "", curConI.RDGatewayPassword)
|
xW.WriteAttributeString("RDGatewayUseConnectionCredentials", "", curConI.RDGatewayUseConnectionCredentials.ToString)
|
||||||
xW.WriteAttributeString("RDGatewayDomain", "", curConI.RDGatewayDomain)
|
|
||||||
|
If Me._SaveSecurity.Username = True Then
|
||||||
|
xW.WriteAttributeString("RDGatewayUsername", "", curConI.RDGatewayUsername)
|
||||||
|
Else
|
||||||
|
xW.WriteAttributeString("RDGatewayUsername", "", "")
|
||||||
|
End If
|
||||||
|
|
||||||
|
If Me._SaveSecurity.Password = True Then
|
||||||
|
xW.WriteAttributeString("RDGatewayPassword", "", curConI.RDGatewayPassword)
|
||||||
|
Else
|
||||||
|
xW.WriteAttributeString("RDGatewayPassword", "", "")
|
||||||
|
End If
|
||||||
|
|
||||||
|
If Me._SaveSecurity.Domain = True Then
|
||||||
|
xW.WriteAttributeString("RDGatewayDomain", "", curConI.RDGatewayDomain)
|
||||||
|
Else
|
||||||
|
xW.WriteAttributeString("RDGatewayDomain", "", "")
|
||||||
|
End If
|
||||||
|
|
||||||
If Me._SaveSecurity.Inheritance = True Then
|
If Me._SaveSecurity.Inheritance = True Then
|
||||||
xW.WriteAttributeString("InheritCacheBitmaps", "", curConI.Inherit.CacheBitmaps)
|
xW.WriteAttributeString("InheritCacheBitmaps", "", curConI.Inherit.CacheBitmaps)
|
||||||
@@ -687,6 +704,7 @@ Namespace Config
|
|||||||
xW.WriteAttributeString("InheritVNCViewOnly", "", curConI.Inherit.VNCViewOnly)
|
xW.WriteAttributeString("InheritVNCViewOnly", "", curConI.Inherit.VNCViewOnly)
|
||||||
xW.WriteAttributeString("InheritRDGatewayUsageMethod", "", curConI.Inherit.RDGatewayUsageMethod)
|
xW.WriteAttributeString("InheritRDGatewayUsageMethod", "", curConI.Inherit.RDGatewayUsageMethod)
|
||||||
xW.WriteAttributeString("InheritRDGatewayHostname", "", curConI.Inherit.RDGatewayHostname)
|
xW.WriteAttributeString("InheritRDGatewayHostname", "", curConI.Inherit.RDGatewayHostname)
|
||||||
|
xW.WriteAttributeString("InheritRDGatewayUseConnectionCredentials", "", curConI.Inherit.RDGatewayUsername)
|
||||||
xW.WriteAttributeString("InheritRDGatewayUsername", "", curConI.Inherit.RDGatewayUsername)
|
xW.WriteAttributeString("InheritRDGatewayUsername", "", curConI.Inherit.RDGatewayUsername)
|
||||||
xW.WriteAttributeString("InheritRDGatewayPassword", "", curConI.Inherit.RDGatewayPassword)
|
xW.WriteAttributeString("InheritRDGatewayPassword", "", curConI.Inherit.RDGatewayPassword)
|
||||||
xW.WriteAttributeString("InheritRDGatewayDomain", "", curConI.Inherit.RDGatewayDomain)
|
xW.WriteAttributeString("InheritRDGatewayDomain", "", curConI.Inherit.RDGatewayDomain)
|
||||||
@@ -732,6 +750,7 @@ Namespace Config
|
|||||||
xW.WriteAttributeString("InheritVNCSmartSizeMode", "", False)
|
xW.WriteAttributeString("InheritVNCSmartSizeMode", "", False)
|
||||||
xW.WriteAttributeString("InheritVNCViewOnly", "", False)
|
xW.WriteAttributeString("InheritVNCViewOnly", "", False)
|
||||||
xW.WriteAttributeString("InheritRDGatewayHostname", "", False)
|
xW.WriteAttributeString("InheritRDGatewayHostname", "", False)
|
||||||
|
xW.WriteAttributeString("InheritRDGatewayUseConnectionCredentials", "", False)
|
||||||
xW.WriteAttributeString("InheritRDGatewayUsername", "", False)
|
xW.WriteAttributeString("InheritRDGatewayUsername", "", False)
|
||||||
xW.WriteAttributeString("InheritRDGatewayPassword", "", False)
|
xW.WriteAttributeString("InheritRDGatewayPassword", "", False)
|
||||||
xW.WriteAttributeString("InheritRDGatewayDomain", "", False)
|
xW.WriteAttributeString("InheritRDGatewayDomain", "", False)
|
||||||
@@ -774,10 +793,10 @@ Namespace Config
|
|||||||
csvLn += "Domain;"
|
csvLn += "Domain;"
|
||||||
End If
|
End If
|
||||||
|
|
||||||
csvLn += "Hostname;Protocol;PuttySession;Port;ConnectToConsole;RenderingEngine;ICAEncryptionStrength;RDPAuthenticationLevel;Colors;Resolution;DisplayWallpaper;DisplayThemes;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;RDGatewayUsername;RDGatewayPassword;RDGatewayDomain;"
|
csvLn += "Hostname;Protocol;PuttySession;Port;ConnectToConsole;RenderingEngine;ICAEncryptionStrength;RDPAuthenticationLevel;Colors;Resolution;DisplayWallpaper;DisplayThemes;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 SaveSecurity.Inheritance Then
|
If SaveSecurity.Inheritance Then
|
||||||
csvLn += "InheritCacheBitmaps;InheritColors;InheritDescription;InheritDisplayThemes;InheritDisplayWallpaper;InheritDomain;InheritIcon;InheritPanel;InheritPassword;InheritPort;InheritProtocol;InheritPuttySession;InheritRedirectDiskDrives;InheritRedirectKeys;InheritRedirectPorts;InheritRedirectPrinters;InheritRedirectSmartCards;InheritRedirectSound;InheritResolution;InheritUseConsoleSession;InheritRenderingEngine;InheritUsername;InheritICAEncryptionStrength;InheritRDPAuthenticationLevel;InheritPreExtApp;InheritPostExtApp;InheritMacAddress;InheritUserField;InheritExtApp;InheritVNCCompression;InheritVNCEncoding;InheritVNCAuthMode;InheritVNCProxyType;InheritVNCProxyIP;InheritVNCProxyPort;InheritVNCProxyUsername;InheritVNCProxyPassword;InheritVNCColors;InheritVNCSmartSizeMode;InheritVNCViewOnly;InheritRDGatewayUsageMethod;InheritRDGatewayHostname;RDGatewayUsername;RDGatewayPassword;RDGatewayDomain"
|
csvLn += "InheritCacheBitmaps;InheritColors;InheritDescription;InheritDisplayThemes;InheritDisplayWallpaper;InheritDomain;InheritIcon;InheritPanel;InheritPassword;InheritPort;InheritProtocol;InheritPuttySession;InheritRedirectDiskDrives;InheritRedirectKeys;InheritRedirectPorts;InheritRedirectPrinters;InheritRedirectSmartCards;InheritRedirectSound;InheritResolution;InheritUseConsoleSession;InheritRenderingEngine;InheritUsername;InheritICAEncryptionStrength;InheritRDPAuthenticationLevel;InheritPreExtApp;InheritPostExtApp;InheritMacAddress;InheritUserField;InheritExtApp;InheritVNCCompression;InheritVNCEncoding;InheritVNCAuthMode;InheritVNCProxyType;InheritVNCProxyIP;InheritVNCProxyPort;InheritVNCProxyUsername;InheritVNCProxyPassword;InheritVNCColors;InheritVNCSmartSizeMode;InheritVNCViewOnly;InheritRDGatewayUsageMethod;InheritRDGatewayHostname;InheritRDGatewayUseConnectionCredentials;InheritRDGatewayUsername;InheritRDGatewayPassword;InheritRDGatewayDomain"
|
||||||
End If
|
End If
|
||||||
|
|
||||||
csvWr.WriteLine(csvLn)
|
csvWr.WriteLine(csvLn)
|
||||||
|
|||||||
@@ -465,6 +465,33 @@ Namespace Connection
|
|||||||
End Set
|
End Set
|
||||||
End Property
|
End Property
|
||||||
|
|
||||||
|
Private _RDGatewayUseConnectionCredentials As mRemote.Connection.Protocol.RDP.RDGatewayUseConnectionCredentials = Tools.Misc.StringToEnum(GetType(Connection.Protocol.RDP.RDGatewayUseConnectionCredentials), My.Settings.ConDefaultRDGatewayUseConnectionCredentials)
|
||||||
|
<Category(Category4 & Language.Base.Category_RDGateway), _
|
||||||
|
Browsable(True), _
|
||||||
|
DisplayName(Language.Base.Props_RDGatewayUseConnectionCredentials), _
|
||||||
|
Description(Language.Base.Descr_RDGatewayUseConnectionCredentials), _
|
||||||
|
TypeConverter(GetType(Tools.Misc.EnumTypeConverter))> _
|
||||||
|
Public Property RDGatewayUseConnectionCredentials() As mRemote.Connection.Protocol.RDP.RDGatewayUseConnectionCredentials
|
||||||
|
Get
|
||||||
|
If Me._Inherit.RDGatewayUseConnectionCredentials And Me._Parent IsNot Nothing Then
|
||||||
|
Dim parCon As Connection.Info = TryCast(Me._Parent, Container.Info).ConnectionInfo
|
||||||
|
|
||||||
|
If Me._IsContainer Then
|
||||||
|
Dim curCont As Container.Info = Me._Parent
|
||||||
|
Dim parCont As Container.Info = curCont.Parent
|
||||||
|
parCon = parCont.ConnectionInfo
|
||||||
|
End If
|
||||||
|
|
||||||
|
Return parCon.RDGatewayUseConnectionCredentials
|
||||||
|
Else
|
||||||
|
Return _RDGatewayUseConnectionCredentials
|
||||||
|
End If
|
||||||
|
End Get
|
||||||
|
Set(ByVal value As mRemote.Connection.Protocol.RDP.RDGatewayUseConnectionCredentials)
|
||||||
|
_RDGatewayUseConnectionCredentials = value
|
||||||
|
End Set
|
||||||
|
End Property
|
||||||
|
|
||||||
Private _RDGatewayUsername As String
|
Private _RDGatewayUsername As String
|
||||||
<Category(Category4 & Language.Base.Category_RDGateway), _
|
<Category(Category4 & Language.Base.Category_RDGateway), _
|
||||||
Browsable(True), _
|
Browsable(True), _
|
||||||
@@ -1771,6 +1798,20 @@ Namespace Connection
|
|||||||
End Set
|
End Set
|
||||||
End Property
|
End Property
|
||||||
|
|
||||||
|
Private _RDGatewayUseConnectionCredentials As Boolean = False
|
||||||
|
<Category(Category5 & Language.Base.Category_RDGateway), _
|
||||||
|
Browsable(True), _
|
||||||
|
DisplayName(Language.Base.Inherit & " " & Language.Base.Props_RDGatewayUseConnectionCredentials), _
|
||||||
|
TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
|
||||||
|
Public Property RDGatewayUseConnectionCredentials() As Boolean
|
||||||
|
Get
|
||||||
|
Return Me._RDGatewayUseConnectionCredentials
|
||||||
|
End Get
|
||||||
|
Set(ByVal value As Boolean)
|
||||||
|
Me._RDGatewayUseConnectionCredentials = value
|
||||||
|
End Set
|
||||||
|
End Property
|
||||||
|
|
||||||
Private _RDGatewayUsername As Boolean = False
|
Private _RDGatewayUsername As Boolean = False
|
||||||
<Category(Category5 & Language.Base.Category_RDGateway), _
|
<Category(Category5 & Language.Base.Category_RDGateway), _
|
||||||
Browsable(True), _
|
Browsable(True), _
|
||||||
|
|||||||
@@ -160,11 +160,20 @@ Namespace Connection
|
|||||||
Try
|
Try
|
||||||
If RDP.TransportSettings.GatewayIsSupported = 1 Then
|
If RDP.TransportSettings.GatewayIsSupported = 1 Then
|
||||||
mC.AddMessage(Messages.MessageClass.InformationMsg, "RD Gateway is supported", True)
|
mC.AddMessage(Messages.MessageClass.InformationMsg, "RD Gateway is supported", True)
|
||||||
RDP.TransportSettings.GatewayUsageMethod = Me.Info.RDGatewayUsageMethod
|
If Me.Info.RDGatewayUsageMethod <> RDGatewayUsageMethod.Never Then
|
||||||
RDP.TransportSettings.GatewayHostname = Me.Info.RDGatewayHostname
|
RDP.TransportSettings2.GatewayProfileUsageMethod = 1
|
||||||
RDP.TransportSettings.GatewayUsername = Me.Info.RDGatewayUsername
|
RDP.TransportSettings.GatewayUsageMethod = Me.Info.RDGatewayUsageMethod
|
||||||
RDP.TransportSettings.GatewayPassword = Me.Info.RDGatewayPassword
|
RDP.TransportSettings.GatewayHostname = Me.Info.RDGatewayHostname
|
||||||
RDP.TransportSettings.GatewayDomain = Me.Info.RDGatewayDomain
|
If Me.Info.RDGatewayUseConnectionCredentials = RDGatewayUseConnectionCredentials.Yes Then
|
||||||
|
RDP.TransportSettings.GatewayUsername = Me.Info.Username
|
||||||
|
RDP.TransportSettings.GatewayPassword = Me.Info.Password
|
||||||
|
RDP.TransportSettings.GatewayDomain = Me.Info.Domain
|
||||||
|
Else
|
||||||
|
RDP.TransportSettings.GatewayUsername = Me.Info.RDGatewayUsername
|
||||||
|
RDP.TransportSettings.GatewayPassword = Me.Info.RDGatewayPassword
|
||||||
|
RDP.TransportSettings.GatewayDomain = Me.Info.RDGatewayDomain
|
||||||
|
End If
|
||||||
|
End If
|
||||||
Else
|
Else
|
||||||
mC.AddMessage(Messages.MessageClass.InformationMsg, "RD Gateway is not supported", True)
|
mC.AddMessage(Messages.MessageClass.InformationMsg, "RD Gateway is not supported", True)
|
||||||
End If
|
End If
|
||||||
@@ -495,6 +504,13 @@ Namespace Connection
|
|||||||
<Description("Detect")> _
|
<Description("Detect")> _
|
||||||
Detect = 2 ' TSC_PROXY_MODE_DETECT
|
Detect = 2 ' TSC_PROXY_MODE_DETECT
|
||||||
End Enum
|
End Enum
|
||||||
|
|
||||||
|
Public Enum RDGatewayUseConnectionCredentials
|
||||||
|
<Description("Use a different username and password")> _
|
||||||
|
No = 0
|
||||||
|
<Description("Use the same username and password")> _
|
||||||
|
Yes = 1
|
||||||
|
End Enum
|
||||||
#End Region
|
#End Region
|
||||||
|
|
||||||
#Region "Resolution"
|
#Region "Resolution"
|
||||||
|
|||||||
@@ -92,6 +92,8 @@
|
|||||||
Public Const Descr_RDGatewayUsageMethod As String = "Specifies when to use a Remote Desktop Gateway (RD Gateway) server."
|
Public Const Descr_RDGatewayUsageMethod As String = "Specifies when to use a Remote Desktop Gateway (RD Gateway) server."
|
||||||
Public Const Props_RDGatewayHostname As String = "Gateway Hostname"
|
Public Const Props_RDGatewayHostname As String = "Gateway Hostname"
|
||||||
Public Const Descr_RDGatewayHostname As String = "Specifies the host name of the Remote Desktop Gateway server."
|
Public Const Descr_RDGatewayHostname As String = "Specifies the host name of the Remote Desktop Gateway server."
|
||||||
|
Public Const Props_RDGatewayUseConnectionCredentials As String = "Gateway Credentials"
|
||||||
|
Public Const Descr_RDGatewayUseConnectionCredentials As String = "Specifies whether or not to log on to the gateway using the same username and password as the connection."
|
||||||
Public Const Props_RDGatewayUsername As String = "Gateway Username"
|
Public Const Props_RDGatewayUsername As String = "Gateway Username"
|
||||||
Public Const Descr_RDGatewayUsername As String = "Specifies the user name that a user provides to connect to the RD Gateway server."
|
Public Const Descr_RDGatewayUsername As String = "Specifies the user name that a user provides to connect to the RD Gateway server."
|
||||||
Public Const Props_RDGatewayPassword As String = "Gateway Password"
|
Public Const Props_RDGatewayPassword As String = "Gateway Password"
|
||||||
|
|||||||
9
mRemoteV1/My Project/Settings.Designer.vb
generated
9
mRemoteV1/My Project/Settings.Designer.vb
generated
@@ -1984,6 +1984,15 @@ Namespace My
|
|||||||
Return CType(Me("ConDefaultRDGatewayUsageMethod"),String)
|
Return CType(Me("ConDefaultRDGatewayUsageMethod"),String)
|
||||||
End Get
|
End Get
|
||||||
End Property
|
End Property
|
||||||
|
|
||||||
|
<Global.System.Configuration.ApplicationScopedSettingAttribute(), _
|
||||||
|
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
|
||||||
|
Global.System.Configuration.DefaultSettingValueAttribute("Yes")> _
|
||||||
|
Public ReadOnly Property ConDefaultRDGatewayUseConnectionCredentials() As String
|
||||||
|
Get
|
||||||
|
Return CType(Me("ConDefaultRDGatewayUseConnectionCredentials"),String)
|
||||||
|
End Get
|
||||||
|
End Property
|
||||||
End Class
|
End Class
|
||||||
End Namespace
|
End Namespace
|
||||||
|
|
||||||
|
|||||||
@@ -449,5 +449,8 @@
|
|||||||
<Setting Name="ConDefaultRDGatewayUsageMethod" Type="System.String" Scope="Application">
|
<Setting Name="ConDefaultRDGatewayUsageMethod" Type="System.String" Scope="Application">
|
||||||
<Value Profile="(Default)">Never</Value>
|
<Value Profile="(Default)">Never</Value>
|
||||||
</Setting>
|
</Setting>
|
||||||
|
<Setting Name="ConDefaultRDGatewayUseConnectionCredentials" Type="System.String" Scope="Application">
|
||||||
|
<Value Profile="(Default)">Yes</Value>
|
||||||
|
</Setting>
|
||||||
</Settings>
|
</Settings>
|
||||||
</SettingsFile>
|
</SettingsFile>
|
||||||
@@ -1,7 +1,4 @@
|
|||||||
Imports WeifenLuo.WinFormsUI.Docking
|
Imports WeifenLuo.WinFormsUI.Docking
|
||||||
Imports Azuria.Common.Controls
|
|
||||||
Imports System.ComponentModel
|
|
||||||
Imports System.Net
|
|
||||||
Imports System.Net.NetworkInformation
|
Imports System.Net.NetworkInformation
|
||||||
Imports mRemote.App.Runtime
|
Imports mRemote.App.Runtime
|
||||||
|
|
||||||
@@ -507,8 +504,13 @@ Namespace UI
|
|||||||
Select Case conI.Protocol
|
Select Case conI.Protocol
|
||||||
Case mRemote.Connection.Protocol.Protocols.RDP
|
Case mRemote.Connection.Protocol.Protocols.RDP
|
||||||
strHide &= "ExtApp;RenderingEngine;PuttySession;ICAEncryption;VNCAuthMode;VNCColors;VNCCompression;VNCEncoding;VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyType;VNCProxyUsername;VNCSmartSizeMode;VNCViewOnly;"
|
strHide &= "ExtApp;RenderingEngine;PuttySession;ICAEncryption;VNCAuthMode;VNCColors;VNCCompression;VNCEncoding;VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyType;VNCProxyUsername;VNCSmartSizeMode;VNCViewOnly;"
|
||||||
|
If conI.RDGatewayUsageMethod = mRemote.Connection.Protocol.RDP.RDGatewayUsageMethod.Never Then
|
||||||
|
strHide &= "RDGatewayHostname;RDGatewayUseConnectionCredentials;RDGatewayUsername;RDGatewayPassword;RDGatewayDomain;"
|
||||||
|
Else If conI.RDGatewayUseConnectionCredentials Then
|
||||||
|
strHide &= "RDGatewayUsername;RDGatewayPassword;RDGatewayDomain;"
|
||||||
|
End If
|
||||||
Case mRemote.Connection.Protocol.Protocols.VNC
|
Case mRemote.Connection.Protocol.Protocols.VNC
|
||||||
strHide &= "ExtApp;CacheBitmaps;Colors;DisplayThemes;DisplayWallpaper;PuttySession;ICAEncryption;RDPAuthenticationLevel;RedirectDiskDrives;RedirectKeys;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;Resolution;UseConsoleSession;RenderingEngine;RDGatewayUsageMethod;RDGatewayHostname;RDGatewayUsername;RDGatewayPassword;RDGatewayDomain;"
|
strHide &= "ExtApp;CacheBitmaps;Colors;DisplayThemes;DisplayWallpaper;PuttySession;ICAEncryption;RDPAuthenticationLevel;RedirectDiskDrives;RedirectKeys;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;Resolution;UseConsoleSession;RenderingEngine;RDGatewayUsageMethod;RDGatewayHostname;RDGatewayUseConnectionCredentials;RDGatewayUsername;RDGatewayPassword;RDGatewayDomain;"
|
||||||
If conI.VNCAuthMode = mRemote.Connection.Protocol.VNC.AuthMode.AuthVNC Then
|
If conI.VNCAuthMode = mRemote.Connection.Protocol.VNC.AuthMode.AuthVNC Then
|
||||||
strHide &= "Username;Domain;"
|
strHide &= "Username;Domain;"
|
||||||
End If
|
End If
|
||||||
@@ -516,23 +518,23 @@ Namespace UI
|
|||||||
strHide &= "VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyUsername;"
|
strHide &= "VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyUsername;"
|
||||||
End If
|
End If
|
||||||
Case mRemote.Connection.Protocol.Protocols.SSH1
|
Case mRemote.Connection.Protocol.Protocols.SSH1
|
||||||
strHide &= "ExtApp;CacheBitmaps;Colors;DisplayThemes;DisplayWallpaper;Domain;ICAEncryption;RDPAuthenticationLevel;RedirectDiskDrives;RedirectKeys;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;Resolution;UseConsoleSession;RenderingEngine;VNCAuthMode;VNCColors;VNCCompression;VNCEncoding;VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyType;VNCProxyUsername;VNCSmartSizeMode;VNCViewOnly;RDGatewayUsageMethod;RDGatewayHostname;RDGatewayUsername;RDGatewayPassword;RDGatewayDomain;"
|
strHide &= "ExtApp;CacheBitmaps;Colors;DisplayThemes;DisplayWallpaper;Domain;ICAEncryption;RDPAuthenticationLevel;RedirectDiskDrives;RedirectKeys;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;Resolution;UseConsoleSession;RenderingEngine;VNCAuthMode;VNCColors;VNCCompression;VNCEncoding;VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyType;VNCProxyUsername;VNCSmartSizeMode;VNCViewOnly;RDGatewayUsageMethod;RDGatewayHostname;RDGatewayUseConnectionCredentials;RDGatewayUsername;RDGatewayPassword;RDGatewayDomain;"
|
||||||
Case mRemote.Connection.Protocol.Protocols.SSH2
|
Case mRemote.Connection.Protocol.Protocols.SSH2
|
||||||
strHide &= "ExtApp;CacheBitmaps;Colors;DisplayThemes;DisplayWallpaper;Domain;ICAEncryption;RDPAuthenticationLevel;RedirectDiskDrives;RedirectKeys;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;Resolution;UseConsoleSession;RenderingEngine;VNCAuthMode;VNCColors;VNCCompression;VNCEncoding;VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyType;VNCProxyUsername;VNCSmartSizeMode;VNCViewOnly;RDGatewayUsageMethod;RDGatewayHostname;RDGatewayUsername;RDGatewayPassword;RDGatewayDomain;"
|
strHide &= "ExtApp;CacheBitmaps;Colors;DisplayThemes;DisplayWallpaper;Domain;ICAEncryption;RDPAuthenticationLevel;RedirectDiskDrives;RedirectKeys;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;Resolution;UseConsoleSession;RenderingEngine;VNCAuthMode;VNCColors;VNCCompression;VNCEncoding;VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyType;VNCProxyUsername;VNCSmartSizeMode;VNCViewOnly;RDGatewayUsageMethod;RDGatewayHostname;RDGatewayUseConnectionCredentials;RDGatewayUsername;RDGatewayPassword;RDGatewayDomain;"
|
||||||
Case mRemote.Connection.Protocol.Protocols.Telnet
|
Case mRemote.Connection.Protocol.Protocols.Telnet
|
||||||
strHide &= "ExtApp;CacheBitmaps;Colors;DisplayThemes;DisplayWallpaper;Domain;ICAEncryption;RDPAuthenticationLevel;Password;RedirectDiskDrives;RedirectKeys;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;Resolution;UseConsoleSession;RenderingEngine;Username;VNCAuthMode;VNCColors;VNCCompression;VNCEncoding;VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyType;VNCProxyUsername;VNCSmartSizeMode;VNCViewOnly;RDGatewayUsageMethod;RDGatewayHostname;RDGatewayUsername;RDGatewayPassword;RDGatewayDomain;"
|
strHide &= "ExtApp;CacheBitmaps;Colors;DisplayThemes;DisplayWallpaper;Domain;ICAEncryption;RDPAuthenticationLevel;Password;RedirectDiskDrives;RedirectKeys;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;Resolution;UseConsoleSession;RenderingEngine;Username;VNCAuthMode;VNCColors;VNCCompression;VNCEncoding;VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyType;VNCProxyUsername;VNCSmartSizeMode;VNCViewOnly;RDGatewayUsageMethod;RDGatewayHostname;RDGatewayUseConnectionCredentials;RDGatewayUsername;RDGatewayPassword;RDGatewayDomain;"
|
||||||
Case mRemote.Connection.Protocol.Protocols.Rlogin
|
Case mRemote.Connection.Protocol.Protocols.Rlogin
|
||||||
strHide &= "ExtApp;CacheBitmaps;Colors;DisplayThemes;DisplayWallpaper;Domain;ICAEncryption;RDPAuthenticationLevel;Password;RedirectDiskDrives;RedirectKeys;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;Resolution;UseConsoleSession;RenderingEngine;Username;VNCAuthMode;VNCColors;VNCCompression;VNCEncoding;VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyType;VNCProxyUsername;VNCSmartSizeMode;VNCViewOnly;RDGatewayUsageMethod;RDGatewayHostname;RDGatewayUsername;RDGatewayPassword;RDGatewayDomain;"
|
strHide &= "ExtApp;CacheBitmaps;Colors;DisplayThemes;DisplayWallpaper;Domain;ICAEncryption;RDPAuthenticationLevel;Password;RedirectDiskDrives;RedirectKeys;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;Resolution;UseConsoleSession;RenderingEngine;Username;VNCAuthMode;VNCColors;VNCCompression;VNCEncoding;VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyType;VNCProxyUsername;VNCSmartSizeMode;VNCViewOnly;RDGatewayUsageMethod;RDGatewayHostname;RDGatewayUseConnectionCredentials;RDGatewayUsername;RDGatewayPassword;RDGatewayDomain;"
|
||||||
Case mRemote.Connection.Protocol.Protocols.RAW
|
Case mRemote.Connection.Protocol.Protocols.RAW
|
||||||
strHide &= "ExtApp;CacheBitmaps;Colors;DisplayThemes;DisplayWallpaper;Domain;ICAEncryption;RDPAuthenticationLevel;Password;RedirectDiskDrives;RedirectKeys;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;Resolution;UseConsoleSession;RenderingEngine;Username;VNCAuthMode;VNCColors;VNCCompression;VNCEncoding;VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyType;VNCProxyUsername;VNCSmartSizeMode;VNCViewOnly;RDGatewayUsageMethod;RDGatewayHostname;RDGatewayUsername;RDGatewayPassword;RDGatewayDomain;"
|
strHide &= "ExtApp;CacheBitmaps;Colors;DisplayThemes;DisplayWallpaper;Domain;ICAEncryption;RDPAuthenticationLevel;Password;RedirectDiskDrives;RedirectKeys;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;Resolution;UseConsoleSession;RenderingEngine;Username;VNCAuthMode;VNCColors;VNCCompression;VNCEncoding;VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyType;VNCProxyUsername;VNCSmartSizeMode;VNCViewOnly;RDGatewayUsageMethod;RDGatewayHostname;RDGatewayUseConnectionCredentials;RDGatewayUsername;RDGatewayPassword;RDGatewayDomain;"
|
||||||
Case mRemote.Connection.Protocol.Protocols.HTTP
|
Case mRemote.Connection.Protocol.Protocols.HTTP
|
||||||
strHide &= "ExtApp;CacheBitmaps;Colors;DisplayThemes;DisplayWallpaper;Domain;ICAEncryption;RDPAuthenticationLevel;PuttySession;RedirectDiskDrives;RedirectKeys;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;Resolution;UseConsoleSession;VNCAuthMode;VNCColors;VNCCompression;VNCEncoding;VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyType;VNCProxyUsername;VNCSmartSizeMode;VNCViewOnly;RDGatewayUsageMethod;RDGatewayHostname;RDGatewayUsername;RDGatewayPassword;RDGatewayDomain;"
|
strHide &= "ExtApp;CacheBitmaps;Colors;DisplayThemes;DisplayWallpaper;Domain;ICAEncryption;RDPAuthenticationLevel;PuttySession;RedirectDiskDrives;RedirectKeys;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;Resolution;UseConsoleSession;VNCAuthMode;VNCColors;VNCCompression;VNCEncoding;VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyType;VNCProxyUsername;VNCSmartSizeMode;VNCViewOnly;RDGatewayUsageMethod;RDGatewayHostname;RDGatewayUseConnectionCredentials;RDGatewayUsername;RDGatewayPassword;RDGatewayDomain;"
|
||||||
Case mRemote.Connection.Protocol.Protocols.HTTPS
|
Case mRemote.Connection.Protocol.Protocols.HTTPS
|
||||||
strHide &= "ExtApp;CacheBitmaps;Colors;DisplayThemes;DisplayWallpaper;Domain;ICAEncryption;RDPAuthenticationLevel;PuttySession;RedirectDiskDrives;RedirectKeys;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;Resolution;UseConsoleSession;VNCAuthMode;VNCColors;VNCCompression;VNCEncoding;VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyType;VNCProxyUsername;VNCSmartSizeMode;VNCViewOnly;RDGatewayUsageMethod;RDGatewayHostname;RDGatewayUsername;RDGatewayPassword;RDGatewayDomain;"
|
strHide &= "ExtApp;CacheBitmaps;Colors;DisplayThemes;DisplayWallpaper;Domain;ICAEncryption;RDPAuthenticationLevel;PuttySession;RedirectDiskDrives;RedirectKeys;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;Resolution;UseConsoleSession;VNCAuthMode;VNCColors;VNCCompression;VNCEncoding;VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyType;VNCProxyUsername;VNCSmartSizeMode;VNCViewOnly;RDGatewayUsageMethod;RDGatewayHostname;RDGatewayUseConnectionCredentials;RDGatewayUsername;RDGatewayPassword;RDGatewayDomain;"
|
||||||
Case mRemote.Connection.Protocol.Protocols.ICA
|
Case mRemote.Connection.Protocol.Protocols.ICA
|
||||||
strHide &= "ExtApp;DisplayThemes;DisplayWallpaper;PuttySession;RDPAuthenticationLevel;RedirectDiskDrives;RedirectKeys;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;UseConsoleSession;RenderingEngine;Port;VNCAuthMode;VNCColors;VNCCompression;VNCEncoding;VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyType;VNCProxyUsername;VNCSmartSizeMode;VNCViewOnly;RDGatewayUsageMethod;RDGatewayHostname;RDGatewayUsername;RDGatewayPassword;RDGatewayDomain;"
|
strHide &= "ExtApp;DisplayThemes;DisplayWallpaper;PuttySession;RDPAuthenticationLevel;RedirectDiskDrives;RedirectKeys;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;UseConsoleSession;RenderingEngine;Port;VNCAuthMode;VNCColors;VNCCompression;VNCEncoding;VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyType;VNCProxyUsername;VNCSmartSizeMode;VNCViewOnly;RDGatewayUsageMethod;RDGatewayHostname;RDGatewayUseConnectionCredentials;RDGatewayUsername;RDGatewayPassword;RDGatewayDomain;"
|
||||||
Case mRemote.Connection.Protocol.Protocols.IntApp
|
Case mRemote.Connection.Protocol.Protocols.IntApp
|
||||||
strHide &= "CacheBitmaps;Colors;DisplayThemes;DisplayWallpaper;Domain;PuttySession;ICAEncryption;RDPAuthenticationLevel;RedirectDiskDrives;RedirectKeys;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;Resolution;UseConsoleSession;RenderingEngine;VNCAuthMode;VNCColors;VNCCompression;VNCEncoding;VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyType;VNCProxyUsername;VNCSmartSizeMode;VNCViewOnly;RDGatewayUsageMethod;RDGatewayHostname;RDGatewayUsername;RDGatewayPassword;RDGatewayDomain;"
|
strHide &= "CacheBitmaps;Colors;DisplayThemes;DisplayWallpaper;Domain;PuttySession;ICAEncryption;RDPAuthenticationLevel;RedirectDiskDrives;RedirectKeys;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;Resolution;UseConsoleSession;RenderingEngine;VNCAuthMode;VNCColors;VNCCompression;VNCEncoding;VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyType;VNCProxyUsername;VNCSmartSizeMode;VNCViewOnly;RDGatewayUsageMethod;RDGatewayHostname;RDGatewayUseConnectionCredentials;RDGatewayUsername;RDGatewayPassword;RDGatewayDomain;"
|
||||||
End Select
|
End Select
|
||||||
|
|
||||||
If conI.IsDefault = False Then
|
If conI.IsDefault = False Then
|
||||||
|
|||||||
@@ -511,6 +511,9 @@
|
|||||||
<setting name="ConDefaultRDGatewayUsageMethod" serializeAs="String">
|
<setting name="ConDefaultRDGatewayUsageMethod" serializeAs="String">
|
||||||
<value>Never</value>
|
<value>Never</value>
|
||||||
</setting>
|
</setting>
|
||||||
|
<setting name="ConDefaultRDGatewayUseConnectionCredentials" serializeAs="String">
|
||||||
|
<value>Yes</value>
|
||||||
|
</setting>
|
||||||
</mRemote.My.MySettings>
|
</mRemote.My.MySettings>
|
||||||
</applicationSettings>
|
</applicationSettings>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
|||||||
Reference in New Issue
Block a user