-
Notifications
You must be signed in to change notification settings - Fork 110
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add lint to enforce SMIME BRs: 7.1.4.2.1 requirement for mailbox addr… (
#800) * Add lint to enforce SMIME BRs: 7.1.4.2.1 requirement for mailbox addresses All mailbox addresses appearing in subjectDN or dirName must be repeated in san:rfc822Name or san:otherName. This lint does its best to detect mailbox address values in the subjectDN or dirName and if any are detected ensures they are repeated. * Add expected integration failures for new lint e_mailbox_address_shall_contain_an_rfc822_name The failures all have email addresses that don't have an **exact** match in the SAN. How the integration tests were run: `make integration INT_FLAGS="-lintSummary -fingerprintSummary -lintFilter='e_mailbox_address_shall_contain_an_rfc822_name'"` Fingerprints of the relevant certificates: 3087f97b6cff020b5320e18d3e326074cbaa128142660f2debe4564ab1ab0179 5f3fcccca91a7b39e8995f79c35cb5e604d4ee0487ea1a41993c84304c0a5c99 63d23132c2511f33bb947f27c398bb824109ccf2d6a2037e3713fe9f7a43b15d b034fa1aa9e501dc14b43d43dfe2210de3e5551744494b55d5f0abd865c67efc c6ac841c78191101725ca7d5ed499be47c15ebeece7d74e6d095e2925e7bb404 e4dbfc94e616ffb59904e394d9dcdd3ab55c26c5586440f37c058eecb907a344 * Revert "Add expected integration failures for new lint e_mailbox_address_shall_contain_an_rfc822_name" This reverts commit 037b5ec. * Add expected integration failures for new lint e_mailbox_address_shall_contain_an_rfc822_name This commit is a proper version of the previously reverted one. It was reverted because I accidently ran the script to update the config only for the failing lint, rather than lints. The failures all have email addresses that don't have an **exact** match in the SAN. How the integration tests were run: `make integration INT_FLAGS="-lintSummary -fingerprintSummary -lintFilter='e_mailbox_address_shall_contain_an_rfc822_name'"` Fingerprints of the relevant certificates: 3087f97b6cff020b5320e18d3e326074cbaa128142660f2debe4564ab1ab0179 5f3fcccca91a7b39e8995f79c35cb5e604d4ee0487ea1a41993c84304c0a5c99 63d23132c2511f33bb947f27c398bb824109ccf2d6a2037e3713fe9f7a43b15d b034fa1aa9e501dc14b43d43dfe2210de3e5551744494b55d5f0abd865c67efc c6ac841c78191101725ca7d5ed499be47c15ebeece7d74e6d095e2925e7bb404 e4dbfc94e616ffb59904e394d9dcdd3ab55c26c5586440f37c058eecb907a344 * Use effective date from SMIME BR for mailbox_address_from_san lint * Address code style to fit with established conventions * Revert accidental changes to genTestCerts * Apply DeMorgan's law to fix incorrect code simplification * Remove redundant function literal * Run gofmt --------- Co-authored-by: Christopher Henderson <chris@chenderson.org>
- Loading branch information
1 parent
a23de3d
commit b9ff71f
Showing
13 changed files
with
639 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
| package cabf_smime_br | ||
|
|
||
| /* | ||
| * ZLint Copyright 2024 Regents of the University of Michigan | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); you may not | ||
| * use this file except in compliance with the License. You may obtain a copy | ||
| * of the License at http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or | ||
| * implied. See the License for the specific language governing | ||
| * permissions and limitations under the License. | ||
| */ | ||
|
|
||
| import ( | ||
| "github.com/zmap/zcrypto/encoding/asn1" | ||
| "github.com/zmap/zcrypto/x509" | ||
| "github.com/zmap/zcrypto/x509/pkix" | ||
| "github.com/zmap/zlint/v3/lint" | ||
| "github.com/zmap/zlint/v3/util" | ||
| ) | ||
|
|
||
| // MailboxAddressFromSAN - linter to enforce MAY/SHALL NOT requirements for SMIME certificates | ||
| type MailboxAddressFromSAN struct { | ||
| } | ||
|
|
||
| func init() { | ||
| lint.RegisterLint(&lint.Lint{ | ||
| Name: "e_mailbox_address_shall_contain_an_rfc822_name", | ||
| Description: "All Mailbox Addresses in the subject field or entries of type dirName of this extension SHALL be repeated as rfc822Name or otherName values of type id-on-SmtpUTF8Mailbox in this extension", | ||
| Citation: "SMIME BRs: 7.1.4.2.1", | ||
| Source: lint.CABFSMIMEBaselineRequirements, | ||
| EffectiveDate: util.CABF_SMIME_BRs_1_0_0_Date, | ||
| Lint: NewMailboxAddressFromSAN, | ||
| }) | ||
| } | ||
|
|
||
| // NewMailboxAddressFromSAN creates a new linter to enforce the requirement that all Mailbox Addresses in SMIME BR certificates must be copied from the SAN | ||
| func NewMailboxAddressFromSAN() lint.LintInterface { | ||
| return &MailboxAddressFromSAN{} | ||
| } | ||
|
|
||
| // CheckApplies is returns true if the certificate's policies assert that it conforms to the SMIME BRs | ||
| func (l *MailboxAddressFromSAN) CheckApplies(c *x509.Certificate) bool { | ||
| if util.HasEKU(c, x509.ExtKeyUsageEmailProtection) || util.HasEKU(c, x509.ExtKeyUsageAny) { | ||
| return true | ||
| } | ||
|
|
||
| return util.IsMailboxValidatedCertificate(c) && util.IsSubscriberCert(c) | ||
| } | ||
|
|
||
| // Execute checks all the places where Mailbox Addresses may be found in an SMIME certificate and confirms that they are present in the SAN rfc822Name or SAN otherName | ||
| func (l *MailboxAddressFromSAN) Execute(c *x509.Certificate) *lint.LintResult { | ||
| lintErr := &lint.LintResult{ | ||
| Status: lint.Error, | ||
| Details: "all certificate mailbox addresses must be present in san:emailAddresses or san:otherNames in addition to any other field they may appear", | ||
| } | ||
|
|
||
| // build list of Mailbox addresses from subject:commonName, subject:emailAddress, dirName | ||
| toFindMailboxAddresses := getMailboxAddressesFromDistinguishedName(c.Subject) | ||
|
|
||
| for _, dirName := range c.DirectoryNames { | ||
| toFindMailboxAddresses = append(toFindMailboxAddresses, getMailboxAddressesFromDistinguishedName(dirName)...) | ||
| } | ||
|
|
||
| sanNames := map[string]bool{} | ||
| for _, rfc822Name := range c.EmailAddresses { | ||
| sanNames[rfc822Name] = true | ||
| } | ||
|
|
||
| for _, otherName := range c.OtherNames { | ||
| if otherName.TypeID.Equal(util.OidIdOnSmtpUtf8Mailbox) { | ||
| // The otherName needs to be specially unmarshalled since it is | ||
| // stored as a UTF-8 string rather than what the asn1 package | ||
| // describes as a PrintableString. | ||
| var otherNameValue string | ||
| rest, err := asn1.UnmarshalWithParams(otherName.Value.Bytes, &otherNameValue, "utf8") | ||
| if len(rest) > 0 || err != nil { | ||
| return lintErr | ||
| } | ||
|
|
||
| sanNames[otherNameValue] = true | ||
| } | ||
| } | ||
|
|
||
| for _, mailboxAddress := range toFindMailboxAddresses { | ||
| if _, found := sanNames[mailboxAddress]; !found { | ||
| return lintErr | ||
| } | ||
| } | ||
|
|
||
| return &lint.LintResult{Status: lint.Pass} | ||
| } | ||
|
|
||
| func getMailboxAddressesFromDistinguishedName(name pkix.Name) []string { | ||
| mailboxAddresses := []string{} | ||
|
|
||
| for _, commonName := range name.CommonNames { | ||
| if util.IsMailboxAddress(commonName) { | ||
| mailboxAddresses = append(mailboxAddresses, commonName) | ||
| } | ||
| } | ||
|
|
||
| for _, emailAddress := range name.EmailAddress { | ||
| if util.IsMailboxAddress(emailAddress) { | ||
| mailboxAddresses = append(mailboxAddresses, emailAddress) | ||
| } | ||
| } | ||
|
|
||
| return mailboxAddresses | ||
| } |
103 changes: 103 additions & 0 deletions
103
v3/lints/cabf_smime_br/mailbox_address_from_san_test.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| package cabf_smime_br | ||
|
|
||
| /* | ||
| * ZLint Copyright 2024 Regents of the University of Michigan | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); you may not | ||
| * use this file except in compliance with the License. You may obtain a copy | ||
| * of the License at http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or | ||
| * implied. See the License for the specific language governing | ||
| * permissions and limitations under the License. | ||
| */ | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/zmap/zlint/v3/lint" | ||
| "github.com/zmap/zlint/v3/test" | ||
| ) | ||
|
|
||
| func TestMailboxAddressFromSANLint(t *testing.T) { | ||
| testCases := []struct { | ||
| Name string | ||
| InputFilename string | ||
|
|
||
| ExpectedResult lint.LintStatus | ||
| ExpectedDetails string | ||
| }{ | ||
| { | ||
| Name: "pass - subject:commonName email address matches san:otherName", | ||
| InputFilename: "WithOtherNameMatched.pem", | ||
|
|
||
| ExpectedResult: lint.Pass, | ||
| }, | ||
| { | ||
| Name: "pass - subject:commonName email address matches san:emailAddress", | ||
| InputFilename: "WithSANEmailMatched.pem", | ||
|
|
||
| ExpectedResult: lint.Pass, | ||
| }, | ||
| { | ||
| Name: "pass - only contains one san:emailAddress value", | ||
| InputFilename: "WithOnlySANEmail.pem", | ||
|
|
||
| ExpectedResult: lint.Pass, | ||
| }, | ||
| { | ||
| Name: "pass - only contains one san:otherName value", | ||
| InputFilename: "WithOnlySANOtherName.pem", | ||
|
|
||
| ExpectedResult: lint.Pass, | ||
| }, | ||
| { | ||
| Name: "NE - before effective date", | ||
| InputFilename: "NotEffective.pem", | ||
|
|
||
| ExpectedResult: lint.NE, | ||
| }, | ||
| { | ||
| Name: "NA - does not contain smime certificate policy", | ||
| InputFilename: "NotApplicable.pem", | ||
|
|
||
| ExpectedResult: lint.NA, | ||
| }, | ||
| { | ||
| Name: "fail - subject:commonName email address does not match san:otherName", | ||
| InputFilename: "WithOtherNameUnmatched.pem", | ||
|
|
||
| ExpectedResult: lint.Error, | ||
| ExpectedDetails: "all certificate mailbox addresses must be present in san:emailAddresses or san:otherNames in addition to any other field they may appear", | ||
| }, | ||
| { | ||
| Name: "fail - subject:commonName email address does not match the email value under san:otherName", | ||
| InputFilename: "WithOtherNameIncorrectType.pem", | ||
|
|
||
| ExpectedResult: lint.Error, | ||
| ExpectedDetails: "all certificate mailbox addresses must be present in san:emailAddresses or san:otherNames in addition to any other field they may appear", | ||
| }, | ||
| { | ||
| Name: "fail - subject:commonName email address does not match san:emailAddress", | ||
| InputFilename: "WithSANEmailUnmatched.pem", | ||
|
|
||
| ExpectedResult: lint.Error, | ||
| ExpectedDetails: "all certificate mailbox addresses must be present in san:emailAddresses or san:otherNames in addition to any other field they may appear", | ||
| }, | ||
| } | ||
|
|
||
| for _, tc := range testCases { | ||
| t.Run(tc.Name, func(t *testing.T) { | ||
| result := test.TestLint("e_mailbox_address_shall_contain_an_rfc822_name", "smime/MailboxAddressFromSAN/"+tc.InputFilename) | ||
| if result.Status != tc.ExpectedResult { | ||
| t.Errorf("expected result %v was %v", tc.ExpectedResult, result.Status) | ||
| } | ||
|
|
||
| if tc.ExpectedResult == lint.Error && tc.ExpectedDetails != result.Details { | ||
| t.Errorf("expected details: %q, was %q", tc.ExpectedDetails, result.Details) | ||
| } | ||
| }) | ||
| } | ||
| } |
Oops, something went wrong.