mirror of
https://github.com/tuna/tunasync.git
synced 2025-04-20 20:04:58 +00:00
Let user create ZFS dataset manually due to security considerations
This commit is contained in:
parent
ff3e690497
commit
96cb975412
@ -3,6 +3,7 @@ package worker
|
|||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
|
"os/user"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/codeskyblue/go-sh"
|
"github.com/codeskyblue/go-sh"
|
||||||
@ -21,25 +22,32 @@ func newZfsHook(provider mirrorProvider, zpool string) *zfsHook {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// create zfs dataset for a new mirror
|
func (z *zfsHook) printHelpMessage() {
|
||||||
|
zfsDataset := fmt.Sprintf("%s/%s", z.zpool, z.provider.Name())
|
||||||
|
zfsDataset = strings.ToLower(zfsDataset)
|
||||||
|
workingDir := z.provider.WorkingDir()
|
||||||
|
logger.Infof("You may create the ZFS dataset with:")
|
||||||
|
logger.Infof(" zfs create '%s'", zfsDataset)
|
||||||
|
logger.Infof(" zfs set mountpoint='%s' '%s'", workingDir, zfsDataset)
|
||||||
|
usr, err := user.Current()
|
||||||
|
if err != nil || usr.Uid == "0" {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
logger.Infof(" chown %s '%s'", usr.Uid, workingDir)
|
||||||
|
}
|
||||||
|
|
||||||
|
// check if working directory is a zfs dataset
|
||||||
func (z *zfsHook) preJob() error {
|
func (z *zfsHook) preJob() error {
|
||||||
workingDir := z.provider.WorkingDir()
|
workingDir := z.provider.WorkingDir()
|
||||||
if _, err := os.Stat(workingDir); os.IsNotExist(err) {
|
if _, err := os.Stat(workingDir); os.IsNotExist(err) {
|
||||||
// sudo zfs create $zfsDataset
|
logger.Errorf("Directory %s doesn't exist", workingDir);
|
||||||
// sudo zfs set mountpoint=${absPath} ${zfsDataset}
|
z.printHelpMessage()
|
||||||
|
return err
|
||||||
zfsDataset := fmt.Sprintf("%s/%s", z.zpool, z.provider.Name())
|
}
|
||||||
// Unknown issue of ZFS:
|
if err := sh.Command("mountpoint", "-q", workingDir).Run(); err != nil {
|
||||||
// dataset name should not contain upper case letters
|
logger.Errorf("%s is not a mount point", workingDir);
|
||||||
zfsDataset = strings.ToLower(zfsDataset)
|
z.printHelpMessage()
|
||||||
logger.Infof("Creating ZFS dataset %s", zfsDataset)
|
return err
|
||||||
if err := sh.Command("sudo", "zfs", "create", zfsDataset).Run(); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
logger.Infof("Mount ZFS dataset %s to %s", zfsDataset, workingDir)
|
|
||||||
if err := sh.Command("sudo", "zfs", "set", "mountpoint="+workingDir, zfsDataset).Run(); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user