remove keygen dependency and update default ssh host key path
+1
-15
+1
-12
cmd/up.go
+1
-12
cmd/up.go
···
23
23
_ "embed"
24
24
25
25
"github.com/caddyserver/certmagic"
26
-
"github.com/charmbracelet/keygen"
27
26
"github.com/charmbracelet/ssh"
28
27
"github.com/creack/pty"
29
28
"github.com/pkg/sftp"
···
277
276
}
278
277
279
278
hostKeyPath := utils.ExpandTilde(flags.sshHostKey)
280
-
if !cmd.Flags().Changed("ssh-host-key") && !utils.FileExists(utils.ExpandTilde(hostKeyPath)) {
281
-
kp, err := keygen.New(hostKeyPath, keygen.WithKeyType(keygen.Ed25519))
282
-
if err != nil {
283
-
return fmt.Errorf("failed to generate ssh key: %v", err)
284
-
}
285
-
286
-
if err := kp.WriteKeys(); err != nil {
287
-
return fmt.Errorf("failed to write ssh key: %v", err)
288
-
}
289
-
}
290
279
291
280
server.SetOption(ssh.HostKeyFile(hostKeyPath))
292
281
···
311
300
312
301
cmd.Flags().StringVar(&flags.addr, "addr", "", "address to listen on")
313
302
cmd.Flags().StringVar(&flags.sshAddr, "ssh-addr", "", "address to listen on for ssh/sftp")
314
-
cmd.Flags().StringVar(&flags.sshHostKey, "ssh-host-key", "~/.ssh/smallweb", "ssh host key")
303
+
cmd.Flags().StringVar(&flags.sshHostKey, "ssh-host-key", "~/.ssh/id_ed25519", "ssh host key")
315
304
cmd.Flags().BoolVar(&flags.onDemandTLS, "on-demand-tls", false, "enable on-demand TLS")
316
305
cmd.Flags().StringVar(&flags.cert, "cert", "", "tls certificate file")
317
306
cmd.Flags().StringVar(&flags.key, "key", "", "key file")
-1
go.mod
-1
go.mod
···
23
23
require (
24
24
github.com/caddyserver/certmagic v0.21.4
25
25
github.com/carapace-sh/carapace v1.5.0
26
-
github.com/charmbracelet/keygen v0.5.1
27
26
github.com/charmbracelet/ssh v0.0.0-20241211182756-4fe22b0f1b7c
28
27
github.com/creack/pty v1.1.21
29
28
github.com/fsnotify/fsnotify v1.8.0
-2
go.sum
-2
go.sum
···
118
118
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
119
119
github.com/charmbracelet/glamour v0.8.0 h1:tPrjL3aRcQbn++7t18wOpgLyl8wrOHUEDS7IZ68QtZs=
120
120
github.com/charmbracelet/glamour v0.8.0/go.mod h1:ViRgmKkf3u5S7uakt2czJ272WSg2ZenlYEZXT2x7Bjw=
121
-
github.com/charmbracelet/keygen v0.5.1 h1:zBkkYPtmKDVTw+cwUyY6ZwGDhRxXkEp0Oxs9sqMLqxI=
122
-
github.com/charmbracelet/keygen v0.5.1/go.mod h1:zznJVmK/GWB6dAtjluqn2qsttiCBhA5MZSiwb80fcHw=
123
121
github.com/charmbracelet/lipgloss v0.13.0 h1:4X3PPeoWEDCMvzDvGmTajSyYPcZM4+y8sCA/SsA3cjw=
124
122
github.com/charmbracelet/lipgloss v0.13.0/go.mod h1:nw4zy0SBX/F/eAO1cWdcvy6qnkDUxr8Lw7dvFrAIbbY=
125
123
github.com/charmbracelet/ssh v0.0.0-20241211182756-4fe22b0f1b7c h1:treQxMBdI2PaD4eOYfFux8stfCkUxhuUxaqGcxKqVpI=