forks/linsk
forks/linsk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minor things

Browse source
This commit is contained in:
AlexSSD7 2023-08-30 15:24:25 +01:00
commit 41d8cb42c9
5 changed files with 47 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

36
cmd/run.go
View file

@ -14,7 +14,7 @@ import (
var runCmd = &cobra.Command{
Use: "run",
Short: "Start a VM and expose a file share.",
Short: "Start a VM and expose an FTP file share.",
Args: cobra.ExactArgs(3),
Run: func(cmd *cobra.Command, args []string) {
vmMountDevName := args[1]
@ -28,8 +28,24 @@ var runCmd = &cobra.Command{
os.Exit(1)
}
ftpListenIP := net.ParseIP(ftpListenAddrFlag)
if ftpListenIP == nil {
slog.Error("Invalid FTP listen address specified", "value", ftpListenAddrFlag)
os.Exit(1)
}
ftpExtIP := net.ParseIP(ftpExtIPFlag)
if ftpExtIP == nil {
slog.Error("Invalid FTP external IP specified", "value", ftpExtIPFlag)
os.Exit(1)
}
if ftpListenAddrFlag != defaultFTPListenAddr && ftpExtIPFlag == defaultFTPListenAddr {
slog.Warn("No external FTP IP address via --ftp-extip was configured. This is a requirement in almost all scenarios if you want to connect remotely.")
}
ports := []vm.PortForwardingRule{{
HostIP: net.ParseIP("127.0.0.1"), // TODO: Make this changeable.
HostIP: ftpListenIP,
HostPort: networkSharePort,
VMPort: 21,
}}
@ -37,7 +53,7 @@ var runCmd = &cobra.Command{
for i := uint16(0); i < ftpPassivePortCount; i++ {
p := networkSharePort + 1 + i
ports = append(ports, vm.PortForwardingRule{
HostIP: net.ParseIP("127.0.0.1"), // TODO: Make this changeable.
HostIP: ftpListenIP,
HostPort: p,
VMPort: p,
})
@ -61,7 +77,7 @@ var runCmd = &cobra.Command{
return 1
}
err = fm.StartFTP(sharePWD, networkSharePort+1, ftpPassivePortCount)
err = fm.StartFTP(sharePWD, networkSharePort+1, ftpPassivePortCount, ftpExtIP)
if err != nil {
slog.Error("Failed to start FTP server", "error", err.Error())
return 1
@ -69,9 +85,9 @@ var runCmd = &cobra.Command{
slog.Info("Started the network share successfully", "type", "ftp")
shareURI := "ftp://linsk:" + sharePWD + "@localhost:" + fmt.Sprint(networkSharePort)
shareURI := "ftp://linsk:" + sharePWD + "@" + ftpExtIP.String() + ":" + fmt.Sprint(networkSharePort)
fmt.Fprintf(os.Stderr, "================\n[Network File Share Config]\nThe network file share was started. Please use the credentials below to connect to the file server.\n\nType: FTP\nServer Address: ftp://localhost:%v\nUsername: linsk\nPassword: %v\n\nShare URI: %v\n================\n", networkSharePort, sharePWD, shareURI)
fmt.Fprintf(os.Stderr, "================\n[Network File Share Config]\nThe network file share was started. Please use the credentials below to connect to the file server.\n\nType: FTP\nServer Address: ftp://%v:%v\nUsername: linsk\nPassword: %v\n\nShare URI: %v\n================\n", ftpExtIP.String(), networkSharePort, sharePWD, shareURI)
<-ctx.Done()
return 0
@ -80,7 +96,13 @@ var runCmd = &cobra.Command{
}
var luksFlag bool
var ftpListenAddrFlag string
var ftpExtIPFlag string
const defaultFTPListenAddr = "127.0.0.1"
func init() {
runCmd.Flags().BoolVarP(&luksFlag, "luks", "l", false, "Use cryptsetup to open a LUKS volume (password will be prompted)")
runCmd.Flags().BoolVarP(&luksFlag, "luks", "l", false, "Use cryptsetup to open a LUKS volume (password will be prompted).")
runCmd.Flags().StringVar(&ftpListenAddrFlag, "ftp-listen", defaultFTPListenAddr, "Specifies the address to bind the FTP ports to. NOTE: Changing bind address is not enough to connect remotely. You should also specify --ftp-extip.")
runCmd.Flags().StringVar(&ftpExtIPFlag, "ftp-extip", defaultFTPListenAddr, "Specifies the external IP the FTP server should advertise.")
}