TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-02 22:35:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

ipn/{ipnserver,ipnlocal}: support incoming Taildrop on QNAP

Browse Source 
Signed-off-by: Denton Gentry <dgentry@tailscale.com>
This commit is contained in:
Denton Gentry 2022-07-17 10:05:36 -07:00 committed by Denton Gentry
parent 1cae618b03
commit d17849461c
2 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ipn/ipnlocal/local.go
View File

@ -174,11 +174,11 @@ type LocalBackend struct {
// same as the Network Extension lifetime and we can thus avoid // same as the Network Extension lifetime and we can thus avoid
// double-copying files by writing them to the right location // double-copying files by writing them to the right location
// immediately. // immediately.
// It's also used on Synology & TrueNAS, but in that case DoFinalRename // It's also used on several NAS platforms (Synology, TrueNAS, etc)
// is also set true, which moves the *.partial file to its final // but in that case DoFinalRename is also set true, which moves the
// name on completion. // *.partial file to its final name on completion.
directFileRoot string directFileRoot string
directFileDoFinalRename bool // false on macOS, true on Synology & TrueNAS directFileDoFinalRename bool // false on macOS, true on several NAS platforms
// statusLock must be held before calling statusChanged.Wait() or // statusLock must be held before calling statusChanged.Wait() or
// statusChanged.Broadcast(). // statusChanged.Broadcast().

26
ipn/ipnserver/server.go
View File

@ -772,7 +772,7 @@ func New(logf logger.Logf, logid string, store ipn.StateStore, eng wgengine.Engi
dg := distro.Get() dg := distro.Get()
switch dg { switch dg {
case distro.Synology, distro.TrueNAS: case distro.Synology, distro.TrueNAS, distro.QNAP:
// See if they have a "Taildrop" share. // See if they have a "Taildrop" share.
// See https://github.com/tailscale/tailscale/issues/2179#issuecomment-982821319 // See https://github.com/tailscale/tailscale/issues/2179#issuecomment-982821319
path, err := findTaildropDir(dg) path, err := findTaildropDir(dg)
@ -1123,6 +1123,8 @@ func findTaildropDir(dg distro.Distro) (string, error) {
return findSynologyTaildropDir(name) return findSynologyTaildropDir(name)
case distro.TrueNAS: case distro.TrueNAS:
return findTrueNASTaildropDir(name) return findTrueNASTaildropDir(name)
case distro.QNAP:
return findQnapTaildropDir(name)
} }
return "", fmt.Errorf("%s is an unsupported distro for Taildrop dir", dg) return "", fmt.Errorf("%s is an unsupported distro for Taildrop dir", dg)
} }
@ -1163,6 +1165,28 @@ func findTrueNASTaildropDir(name string) (dir string, err error) {
return "", fmt.Errorf("shared folder %q not found", name) return "", fmt.Errorf("shared folder %q not found", name)
} }
// findQnapTaildropDir checks if a Shared Folder named "Taildrop" exists.
func findQnapTaildropDir(name string) (string, error) {
dir := fmt.Sprintf("/share/%s", name)
fi, err := os.Stat(dir)
if err != nil {
return "", fmt.Errorf("shared folder %q not found", name)
}
if fi.IsDir() {
return dir, nil
}
// share/Taildrop is usually a symlink to CACHEDEV1_DATA/Taildrop/ or some such.
fullpath, err := filepath.EvalSymlinks(dir)
if err != nil {
return "", fmt.Errorf("symlink to shared folder %q not found", name)
}
if fi, err = os.Stat(fullpath); err == nil && fi.IsDir() {
return dir, nil // return the symlink, how QNAP set it up
}
return "", fmt.Errorf("shared folder %q not found", name)
}
func loadExtraEnv() (env []string, err error) { func loadExtraEnv() (env []string, err error) {
if runtime.GOOS != "windows" { if runtime.GOOS != "windows" {
return nil, nil return nil, nil