disconnect connected client from web interface

Author: pavelrevak

ser2tcp/html/app.js

@@ -229,14 +229,27 @@ function renderPortCard(port, index) {
     div.appendChild(el('p', 'port: ' + ser.port, 'port-config-detail'));
   }
   const ul = el('ul');
-  (port.servers || []).forEach(s => {
+  (port.servers || []).forEach((s, si) => {
     const proto = (s.protocol || 'tcp').toUpperCase();
     const addr = proto === 'SOCKET' ? s.address : s.address + ':' + s.port;
     const li = el('li', proto + ' \u2014 ' + addr);
     const clients = s.connections || [];
     if (clients.length) {
       const cul = el('ul');
-      clients.forEach(c => cul.appendChild(el('li', c.address)));
+      clients.forEach((c, ci) => {
+        const cli = el('li');
+        cli.appendChild(document.createTextNode(c.address + ' '));
+        const dcBtn = document.createElement('button');
+        dcBtn.className = 'btn-disconnect';
+        dcBtn.innerHTML = '<svg viewBox="0 0 24 24" width="14" height="14">'
+          + '<path d="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12'
+          + ' 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z"'
+          + ' fill="currentColor"/></svg>';
+        dcBtn.title = 'Disconnect ' + c.address;
+        dcBtn.onclick = () => disconnectClient(index, si, ci);
+        cli.appendChild(dcBtn);
+        cul.appendChild(cli);
+      });
       li.appendChild(cul);
     } else {
       li.appendChild(el('em', ' no connections'));
@@ -817,6 +830,12 @@ function savePort(index) {
   });
 }
 
+function disconnectClient(portIdx, srvIdx, conIdx) {
+  api('DELETE', '/api/ports/' + portIdx + '/connections/' + srvIdx + '/' + conIdx)
+    .then(() => loadPorts())
+    .catch(e => { if (e !== 'unauthorized') alert(e); });
+}
+
 function deletePort(index) {
   if (!confirm('Delete port ' + index + '?')) return;
   api('DELETE', '/api/ports/' + index).then(() => loadPorts()).catch(e => {

ser2tcp/html/style.css

@@ -82,5 +82,8 @@ nav button:hover { color: #2a7edf; }
 .detected-section { margin-top: 2em; padding-top: 1em;
   border-top: 1px solid #ddd; }
 .detected-section h3 { color: #888; margin: 0 0 0.5em; }
+.btn-disconnect { background: none; border: none; color: #ccc; padding: 0 0.2em;
+  cursor: pointer; vertical-align: middle; }
+.btn-disconnect:hover { color: #e55; }
 .detect-link { color: #4a9eff; text-decoration: none; cursor: pointer; }
 .detect-link:hover { text-decoration: underline; }

ser2tcp/http_server.py

@@ -266,18 +266,33 @@ def _get_ports_config(self):
         return ports
 
     def _route_api_ports_item(self, client, user):
-        """Route /api/ports/<index> requests"""
+        """Route /api/ports/<index>/... requests"""
+        rest = client.path[len('/api/ports/'):]
+        parts = rest.split('/')
         try:
-            index = int(client.path[len('/api/ports/'):])
+            index = int(parts[0])
         except ValueError:
             self._error(client, 'Invalid port index', 400)
             return
-        if client.method == 'PUT':
-            self._handle_api_ports_update(client, user, index)
-        elif client.method == 'DELETE':
-            self._handle_api_ports_delete(client, user, index)
+        if len(parts) == 1:
+            if client.method == 'PUT':
+                self._handle_api_ports_update(client, user, index)
+            elif client.method == 'DELETE':
+                self._handle_api_ports_delete(client, user, index)
+            else:
+                self._error(client, 'Method not allowed', 405)
+        elif len(parts) == 4 and parts[1] == 'connections' \
+                and client.method == 'DELETE':
+            try:
+                srv_idx = int(parts[2])
+                con_idx = int(parts[3])
+            except ValueError:
+                self._error(client, 'Invalid index', 400)
+                return
+            self._handle_api_disconnect(client, user, index,
+                srv_idx, con_idx)
         else:
-            self._error(client, 'Method not allowed', 405)
+            self._error(client, 'Not found', 404)
 
     def _validate_port_config(self, data):
         """Validate port configuration, return error string or None"""
@@ -398,6 +413,28 @@ def _handle_api_ports_delete(self, client, user, index):
         self._log.info("Port deleted: %d", index)
         client.respond({'ok': True})
 
+    def _handle_api_disconnect(self, client, user, port_idx,
+            srv_idx, con_idx):
+        """Disconnect a specific client connection"""
+        if not self._require_admin(client, user):
+            return
+        if port_idx < 0 or port_idx >= len(self._serial_proxies):
+            self._error(client, 'Port not found', 404)
+            return
+        proxy = self._serial_proxies[port_idx]
+        if srv_idx < 0 or srv_idx >= len(proxy.servers):
+            self._error(client, 'Server not found', 404)
+            return
+        server = proxy.servers[srv_idx]
+        if con_idx < 0 or con_idx >= len(server.connections):
+            self._error(client, 'Connection not found', 404)
+            return
+        con = server.connections[con_idx]
+        addr = con.address_str()
+        server._remove_connection(con)
+        self._log.info("Disconnected: %s", addr)
+        client.respond({'ok': True})
+
     def _handle_api_login(self, client):
         """Authenticate user and return session token"""
         if not self._auth:

tests/test_http_server.py

@@ -354,6 +354,75 @@ def test_no_ssl_config_for_tcp(self):
         self.assertNotIn('ssl', srv)
 
 
+class TestApiDisconnect(unittest.TestCase):
+    def _make_connection(self, address='192.168.1.5:54321'):
+        con = Mock()
+        con.address_str.return_value = address
+        return con
+
+    def _make_server_with_con(self):
+        con = self._make_connection()
+        server = Mock()
+        server.protocol = 'TCP'
+        server.config = {'address': '0.0.0.0', 'port': 21000}
+        server.connections = [con]
+        return server, con
+
+    def _make_proxy_with_con(self):
+        server, con = self._make_server_with_con()
+        proxy = Mock()
+        proxy.serial_config = {'port': '/dev/ttyUSB0'}
+        proxy.match = None
+        proxy.name = ''
+        proxy.is_connected = True
+        proxy.servers = [server]
+        return proxy, server, con
+
+    def test_disconnect_client(self):
+        proxy, server, con = self._make_proxy_with_con()
+        wrapper = make_wrapper(serial_proxies=[proxy])
+        client = MockClient(
+            method='DELETE',
+            path='/api/ports/0/connections/0/0')
+        wrapper._handle_request(client)
+        self.assertEqual(client.respond_status, 200)
+        server._remove_connection.assert_called_once_with(con)
+
+    def test_disconnect_port_not_found(self):
+        wrapper = make_wrapper(serial_proxies=[])
+        client = MockClient(
+            method='DELETE',
+            path='/api/ports/0/connections/0/0')
+        wrapper._handle_request(client)
+        self.assertEqual(client.respond_status, 404)
+
+    def test_disconnect_server_not_found(self):
+        proxy, _, _ = self._make_proxy_with_con()
+        wrapper = make_wrapper(serial_proxies=[proxy])
+        client = MockClient(
+            method='DELETE',
+            path='/api/ports/0/connections/5/0')
+        wrapper._handle_request(client)
+        self.assertEqual(client.respond_status, 404)
+
+    def test_disconnect_connection_not_found(self):
+        proxy, _, _ = self._make_proxy_with_con()
+        wrapper = make_wrapper(serial_proxies=[proxy])
+        client = MockClient(
+            method='DELETE',
+            path='/api/ports/0/connections/0/5')
+        wrapper._handle_request(client)
+        self.assertEqual(client.respond_status, 404)
+
+    def test_disconnect_invalid_index(self):
+        wrapper = make_wrapper(serial_proxies=[])
+        client = MockClient(
+            method='DELETE',
+            path='/api/ports/0/connections/abc/0')
+        wrapper._handle_request(client)
+        self.assertEqual(client.respond_status, 400)
+
+
 class TestApiDetect(unittest.TestCase):
     def _make_port_info(self, device='/dev/ttyUSB0', vid=None, pid=None,
             serial_number=None, manufacturer=None, product=None,