update certificate request data structure
Change-Id: Id73428d07e6a0315dcdf78da8aba380f429a8f46
diff --git a/tests/unit-tests/bench.t.cpp b/tests/unit-tests/bench.t.cpp
index d2b37a6..0a738d7 100644
--- a/tests/unit-tests/bench.t.cpp
+++ b/tests/unit-tests/bench.t.cpp
@@ -138,7 +138,7 @@
auto paramList = pinChallenge.getRequestedParameterList(client.m_status, client.m_challengeStatus);
auto request = ca.getCertificateRequest(*challengeInterest2);
- auto secret = request.m_challengeSecrets.get(ChallengePin::PARAMETER_KEY_CODE, "");
+ auto secret = request.m_challengeState->m_secrets.get(ChallengePin::PARAMETER_KEY_CODE, "");
std::get<1>(paramList[0]) = secret;
challengeInterest3 = client.generateChallengeInterest(pinChallenge.genChallengeRequestTLV(client.m_status,
client.m_challengeStatus,
diff --git a/tests/unit-tests/ca-memory.t.cpp b/tests/unit-tests/ca-memory.t.cpp
index 490e517..1f50b99 100644
--- a/tests/unit-tests/ca-memory.t.cpp
+++ b/tests/unit-tests/ca-memory.t.cpp
@@ -95,8 +95,8 @@
json.put("code", "1234");
// update operation
- CertificateRequest request2(Name("/ndn/site1"), "123", RequestType::NEW, Status::CHALLENGE, "test",
- "Email", time::toIsoString(time::system_clock::now()), 3600, 3, json, cert1);
+ CertificateRequest request2(Name("/ndn/site1"), "123", RequestType::NEW, Status::CHALLENGE, cert1,
+ "email", "test", time::system_clock::now(), 3, time::seconds(3600), std::move(json));
storage.updateRequest(request2);
result = storage.getRequest("123");
BOOST_CHECK_EQUAL(request2.m_cert, result.m_cert);
diff --git a/tests/unit-tests/ca-module.t.cpp b/tests/unit-tests/ca-module.t.cpp
index 4f1f1bf..4e3a94a 100644
--- a/tests/unit-tests/ca-module.t.cpp
+++ b/tests/unit-tests/ca-module.t.cpp
@@ -123,7 +123,6 @@
BOOST_CHECK_EQUAL(count, 1);
}
-
BOOST_AUTO_TEST_CASE(HandleProbeUsingDefaultHandler)
{
auto identity = addIdentity(Name("/ndn"));
@@ -380,7 +379,7 @@
auto paramList = pinChallenge.getRequestedParameterList(client.m_status, client.m_challengeStatus);
auto request = ca.getCertificateRequest(*challengeInterest2);
- auto secret = request.m_challengeSecrets.get(ChallengePin::PARAMETER_KEY_CODE, "");
+ auto secret = request.m_challengeState->m_secrets.get(ChallengePin::PARAMETER_KEY_CODE, "");
std::get<1>(paramList[0]) = secret;
challengeInterest3 = client.generateChallengeInterest(pinChallenge.genChallengeRequestTLV(client.m_status,
client.m_challengeStatus,
diff --git a/tests/unit-tests/ca-sqlite.t.cpp b/tests/unit-tests/ca-sqlite.t.cpp
index e141047..779532d 100644
--- a/tests/unit-tests/ca-sqlite.t.cpp
+++ b/tests/unit-tests/ca-sqlite.t.cpp
@@ -93,8 +93,8 @@
// update operation
JsonSection json;
json.put("test", "4567");
- CertificateRequest request2(Name("/ndn/site1"), "123", RequestType::NEW, Status::CHALLENGE, "test",
- "Email", time::toIsoString(time::system_clock::now()), 3600, 3, json, cert1);
+ CertificateRequest request2(Name("/ndn/site1"), "123", RequestType::NEW, Status::CHALLENGE, cert1,
+ "email", "test", time::system_clock::now(), 3, time::seconds(3600), std::move(json));
storage.updateRequest(request2);
result = storage.getRequest("123");
BOOST_CHECK_EQUAL(request2.m_cert, result.m_cert);
diff --git a/tests/unit-tests/challenge-email.t.cpp b/tests/unit-tests/challenge-email.t.cpp
index 9be44be..8858385 100644
--- a/tests/unit-tests/challenge-email.t.cpp
+++ b/tests/unit-tests/challenge-email.t.cpp
@@ -55,11 +55,10 @@
challenge.handleChallengeRequest(paramTLV, request);
BOOST_CHECK(request.m_status == Status::CHALLENGE);
- BOOST_CHECK_EQUAL(request.m_challengeStatus, ChallengeEmail::NEED_CODE);
- BOOST_CHECK(request.m_challengeSecrets.get<std::string>(ChallengeEmail::PARAMETER_KEY_CODE) != "");
- BOOST_CHECK(request.m_remainingTime != 0);
- BOOST_CHECK(request.m_remainingTries != 0);
- BOOST_CHECK(request.m_challengeTp != "");
+ BOOST_CHECK_EQUAL(request.m_challengeState->m_challengeStatus, ChallengeEmail::NEED_CODE);
+ BOOST_CHECK(request.m_challengeState->m_secrets.get<std::string>(ChallengeEmail::PARAMETER_KEY_CODE) != "");
+ BOOST_CHECK(request.m_challengeState->m_remainingTime.count() != 0);
+ BOOST_CHECK(request.m_challengeState->m_remainingTries != 0);
BOOST_CHECK_EQUAL(request.m_challengeType, "email");
std::string line = "";
@@ -76,7 +75,7 @@
end = line.find(delimiter);
std::string secret = line.substr(0, end);
- auto stored_secret = request.m_challengeSecrets.get<std::string>(ChallengeEmail::PARAMETER_KEY_CODE);
+ auto stored_secret = request.m_challengeState->m_secrets.get<std::string>(ChallengeEmail::PARAMETER_KEY_CODE);
BOOST_CHECK_EQUAL(secret, stored_secret);
line = line.substr(end + 1);
@@ -114,8 +113,9 @@
auto cert = key.getDefaultCertificate();
JsonSection json;
json.put(ChallengeEmail::PARAMETER_KEY_CODE, "4567");
- CertificateRequest request(Name("/ndn/site1"), "123", RequestType::NEW, Status::CHALLENGE, ChallengeEmail::NEED_CODE,
- "Email", time::toIsoString(time::system_clock::now()), 3600, 3, json, cert);
+ CertificateRequest request(Name("/ndn/site1"), "123", RequestType::NEW, Status::CHALLENGE, cert,
+ "email", ChallengeEmail::NEED_CODE, time::system_clock::now(),
+ 3, time::seconds(3600), std::move(json));
Block paramTLV = makeEmptyBlock(tlv_encrypted_payload);
paramTLV.push_back(makeStringBlock(tlv_parameter_key, ChallengeEmail::PARAMETER_KEY_CODE));
@@ -125,7 +125,7 @@
challenge.handleChallengeRequest(paramTLV, request);
BOOST_CHECK(request.m_status == Status::PENDING);
- BOOST_CHECK_EQUAL(request.m_challengeSecrets.empty(), true);
+ BOOST_CHECK(!request.m_challengeState);
}
BOOST_AUTO_TEST_CASE(OnValidateInterestComingWithWrongCode)
@@ -135,8 +135,9 @@
auto cert = key.getDefaultCertificate();
JsonSection json;
json.put(ChallengeEmail::PARAMETER_KEY_CODE, "4567");
- CertificateRequest request(Name("/ndn/site1"), "123", RequestType::NEW, Status::CHALLENGE, ChallengeEmail::NEED_CODE,
- "email", time::toIsoString(time::system_clock::now()), 3600, 3, json, cert);
+ CertificateRequest request(Name("/ndn/site1"), "123", RequestType::NEW, Status::CHALLENGE, cert,
+ "email", ChallengeEmail::NEED_CODE, time::system_clock::now(),
+ 3, time::seconds(3600), std::move(json));
Block paramTLV = makeEmptyBlock(tlv_encrypted_payload);
paramTLV.push_back(makeStringBlock(tlv_parameter_key, ChallengeEmail::PARAMETER_KEY_CODE));
@@ -145,13 +146,13 @@
ChallengeEmail challenge;
challenge.handleChallengeRequest(paramTLV, request);
- BOOST_CHECK_EQUAL(request.m_challengeStatus, ChallengeEmail::WRONG_CODE);
+ BOOST_CHECK_EQUAL(request.m_challengeState->m_challengeStatus, ChallengeEmail::WRONG_CODE);
BOOST_CHECK(request.m_status == Status::CHALLENGE);
- BOOST_CHECK_EQUAL(request.m_challengeSecrets.empty(), false);
+ BOOST_CHECK_EQUAL(request.m_challengeState->m_secrets.empty(), false);
}
BOOST_AUTO_TEST_SUITE_END()
-} // namespace tests
-} // namespace ndncert
-} // namespace ndn
+} // namespace tests
+} // namespace ndncert
+} // namespace ndn
diff --git a/tests/unit-tests/challenge-pin.t.cpp b/tests/unit-tests/challenge-pin.t.cpp
index 810b285..f21813b 100644
--- a/tests/unit-tests/challenge-pin.t.cpp
+++ b/tests/unit-tests/challenge-pin.t.cpp
@@ -44,7 +44,7 @@
challenge.handleChallengeRequest(makeEmptyBlock(tlv_encrypted_payload), request);
BOOST_CHECK(request.m_status == Status::CHALLENGE);
- BOOST_CHECK_EQUAL(request.m_challengeStatus, ChallengePin::NEED_CODE);
+ BOOST_CHECK_EQUAL(request.m_challengeState->m_challengeStatus, ChallengePin::NEED_CODE);
BOOST_CHECK_EQUAL(request.m_challengeType, "pin");
}
@@ -55,8 +55,9 @@
auto cert = key.getDefaultCertificate();
JsonSection secret;
secret.add(ChallengePin::PARAMETER_KEY_CODE, "12345");
- CertificateRequest request(Name("/ndn/site1"), "123", RequestType::NEW, Status::CHALLENGE, ChallengePin::NEED_CODE, "pin",
- time::toIsoString(time::system_clock::now()), 3600, 3, secret, cert);
+ CertificateRequest request(Name("/ndn/site1"), "123", RequestType::NEW, Status::CHALLENGE, cert,
+ "pin", ChallengePin::NEED_CODE, time::system_clock::now(),
+ 3, time::seconds(3600), std::move(secret));
Block paramTLV = makeEmptyBlock(tlv_encrypted_payload);
paramTLV.push_back(makeStringBlock(tlv_parameter_key, ChallengePin::PARAMETER_KEY_CODE));
@@ -66,7 +67,7 @@
challenge.handleChallengeRequest(paramTLV, request);
BOOST_CHECK(request.m_status == Status::PENDING);
- BOOST_CHECK_EQUAL(request.m_challengeSecrets.empty(), true);
+ BOOST_CHECK(!request.m_challengeState);
}
BOOST_AUTO_TEST_CASE(OnChallengeRequestWithWrongCode)
@@ -76,8 +77,9 @@
auto cert = key.getDefaultCertificate();
JsonSection secret;
secret.add(ChallengePin::PARAMETER_KEY_CODE, "12345");
- CertificateRequest request(Name("/ndn/site1"), "123", RequestType::NEW, Status::CHALLENGE, ChallengePin::NEED_CODE, "pin",
- time::toIsoString(time::system_clock::now()), 3600, 3, secret, cert);
+ CertificateRequest request(Name("/ndn/site1"), "123", RequestType::NEW, Status::CHALLENGE, cert,
+ "pin", ChallengePin::NEED_CODE, time::system_clock::now(),
+ 3, time::seconds(3600), std::move(secret));
Block paramTLV = makeEmptyBlock(tlv_encrypted_payload);
paramTLV.push_back(makeStringBlock(tlv_parameter_key, ChallengePin::PARAMETER_KEY_CODE));
@@ -87,8 +89,8 @@
challenge.handleChallengeRequest(paramTLV, request);
BOOST_CHECK(request.m_status == Status::CHALLENGE);
- BOOST_CHECK_EQUAL(request.m_challengeStatus, ChallengePin::WRONG_CODE);
- BOOST_CHECK_EQUAL(request.m_challengeSecrets.empty(), false);
+ BOOST_CHECK_EQUAL(request.m_challengeState->m_challengeStatus, ChallengePin::WRONG_CODE);
+ BOOST_CHECK_EQUAL(request.m_challengeState->m_secrets.empty(), false);
}
BOOST_AUTO_TEST_SUITE_END()