TudbuT/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix problem with #1879

Browse source
This commit is contained in:
Unknwon 2015-11-02 14:01:19 -05:00
parent 92535c9df0
commit 75aab86a8d
5 changed files with 223 additions and 222 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gogs.go
View file

@ -17,7 +17,7 @@ import (
"github.com/gogits/gogs/modules/setting" "github.com/gogits/gogs/modules/setting"
) )
const APP_VER = "0.6.20.1031 Beta" const APP_VER = "0.6.20.1102 Beta"
func init() { func init() {
runtime.GOMAXPROCS(runtime.NumCPU()) runtime.GOMAXPROCS(runtime.NumCPU())

2
models/publickey.go
View file

@ -243,7 +243,7 @@ func CheckPublicKeyString(content string) (_ string, err error) {
} }
keyType := strings.Trim(sshKeygenOutput[len(sshKeygenOutput)-1], " ()") keyType := strings.Trim(sshKeygenOutput[len(sshKeygenOutput)-1], " ()")
if minimumKeySize := setting.Service.MinimumKeySizes[keyType]; minimumKeySize == 0 { if minimumKeySize := setting.Service.MinimumKeySizes[keyType]; minimumKeySize == 0 {
return "", errors.New("sorry, unrecognized public key type") return "", fmt.Errorf("unrecognized public key type: %s", keyType)
} else if keySize < minimumKeySize { } else if keySize < minimumKeySize {
return "", fmt.Errorf("the minimum accepted size of a public key %s is %d", keyType, minimumKeySize) return "", fmt.Errorf("the minimum accepted size of a public key %s is %d", keyType, minimumKeySize)
} }

438
modules/bindata/bindata.go
View file

File diff suppressed because one or more lines are too long

1
modules/setting/setting.go
View file

@ -453,6 +453,7 @@ func newService() {
Service.EnableCaptcha = sec.Key("ENABLE_CAPTCHA").MustBool() Service.EnableCaptcha = sec.Key("ENABLE_CAPTCHA").MustBool()
minimumKeySizes := Cfg.Section("service.minimum_key_sizes").Keys() minimumKeySizes := Cfg.Section("service.minimum_key_sizes").Keys()
Service.MinimumKeySizes = make(map[string]int)
for _, key := range minimumKeySizes { for _, key := range minimumKeySizes {
Service.MinimumKeySizes[key.Name()] = key.MustInt() Service.MinimumKeySizes[key.Name()] = key.MustInt()
} }

2
templates/.VERSION
View file

@ -1 +1 @@
0.6.20.1031 Beta 0.6.20.1102 Beta