54f399c4df
According to the discussion with DanielGibson, the default "20m" seems
too short. It would make LFS fail if the file is large / network is
slow.
I think relaxing this timeout doesn't have side affect. So change the
default value to 24h, IMO that should be long enough.
## ⚠️ BREAKING
If admins want the previous timeout, they should set the setting
`[server].LFS_HTTP_AUTH_EXPIRY`.
69 lines
2 KiB
Go
69 lines
2 KiB
Go
// Copyright 2019 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package setting
|
|
|
|
import (
|
|
"encoding/base64"
|
|
"time"
|
|
|
|
"code.gitea.io/gitea/modules/generate"
|
|
"code.gitea.io/gitea/modules/log"
|
|
)
|
|
|
|
// LFS represents the configuration for Git LFS
|
|
var LFS = struct {
|
|
StartServer bool `ini:"LFS_START_SERVER"`
|
|
JWTSecretBase64 string `ini:"LFS_JWT_SECRET"`
|
|
JWTSecretBytes []byte `ini:"-"`
|
|
HTTPAuthExpiry time.Duration `ini:"LFS_HTTP_AUTH_EXPIRY"`
|
|
MaxFileSize int64 `ini:"LFS_MAX_FILE_SIZE"`
|
|
LocksPagingNum int `ini:"LFS_LOCKS_PAGING_NUM"`
|
|
|
|
Storage
|
|
}{}
|
|
|
|
func loadLFSFrom(rootCfg ConfigProvider) {
|
|
sec := rootCfg.Section("server")
|
|
if err := sec.MapTo(&LFS); err != nil {
|
|
log.Fatal("Failed to map LFS settings: %v", err)
|
|
}
|
|
|
|
lfsSec := rootCfg.Section("lfs")
|
|
storageType := lfsSec.Key("STORAGE_TYPE").MustString("")
|
|
|
|
// Specifically default PATH to LFS_CONTENT_PATH
|
|
// DEPRECATED should not be removed because users maybe upgrade from lower version to the latest version
|
|
// if these are removed, the warning will not be shown
|
|
deprecatedSetting(rootCfg, "server", "LFS_CONTENT_PATH", "lfs", "PATH", "v1.19.0")
|
|
lfsSec.Key("PATH").MustString(sec.Key("LFS_CONTENT_PATH").String())
|
|
|
|
LFS.Storage = getStorage(rootCfg, "lfs", storageType, lfsSec)
|
|
|
|
// Rest of LFS service settings
|
|
if LFS.LocksPagingNum == 0 {
|
|
LFS.LocksPagingNum = 50
|
|
}
|
|
|
|
LFS.HTTPAuthExpiry = sec.Key("LFS_HTTP_AUTH_EXPIRY").MustDuration(24 * time.Hour)
|
|
|
|
if LFS.StartServer {
|
|
LFS.JWTSecretBytes = make([]byte, 32)
|
|
n, err := base64.RawURLEncoding.Decode(LFS.JWTSecretBytes, []byte(LFS.JWTSecretBase64))
|
|
|
|
if err != nil || n != 32 {
|
|
LFS.JWTSecretBase64, err = generate.NewJwtSecretBase64()
|
|
if err != nil {
|
|
log.Fatal("Error generating JWT Secret for custom config: %v", err)
|
|
return
|
|
}
|
|
|
|
// Save secret
|
|
sec.Key("LFS_JWT_SECRET").SetValue(LFS.JWTSecretBase64)
|
|
if err := rootCfg.Save(); err != nil {
|
|
log.Fatal("Error saving JWT Secret for custom config: %v", err)
|
|
return
|
|
}
|
|
}
|
|
}
|
|
}
|