/*
This file is part of GNUnet.
- (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Christian Grothoff (and other contributing authors)
+ (C) 2003--2013 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
#include "platform.h"
#include "gnunet_fs_service.h"
#include "gnunet_signatures.h"
-#include "fs.h"
+#include "fs_api.h"
+#include <unitypes.h>
+#include <unicase.h>
+#include <uniconv.h>
+#include <unistr.h>
+#include <unistdio.h>
+
/**
* into HashMaps. The key may change between FS implementations.
*
* @param uri uri to convert to a unique key
- * @param key wherer to store the unique key
+ * @param key where to store the unique key
*/
void
-GNUNET_FS_uri_to_key (const struct GNUNET_FS_Uri *uri, GNUNET_HashCode * key)
+GNUNET_FS_uri_to_key (const struct GNUNET_FS_Uri *uri,
+ struct GNUNET_HashCode *key)
{
switch (uri->type)
{
- case chk:
+ case GNUNET_FS_URI_CHK:
*key = uri->data.chk.chk.query;
return;
- case sks:
+ case GNUNET_FS_URI_SKS:
GNUNET_CRYPTO_hash (uri->data.sks.identifier,
strlen (uri->data.sks.identifier), key);
break;
- case ksk:
+ case GNUNET_FS_URI_KSK:
if (uri->data.ksk.keywordCount > 0)
GNUNET_CRYPTO_hash (uri->data.ksk.keywords[0],
strlen (uri->data.ksk.keywords[0]), key);
break;
- case loc:
+ case GNUNET_FS_URI_LOC:
GNUNET_CRYPTO_hash (&uri->data.loc.fi,
sizeof (struct FileIdentifier) +
- sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
+ sizeof (struct GNUNET_CRYPTO_EccPublicKey),
key);
break;
default:
- memset (key, 0, sizeof (GNUNET_HashCode));
+ memset (key, 0, sizeof (struct GNUNET_HashCode));
break;
}
}
* Convert keyword URI to a human readable format
* (i.e. the search query that was used in the first place)
*
- * @param uri ksk uri to convert to a string
+ * @param uri ksk uri to convert to a string
* @return string with the keywords
*/
char *
char **keywords;
unsigned int keywordCount;
- if ((uri == NULL) || (uri->type != ksk))
+ if ((NULL == uri) || (GNUNET_FS_URI_KSK != uri->type))
{
GNUNET_break (0);
return NULL;
* spaces), return a copy of the keyword without %-encoding and
* without double-quotes (%22). Also, add a space at the beginning
* if there is not a '+'.
- *
+ *
* @param in string with %-encoding
* @param emsg where to store the parser error message (if any)
* @return decodded string with leading space (or preserved plus)
{
if (out[rpos] == '%')
{
- if (1 != sscanf (&out[rpos + 1], "%2X", &hx))
+ if (1 != SSCANF (&out[rpos + 1], "%2X", &hx))
{
GNUNET_free (out);
- *emsg = GNUNET_strdup (_("`%' must be followed by HEX number"));
+ *emsg = GNUNET_strdup (_(/* xgettext:no-c-format */
+ "`%' must be followed by HEX number"));
return NULL;
}
rpos += 3;
char *dup;
int saw_quote;
- GNUNET_assert (s != NULL);
+ GNUNET_assert (NULL != s);
slen = strlen (s);
pos = strlen (GNUNET_FS_URI_KSK_PREFIX);
if ((slen <= pos) || (0 != strncmp (s, GNUNET_FS_URI_KSK_PREFIX, pos)))
goto CLEANUP;
GNUNET_assert (max == 0);
GNUNET_free (dup);
- ret = GNUNET_malloc (sizeof (struct GNUNET_FS_Uri));
- ret->type = ksk;
+ ret = GNUNET_new (struct GNUNET_FS_Uri);
+ ret->type = GNUNET_FS_URI_KSK;
ret->data.ksk.keywordCount = iret;
ret->data.ksk.keywords = keywords;
return ret;
uri_sks_parse (const char *s, char **emsg)
{
struct GNUNET_FS_Uri *ret;
- GNUNET_HashCode namespace;
- char *identifier;
- unsigned int pos;
- size_t slen;
- char enc[sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded)];
+ struct GNUNET_CRYPTO_EccPublicKey ns;
+ size_t pos;
+ char *end;
GNUNET_assert (s != NULL);
- slen = strlen (s);
pos = strlen (GNUNET_FS_URI_SKS_PREFIX);
- if ((slen <= pos) || (0 != strncmp (s, GNUNET_FS_URI_SKS_PREFIX, pos)))
+ if ((strlen (s) <= pos) || (0 != strncmp (s, GNUNET_FS_URI_SKS_PREFIX, pos)))
return NULL; /* not an SKS URI */
- if ((slen < pos + sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded)) ||
- (s[pos + sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) - 1] != '/'))
+ end = strchr (&s[pos], '/');
+ if ( (NULL == end) ||
+ (GNUNET_OK !=
+ GNUNET_STRINGS_string_to_data (&s[pos],
+ end - &s[pos],
+ &ns,
+ sizeof (ns))) )
{
*emsg = GNUNET_strdup (_("Malformed SKS URI"));
- return NULL;
+ return NULL; /* malformed */
}
- memcpy (enc, &s[pos], sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded));
- enc[sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) - 1] = '\0';
- if (GNUNET_OK != GNUNET_CRYPTO_hash_from_string (enc, &namespace))
- {
- *emsg = GNUNET_strdup (_("Malformed SKS URI"));
- return NULL;
- }
- identifier =
- GNUNET_strdup (&s[pos + sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded)]);
- ret = GNUNET_malloc (sizeof (struct GNUNET_FS_Uri));
- ret->type = sks;
- ret->data.sks.namespace = namespace;
- ret->data.sks.identifier = identifier;
+ end++; /* skip over '/' */
+ ret = GNUNET_new (struct GNUNET_FS_Uri);
+ ret->type = GNUNET_FS_URI_SKS;
+ ret->data.sks.ns = ns;
+ ret->data.sks.identifier = GNUNET_strdup (end);
return ret;
}
return NULL;
}
fi.file_length = GNUNET_htonll (flen);
- ret = GNUNET_malloc (sizeof (struct GNUNET_FS_Uri));
- ret->type = chk;
+ ret = GNUNET_new (struct GNUNET_FS_Uri);
+ ret->type = GNUNET_FS_URI_CHK;
ret->data.chk = fi;
return ret;
}
}
+GNUNET_NETWORK_STRUCT_BEGIN
/**
- * Structure that defines how the
- * contents of a location URI must be
- * assembled in memory to create or
- * verify the signature of a location
+ * Structure that defines how the contents of a location URI must be
+ * assembled in memory to create or verify the signature of a location
* URI.
*/
struct LocUriAssembly
{
- struct GNUNET_CRYPTO_RsaSignaturePurpose purpose;
+ /**
+ * What is being signed (rest of this struct).
+ */
+ struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+ /**
+ * Expiration time of the offer.
+ */
struct GNUNET_TIME_AbsoluteNBO exptime;
+ /**
+ * File being offered.
+ */
struct FileIdentifier fi;
- struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded peer;
+ /**
+ * Peer offering the file.
+ */
+ struct GNUNET_CRYPTO_EccPublicKey peer;
};
+GNUNET_NETWORK_STRUCT_END
#define GNUNET_FS_URI_LOC_PREFIX GNUNET_FS_URI_PREFIX GNUNET_FS_URI_LOC_INFIX
unsigned long long exptime;
unsigned long long flen;
struct GNUNET_TIME_Absolute et;
- struct GNUNET_CRYPTO_RsaSignature sig;
+ struct GNUNET_CRYPTO_EccSignature sig;
struct LocUriAssembly ass;
int ret;
size_t slen;
npos++;
ret =
enc2bin (&s[npos], &ass.peer,
- sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded));
+ sizeof (struct GNUNET_CRYPTO_EccPublicKey));
if (ret == -1)
{
*emsg =
*emsg = GNUNET_strdup (_("SKS URI malformed (could not find signature)"));
goto ERR;
}
- ret = enc2bin (&s[npos], &sig, sizeof (struct GNUNET_CRYPTO_RsaSignature));
+ ret = enc2bin (&s[npos], &sig, sizeof (struct GNUNET_CRYPTO_EccSignature));
if (ret == -1)
{
*emsg = GNUNET_strdup (_("SKS URI malformed (could not decode signature)"));
et.abs_value = exptime;
ass.exptime = GNUNET_TIME_absolute_hton (et);
if (GNUNET_OK !=
- GNUNET_CRYPTO_rsa_verify (GNUNET_SIGNATURE_PURPOSE_PEER_PLACEMENT,
+ GNUNET_CRYPTO_ecc_verify (GNUNET_SIGNATURE_PURPOSE_PEER_PLACEMENT,
&ass.purpose, &sig, &ass.peer))
{
*emsg =
GNUNET_strdup (_("SKS URI malformed (signature failed validation)"));
goto ERR;
}
- uri = GNUNET_malloc (sizeof (struct GNUNET_FS_Uri));
- uri->type = loc;
+ uri = GNUNET_new (struct GNUNET_FS_Uri);
+ uri->type = GNUNET_FS_URI_LOC;
uri->data.loc.fi = ass.fi;
uri->data.loc.peer = ass.peer;
uri->data.loc.expirationTime = et;
GNUNET_assert (uri != NULL);
switch (uri->type)
{
- case ksk:
+ case GNUNET_FS_URI_KSK:
for (i = 0; i < uri->data.ksk.keywordCount; i++)
GNUNET_free (uri->data.ksk.keywords[i]);
GNUNET_array_grow (uri->data.ksk.keywords, uri->data.ksk.keywordCount, 0);
break;
- case sks:
+ case GNUNET_FS_URI_SKS:
GNUNET_free (uri->data.sks.identifier);
break;
- case loc:
+ case GNUNET_FS_URI_LOC:
break;
default:
/* do nothing */
unsigned int
GNUNET_FS_uri_ksk_get_keyword_count (const struct GNUNET_FS_Uri *uri)
{
- if (uri->type != ksk)
+ if (uri->type != GNUNET_FS_URI_KSK)
return 0;
return uri->data.ksk.keywordCount;
}
unsigned int i;
char *keyword;
- if (uri->type != ksk)
+ if (uri->type != GNUNET_FS_URI_KSK)
return -1;
if (iterator == NULL)
return uri->data.ksk.keywordCount;
const char *old;
char *n;
- GNUNET_assert (uri->type == ksk);
+ GNUNET_assert (uri->type == GNUNET_FS_URI_KSK);
for (i = 0; i < uri->data.ksk.keywordCount; i++)
{
old = uri->data.ksk.keywords[i];
unsigned int i;
char *old;
- GNUNET_assert (uri->type == ksk);
+ GNUNET_assert (uri->type == GNUNET_FS_URI_KSK);
for (i = 0; i < uri->data.ksk.keywordCount; i++)
{
old = uri->data.ksk.keywords[i];
GNUNET_FS_uri_loc_get_peer_identity (const struct GNUNET_FS_Uri *uri,
struct GNUNET_PeerIdentity *peer)
{
- if (uri->type != loc)
+ if (uri->type != GNUNET_FS_URI_LOC)
return GNUNET_SYSERR;
GNUNET_CRYPTO_hash (&uri->data.loc.peer,
- sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
+ sizeof (struct GNUNET_CRYPTO_EccPublicKey),
&peer->hashPubKey);
return GNUNET_OK;
}
struct GNUNET_TIME_Absolute
GNUNET_FS_uri_loc_get_expiration (const struct GNUNET_FS_Uri *uri)
{
- GNUNET_assert (uri->type == loc);
+ GNUNET_assert (uri->type == GNUNET_FS_URI_LOC);
return uri->data.loc.expirationTime;
}
{
struct GNUNET_FS_Uri *ret;
- if (uri->type != loc)
+ if (uri->type != GNUNET_FS_URI_LOC)
return NULL;
- ret = GNUNET_malloc (sizeof (struct GNUNET_FS_Uri));
- ret->type = chk;
+ ret = GNUNET_new (struct GNUNET_FS_Uri);
+ ret->type = GNUNET_FS_URI_CHK;
ret->data.chk = uri->data.loc.fi;
return ret;
}
struct GNUNET_TIME_Absolute expiration_time)
{
struct GNUNET_FS_Uri *uri;
- struct GNUNET_CRYPTO_RsaPrivateKey *my_private_key;
- struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded my_public_key;
+ struct GNUNET_CRYPTO_EccPrivateKey *my_private_key;
+ struct GNUNET_CRYPTO_EccPublicKey my_public_key;
char *keyfile;
struct LocUriAssembly ass;
- if (baseUri->type != chk)
+ if (baseUri->type != GNUNET_FS_URI_CHK)
return NULL;
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_filename (cfg, "GNUNETD", "HOSTKEY",
+ GNUNET_CONFIGURATION_get_value_filename (cfg, "PEER", "PRIVATE_KEY",
&keyfile))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Lacking key configuration settings.\n"));
return NULL;
}
- my_private_key = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
- if (my_private_key == NULL)
+ if (NULL == (my_private_key = GNUNET_CRYPTO_ecc_key_create_from_file (keyfile)))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Could not access hostkey file `%s'.\n"), keyfile);
return NULL;
}
GNUNET_free (keyfile);
- GNUNET_CRYPTO_rsa_key_get_public (my_private_key, &my_public_key);
+ GNUNET_CRYPTO_ecc_key_get_public (my_private_key, &my_public_key);
ass.purpose.size = htonl (sizeof (struct LocUriAssembly));
ass.purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_PEER_PLACEMENT);
ass.exptime = GNUNET_TIME_absolute_hton (expiration_time);
ass.fi = baseUri->data.chk;
ass.peer = my_public_key;
- uri = GNUNET_malloc (sizeof (struct GNUNET_FS_Uri));
- uri->type = loc;
+ uri = GNUNET_new (struct GNUNET_FS_Uri);
+ uri->type = GNUNET_FS_URI_LOC;
uri->data.loc.fi = baseUri->data.chk;
uri->data.loc.expirationTime = expiration_time;
uri->data.loc.peer = my_public_key;
GNUNET_assert (GNUNET_OK ==
- GNUNET_CRYPTO_rsa_sign (my_private_key, &ass.purpose,
+ GNUNET_CRYPTO_ecc_sign (my_private_key, &ass.purpose,
&uri->data.loc.contentSignature));
- GNUNET_CRYPTO_rsa_key_free (my_private_key);
+ GNUNET_CRYPTO_ecc_key_free (my_private_key);
return uri;
}
-/**
- * Create an SKS URI from a namespace and an identifier.
- *
- * @param ns namespace
- * @param id identifier
- * @param emsg where to store an error message
- * @return an FS URI for the given namespace and identifier
- */
-struct GNUNET_FS_Uri *
-GNUNET_FS_uri_sks_create (struct GNUNET_FS_Namespace *ns, const char *id,
- char **emsg)
-{
- struct GNUNET_FS_Uri *ns_uri;
- struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pk;
-
- ns_uri = GNUNET_malloc (sizeof (struct GNUNET_FS_Uri));
- ns_uri->type = sks;
- GNUNET_CRYPTO_rsa_key_get_public (ns->key, &pk);
- GNUNET_CRYPTO_hash (&pk, sizeof (pk), &ns_uri->data.sks.namespace);
- ns_uri->data.sks.identifier = GNUNET_strdup (id);
- return ns_uri;
-}
-
-
/**
* Create an SKS URI from a namespace ID and an identifier.
*
- * @param nsid namespace ID
+ * @param ns namespace ID
* @param id identifier
* @return an FS URI for the given namespace and identifier
*/
struct GNUNET_FS_Uri *
-GNUNET_FS_uri_sks_create_from_nsid (GNUNET_HashCode * nsid, const char *id)
+GNUNET_FS_uri_sks_create (const struct GNUNET_CRYPTO_EccPublicKey *ns,
+ const char *id)
{
struct GNUNET_FS_Uri *ns_uri;
- ns_uri = GNUNET_malloc (sizeof (struct GNUNET_FS_Uri));
- ns_uri->type = sks;
- ns_uri->data.sks.namespace = *nsid;
+ ns_uri = GNUNET_new (struct GNUNET_FS_Uri);
+ ns_uri->type = GNUNET_FS_URI_SKS;
+ ns_uri->data.sks.ns = *ns;
ns_uri->data.sks.identifier = GNUNET_strdup (id);
return ns_uri;
}
-/**
- * Canonicalize a keyword.
- *
- * @param in input string (the keyword)
- * @return canonicalized keyword
- */
-static char *
-canonicalize_keyword (const char *in)
-{
- char *ret;
- char *wpos;
- const char *rpos;
-
- ret = GNUNET_strdup (in);
- wpos = ret;
- rpos = in;
- while ('\0' != *rpos)
- {
- switch (tolower ((unsigned char) *rpos))
- {
- case 'a':
- case 'e':
- case 'i':
- case 'o':
- case 'u':
- case ' ':
- case '\t':
- case '\n':
- case '\r':
- /* skip characters listed above */
- break;
- case 'b':
- case 'c':
- case 'd':
- case 'f':
- case 'g':
- case 'h':
- case 'j':
- case 'k':
- case 'l':
- case 'm':
- case 'n':
- case 'p':
- case 'r':
- case 's':
- case 't':
- case 'v':
- case 'w':
- case 'x':
- case 'y':
- case 'z':
- /* convert characters listed above to lower case */
- *wpos = tolower ((unsigned char) *rpos);
- wpos++;
- break;
- case '!':
- case '.':
- case '?':
- case '-':
- /* keep characters listed above without changes */
- *wpos = *rpos;
- wpos++;
- break;
- default:
- /* replace characters listed above with '_' */
- *wpos = '_';
- wpos++;
- break;
- }
- rpos++;
- }
- return ret;
-}
-
-
-/**
- * Canonicalize keyword URI. Performs operations such
- * as decapitalization and removal of certain characters.
- * (useful for search).
- *
- * @param uri the URI to canonicalize
- * @return canonicalized version of the URI, NULL on error
- */
-struct GNUNET_FS_Uri *
-GNUNET_FS_uri_ksk_canonicalize (const struct GNUNET_FS_Uri *uri)
-{
- struct GNUNET_FS_Uri *ret;
- unsigned int kc;
- unsigned int i;
- char **kl;
-
- kc = uri->data.ksk.keywordCount;
- kl = GNUNET_malloc (kc * sizeof (char *));
- for (i = 0; i < kc; i++)
- kl[i] = canonicalize_keyword (uri->data.ksk.keywords[i]);
- ret = GNUNET_malloc (sizeof (struct GNUNET_FS_Uri));
- ret->type = ksk;
- ret->data.ksk.keywordCount = kc;
- ret->data.ksk.keywords = kl;
- return ret;
-}
-
-
/**
* Merge the sets of keywords from two KSK URIs.
* (useful for merging the canonicalized keywords with
return GNUNET_FS_uri_dup (u2);
if (u2 == NULL)
return GNUNET_FS_uri_dup (u1);
- if ((u1->type != ksk) || (u2->type != ksk))
+ if ((u1->type != GNUNET_FS_URI_KSK) || (u2->type != GNUNET_FS_URI_KSK))
{
GNUNET_break (0);
return NULL;
if (0 == found)
kl[kc++] = GNUNET_strdup (kp);
}
- ret = GNUNET_malloc (sizeof (struct GNUNET_FS_Uri));
- ret->type = ksk;
+ ret = GNUNET_new (struct GNUNET_FS_Uri);
+ ret->type = GNUNET_FS_URI_KSK;
ret->data.ksk.keywordCount = kc;
ret->data.ksk.keywords = kl;
return ret;
if (uri == NULL)
return NULL;
- ret = GNUNET_malloc (sizeof (struct GNUNET_FS_Uri));
+ ret = GNUNET_new (struct GNUNET_FS_Uri);
memcpy (ret, uri, sizeof (struct GNUNET_FS_Uri));
switch (ret->type)
{
- case ksk:
+ case GNUNET_FS_URI_KSK:
if (ret->data.ksk.keywordCount >=
GNUNET_MAX_MALLOC_CHECKED / sizeof (char *))
{
else
ret->data.ksk.keywords = NULL; /* just to be sure */
break;
- case sks:
+ case GNUNET_FS_URI_SKS:
ret->data.sks.identifier = GNUNET_strdup (uri->data.sks.identifier);
break;
- case loc:
+ case GNUNET_FS_URI_LOC:
break;
default:
break;
&& (NULL != (uri = GNUNET_FS_uri_parse (argv[0], &emsg))))
return uri;
GNUNET_free_non_null (emsg);
- uri = GNUNET_malloc (sizeof (struct GNUNET_FS_Uri));
- uri->type = ksk;
+ uri = GNUNET_new (struct GNUNET_FS_Uri);
+ uri->type = GNUNET_FS_URI_KSK;
uri->data.ksk.keywordCount = argc;
uri->data.ksk.keywords = GNUNET_malloc (argc * sizeof (char *));
for (i = 0; i < argc; i++)
return GNUNET_NO;
switch (u1->type)
{
- case chk:
+ case GNUNET_FS_URI_CHK:
if (0 ==
memcmp (&u1->data.chk, &u2->data.chk, sizeof (struct FileIdentifier)))
return GNUNET_YES;
return GNUNET_NO;
- case sks:
+ case GNUNET_FS_URI_SKS:
if ((0 ==
- memcmp (&u1->data.sks.namespace, &u2->data.sks.namespace,
- sizeof (GNUNET_HashCode))) &&
+ memcmp (&u1->data.sks.ns, &u2->data.sks.ns,
+ sizeof (struct GNUNET_CRYPTO_EccPublicKey))) &&
(0 == strcmp (u1->data.sks.identifier, u2->data.sks.identifier)))
return GNUNET_YES;
return GNUNET_NO;
- case ksk:
+ case GNUNET_FS_URI_KSK:
if (u1->data.ksk.keywordCount != u2->data.ksk.keywordCount)
return GNUNET_NO;
for (i = 0; i < u1->data.ksk.keywordCount; i++)
return GNUNET_NO;
}
return GNUNET_YES;
- case loc:
+ case GNUNET_FS_URI_LOC:
if (memcmp
(&u1->data.loc, &u2->data.loc,
sizeof (struct FileIdentifier) +
- sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded) +
+ sizeof (struct GNUNET_CRYPTO_EccPublicKey) +
sizeof (struct GNUNET_TIME_Absolute) + sizeof (unsigned short) +
sizeof (unsigned short)) != 0)
return GNUNET_NO;
int
GNUNET_FS_uri_test_sks (const struct GNUNET_FS_Uri *uri)
{
- return uri->type == sks;
+ return uri->type == GNUNET_FS_URI_SKS;
}
* namespace URI.
*
* @param uri the uri to get the namespace ID from
- * @param nsid where to store the ID of the namespace
+ * @param pseudonym where to store the ID of the namespace
* @return GNUNET_OK on success
*/
int
GNUNET_FS_uri_sks_get_namespace (const struct GNUNET_FS_Uri *uri,
- GNUNET_HashCode * nsid)
+ struct GNUNET_CRYPTO_EccPublicKey *pseudonym)
{
if (!GNUNET_FS_uri_test_sks (uri))
{
GNUNET_break (0);
return GNUNET_SYSERR;
}
- *nsid = uri->data.sks.namespace;
+ *pseudonym = uri->data.sks.ns;
return GNUNET_OK;
}
{
char *ret;
char *name;
+ char *unique_name;
- if (uri->type != sks)
+ if (uri->type != GNUNET_FS_URI_SKS)
return NULL;
- name = GNUNET_PSEUDONYM_id_to_name (cfg, &uri->data.sks.namespace);
- if (name == NULL)
- return GNUNET_FS_uri_to_string (uri);
- GNUNET_asprintf (&ret, "%s: %s", name, uri->data.sks.identifier);
+ (void) GNUNET_FS_pseudonym_get_info (cfg, &uri->data.sks.ns,
+ NULL, NULL, &name, NULL);
+ unique_name = GNUNET_FS_pseudonym_name_uniquify (cfg, &uri->data.sks.ns, name, NULL);
GNUNET_free (name);
+ GNUNET_asprintf (&ret, "%s: %s", unique_name, uri->data.sks.identifier);
+ GNUNET_free (unique_name);
return ret;
}
#if EXTRA_CHECKS
unsigned int i;
- if (uri->type == ksk)
+ if (uri->type == GNUNET_FS_URI_KSK)
{
- for (i = uri->data.ksk.keywordCount - 1; i >= 0; i--)
+ for (i=0;i < uri->data.ksk.keywordCount; i++)
GNUNET_assert (uri->data.ksk.keywords[i] != NULL);
}
#endif
- return uri->type == ksk;
+ return uri->type == GNUNET_FS_URI_KSK;
}
int
GNUNET_FS_uri_test_chk (const struct GNUNET_FS_Uri *uri)
{
- return uri->type == chk;
+ return uri->type == GNUNET_FS_URI_CHK;
}
{
switch (uri->type)
{
- case chk:
+ case GNUNET_FS_URI_CHK:
return GNUNET_ntohll (uri->data.chk.file_length);
- case loc:
+ case GNUNET_FS_URI_LOC:
return GNUNET_ntohll (uri->data.loc.fi.file_length);
default:
GNUNET_assert (0);
int
GNUNET_FS_uri_test_loc (const struct GNUNET_FS_Uri *uri)
{
- return uri->type == loc;
+ return uri->type == GNUNET_FS_URI_LOC;
+}
+
+
+/**
+ * Add a keyword as non-mandatory (with ' '-prefix) to the
+ * given keyword list at offset 'index'. The array is
+ * guaranteed to be long enough.
+ *
+ * @param s keyword to add
+ * @param array array to add the keyword to
+ * @param index offset where to add the keyword
+ */
+static void
+insert_non_mandatory_keyword (const char *s, char **array, int index)
+{
+ char *nkword;
+ GNUNET_asprintf (&nkword, " %s", /* space to mark as 'non mandatory' */ s);
+ array[index] = nkword;
}
+/**
+ * Test if the given keyword 's' is already present in the
+ * given array, ignoring the '+'-mandatory prefix in the array.
+ *
+ * @param s keyword to test
+ * @param array keywords to test against, with ' ' or '+' prefix to ignore
+ * @param array_length length of the array
+ * @return GNUNET_YES if the keyword exists, GNUNET_NO if not
+ */
+static int
+find_duplicate (const char *s, const char **array, int array_length)
+{
+ int j;
+
+ for (j = array_length - 1; j >= 0; j--)
+ if (0 == strcmp (&array[j][1], s))
+ return GNUNET_YES;
+ return GNUNET_NO;
+}
+
+
+/**
+ * FIXME: comment
+ */
+static char *
+normalize_metadata (enum EXTRACTOR_MetaFormat format, const char *data,
+ size_t data_len)
+{
+ uint8_t *free_str = NULL;
+ uint8_t *str_to_normalize = (uint8_t *) data;
+ uint8_t *normalized;
+ size_t r_len;
+ if (str_to_normalize == NULL)
+ return NULL;
+ /* Don't trust libextractor */
+ if (format == EXTRACTOR_METAFORMAT_UTF8)
+ {
+ free_str = (uint8_t *) u8_check ((const uint8_t *) data, data_len);
+ if (free_str == NULL)
+ free_str = NULL;
+ else
+ format = EXTRACTOR_METAFORMAT_C_STRING;
+ }
+ if (format == EXTRACTOR_METAFORMAT_C_STRING)
+ {
+ free_str = u8_strconv_from_encoding (data, locale_charset (), iconveh_escape_sequence);
+ if (free_str == NULL)
+ return NULL;
+ }
+
+ normalized = u8_tolower (str_to_normalize, strlen ((char *) str_to_normalize), NULL, UNINORM_NFD, NULL, &r_len);
+ /* free_str is allocated by libunistring internally, use free() */
+ if (free_str != NULL)
+ free (free_str);
+ if (normalized != NULL)
+ {
+ /* u8_tolower allocates a non-NULL-terminated string! */
+ free_str = GNUNET_malloc (r_len + 1);
+ memcpy (free_str, normalized, r_len);
+ free_str[r_len] = '\0';
+ free (normalized);
+ normalized = free_str;
+ }
+ return (char *) normalized;
+}
+
+/**
+ * Counts the number of UTF-8 characters (not bytes) in the string,
+ * returns that count.
+ */
+static size_t
+u8_strcount (const uint8_t *s)
+{
+ size_t count;
+ ucs4_t c;
+ GNUNET_assert (s != NULL);
+ if (s[0] == 0)
+ return 0;
+ for (count = 0; s != NULL; count++)
+ s = u8_next (&c, s);
+ return count - 1;
+}
+
+
+/**
+ * Break the filename up by matching [], () and {} pairs to make
+ * keywords. In case of nesting parentheses only the inner pair counts.
+ * You can't escape parentheses to scan something like "[blah\{foo]" to
+ * make a "blah{foo" keyword, this function is only a heuristic!
+ *
+ * @param s string to break down.
+ * @param array array to fill with enclosed tokens. If NULL, then tokens
+ * are only counted.
+ * @param index index at which to start filling the array (entries prior
+ * to it are used to check for duplicates). ignored if array == NULL.
+ * @return number of tokens counted (including duplicates), or number of
+ * tokens extracted (excluding duplicates). 0 if there are no
+ * matching parens in the string (when counting), or when all tokens
+ * were duplicates (when extracting).
+ */
+static int
+get_keywords_from_parens (const char *s, char **array, int index)
+{
+ int count = 0;
+ char *open_paren;
+ char *close_paren;
+ char *ss;
+ char tmp;
+
+ if (NULL == s)
+ return 0;
+ ss = GNUNET_strdup (s);
+ open_paren = ss - 1;
+ while (NULL != (open_paren = strpbrk (open_paren + 1, "[{(")))
+ {
+ int match = 0;
+
+ close_paren = strpbrk (open_paren + 1, "]})");
+ if (NULL == close_paren)
+ continue;
+ switch (open_paren[0])
+ {
+ case '[':
+ if (']' == close_paren[0])
+ match = 1;
+ break;
+ case '{':
+ if ('}' == close_paren[0])
+ match = 1;
+ break;
+ case '(':
+ if (')' == close_paren[0])
+ match = 1;
+ break;
+ default:
+ break;
+ }
+ if (match && (close_paren - open_paren > 1))
+ {
+ tmp = close_paren[0];
+ close_paren[0] = '\0';
+ /* Keywords must be at least 3 characters long */
+ if (u8_strcount ((const uint8_t *) &open_paren[1]) <= 2)
+ {
+ close_paren[0] = tmp;
+ continue;
+ }
+ if (NULL != array)
+ {
+ char *normalized;
+ if (GNUNET_NO == find_duplicate ((const char *) &open_paren[1],
+ (const char **) array, index + count))
+ {
+ insert_non_mandatory_keyword ((const char *) &open_paren[1], array,
+ index + count);
+ count++;
+ }
+ normalized = normalize_metadata (EXTRACTOR_METAFORMAT_UTF8,
+ &open_paren[1], close_paren - &open_paren[1]);
+ if (normalized != NULL)
+ {
+ if (GNUNET_NO == find_duplicate ((const char *) normalized,
+ (const char **) array, index + count))
+ {
+ insert_non_mandatory_keyword ((const char *) normalized, array,
+ index + count);
+ count++;
+ }
+ GNUNET_free (normalized);
+ }
+ }
+ else
+ count++;
+ close_paren[0] = tmp;
+ }
+ }
+ GNUNET_free (ss);
+ return count;
+}
+
+
+/**
+ * Where to break up keywords
+ */
+#define TOKENS "_. /-!?#&+@\"\'\\;:,()[]{}$<>|"
+
+/**
+ * Break the filename up by TOKENS to make
+ * keywords.
+ *
+ * @param s string to break down.
+ * @param array array to fill with tokens. If NULL, then tokens are only
+ * counted.
+ * @param index index at which to start filling the array (entries prior
+ * to it are used to check for duplicates). ignored if array == NULL.
+ * @return number of tokens (>1) counted (including duplicates), or number of
+ * tokens extracted (excluding duplicates). 0 if there are no
+ * separators in the string (when counting), or when all tokens were
+ * duplicates (when extracting).
+ */
+static int
+get_keywords_from_tokens (const char *s, char **array, int index)
+{
+ char *p;
+ char *ss;
+ int seps = 0;
+
+ ss = GNUNET_strdup (s);
+ for (p = strtok (ss, TOKENS); p != NULL; p = strtok (NULL, TOKENS))
+ {
+ /* Keywords must be at least 3 characters long */
+ if (u8_strcount ((const uint8_t *) p) <= 2)
+ continue;
+ if (NULL != array)
+ {
+ char *normalized;
+ if (GNUNET_NO == find_duplicate (p, (const char **) array, index + seps))
+ {
+ insert_non_mandatory_keyword (p, array,
+ index + seps);
+ seps++;
+ }
+ normalized = normalize_metadata (EXTRACTOR_METAFORMAT_UTF8,
+ p, strlen (p));
+ if (normalized != NULL)
+ {
+ if (GNUNET_NO == find_duplicate ((const char *) normalized,
+ (const char **) array, index + seps))
+ {
+ insert_non_mandatory_keyword ((const char *) normalized, array,
+ index + seps);
+ seps++;
+ }
+ GNUNET_free (normalized);
+ }
+ }
+ else
+ seps++;
+ }
+ GNUNET_free (ss);
+ return seps;
+}
+#undef TOKENS
+
/**
* Function called on each value in the meta data.
* Adds it to the URI.
* used in the main libextractor library and yielding
* meta data).
* @param type libextractor-type describing the meta data
- * @param format basic format information about data
+ * @param format basic format information about data
* @param data_mime_type mime-type of data (not of the original file);
* can be NULL (if mime-type is not known)
* @param data actual meta-data found
const char *data_mime_type, const char *data, size_t data_len)
{
struct GNUNET_FS_Uri *uri = cls;
- char *nkword;
- int j;
+ char *normalized_data;
if ((format != EXTRACTOR_METAFORMAT_UTF8) &&
(format != EXTRACTOR_METAFORMAT_C_STRING))
return 0;
- for (j = uri->data.ksk.keywordCount - 1; j >= 0; j--)
- if (0 == strcmp (&uri->data.ksk.keywords[j][1], data))
- return GNUNET_OK;
- GNUNET_asprintf (&nkword, " %s", /* space to mark as 'non mandatory' */
- data);
- uri->data.ksk.keywords[uri->data.ksk.keywordCount++] = nkword;
+ /* Keywords must be at least 3 characters long
+ * If given non-utf8 string it will, most likely, find it to be invalid,
+ * and will return the length of its valid part, skipping the keyword.
+ * If it does - fix the extractor, not this check!
+ */
+ if (u8_strcount ((const uint8_t *) data) <= 2)
+ {
+ return 0;
+ }
+ normalized_data = normalize_metadata (format, data, data_len);
+ if (!find_duplicate (data, (const char **) uri->data.ksk.keywords, uri->data.ksk.keywordCount))
+ {
+ insert_non_mandatory_keyword (data,
+ uri->data.ksk.keywords, uri->data.ksk.keywordCount);
+ uri->data.ksk.keywordCount++;
+ }
+ if (normalized_data != NULL)
+ {
+ if (!find_duplicate (normalized_data, (const char **) uri->data.ksk.keywords, uri->data.ksk.keywordCount))
+ {
+ insert_non_mandatory_keyword (normalized_data,
+ uri->data.ksk.keywords, uri->data.ksk.keywordCount);
+ uri->data.ksk.keywordCount++;
+ }
+ GNUNET_free (normalized_data);
+ }
return 0;
}
*md)
{
struct GNUNET_FS_Uri *ret;
+ char *filename;
+ char *full_name = NULL;
+ char *ss;
int ent;
+ int tok_keywords = 0;
+ int paren_keywords = 0;
if (md == NULL)
return NULL;
- ret = GNUNET_malloc (sizeof (struct GNUNET_FS_Uri));
- ret->type = ksk;
+ ret = GNUNET_new (struct GNUNET_FS_Uri);
+ ret->type = GNUNET_FS_URI_KSK;
ent = GNUNET_CONTAINER_meta_data_iterate (md, NULL, NULL);
if (ent > 0)
{
- ret->data.ksk.keywords = GNUNET_malloc (sizeof (char *) * ent);
+ full_name = GNUNET_CONTAINER_meta_data_get_first_by_types (md,
+ EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME, -1);
+ if (NULL != full_name)
+ {
+ filename = full_name;
+ while (NULL != (ss = strstr (filename, DIR_SEPARATOR_STR)))
+ filename = ss + 1;
+ tok_keywords = get_keywords_from_tokens (filename, NULL, 0);
+ paren_keywords = get_keywords_from_parens (filename, NULL, 0);
+ }
+ /* x2 because there might be a normalized variant of every keyword */
+ ret->data.ksk.keywords = GNUNET_malloc (sizeof (char *) * (ent
+ + tok_keywords + paren_keywords) * 2);
GNUNET_CONTAINER_meta_data_iterate (md, &gather_uri_data, ret);
}
+ if (tok_keywords > 0)
+ ret->data.ksk.keywordCount += get_keywords_from_tokens (filename,
+ ret->data.ksk.keywords,
+ ret->data.ksk.keywordCount);
+ if (paren_keywords > 0)
+ ret->data.ksk.keywordCount += get_keywords_from_parens (filename,
+ ret->data.ksk.keywords,
+ ret->data.ksk.keywordCount);
+ if (ent > 0)
+ GNUNET_free_non_null (full_name);
return ret;
}
size_t slen;
const char *keyword;
- if (uri->type != ksk)
+ if (uri->type != GNUNET_FS_URI_KSK)
return NULL;
keywords = uri->data.ksk.keywords;
keywordCount = uri->data.ksk.keywordCount;
continue; /* skip leading space */
if (needs_percent (keyword[j]))
{
- sprintf (&ret[wpos], "%%%02X", keyword[j]);
+ sprintf (&ret[wpos], "%%%02X", (unsigned char) keyword[j]);
wpos += 3;
}
else
static char *
uri_sks_to_string (const struct GNUNET_FS_Uri *uri)
{
- const GNUNET_HashCode *namespace;
- const char *identifier;
char *ret;
- struct GNUNET_CRYPTO_HashAsciiEncoded ns;
+ char buf[1024];
- if (uri->type != sks)
+ if (GNUNET_FS_URI_SKS != uri->type)
return NULL;
- namespace = &uri->data.sks.namespace;
- identifier = uri->data.sks.identifier;
- GNUNET_CRYPTO_hash_to_enc (namespace, &ns);
+ ret = GNUNET_STRINGS_data_to_string (&uri->data.sks.ns,
+ sizeof (struct GNUNET_CRYPTO_EccPublicKey),
+ buf,
+ sizeof (buf));
+ GNUNET_assert (NULL != ret);
+ ret[0] = '\0';
GNUNET_asprintf (&ret, "%s%s%s/%s", GNUNET_FS_URI_PREFIX,
- GNUNET_FS_URI_SKS_INFIX, (const char *) &ns, identifier);
+ GNUNET_FS_URI_SKS_INFIX, buf,
+ uri->data.sks.identifier);
return ret;
}
struct GNUNET_CRYPTO_HashAsciiEncoded keyhash;
struct GNUNET_CRYPTO_HashAsciiEncoded queryhash;
- if (uri->type != chk)
+ if (uri->type != GNUNET_FS_URI_CHK)
return NULL;
fi = &uri->data.chk;
GNUNET_CRYPTO_hash_to_enc (&fi->chk.key, &keyhash);
GNUNET_CRYPTO_hash_to_enc (&uri->data.loc.fi.chk.query, &queryhash);
peerId =
bin2enc (&uri->data.loc.peer,
- sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded));
+ sizeof (struct GNUNET_CRYPTO_EccPublicKey));
peerSig =
bin2enc (&uri->data.loc.contentSignature,
- sizeof (struct GNUNET_CRYPTO_RsaSignature));
+ sizeof (struct GNUNET_CRYPTO_EccSignature));
GNUNET_asprintf (&ret, "%s%s%s.%s.%llu.%s.%s.%llu", GNUNET_FS_URI_PREFIX,
GNUNET_FS_URI_LOC_INFIX, (const char *) &keyhash,
(const char *) &queryhash,
}
switch (uri->type)
{
- case ksk:
+ case GNUNET_FS_URI_KSK:
return uri_ksk_to_string (uri);
- case sks:
+ case GNUNET_FS_URI_SKS:
return uri_sks_to_string (uri);
- case chk:
+ case GNUNET_FS_URI_CHK:
return uri_chk_to_string (uri);
- case loc:
+ case GNUNET_FS_URI_LOC:
return uri_loc_to_string (uri);
default:
GNUNET_break (0);