Skip to content

feat: Add AWS instance identity authentication #570

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

Merged
merged 5 commits into from
Mar 28, 2022
Merged

feat: Add AWS instance identity authentication #570

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c31d9cd
feat: Add AWS instance identity authentication
kylecarbs Mar 26, 2022
9fdd6f5
Fix sha256 verbosity
kylecarbs Mar 28, 2022
7f04df4
Merge branch 'main' into awsauth
kylecarbs Mar 28, 2022
83b5fe9
Fix HTTP client being exposed on auth
kylecarbs Mar 28, 2022
eec8e29
Merge branch 'main' into awsauth
kylecarbs Mar 28, 2022
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
Prev Previous commit
Next Next commit
Fix sha256 verbosity
  • Loading branch information
@kylecarbs
kylecarbs committed Mar 28, 2022
commit 9fdd6f548eab70f8177522cc0835a0411e0556d3
9 changes: 2 additions & 7 deletions coderd/awsidentity/awsidentity.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,7 @@ func Validate(signature, document string, certificates Certificates) (Identity,
if err != nil {
return Identity{}, xerrors.Errorf("decode signature: %w", err)
}
documentHash := sha256.New()
_, err = documentHash.Write([]byte(document))
if err != nil {
return Identity{}, xerrors.Errorf("write document hash: %w", err)
}
hashedDocument := documentHash.Sum(nil)
hashedDocument := sha256.Sum256([]byte(document))

for region, certificate := range certificates {
regionBlock, rest := pem.Decode([]byte(certificate))
Expand All @@ -89,7 +84,7 @@ func Validate(signature, document string, certificates Certificates) (Identity,
if !valid {
return Identity{}, xerrors.Errorf("certificate for %q was not an rsa key", region)
}
err = rsa.VerifyPKCS1v15(regionPublicKey, crypto.SHA256, hashedDocument, rawSignature)
err = rsa.VerifyPKCS1v15(regionPublicKey, crypto.SHA256, hashedDocument[:], rawSignature)
if err != nil {
continue
}
Expand Down
7 changes: 2 additions & 5 deletions coderd/coderdtest/coderdtest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,12 +348,9 @@ func NewAWSInstanceIdentity(t *testing.T, instanceID string) (awsidentity.Certif
require.NoError(t, err)

document := []byte(`{"instanceId":"` + instanceID + `"}`)
documentHash := sha256.New()
_, err = documentHash.Write(document)
require.NoError(t, err)
hashedDocument := documentHash.Sum(nil)
hashedDocument := sha256.Sum256(document)

signatureRaw, err := rsa.SignPKCS1v15(rand.Reader, privateKey, crypto.SHA256, hashedDocument)
signatureRaw, err := rsa.SignPKCS1v15(rand.Reader, privateKey, crypto.SHA256, hashedDocument[:])
require.NoError(t, err)
signature := make([]byte, base64.StdEncoding.EncodedLen(len(signatureRaw)))
base64.StdEncoding.Encode(signature, signatureRaw)
Expand Down