diff options
| author | Antoine GIRARD <sapk@users.noreply.github.com> | 2018-01-27 17:48:15 +0100 |
|---|---|---|
| committer | Lauris BH <lauris@nix.lv> | 2018-01-27 18:48:15 +0200 |
| commit | 9e842c8a722eb1db50cfbdbe7146b67d3670052f (patch) | |
| tree | d0d1f06f9363276289971759c7134149b9ec6860 /cmd | |
| parent | 97fe773491ae69531141316a1178d22c8a5d1257 (diff) | |
| download | gitea-9e842c8a722eb1db50cfbdbe7146b67d3670052f.tar.gz gitea-9e842c8a722eb1db50cfbdbe7146b67d3670052f.zip | |
Fix SSH auth lfs locks (#3152)
* Fix SSH auth LFS locks
* Activate SSH/lock test
* Remove debug
* Follow @lunny recommendation for AfterLoad method
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/serv.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/cmd/serv.go b/cmd/serv.go index d7fe6c6630..0326656f2a 100644 --- a/cmd/serv.go +++ b/cmd/serv.go @@ -259,12 +259,16 @@ func runServ(c *cli.Context) error { url := fmt.Sprintf("%s%s/%s.git/info/lfs", setting.AppURL, username, repo.Name) now := time.Now() - token := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims{ + claims := jwt.MapClaims{ "repo": repo.ID, "op": lfsVerb, "exp": now.Add(5 * time.Minute).Unix(), "nbf": now.Unix(), - }) + } + if user != nil { + claims["user"] = user.ID + } + token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims) // Sign and get the complete encoded token as a string using the secret tokenString, err := token.SignedString(setting.LFS.JWTSecretBytes) |