From bfdb3aa855de75d91c5d191ef116c651feb0fcfc Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Tue, 14 May 2019 17:00:10 +0200
Subject: service: clean up token mangling

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 main.go | 25 ++++---------------------
 1 file changed, 4 insertions(+), 21 deletions(-)

(limited to 'main.go')

diff --git a/main.go b/main.go
index c0dc5c49..0ed7bfa8 100644
--- a/main.go
+++ b/main.go
@@ -8,13 +8,12 @@ package main
 import (
 	"fmt"
 	"os"
-	"runtime"
 	"strconv"
 	"strings"
 	"time"
-	"unsafe"
 
 	"golang.org/x/sys/windows"
+
 	"golang.zx2c4.com/wireguard/windows/ringlogger"
 	"golang.zx2c4.com/wireguard/windows/service"
 	"golang.zx2c4.com/wireguard/windows/ui"
@@ -64,28 +63,12 @@ func checkForWow64() {
 
 func checkForAdminGroup() {
 	// This is not a security check, but rather a user-confusion one.
-	adminSid, err := windows.CreateWellKnownSid(windows.WinBuiltinAdministratorsSid)
-	if err != nil {
-		fatal("Unable to create well-known SID for Builtin Administrators: ", err)
-	}
-	token, err := windows.OpenCurrentProcessToken()
+	processToken, err := windows.OpenCurrentProcessToken()
 	if err != nil {
 		fatal("Unable to open current process token: ", err)
 	}
-	gs, err := token.GetTokenGroups()
-	if err != nil {
-		fatal("Unable to get groups of current process token: ", err)
-	}
-	groups := (*[(1 << 28) - 1]windows.SIDAndAttributes)(unsafe.Pointer(&gs.Groups[0]))[:gs.GroupCount]
-	isAdmin := false
-	for _, g := range groups {
-		if windows.EqualSid(g.Sid, adminSid) {
-			isAdmin = true
-			break
-		}
-	}
-	runtime.KeepAlive(gs)
-	if !isAdmin {
+	defer processToken.Close()
+	if !service.TokenIsMemberOfBuiltInAdministrator(processToken) {
 		fatal("WireGuard may only be used by users who are a member of the Builtin Administrators group.")
 	}
 }
-- 
cgit v1.2.3-59-g8ed1b