Diff
1diff --git a/server/config/config.go b/server/config/config.go
2index c9665755bf246cfbc63c78d58ee9ed455f180d59..978fccc722013374c9c2fdb7b901609fbc5c811a 100644
3--- a/server/config/config.go
4+++ b/server/config/config.go
5@@ -288,12 +288,11 @@ func (c *Config) validate() error {
6 func parseAuthKeys(aks []string) []ssh.PublicKey {
7 pks := make([]ssh.PublicKey, 0)
8 for _, key := range aks {
9- var ak string
10 if bts, err := os.ReadFile(key); err == nil {
11 // key is a file
12- ak = strings.TrimSpace(string(bts))
13+ key = strings.TrimSpace(string(bts))
14 }
15- if pk, _, err := backend.ParseAuthorizedKey(ak); err == nil {
16+ if pk, _, err := backend.ParseAuthorizedKey(key); err == nil {
17 pks = append(pks, pk)
18 }
19 }
20diff --git a/server/config/config_test.go b/server/config/config_test.go
21index cd4a90198cc1f14ca1bdfaf88f242a5d26749226..f4cc8f16942db8b1b50735f8fd91803ca6d3a8aa 100644
22--- a/server/config/config_test.go
23+++ b/server/config/config_test.go
24@@ -20,8 +20,8 @@ func TestParseMultipleKeys(t *testing.T) {
25 })
26 cfg := DefaultConfig()
27 is.Equal(cfg.InitialAdminKeys, []string{
28- "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINMwLvyV3ouVrTysUYGoJdl5Vgn5BACKov+n9PlzfPwH a@b",
29- "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFxIobhwtfdwN7m1TFt9wx3PsfvcAkISGPxmbmbauST8 a@b",
30+ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINMwLvyV3ouVrTysUYGoJdl5Vgn5BACKov+n9PlzfPwH",
31+ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFxIobhwtfdwN7m1TFt9wx3PsfvcAkISGPxmbmbauST8",
32 })
33 }
34
35@@ -39,8 +39,8 @@ func TestMergeInitAdminKeys(t *testing.T) {
36 cfg, err := ParseConfig(fp)
37 is.NoErr(err)
38 is.Equal(cfg.InitialAdminKeys, []string{
39- "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINMwLvyV3ouVrTysUYGoJdl5Vgn5BACKov+n9PlzfPwH a@b",
40- "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFxIobhwtfdwN7m1TFt9wx3PsfvcAkISGPxmbmbauST8 a@b",
41+ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINMwLvyV3ouVrTysUYGoJdl5Vgn5BACKov+n9PlzfPwH",
42+ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFxIobhwtfdwN7m1TFt9wx3PsfvcAkISGPxmbmbauST8",
43 })
44 }
45
46@@ -60,6 +60,6 @@ func TestValidateInitAdminKeys(t *testing.T) {
47 cfg, err := ParseConfig(fp)
48 is.NoErr(err)
49 is.Equal(cfg.InitialAdminKeys, []string{
50- "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINMwLvyV3ouVrTysUYGoJdl5Vgn5BACKov+n9PlzfPwH a@b",
51+ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINMwLvyV3ouVrTysUYGoJdl5Vgn5BACKov+n9PlzfPwH",
52 })
53 }