add hacks to allow publishing unsigned data
This is mainly to reduce the computing overhead when serving
content object from database
Change-Id: I15dd03a496b21ab38bb1f00027eedada5282a743
diff --git a/ccnx/ccnx-wrapper.cpp b/ccnx/ccnx-wrapper.cpp
index 5a6cfd3..a9f0821 100644
--- a/ccnx/ccnx-wrapper.cpp
+++ b/ccnx/ccnx-wrapper.cpp
@@ -43,11 +43,92 @@
namespace Ccnx {
+static int
+ccn_encode_Signature(struct ccn_charbuf *buf,
+ const char *digest_algorithm,
+ const void *witness,
+ size_t witness_size,
+ const struct ccn_signature *signature,
+ size_t signature_size)
+{
+ int res = 0;
+
+ if (signature == NULL)
+ return(-1);
+
+ res |= ccn_charbuf_append_tt(buf, CCN_DTAG_Signature, CCN_DTAG);
+
+ if (digest_algorithm != NULL) {
+ res |= ccn_charbuf_append_tt(buf, CCN_DTAG_DigestAlgorithm, CCN_DTAG);
+ res |= ccn_charbuf_append_tt(buf, strlen(digest_algorithm), CCN_UDATA);
+ res |= ccn_charbuf_append_string(buf, digest_algorithm);
+ res |= ccn_charbuf_append_closer(buf);
+ }
+
+ if (witness != NULL) {
+ res |= ccn_charbuf_append_tt(buf, CCN_DTAG_Witness, CCN_DTAG);
+ res |= ccn_charbuf_append_tt(buf, witness_size, CCN_BLOB);
+ res |= ccn_charbuf_append(buf, witness, witness_size);
+ res |= ccn_charbuf_append_closer(buf);
+ }
+
+ res |= ccn_charbuf_append_tt(buf, CCN_DTAG_SignatureBits, CCN_DTAG);
+ res |= ccn_charbuf_append_tt(buf, signature_size, CCN_BLOB);
+ res |= ccn_charbuf_append(buf, signature, signature_size);
+ res |= ccn_charbuf_append_closer(buf);
+
+ res |= ccn_charbuf_append_closer(buf);
+
+ return(res == 0 ? 0 : -1);
+}
+
+static int
+ccn_pack_ContentObject(struct ccn_charbuf *buf,
+ const struct ccn_charbuf *Name,
+ const struct ccn_charbuf *SignedInfo,
+ const void *data,
+ size_t size,
+ const char *digest_algorithm,
+ const struct ccn_pkey *private_key
+ )
+{
+ int res = 0;
+ struct ccn_sigc *sig_ctx;
+ struct ccn_signature *signature;
+ struct ccn_charbuf *content_header;
+ size_t closer_start;
+
+ content_header = ccn_charbuf_create();
+ res |= ccn_charbuf_append_tt(content_header, CCN_DTAG_Content, CCN_DTAG);
+ if (size != 0)
+ res |= ccn_charbuf_append_tt(content_header, size, CCN_BLOB);
+ closer_start = content_header->length;
+ res |= ccn_charbuf_append_closer(content_header);
+ if (res < 0)
+ return(-1);
+ sig_ctx = ccn_sigc_create();
+ size_t sig_size = ccn_sigc_signature_max_size(sig_ctx, private_key);
+ signature = (ccn_signature *)calloc(1, sig_size);
+ ccn_sigc_destroy(&sig_ctx);
+ res |= ccn_charbuf_append_tt(buf, CCN_DTAG_ContentObject, CCN_DTAG);
+
+ res |= ccn_encode_Signature(buf, digest_algorithm,
+ NULL, 0, signature, sig_size);
+ res |= ccn_charbuf_append_charbuf(buf, Name);
+ res |= ccn_charbuf_append_charbuf(buf, SignedInfo);
+ res |= ccnb_append_tagged_blob(buf, CCN_DTAG_Content, data, size);
+ res |= ccn_charbuf_append_closer(buf);
+ free(signature);
+ ccn_charbuf_destroy(&content_header);
+ return(res == 0 ? 0 : -1);
+}
+
CcnxWrapper::CcnxWrapper()
: m_handle (0)
, m_running (true)
, m_connected (false)
, m_executor (new Executor(1))
+ , m_keystore(NULL)
{
start ();
}
@@ -81,6 +162,10 @@
CcnxWrapper::~CcnxWrapper()
{
shutdown ();
+ if (m_keystore != NULL)
+ {
+ ccn_keystore_destroy(&m_keystore);
+ }
}
void
@@ -271,6 +356,58 @@
return publishData(name, head(content), content.size(), freshness);
}
+int
+CcnxWrapper::publishUnsignedData(const Name &name, const Bytes &content, int freshness)
+{
+ return publishUnsignedData(name, head(content), content.size(), freshness);
+}
+
+int
+CcnxWrapper::publishUnsignedData(const Name &name, const unsigned char *buf, size_t len, int freshness)
+{
+ {
+ UniqueRecLock lock(m_mutex);
+ if (!m_running || !m_connected)
+ {
+ _LOG_TRACE ("<< not running or connected");
+ return -1;
+ }
+ }
+
+ CcnxCharbufPtr ptr = name.toCcnxCharbuf();
+ ccn_charbuf *pname = ptr->getBuf();
+ ccn_charbuf *content = ccn_charbuf_create();
+ ccn_charbuf *signed_info = ccn_charbuf_create();
+
+ if (m_keystore == NULL)
+ {
+ m_keystore = ccn_keystore_create ();
+ string keystoreFile = string(getenv("HOME")) + string("/.ccnx/.ccnx_keystore");
+ if (ccn_keystore_init (m_keystore, (char *)keystoreFile.c_str(), (char*)"Th1s1sn0t8g00dp8ssw0rd.") < 0)
+ BOOST_THROW_EXCEPTION(CcnxOperationException() << errmsg_info_str(keystoreFile.c_str()));
+ }
+
+ int res = ccn_signed_info_create(signed_info,
+ ccn_keystore_public_key_digest(m_keystore),
+ ccn_keystore_public_key_digest_length(m_keystore),
+ NULL,
+ CCN_CONTENT_DATA,
+ freshness,
+ NULL,
+ NULL
+ );
+
+ ccn_pack_ContentObject(content, pname, signed_info, buf, len, NULL, ccn_keystore_private_key (m_keystore));
+
+ Bytes bytes;
+ readRaw(bytes, content->buf, content->length);
+
+ ccn_charbuf_destroy (&content);
+ ccn_charbuf_destroy (&signed_info);
+
+ return putToCcnd (bytes);
+}
+
static void
deleterInInterestTuple (tuple<CcnxWrapper::InterestCallback *, ExecutorPtr> *tuple)
@@ -352,6 +489,10 @@
_LOG_TRACE (">> incomingData content upcall: " << Name (info->content_ccnb, info->content_comps));
break;
+ case CCN_UPCALL_CONTENT_UNVERIFIED:
+ _LOG_TRACE (">> incomingData content unverified upcall: " << Name (info->content_ccnb, info->content_comps));
+ break;
+
case CCN_UPCALL_INTEREST_TIMED_OUT: {
if (cp != NULL)
{
@@ -367,6 +508,7 @@
}
default:
+ _LOG_TRACE(">> unknown upcall type");
return CCN_UPCALL_RESULT_OK;
}
diff --git a/ccnx/ccnx-wrapper.h b/ccnx/ccnx-wrapper.h
index b264d14..6cd1791 100644
--- a/ccnx/ccnx-wrapper.h
+++ b/ccnx/ccnx-wrapper.h
@@ -71,6 +71,12 @@
int
publishData (const Name &name, const Bytes &content, int freshness = DEFAULT_FRESHNESS/* max value for ccnx*/);
+ int
+ publishUnsignedData(const Name &name, const Bytes &content, int freshness = DEFAULT_FRESHNESS);
+
+ int
+ publishUnsignedData(const Name &name, const unsigned char *buf, size_t len, int freshness = DEFAULT_FRESHNESS);
+
static Name
getLocalPrefix ();
@@ -108,6 +114,7 @@
bool m_connected;
std::map<Name, InterestCallback> m_registeredInterests;
ExecutorPtr m_executor;
+ ccn_keystore *m_keystore;
};
typedef boost::shared_ptr<CcnxWrapper> CcnxWrapperPtr;
diff --git a/test/test-ccnx-wrapper.cc b/test/test-ccnx-wrapper.cc
index 2b99dd3..def7876 100644
--- a/test/test-ccnx-wrapper.cc
+++ b/test/test-ccnx-wrapper.cc
@@ -55,6 +55,7 @@
void dataCallback(const Name &name, Ccnx::PcoPtr pco)
{
+ cout << " in data callback" << endl;
BytesPtr content = pco->contentPtr ();
string msg(reinterpret_cast<const char *> (head (*content)), content->size());
g_dataCallback_counter ++;
@@ -67,11 +68,36 @@
g_timeout_counter ++;
}
+void
+setup()
+{
+ if (!c1)
+ {
+ c1 = make_shared<CcnxWrapper> ();
+ }
+ if (!c2)
+ {
+ c2 = make_shared<CcnxWrapper> ();
+ }
+}
+
+void
+teardown()
+{
+ if (c1)
+ {
+ c1.reset();
+ }
+ if (c2)
+ {
+ c2.reset();
+ }
+}
+
+
BOOST_AUTO_TEST_CASE (BlaCcnxWrapperTest)
{
- c1 = make_shared<CcnxWrapper> ();
- c2 = make_shared<CcnxWrapper> ();
-
+ setup();
Name prefix1("/c1");
Name prefix2("/c2");
@@ -89,11 +115,14 @@
// reset
g_dataCallback_counter = 0;
g_timeout_counter = 0;
+
+ teardown();
}
BOOST_AUTO_TEST_CASE (CcnxWrapperSelector)
{
+ setup();
Closure closure (bind(dataCallback, _1, _2), bind(timeout, _1, _2, _3));
Selectors selectors;
@@ -120,6 +149,7 @@
g_dataCallback_counter = 0;
g_timeout_counter = 0;
+ teardown();
}
@@ -132,6 +162,7 @@
BOOST_AUTO_TEST_CASE (TestTimeout)
{
+ setup();
g_dataCallback_counter = 0;
g_timeout_counter = 0;
Closure closure (bind(dataCallback, _1, _2), bind(reexpress, _1, _2, _3));
@@ -146,37 +177,50 @@
usleep(1000);
BOOST_CHECK_EQUAL(g_dataCallback_counter, 1);
BOOST_CHECK_EQUAL(g_timeout_counter, 3);
+ teardown();
}
-BOOST_AUTO_TEST_CASE(Cleanup)
+BOOST_AUTO_TEST_CASE (TestUnsigned)
{
- c1.reset ();
- c2.reset ();
+ setup();
+ string n1 = "/xxxxxx/unsigned/01";
+ Closure closure (bind(dataCallback, _1, _2), bind(timeout, _1, _2, _3));
+
+ g_dataCallback_counter = 0;
+ c1->sendInterest(Name(n1), closure);
+ usleep(1000);
+ c2->publishUnsignedData(Name(n1), (const unsigned char *)n1.c_str(), n1.size(), 1);
+ usleep(1000);
+ BOOST_CHECK_EQUAL(g_dataCallback_counter, 1);
+ teardown();
}
-// BOOST_AUTO_TEST_CASE (CcnxWrapperSigningTest)
-// {
-// Bytes data;
-// data.resize(1024);
-// for (int i = 0; i < 1024; i++)
-// {
-// data[i] = 'm';
-// }
-// Name name("/signingtest");
+ BOOST_AUTO_TEST_CASE (CcnxWrapperUnsigningTest)
+ {
+ setup();
+ Bytes data;
+ data.resize(1024);
+ for (int i = 0; i < 1024; i++)
+ {
+ data[i] = 'm';
+ }
-// posix_time::ptime start = posix_time::second_clock::local_time();
-// for (uint64_t i = 0; i < 10000; i++)
-// {
-// Name n = name;
-// n.appendComp(i);
-// c1->publishData(n, data, 10);
-// }
-// posix_time::ptime end = posix_time::second_clock::local_time();
+ Name name("/unsigningtest");
-// posix_time::time_duration duration = end - start;
+ posix_time::ptime start = posix_time::second_clock::local_time();
+ for (uint64_t i = 0; i < 100000; i++)
+ {
+ Name n = name;
+ n.appendComp(i);
+ c1->publishUnsignedData(n, data, 10);
+ }
+ posix_time::ptime end = posix_time::second_clock::local_time();
-// cout << "Publishing 10000 1K size content objects costs " <<duration.total_milliseconds() << " milliseconds" << endl;
-// cout << "Average time to publish one content object is " << (double) duration.total_milliseconds() / 10000.0 << " milliseconds" << endl;
-// }
+ posix_time::time_duration duration = end - start;
+
+ cout << "Publishing 100000 1K size content objects costs " <<duration.total_milliseconds() << " milliseconds" << endl;
+ cout << "Average time to publish one content object is " << (double) duration.total_milliseconds() / 100000.0 << " milliseconds" << endl;
+ teardown();
+ }
BOOST_AUTO_TEST_SUITE_END()