Use -1 to disable key algorithm type in ssh.minimum_key_sizes (#11635) (#11662)

zeripath · techknowlogick · web-flow · commit 0c40b0badd9e · 2020-05-28T19:05:16.000-04:00
Backport #11635 Fix #11634 Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: techknowlogick <techknowlogick@gitea.io>
diff --git a/modules/setting/setting.go b/modules/setting/setting.go
@@ -730,6 +730,8 @@ func NewContext() {
 	for _, key := range minimumKeySizes {
 		if key.MustInt() != -1 {
 			SSH.MinimumKeySizes[strings.ToLower(key.Name())] = key.MustInt()
+		} else {
+			delete(SSH.MinimumKeySizes, strings.ToLower(key.Name()))
 		}
 	}
 	SSH.AuthorizedKeysBackup = sec.Key("SSH_AUTHORIZED_KEYS_BACKUP").MustBool(true)

Original file line number	Diff line number	Diff line change
`@@ -730,6 +730,8 @@ func NewContext() {`
`730`	`730`	`for _, key := range minimumKeySizes {`
`731`	`731`	`if key.MustInt() != -1 {`
`732`	`732`	`SSH.MinimumKeySizes[strings.ToLower(key.Name())] = key.MustInt()`
	`733`	`+ } else {`
	`734`	`+ delete(SSH.MinimumKeySizes, strings.ToLower(key.Name()))`
`733`	`735`	`}`
`734`	`736`	`}`
`735`	`737`	`SSH.AuthorizedKeysBackup = sec.Key("SSH_AUTHORIZED_KEYS_BACKUP").MustBool(true)`