Merge open PR's

Merge jstaf#402 jstaf#403 jstaf#418 jstaf#420

+ version++

Author: NBA2K1

Dockerfile

@@ -0,0 +1,17 @@
+FROM golang:bookworm 
+
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt update && apt -y install build-essential fuse 
+
+RUN groupadd onedriver
+RUN useradd -g onedriver -ms /bin/bash onedriver
+RUN mkdir /mount && chown onedriver:onedriver -R /mount
+
+USER onedriver
+RUN mkdir -p /home/onedriver/.cache/onedriver
+VOLUME [ "/home/onedriver/.cache/onedriver" ]
+WORKDIR /build
+COPY --chown=onedriver:onedriver . .
+RUN make onedriver-headless
+
+ENTRYPOINT [ "/build/onedriver-headless", "--no-browser", "/mount/" ]

cmd/common/common.go

@@ -12,7 +12,7 @@ import (
 	"github.com/rs/zerolog/log"
 )
 
-const version = "0.14.1"
+const version = "0.14.2"
 
 var commit string
 

cmd/common/config.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/imdario/mergo"
+	"dario.cat/mergo"
 	"github.com/jstaf/onedriver/fs/graph"
 	"github.com/jstaf/onedriver/ui"
 	"github.com/rs/zerolog/log"

cmd/onedriver-launcher/main.go

@@ -91,9 +91,14 @@ func activateCallback(app *gtk.Application, config *common.Config, configPath st
 
 	header, _ := gtk.HeaderBarNew()
 	header.SetShowCloseButton(true)
-	header.SetTitle("onedriver")
+	header.SetTitle("OneDriver")
 	window.SetTitlebar(header)
 
+	err := window.SetIconFromFile("/usr/share/icons/onedriver/onedriver.svg")
+	if err != nil {
+		log.Error().Err(err).Msg("Could not find logo.")
+	}
+
 	listbox, _ := gtk.ListBoxNew()
 	window.Add(listbox)
 
@@ -148,7 +153,7 @@ func activateCallback(app *gtk.Application, config *common.Config, configPath st
 	settings, _ := gtk.ModelButtonNew()
 	settings.SetLabel("Settings")
 	settings.Connect("clicked", func(button *gtk.ModelButton) {
-		newSettingsWindow(config, configPath)
+		newSettingsDialog(config, configPath, window)
 	})
 	popoverBox.PackStart(settings, false, true, 0)
 
@@ -157,6 +162,7 @@ func activateCallback(app *gtk.Application, config *common.Config, configPath st
 	about.SetLabel("About")
 	about.Connect("clicked", func(button *gtk.ModelButton) {
 		aboutDialog, _ := gtk.AboutDialogNew()
+		aboutDialog.SetProgramName("OneDriver Launcher")
 		aboutDialog.SetAuthors([]string{"Jeff Stafford", "https://github.com/jstaf"})
 		aboutDialog.SetWebsite("https://github.com/jstaf/onedriver")
 		aboutDialog.SetWebsiteLabel("github.com/jstaf/onedriver")
@@ -168,6 +174,8 @@ func activateCallback(app *gtk.Application, config *common.Config, configPath st
 		} else {
 			aboutDialog.SetLogo(logo.GetPixbuf())
 		}
+		aboutDialog.SetTransientFor(window)
+		aboutDialog.Connect("response", aboutDialog.Destroy)
 		aboutDialog.Run()
 	})
 	popoverBox.PackStart(about, false, true, 0)
@@ -317,7 +325,7 @@ func newMountRow(config common.Config, mount string) (*gtk.ListBoxRow, *gtk.Swit
 	}
 	// rename the mount by rewriting the .xdg-volume-info file
 	renameMountpointEntry, _ := gtk.EntryNew()
-	renameMountpointEntry.SetTooltipText("Change the label that your file browser uses for this drive")
+	renameMountpointEntry.SetTooltipText("The label that your file browser uses for this drive")
 	renameMountpointEntry.SetText(driveName)
 	// runs on enter
 	renameMountpointEntry.Connect("activate", func(entry *gtk.Entry) {
@@ -374,7 +382,7 @@ func newMountRow(config common.Config, mount string) (*gtk.ListBoxRow, *gtk.Swit
 	popoverBox.Add(separator)
 
 	// create a button to enable/disable the mountpoint
-	unitEnabledBtn, _ := gtk.CheckButtonNewWithLabel(" Start drive on login")
+	unitEnabledBtn, _ := gtk.CheckButtonNewWithLabel("Start Drive on Login")
 	unitEnabledBtn.SetTooltipText("Start this drive automatically when you login")
 	enabled, err := systemd.UnitIsEnabled(unitName)
 	if err == nil {
@@ -401,7 +409,7 @@ func newMountRow(config common.Config, mount string) (*gtk.ListBoxRow, *gtk.Swit
 
 	// button to delete the mount
 	deleteMountpointBtn, _ := gtk.ModelButtonNew()
-	deleteMountpointBtn.SetLabel("Remove drive")
+	deleteMountpointBtn.SetLabel("Remove Drive")
 	deleteMountpointBtn.SetTooltipText("Remove OneDrive account from local computer")
 	deleteMountpointBtn.Connect("clicked", func(button *gtk.ModelButton) {
 		log.Trace().
@@ -444,16 +452,16 @@ func newMountRow(config common.Config, mount string) (*gtk.ListBoxRow, *gtk.Swit
 	return row, mountToggle
 }
 
-func newSettingsWindow(config *common.Config, configPath string) {
+func newSettingsDialog(config *common.Config, configPath string, parent gtk.IWindow) {
 	const offset = 15
 
-	settingsWindow, _ := gtk.WindowNew(gtk.WINDOW_TOPLEVEL)
-	settingsWindow.SetResizable(false)
-	settingsWindow.SetTitle("Settings")
+	settingsDialog, _ := gtk.DialogNew()
+	settingsDialog.SetResizable(false)
+	settingsDialog.SetTitle("Settings")
 
 	// log level settings
 	settingsRowLog, _ := gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, offset)
-	logLevelLabel, _ := gtk.LabelNew("Log level")
+	logLevelLabel, _ := gtk.LabelNew("Log Level")
 	settingsRowLog.PackStart(logLevelLabel, false, false, 0)
 
 	logLevelSelector, _ := gtk.ComboBoxTextNew()
@@ -475,7 +483,7 @@ func newSettingsWindow(config *common.Config, configPath string) {
 
 	// cache dir settings
 	settingsRowCacheDir, _ := gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, offset)
-	cacheDirLabel, _ := gtk.LabelNew("Cache directory")
+	cacheDirLabel, _ := gtk.LabelNew("Cache Directory")
 	settingsRowCacheDir.PackStart(cacheDirLabel, false, false, 0)
 
 	cacheDirPicker, _ := gtk.ButtonNew()
@@ -485,7 +493,7 @@ func newSettingsWindow(config *common.Config, configPath string) {
 		oldPath, _ := button.GetLabel()
 		oldPath = ui.UnescapeHome(oldPath)
 		path := ui.DirChooser("Select an empty directory to use for storage")
-		if !ui.CancelDialog(settingsWindow, "Remount all drives?", "") {
+		if !ui.CancelDialog(settingsDialog, "Remount all drives?", "") {
 			return
 		}
 		log.Warn().
@@ -508,7 +516,7 @@ func newSettingsWindow(config *common.Config, configPath string) {
 			err := systemd.UnitSetActive(unitName, false)
 			if err != nil {
 				ui.Dialog("Could not disable mount: "+err.Error(),
-					gtk.MESSAGE_ERROR, settingsWindow)
+					gtk.MESSAGE_ERROR, settingsDialog)
 				log.Error().
 					Err(err).
 					Str("mount", mount).
@@ -520,7 +528,7 @@ func newSettingsWindow(config *common.Config, configPath string) {
 			err = os.Rename(filepath.Join(oldPath, mount), filepath.Join(path, mount))
 			if err != nil {
 				ui.Dialog("Could not move cache for mount: "+err.Error(),
-					gtk.MESSAGE_ERROR, settingsWindow)
+					gtk.MESSAGE_ERROR, settingsDialog)
 				log.Error().
 					Err(err).
 					Str("mount", mount).
@@ -549,10 +557,20 @@ func newSettingsWindow(config *common.Config, configPath string) {
 	settingsRowCacheDir.PackEnd(cacheDirPicker, false, false, 0)
 
 	// assemble rows
-	settingsWindowBox, _ := gtk.BoxNew(gtk.ORIENTATION_VERTICAL, offset)
-	settingsWindowBox.SetBorderWidth(offset)
-	settingsWindowBox.PackStart(settingsRowLog, true, true, 0)
-	settingsWindowBox.PackStart(settingsRowCacheDir, true, true, 0)
-	settingsWindow.Add(settingsWindowBox)
-	settingsWindow.ShowAll()
+	settingsDialogBox, _ := gtk.BoxNew(gtk.ORIENTATION_VERTICAL, offset)
+	settingsDialogBox.SetBorderWidth(offset)
+	settingsDialogBox.PackStart(settingsRowLog, true, true, 0)
+	settingsDialogBox.PackStart(settingsRowCacheDir, true, true, 0)
+
+	contentArea, err := settingsDialog.GetContentArea()
+	if err != nil {
+		log.Error().Err(err).Msg("Failed to get settings dialog content area.")
+		return
+	}
+
+	contentArea.Add(settingsDialogBox)
+
+	settingsDialog.SetModal(true)
+	settingsDialog.SetTransientFor(parent)
+	settingsDialog.ShowAll()
 }

cmd/onedriver/main.go

@@ -1,13 +1,11 @@
 package main
 
 import (
-	"encoding/json"
 	"fmt"
 	"io/ioutil"
 	"os"
 	"os/signal"
 	"path/filepath"
-	"strings"
 	"syscall"
 	"time"
 
@@ -60,6 +58,10 @@ func main() {
 	versionFlag := flag.BoolP("version", "v", false, "Display program version.")
 	debugOn := flag.BoolP("debug", "d", false, "Enable FUSE debug logging. "+
 		"This logs communication between onedriver and the kernel.")
+	allowOther := flag.BoolP("allow-other", "", false,
+		"Allow access to the mount point for other users.")
+	uid := flag.Uint32P("uid", "", uint32(os.Getuid()), "Owner uid of the mount point.")
+	gid := flag.Uint32P("gid", "", uint32(os.Getgid()), "Owner gid of the mount point.")
 	help := flag.BoolP("help", "h", false, "Displays this help message.")
 	flag.Usage = usage
 	flag.Parse()
@@ -125,13 +127,15 @@ func main() {
 	// create the filesystem
 	log.Info().Msgf("onedriver %s", common.Version())
 	auth := graph.Authenticate(config.AuthConfig, authPath, *headless)
-	filesystem := fs.NewFilesystem(auth, cachePath)
-	go filesystem.DeltaLoop(30 * time.Second)
+	filesystem := fs.NewFilesystem(auth, cachePath, fs.OptionOwner(*uid, *gid))
+	go filesystem.DeltaLoop(10 * time.Minute)
 	xdgVolumeInfo(filesystem, auth)
 
 	server, err := fuse.NewServer(filesystem, mountpoint, &fuse.MountOptions{
 		Name:          "onedriver",
 		FsName:        "onedriver",
+		DirectMount:   true,
+		AllowOther:    *allowOther,
 		DisableXAttrs: true,
 		MaxBackground: 1024,
 		Debug:         *debugOn,
@@ -153,34 +157,3 @@ func main() {
 		Msg("Serving filesystem.")
 	server.Serve()
 }
-
-// xdgVolumeInfo createx .xdg-volume-info for a nice little onedrive logo in the
-// corner of the mountpoint and shows the account name in the nautilus sidebar
-func xdgVolumeInfo(filesystem *fs.Filesystem, auth *graph.Auth) {
-	if child, _ := filesystem.GetPath("/.xdg-volume-info", auth); child != nil {
-		return
-	}
-	log.Info().Msg("Creating .xdg-volume-info")
-	user, err := graph.GetUser(auth)
-	if err != nil {
-		log.Error().Err(err).Msg("Could not create .xdg-volume-info")
-		return
-	}
-	xdgVolumeInfo := common.TemplateXDGVolumeInfo(user.UserPrincipalName)
-
-	// just upload directly and shove it in the cache
-	// (since the fs isn't mounted yet)
-	resp, err := graph.Put(
-		graph.ResourcePath("/.xdg-volume-info")+":/content",
-		auth,
-		strings.NewReader(xdgVolumeInfo),
-	)
-	if err != nil {
-		log.Error().Err(err).Msg("Failed to write .xdg-volume-info")
-	}
-	root, _ := filesystem.GetPath("/", auth) // cannot fail
-	inode := fs.NewInode(".xdg-volume-info", 0644, root)
-	if json.Unmarshal(resp, &inode) == nil {
-		filesystem.InsertID(inode.ID(), inode)
-	}
-}

cmd/onedriver/xdg.go

@@ -0,0 +1,45 @@
+//go:build linux && cgo
+// +build linux,cgo
+
+package main
+
+import (
+	"encoding/json"
+	"strings"
+
+	"github.com/jstaf/onedriver/fs"
+	"github.com/jstaf/onedriver/cmd/common"
+	"github.com/jstaf/onedriver/fs/graph"
+	"github.com/rs/zerolog/log"
+)
+
+// xdgVolumeInfo createx .xdg-volume-info for a nice little onedrive logo in the
+// corner of the mountpoint and shows the account name in the nautilus sidebar
+func xdgVolumeInfo(filesystem *fs.Filesystem, auth *graph.Auth) {
+	if child, _ := filesystem.GetPath("/.xdg-volume-info", auth); child != nil {
+		return
+	}
+	log.Info().Msg("Creating .xdg-volume-info")
+	user, err := graph.GetUser(auth)
+	if err != nil {
+		log.Error().Err(err).Msg("Could not create .xdg-volume-info")
+		return
+	}
+	xdgVolumeInfo := common.TemplateXDGVolumeInfo(user.UserPrincipalName)
+
+	// just upload directly and shove it in the cache
+	// (since the fs isn't mounted yet)
+	resp, err := graph.Put(
+		graph.ResourcePath("/.xdg-volume-info")+":/content",
+		auth,
+		strings.NewReader(xdgVolumeInfo),
+	)
+	if err != nil {
+		log.Error().Err(err).Msg("Failed to write .xdg-volume-info")
+	}
+	root, _ := filesystem.GetPath("/", auth) // cannot fail
+	inode := fs.NewInode(".xdg-volume-info", 0644, root)
+	if json.Unmarshal(resp, &inode) == nil {
+		filesystem.InsertID(inode.ID(), inode)
+	}
+}

cmd/onedriver/xdg_headless.go

@@ -0,0 +1,13 @@
+//go:build !linux || !cgo
+// +build !linux !cgo
+
+package main
+
+import (
+	"github.com/jstaf/onedriver/fs"
+	"github.com/jstaf/onedriver/fs/graph"
+)
+
+func xdgVolumeInfo(filesystem *fs.Filesystem, auth *graph.Auth) {
+	return
+}

docker-run.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+# Build and run in Docker. Run with privileges for FUSE and interactively for login.
+# Mount at $MOUNTPOINT on host, defaults to ~/Onedrive
+
+set -e
+if [ -z "$(docker images -q onedriver 2> /dev/null)" ]; then
+  docker build -t onedriver .
+fi
+MOUNT="${MOUNTPOINT:-"$HOME/Onedrive"}"
+echo Mounting at $MOUNT
+mkdir -p $MOUNT
+docker run -it \
+           -v $MOUNT:/mount:rw,rshared \
+           --device /dev/fuse \
+           --cap-add SYS_ADMIN \
+           --security-opt apparmor:unconfined \
+           --restart unless-stopped \
+           onedriver