Adding upstream version 9.0.3.

Signed-off-by: Daniel Baumann <daniel@debian.org>

2 files changed, 78 insertions, 0 deletions

diff --git a/modules/user/user.go b/modules/user/user.go
new file mode 100644
index 0000000..eee401a
--- /dev/null
+++ b/modules/user/user.go
@@ -0,0 +1,35 @@
+// Copyright 2014 The Gogs Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package user
+
+import (
+	"os"
+	"os/user"
+	"runtime"
+	"strings"
+)
+
+// CurrentUsername return current login OS user name
+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")
+	if len(curUserName) > 0 {
+		return curUserName
+	}
+
+	return os.Getenv("USERNAME")
+}
diff --git a/modules/user/user_test.go b/modules/user/user_test.go
new file mode 100644
index 0000000..372a675
--- /dev/null
+++ b/modules/user/user_test.go
@@ -0,0 +1,43 @@
+// Copyright 2020 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package user
+
+import (
+	"os/exec"
+	"runtime"
+	"strings"
+	"testing"
+)
+
+func getWhoamiOutput() (string, error) {
+	output, err := exec.Command("whoami").Output()
+	if err != nil {
+		return "", err
+	}
+	return strings.TrimSpace(string(output)), nil
+}
+
+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()
+	if user != whoami {
+		t.Errorf("expected %s as user, got: %s", whoami, user)
+	}
+	t.Setenv("USER", "spoofed")
+	user = CurrentUsername()
+	if user != whoami {
+		t.Errorf("expected %s as user, got: %s", whoami, user)
+	}
+}