diff options
author | zeripath <art27@cantab.net> | 2020-10-09 07:52:57 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-09 09:52:57 +0300 |
commit | ea69ec6f0feb357b82dc2572f88184db507e383b (patch) | |
tree | e2c89b77999c70f853f4a6d93703338b1ae7d013 /models | |
parent | 06f1cdde6edaf99a78ab18e0c1939a2d6ab30fde (diff) | |
download | gitea-ea69ec6f0feb357b82dc2572f88184db507e383b.tar.gz gitea-ea69ec6f0feb357b82dc2572f88184db507e383b.zip |
Disable DSA ssh keys by default (#13056)
* Disable DSA ssh keys by default
OpenSSH has disabled DSA keys since version 7.0
As the docker runs openssh > v7.0 we should just disable
DSA keys by default.
Refers to #11417
Signed-off-by: Andrew Thornton <art27@cantab.net>
* Just disable DSA keys by default
Signed-off-by: Andrew Thornton <art27@cantab.net>
* Appears we need to set the minimum key sizes too
Signed-off-by: Andrew Thornton <art27@cantab.net>
* Appears we need to set the minimum key sizes too
Signed-off-by: Andrew Thornton <art27@cantab.net>
* Remove DSA type
* Fix Tests
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Co-authored-by: Lauris BH <lauris@nix.lv>
Diffstat (limited to 'models')
-rw-r--r-- | models/ssh_key_test.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/models/ssh_key_test.go b/models/ssh_key_test.go index 95cd4eeb1a..282c26e736 100644 --- a/models/ssh_key_test.go +++ b/models/ssh_key_test.go @@ -57,6 +57,8 @@ func Test_SSHParsePublicKey(t *testing.T) { } func Test_CheckPublicKeyString(t *testing.T) { + oldValue := setting.SSH.MinimumKeySizeCheck + setting.SSH.MinimumKeySizeCheck = false for _, test := range []struct { content string }{ @@ -131,7 +133,7 @@ AAAAC3NzaC1lZDI1NTE5AAAAICV0MGX/W9IvLA4FXpIuUcdDcbj5KX4syHgsTy7soVgf _, err := CheckPublicKeyString(test.content) assert.NoError(t, err) } - + setting.SSH.MinimumKeySizeCheck = oldValue for _, invalidKeys := range []struct { content string }{ |