2018-04-20 01:11:55 +08:00
|
|
|
/*
|
|
|
|
* verify-test.cpp
|
|
|
|
*
|
|
|
|
* This source file is part of the FoundationDB open source project
|
|
|
|
*
|
|
|
|
* Copyright 2013-2018 Apple Inc. and the FoundationDB project authors
|
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
*/
|
|
|
|
|
2018-04-13 03:28:52 +08:00
|
|
|
#include <iostream>
|
|
|
|
#include <string>
|
|
|
|
#include <vector>
|
|
|
|
|
2018-05-09 07:27:21 +08:00
|
|
|
#include <string.h>
|
Fix Subject Alternative Name matching and add test cases.
The previous change was done in the optimistic hope that NID_subject_alt_name
could be handled in the same fashion as all the rest of the attributes we match
against. However, X509 is not a place for optimisim. Instead, it turns out
that the Subject Alternative Name is an X509v3 extension, and needs to be
handled separately.
Therefore, this change...
* Introduces the idea of Criteria matching against a location in the
certificate, and not just against the entirety of the certificate.
* Extracts the Subject Alternative Name extension, and allows iteration and
matching against its components.
* Extends our constraint language to sensibly match against SubjectAlternativeNames.
The `S.subjectAltName` syntax has been kept, but the value is now required to
provide what type of field the rest of the value is intended to match against.
The code currently supports DNS, EMAIL, URI, and IP. Prefix and suffix
matching is supported.
Both verify-test and plugin-test were updated to cover Subject Alternative Name
matching. I've additionally run plugin-test under valgrind to verify that I've
understood object lifetimes correctly.
2018-06-30 08:10:27 +08:00
|
|
|
#include <boost/lexical_cast.hpp>
|
2018-05-09 07:27:21 +08:00
|
|
|
|
|
|
|
#include <openssl/objects.h>
|
2018-04-13 03:28:52 +08:00
|
|
|
|
2018-10-20 09:53:09 +08:00
|
|
|
#include "fdbrpc/ITLSPlugin.h"
|
2018-04-13 03:28:52 +08:00
|
|
|
|
2018-10-20 09:53:09 +08:00
|
|
|
#include "FDBLibTLS/FDBLibTLSPlugin.h"
|
|
|
|
#include "FDBLibTLS/FDBLibTLSPolicy.h"
|
2018-04-13 03:28:52 +08:00
|
|
|
|
|
|
|
struct FDBLibTLSVerifyTest {
|
|
|
|
FDBLibTLSVerifyTest(std::string input):
|
2018-05-09 07:27:21 +08:00
|
|
|
input(input), valid(false), verify_cert(true), verify_time(true), subject_criteria({}), issuer_criteria({}), root_criteria({}) {};
|
2018-06-28 09:06:24 +08:00
|
|
|
FDBLibTLSVerifyTest(std::string input, bool verify_cert, bool verify_time, std::map<int, Criteria> subject, std::map<int, Criteria> issuer, std::map<int, Criteria> root):
|
2018-05-09 07:27:21 +08:00
|
|
|
input(input), valid(true), verify_cert(verify_cert), verify_time(verify_time), subject_criteria(subject), issuer_criteria(issuer), root_criteria(root) {};
|
|
|
|
~FDBLibTLSVerifyTest() {};
|
2018-04-13 03:28:52 +08:00
|
|
|
|
|
|
|
int run();
|
|
|
|
|
|
|
|
std::string input;
|
|
|
|
|
|
|
|
bool valid;
|
|
|
|
bool verify_cert;
|
|
|
|
bool verify_time;
|
|
|
|
|
2018-06-28 09:06:24 +08:00
|
|
|
std::map<int, Criteria> subject_criteria;
|
|
|
|
std::map<int, Criteria> issuer_criteria;
|
|
|
|
std::map<int, Criteria> root_criteria;
|
2018-04-13 03:28:52 +08:00
|
|
|
};
|
|
|
|
|
2018-06-28 09:06:24 +08:00
|
|
|
static std::string criteriaToString(std::map<int, Criteria> const& criteria) {
|
2018-04-13 03:28:52 +08:00
|
|
|
std::string s;
|
|
|
|
for (auto &pair: criteria) {
|
Fix Subject Alternative Name matching and add test cases.
The previous change was done in the optimistic hope that NID_subject_alt_name
could be handled in the same fashion as all the rest of the attributes we match
against. However, X509 is not a place for optimisim. Instead, it turns out
that the Subject Alternative Name is an X509v3 extension, and needs to be
handled separately.
Therefore, this change...
* Introduces the idea of Criteria matching against a location in the
certificate, and not just against the entirety of the certificate.
* Extracts the Subject Alternative Name extension, and allows iteration and
matching against its components.
* Extends our constraint language to sensibly match against SubjectAlternativeNames.
The `S.subjectAltName` syntax has been kept, but the value is now required to
provide what type of field the rest of the value is intended to match against.
The code currently supports DNS, EMAIL, URI, and IP. Prefix and suffix
matching is supported.
Both verify-test and plugin-test were updated to cover Subject Alternative Name
matching. I've additionally run plugin-test under valgrind to verify that I've
understood object lifetimes correctly.
2018-06-30 08:10:27 +08:00
|
|
|
s += "{" + std::to_string(pair.first) + ":(" + printable(pair.second.criteria) + ", " + boost::lexical_cast<std::string>((int)pair.second.match_type) + ", " + boost::lexical_cast<std::string>((int)pair.second.location) + ")}";
|
2018-04-13 03:28:52 +08:00
|
|
|
}
|
|
|
|
return "{" + s + "}";
|
|
|
|
}
|
|
|
|
|
Fix Subject Alternative Name matching and add test cases.
The previous change was done in the optimistic hope that NID_subject_alt_name
could be handled in the same fashion as all the rest of the attributes we match
against. However, X509 is not a place for optimisim. Instead, it turns out
that the Subject Alternative Name is an X509v3 extension, and needs to be
handled separately.
Therefore, this change...
* Introduces the idea of Criteria matching against a location in the
certificate, and not just against the entirety of the certificate.
* Extracts the Subject Alternative Name extension, and allows iteration and
matching against its components.
* Extends our constraint language to sensibly match against SubjectAlternativeNames.
The `S.subjectAltName` syntax has been kept, but the value is now required to
provide what type of field the rest of the value is intended to match against.
The code currently supports DNS, EMAIL, URI, and IP. Prefix and suffix
matching is supported.
Both verify-test and plugin-test were updated to cover Subject Alternative Name
matching. I've additionally run plugin-test under valgrind to verify that I've
understood object lifetimes correctly.
2018-06-30 08:10:27 +08:00
|
|
|
static void logf(const char* event, void* uid, bool is_error, ...) {
|
2018-04-13 03:28:52 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
int FDBLibTLSVerifyTest::run() {
|
2018-05-09 07:27:21 +08:00
|
|
|
Reference<FDBLibTLSVerify> verify;
|
|
|
|
try {
|
|
|
|
verify = Reference<FDBLibTLSVerify>(new FDBLibTLSVerify(input));
|
|
|
|
} catch ( const std::runtime_error& e ) {
|
2018-04-13 03:28:52 +08:00
|
|
|
if (valid) {
|
|
|
|
std::cerr << "FAIL: Verify test failed, but should have succeeded - '" << input << "'\n";
|
|
|
|
return 1;
|
|
|
|
}
|
2018-05-09 07:27:21 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (!valid) {
|
|
|
|
std::cerr << "FAIL: Verify test should have failed, but succeeded - '" << input << "'\n";
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
if (verify->verify_cert != verify_cert) {
|
|
|
|
std::cerr << "FAIL: Got verify cert " << verify->verify_cert << ", want " << verify_cert << "\n";
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
if (verify->verify_time != verify_time) {
|
|
|
|
std::cerr << "FAIL: Got verify time " << verify->verify_time << ", want " << verify_time << "\n";
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
if (verify->subject_criteria != subject_criteria) {
|
|
|
|
std::cerr << "FAIL: Got subject criteria " << criteriaToString(verify->subject_criteria) << ", want " << criteriaToString(subject_criteria) << "\n";
|
|
|
|
return 1;
|
2018-04-13 03:28:52 +08:00
|
|
|
}
|
2018-05-09 07:27:21 +08:00
|
|
|
if (verify->issuer_criteria != issuer_criteria) {
|
|
|
|
std::cerr << "FAIL: Got issuer criteria " << criteriaToString(verify->issuer_criteria) << ", want " << criteriaToString(issuer_criteria) << "\n";
|
2018-04-13 03:28:52 +08:00
|
|
|
return 1;
|
|
|
|
}
|
2018-05-09 07:27:21 +08:00
|
|
|
if (verify->root_criteria != root_criteria) {
|
|
|
|
std::cerr << "FAIL: Got root criteria " << criteriaToString(verify->root_criteria) << ", want " << criteriaToString(root_criteria) << "\n";
|
2018-04-13 03:28:52 +08:00
|
|
|
return 1;
|
|
|
|
}
|
2018-05-09 07:27:21 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int policy_verify_test() {
|
|
|
|
Reference<FDBLibTLSPlugin> plugin = Reference<FDBLibTLSPlugin>(new FDBLibTLSPlugin());
|
|
|
|
Reference<FDBLibTLSPolicy> policy = Reference<FDBLibTLSPolicy>(new FDBLibTLSPolicy(plugin, (ITLSLogFunc)logf));
|
|
|
|
|
|
|
|
const char *verify_peers[] = {
|
|
|
|
"S.CN=abc",
|
|
|
|
"I.CN=def",
|
|
|
|
"R.CN=xyz,Check.Unexpired=0",
|
|
|
|
};
|
|
|
|
int verify_peers_len[] = {
|
|
|
|
(int)strlen(verify_peers[0]),
|
|
|
|
(int)strlen(verify_peers[1]),
|
|
|
|
(int)strlen(verify_peers[2]),
|
|
|
|
};
|
|
|
|
Reference<FDBLibTLSVerify> verify_rules[] = {
|
|
|
|
Reference<FDBLibTLSVerify>(new FDBLibTLSVerify(std::string(verify_peers[0], verify_peers_len[0]))),
|
|
|
|
Reference<FDBLibTLSVerify>(new FDBLibTLSVerify(std::string(verify_peers[1], verify_peers_len[1]))),
|
|
|
|
Reference<FDBLibTLSVerify>(new FDBLibTLSVerify(std::string(verify_peers[2], verify_peers_len[2]))),
|
|
|
|
};
|
|
|
|
|
|
|
|
if (!policy->set_verify_peers(3, (const uint8_t **)verify_peers, verify_peers_len)) {
|
|
|
|
std::cerr << "FAIL: Policy verify test failed, but should have succeeded\n";
|
2018-04-13 03:28:52 +08:00
|
|
|
return 1;
|
|
|
|
}
|
2018-05-09 07:27:21 +08:00
|
|
|
if (policy->verify_rules.size() != 3) {
|
|
|
|
std::cerr << "FAIL: Got " << policy->verify_rules.size() << " verify rule, want 3\n";
|
2018-04-13 03:28:52 +08:00
|
|
|
return 1;
|
|
|
|
}
|
2018-05-09 07:27:21 +08:00
|
|
|
|
|
|
|
int i = 0;
|
|
|
|
for (auto &verify_rule: policy->verify_rules) {
|
|
|
|
if (verify_rule->verify_cert != verify_rules[i]->verify_cert) {
|
|
|
|
std::cerr << "FAIL: Got verify cert " << verify_rule->verify_cert << ", want " << verify_rules[i]->verify_cert << "\n";
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
if (verify_rule->verify_time != verify_rules[i]->verify_time) {
|
|
|
|
std::cerr << "FAIL: Got verify time " << verify_rule->verify_time << ", want " << verify_rules[i]->verify_time << "\n";
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
if (verify_rule->subject_criteria != verify_rules[i]->subject_criteria) {
|
|
|
|
std::cerr << "FAIL: Got subject criteria " << criteriaToString(verify_rule->subject_criteria) << ", want " << criteriaToString(verify_rules[i]->subject_criteria) << "\n";
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
if (verify_rule->issuer_criteria != verify_rules[i]->issuer_criteria) {
|
|
|
|
std::cerr << "FAIL: Got issuer criteria " << criteriaToString(verify_rule->issuer_criteria) << ", want " << criteriaToString(verify_rules[i]->issuer_criteria) << "\n";
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
if (verify_rule->root_criteria != verify_rules[i]->root_criteria) {
|
|
|
|
std::cerr << "FAIL: Got root criteria " << criteriaToString(verify_rule->root_criteria) << ", want " << criteriaToString(verify_rules[i]->root_criteria) << "\n";
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
i++;
|
|
|
|
}
|
2018-04-13 03:28:52 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int main(int argc, char **argv)
|
|
|
|
{
|
|
|
|
int failed = 0;
|
|
|
|
|
Fix Subject Alternative Name matching and add test cases.
The previous change was done in the optimistic hope that NID_subject_alt_name
could be handled in the same fashion as all the rest of the attributes we match
against. However, X509 is not a place for optimisim. Instead, it turns out
that the Subject Alternative Name is an X509v3 extension, and needs to be
handled separately.
Therefore, this change...
* Introduces the idea of Criteria matching against a location in the
certificate, and not just against the entirety of the certificate.
* Extracts the Subject Alternative Name extension, and allows iteration and
matching against its components.
* Extends our constraint language to sensibly match against SubjectAlternativeNames.
The `S.subjectAltName` syntax has been kept, but the value is now required to
provide what type of field the rest of the value is intended to match against.
The code currently supports DNS, EMAIL, URI, and IP. Prefix and suffix
matching is supported.
Both verify-test and plugin-test were updated to cover Subject Alternative Name
matching. I've additionally run plugin-test under valgrind to verify that I've
understood object lifetimes correctly.
2018-06-30 08:10:27 +08:00
|
|
|
#define EXACT(x) Criteria(x, MatchType::EXACT, X509Location::NAME)
|
|
|
|
#define PREFIX(x) Criteria(x, MatchType::PREFIX, X509Location::NAME)
|
|
|
|
#define SUFFIX(x) Criteria(x, MatchType::SUFFIX, X509Location::NAME)
|
2018-06-28 09:06:24 +08:00
|
|
|
|
2018-04-13 03:28:52 +08:00
|
|
|
std::vector<FDBLibTLSVerifyTest> tests = {
|
2018-05-09 07:27:21 +08:00
|
|
|
FDBLibTLSVerifyTest("", true, true, {}, {}, {}),
|
|
|
|
FDBLibTLSVerifyTest("Check.Valid=1", true, true, {}, {}, {}),
|
|
|
|
FDBLibTLSVerifyTest("Check.Valid=0", false, true, {}, {}, {}),
|
|
|
|
FDBLibTLSVerifyTest("Check.Unexpired=1", true, true, {}, {}, {}),
|
|
|
|
FDBLibTLSVerifyTest("Check.Unexpired=0", true, false, {}, {}, {}),
|
|
|
|
FDBLibTLSVerifyTest("Check.Valid=1,Check.Unexpired=0", true, false, {}, {}, {}),
|
|
|
|
FDBLibTLSVerifyTest("Check.Unexpired=0,Check.Valid=0", false, false, {}, {}, {}),
|
2018-04-13 03:28:52 +08:00
|
|
|
FDBLibTLSVerifyTest("Check.Unexpired=0,I.C=US,C=US,S.O=XYZCorp\\, LLC", true, false,
|
2018-06-28 09:06:24 +08:00
|
|
|
{{NID_countryName, EXACT("US")}, {NID_organizationName, EXACT("XYZCorp, LLC")}}, {{NID_countryName, EXACT("US")}}, {}),
|
2018-04-13 03:28:52 +08:00
|
|
|
FDBLibTLSVerifyTest("Check.Unexpired=0,I.C=US,C=US,S.O=XYZCorp\\= LLC", true, false,
|
2018-06-28 09:06:24 +08:00
|
|
|
{{NID_countryName, EXACT("US")}, {NID_organizationName, EXACT("XYZCorp= LLC")}}, {{NID_countryName, EXACT("US")}}, {}),
|
2018-05-09 07:27:21 +08:00
|
|
|
FDBLibTLSVerifyTest("Check.Unexpired=0,R.C=US,C=US,S.O=XYZCorp\\= LLC", true, false,
|
2018-06-28 09:06:24 +08:00
|
|
|
{{NID_countryName, EXACT("US")}, {NID_organizationName, EXACT("XYZCorp= LLC")}}, {}, {{NID_countryName, EXACT("US")}}),
|
2018-04-13 03:28:52 +08:00
|
|
|
FDBLibTLSVerifyTest("Check.Unexpired=0,I.C=US,C=US,S.O=XYZCorp=LLC", true, false,
|
2018-06-28 09:06:24 +08:00
|
|
|
{{NID_countryName, EXACT("US")}, {NID_organizationName, EXACT("XYZCorp=LLC")}}, {{NID_countryName, EXACT("US")}}, {}),
|
2018-04-13 03:28:52 +08:00
|
|
|
FDBLibTLSVerifyTest("I.C=US,C=US,Check.Unexpired=0,S.O=XYZCorp=LLC", true, false,
|
2018-06-28 09:06:24 +08:00
|
|
|
{{NID_countryName, EXACT("US")}, {NID_organizationName, EXACT("XYZCorp=LLC")}}, {{NID_countryName, EXACT("US")}}, {}),
|
2018-04-13 03:28:52 +08:00
|
|
|
FDBLibTLSVerifyTest("I.C=US,C=US,S.O=XYZCorp\\, LLC", true, true,
|
2018-06-28 09:06:24 +08:00
|
|
|
{{NID_countryName, EXACT("US")}, {NID_organizationName, EXACT("XYZCorp, LLC")}}, {{NID_countryName, EXACT("US")}}, {}),
|
2018-05-09 07:27:21 +08:00
|
|
|
FDBLibTLSVerifyTest("I.C=US,C=US,S.O=XYZCorp\\, LLC,R.CN=abc", true, true,
|
2018-06-28 09:06:24 +08:00
|
|
|
{{NID_countryName, EXACT("US")}, {NID_organizationName, EXACT("XYZCorp, LLC")}},
|
|
|
|
{{NID_countryName, EXACT("US")}},
|
|
|
|
{{NID_commonName, EXACT("abc")}}),
|
|
|
|
FDBLibTLSVerifyTest("C=\\,S=abc", true, true, {{NID_countryName, EXACT(",S=abc")}}, {}, {}),
|
|
|
|
FDBLibTLSVerifyTest("CN=\\61\\62\\63", true, true, {{NID_commonName, EXACT("abc")}}, {}, {}),
|
|
|
|
FDBLibTLSVerifyTest("CN=a\\62c", true, true, {{NID_commonName, EXACT("abc")}}, {}, {}),
|
|
|
|
FDBLibTLSVerifyTest("CN=a\\01c", true, true, {{NID_commonName, EXACT("a\001c")}}, {}, {}),
|
Fix Subject Alternative Name matching and add test cases.
The previous change was done in the optimistic hope that NID_subject_alt_name
could be handled in the same fashion as all the rest of the attributes we match
against. However, X509 is not a place for optimisim. Instead, it turns out
that the Subject Alternative Name is an X509v3 extension, and needs to be
handled separately.
Therefore, this change...
* Introduces the idea of Criteria matching against a location in the
certificate, and not just against the entirety of the certificate.
* Extracts the Subject Alternative Name extension, and allows iteration and
matching against its components.
* Extends our constraint language to sensibly match against SubjectAlternativeNames.
The `S.subjectAltName` syntax has been kept, but the value is now required to
provide what type of field the rest of the value is intended to match against.
The code currently supports DNS, EMAIL, URI, and IP. Prefix and suffix
matching is supported.
Both verify-test and plugin-test were updated to cover Subject Alternative Name
matching. I've additionally run plugin-test under valgrind to verify that I've
understood object lifetimes correctly.
2018-06-30 08:10:27 +08:00
|
|
|
FDBLibTLSVerifyTest("S.subjectAltName=XYZCorp", true, true, {{NID_subject_alt_name, {"XYZCorp", MatchType::EXACT, X509Location::EXTENSION}}}, {}, {}),
|
2018-06-28 09:06:24 +08:00
|
|
|
FDBLibTLSVerifyTest("S.O>=XYZ", true, true, {{NID_organizationName, PREFIX("XYZ")}}, {}, {}),
|
|
|
|
FDBLibTLSVerifyTest("S.O<=LLC", true, true, {{NID_organizationName, SUFFIX("LLC")}}, {}, {}),
|
2018-04-13 03:28:52 +08:00
|
|
|
|
|
|
|
// Invalid cases.
|
|
|
|
FDBLibTLSVerifyTest("Check.Invalid=0"),
|
|
|
|
FDBLibTLSVerifyTest("Valid=1"),
|
|
|
|
FDBLibTLSVerifyTest("C= US,S=abc"),
|
|
|
|
FDBLibTLSVerifyTest("C=#US,S=abc"),
|
|
|
|
FDBLibTLSVerifyTest("C=abc,S=\\"),
|
|
|
|
FDBLibTLSVerifyTest("XYZ=abc"),
|
|
|
|
FDBLibTLSVerifyTest("GN=abc"),
|
|
|
|
FDBLibTLSVerifyTest("CN=abc,Check.Expired=1"),
|
|
|
|
};
|
|
|
|
|
2018-06-28 09:06:24 +08:00
|
|
|
#undef EXACT
|
|
|
|
#undef PREFIX
|
|
|
|
#undef SUFFIX
|
|
|
|
|
2018-04-13 03:28:52 +08:00
|
|
|
for (auto &test: tests)
|
|
|
|
failed |= test.run();
|
|
|
|
|
2018-05-09 07:27:21 +08:00
|
|
|
failed |= policy_verify_test();
|
|
|
|
|
2018-04-13 03:28:52 +08:00
|
|
|
return (failed);
|
|
|
|
}
|