Skip to content
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

Jump to bottom

Add sha256 fingerprint alongside sha1 #130

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add sha256 fingerprint alongside sha1 #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
49 changes: 39 additions & 10 deletions internal/provider/data_source_tls_certificate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package provider

import (
"crypto/sha1"
"crypto/sha256"
"crypto/tls"
"crypto/x509"
"fmt"
Expand Down Expand Up @@ -68,6 +69,18 @@ func dataSourceTlsCertificate() *schema.Resource {
Type: schema.TypeString,
Computed: true,
},
"sha1_fingerprint_rfc4716": {
Type: schema.TypeString,
Computed: true,
},
"sha256_fingerprint": {
Type: schema.TypeString,
Computed: true,
},
"sha256_fingerprint_rfc4716": {
Type: schema.TypeString,
Computed: true,
},
},
},
},
Expand Down Expand Up @@ -111,18 +124,34 @@ func dataSourceTlsCertificateRead(d *schema.ResourceData, _ interface{}) error {
return nil
}

func rfc4716hex(data []byte) string {
var fingerprint string
for i := 0; i < len(data); i++ {
fingerprint = fmt.Sprintf("%s%0.2x", fingerprint, data[i])
if i != len(data)-1 {
fingerprint = fingerprint + ":"
}
}
return fingerprint
}

func parsePeerCertificate(cert *x509.Certificate) map[string]interface{} {
sha1_fingerprint := sha1.Sum(cert.Raw)
sha256_fingerprint := sha256.Sum256(cert.Raw)
ret := map[string]interface{}{
"signature_algorithm": cert.SignatureAlgorithm.String(),
"public_key_algorithm": cert.PublicKeyAlgorithm.String(),
"serial_number": cert.SerialNumber.String(),
"is_ca": cert.IsCA,
"version": cert.Version,
"issuer": cert.Issuer.String(),
"subject": cert.Subject.String(),
"not_before": cert.NotBefore.Format(time.RFC3339),
"not_after": cert.NotAfter.Format(time.RFC3339),
"sha1_fingerprint": fmt.Sprintf("%x", sha1.Sum(cert.Raw)),
"signature_algorithm": cert.SignatureAlgorithm.String(),
"public_key_algorithm": cert.PublicKeyAlgorithm.String(),
"serial_number": cert.SerialNumber.String(),
"is_ca": cert.IsCA,
"version": cert.Version,
"issuer": cert.Issuer.String(),
"subject": cert.Subject.String(),
"not_before": cert.NotBefore.Format(time.RFC3339),
"not_after": cert.NotAfter.Format(time.RFC3339),
"sha1_fingerprint": fmt.Sprintf("%x", sha1_fingerprint),
"sha1_fingerprint_rfc4716": rfc4716hex(sha1_fingerprint[:]),
"sha256_fingerprint": fmt.Sprintf("%x", sha256_fingerprint),
"sha256_fingerprint_rfc4716": rfc4716hex(sha256_fingerprint[:]),
}

return ret
Expand Down
7 changes: 7 additions & 0 deletions internal/provider/data_source_tls_certificate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ data "tls_certificate" "test" {
resource.TestCheckResourceAttr("data.tls_certificate.test", "certificates.0.not_before", "2019-11-07T15:47:48Z"),
resource.TestCheckResourceAttr("data.tls_certificate.test", "certificates.0.not_after", "2019-12-17T15:47:48Z"),
resource.TestCheckResourceAttr("data.tls_certificate.test", "certificates.0.sha1_fingerprint", "5829a9bcc57f317719c5c98d1f48d6c9957cb44e"),
resource.TestCheckResourceAttr("data.tls_certificate.test", "certificates.0.sha256_fingerprint", "fbab4a817b07545e5a674208f0fd4b6975305d0bd65419d23f6ce8476865f7a1"),
resource.TestCheckResourceAttr("data.tls_certificate.test", "certificates.0.sha1_fingerprint_rfc4716", "58:29:a9:bc:c5:7f:31:77:19:c5:c9:8d:1f:48:d6:c9:95:7c:b4:4e"),
resource.TestCheckResourceAttr("data.tls_certificate.test", "certificates.0.sha256_fingerprint_rfc4716", "fb:ab:4a:81:7b:07:54:5e:5a:67:42:08:f0:fd:4b:69:75:30:5d:0b:d6:54:19:d2:3f:6c:e8:47:68:65:f7:a1"),

resource.TestCheckResourceAttr("data.tls_certificate.test", "certificates.1.signature_algorithm", "SHA256-RSA"),
resource.TestCheckResourceAttr("data.tls_certificate.test", "certificates.1.public_key_algorithm", "RSA"),
Expand All @@ -53,6 +56,10 @@ data "tls_certificate" "test" {
resource.TestCheckResourceAttr("data.tls_certificate.test", "certificates.1.not_before", "2019-11-08T09:01:36Z"),
resource.TestCheckResourceAttr("data.tls_certificate.test", "certificates.1.not_after", "2019-11-08T19:01:36Z"),
resource.TestCheckResourceAttr("data.tls_certificate.test", "certificates.1.sha1_fingerprint", "61b65624427d75b61169100836904e44364df817"),
resource.TestCheckResourceAttr("data.tls_certificate.test", "certificates.1.sha256_fingerprint", "66d69bb2324b5fdef01ee5c59d6bdc1fce1a0db62ee6ba897a4bc1fdace20520"),
resource.TestCheckResourceAttr("data.tls_certificate.test", "certificates.1.sha1_fingerprint_rfc4716", "61:b6:56:24:42:7d:75:b6:11:69:10:08:36:90:4e:44:36:4d:f8:17"),
resource.TestCheckResourceAttr("data.tls_certificate.test", "certificates.1.sha256_fingerprint_rfc4716", "66:d6:9b:b2:32:4b:5f:de:f0:1e:e5:c5:9d:6b:dc:1f:ce:1a:0d:b6:2e:e6:ba:89:7a:4b:c1:fd:ac:e2:05:20"),

),
},
},
Expand Down
3 changes: 3 additions & 0 deletions website/docs/d/tls_certificate.html.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ The following attributes are exported:
* `certificates.#.serial_number` - Number that uniquely identifies the certificate with the CA's system. The `format`
function can be used to convert this base 10 number into other bases, such as hex.
* `certificates.#.sha1_fingerprint` - The SHA1 fingerprint of the public key of the certificate.
* `certificates.#.sha256_fingerprint` - The SHA256 fingerprint of the public key of the certificate.
* `certificates.#.sha1_fingerprint_rfc4716` - The SHA1 thumbprint of the public key of the certificate in RFC4716 format.
* `certificates.#.sha256_fingerprint_rfc4716` - The SHA256 thumbprint of the public key of the certificate in RFC4716 format.
* `certificates.#.signature_algorithm` - The algorithm used to sign the certificate.
* `certificates.#.subject` - The entity the certificate belongs to, roughly following
[RFC2253](https://tools.ietf.org/html/rfc2253).
Expand Down