From 0d38794c7f9b25b2e602cb0d2f686e74cd1ab1cb Mon Sep 17 00:00:00 2001 From: Paolo Borelli Date: Fri, 31 Jul 2015 08:50:11 +0200 Subject: Factor out function to get the current user The same logic was duplicated in three places. Factor it out so that we can add further fallbacks in a single place. --- modules/setting/setting.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'modules/setting') diff --git a/modules/setting/setting.go b/modules/setting/setting.go index acd3aae6..79e47c89 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -24,6 +24,7 @@ import ( "github.com/gogits/gogs/modules/bindata" "github.com/gogits/gogs/modules/log" // "github.com/gogits/gogs/modules/ssh" + "github.com/gogits/gogs/modules/user" ) type Scheme string @@ -309,10 +310,7 @@ func NewConfigContext() { }[Cfg.Section("time").Key("FORMAT").MustString("RFC1123")] RunUser = Cfg.Section("").Key("RUN_USER").String() - curUser := os.Getenv("USER") - if len(curUser) == 0 { - curUser = os.Getenv("USERNAME") - } + curUser := user.CurrentUsername() // Does not check run user when the install lock is off. if InstallLock && RunUser != curUser { log.Fatal(4, "Expect user(%s) but current user is: %s", RunUser, curUser) -- cgit v1.2.3