From 89e36f2c902dda28e738286aa6be99302eaa552f Mon Sep 17 00:00:00 2001 From: Ayman Bagabas Date: Thu, 27 Apr 2023 11:30:15 -0400 Subject: [PATCH] fix(config): server config tests --- server/config/config.go | 5 ++--- server/config/config_test.go | 10 +++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/server/config/config.go b/server/config/config.go index c9665755bf246cfbc63c78d58ee9ed455f180d59..978fccc722013374c9c2fdb7b901609fbc5c811a 100644 --- a/server/config/config.go +++ b/server/config/config.go @@ -288,12 +288,11 @@ func (c *Config) validate() error { func parseAuthKeys(aks []string) []ssh.PublicKey { pks := make([]ssh.PublicKey, 0) for _, key := range aks { - var ak string if bts, err := os.ReadFile(key); err == nil { // key is a file - ak = strings.TrimSpace(string(bts)) + key = strings.TrimSpace(string(bts)) } - if pk, _, err := backend.ParseAuthorizedKey(ak); err == nil { + if pk, _, err := backend.ParseAuthorizedKey(key); err == nil { pks = append(pks, pk) } } diff --git a/server/config/config_test.go b/server/config/config_test.go index cd4a90198cc1f14ca1bdfaf88f242a5d26749226..f4cc8f16942db8b1b50735f8fd91803ca6d3a8aa 100644 --- a/server/config/config_test.go +++ b/server/config/config_test.go @@ -20,8 +20,8 @@ func TestParseMultipleKeys(t *testing.T) { }) cfg := DefaultConfig() is.Equal(cfg.InitialAdminKeys, []string{ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINMwLvyV3ouVrTysUYGoJdl5Vgn5BACKov+n9PlzfPwH a@b", - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFxIobhwtfdwN7m1TFt9wx3PsfvcAkISGPxmbmbauST8 a@b", + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINMwLvyV3ouVrTysUYGoJdl5Vgn5BACKov+n9PlzfPwH", + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFxIobhwtfdwN7m1TFt9wx3PsfvcAkISGPxmbmbauST8", }) } @@ -39,8 +39,8 @@ func TestMergeInitAdminKeys(t *testing.T) { cfg, err := ParseConfig(fp) is.NoErr(err) is.Equal(cfg.InitialAdminKeys, []string{ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINMwLvyV3ouVrTysUYGoJdl5Vgn5BACKov+n9PlzfPwH a@b", - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFxIobhwtfdwN7m1TFt9wx3PsfvcAkISGPxmbmbauST8 a@b", + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINMwLvyV3ouVrTysUYGoJdl5Vgn5BACKov+n9PlzfPwH", + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFxIobhwtfdwN7m1TFt9wx3PsfvcAkISGPxmbmbauST8", }) } @@ -60,6 +60,6 @@ func TestValidateInitAdminKeys(t *testing.T) { cfg, err := ParseConfig(fp) is.NoErr(err) is.Equal(cfg.InitialAdminKeys, []string{ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINMwLvyV3ouVrTysUYGoJdl5Vgn5BACKov+n9PlzfPwH a@b", + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINMwLvyV3ouVrTysUYGoJdl5Vgn5BACKov+n9PlzfPwH", }) }