From 41b9bea023c4fe633e12a7eaeef128bb91c19c75 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 13 Mar 2021 18:41:16 +0100
Subject: console-server: T3407: can not reuse device used for "system console"

A user can specify both "set system console device ttyS0 speed '9600'" and
"set service console-server device ttyS0 speed 9600". A serial interface can
not be used multiple times.

commit now produces an error:

   vyos@vyos# commit
   [ service console-server ]
   Port "ttyS0" requires speed to be set!

(cherry picked from commit 7620a8a1d6d20d4bf16e714a9d40b7bdfb133b39)
---
 src/conf_mode/service_console-server.py | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/conf_mode/service_console-server.py b/src/conf_mode/service_console-server.py
index 6e94a19ae..51050e702 100755
--- a/src/conf_mode/service_console-server.py
+++ b/src/conf_mode/service_console-server.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2018-2020 VyOS maintainers and contributors
+# Copyright (C) 2018-2021 VyOS maintainers and contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 or later as
@@ -17,6 +17,7 @@
 import os
 
 from sys import exit
+from psutil import process_iter
 
 from vyos.config import Config
 from vyos.configdict import dict_merge
@@ -60,14 +61,19 @@ def verify(proxy):
     if not proxy:
         return None
 
+    processes = process_iter(['name', 'cmdline'])
     if 'device' in proxy:
-        for device in proxy['device']:
-            if 'speed' not in proxy['device'][device]:
-                raise ConfigError(f'Serial port speed must be defined for "{device}"!')
+        for device, device_config in proxy['device'].items():
+            for process in processes:
+                if 'agetty' in process.name() and device in process.cmdline():
+                    raise ConfigError(f'Port "{device}" already provides a '\
+                                      'console used by "system console"!')
+
+            if 'speed' not in device_config:
+                raise ConfigError(f'Port "{device}" requires speed to be set!')
 
-            if 'ssh' in proxy['device'][device]:
-                if 'port' not in proxy['device'][device]['ssh']:
-                    raise ConfigError(f'SSH port must be defined for "{device}"!')
+            if 'ssh' in device_config and 'port' not in device_config['ssh']:
+                raise ConfigError(f'Port "{device}" requires SSH port to be set!')
 
     return None
 
@@ -77,13 +83,13 @@ def generate(proxy):
 
     render(config_file, 'conserver/conserver.conf.tmpl', proxy)
     if 'device' in proxy:
-        for device in proxy['device']:
-            if 'ssh' not in proxy['device'][device]:
+        for device, device_config in proxy['device'].items():
+            if 'ssh' not in device_config:
                 continue
 
             tmp = {
                 'device' : device,
-                'port' : proxy['device'][device]['ssh']['port'],
+                'port' : device_config['ssh']['port'],
             }
             render(dropbear_systemd_file.format(**tmp),
                    'conserver/dropbear@.service.tmpl', tmp)
@@ -102,10 +108,10 @@ def apply(proxy):
     call('systemctl restart conserver-server.service')
 
     if 'device' in proxy:
-        for device in proxy['device']:
-            if 'ssh' not in proxy['device'][device]:
+        for device, device_config in proxy['device'].items():
+            if 'ssh' not in device_config:
                 continue
-            port = proxy['device'][device]['ssh']['port']
+            port = device_config['ssh']['port']
             call(f'systemctl restart dropbear@{port}.service')
 
     return None
-- 
cgit v1.2.3