Skip to content

added support for sha512 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sapergus wants to merge 2 commits into
base: master
Choose a base branch
from
Open

added support for sha512 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50c2ee5
added support for sha512
pergus Jun 11, 2024
15a7f28
fixed spelling error and added the algSha512 to valid()
pergus Jun 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions hash.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ func (h hashAlgorithm) valid() bool {
switch h {
case algSha1:
case algSha256:
case algSha512:
case algMd5:
default:
return false
Expand All @@ -23,6 +24,7 @@ func (h hashAlgorithm) valid() bool {
const (
algSha1 hashAlgorithm = "sha1"
algSha256 hashAlgorithm = "sha256"
algSha512 hashAlgorithm = "sha512"
algMd5 hashAlgorithm = "md5"
)

Expand Down
15 changes: 15 additions & 0 deletions hash_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"crypto/md5"
"crypto/sha1"
"crypto/sha256"
"crypto/sha512"
"fmt"
"testing"
)
Expand All @@ -12,6 +13,7 @@ func TestGenerateSignature(t *testing.T) {
type algos struct {
sha1 string
sha256 string
sha512 string
md5 string
}
tests := []struct {
Expand All @@ -25,6 +27,7 @@ func TestGenerateSignature(t *testing.T) {
expected: algos{
sha1: "889b4bc00e8a5d6b05c3cb47db58217cac788526",
sha256: "f28635b332e79bbb9322cebf268dc2bb7f13c90e52310d8ecb0a56bab8a8b9b7",
sha512: "b46ffe325d2817cfd431da5a5e0f67e5847f5cf4a50fd4c189b1d81b9bd38fa01472f406244a0d76210d249853626947ad9c3330e269da4b67ef12cce49a0d6d",
md5: "a54c3399cb671fe6e4abecf2b078e3ad",
},
},
Expand All @@ -34,6 +37,7 @@ func TestGenerateSignature(t *testing.T) {
expected: algos{
sha1: "cd936c4f51ecec358b62846b9c543e6c0bf3e1d7",
sha256: "9bd480144621173f8b045224ad409aa2a8e8213a7723acdf040868158496e409",
sha512: "f4ecc6965ca4d761c614d4da2ae034965b34d2b2f5774f1835a5dd2a00d5569c49ae272d83e36224b5ff0b4d17b7d8e677a38c13c1667177d8ca057e6f7cff98",
md5: "49c6a78f69fd4b317d04ba21abe96ac4",
},
},
Expand All @@ -43,6 +47,7 @@ func TestGenerateSignature(t *testing.T) {
expected: algos{
sha1: "22094f7f74b9424d038567e05058b989ad49fc72",
sha256: "56923d77e8a4053ac3709150238394f157d68364e05b7daa16455e705f87ccf0",
sha512: "95a96297a7c5e2bcc6a1ef421e4fc53f73763e2abca4fc12d00d62a18773fe2434635a158e2a4dd4bc4daac3881541065a7768c8719beebbff8d66e510dc599e",
md5: "a85ec23c3b5f82e67ccf15341a82d09f",
},
},
Expand All @@ -68,6 +73,16 @@ func TestGenerateSignature(t *testing.T) {
})
}

// sha512
for i, tt := range tests {
t.Run(fmt.Sprintf("sha512 %v", i), func(t *testing.T) {
signature := generateSignature(sha512.New, tt.secret, []byte(tt.body))
if signature != tt.expected.sha512 {
t.Errorf("got: %v, want: %v", signature, tt.expected.sha512)
}
})
}

// md5
for i, tt := range tests {
t.Run(fmt.Sprintf("md5 %v", i), func(t *testing.T) {
Expand Down
5 changes: 4 additions & 1 deletion hmac.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"crypto/md5"
"crypto/sha1"
"crypto/sha256"
"crypto/sha512"
"fmt"
"hash"

Expand Down Expand Up @@ -51,6 +52,8 @@ func (m *HMAC) Provision(ctx caddy.Context) error {
m.hasher = sha1.New
case algSha256:
m.hasher = sha256.New
case algSha512:
m.hasher = sha512.New
case algMd5:
m.hasher = md5.New
}
Expand All @@ -77,8 +80,8 @@ func (m HMAC) replacerKey() string {
}

// UnmarshalCaddyfile implements caddyfile.Unmarshaler.
// hmac [<name>] <algorithm> <secret>
//
// hmac [<name>] <algorithm> <secret>
func (m *HMAC) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
for d.Next() {
args := d.RemainingArgs()
Expand Down