remove the const strings used for JSON based encoding
Change-Id: Ib1ef92e5acccf54417063c66f893995e737e703c
diff --git a/src/ndncert-common.hpp b/src/ndncert-common.hpp
index 7306084..b5c8d0f 100644
--- a/src/ndncert-common.hpp
+++ b/src/ndncert-common.hpp
@@ -117,30 +117,6 @@
const std::string CONFIG_CHALLENGE = "challenge";
const std::string CONFIG_MAX_SUFFIX_LENGTH = "max-suffix-length";
-// // JSON format for Certificate Issuer (CA)
-const std::string JSON_CA_NAME = "name";
-const std::string JSON_CA_CONFIG = "ca-config";
-const std::string JSON_CA_ECDH = "ecdh-pub";
-const std::string JSON_CA_SALT = "salt";
-const std::string JSON_CA_REQUEST_ID = "request-id";
-const std::string JSON_CA_STATUS = "status";
-const std::string JSON_CA_CHALLENGES = "challenges";
-const std::string JSON_CA_CHALLENGE_ID = "challenge-id";
-const std::string JSON_CA_CERT_ID = "certificate-id";
-
-// // JSON format for Challenge Module
-const std::string JSON_CHALLENGE_STATUS = "challenge-status";
-const std::string JSON_CHALLENGE_REMAINING_TRIES = "remaining-tries";
-const std::string JSON_CHALLENGE_REMAINING_TIME = "remaining-time";
-const std::string JSON_CHALLENGE_ISSUED_CERT_NAME = "issued-cert-name";
-
-// // JSON format for Certificate Requester
-const std::string JSON_CLIENT_PROBE_INFO = "probe-info";
-const std::string JSON_CLIENT_ECDH = "ecdh-pub";
-const std::string JSON_CLIENT_CERT_REQ = "cert-request";
-const std::string JSON_CLIENT_SELECTED_CHALLENGE = "selected-challenge";
-const std::string JSON_CLIENT_CERT_TO_REVOKE = "cert-to-revoke";
-
// NDNCERT Status Enum
enum class Status : uint16_t {
BEFORE_CHALLENGE = 0,
@@ -176,12 +152,6 @@
std::string requestTypeToString(RequestType type);
-// Pre-defined challenge status
-const std::string CHALLENGE_STATUS_SUCCESS = "success";
-const std::string CHALLENGE_STATUS_FAILURE_TIMEOUT = "failure-timeout";
-const std::string CHALLENGE_STATUS_FAILURE_MAXRETRY = "failure-max-retry";
-const std::string CHALLENGE_STATUS_UNKNOWN_CHALLENGE = "unknown-challenge";
-
} // namespace ndncert
} // namespace ndn
diff --git a/tests/unit-tests/ca-memory.t.cpp b/tests/unit-tests/ca-memory.t.cpp
index 452937e..490e517 100644
--- a/tests/unit-tests/ca-memory.t.cpp
+++ b/tests/unit-tests/ca-memory.t.cpp
@@ -95,7 +95,7 @@
json.put("code", "1234");
// update operation
- CertificateRequest request2(Name("/ndn/site1"), "123", RequestType::NEW, Status::CHALLENGE, CHALLENGE_STATUS_SUCCESS,
+ CertificateRequest request2(Name("/ndn/site1"), "123", RequestType::NEW, Status::CHALLENGE, "test",
"Email", time::toIsoString(time::system_clock::now()), 3600, 3, json, cert1);
storage.updateRequest(request2);
result = storage.getRequest("123");
diff --git a/tests/unit-tests/ca-module.t.cpp b/tests/unit-tests/ca-module.t.cpp
index 7a7d3dd..4f1f1bf 100644
--- a/tests/unit-tests/ca-module.t.cpp
+++ b/tests/unit-tests/ca-module.t.cpp
@@ -49,49 +49,6 @@
BOOST_CHECK_EQUAL(ca.m_interestFilterHandles.size(), 5); // onInfo, onProbe, onNew, onChallenge, onRevoke
}
-BOOST_AUTO_TEST_CASE(HandleProbe)
-{
- auto identity = addIdentity(Name("/ndn"));
- auto key = identity.getDefaultKey();
- auto cert = key.getDefaultCertificate();
-
- util::DummyClientFace face(io, m_keyChain, {true, true});
- CaModule ca(face, m_keyChain, "tests/unit-tests/ca.conf.test", "ca-storage-memory");
- ca.setNameAssignmentFunction([&](const std::vector<std::tuple<std::string, std::string>>) -> std::vector<std::string> {
- std::vector<std::string> result;
- result.push_back("example");
- return result;
- });
- advanceClocks(time::milliseconds(20), 60);
-
- Interest interest("/ndn/CA/PROBE");
- interest.setCanBePrefix(false);
-
- Block paramTLV = makeEmptyBlock(tlv::ApplicationParameters);
- paramTLV.push_back(makeStringBlock(tlv_parameter_key, JSON_CLIENT_PROBE_INFO));
- paramTLV.push_back(makeStringBlock(tlv_parameter_value, "zhiyi"));
- paramTLV.encode();
-
- interest.setApplicationParameters(paramTLV);
-
- int count = 0;
- face.onSendData.connect([&](const Data& response) {
- count++;
- BOOST_CHECK(security::verifySignature(response, cert));
- Block contentBlock = response.getContent();
- contentBlock.parse();
- Block probeResponse = contentBlock.get(tlv_probe_response);
- probeResponse.parse();
- Name caName;
- caName.wireDecode(probeResponse.get(tlv::Name));
- BOOST_CHECK_EQUAL(caName, "/ndn/example");
- });
- face.receive(interest);
-
- advanceClocks(time::milliseconds(20), 60);
- BOOST_CHECK_EQUAL(count, 1);
-}
-
BOOST_AUTO_TEST_CASE(HandleInfo)
{
auto identity = addIdentity(Name("/ndn"));
@@ -123,6 +80,50 @@
BOOST_CHECK_EQUAL(count, 1);
}
+BOOST_AUTO_TEST_CASE(HandleProbe)
+{
+ auto identity = addIdentity(Name("/ndn"));
+ auto key = identity.getDefaultKey();
+ auto cert = key.getDefaultCertificate();
+
+ util::DummyClientFace face(io, m_keyChain, {true, true});
+ CaModule ca(face, m_keyChain, "tests/unit-tests/ca.conf.test", "ca-storage-memory");
+ ca.setNameAssignmentFunction([&](const std::vector<std::tuple<std::string, std::string>>) -> std::vector<std::string> {
+ std::vector<std::string> result;
+ result.push_back("example");
+ return result;
+ });
+ advanceClocks(time::milliseconds(20), 60);
+
+ Interest interest("/ndn/CA/PROBE");
+ interest.setCanBePrefix(false);
+
+ Block paramTLV = makeEmptyBlock(tlv::ApplicationParameters);
+ paramTLV.push_back(makeStringBlock(tlv_parameter_key, "name"));
+ paramTLV.push_back(makeStringBlock(tlv_parameter_value, "zhiyi"));
+ paramTLV.encode();
+
+ interest.setApplicationParameters(paramTLV);
+
+ int count = 0;
+ face.onSendData.connect([&](const Data& response) {
+ count++;
+ BOOST_CHECK(security::verifySignature(response, cert));
+ Block contentBlock = response.getContent();
+ contentBlock.parse();
+ Block probeResponse = contentBlock.get(tlv_probe_response);
+ probeResponse.parse();
+ Name caName;
+ caName.wireDecode(probeResponse.get(tlv::Name));
+ BOOST_CHECK_EQUAL(caName, "/ndn/example");
+ });
+ face.receive(interest);
+
+ advanceClocks(time::milliseconds(20), 60);
+ BOOST_CHECK_EQUAL(count, 1);
+}
+
+
BOOST_AUTO_TEST_CASE(HandleProbeUsingDefaultHandler)
{
auto identity = addIdentity(Name("/ndn"));
@@ -137,7 +138,7 @@
interest.setCanBePrefix(false);
Block paramTLV = makeEmptyBlock(tlv::ApplicationParameters);
- paramTLV.push_back(makeStringBlock(tlv_parameter_key, JSON_CLIENT_PROBE_INFO));
+ paramTLV.push_back(makeStringBlock(tlv_parameter_key, "name"));
paramTLV.push_back(makeStringBlock(tlv_parameter_value, "zhiyi"));
paramTLV.encode();
diff --git a/tests/unit-tests/ca-sqlite.t.cpp b/tests/unit-tests/ca-sqlite.t.cpp
index 123db6a..e141047 100644
--- a/tests/unit-tests/ca-sqlite.t.cpp
+++ b/tests/unit-tests/ca-sqlite.t.cpp
@@ -93,7 +93,7 @@
// update operation
JsonSection json;
json.put("test", "4567");
- CertificateRequest request2(Name("/ndn/site1"), "123", RequestType::NEW, Status::CHALLENGE, CHALLENGE_STATUS_SUCCESS,
+ CertificateRequest request2(Name("/ndn/site1"), "123", RequestType::NEW, Status::CHALLENGE, "test",
"Email", time::toIsoString(time::system_clock::now()), 3600, 3, json, cert1);
storage.updateRequest(request2);
result = storage.getRequest("123");