#2706 - Updated terminal.receive() to work with SSHPacket class, fixed some tests and updated RemoteTerminalConnection to hold Source_IP for easier reading

src/primaite/notebooks/Terminal-Processing.ipynb

@@ -15,7 +15,7 @@
    "source": [
     "This notebook serves as a guide on the functionality and use of the new Terminal simulation component.\n",
     "\n",
-    "By default, the Terminal will come pre-installed on any simulation component which inherits from `HostNode` (Computer, Server, Printer), and simulates the Secure Shell (SSH) protocol as the communication method."
+    "The Terminal service comes pre-installed on most Nodes (The exception being Switches, as these are currently dumb). "
    ]
   },
   {
@@ -27,15 +27,9 @@
     "from primaite.simulator.system.services.terminal.terminal import Terminal\n",
     "from primaite.simulator.network.container import Network\n",
     "from primaite.simulator.network.hardware.nodes.host.computer import Computer\n",
-    "from primaite.simulator.system.applications.red_applications.ransomware_script import RansomwareScript"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
+    "from primaite.simulator.system.applications.red_applications.ransomware_script import RansomwareScript\n",
+    "from primaite.simulator.system.services.terminal.terminal import RemoteTerminalConnection\n",
+    "\n",
     "def basic_network() -> Network:\n",
     "    \"\"\"Utility function for creating a default network to demonstrate Terminal functionality\"\"\"\n",
     "    network = Network()\n",
@@ -51,9 +45,9 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "The terminal can be accessed from a `HostNode` via the `software_manager` as demonstrated below. \n",
+    "The terminal can be accessed from a `Node` via the `software_manager` as demonstrated below. \n",
     "\n",
-    "In the example, we have a basic network consisting of two computers "
+    "In the example, we have a basic network consisting of two computers, connected to form a basic network."
    ]
   },
   {
@@ -66,15 +60,17 @@
     "computer_a: Computer = network.get_node_by_hostname(\"node_a\")\n",
     "terminal_a: Terminal = computer_a.software_manager.software.get(\"Terminal\")\n",
     "computer_b: Computer = network.get_node_by_hostname(\"node_b\")\n",
-    "terminal_b: Terminal = computer_b.software_manager.software.get(\"Terminal\")\n"
+    "terminal_b: Terminal = computer_b.software_manager.software.get(\"Terminal\")"
    ]
   },
   {
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "To be able to send commands from `node_a` to `node_b`, you will need to `login` to `node_b` first, using valid user credentials. In the example below, we are logging in to the 'admin' account on `node_b`. \n",
-    "If you are not logged in, any commands sent will be rejected."
+    "To be able to send commands from `node_a` to `node_b`, you will need to `login` to `node_b` first, using valid user credentials. In the example below, we are remotely logging in to the 'admin' account on `node_b`, from `node_a`. \n",
+    "If you are not logged in, any commands sent will be rejected by the remote.\n",
+    "\n",
+    "Remote Logins return a RemoteTerminalConnection object, which can be used for sending commands to the remote node. "
    ]
   },
   {
@@ -84,10 +80,14 @@
    "outputs": [],
    "source": [
     "# Login to the remote (node_b) from local (node_a)\n",
-    "from primaite.simulator.system.services.terminal.terminal import RemoteTerminalConnection\n",
-    "\n",
-    "\n",
-    "term_a_term_b_remote_connection: RemoteTerminalConnection = terminal_a.login(username=\"admin\", password=\"Admin123!\", ip_address=computer_b.network_interface[1].ip_address)"
+    "term_a_term_b_remote_connection: RemoteTerminalConnection = terminal_a.login(username=\"admin\", password=\"Admin123!\", ip_address=\"192.168.0.11\")"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "You can view all active connections to a terminal through use of the `show()` method"
    ]
   },
   {
@@ -96,7 +96,14 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "computer_b.software_manager.show()"
+    "terminal_b.show()"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "The new connection object allows us to forward commands to be executed on the target node. The example below demonstrates how you can remotely install an application on the target node."
    ]
   },
   {
@@ -105,7 +112,6 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "print(type(term_a_term_b_remote_connection))\n",
     "term_a_term_b_remote_connection.execute([\"software_manager\", \"application\", \"install\", \"RansomwareScript\"])"
    ]
   },
@@ -122,7 +128,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "You can view all remote connections to a terminal through use of the `show()` method"
+    "The code block below demonstrates how the Terminal class allows the user of `terminal_a`, on `computer_a`, to send a command to `computer_b` to create a downloads folder. \n"
    ]
   },
   {
@@ -131,23 +137,11 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "terminal_b.show()"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "The Terminal can be used to send requests to install new software. The code block below demonstrates how the Terminal class allows the user of `terminal_a`, on `computer_a`, to send a command to `computer_b` to install the `RansomwareScript` application. \n"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "The below example shows how you can send a command via the terminal to create a folder on the target Node.\n",
+    "# Display the current state of the file system on computer_b\n",
+    "computer_b.file_system.show()\n",
     "\n",
-    "Here, we send a command to `computer_b` to create a new folder titled \"Downloads\"."
+    "# Send command\n",
+    "term_a_term_b_remote_connection.execute([\"file_system\", \"create\", \"folder\", \"downloads\"])"
    ]
   },
   {
@@ -156,6 +150,39 @@
    "source": [
     "The resultant call to `computer_b.file_system.show()` shows that the new folder has been created."
    ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "computer_b.file_system.show()"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "When finished, the connection can be closed by calling the `disconnect` function of the Remote Client object"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# Display active connection\n",
+    "terminal_a.show()\n",
+    "terminal_b.show()\n",
+    "\n",
+    "term_a_term_b_remote_connection.disconnect()\n",
+    "\n",
+    "terminal_a.show()\n",
+    "\n",
+    "terminal_b.show()"
+   ]
   }
  ],
  "metadata": {