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

Linting fixes + FileManager share start refactor

Browse source
This commit is contained in:
AlexSSD7 2023-09-02 12:07:30 +01:00
commit b15e2df3d3
11 changed files with 66 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

10
vm/cfg.go
View file

@ -37,7 +37,7 @@ func cleanQEMUPath(s string) string {
return path
}
func configureBaseVMCmd(logger *slog.Logger, cfg VMConfig) (string, []qemucli.Arg, error) {
func configureBaseVMCmd(logger *slog.Logger, cfg Config) (string, []qemucli.Arg, error) {
baseCmd := "qemu-system"
if osspecifics.IsWindows() {
@ -180,7 +180,7 @@ func configureVMCmdTapNetwork(tapName string) ([]qemucli.Arg, error) {
return []qemucli.Arg{netdevArg, deviceArg}, nil
}
func configureVMCmdNetworking(logger *slog.Logger, cfg VMConfig, sshPort uint16) ([]qemucli.Arg, error) {
func configureVMCmdNetworking(logger *slog.Logger, cfg Config, sshPort uint16) ([]qemucli.Arg, error) {
// SSH port config.
ports := []PortForwardingRule{{
HostIP: net.ParseIP("127.0.0.1"),
@ -211,7 +211,7 @@ func configureVMCmdNetworking(logger *slog.Logger, cfg VMConfig, sshPort uint16)
return args, nil
}
func configureVMCmdDrives(cfg VMConfig) ([]qemucli.Arg, error) {
func configureVMCmdDrives(cfg Config) ([]qemucli.Arg, error) {
var args []qemucli.Arg
for i, drive := range cfg.Drives {
@ -265,7 +265,7 @@ func configureVMCmdDrives(cfg VMConfig) ([]qemucli.Arg, error) {
return args, nil
}
func configureVMCmdUSBPassthrough(cfg VMConfig) []qemucli.Arg {
func configureVMCmdUSBPassthrough(cfg Config) []qemucli.Arg {
var args []qemucli.Arg
if len(cfg.PassthroughConfig.USB) != 0 {
@ -283,7 +283,7 @@ func configureVMCmdUSBPassthrough(cfg VMConfig) []qemucli.Arg {
return args
}
func configureVMCmdBlockDevicePassthrough(logger *slog.Logger, cfg VMConfig) ([]qemucli.Arg, error) {
func configureVMCmdBlockDevicePassthrough(logger *slog.Logger, cfg Config) ([]qemucli.Arg, error) {
var args []qemucli.Arg
if len(cfg.PassthroughConfig.Block) != 0 {

115
vm/filemanager.go
View file

@ -97,7 +97,7 @@ func (fm *FileManager) luksOpen(sc *ssh.Client, fullDevPath string) error {
return errors.Wrap(err, "write prompt to stderr")
}
pwd, err := term.ReadPassword(int(syscall.Stdin))
pwd, err := term.ReadPassword(syscall.Stdin)
if err != nil {
return errors.Wrap(err, "read luks password")
}
@ -199,17 +199,6 @@ func (fm *FileManager) Mount(devName string, mo MountOptions) error {
}
func (fm *FileManager) StartFTP(pwd string, passivePortStart uint16, passivePortCount uint16, extIP net.IP) error {
// This timeout is for the SCP client exclusively.
scpCtx, scpCtxCancel := context.WithTimeout(fm.vm.ctx, time.Second*5)
defer scpCtxCancel()
scpClient, err := fm.vm.DialSCP()
if err != nil {
return errors.Wrap(err, "dial scp")
}
defer scpClient.Close()
ftpdCfg := `anonymous_enable=NO
local_enable=YES
write_enable=YES
@ -223,45 +212,10 @@ pasv_max_port=` + fmt.Sprint(passivePortStart+passivePortCount) + `
pasv_address=` + extIP.String() + `
`
err = scpClient.CopyFile(scpCtx, strings.NewReader(ftpdCfg), "/etc/vsftpd/vsftpd.conf", "0400")
if err != nil {
return errors.Wrap(err, "copy ftpd .conf file")
}
scpClient.Close()
sc, err := fm.vm.DialSSH()
if err != nil {
return errors.Wrap(err, "dial ssh")
}
defer func() { _ = sc.Close() }()
_, err = sshutil.RunSSHCmd(fm.vm.ctx, sc, "rc-update add vsftpd && rc-service vsftpd start")
if err != nil {
return errors.Wrap(err, "add and start ftpd service")
}
err = sshutil.ChangeUnixPass(fm.vm.ctx, sc, "linsk", pwd)
if err != nil {
return errors.Wrap(err, "change unix pass")
}
return nil
return fm.startGenericShare(pwd, ftpdCfg, "/etc/vsftpd/vsftpd.conf", "vsftpd", sshutil.ChangeUnixPass)
}
func (fm *FileManager) StartSMB(pwd string) error {
// This timeout is for the SCP client exclusively.
scpCtx, scpCtxCancel := context.WithTimeout(fm.vm.ctx, time.Second*5)
defer scpCtxCancel()
scpClient, err := fm.vm.DialSCP()
if err != nil {
return errors.Wrap(err, "dial scp")
}
defer scpClient.Close()
sambaCfg := `[global]
workgroup = WORKGROUP
dos charset = cp866
@ -286,46 +240,10 @@ force user = linsk
force group = linsk
create mask = 0664
`
err = scpClient.CopyFile(scpCtx, strings.NewReader(sambaCfg), "/etc/samba/smb.conf", "0400")
if err != nil {
return errors.Wrap(err, "copy samba config file")
}
scpClient.Close()
sc, err := fm.vm.DialSSH()
if err != nil {
return errors.Wrap(err, "dial ssh")
}
defer func() { _ = sc.Close() }()
_, err = sshutil.RunSSHCmd(fm.vm.ctx, sc, "rc-update add samba && rc-service samba start")
if err != nil {
return errors.Wrap(err, "add and start samba service")
}
err = sshutil.ChangeSambaPass(fm.vm.ctx, sc, "linsk", pwd)
if err != nil {
return errors.Wrap(err, "change samba pass")
}
return nil
return fm.startGenericShare(pwd, sambaCfg, "/etc/samba/smb.conf", "samba", sshutil.ChangeSambaPass)
}
func (fm *FileManager) StartAFP(pwd string) error {
// This timeout is for the SCP client exclusively.
scpCtx, scpCtxCancel := context.WithTimeout(fm.vm.ctx, time.Second*5)
defer scpCtxCancel()
scpClient, err := fm.vm.DialSCP()
if err != nil {
return errors.Wrap(err, "dial scp")
}
defer scpClient.Close()
afpCfg := `[Global]
[linsk]
@ -337,9 +255,24 @@ force user = linsk
force group = linsk
`
err = scpClient.CopyFile(scpCtx, strings.NewReader(afpCfg), "/etc/afp.conf", "0400")
return fm.startGenericShare(pwd, afpCfg, "/etc/afp.conf", "netatalk", sshutil.ChangeUnixPass)
}
func (fm *FileManager) startGenericShare(pwd string, cfg string, cfgPath string, rcServiceName string, changePassFunc sshutil.ChangePassFunc) error {
// This timeout is for the SCP client exclusively.
scpCtx, scpCtxCancel := context.WithTimeout(fm.vm.ctx, time.Second*5)
defer scpCtxCancel()
scpClient, err := fm.vm.DialSCP()
if err != nil {
return errors.Wrap(err, "copy netatalk config file")
return errors.Wrap(err, "dial scp")
}
defer scpClient.Close()
err = scpClient.CopyFile(scpCtx, strings.NewReader(cfg), cfgPath, "0400")
if err != nil {
return errors.Wrap(err, "copy config file")
}
scpClient.Close()
@ -351,14 +284,14 @@ force group = linsk
defer func() { _ = sc.Close() }()
_, err = sshutil.RunSSHCmd(fm.vm.ctx, sc, "rc-update add netatalk && rc-service netatalk start")
_, err = sshutil.RunSSHCmd(fm.vm.ctx, sc, "rc-update add "+shellescape.Quote(rcServiceName)+" && rc-service "+shellescape.Quote(rcServiceName)+" start")
if err != nil {
return errors.Wrap(err, "add and start netatalk service")
return errors.Wrap(err, "add and start rc service")
}
err = sshutil.ChangeUnixPass(fm.vm.ctx, sc, "linsk", pwd)
err = changePassFunc(fm.vm.ctx, sc, "linsk", pwd)
if err != nil {
return errors.Wrap(err, "change unix pass")
return errors.Wrap(err, "change pass")
}
return nil

6
vm/vm.go
View file

@ -52,7 +52,7 @@ type VM struct {
disposed uint32
canceled uint32
originalCfg VMConfig
originalCfg Config
}
type DriveConfig struct {
@ -64,7 +64,7 @@ type TapConfig struct {
Name string
}
type VMConfig struct {
type Config struct {
CdromImagePath string
BIOSPath string
Drives []DriveConfig
@ -87,7 +87,7 @@ type VMConfig struct {
InstallBaseUtilities bool
}
func NewVM(logger *slog.Logger, cfg VMConfig) (*VM, error) {
func NewVM(logger *slog.Logger, cfg Config) (*VM, error) {
sshPort, err := freeport.GetFreePort()
if err != nil {
return nil, errors.Wrap(err, "get free port for ssh server")