merge ca config and client config, remove old format of probe
Change-Id: I73500f532f166851d82c1bf1cc008c7ffc241ef3
diff --git a/tests/unit-tests/configuration.t.cpp b/tests/unit-tests/configuration.t.cpp
new file mode 100644
index 0000000..2c0ca02
--- /dev/null
+++ b/tests/unit-tests/configuration.t.cpp
@@ -0,0 +1,145 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2017-2019, Regents of the University of California.
+ *
+ * This file is part of ndncert, a certificate management system based on NDN.
+ *
+ * ndncert is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation, either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * ndncert is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received copies of the GNU General Public License along with
+ * ndncert, e.g., in COPYING.md file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * See AUTHORS.md for complete list of ndncert authors and contributors.
+ */
+
+#include "configuration.hpp"
+#include "protocol-detail/info.hpp"
+#include "test-common.hpp"
+
+namespace ndn {
+namespace ndncert {
+namespace tests {
+
+BOOST_FIXTURE_TEST_SUITE(TestConfig, IdentityManagementFixture)
+
+BOOST_AUTO_TEST_CASE(CAConfigFile)
+{
+ CaConfig config;
+ config.load("tests/unit-tests/config-files/config-ca-1");
+ BOOST_CHECK_EQUAL(config.m_caItem.m_caPrefix, "/ndn");
+ BOOST_CHECK_EQUAL(config.m_caItem.m_caInfo, "ndn testbed ca");
+ BOOST_CHECK_EQUAL(config.m_caItem.m_maxValidityPeriod, time::seconds(864000));
+ BOOST_CHECK_EQUAL(*config.m_caItem.m_maxSuffixLength, 3);
+ BOOST_CHECK_EQUAL(config.m_caItem.m_probeParameterKeys.size(), 1);
+ BOOST_CHECK_EQUAL(config.m_caItem.m_probeParameterKeys.front(), "full name");
+ BOOST_CHECK_EQUAL(config.m_caItem.m_supportedChallenges.size(), 1);
+ BOOST_CHECK_EQUAL(config.m_caItem.m_supportedChallenges.front(), "pin");
+
+ config.load("tests/unit-tests/config-files/config-ca-2");
+ BOOST_CHECK_EQUAL(config.m_caItem.m_caPrefix, "/ndn");
+ BOOST_CHECK_EQUAL(config.m_caItem.m_caInfo, "missing max validity period, max suffix length, and probe");
+ BOOST_CHECK_EQUAL(config.m_caItem.m_maxValidityPeriod, time::seconds(86400));
+ BOOST_CHECK(!config.m_caItem.m_maxSuffixLength);
+ BOOST_CHECK_EQUAL(config.m_caItem.m_probeParameterKeys.size(), 0);
+ BOOST_CHECK_EQUAL(config.m_caItem.m_supportedChallenges.size(), 0);
+ BOOST_CHECK_EQUAL(config.m_caItem.m_supportedChallenges.front(), "pin");
+ BOOST_CHECK_EQUAL(config.m_caItem.m_supportedChallenges.back(), "email");
+}
+
+BOOST_AUTO_TEST_CASE(CAConfigFileWithErrors)
+{
+ CaConfig config;
+ // nonexistent file
+ BOOST_CHECK_THROW(config.load("tests/unit-tests/config-files/Nonexist"), std::runtime_error);
+ // missing challenge
+ BOOST_CHECK_THROW(config.load("tests/unit-tests/config-files/config-ca-3"), std::runtime_error);
+ // unsupported challenge
+ BOOST_CHECK_THROW(config.load("tests/unit-tests/config-files/config-ca-4"), std::runtime_error);
+}
+
+BOOST_AUTO_TEST_CASE(ClientConfigFile)
+{
+ ClientConfig config;
+ config.load("tests/unit-tests/config-files/config-client-1");
+ BOOST_CHECK_EQUAL(config.m_caItems.size(), 2);
+
+ auto& config1 = config.m_caItems.front();
+ BOOST_CHECK_EQUAL(config1.m_caPrefix, "/ndn");
+ BOOST_CHECK_EQUAL(config1.m_caInfo, "ndn testbed ca");
+ BOOST_CHECK_EQUAL(config1.m_maxValidityPeriod, time::seconds(864000));
+ BOOST_CHECK_EQUAL(*config1.m_maxSuffixLength, 3);
+ BOOST_CHECK_EQUAL(config1.m_probeParameterKeys.size(), 1);
+ BOOST_CHECK_EQUAL(config1.m_probeParameterKeys.front(), "email");
+ BOOST_CHECK_EQUAL(config1.m_cert->getName(),
+ "/ndn/site1/KEY/%11%BC%22%F4c%15%FF%17/self/%FD%00%00%01Y%C8%14%D9%A5");
+
+ auto& config2 = config.m_caItems.front();
+ BOOST_CHECK_EQUAL(config2.m_caPrefix, "/ndn");
+ BOOST_CHECK_EQUAL(config2.m_caInfo, "ndn testbed ca");
+ BOOST_CHECK_EQUAL(config2.m_maxValidityPeriod, time::seconds(86400));
+ BOOST_CHECK(!config2.m_maxSuffixLength);
+ BOOST_CHECK_EQUAL(config2.m_probeParameterKeys.size(), 0);
+ BOOST_CHECK_EQUAL(config2.m_cert->getName(),
+ "/ndn/site1/KEY/%11%BC%22%F4c%15%FF%17/self/%FD%00%00%01Y%C8%14%D9%A5");
+}
+
+BOOST_AUTO_TEST_CASE(ClientConfigFileWithErrors)
+{
+ ClientConfig config;
+ // nonexistent file
+ BOOST_CHECK_THROW(config.load("tests/unit-tests/config-files/Nonexist"), std::runtime_error);
+ // missing certificate
+ BOOST_CHECK_THROW(config.load("tests/unit-tests/config-files/config-client-2"), std::runtime_error);
+ // missing ca prefix
+ BOOST_CHECK_THROW(config.load("tests/unit-tests/config-files/config-client-3"), std::runtime_error);
+}
+
+BOOST_AUTO_TEST_CASE(ClientConfigFileAddAndRemoveCaItem)
+{
+ ClientConfig config;
+ config.load("tests/unit-tests/config-files/config-client-1");
+
+ CaConfigItem item;
+ item.m_caPrefix = Name("/test");
+ item.m_caInfo = "test";
+
+ config.m_caItems.push_back(item);
+ BOOST_CHECK_EQUAL(config.m_caItems.size(), 3);
+ auto lastItem = config.m_caItems.back();
+ BOOST_CHECK_EQUAL(lastItem.m_caPrefix, "/test");
+
+ config.removeCaItem(Name("/test"));
+ BOOST_CHECK_EQUAL(config.m_caItems.size(), 2);
+ lastItem = config.m_caItems.back();
+ BOOST_CHECK_EQUAL(lastItem.m_caPrefix, "/ndn/edu/ucla/zhiyi");
+}
+
+BOOST_AUTO_TEST_CASE(InfoEncodingDecoding)
+{
+ CaConfig config;
+ config.load("tests/unit-tests/config-files/config-ca-1");
+
+ const auto& identity = addIdentity("/test");
+ const auto& cert = identity.getDefaultKey().getDefaultCertificate();
+ auto encoded = INFO::encodeDataContent(config.m_caItem, cert);
+ auto decoded = INFO::decodeDataContentToCaProfile(encoded);
+ BOOST_CHECK_EQUAL(config.m_caItem.m_caPrefix, decoded.m_caPrefix);
+ BOOST_CHECK_EQUAL(config.m_caItem.m_caInfo, decoded.m_caInfo);
+ BOOST_CHECK_EQUAL(config.m_caItem.m_maxValidityPeriod, decoded.m_maxValidityPeriod);
+ BOOST_CHECK_EQUAL(*config.m_caItem.m_maxSuffixLength, *decoded.m_maxSuffixLength);
+ BOOST_CHECK_EQUAL(config.m_caItem.m_probeParameterKeys.size(), decoded.m_probeParameterKeys.size());
+ BOOST_CHECK_EQUAL(config.m_caItem.m_probeParameterKeys.front(), decoded.m_probeParameterKeys.front());
+ BOOST_CHECK_EQUAL(cert.wireEncode(), decoded.m_cert->wireEncode());
+}
+
+BOOST_AUTO_TEST_SUITE_END() // TestCaConfig
+
+} // namespace tests
+} // namespace ndncert
+} // namespace ndn