mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-10-31 19:06:18 +01:00 
			
		
		
		
	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.
This commit is contained in:
		| @@ -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) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user