From fa45351ec5cda7a5f11c45c0c4d1d3b41a381a82 Mon Sep 17 00:00:00 2001
From: Myzel394 <github.7a2op@simplelogin.co>
Date: Sun, 4 May 2025 22:21:20 +0200
Subject: [PATCH] fix(server): Fix SSH fields

Signed-off-by: Myzel394 <github.7a2op@simplelogin.co>
---
 server/handlers/sshd_config/fields/fields.go  | 47 ++++++++++---------
 server/handlers/sshd_config/fields/options.go |  1 +
 2 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/server/handlers/sshd_config/fields/fields.go b/server/handlers/sshd_config/fields/fields.go
index f18893e..d7eaf1b 100644
--- a/server/handlers/sshd_config/fields/fields.go
+++ b/server/handlers/sshd_config/fields/fields.go
@@ -83,31 +83,36 @@ See PATTERNS in ssh_config(5) for more information on patterns. This keyword may
 					},
 				},
 				docvalues.ArrayValue{
-					Separator:           ",",
-					DuplicatesExtractor: &docvalues.SimpleDuplicatesExtractor,
+					Separator:           " ",
+					DuplicatesExtractor: nil,
 					RespectQuotes:       true,
-					SubValue: docvalues.EnumValue{
-						EnforceValues: true,
-						Values: []docvalues.EnumString{
-							docvalues.CreateEnumString("none"),
+					SubValue: docvalues.ArrayValue{
+						Separator:           ",",
+						DuplicatesExtractor: &docvalues.SimpleDuplicatesExtractor,
+						RespectQuotes:       true,
+						SubValue: docvalues.EnumValue{
+							EnforceValues: true,
+							Values: []docvalues.EnumString{
+								docvalues.CreateEnumString("none"),
 
-							docvalues.CreateEnumString("password"),
-							docvalues.CreateEnumString("publickey"),
-							docvalues.CreateEnumString("gssapi-with-mic"),
-							docvalues.CreateEnumString("keyboard-interactive"),
-							docvalues.CreateEnumString("hostbased"),
+								docvalues.CreateEnumString("password"),
+								docvalues.CreateEnumString("publickey"),
+								docvalues.CreateEnumString("gssapi-with-mic"),
+								docvalues.CreateEnumString("keyboard-interactive"),
+								docvalues.CreateEnumString("hostbased"),
 
-							docvalues.CreateEnumString("password:bsdauth"),
-							docvalues.CreateEnumString("publickey:bsdauth"),
-							docvalues.CreateEnumString("gssapi-with-mic:bsdauth"),
-							docvalues.CreateEnumString("keyboard-interactive:bsdauth"),
-							docvalues.CreateEnumString("hostbased:bsdauth"),
+								docvalues.CreateEnumString("password:bsdauth"),
+								docvalues.CreateEnumString("publickey:bsdauth"),
+								docvalues.CreateEnumString("gssapi-with-mic:bsdauth"),
+								docvalues.CreateEnumString("keyboard-interactive:bsdauth"),
+								docvalues.CreateEnumString("hostbased:bsdauth"),
 
-							docvalues.CreateEnumString("password:pam"),
-							docvalues.CreateEnumString("publickey:pam"),
-							docvalues.CreateEnumString("gssapi-with-mic:pam"),
-							docvalues.CreateEnumString("keyboard-interactive:pam"),
-							docvalues.CreateEnumString("hostbased:pam"),
+								docvalues.CreateEnumString("password:pam"),
+								docvalues.CreateEnumString("publickey:pam"),
+								docvalues.CreateEnumString("gssapi-with-mic:pam"),
+								docvalues.CreateEnumString("keyboard-interactive:pam"),
+								docvalues.CreateEnumString("hostbased:pam"),
+							},
 						},
 					},
 				},
diff --git a/server/handlers/sshd_config/fields/options.go b/server/handlers/sshd_config/fields/options.go
index 4f9f233..f52ba9f 100644
--- a/server/handlers/sshd_config/fields/options.go
+++ b/server/handlers/sshd_config/fields/options.go
@@ -8,4 +8,5 @@ var AllowedDuplicateOptions = map[NormalizedOptionName]struct{}{
 	"listenaddress": {},
 	"match":         {},
 	"port":          {},
+	"hostkey":       {},
 }