Use os.Geteuid()

jedisct1 · jedisct1 · commit 09a691822627 · 2022-10-18T14:56:39.000+02:00
Fixes #2224
diff --git a/dnscrypt-proxy/privilege_linux.go b/dnscrypt-proxy/privilege_linux.go
@@ -15,8 +15,7 @@ import (
 )
 
 func (proxy *Proxy) dropPrivilege(userStr string, fds []*os.File) {
-	currentUser, err := user.Current()
-	if err != nil && currentUser.Uid != "0" {
+	if os.Geteuid() != 0 {
 		dlog.Fatal("Root privileges are required in order to switch to a different user. Maybe try again with 'sudo'")
 	}
 	userInfo, err := user.Lookup(userStr)
diff --git a/dnscrypt-proxy/privilege_others.go b/dnscrypt-proxy/privilege_others.go
@@ -17,8 +17,7 @@ import (
 )
 
 func (proxy *Proxy) dropPrivilege(userStr string, fds []*os.File) {
-	currentUser, err := user.Current()
-	if err != nil && currentUser.Uid != "0" {
+	if os.Geteuid() != 0 {
 		dlog.Fatal("Root privileges are required in order to switch to a different user. Maybe try again with 'sudo'")
 	}
 	userInfo, err := user.Lookup(userStr)

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,7 @@ import (`
`15`	`15`	`)`
`16`	`16`
`17`	`17`	`func (proxy Proxy) dropPrivilege(userStr string, fds []os.File) {`
`18`		`- currentUser, err := user.Current()`
`19`		`- if err != nil && currentUser.Uid != "0" {`
	`18`	`+ if os.Geteuid() != 0 {`
`20`	`19`	`dlog.Fatal("Root privileges are required in order to switch to a different user. Maybe try again with 'sudo'")`
`21`	`20`	`}`
`22`	`21`	`userInfo, err := user.Lookup(userStr)`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,7 @@ import (`
`17`	`17`	`)`
`18`	`18`
`19`	`19`	`func (proxy Proxy) dropPrivilege(userStr string, fds []os.File) {`
`20`		`- currentUser, err := user.Current()`
`21`		`- if err != nil && currentUser.Uid != "0" {`
	`20`	`+ if os.Geteuid() != 0 {`
`22`	`21`	`dlog.Fatal("Root privileges are required in order to switch to a different user. Maybe try again with 'sudo'")`
`23`	`22`	`}`
`24`	`23`	`userInfo, err := user.Lookup(userStr)`