aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/manager
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2021-10-12 16:56:07 -0600
committerJason A. Donenfeld <Jason@zx2c4.com>2021-10-16 22:54:34 -0600
commit94949cd72fd1754d03fe0eb318c00cbd0a4c1fd0 (patch)
tree7de0756d5b07612385c6fd5067b78709c3f059bd /manager
parentversion: bump (diff)
downloadwireguard-windows-94949cd72fd1754d03fe0eb318c00cbd0a4c1fd0.tar.xz
wireguard-windows-94949cd72fd1754d03fe0eb318c00cbd0a4c1fd0.zip
manager: remove legacy store support
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'manager')
-rw-r--r--manager/legacystore.go78
-rw-r--r--manager/service.go2
2 files changed, 0 insertions, 80 deletions
diff --git a/manager/legacystore.go b/manager/legacystore.go
deleted file mode 100644
index 0996d15f..00000000
--- a/manager/legacystore.go
+++ /dev/null
@@ -1,78 +0,0 @@
-/* SPDX-License-Identifier: MIT
- *
- * Copyright (C) 2019-2021 WireGuard LLC. All Rights Reserved.
- */
-
-package manager
-
-import (
- "log"
- "os"
- "path/filepath"
- "strings"
-
- "golang.org/x/sys/windows"
- "golang.org/x/sys/windows/registry"
- "golang.zx2c4.com/wireguard/windows/conf"
-)
-
-func moveConfigsFromLegacyStore() {
- oldRoot, err := windows.KnownFolderPath(windows.FOLDERID_LocalAppData, windows.KF_FLAG_DEFAULT)
- if err != nil {
- return
- }
- oldC := filepath.Join(oldRoot, "WireGuard", "Configurations")
- files, err := os.ReadDir(oldC)
- if err != nil {
- return
- }
- pendingDeletion := make(map[string]bool)
- if key, err := registry.OpenKey(registry.LOCAL_MACHINE, `SYSTEM\CurrentControlSet\Control\Session Manager`, registry.READ); err == nil {
- if ntPaths, _, err := key.GetStringsValue("PendingFileRenameOperations"); err == nil {
- for _, ntPath := range ntPaths {
- pendingDeletion[strings.ToLower(strings.TrimPrefix(ntPath, `\??\`))] = true
- }
- }
- key.Close()
- }
- for i := range files {
- if files[i].IsDir() {
- continue
- }
- fileName := files[i].Name()
- oldPath := filepath.Join(oldC, fileName)
- if pendingDeletion[strings.ToLower(oldPath)] {
- continue
- }
- config, err := conf.LoadFromPath(oldPath)
- if err != nil {
- continue
- }
- newPath, err := config.Path()
- if err != nil {
- continue
- }
- err = config.Save(false)
- if err != nil {
- continue
- }
- oldPath16, err := windows.UTF16PtrFromString(oldPath)
- if err == nil {
- windows.MoveFileEx(oldPath16, nil, windows.MOVEFILE_DELAY_UNTIL_REBOOT)
- }
- log.Printf("Migrated configuration from %#q to %#q", oldPath, newPath)
- changeTunnelServiceConfigFilePath(config.Name, oldPath, newPath)
- }
- oldC16, err := windows.UTF16PtrFromString(oldC)
- if err == nil {
- windows.MoveFileEx(oldC16, nil, windows.MOVEFILE_DELAY_UNTIL_REBOOT)
- }
- oldLog16, err := windows.UTF16PtrFromString(filepath.Join(oldRoot, "WireGuard", "log.bin"))
- if err == nil {
- windows.MoveFileEx(oldLog16, nil, windows.MOVEFILE_DELAY_UNTIL_REBOOT)
- }
- oldRoot16, err := windows.UTF16PtrFromString(filepath.Join(oldRoot, "WireGuard"))
- if err == nil {
- windows.MoveFileEx(oldRoot16, nil, windows.MOVEFILE_DELAY_UNTIL_REBOOT)
- }
-}
diff --git a/manager/service.go b/manager/service.go
index 22188ade..e5dcf92d 100644
--- a/manager/service.go
+++ b/manager/service.go
@@ -63,8 +63,6 @@ func (service *managerService) Execute(args []string, r <-chan svc.ChangeRequest
return
}
- moveConfigsFromLegacyStore()
-
err = watchNewTunnelServices()
if err != nil {
serviceError = services.ErrorTrackTunnels