Compare commits
No commits in common. "a9f699639f1593ac50571afff81f0b6740c90c3f" and "4e4763670be138b318a540ce2e883d1ce5aa54d7" have entirely different histories.
a9f699639f
...
4e4763670b
@ -1,5 +1,5 @@
|
|||||||
name='firefox-bin'
|
name='firefox-bin'
|
||||||
version='131.0.0'
|
version='130.0.0'
|
||||||
release='1'
|
release='1'
|
||||||
desc='Fast, Private & Safe Web Browser.'
|
desc='Fast, Private & Safe Web Browser.'
|
||||||
homepage='https://www.mozilla.org/firefox/'
|
homepage='https://www.mozilla.org/firefox/'
|
||||||
|
|||||||
@ -42,6 +42,7 @@ prepare() {
|
|||||||
cd ${name}
|
cd ${name}
|
||||||
# Patch to disable failing tests that rely on weak ssh keys (DSA-1024)
|
# Patch to disable failing tests that rely on weak ssh keys (DSA-1024)
|
||||||
# See https://github.com/go-gitea/gitea/issues/31624
|
# See https://github.com/go-gitea/gitea/issues/31624
|
||||||
|
patch -Np1 < "${scriptdir}/disable_failing_tests.patch"
|
||||||
make deps
|
make deps
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -54,7 +55,7 @@ build() {
|
|||||||
export EXTRA_GOFLAGS="-buildmode=pie -mod=readonly -modcacherw"
|
export EXTRA_GOFLAGS="-buildmode=pie -mod=readonly -modcacherw"
|
||||||
export LDFLAGS="-linkmode=external -compressdwarf=false -X 'code.gitea.io/gitea/modules/setting.AppWorkPath=/var/lib/gitea/' -X 'code.gitea.io/gitea/modules/setting.CustomConf=/etc/gitea/app.ini'"
|
export LDFLAGS="-linkmode=external -compressdwarf=false -X 'code.gitea.io/gitea/modules/setting.AppWorkPath=/var/lib/gitea/' -X 'code.gitea.io/gitea/modules/setting.CustomConf=/etc/gitea/app.ini'"
|
||||||
export TAGS="bindata sqlite sqlite_unlock_notify pam"
|
export TAGS="bindata sqlite sqlite_unlock_notify pam"
|
||||||
make -j$(nproc)
|
make -j1
|
||||||
}
|
}
|
||||||
|
|
||||||
check() {
|
check() {
|
||||||
|
|||||||
186
gitea/disable_failing_tests.patch
Normal file
186
gitea/disable_failing_tests.patch
Normal file
@ -0,0 +1,186 @@
|
|||||||
|
diff --git a/models/asymkey/ssh_key_test.go b/models/asymkey/ssh_key_test.go
|
||||||
|
index d3e886b97f..1243e31552 100644
|
||||||
|
--- a/models/asymkey/ssh_key_test.go
|
||||||
|
+++ b/models/asymkey/ssh_key_test.go
|
||||||
|
@@ -18,56 +18,56 @@ import (
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
)
|
||||||
|
|
||||||
|
-func Test_SSHParsePublicKey(t *testing.T) {
|
||||||
|
- testCases := []struct {
|
||||||
|
- name string
|
||||||
|
- skipSSHKeygen bool
|
||||||
|
- keyType string
|
||||||
|
- length int
|
||||||
|
- content string
|
||||||
|
- }{
|
||||||
|
- {"dsa-1024", false, "dsa", 1024, "ssh-dss AAAAB3NzaC1kc3MAAACBAOChCC7lf6Uo9n7BmZ6M8St19PZf4Tn59NriyboW2x/DZuYAz3ibZ2OkQ3S0SqDIa0HXSEJ1zaExQdmbO+Ux/wsytWZmCczWOVsaszBZSl90q8UnWlSH6P+/YA+RWJm5SFtuV9PtGIhyZgoNuz5kBQ7K139wuQsecdKktISwTakzAAAAFQCzKsO2JhNKlL+wwwLGOcLffoAmkwAAAIBpK7/3xvduajLBD/9vASqBQIHrgK2J+wiQnIb/Wzy0UsVmvfn8A+udRbBo+csM8xrSnlnlJnjkJS3qiM5g+eTwsLIV1IdKPEwmwB+VcP53Cw6lSyWyJcvhFb0N6s08NZysLzvj0N+ZC/FnhKTLzIyMtkHf/IrPCwlM+pV/M/96YgAAAIEAqQcGn9CKgzgPaguIZooTAOQdvBLMI5y0bQjOW6734XOpqQGf/Kra90wpoasLKZjSYKNPjE+FRUOrStLrxcNs4BeVKhy2PYTRnybfYVk1/dmKgH6P1YSRONsGKvTsH6c5IyCRG0ncCgYeF8tXppyd642982daopE7zQ/NPAnJfag= nocomment"},
|
||||||
|
- {"rsa-1024", false, "rsa", 1024, "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDAu7tvIvX6ZHrRXuZNfkR3XLHSsuCK9Zn3X58lxBcQzuo5xZgB6vRwwm/QtJuF+zZPtY5hsQILBLmF+BZ5WpKZp1jBeSjH2G7lxet9kbcH+kIVj0tPFEoyKI9wvWqIwC4prx/WVk2wLTJjzBAhyNxfEq7C9CeiX9pQEbEqJfkKCQ== nocomment\n"},
|
||||||
|
- {"rsa-2048", false, "rsa", 2048, "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDMZXh+1OBUwSH9D45wTaxErQIN9IoC9xl7MKJkqvTvv6O5RR9YW/IK9FbfjXgXsppYGhsCZo1hFOOsXHMnfOORqu/xMDx4yPuyvKpw4LePEcg4TDipaDFuxbWOqc/BUZRZcXu41QAWfDLrInwsltWZHSeG7hjhpacl4FrVv9V1pS6Oc5Q1NxxEzTzuNLS/8diZrTm/YAQQ/+B+mzWI3zEtF4miZjjAljWd1LTBPvU23d29DcBmmFahcZ441XZsTeAwGxG/Q6j8NgNXj9WxMeWwxXV2jeAX/EBSpZrCVlCQ1yJswT6xCp8TuBnTiGWYMBNTbOZvPC4e0WI2/yZW/s5F nocomment"},
|
||||||
|
- {"ecdsa-256", false, "ecdsa", 256, "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFQacN3PrOll7PXmN5B/ZNVahiUIqI05nbBlZk1KXsO3d06ktAWqbNflv2vEmA38bTFTfJ2sbn2B5ksT52cDDbA= nocomment"},
|
||||||
|
- {"ecdsa-384", false, "ecdsa", 384, "ecdsa-sha2-nistp384 AAAAE2VjZHNhLXNoYTItbmlzdHAzODQAAAAIbmlzdHAzODQAAABhBINmioV+XRX1Fm9Qk2ehHXJ2tfVxW30ypUWZw670Zyq5GQfBAH6xjygRsJ5wWsHXBsGYgFUXIHvMKVAG1tpw7s6ax9oA+dJOJ7tj+vhn8joFqT+sg3LYHgZkHrfqryRasQ== nocomment"},
|
||||||
|
- {"ecdsa-sk", true, "ecdsa-sk", 256, "sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBGXEEzWmm1dxb+57RoK5KVCL0w2eNv9cqJX2AGGVlkFsVDhOXHzsadS3LTK4VlEbbrDMJdoti9yM8vclA8IeRacAAAAEc3NoOg== nocomment"},
|
||||||
|
- {"ed25519-sk", true, "ed25519-sk", 256, "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIE7kM1R02+4ertDKGKEDcKG0s+2vyDDcIvceJ0Gqv5f1AAAABHNzaDo= nocomment"},
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- for _, tc := range testCases {
|
||||||
|
- t.Run(tc.name, func(t *testing.T) {
|
||||||
|
- t.Run("Native", func(t *testing.T) {
|
||||||
|
- keyTypeN, lengthN, err := SSHNativeParsePublicKey(tc.content)
|
||||||
|
- assert.NoError(t, err)
|
||||||
|
- assert.Equal(t, tc.keyType, keyTypeN)
|
||||||
|
- assert.EqualValues(t, tc.length, lengthN)
|
||||||
|
- })
|
||||||
|
- if tc.skipSSHKeygen {
|
||||||
|
- return
|
||||||
|
- }
|
||||||
|
- t.Run("SSHKeygen", func(t *testing.T) {
|
||||||
|
- keyTypeK, lengthK, err := SSHKeyGenParsePublicKey(tc.content)
|
||||||
|
- if err != nil {
|
||||||
|
- // Some servers do not support ecdsa format.
|
||||||
|
- if !strings.Contains(err.Error(), "line 1 too long:") {
|
||||||
|
- assert.FailNow(t, "%v", err)
|
||||||
|
- }
|
||||||
|
- }
|
||||||
|
- assert.Equal(t, tc.keyType, keyTypeK)
|
||||||
|
- assert.EqualValues(t, tc.length, lengthK)
|
||||||
|
- })
|
||||||
|
- t.Run("SSHParseKeyNative", func(t *testing.T) {
|
||||||
|
- keyTypeK, lengthK, err := SSHNativeParsePublicKey(tc.content)
|
||||||
|
- if err != nil {
|
||||||
|
- assert.FailNow(t, "%v", err)
|
||||||
|
- }
|
||||||
|
- assert.Equal(t, tc.keyType, keyTypeK)
|
||||||
|
- assert.EqualValues(t, tc.length, lengthK)
|
||||||
|
- })
|
||||||
|
- })
|
||||||
|
- }
|
||||||
|
-}
|
||||||
|
+//func Test_SSHParsePublicKey(t *testing.T) {
|
||||||
|
+// testCases := []struct {
|
||||||
|
+// name string
|
||||||
|
+// skipSSHKeygen bool
|
||||||
|
+// keyType string
|
||||||
|
+// length int
|
||||||
|
+// content string
|
||||||
|
+// }{
|
||||||
|
+// {"dsa-1024", false, "dsa", 1024, "ssh-dss AAAAB3NzaC1kc3MAAACBAOChCC7lf6Uo9n7BmZ6M8St19PZf4Tn59NriyboW2x/DZuYAz3ibZ2OkQ3S0SqDIa0HXSEJ1zaExQdmbO+Ux/wsytWZmCczWOVsaszBZSl90q8UnWlSH6P+/YA+RWJm5SFtuV9PtGIhyZgoNuz5kBQ7K139wuQsecdKktISwTakzAAAAFQCzKsO2JhNKlL+wwwLGOcLffoAmkwAAAIBpK7/3xvduajLBD/9vASqBQIHrgK2J+wiQnIb/Wzy0UsVmvfn8A+udRbBo+csM8xrSnlnlJnjkJS3qiM5g+eTwsLIV1IdKPEwmwB+VcP53Cw6lSyWyJcvhFb0N6s08NZysLzvj0N+ZC/FnhKTLzIyMtkHf/IrPCwlM+pV/M/96YgAAAIEAqQcGn9CKgzgPaguIZooTAOQdvBLMI5y0bQjOW6734XOpqQGf/Kra90wpoasLKZjSYKNPjE+FRUOrStLrxcNs4BeVKhy2PYTRnybfYVk1/dmKgH6P1YSRONsGKvTsH6c5IyCRG0ncCgYeF8tXppyd642982daopE7zQ/NPAnJfag= nocomment"},
|
||||||
|
+// {"rsa-1024", false, "rsa", 1024, "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDAu7tvIvX6ZHrRXuZNfkR3XLHSsuCK9Zn3X58lxBcQzuo5xZgB6vRwwm/QtJuF+zZPtY5hsQILBLmF+BZ5WpKZp1jBeSjH2G7lxet9kbcH+kIVj0tPFEoyKI9wvWqIwC4prx/WVk2wLTJjzBAhyNxfEq7C9CeiX9pQEbEqJfkKCQ== nocomment\n"},
|
||||||
|
+// {"rsa-2048", false, "rsa", 2048, "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDMZXh+1OBUwSH9D45wTaxErQIN9IoC9xl7MKJkqvTvv6O5RR9YW/IK9FbfjXgXsppYGhsCZo1hFOOsXHMnfOORqu/xMDx4yPuyvKpw4LePEcg4TDipaDFuxbWOqc/BUZRZcXu41QAWfDLrInwsltWZHSeG7hjhpacl4FrVv9V1pS6Oc5Q1NxxEzTzuNLS/8diZrTm/YAQQ/+B+mzWI3zEtF4miZjjAljWd1LTBPvU23d29DcBmmFahcZ441XZsTeAwGxG/Q6j8NgNXj9WxMeWwxXV2jeAX/EBSpZrCVlCQ1yJswT6xCp8TuBnTiGWYMBNTbOZvPC4e0WI2/yZW/s5F nocomment"},
|
||||||
|
+// {"ecdsa-256", false, "ecdsa", 256, "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFQacN3PrOll7PXmN5B/ZNVahiUIqI05nbBlZk1KXsO3d06ktAWqbNflv2vEmA38bTFTfJ2sbn2B5ksT52cDDbA= nocomment"},
|
||||||
|
+// {"ecdsa-384", false, "ecdsa", 384, "ecdsa-sha2-nistp384 AAAAE2VjZHNhLXNoYTItbmlzdHAzODQAAAAIbmlzdHAzODQAAABhBINmioV+XRX1Fm9Qk2ehHXJ2tfVxW30ypUWZw670Zyq5GQfBAH6xjygRsJ5wWsHXBsGYgFUXIHvMKVAG1tpw7s6ax9oA+dJOJ7tj+vhn8joFqT+sg3LYHgZkHrfqryRasQ== nocomment"},
|
||||||
|
+// {"ecdsa-sk", true, "ecdsa-sk", 256, "sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBGXEEzWmm1dxb+57RoK5KVCL0w2eNv9cqJX2AGGVlkFsVDhOXHzsadS3LTK4VlEbbrDMJdoti9yM8vclA8IeRacAAAAEc3NoOg== nocomment"},
|
||||||
|
+// {"ed25519-sk", true, "ed25519-sk", 256, "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIE7kM1R02+4ertDKGKEDcKG0s+2vyDDcIvceJ0Gqv5f1AAAABHNzaDo= nocomment"},
|
||||||
|
+// }
|
||||||
|
+//
|
||||||
|
+// for _, tc := range testCases {
|
||||||
|
+// t.Run(tc.name, func(t *testing.T) {
|
||||||
|
+// t.Run("Native", func(t *testing.T) {
|
||||||
|
+// keyTypeN, lengthN, err := SSHNativeParsePublicKey(tc.content)
|
||||||
|
+// assert.NoError(t, err)
|
||||||
|
+// assert.Equal(t, tc.keyType, keyTypeN)
|
||||||
|
+// assert.EqualValues(t, tc.length, lengthN)
|
||||||
|
+// })
|
||||||
|
+// if tc.skipSSHKeygen {
|
||||||
|
+// return
|
||||||
|
+// }
|
||||||
|
+// t.Run("SSHKeygen", func(t *testing.T) {
|
||||||
|
+// keyTypeK, lengthK, err := SSHKeyGenParsePublicKey(tc.content)
|
||||||
|
+// if err != nil {
|
||||||
|
+// // Some servers do not support ecdsa format.
|
||||||
|
+// if !strings.Contains(err.Error(), "line 1 too long:") {
|
||||||
|
+// assert.FailNow(t, "%v", err)
|
||||||
|
+// }
|
||||||
|
+// }
|
||||||
|
+// assert.Equal(t, tc.keyType, keyTypeK)
|
||||||
|
+// assert.EqualValues(t, tc.length, lengthK)
|
||||||
|
+// })
|
||||||
|
+// t.Run("SSHParseKeyNative", func(t *testing.T) {
|
||||||
|
+// keyTypeK, lengthK, err := SSHNativeParsePublicKey(tc.content)
|
||||||
|
+// if err != nil {
|
||||||
|
+// assert.FailNow(t, "%v", err)
|
||||||
|
+// }
|
||||||
|
+// assert.Equal(t, tc.keyType, keyTypeK)
|
||||||
|
+// assert.EqualValues(t, tc.length, lengthK)
|
||||||
|
+// })
|
||||||
|
+// })
|
||||||
|
+// }
|
||||||
|
+//}
|
||||||
|
|
||||||
|
func Test_CheckPublicKeyString(t *testing.T) {
|
||||||
|
oldValue := setting.SSH.MinimumKeySizeCheck
|
||||||
|
@@ -163,40 +163,40 @@ AAAAC3NzaC1lZDI1NTE5AAAAICV0MGX/W9IvLA4FXpIuUcdDcbj5KX4syHgsTy7soVgf
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
-func Test_calcFingerprint(t *testing.T) {
|
||||||
|
- testCases := []struct {
|
||||||
|
- name string
|
||||||
|
- skipSSHKeygen bool
|
||||||
|
- fp string
|
||||||
|
- content string
|
||||||
|
- }{
|
||||||
|
- {"dsa-1024", false, "SHA256:fSIHQlpKMDsGPVAXI8BPYfRp+e2sfvSt1sMrPsFiXrc", "ssh-dss AAAAB3NzaC1kc3MAAACBAOChCC7lf6Uo9n7BmZ6M8St19PZf4Tn59NriyboW2x/DZuYAz3ibZ2OkQ3S0SqDIa0HXSEJ1zaExQdmbO+Ux/wsytWZmCczWOVsaszBZSl90q8UnWlSH6P+/YA+RWJm5SFtuV9PtGIhyZgoNuz5kBQ7K139wuQsecdKktISwTakzAAAAFQCzKsO2JhNKlL+wwwLGOcLffoAmkwAAAIBpK7/3xvduajLBD/9vASqBQIHrgK2J+wiQnIb/Wzy0UsVmvfn8A+udRbBo+csM8xrSnlnlJnjkJS3qiM5g+eTwsLIV1IdKPEwmwB+VcP53Cw6lSyWyJcvhFb0N6s08NZysLzvj0N+ZC/FnhKTLzIyMtkHf/IrPCwlM+pV/M/96YgAAAIEAqQcGn9CKgzgPaguIZooTAOQdvBLMI5y0bQjOW6734XOpqQGf/Kra90wpoasLKZjSYKNPjE+FRUOrStLrxcNs4BeVKhy2PYTRnybfYVk1/dmKgH6P1YSRONsGKvTsH6c5IyCRG0ncCgYeF8tXppyd642982daopE7zQ/NPAnJfag= nocomment"},
|
||||||
|
- {"rsa-1024", false, "SHA256:vSnDkvRh/xM6kMxPidLgrUhq3mCN7CDaronCEm2joyQ", "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDAu7tvIvX6ZHrRXuZNfkR3XLHSsuCK9Zn3X58lxBcQzuo5xZgB6vRwwm/QtJuF+zZPtY5hsQILBLmF+BZ5WpKZp1jBeSjH2G7lxet9kbcH+kIVj0tPFEoyKI9wvWqIwC4prx/WVk2wLTJjzBAhyNxfEq7C9CeiX9pQEbEqJfkKCQ== nocomment\n"},
|
||||||
|
- {"rsa-2048", false, "SHA256:ZHD//a1b9VuTq9XSunAeYjKeU1xDa2tBFZYrFr2Okkg", "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDMZXh+1OBUwSH9D45wTaxErQIN9IoC9xl7MKJkqvTvv6O5RR9YW/IK9FbfjXgXsppYGhsCZo1hFOOsXHMnfOORqu/xMDx4yPuyvKpw4LePEcg4TDipaDFuxbWOqc/BUZRZcXu41QAWfDLrInwsltWZHSeG7hjhpacl4FrVv9V1pS6Oc5Q1NxxEzTzuNLS/8diZrTm/YAQQ/+B+mzWI3zEtF4miZjjAljWd1LTBPvU23d29DcBmmFahcZ441XZsTeAwGxG/Q6j8NgNXj9WxMeWwxXV2jeAX/EBSpZrCVlCQ1yJswT6xCp8TuBnTiGWYMBNTbOZvPC4e0WI2/yZW/s5F nocomment"},
|
||||||
|
- {"ecdsa-256", false, "SHA256:Bqx/xgWqRKLtkZ0Lr4iZpgb+5lYsFpSwXwVZbPwuTRw", "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFQacN3PrOll7PXmN5B/ZNVahiUIqI05nbBlZk1KXsO3d06ktAWqbNflv2vEmA38bTFTfJ2sbn2B5ksT52cDDbA= nocomment"},
|
||||||
|
- {"ecdsa-384", false, "SHA256:4qfJOgJDtUd8BrEjyVNdI8IgjiZKouztVde43aDhe1E", "ecdsa-sha2-nistp384 AAAAE2VjZHNhLXNoYTItbmlzdHAzODQAAAAIbmlzdHAzODQAAABhBINmioV+XRX1Fm9Qk2ehHXJ2tfVxW30ypUWZw670Zyq5GQfBAH6xjygRsJ5wWsHXBsGYgFUXIHvMKVAG1tpw7s6ax9oA+dJOJ7tj+vhn8joFqT+sg3LYHgZkHrfqryRasQ== nocomment"},
|
||||||
|
- {"ecdsa-sk", true, "SHA256:4wcIu4z+53gHc+db85OPfy8IydyNzPLCr6kHIs625LQ", "sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBGXEEzWmm1dxb+57RoK5KVCL0w2eNv9cqJX2AGGVlkFsVDhOXHzsadS3LTK4VlEbbrDMJdoti9yM8vclA8IeRacAAAAEc3NoOg== nocomment"},
|
||||||
|
- {"ed25519-sk", true, "SHA256:RB4ku1OeWKN7fLMrjxz38DK0mp1BnOPBx4BItjTvJ0g", "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIE7kM1R02+4ertDKGKEDcKG0s+2vyDDcIvceJ0Gqv5f1AAAABHNzaDo= nocomment"},
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- for _, tc := range testCases {
|
||||||
|
- t.Run(tc.name, func(t *testing.T) {
|
||||||
|
- t.Run("Native", func(t *testing.T) {
|
||||||
|
- fpN, err := calcFingerprintNative(tc.content)
|
||||||
|
- assert.NoError(t, err)
|
||||||
|
- assert.Equal(t, tc.fp, fpN)
|
||||||
|
- })
|
||||||
|
- if tc.skipSSHKeygen {
|
||||||
|
- return
|
||||||
|
- }
|
||||||
|
- t.Run("SSHKeygen", func(t *testing.T) {
|
||||||
|
- fpK, err := calcFingerprintSSHKeygen(tc.content)
|
||||||
|
- assert.NoError(t, err)
|
||||||
|
- assert.Equal(t, tc.fp, fpK)
|
||||||
|
- })
|
||||||
|
- })
|
||||||
|
- }
|
||||||
|
-}
|
||||||
|
+//func Test_calcFingerprint(t *testing.T) {
|
||||||
|
+// testCases := []struct {
|
||||||
|
+// name string
|
||||||
|
+// skipSSHKeygen bool
|
||||||
|
+// fp string
|
||||||
|
+// content string
|
||||||
|
+// }{
|
||||||
|
+// {"dsa-1024", false, "SHA256:fSIHQlpKMDsGPVAXI8BPYfRp+e2sfvSt1sMrPsFiXrc", "ssh-dss AAAAB3NzaC1kc3MAAACBAOChCC7lf6Uo9n7BmZ6M8St19PZf4Tn59NriyboW2x/DZuYAz3ibZ2OkQ3S0SqDIa0HXSEJ1zaExQdmbO+Ux/wsytWZmCczWOVsaszBZSl90q8UnWlSH6P+/YA+RWJm5SFtuV9PtGIhyZgoNuz5kBQ7K139wuQsecdKktISwTakzAAAAFQCzKsO2JhNKlL+wwwLGOcLffoAmkwAAAIBpK7/3xvduajLBD/9vASqBQIHrgK2J+wiQnIb/Wzy0UsVmvfn8A+udRbBo+csM8xrSnlnlJnjkJS3qiM5g+eTwsLIV1IdKPEwmwB+VcP53Cw6lSyWyJcvhFb0N6s08NZysLzvj0N+ZC/FnhKTLzIyMtkHf/IrPCwlM+pV/M/96YgAAAIEAqQcGn9CKgzgPaguIZooTAOQdvBLMI5y0bQjOW6734XOpqQGf/Kra90wpoasLKZjSYKNPjE+FRUOrStLrxcNs4BeVKhy2PYTRnybfYVk1/dmKgH6P1YSRONsGKvTsH6c5IyCRG0ncCgYeF8tXppyd642982daopE7zQ/NPAnJfag= nocomment"},
|
||||||
|
+// {"rsa-1024", false, "SHA256:vSnDkvRh/xM6kMxPidLgrUhq3mCN7CDaronCEm2joyQ", "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDAu7tvIvX6ZHrRXuZNfkR3XLHSsuCK9Zn3X58lxBcQzuo5xZgB6vRwwm/QtJuF+zZPtY5hsQILBLmF+BZ5WpKZp1jBeSjH2G7lxet9kbcH+kIVj0tPFEoyKI9wvWqIwC4prx/WVk2wLTJjzBAhyNxfEq7C9CeiX9pQEbEqJfkKCQ== nocomment\n"},
|
||||||
|
+// {"rsa-2048", false, "SHA256:ZHD//a1b9VuTq9XSunAeYjKeU1xDa2tBFZYrFr2Okkg", "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDMZXh+1OBUwSH9D45wTaxErQIN9IoC9xl7MKJkqvTvv6O5RR9YW/IK9FbfjXgXsppYGhsCZo1hFOOsXHMnfOORqu/xMDx4yPuyvKpw4LePEcg4TDipaDFuxbWOqc/BUZRZcXu41QAWfDLrInwsltWZHSeG7hjhpacl4FrVv9V1pS6Oc5Q1NxxEzTzuNLS/8diZrTm/YAQQ/+B+mzWI3zEtF4miZjjAljWd1LTBPvU23d29DcBmmFahcZ441XZsTeAwGxG/Q6j8NgNXj9WxMeWwxXV2jeAX/EBSpZrCVlCQ1yJswT6xCp8TuBnTiGWYMBNTbOZvPC4e0WI2/yZW/s5F nocomment"},
|
||||||
|
+// {"ecdsa-256", false, "SHA256:Bqx/xgWqRKLtkZ0Lr4iZpgb+5lYsFpSwXwVZbPwuTRw", "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFQacN3PrOll7PXmN5B/ZNVahiUIqI05nbBlZk1KXsO3d06ktAWqbNflv2vEmA38bTFTfJ2sbn2B5ksT52cDDbA= nocomment"},
|
||||||
|
+// {"ecdsa-384", false, "SHA256:4qfJOgJDtUd8BrEjyVNdI8IgjiZKouztVde43aDhe1E", "ecdsa-sha2-nistp384 AAAAE2VjZHNhLXNoYTItbmlzdHAzODQAAAAIbmlzdHAzODQAAABhBINmioV+XRX1Fm9Qk2ehHXJ2tfVxW30ypUWZw670Zyq5GQfBAH6xjygRsJ5wWsHXBsGYgFUXIHvMKVAG1tpw7s6ax9oA+dJOJ7tj+vhn8joFqT+sg3LYHgZkHrfqryRasQ== nocomment"},
|
||||||
|
+// {"ecdsa-sk", true, "SHA256:4wcIu4z+53gHc+db85OPfy8IydyNzPLCr6kHIs625LQ", "sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBGXEEzWmm1dxb+57RoK5KVCL0w2eNv9cqJX2AGGVlkFsVDhOXHzsadS3LTK4VlEbbrDMJdoti9yM8vclA8IeRacAAAAEc3NoOg== nocomment"},
|
||||||
|
+// {"ed25519-sk", true, "SHA256:RB4ku1OeWKN7fLMrjxz38DK0mp1BnOPBx4BItjTvJ0g", "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIE7kM1R02+4ertDKGKEDcKG0s+2vyDDcIvceJ0Gqv5f1AAAABHNzaDo= nocomment"},
|
||||||
|
+// }
|
||||||
|
+//
|
||||||
|
+// for _, tc := range testCases {
|
||||||
|
+// t.Run(tc.name, func(t *testing.T) {
|
||||||
|
+// t.Run("Native", func(t *testing.T) {
|
||||||
|
+// fpN, err := calcFingerprintNative(tc.content)
|
||||||
|
+// assert.NoError(t, err)
|
||||||
|
+// assert.Equal(t, tc.fp, fpN)
|
||||||
|
+// })
|
||||||
|
+// if tc.skipSSHKeygen {
|
||||||
|
+// return
|
||||||
|
+// }
|
||||||
|
+// t.Run("SSHKeygen", func(t *testing.T) {
|
||||||
|
+// fpK, err := calcFingerprintSSHKeygen(tc.content)
|
||||||
|
+// assert.NoError(t, err)
|
||||||
|
+// assert.Equal(t, tc.fp, fpK)
|
||||||
|
+// })
|
||||||
|
+// })
|
||||||
|
+// }
|
||||||
|
+//}
|
||||||
|
|
||||||
|
var (
|
||||||
|
// Generated with "ssh-keygen -C test@rekor.dev -f id_rsa"
|
||||||
@ -1,73 +0,0 @@
|
|||||||
_name=sphinx
|
|
||||||
name='python3-sphinx'
|
|
||||||
version='8.0.2'
|
|
||||||
release='1'
|
|
||||||
desc='Python documentation generator.'
|
|
||||||
homepage='https://github.com/pypa/setuptools_scm'
|
|
||||||
maintainer_ru='Евгений Храмов <xpamych@yandex.ru>'
|
|
||||||
architectures=('all')
|
|
||||||
license=('BSD-2-Clause')
|
|
||||||
provides=('sphinx')
|
|
||||||
conflicts=('sphinx')
|
|
||||||
|
|
||||||
deps=(
|
|
||||||
python3-babel
|
|
||||||
python3-docutils
|
|
||||||
python3-imagesize
|
|
||||||
python3-jinja
|
|
||||||
python3-packaging
|
|
||||||
python3-pygments
|
|
||||||
python3-requests
|
|
||||||
python3-snowballstemmer
|
|
||||||
python3-sphinx-alabaster-theme
|
|
||||||
python3-sphinxcontrib-{{apple,dev,html}help,jsmath,qthelp,serializinghtml}
|
|
||||||
|
|
||||||
)
|
|
||||||
|
|
||||||
build_deps=(
|
|
||||||
'git'
|
|
||||||
'python3-build'
|
|
||||||
'python3-installer'
|
|
||||||
'python3-wheel'
|
|
||||||
'mercurial'
|
|
||||||
'python3-pip'
|
|
||||||
'python3-pytest'
|
|
||||||
'python3-rich'
|
|
||||||
)
|
|
||||||
|
|
||||||
build_deps_almalinux=(
|
|
||||||
'git'
|
|
||||||
'python3-build'
|
|
||||||
'python3-installer'
|
|
||||||
'python3-setuptools-wheel'
|
|
||||||
'python3-pip'
|
|
||||||
'python3-pytest'
|
|
||||||
'python3-rich'
|
|
||||||
)
|
|
||||||
|
|
||||||
sources=("git+https://github.com/pypa/setuptools_scm.git#tag=v$version")
|
|
||||||
checksums=('SKIP')
|
|
||||||
|
|
||||||
build() {
|
|
||||||
cd $_name
|
|
||||||
python -m build --wheel --skip-dependency-check --no-isolation
|
|
||||||
}
|
|
||||||
|
|
||||||
check() {
|
|
||||||
cd $_name
|
|
||||||
python -m venv --system-site-packages test-env
|
|
||||||
test-env/bin/python -m installer dist/*.whl
|
|
||||||
# test_pyproject_support https://gitlab.archlinux.org/archlinux/packaging/packages/python-setuptools-scm/-/issues/1
|
|
||||||
test-env/bin/python -m pytest -vk 'not test_not_owner and not test_pyproject_support'
|
|
||||||
}
|
|
||||||
|
|
||||||
package() {
|
|
||||||
cd $_name
|
|
||||||
python -m installer --destdir="$pkgdir" dist/*.whl
|
|
||||||
|
|
||||||
# Symlink license file
|
|
||||||
local site_packages=$(python -c "import site; print(site.getsitepackages()[0])")
|
|
||||||
install -d "$pkgdir"/usr/share/licenses/python3-setuptools-scm
|
|
||||||
ln -s "$site_packages"/$_name-$version.dist-info/LICENSE \
|
|
||||||
"$pkgdir"/usr/share/licenses/python3-setuptools-scm/LICENSE
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue
Block a user