mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-22 23:33:15 -05:00
Use native go method to get current user rather than environment variable (#4930)
* Use native go method to get current user rather than environment var * Use t.Skip instead of return in test
This commit is contained in:
parent
637c5fe1eb
commit
eb0c848f5b
2 changed files with 49 additions and 11 deletions
|
@ -4,10 +4,29 @@
|
||||||
|
|
||||||
package user
|
package user
|
||||||
|
|
||||||
import "os"
|
import (
|
||||||
|
"os"
|
||||||
|
"os/user"
|
||||||
|
"runtime"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
// CurrentUsername return current login OS user name
|
// CurrentUsername return current login OS user name
|
||||||
func CurrentUsername() string {
|
func CurrentUsername() string {
|
||||||
|
userinfo, err := user.Current()
|
||||||
|
if err != nil {
|
||||||
|
return fallbackCurrentUsername()
|
||||||
|
}
|
||||||
|
username := userinfo.Username
|
||||||
|
if runtime.GOOS == "windows" {
|
||||||
|
parts := strings.Split(username, "\\")
|
||||||
|
username = parts[len(parts)-1]
|
||||||
|
}
|
||||||
|
return username
|
||||||
|
}
|
||||||
|
|
||||||
|
// Old method, used if new method doesn't work on your OS for some reason
|
||||||
|
func fallbackCurrentUsername() string {
|
||||||
curUserName := os.Getenv("USER")
|
curUserName := os.Getenv("USER")
|
||||||
if len(curUserName) > 0 {
|
if len(curUserName) > 0 {
|
||||||
return curUserName
|
return curUserName
|
||||||
|
|
|
@ -2,21 +2,40 @@ package user
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"os"
|
"os"
|
||||||
|
"os/exec"
|
||||||
|
"runtime"
|
||||||
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestCurrentUsername(t *testing.T) {
|
func getWhoamiOutput() (string, error) {
|
||||||
os.Setenv("USER", "")
|
output, err := exec.Command("whoami").Output()
|
||||||
os.Setenv("USERNAME", "foobar")
|
if err != nil {
|
||||||
|
return "", err
|
||||||
user := CurrentUsername()
|
|
||||||
if user != "foobar" {
|
|
||||||
t.Errorf("expected foobar as user, got: %s", user)
|
|
||||||
}
|
}
|
||||||
|
return strings.TrimSpace(string(output[:])), nil
|
||||||
|
}
|
||||||
|
|
||||||
os.Setenv("USER", "gitea")
|
func TestCurrentUsername(t *testing.T) {
|
||||||
|
user := CurrentUsername()
|
||||||
|
if len(user) <= 0 {
|
||||||
|
t.Errorf("expected non-empty user, got: %s", user)
|
||||||
|
}
|
||||||
|
// Windows whoami is weird, so just skip remaining tests
|
||||||
|
if runtime.GOOS == "windows" {
|
||||||
|
t.Skip("skipped test because of weird whoami on Windows")
|
||||||
|
}
|
||||||
|
whoami, err := getWhoamiOutput()
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("failed to run whoami to test current user: %f", err)
|
||||||
|
}
|
||||||
user = CurrentUsername()
|
user = CurrentUsername()
|
||||||
if user != "gitea" {
|
if user != whoami {
|
||||||
t.Errorf("expected gitea as user, got: %s", user)
|
t.Errorf("expected %s as user, got: %s", whoami, user)
|
||||||
|
}
|
||||||
|
os.Setenv("USER", "spoofed")
|
||||||
|
user = CurrentUsername()
|
||||||
|
if user != whoami {
|
||||||
|
t.Errorf("expected %s as user, got: %s", whoami, user)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue