Add support for removing configs with associated SSH keys

Author: cortiz

README.md

@@ -75,6 +75,9 @@ sshc edit config my-server --user new-admin --host new-example.com
 
 # Remove a managed config
 sshc rm config my-server
+
+# Remove a config and its associated SSH key
+sshc rm config my-server --delete-key
 ```
 
 ## Examples

internal/cmd/rm.go

@@ -8,6 +8,10 @@ import (
 	"github.com/spf13/cobra"
 )
 
+var (
+	deleteKey bool
+)
+
 var rmCmd = &cobra.Command{
 	Use:   "rm",
 	Short: "Remove SSH configuration or keys",
@@ -24,16 +28,30 @@ var rmConfigCmd = &cobra.Command{
 			return err
 		}
 
-		if err := m.RemoveConfig(name); err != nil {
+		idFile, err := m.RemoveConfigWithKey(name, deleteKey)
+		if err != nil {
 			return err
 		}
 
-		fmt.Printf("Config %s removed successfully\n", name)
+		if deleteKey {
+			if idFile != "" {
+				fmt.Printf("Config %s and its key %s removed successfully\n", name, idFile)
+			} else {
+				fmt.Printf("Config %s removed successfully (no identity file found to delete)\n", name)
+			}
+		} else {
+			fmt.Printf("Config %s removed successfully\n", name)
+			if idFile != "" {
+				fmt.Printf("Warning: SSH key %s was not deleted. Use --delete-key to remove it.\n", idFile)
+			}
+		}
+
 		return nil
 	},
 }
 
 func init() {
+	rmConfigCmd.Flags().BoolVar(&deleteKey, "delete-key", false, "Delete the associated SSH key")
 	rmCmd.AddCommand(rmConfigCmd)
 	rootCmd.AddCommand(rmCmd)
 }

internal/config/manager.go

@@ -93,14 +93,41 @@ func (m *Manager) AddConfig(name string, content string) error {
 }
 
 func (m *Manager) RemoveConfig(name string) error {
+	_, err := m.RemoveConfigWithKey(name, false)
+	return err
+}
+
+func (m *Manager) RemoveConfigWithKey(name string, deleteKey bool) (string, error) {
 	configPath := m.GetConfigPath(name)
-	if err := os.Remove(configPath); err != nil {
+	content, err := os.ReadFile(configPath)
+	if err != nil {
 		if os.IsNotExist(err) {
-			return fmt.Errorf("config %s does not exist", name)
+			return "", fmt.Errorf("config %s does not exist", name)
 		}
-		return fmt.Errorf("failed to remove config %s: %w", name, err)
+		return "", fmt.Errorf("failed to read config %s: %w", name, err)
 	}
-	return nil
+
+	var identityFile string
+	for line := range strings.SplitSeq(string(content), "\n") {
+		trimmed := strings.TrimSpace(line)
+		if strings.HasPrefix(strings.ToLower(trimmed), "identityfile ") {
+			identityFile = strings.TrimSpace(trimmed[len("identityfile "):])
+			break
+		}
+	}
+
+	if err := os.Remove(configPath); err != nil {
+		return "", fmt.Errorf("failed to remove config %s: %w", name, err)
+	}
+
+	if deleteKey && identityFile != "" {
+		// Try to remove the private key
+		_ = os.Remove(identityFile)
+		// Try to remove the public key
+		_ = os.Remove(identityFile + ".pub")
+	}
+
+	return identityFile, nil
 }
 
 type ConfigOptions struct {

internal/config/manager_test.go

@@ -150,6 +150,69 @@ func TestManager_AddRemoveConfig(t *testing.T) {
 	}
 }
 
+func TestManager_RemoveConfig_WithKey(t *testing.T) {
+	tmpDir, err := os.MkdirTemp("", "sshc-test-rm-key")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer os.RemoveAll(tmpDir)
+
+	m := &Manager{
+		SshDir: tmpDir,
+	}
+	_ = m.Init()
+
+	name := "key-config"
+	keyPath := filepath.Join(tmpDir, "test-key")
+	content := "Host test\n  IdentityFile " + keyPath
+
+	// Create dummy key files
+	if err := os.WriteFile(keyPath, []byte("private"), 0600); err != nil {
+		t.Fatal(err)
+	}
+	if err := os.WriteFile(keyPath+".pub", []byte("public"), 0644); err != nil {
+		t.Fatal(err)
+	}
+
+	if err := m.AddConfig(name, content); err != nil {
+		t.Fatal(err)
+	}
+
+	// 1. Remove WITHOUT deleting key
+	idFile, err := m.RemoveConfigWithKey(name, false)
+	if err != nil {
+		t.Errorf("RemoveConfigWithKey(false) error = %v", err)
+	}
+	if idFile != keyPath {
+		t.Errorf("Expected idFile %s, got %s", keyPath, idFile)
+	}
+
+	// Verify key still exists
+	if _, err := os.Stat(keyPath); os.IsNotExist(err) {
+		t.Errorf("Key should still exist")
+	}
+
+	// 2. Add back and remove WITH deleting key
+	if err := m.AddConfig(name, content); err != nil {
+		t.Fatal(err)
+	}
+	idFile, err = m.RemoveConfigWithKey(name, true)
+	if err != nil {
+		t.Errorf("RemoveConfigWithKey(true) error = %v", err)
+	}
+	if idFile != keyPath {
+		t.Errorf("Expected idFile %s, got %s", keyPath, idFile)
+	}
+
+	// Verify key is deleted
+	if _, err := os.Stat(keyPath); !os.IsNotExist(err) {
+		t.Errorf("Key should be deleted")
+	}
+	if _, err := os.Stat(keyPath + ".pub"); !os.IsNotExist(err) {
+		t.Errorf("Public key should be deleted")
+	}
+}
+
 func TestManager_ListConfigs_Sorted(t *testing.T) {
 	tmpDir, err := os.MkdirTemp("", "sshc-test-list")
 	if err != nil {