Support for >REMOTE/remote interaction added

eduOpenVPN/Management/ISessionNotifications.cs

@@ -90,6 +90,15 @@ public interface ISessionNotifications
         /// <param name="realm">Realm title</param>
         void OnAuthenticationFailed(string realm);
 
+        /// <summary>
+        /// Called when remote endpoint is needed
+        /// </summary>
+        /// <param name="host">Hostname or IP address</param>
+        /// <param name="port">IP Port</param>
+        /// <param name="protocol">Protocol</param>
+        /// <returns></returns>
+        RemoteAction OnRemote(string host, int port, ProtoType protocol);
+
         /// <summary>
         /// Called when RSA data signing is required
         /// </summary>

eduOpenVPN/Management/RemoteAcceptAction.cs

@@ -0,0 +1,24 @@
+/*
+    eduOpenVPN - OpenVPN Management Library for eduVPN (and beyond)
+
+    Copyright: 2017, The Commons Conservancy eduVPN Programme
+    SPDX-License-Identifier: GPL-3.0+
+*/
+
+namespace eduOpenVPN.Management
+{
+    /// <summary>
+    /// OpenVPN Management session remote "ACCEPT" command action
+    /// </summary>
+    public class RemoteAcceptAction : RemoteAction
+    {
+        #region Methods
+
+        public override string ToString()
+        {
+            return "ACCEPT";
+        }
+
+        #endregion
+    }
+}

eduOpenVPN/Management/RemoteAction.cs

@@ -0,0 +1,16 @@
+/*
+    eduOpenVPN - OpenVPN Management Library for eduVPN (and beyond)
+
+    Copyright: 2017, The Commons Conservancy eduVPN Programme
+    SPDX-License-Identifier: GPL-3.0+
+*/
+
+namespace eduOpenVPN.Management
+{
+    /// <summary>
+    /// OpenVPN Management session "remote" command action base class
+    /// </summary>
+    public class RemoteAction
+    {
+    }
+}

eduOpenVPN/Management/RemoteModAction.cs

@@ -0,0 +1,53 @@
+/*
+    eduOpenVPN - OpenVPN Management Library for eduVPN (and beyond)
+
+    Copyright: 2017, The Commons Conservancy eduVPN Programme
+    SPDX-License-Identifier: GPL-3.0+
+*/
+
+namespace eduOpenVPN.Management
+{
+    /// <summary>
+    /// OpenVPN Management session remote "MOD" command action
+    /// </summary>
+    public class RemoteModAction : RemoteAction
+    {
+        #region Properties
+
+        /// <summary>
+        /// Hostname or IP address
+        /// </summary>
+        public string Host { get; }
+
+        /// <summary>
+        /// IP port
+        /// </summary>
+        public int Port { get; }
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Constructs a command action
+        /// </summary>
+        /// <param name="host">Hostname or IP address</param>
+        /// <param name="port">IP port</param>
+        public RemoteModAction(string host, int port)
+        {
+            Host = host;
+            Port = port;
+        }
+
+        #endregion
+
+        #region Methods
+
+        public override string ToString()
+        {
+            return string.Format("MOD {0} {1:D}", Configuration.EscapeParamValue(Host), Port);
+        }
+
+        #endregion
+    }
+}

eduOpenVPN/Management/RemoteSkipAction.cs

@@ -0,0 +1,24 @@
+/*
+    eduOpenVPN - OpenVPN Management Library for eduVPN (and beyond)
+
+    Copyright: 2017, The Commons Conservancy eduVPN Programme
+    SPDX-License-Identifier: GPL-3.0+
+*/
+
+namespace eduOpenVPN.Management
+{
+    /// <summary>
+    /// OpenVPN Management session remote "SKIP" command action
+    /// </summary>
+    public class RemoteSkipAction : RemoteAction
+    {
+        #region Methods
+
+        public override string ToString()
+        {
+            return "SKIP";
+        }
+
+        #endregion
+    }
+}

eduOpenVPN/Management/Session.cs

@@ -405,12 +405,27 @@ public override void ProcessData(byte[] data, ISessionNotifications event_sink)
                                             }
                                             break;
 
+                                        case "PKCS11ID-COUNT":
+                                            // TODO: Implement.
+                                            break;
+
                                         case "PROXY":
                                             // TODO: Implement.
                                             break;
 
                                         case "REMOTE":
-                                            // TODO: Implement.
+                                            {
+                                                // Get action.
+                                                var fields = Encoding.ASCII.GetString(queue.SubArray(data_start, msg_end - data_start)).Split(new char[] { ',' }, 3 + 1);
+                                                var action = event_sink.OnRemote(
+                                                    fields.Length >= 1 ? fields[0].Trim() : null,
+                                                    fields.Length >= 2 && int.TryParse(fields[1].Trim(), out var port) ? port : 0,
+                                                    fields.Length >= 3 && ParameterValueAttribute.TryGetEnumByParameterValueAttribute<ProtoType>(fields[2].Trim(), out var proto) ? proto : ProtoType.UDP);
+
+                                                // Send reply message.
+                                                SendCommand("remote " + action.ToString(), new SingleCommand(), ct);
+                                            }
+
                                             break;
 
                                         case "RSA_SIGN":

eduOpenVPN/ProtoType.cs

@@ -0,0 +1,30 @@
+/*
+    eduOpenVPN - OpenVPN Management Library for eduVPN (and beyond)
+
+    Copyright: 2017, The Commons Conservancy eduVPN Programme
+    SPDX-License-Identifier: GPL-3.0+
+*/
+
+namespace eduOpenVPN
+{
+    public enum ProtoType
+    {
+        /// <summary>
+        /// UDP
+        /// </summary>
+        [ParameterValue("udp")]
+        UDP = 0,
+
+        /// <summary>
+        /// TCP client
+        /// </summary>
+        [ParameterValue("tcp-client")]
+        TCPClient,
+
+        /// <summary>
+        /// TCP server
+        /// </summary>
+        [ParameterValue("tcp-server")]
+        TCPServer,
+    }
+}

eduOpenVPN/eduOpenVPN.csproj

@@ -25,6 +25,11 @@
     <Reference Include="System.ServiceProcess" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Management\RemoteModAction.cs" />
+    <Compile Include="Management\RemoteAcceptAction.cs" />
+    <Compile Include="Management\RemoteAction.cs" />
+    <Compile Include="Management\RemoteSkipAction.cs" />
+    <Compile Include="ProtoType.cs" />
     <Compile Include="AuthRetryType.cs" />
     <Compile Include="Configuration.cs" />
     <Compile Include="InteractiveService\Session.cs" />