subpackage 'keys' and 'sshkeys' into 'core'

ToeiRei · ToeiRei · commit bc53e3089af2 · 2026-02-04T21:52:31.000+01:00
diff --git a/cmd/keymaster/main.go b/cmd/keymaster/main.go
@@ -39,9 +39,9 @@ import (
 
 	// DB init/inspection delegated to internal/core facades
 	log "github.com/charmbracelet/log"
+	"github.com/toeirei/keymaster/internal/core/sshkey"
 	"github.com/toeirei/keymaster/internal/i18n"
 	"github.com/toeirei/keymaster/internal/model"
-	"github.com/toeirei/keymaster/internal/sshkey"
 	"github.com/toeirei/keymaster/internal/tui"
 	"github.com/toeirei/keymaster/internal/uiadapters"
 	"golang.org/x/crypto/ssh"
diff --git a/internal/core/deploy/audit.go b/internal/core/deploy/audit.go
@@ -10,9 +10,9 @@ import (
 	"strings"
 
 	"github.com/toeirei/keymaster/internal/core/db"
+	"github.com/toeirei/keymaster/internal/core/sshkey"
 	"github.com/toeirei/keymaster/internal/i18n"
 	"github.com/toeirei/keymaster/internal/model"
-	"github.com/toeirei/keymaster/internal/sshkey"
 	"github.com/toeirei/keymaster/internal/state"
 )
 
diff --git a/internal/core/deploy/generator.go b/internal/core/deploy/generator.go
@@ -14,7 +14,7 @@ import (
 	"time"
 
 	"github.com/toeirei/keymaster/internal/core/db"
-	"github.com/toeirei/keymaster/internal/keys"
+	"github.com/toeirei/keymaster/internal/core/keys"
 	"github.com/toeirei/keymaster/internal/model"
 )
 
diff --git a/internal/core/deploy/import.go b/internal/core/deploy/import.go
@@ -16,9 +16,9 @@ import (
 	"time"
 
 	"github.com/toeirei/keymaster/internal/core/db"
+	"github.com/toeirei/keymaster/internal/core/sshkey"
 	"github.com/toeirei/keymaster/internal/model"
 	"github.com/toeirei/keymaster/internal/security"
-	"github.com/toeirei/keymaster/internal/sshkey"
 	"github.com/toeirei/keymaster/internal/state"
 )
 
diff --git a/internal/core/deploy_audit.go b/internal/core/deploy_audit.go
@@ -10,9 +10,9 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/toeirei/keymaster/internal/core/sshkey"
 	"github.com/toeirei/keymaster/internal/i18n"
 	"github.com/toeirei/keymaster/internal/model"
-	"github.com/toeirei/keymaster/internal/sshkey"
 	"github.com/toeirei/keymaster/internal/state"
 )
 
diff --git a/internal/core/deploy_import.go b/internal/core/deploy_import.go
@@ -11,9 +11,9 @@ import (
 	"strings"
 	"time"
 
+	"github.com/toeirei/keymaster/internal/core/sshkey"
 	"github.com/toeirei/keymaster/internal/model"
 	"github.com/toeirei/keymaster/internal/security"
-	"github.com/toeirei/keymaster/internal/sshkey"
 	"github.com/toeirei/keymaster/internal/state"
 )
 
diff --git a/internal/core/facades.go b/internal/core/facades.go
@@ -23,8 +23,8 @@ import (
 	"github.com/toeirei/keymaster/internal/core/bootstrap"
 	"github.com/toeirei/keymaster/internal/i18n"
 
+	"github.com/toeirei/keymaster/internal/core/sshkey"
 	"github.com/toeirei/keymaster/internal/model"
-	"github.com/toeirei/keymaster/internal/sshkey"
 )
 
 // Option/result types (placeholders) ---------------------------------------
diff --git a/internal/core/generator.go b/internal/core/generator.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/toeirei/keymaster/internal/keys"
+	"github.com/toeirei/keymaster/internal/core/keys"
 	"github.com/toeirei/keymaster/internal/model"
 )
 
diff --git a/internal/core/keys/builder.go b/internal/core/keys/builder.go
diff --git a/internal/core/keys/builder_test.go b/internal/core/keys/builder_test.go
diff --git a/internal/core/plan.go b/internal/core/plan.go
@@ -5,7 +5,7 @@
 package core
 
 import (
-	"github.com/toeirei/keymaster/internal/keys"
+	"github.com/toeirei/keymaster/internal/core/keys"
 	"github.com/toeirei/keymaster/internal/model"
 )
 
diff --git a/internal/core/sshkey/parser.go b/internal/core/sshkey/parser.go
@@ -5,7 +5,7 @@
 // package sshkey provides utilities for parsing and validating SSH key data.
 // It includes functions to parse authorized_keys lines, extract Keymaster-specific
 // metadata, and check for weak cryptographic algorithms.
-package sshkey // import "github.com/toeirei/keymaster/internal/sshkey"
+package sshkey // import "github.com/toeirei/keymaster/internal/core/sshkey"
 
 import (
 	"fmt"
diff --git a/internal/core/sshkey/parser_test.go b/internal/core/sshkey/parser_test.go
@@ -76,8 +76,8 @@ func TestCheckHostKeyAlgorithm_FromTestKeys(t *testing.T) {
 		path          string
 		expectWarning bool
 	}{
-		{"../../testdata/ssh_host_rsa_key.pub", true},
-		{"../../testdata/ssh_host_ed25519_key.pub", false},
+		{"../../../testdata/ssh_host_rsa_key.pub", true},
+		{"../../../testdata/ssh_host_ed25519_key.pub", false},
 	}
 
 	for _, f := range files {
diff --git a/internal/tui/accounts.go b/internal/tui/accounts.go
@@ -15,9 +15,9 @@ import (
 	"github.com/charmbracelet/lipgloss"
 	"github.com/toeirei/keymaster/internal/core"
 	"github.com/toeirei/keymaster/internal/core/db"
+	"github.com/toeirei/keymaster/internal/core/sshkey"
 	"github.com/toeirei/keymaster/internal/i18n"
 	"github.com/toeirei/keymaster/internal/model"
-	"github.com/toeirei/keymaster/internal/sshkey"
 	"github.com/toeirei/keymaster/internal/ui"
 	"golang.org/x/crypto/ssh"
 )
diff --git a/internal/tui/adapters_core.go b/internal/tui/adapters_core.go
@@ -12,7 +12,7 @@ import (
 	"github.com/toeirei/keymaster/internal/config"
 	"github.com/toeirei/keymaster/internal/core"
 	"github.com/toeirei/keymaster/internal/core/db"
-	"github.com/toeirei/keymaster/internal/keys"
+	"github.com/toeirei/keymaster/internal/core/keys"
 	"github.com/toeirei/keymaster/internal/model"
 	"github.com/toeirei/keymaster/internal/security"
 	_ "github.com/toeirei/keymaster/internal/ui"
diff --git a/internal/tui/bootstrap.go b/internal/tui/bootstrap.go
@@ -24,8 +24,8 @@ import (
 	"github.com/toeirei/keymaster/internal/core"
 	"github.com/toeirei/keymaster/internal/core/bootstrap"
 	"github.com/toeirei/keymaster/internal/core/db"
+	"github.com/toeirei/keymaster/internal/core/keys"
 	"github.com/toeirei/keymaster/internal/i18n"
-	"github.com/toeirei/keymaster/internal/keys"
 	"github.com/toeirei/keymaster/internal/model"
 	"github.com/toeirei/keymaster/internal/security"
 	"golang.org/x/crypto/ssh"
diff --git a/internal/tui/public_key_form.go b/internal/tui/public_key_form.go
@@ -15,8 +15,8 @@ import (
 	"github.com/charmbracelet/bubbles/textinput"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
+	"github.com/toeirei/keymaster/internal/core/sshkey"
 	"github.com/toeirei/keymaster/internal/i18n"
-	"github.com/toeirei/keymaster/internal/sshkey"
 	"github.com/toeirei/keymaster/internal/ui"
 )
 
diff --git a/internal/uiadapters/store.go b/internal/uiadapters/store.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/toeirei/keymaster/internal/core"
 	"github.com/toeirei/keymaster/internal/core/db"
-	"github.com/toeirei/keymaster/internal/keys"
+	"github.com/toeirei/keymaster/internal/core/keys"
 	"github.com/toeirei/keymaster/internal/logging"
 	"github.com/toeirei/keymaster/internal/model"
 )

Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,9 @@ import (`
`10`	`10`	`"strings"`
`11`	`11`
`12`	`12`	`"github.com/toeirei/keymaster/internal/core/db"`
	`13`	`+ "github.com/toeirei/keymaster/internal/core/sshkey"`
`13`	`14`	`"github.com/toeirei/keymaster/internal/i18n"`
`14`	`15`	`"github.com/toeirei/keymaster/internal/model"`
`15`		`- "github.com/toeirei/keymaster/internal/sshkey"`
`16`	`16`	`"github.com/toeirei/keymaster/internal/state"`
`17`	`17`	`)`
`18`	`18`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ import (`
`14`	`14`	`"time"`
`15`	`15`
`16`	`16`	`"github.com/toeirei/keymaster/internal/core/db"`
`17`		`- "github.com/toeirei/keymaster/internal/keys"`
	`17`	`+ "github.com/toeirei/keymaster/internal/core/keys"`
`18`	`18`	`"github.com/toeirei/keymaster/internal/model"`
`19`	`19`	`)`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -16,9 +16,9 @@ import (`
`16`	`16`	`"time"`
`17`	`17`
`18`	`18`	`"github.com/toeirei/keymaster/internal/core/db"`
	`19`	`+ "github.com/toeirei/keymaster/internal/core/sshkey"`
`19`	`20`	`"github.com/toeirei/keymaster/internal/model"`
`20`	`21`	`"github.com/toeirei/keymaster/internal/security"`
`21`		`- "github.com/toeirei/keymaster/internal/sshkey"`
`22`	`22`	`"github.com/toeirei/keymaster/internal/state"`
`23`	`23`	`)`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,9 @@ import (`
`11`	`11`	`"strings"`
`12`	`12`	`"time"`
`13`	`13`
	`14`	`+ "github.com/toeirei/keymaster/internal/core/sshkey"`
`14`	`15`	`"github.com/toeirei/keymaster/internal/model"`
`15`	`16`	`"github.com/toeirei/keymaster/internal/security"`
`16`		`- "github.com/toeirei/keymaster/internal/sshkey"`
`17`	`17`	`"github.com/toeirei/keymaster/internal/state"`
`18`	`18`	`)`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,8 @@ import (`
`23`	`23`	`"github.com/toeirei/keymaster/internal/core/bootstrap"`
`24`	`24`	`"github.com/toeirei/keymaster/internal/i18n"`
`25`	`25`
	`26`	`+ "github.com/toeirei/keymaster/internal/core/sshkey"`
`26`	`27`	`"github.com/toeirei/keymaster/internal/model"`
`27`		`- "github.com/toeirei/keymaster/internal/sshkey"`
`28`	`28`	`)`
`29`	`29`
`30`	`30`	`// Option/result types (placeholders) ---------------------------------------`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import (`
`10`	`10`	`"strings"`
`11`	`11`	`"time"`
`12`	`12`
`13`		`- "github.com/toeirei/keymaster/internal/keys"`
	`13`	`+ "github.com/toeirei/keymaster/internal/core/keys"`
`14`	`14`	`"github.com/toeirei/keymaster/internal/model"`
`15`	`15`	`)`
`16`	`16`