From aa49c7dc35c4693ea128cbd4380db9efa7130e38 Mon Sep 17 00:00:00 2001 From: Jose Marcial Vieira Bisneto Date: Fri, 16 Dec 2016 00:28:12 -0300 Subject: [PATCH 1/2] Initial implementation of namesys/pb --- include/ipfs/namesys/pb.h | 31 +++++++++++++++++++++++++++++++ namesys/pb.c | 19 +++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 include/ipfs/namesys/pb.h create mode 100644 namesys/pb.c diff --git a/include/ipfs/namesys/pb.h b/include/ipfs/namesys/pb.h new file mode 100644 index 0000000..1d47ef6 --- /dev/null +++ b/include/ipfs/namesys/pb.h @@ -0,0 +1,31 @@ +#ifndef IPNS_NAMESYS_PB_H + #define IPNS_NAMESYS_PB_H + + typedef int IpnsEntry_ValidityType; + + struct ipns_entry { + // TODO + struct routingResolver *cache; + struct stime *eol; + }; + + struct namesys_pb { + // TODO + struct ipns_entry *IpnsEntry; + }; + + // setting an EOL says "this record is valid until..." + const IpnsEntry_ValidityType IpnsEntry_EOL = 0; + + char *IpnsEntry_ValidityType_name[] = { + "EOL", + NULL + }; + + int IpnsEntry_ValidityType_value (char *s); + char* ipfs_namesys_pb_get_validity (struct ipns_entry*); + char* ipfs_ipns_entry_data_for_sig(struct ipns_entry*); + char* ipfs_ipns_entry_get_signature(struct ipns_entry*); + int ipfs_namesys_pb_get_value (char**, struct ipns_entry*); + IpnsEntry_ValidityType ipfs_namesys_pb_get_validity_type (struct ipns_entry*); +#endif // IPNS_NAMESYS_PB_H diff --git a/namesys/pb.c b/namesys/pb.c new file mode 100644 index 0000000..4e7d633 --- /dev/null +++ b/namesys/pb.c @@ -0,0 +1,19 @@ +#include +#include "ipfs/namesys/pb.h" + +int IpnsEntry_ValidityType_value (char *s) +{ + int r; + + if (!s) { + return -1; // invalid. + } + + for (r = 0 ; IpnsEntry_ValidityType_name[r] ; r++) { + if (strcmp (IpnsEntry_ValidityType_name[r], s) == 0) { + return r; // found + } + } + + return -1; // not found. +} From fea5d3b8bf62253168afabde5b4cb03c1e21ebc9 Mon Sep 17 00:00:00 2001 From: Jose Marcial Vieira Bisneto Date: Fri, 16 Dec 2016 00:30:40 -0300 Subject: [PATCH 2/2] Initial implementation of namesys/routing --- include/ipfs/errs.h | 10 +- include/ipfs/namesys/routing.h | 35 ++++++ namesys/routing.c | 212 +++++++++++++++++++++++++++++++++ 3 files changed, 255 insertions(+), 2 deletions(-) create mode 100644 include/ipfs/namesys/routing.h create mode 100644 namesys/routing.c diff --git a/include/ipfs/errs.h b/include/ipfs/errs.h index c300dac..18494b4 100644 --- a/include/ipfs/errs.h +++ b/include/ipfs/errs.h @@ -5,6 +5,7 @@ NULL, "ErrAllocFailed", "ErrNULLPointer", + "ErrUnknow", "ErrPipe", "ErrPoll", "Could not publish name." @@ -25,12 +26,15 @@ "ErrInvalidParam", // ErrResolveLimit is returned when a recursive resolution goes over // the limit. - "resolve depth exceeded" + "resolve depth exceeded", + NULL, + "Invalid value. Not signed by PrivateKey corresponding to %s" }; enum { ErrAllocFailed = 1, ErrNULLPointer, + ErrUnknow, ErrPipe, ErrPoll, ErrPublishFailed, @@ -47,6 +51,8 @@ ErrNoLink, ErrNoLinkFmt, ErrInvalidParam, - ErrResolveLimit + ErrResolveLimit, + ErrInvalidSignature, + ErrInvalidSignatureFmt } ErrsIdx; #endif // IPFS_ERRS_H diff --git a/include/ipfs/namesys/routing.h b/include/ipfs/namesys/routing.h new file mode 100644 index 0000000..7d6fbdd --- /dev/null +++ b/include/ipfs/namesys/routing.h @@ -0,0 +1,35 @@ +#ifndef IPNS_NAMESYS_ROUTING_H + #define IPNS_NAMESYS_ROUTING_H + + #include "mh/multihash.h" + #include "ipfs/util/time.h" + #include "ipfs/namesys/pb.h" + + #define DefaultResolverCacheTTL 60 // a minute + + struct cacheEntry { + char *key; + char *value; + struct stime eol; + }; + + struct routingResolver { + int cachesize; + int next; + struct cacheEntry **data; + }; + + char* ipfs_routing_cache_get (char *key, struct ipns_entry *ientry); + void ipfs_routing_cache_set (char *key, char *value, struct ipns_entry *ientry); + struct routingResolver* ipfs_namesys_new_routing_resolver (struct libp2p_routing_value_store *route, int cachesize); + // ipfs_namesys_routing_resolve implements Resolver. + int ipfs_namesys_routing_resolve (char **path, char *name, struct namesys_pb *pb); + // ipfs_namesys_routing_resolve_n implements Resolver. + int ipfs_namesys_routing_resolve_n (char **path, char *name, int depth, struct namesys_pb *pb); + // ipfs_namesys_routing_resolve_once implements resolver. Uses the IPFS + // routing system to resolve SFS-like names. + int ipfs_namesys_routing_resolve_once (char **path, char *name, int depth, char *prefix, struct namesys_pb *pb); + int ipfs_namesys_routing_check_EOL (struct stime *st, struct namesys_pb *pb); + int ipfs_namesys_routing_get_value (char*, char*); + int ipfs_namesys_routing_getpublic_key (char*, struct MultiHash*); +#endif // IPNS_NAMESYS_ROUTING_H diff --git a/namesys/routing.c b/namesys/routing.c new file mode 100644 index 0000000..3842300 --- /dev/null +++ b/namesys/routing.c @@ -0,0 +1,212 @@ +#include +#include +#include +#include +#include "ipfs/namesys/routing.h" +#include "ipfs/util/time.h" +#include "mh/multihash.h" +#include "ipfs/namesys/pb.h" +#include "ipfs/namesys/namesys.h" +#include "ipfs/cid/cid.h" + +char* ipfs_routing_cache_get (char *key, struct ipns_entry *ientry) +{ + int i; + struct routingResolver *cache; + struct stime now; + + if (key && ientry) { + cache = ientry->cache; + if (cache) { + get_gmttime (&now); + for (i = 0 ; i < cache->next ; i++) { + if (((now.t < cache->data[i]->eol.t || + (now.t == cache->data[i]->eol.t && now.ts.tv_nsec < cache->data[i]->eol.ts.tv_nsec))) && + strcmp(cache->data[i]->key, key) == 0) { + return cache->data[i]->value; + } + } + } + } + return NULL; +} + +void ipfs_routing_cache_set (char *key, char *value, struct ipns_entry *ientry) +{ + struct cacheEntry *n; + struct routingResolver *cache; + + if (key && value && ientry) { + cache = ientry->cache; + if (cache && cache->next < cache->cachesize) { + n = malloc(sizeof (struct cacheEntry)); + if (n) { + n->key = key; + n->value = value; + get_gmttime (&n->eol); // now + n->eol.t += DefaultResolverCacheTTL; // sum TTL seconds to time seconds. + cache->data[cache->next++] = n; + } + } + } +} + +// NewRoutingResolver constructs a name resolver using the IPFS Routing system +// to implement SFS-like naming on top. +// cachesize is the limit of the number of entries in the lru cache. Setting it +// to '0' will disable caching. +struct routingResolver* ipfs_namesys_new_routing_resolver (struct libp2p_routing_value_store *route, int cachesize) +{ + struct routingResolver *ret; + + if (!route) { + fprintf(stderr, "attempt to create resolver with NULL routing system\n"); + exit (1); + } + + ret = calloc (1, sizeof (struct routingResolver)); + + if (!ret) { + return NULL; + } + + ret->data = calloc(cachesize, sizeof(void*)); + if (!ret) { + free (ret); + return NULL; + } + + ret->cachesize = cachesize; + return ret; +} + +// ipfs_namesys_routing_resolve implements Resolver. +int ipfs_namesys_routing_resolve (char **path, char *name, struct namesys_pb *pb) +{ + return ipfs_namesys_routing_resolve_n(path, name, DefaultDepthLimit, pb); +} + +// ipfs_namesys_routing_resolve_n implements Resolver. +int ipfs_namesys_routing_resolve_n (char **path, char *name, int depth, struct namesys_pb *pb) +{ + return ipfs_namesys_routing_resolve_once (path, name, depth, "/ipns/", pb); +} + +// ipfs_namesys_routing_resolve_once implements resolver. Uses the IPFS +// routing system to resolve SFS-like names. +int ipfs_namesys_routing_resolve_once (char **path, char *name, int depth, char *prefix, struct namesys_pb *pb) +{ + int err, l, s, ok; + struct MultiHash hash; + char *h, *string, *val; + struct libp2p_crypto_pubkey pubkey; + + if (!path || !name | !prefix) { + return ErrInvalidParam; + } + // log.Debugf("RoutingResolve: '%s'", name) + *path = ipfs_routing_cache_get (name, pb->IpnsEntry); + if (*path) { + return 0; // cached + } + + if (memcmp(name, prefix, strlen(prefix)) == 0) { + name += strlen (prefix); // trim prefix. + } + + err = libp2p_b58_to_multihash (name, strlen(name), &hash); + if (err) { + // name should be a multihash. if it isn't, error out here. + //log.Warningf("RoutingResolve: bad input hash: [%s]\n", name) + return err; + } + + // use the routing system to get the name. + // /ipns/ + l = strlen(prefix); + s = (hash.size * 2) + 1; + h = malloc(l + s); // alloc to fit prefix + hexhash + null terminator + if (!h) { + return ErrAllocFailed; + } + memcpy(h, prefix, l); // copy prefix + if (!libp2p_multihash_hex_string(&hash, h+l, s)) { // hexstring just after prefix. + return ErrUnknow; + } + + err = ipfs_namesys_routing_get_value (val, h); + if (err) { + //log.Warning("RoutingResolve get failed.") + return err; + } + + //err = protobuf decode (val, pb.IpnsEntry); + if (err) { + return err; + } + + // name should be a public key retrievable from ipfs + err = ipfs_namesys_routing_getpublic_key (pubkey, &hash); + if (err) { + return err; + } + + // check sig with pk + err = libp2p_crypto_verify (ipfs_ipns_entry_data_for_sig(pb->IpnsEntry), ipfs_ipns_entry_get_signature(pb->IpnsEntry), &ok); + if (err || !ok) { + char buf[500]; + snprintf(buf, sizeof(buf), Err[ErrInvalidSignatureFmt], pubkey); + l = strlen(buf) + 1; + Err[ErrInvalidSignature] = malloc(l); + if (!Err[ErrInvalidSignature]) { + return ErrAllocFailed; + } + memcpy(Err[ErrInvalidSignature], buf, l); + return ErrInvalidSignature; + } + // ok sig checks out. this is a valid name. + + // check for old style record: + err = ipfs_namesys_pb_get_value (&string, pb->IpnsEntry); + if (err) { + return err; + } + err = libp2p_multihash_from_hex_string(string, strlen(string), &hash); + if (err) { + // Not a multihash, probably a new record + err = ipfs_path_parse(path, string); + if (err) { + return err; + } + } else { + // Its an old style multihash record + //log.Warning("Detected old style multihash record") + struct Cid *cid; + err = ipfs_cid_new(0, hash.data, hash.size, CID_PROTOBUF, &cid); + if (err) { + return err; + } + + err = ipfs_path_parse_from_cid (path, cid); + if (err) { + return err; + } + } + + ipfs_routing_cache_set (name, *path, pb->IpnsEntry); + + return 0; +} + +int ipfs_namesys_routing_check_EOL (struct stime *st, struct namesys_pb *pb) +{ + int err; + + if (ipfs_namesys_pb_get_validity_type (pb->IpnsEntry) == IpnsEntry_EOL) { + err = ipfs_util_time_parse_RFC3339 (st, ipfs_namesys_pb_get_validity (pb->IpnsEntry)); + if (!err) { + return 1; + } + } + return 0; +}