From 11c488215620d12c1f79fc9b05deb9928d2cab39 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 16 Nov 2020 14:03:21 +0100
Subject: [sysconfig] SSH: Split pubkey and rest of config, add more options

Now we can have exactly one SSH-Config per sysconfig, which avoids
confusion due to config mismatch regarding "allow pw" and "port".
The install include takes care of splitting the key into a new module
for existing modules, but doesn't remove duplicate SshConfig modules
from sysconfigs, as this might lead to additional confusion. Next time
the user edits a sysconfig, they are forced to pick exactly one
SshConfig module.

The "allow password login" option was extended to allow password login
for non-root users only in addition to simply being "yes" or "no".
There's an additional option that can entirely limit the group of users
allowed to log in via SSH.
---
 .../sysconfig/templates/sshconfig-start.html       | 33 +++++++++++++---------
 1 file changed, 19 insertions(+), 14 deletions(-)

(limited to 'modules-available/sysconfig/templates/sshconfig-start.html')

diff --git a/modules-available/sysconfig/templates/sshconfig-start.html b/modules-available/sysconfig/templates/sshconfig-start.html
index 33108161..df39feb0 100644
--- a/modules-available/sysconfig/templates/sshconfig-start.html
+++ b/modules-available/sysconfig/templates/sshconfig-start.html
@@ -5,33 +5,38 @@
 		<span class="input-group-addon">{{lang_moduleName}}</span>
 		<input type="text" name="title" value="{{title}}" class="form-control" autofocus="autofocus">
 	</div>
+	<br>
 	<div class="form-group">
-		<div class="checkbox">
-			<input type="checkbox" name="allowPasswordLogin" value="yes" {{#apl}}checked{{/apl}}>
-			<label><b>{{lang_allowPass}}</b></label>
-		</div>
+		<label>{{lang_sshAllowedUsers}}
+			<select class="form-control" name="allowedUsersLogin">
+				<option value="ROOT_ONLY" {{USR_ROOT_ONLY_selected}}>{{lang_user_root_only}}</option>
+				<option value="USER_ONLY" {{USR_USER_ONLY_selected}}>{{lang_user_user_only}}</option>
+				<option value="ALL" {{USR_ALL_selected}}>{{lang_user_all}}</option>
+			</select>
+		</label>
 		<div>
-			<i>{{lang_allowPassInfo}}</i>
+			<i>{{lang_sshAllowedUsersInfo}}</i>
 		</div>
 	</div>
 	<div class="form-group">
-		<label for="root-key">{{lang_rootKey}}</label>
-		<input class="form-control" type="text" name="publicKey" value="{{publicKey}}" id="root-key" pattern="[a-z0-9\-]+ +[a-zA-Z0-9=/\+]+ +.*">
-		<i>{{lang_rootKeyInfo}}</i>
+		<label>{{lang_sshAllowPass}}
+			<select class="form-control" name="allowPasswordLogin">
+				<option value="NO" {{PWD_NO_selected}}>{{lang_no}}</option>
+				<option value="USER_ONLY" {{PWD_USER_ONLY_selected}}>{{lang_pwlogin_user_only}}</option>
+				<option value="YES" {{PWD_YES_selected}}>{{lang_yes}}</option>
+			</select>
+		</label>
+		<div>
+			<i>{{lang_sshAllowPassInfo}}</i>
+		</div>
 	</div>
 	<div class="form-group">
 		<label for="port">{{lang_listenPort}}</label>
 		<input class="form-control" type="text" name="listenPort" value="{{listenPort}}" id="port" pattern="\d+" placeholder="22">
 		<i>{{lang_listenPortInfo}}</i>
 	</div>
-	<p>
-		<i>
-			{{lang_sshMultipleHeadsup}}
-		</i>
-	</p>
 	<div class="btn-group pull-right">
 		<button type="submit" class="btn btn-primary"><span class="glyphicon glyphicon-floppy-disk"></span> {{lang_save}}</button>
 	</div>
 	<div class="clearfix"></div>
 </form>
-
-- 
cgit v1.2.3-55-g7522