rms/euphoria-windows
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/euphoria-windows.git synced 2026-05-17 08:15:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8 from RomikB/module_rename

Browse Source 
rename module to amneziawg-windows, update dependency
This commit is contained in:
pokamest
2024-05-13 12:22:47 -07:00
committed by GitHub
parent 5a6a095cd1 61f28c8513
commit c7fc31b176
24 changed files with 82 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
addressconfig.go
View File

@@ -11,12 +11,12 @@ import (
"net"
"sort"
"github.com/amnezia-vpn/amneziawg-go/tun"
"golang.org/x/sys/windows"
"github.com/amnezia-vpn/amnezia-wg/tun"
"github.com/amnezia-vpn/awg-windows/conf"
"github.com/amnezia-vpn/awg-windows/tunnel/firewall"
"github.com/amnezia-vpn/awg-windows/tunnel/winipcfg"
"github.com/amnezia-vpn/amneziawg-windows/conf"
"github.com/amnezia-vpn/amneziawg-windows/tunnel/firewall"
"github.com/amnezia-vpn/amneziawg-windows/tunnel/winipcfg"
)
func cleanupAddressesOnDisconnectedInterfaces(family winipcfg.AddressFamily, addresses []net.IPNet) {
@@ -187,4 +187,4 @@ func enableFirewall(conf *conf.Config, tun *tun.NativeTun) error {
}
log.Println("Enabling firewall rules")
return firewall.EnableFirewall(tun.LUID(), doNotRestrict, conf.Interface.DNS)
}
}

2
conf/config.go
View File

@@ -17,7 +17,7 @@ import (
"golang.org/x/crypto/curve25519"
"github.com/amnezia-vpn/awg-windows/l18n"
"github.com/amnezia-vpn/amneziawg-windows/l18n"
)
const KeyLength = 32

4
conf/parser.go
View File

@@ -10,15 +10,15 @@ import (
"encoding/base64"
"encoding/hex"
"io"
"math"
"net"
"strconv"
"strings"
"time"
"math"
"golang.org/x/text/encoding/unicode"
"github.com/amnezia-vpn/awg-windows/l18n"
"github.com/amnezia-vpn/amneziawg-windows/l18n"
)
type ParseError struct {

2
conf/store.go
View File

@@ -11,7 +11,7 @@ import (
"path/filepath"
"strings"
"github.com/amnezia-vpn/awg-windows/conf/dpapi"
"github.com/amnezia-vpn/amneziawg-windows/conf/dpapi"
)
const configFileSuffix = ".conf.dpapi"

4
deterministicguid.go
View File

@@ -15,7 +15,7 @@ import (
"golang.org/x/sys/windows"
"golang.org/x/text/unicode/norm"
"github.com/amnezia-vpn/awg-windows/conf"
"github.com/amnezia-vpn/amneziawg-windows/conf"
)
const deterministicGUIDLabel = "Deterministic WireGuard Windows GUID v1 jason@zx2c4.com"
@@ -94,4 +94,4 @@ func deterministicGUID(c *conf.Config) *windows.GUID {
}
}
return (*windows.GUID)(unsafe.Pointer(&b2.Sum(nil)[0]))
}
}

2
elevate/shellexecute.go
View File

@@ -14,7 +14,7 @@ import (
"golang.org/x/sys/windows"
"golang.org/x/sys/windows/registry"
"github.com/amnezia-vpn/awg-windows/version"
"github.com/amnezia-vpn/amneziawg-windows/version"
)
const (

10
go.mod
View File

@@ -1,16 +1,16 @@
module github.com/amnezia-vpn/awg-windows
module github.com/amnezia-vpn/amneziawg-windows
go 1.18
require (
github.com/amnezia-vpn/amnezia-wg v0.1.8
golang.org/x/crypto v0.18.0
golang.org/x/sys v0.16.0
github.com/amnezia-vpn/amneziawg-go v0.2.6-0.20240513181042-3ddf952973fa
golang.org/x/crypto v0.19.0
golang.org/x/sys v0.17.0
golang.org/x/text v0.14.0
)
require (
github.com/tevino/abool/v2 v2.1.0 // indirect
golang.org/x/net v0.20.0 // indirect
golang.org/x/net v0.21.0 // indirect
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
)

16
go.sum
View File

@@ -1,14 +1,14 @@
github.com/amnezia-vpn/amnezia-wg v0.1.8 h1:CuJ33YIuRbmuN6+Rs6n6qe2sVvDu1v1toRly9BHZgKM=
github.com/amnezia-vpn/amnezia-wg v0.1.8/go.mod h1:vB51g4MZ8nCj3oEF5qg1YN/2JYEgKvd7+knuCFH4Tf0=
github.com/amnezia-vpn/amneziawg-go v0.2.6-0.20240513181042-3ddf952973fa h1:Hc2kYyeugpMCCi9Bmtay9rzsfnZGq3pxgjZ9ArQj3ts=
github.com/amnezia-vpn/amneziawg-go v0.2.6-0.20240513181042-3ddf952973fa/go.mod h1:12g0XRbFeGbpXvuCmBOV21YxLWSFnUFJnwgrzyHBUyk=
github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4=
github.com/tevino/abool/v2 v2.1.0 h1:7w+Vf9f/5gmKT4m4qkayb33/92M+Um45F2BkHOR+L/c=
github.com/tevino/abool/v2 v2.1.0/go.mod h1:+Lmlqk6bHDWHqN1cbxqhwEAwMPXgc8I1SDEamtseuXY=
golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc=
golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=
golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo=
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 h1:vVKdlvoWBphwdxWKrFZEuM0kGgGLxUOYcY4U/2Vjg44=

12
interfacewatcher.go
View File

@@ -12,13 +12,13 @@ import (
"golang.org/x/sys/windows"
"github.com/amnezia-vpn/amnezia-wg/conn"
"github.com/amnezia-vpn/amnezia-wg/tun"
"github.com/amnezia-vpn/amneziawg-go/conn"
"github.com/amnezia-vpn/amneziawg-go/tun"
"github.com/amnezia-vpn/awg-windows/conf"
"github.com/amnezia-vpn/awg-windows/services"
"github.com/amnezia-vpn/awg-windows/tunnel/firewall"
"github.com/amnezia-vpn/awg-windows/tunnel/winipcfg"
"github.com/amnezia-vpn/amneziawg-windows/conf"
"github.com/amnezia-vpn/amneziawg-windows/services"
"github.com/amnezia-vpn/amneziawg-windows/tunnel/firewall"
"github.com/amnezia-vpn/amneziawg-windows/tunnel/winipcfg"
)
type interfaceWatcherError struct {

6
ipcpermissions.go
View File

@@ -8,9 +8,9 @@ package main
import (
"golang.org/x/sys/windows"
"github.com/amnezia-vpn/amnezia-wg/ipc"
"github.com/amnezia-vpn/amneziawg-go/ipc"
"github.com/amnezia-vpn/awg-windows/conf"
"github.com/amnezia-vpn/amneziawg-windows/conf"
)
func CopyConfigOwnerToIPCSecurityDescriptor(filename string) error {
@@ -60,4 +60,4 @@ func CopyConfigOwnerToIPCSecurityDescriptor(filename string) error {
ipc.UAPISecurityDescriptor = sd
return nil
}
}

2
ringlogger/dump.go
View File

@@ -12,7 +12,7 @@ import (
"golang.org/x/sys/windows"
"github.com/amnezia-vpn/awg-windows/conf"
"github.com/amnezia-vpn/amneziawg-windows/conf"
)
func DumpTo(out io.Writer, notSystem bool) error {

2
ringlogger/global.go
View File

@@ -10,7 +10,7 @@ import (
"path/filepath"
"unsafe"
"github.com/amnezia-vpn/awg-windows/conf"
"github.com/amnezia-vpn/amneziawg-windows/conf"
)
var Global *Ringlogger

2
scriptrunner.go
View File

@@ -15,7 +15,7 @@ import (
"golang.org/x/sys/windows"
"github.com/amnezia-vpn/awg-windows/conf"
"github.com/amnezia-vpn/amneziawg-windows/conf"
)
func runScriptCommand(command, interfaceName string) error {

29
service.go
View File

@@ -14,24 +14,24 @@ import (
"runtime"
"time"
"github.com/amnezia-vpn/amnezia-wg/conn"
"github.com/amnezia-vpn/amnezia-wg/device"
"github.com/amnezia-vpn/amnezia-wg/ipc"
"github.com/amnezia-vpn/amnezia-wg/tun"
"github.com/amnezia-vpn/amneziawg-go/conn"
"github.com/amnezia-vpn/amneziawg-go/device"
"github.com/amnezia-vpn/amneziawg-go/ipc"
"github.com/amnezia-vpn/amneziawg-go/tun"
"golang.org/x/sys/windows"
"golang.org/x/sys/windows/svc"
"golang.org/x/sys/windows/svc/mgr"
"github.com/amnezia-vpn/awg-windows/conf"
"github.com/amnezia-vpn/awg-windows/elevate"
"github.com/amnezia-vpn/awg-windows/ringlogger"
"github.com/amnezia-vpn/awg-windows/services"
"github.com/amnezia-vpn/awg-windows/version"
"github.com/amnezia-vpn/amneziawg-windows/conf"
"github.com/amnezia-vpn/amneziawg-windows/elevate"
"github.com/amnezia-vpn/amneziawg-windows/ringlogger"
"github.com/amnezia-vpn/amneziawg-windows/services"
"github.com/amnezia-vpn/amneziawg-windows/version"
)
type tunnelService struct {
ConfString string;
TunnelName string;
ConfString string
TunnelName string
}
func (service *tunnelService) Execute(args []string, r <-chan svc.ChangeRequest, changes chan<- svc.Status) (svcSpecificEC bool, exitCode uint32) {
@@ -110,14 +110,13 @@ func (service *tunnelService) Execute(args []string, r <-chan svc.ChangeRequest,
return
}
config, err = conf.FromWgQuickWithUnknownEncoding(service.ConfString,service.TunnelName)
config, err = conf.FromWgQuickWithUnknownEncoding(service.ConfString, service.TunnelName)
if err != nil {
serviceError = services.ErrorLoadConfiguration
return
}
config.DeduplicateNetworkEntries()
log.SetPrefix(fmt.Sprintf("[%s] ", config.Name))
log.Println("Starting", version.UserAgent())
@@ -254,5 +253,5 @@ func (service *tunnelService) Execute(args []string, r <-chan svc.ChangeRequest,
}
func Run(confString string, tunnelName string) error {
return svc.Run(tunnelName, &tunnelService{confString,tunnelName})
}
return svc.Run(tunnelName, &tunnelService{confString, tunnelName})
}

2
services/names.go
View File

@@ -8,7 +8,7 @@ package services
import (
"errors"
"github.com/amnezia-vpn/awg-windows/conf"
"github.com/amnezia-vpn/amneziawg-windows/conf"
)
func ServiceNameOfTunnel(tunnelName string) (string, error) {

8
tunnel/addressconfig.go
View File

@@ -11,12 +11,12 @@ import (
"net"
"sort"
"github.com/amnezia-vpn/amneziawg-go/tun"
"golang.org/x/sys/windows"
"github.com/amnezia-vpn/amnezia-wg/tun"
"github.com/amnezia-vpn/awg-windows/conf"
"github.com/amnezia-vpn/awg-windows/tunnel/firewall"
"github.com/amnezia-vpn/awg-windows/tunnel/winipcfg"
"github.com/amnezia-vpn/amneziawg-windows/conf"
"github.com/amnezia-vpn/amneziawg-windows/tunnel/firewall"
"github.com/amnezia-vpn/amneziawg-windows/tunnel/winipcfg"
)
func cleanupAddressesOnDisconnectedInterfaces(family winipcfg.AddressFamily, addresses []net.IPNet) {

6
tunnel/defaultroutemonitor.go
View File

@@ -12,9 +12,9 @@ import (
"golang.org/x/sys/windows"
"github.com/amnezia-vpn/amnezia-wg/conn"
"github.com/amnezia-vpn/amnezia-wg/tun"
"github.com/amnezia-vpn/awg-windows/tunnel/winipcfg"
"github.com/amnezia-vpn/amneziawg-go/conn"
"github.com/amnezia-vpn/amneziawg-go/tun"
"github.com/amnezia-vpn/amneziawg-windows/tunnel/winipcfg"
)
func bindSocketRoute(family winipcfg.AddressFamily, binder conn.BindSocketToInterface, ourLUID winipcfg.LUID, lastLUID *winipcfg.LUID, lastIndex *uint32, blackholeWhenLoop bool) error {

2
tunnel/deterministicguid.go
View File

@@ -15,7 +15,7 @@ import (
"golang.org/x/sys/windows"
"golang.org/x/text/unicode/norm"
"github.com/amnezia-vpn/awg-windows/conf"
"github.com/amnezia-vpn/amneziawg-windows/conf"
)
const deterministicGUIDLabel = "Deterministic WireGuard Windows GUID v1 jason@zx2c4.com"

12
tunnel/interfacewatcher.go
View File

@@ -11,13 +11,13 @@ import (
"golang.org/x/sys/windows"
"github.com/amnezia-vpn/amnezia-wg/conn"
"github.com/amnezia-vpn/amnezia-wg/tun"
"github.com/amnezia-vpn/amneziawg-go/conn"
"github.com/amnezia-vpn/amneziawg-go/tun"
"github.com/amnezia-vpn/awg-windows/conf"
"github.com/amnezia-vpn/awg-windows/services"
"github.com/amnezia-vpn/awg-windows/tunnel/firewall"
"github.com/amnezia-vpn/awg-windows/tunnel/winipcfg"
"github.com/amnezia-vpn/amneziawg-windows/conf"
"github.com/amnezia-vpn/amneziawg-windows/services"
"github.com/amnezia-vpn/amneziawg-windows/tunnel/firewall"
"github.com/amnezia-vpn/amneziawg-windows/tunnel/winipcfg"
)
type interfaceWatcherError struct {

4
tunnel/ipcpermissions.go
View File

@@ -8,9 +8,9 @@ package tunnel
import (
"golang.org/x/sys/windows"
"github.com/amnezia-vpn/amnezia-wg/ipc"
"github.com/amnezia-vpn/amneziawg-go/ipc"
"github.com/amnezia-vpn/awg-windows/conf"
"github.com/amnezia-vpn/amneziawg-windows/conf"
)
func CopyConfigOwnerToIPCSecurityDescriptor(filename string) error {

2
tunnel/mtumonitor.go
View File

@@ -6,7 +6,7 @@
package tunnel
import (
"github.com/amnezia-vpn/awg-windows/tunnel/winipcfg"
"github.com/amnezia-vpn/amneziawg-windows/tunnel/winipcfg"
"golang.org/x/sys/windows"
)

2
tunnel/scriptrunner.go
View File

@@ -15,7 +15,7 @@ import (
"golang.org/x/sys/windows"
"github.com/amnezia-vpn/awg-windows/conf"
"github.com/amnezia-vpn/amneziawg-windows/conf"
)
func runScriptCommand(command, interfaceName string) error {

18
tunnel/service.go
View File

@@ -14,19 +14,19 @@ import (
"runtime"
"time"
"github.com/amnezia-vpn/amneziawg-go/conn"
"github.com/amnezia-vpn/amneziawg-go/device"
"github.com/amnezia-vpn/amneziawg-go/ipc"
"github.com/amnezia-vpn/amneziawg-go/tun"
"golang.org/x/sys/windows"
"golang.org/x/sys/windows/svc"
"golang.org/x/sys/windows/svc/mgr"
"github.com/amnezia-vpn/amnezia-wg/conn"
"github.com/amnezia-vpn/amnezia-wg/device"
"github.com/amnezia-vpn/amnezia-wg/ipc"
"github.com/amnezia-vpn/amnezia-wg/tun"
"github.com/amnezia-vpn/awg-windows/conf"
"github.com/amnezia-vpn/awg-windows/elevate"
"github.com/amnezia-vpn/awg-windows/ringlogger"
"github.com/amnezia-vpn/awg-windows/services"
"github.com/amnezia-vpn/awg-windows/version"
"github.com/amnezia-vpn/amneziawg-windows/conf"
"github.com/amnezia-vpn/amneziawg-windows/elevate"
"github.com/amnezia-vpn/amneziawg-windows/ringlogger"
"github.com/amnezia-vpn/amneziawg-windows/services"
"github.com/amnezia-vpn/amneziawg-windows/version"
)
type tunnelService struct {

6
tunnel/wintun_test.go
View File

@@ -17,10 +17,10 @@ import (
"golang.org/x/sys/windows"
"github.com/amnezia-vpn/amnezia-wg/tun"
"github.com/amnezia-vpn/amneziawg-go/tun"
"github.com/amnezia-vpn/awg-windows/elevate"
"github.com/amnezia-vpn/awg-windows/tunnel/winipcfg"
"github.com/amnezia-vpn/amneziawg-windows/elevate"
"github.com/amnezia-vpn/amneziawg-windows/tunnel/winipcfg"
)
func TestWintunOrdering(t *testing.T) {