* GNUnet URIs are of the general form "gnunet://MODULE/IDENTIFIER".
* The specific structure of "IDENTIFIER" depends on the module and
* maybe differenciated into additional subcategories if applicable.
- * This module only deals with ecrs identifiers (MODULE = "ecrs").
+ * This module only deals with fs identifiers (MODULE = "fs").
* <p>
*
- * This module only parses URIs for the AFS module. The ECRS URIs fall
+ * This module only parses URIs for the AFS module. The FS URIs fall
* into four categories, "chk", "sks", "ksk" and "loc". The first three
* categories were named in analogy (!) to Freenet, but they do NOT
* work in exactly the same way. They are very similar from the user's
* <ul><li>
*
* First, there are URIs that identify a file. They have the format
- * "gnunet://ecrs/chk/HEX1.HEX2.SIZE". These URIs can be used to
+ * "gnunet://fs/chk/HEX1.HEX2.SIZE". These URIs can be used to
* download the file. The description, filename, mime-type and other
* meta-data is NOT part of the file-URI since a URI uniquely
* identifies a resource (and the contents of the file would be the
* </li><li>
*
* The second category identifies entries in a namespace. The format
- * is "gnunet://ecrs/sks/NAMESPACE/IDENTIFIER" where the namespace
+ * is "gnunet://fs/sks/NAMESPACE/IDENTIFIER" where the namespace
* should be given in HEX. Applications may allow using a nickname
* for the namespace if the nickname is not ambiguous. The identifier
* can be either an ASCII sequence or a HEX-encoding. If the
* </li> <li>
*
* The third category identifies ordinary searches. The format is
- * "gnunet://ecrs/ksk/KEYWORD[+KEYWORD]*". Using the "+" syntax
+ * "gnunet://fs/ksk/KEYWORD[+KEYWORD]*". Using the "+" syntax
* it is possible to encode searches with the boolean "AND" operator.
* "+" is used since it indicates a commutative 'and' operation and
* is unlikely to be used in a keyword by itself.
* </li><li>
*
* The last category identifies a datum on a specific machine. The
- * format is "gnunet://ecrs/loc/HEX1.HEX2.SIZE.PEER.SIG.EXPTIME". PEER is
+ * format is "gnunet://fs/loc/HEX1.HEX2.SIZE.PEER.SIG.EXPTIME". PEER is
* the BinName of the public key of the peer storing the datum. The
* signature (SIG) certifies that this peer has this content.
* HEX1, HEX2 and SIZE correspond to a 'chk' URI.
if (1 != sscanf (&out[rpos + 1], "%2X", &hx))
{
GNUNET_free (out);
+ *emsg = GNUNET_strdup (_("`%' must be followed by HEX number"));
return NULL;
}
rpos += 3;
pos = strlen (GNUNET_FS_URI_PREFIX GNUNET_FS_URI_KSK_INFIX);
if ( (slen <= pos) ||
(0 != strncmp (s, GNUNET_FS_URI_PREFIX GNUNET_FS_URI_KSK_INFIX,
- pos) ) ||
- (s[slen - 1] == '+') ||
+ pos) ) )
+ return NULL; /* not KSK URI */
+ if ( (s[slen - 1] == '+') ||
(s[pos] == '+') )
- return NULL; /* no keywords / malformed */
-
+ {
+ *emsg = GNUNET_strdup (_("Malformed KSK URI (must not begin or end with `+')"));
+ return NULL;
+ }
max = 1;
saw_quote = 0;
for (i = pos; i < slen; i++)
{
max++;
if (s[i - 1] == '+')
- return NULL; /* "++" not allowed */
+ {
+ *emsg = GNUNET_strdup (_("`++' not allowed in KSK URI"));
+ return NULL;
+ }
}
}
if (saw_quote == 1)
- return NULL; /* quotes not balanced */
+ {
+ *emsg = GNUNET_strdup (_("Quotes not balanced in KSK URI"));
+ return NULL;
+ }
iret = max;
dup = GNUNET_strdup (s);
keywords = GNUNET_malloc (max * sizeof (char *));
{
keywords[--max] = percent_decode_keyword (&dup[i + 1], emsg);
if (NULL == keywords[max])
- goto CLEANUP;
+ goto CLEANUP;
dup[i] = '\0';
}
}
pos = strlen (GNUNET_FS_URI_PREFIX GNUNET_FS_URI_SKS_INFIX);
if ( (slen <= pos) ||
(0 != strncmp (s, GNUNET_FS_URI_PREFIX GNUNET_FS_URI_SKS_INFIX,
- pos) ) ||
- (slen < pos + sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) + 1) ||
+ pos) ) )
+ return NULL; /* not an SKS URI */
+ if ( (slen < pos + sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded)) ||
(s[pos + sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) - 1] != '/') )
- return NULL;
+ {
+ *emsg = GNUNET_strdup (_("Malformed SKS URI"));
+ return NULL;
+ }
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))
- return NULL;
+ {
+ *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;
struct GNUNET_FS_Uri *ret;
struct FileIdentifier fi;
unsigned int pos;
+ unsigned long long flen;
size_t slen;
char h1[sizeof(struct GNUNET_CRYPTO_HashAsciiEncoded)];
char h2[sizeof(struct GNUNET_CRYPTO_HashAsciiEncoded)];
pos = strlen (GNUNET_FS_URI_PREFIX GNUNET_FS_URI_CHK_INFIX);
if ( (slen < pos + 2 * sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) + 1) ||
(0 != strncmp (s, GNUNET_FS_URI_PREFIX GNUNET_FS_URI_CHK_INFIX,
- pos) ) ||
- (s[pos + sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) - 1] != '.') ||
+ pos) ) )
+ return NULL; /* not a CHK URI */
+ if ( (s[pos + sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) - 1] != '.') ||
(s[pos + sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) * 2 - 1] != '.') )
- return NULL;
-
+ {
+ *emsg = GNUNET_strdup (_("Malformed CHK URI"));
+ return NULL;
+ }
memcpy (h1,
&s[pos],
sizeof(struct GNUNET_CRYPTO_HashAsciiEncoded));
&fi.chk.query)) ||
(1 != SSCANF (&s[pos + sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) * 2],
"%llu",
- &fi.file_length)))
- return NULL;
- fi.file_length = GNUNET_htonll (fi.file_length);
-
+ &flen)) )
+ {
+ *emsg = GNUNET_strdup (_("Malformed CHK URI"));
+ return NULL;
+ }
+ fi.file_length = GNUNET_htonll (flen);
ret = GNUNET_malloc (sizeof(struct GNUNET_FS_Uri));
ret->type = chk;
ret->data.chk = fi;
/**
* Convert string back to binary data.
*
- * @param input '\0'-terminated string
+ * @param input '\\0'-terminated string
* @param data where to write binary data
* @param size how much data should be converted
* @return number of characters processed from input,
bits = 0;
hbits = 0;
len = 0;
- pos = 0;
for (pos = 0; pos < size; pos++)
{
while (hbits < 8)
unsigned int pos;
unsigned int npos;
unsigned long long exptime;
+ unsigned long long flen;
struct GNUNET_TIME_Absolute et;
struct GNUNET_CRYPTO_RsaSignature sig;
struct LocUriAssembly ass;
int ret;
size_t slen;
- char *addr;
GNUNET_assert (s != NULL);
slen = strlen (s);
pos = strlen (GNUNET_FS_URI_PREFIX GNUNET_FS_URI_LOC_INFIX);
if ( (slen < pos + 2 * sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) + 1) ||
(0 != strncmp (s, GNUNET_FS_URI_PREFIX GNUNET_FS_URI_LOC_INFIX,
- pos) ) ||
- (s[pos + sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) - 1] != '.') ||
+ pos) ) )
+ return NULL; /* not an SKS URI */
+ if ( (s[pos + sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) - 1] != '.') ||
(s[pos + sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) * 2 - 1] != '.') )
- return NULL;
-
+ {
+ *emsg = GNUNET_strdup (_("SKS URI malformed"));
+ return NULL;
+ }
memcpy (h1,
&s[pos],
sizeof(struct GNUNET_CRYPTO_HashAsciiEncoded));
&ass.fi.chk.query)) ||
(1 != SSCANF (&s[pos + sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) * 2],
"%llu",
- &ass.fi.file_length)) )
- return NULL;
- ass.fi.file_length = GNUNET_htonll (ass.fi.file_length);
+ &flen)) )
+ {
+ *emsg = GNUNET_strdup (_("SKS URI malformed"));
+ return NULL;
+ }
+ ass.fi.file_length = GNUNET_htonll (flen);
npos = pos + sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) * 2;
while ((s[npos] != '\0') && (s[npos] != '.'))
npos++;
if (s[npos] == '\0')
- goto ERR;
+ {
+ *emsg = GNUNET_strdup (_("SKS URI malformed"));
+ goto ERR;
+ }
+ npos++;
ret = enc2bin (&s[npos],
&ass.peer,
sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded));
if (ret == -1)
- goto ERR;
+ {
+ *emsg = GNUNET_strdup (_("SKS URI malformed (could not decode public key)"));
+ goto ERR;
+ }
npos += ret;
if (s[npos++] != '.')
- goto ERR;
+ {
+ *emsg = GNUNET_strdup (_("SKS URI malformed (could not find signature)"));
+ goto ERR;
+ }
ret = enc2bin (&s[npos],
&sig,
sizeof (struct GNUNET_CRYPTO_RsaSignature));
if (ret == -1)
- goto ERR;
- npos += ret;
+ {
+ *emsg = GNUNET_strdup (_("SKS URI malformed (could not decode signature)"));
+ goto ERR;
+ }
+ npos += ret;
if (s[npos++] != '.')
- goto ERR;
+ {
+ *emsg = GNUNET_strdup (_("SKS URI malformed"));
+ goto ERR;
+ }
if (1 != SSCANF (&s[npos], "%llu", &exptime))
- goto ERR;
+ {
+ *emsg = GNUNET_strdup (_("SKS URI malformed (could not parse expiration time)"));
+ goto ERR;
+ }
ass.purpose.size = htonl(sizeof(struct LocUriAssembly));
- ass.purpose.purpose = htonl(GNUNET_SIGNATURE_PURPOSE_NAMESPACE_PLACEMENT);
+ ass.purpose.purpose = htonl(GNUNET_SIGNATURE_PURPOSE_PEER_PLACEMENT);
et.value = exptime;
ass.exptime = GNUNET_TIME_absolute_hton (et);
if (GNUNET_OK !=
- GNUNET_CRYPTO_rsa_verify (GNUNET_SIGNATURE_PURPOSE_NAMESPACE_PLACEMENT,
+ GNUNET_CRYPTO_rsa_verify (GNUNET_SIGNATURE_PURPOSE_PEER_PLACEMENT,
&ass.purpose,
&sig,
&ass.peer))
- goto ERR;
-
+ {
+ *emsg = GNUNET_strdup (_("SKS URI malformed (signature failed validation)"));
+ goto ERR;
+ }
uri = GNUNET_malloc (sizeof(struct GNUNET_FS_Uri));
uri->type = loc;
uri->data.loc.fi = ass.fi;
return uri;
ERR:
- GNUNET_free_non_null (addr);
return NULL;
}
char **emsg)
{
struct GNUNET_FS_Uri *ret;
+ char *msg;
+ if (NULL == emsg)
+ emsg = &msg;
+ *emsg = NULL;
if ( (NULL != (ret = uri_chk_parse (uri, emsg))) ||
(NULL != (ret = uri_ksk_parse (uri, emsg))) ||
(NULL != (ret = uri_sks_parse (uri, emsg))) ||
(NULL != (ret = uri_loc_parse (uri, emsg))) )
return ret;
+ if (NULL == *emsg)
+ *emsg = GNUNET_strdup (_("Unrecognized URI type"));
+ if (emsg == &msg)
+ GNUNET_free (msg);
return NULL;
}
}
+/**
+ * Obtain the expiration of the LOC URI.
+ *
+ * @param uri location URI to get the expiration from
+ * @return expiration time of the URI
+ */
+struct GNUNET_TIME_Absolute
+GNUNET_FS_uri_loc_get_expiration (const struct GNUNET_FS_Uri *uri)
+{
+ GNUNET_assert (uri->type == loc);
+ return uri->data.loc.expirationTime;
+}
+
+
+
/**
* Obtain the URI of the content itself.
*
/**
* Construct a location URI (this peer will be used for the location).
*
- * @param baseURI content offered by the sender
+ * @param baseUri content offered by the sender
* @param cfg configuration information (used to find our hostkey)
* @param expiration_time how long will the content be offered?
* @return the location URI, NULL on error
GNUNET_free (keyfile);
GNUNET_CRYPTO_rsa_key_get_public (my_private_key, &my_public_key);
ass.purpose.size = htonl(sizeof(struct LocUriAssembly));
- ass.purpose.purpose = htonl(GNUNET_SIGNATURE_PURPOSE_NAMESPACE_PLACEMENT);
+ 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;
}
+/**
+ * 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;
+}
+
+
/**
* Canonicalize a keyword.
*
rpos = in;
while ('\0' != *rpos)
{
- switch (tolower(*rpos))
+ switch (tolower( (unsigned char) *rpos))
{
case 'a':
case 'e':
case 'y':
case 'z':
/* convert characters listed above to lower case */
- *wpos = tolower(*rpos);
+ *wpos = tolower( (unsigned char)*rpos);
wpos++;
case '!':
case '.':
/* keep characters listed above without changes */
*wpos = *rpos;
wpos++;
+ break;
default:
/* replace characters listed above with '_' */
*wpos = '_';
const char *kp;
char **kl;
+ if ( (u1 == NULL) && (u2 == NULL) )
+ return NULL;
+ if (u1 == NULL)
+ return GNUNET_FS_uri_dup (u2);
+ if (u2 == NULL)
+ return GNUNET_FS_uri_dup (u1);
if ( (u1->type != ksk) ||
(u2->type != ksk) )
{
struct GNUNET_FS_Uri *ret;
unsigned int i;
+ if (uri == NULL)
+ return NULL;
ret = GNUNET_malloc (sizeof (struct GNUNET_FS_Uri));
memcpy (ret, uri, sizeof (struct GNUNET_FS_Uri));
switch (ret->type)
pos = searchString;
while ('\0' != *pos)
{
- if ((saw_quote == 0) && (isspace (*pos)))
+ if ((saw_quote == 0) && (isspace ((unsigned char) *pos)))
{
inWord = 0;
}
pos = searchString;
while ('\0' != *pos)
{
- if ((saw_quote == 0) && (isspace (*pos)))
+ if ((saw_quote == 0) && (isspace ( (unsigned char) *pos)))
{
inWord = 0;
*pos = '\0';
emsg = NULL;
if ( (argc == 1) &&
(strlen(argv[0]) > strlen(GNUNET_FS_URI_PREFIX)) &&
- (strncmp(argv[0], GNUNET_FS_URI_PREFIX, strlen(GNUNET_FS_URI_PREFIX)) ) &&
+ (0 == strncmp(argv[0], GNUNET_FS_URI_PREFIX, strlen(GNUNET_FS_URI_PREFIX)) ) &&
(NULL != (uri = GNUNET_FS_uri_parse(argv[0], &emsg)) ) )
return uri;
GNUNET_free_non_null (emsg);
* Adds it to the URI.
*
* @param cls URI to update
- * @param type type of the meta data
- * @param data value of the meta data
- * @return GNUNET_OK (always)
+ * @param plugin_name name of the plugin that produced this value;
+ * special values can be used (i.e. '<zlib>' for zlib being
+ * 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 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
+ * @param data_len number of bytes in data
+ * @return 0 (always)
*/
static int
gather_uri_data (void *cls,
- EXTRACTOR_KeywordType type,
- const char *data)
+ const char *plugin_name,
+ enum EXTRACTOR_MetaType type,
+ enum EXTRACTOR_MetaFormat format,
+ const char *data_mime_type,
+ const char *data,
+ size_t data_len)
{
struct GNUNET_FS_Uri *uri = cls;
char *nkword;
int j;
+ 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;
strcpy (nkword, " "); /* not mandatory */
strcat (nkword, data);
uri->data.ksk.keywords[uri->data.ksk.keywordCount++] = nkword;
- return GNUNET_OK;
+ return 0;
}
* Construct a keyword-URI from meta-data (take all entries
* in the meta-data and construct one large keyword URI
* that lists all keywords that can be found in the meta-data).
- * @deprecated
+ *
+ * @param md metadata to use
+ * @return NULL on error, otherwise a KSK URI
*/
struct GNUNET_FS_Uri *
GNUNET_FS_uri_ksk_create_from_meta_data (const struct GNUNET_CONTAINER_MetaData *md)
ret->data.ksk.keywords = NULL;
ret->data.ksk.keywords
= GNUNET_malloc (sizeof (char *) *
- GNUNET_CONTAINER_meta_data_get_contents (md, NULL, NULL));
- GNUNET_CONTAINER_meta_data_get_contents (md, &gather_uri_data, ret);
+ GNUNET_CONTAINER_meta_data_iterate (md, NULL, NULL));
+ GNUNET_CONTAINER_meta_data_iterate (md, &gather_uri_data, ret);
return ret;
}
static int
needs_percent (char c)
{
- return (!((isalnum (c)) ||
+ return (!((isalnum ( (unsigned char) c)) ||
(c == '-') || (c == '_') || (c == '.') || (c == '~')));
}
}
}
if (hbits > 0)
- ret[len++] = tbl[bits & 63];
+ ret[len] = tbl[bits & 63];
return ret;
}
projects / oweals / gnunet.git / blobdiff