*/
/**
+ *
* @file gns/gnunet-service-gns.c
* @brief GNUnet GNS service
* @author Martin Schanzenbach
#include "gnunet_transport_service.h"
#include "gnunet_dns_service.h"
#include "gnunet_dnsparser_lib.h"
+#include "gnunet_dht_service.h"
#include "gnunet_namestore_service.h"
#include "gnunet_gns_service.h"
+#include "block_gns.h"
#include "gns.h"
+#include "gnunet-service-gns_resolver.h"
+#include "gnunet-service-gns_interceptor.h"
+/* FIXME move to proper header in include */
+#define GNUNET_MESSAGE_TYPE_GNS_LOOKUP 23
+#define GNUNET_MESSAGE_TYPE_GNS_LOOKUP_RESULT 24
+#define GNUNET_MESSAGE_TYPE_GNS_SHORTEN 25
+#define GNUNET_MESSAGE_TYPE_GNS_SHORTEN_RESULT 26
+#define GNUNET_MESSAGE_TYPE_GNS_GET_AUTH 27
+#define GNUNET_MESSAGE_TYPE_GNS_GET_AUTH_RESULT 28
-/* TODO into gnunet_protocols */
-#define GNUNET_MESSAGE_TYPE_GNS_CLIENT_LOOKUP 23
-#define GNUNET_MESSAGE_TYPE_GNS_CLIENT_RESULT 24
-struct GNUNET_GNS_QueryRecordList
+/**
+ * Handle to a shorten operation from api
+ */
+struct ClientShortenHandle
{
- /**
- * DLL
- */
- struct GNUNET_GNS_QueryRecordList * next;
- struct GNUNET_GNS_QueryRecordList * prev;
+ /* the requesting client that */
+ struct GNUNET_SERVER_Client *client;
+
+ /* request id */
+ uint64_t unique_id;
+
+ /* request type */
+ enum GNUNET_GNS_RecordType type;
+
+ /* name to shorten */
+ char* name;
- struct GNUNET_DNSPARSER_Record * record;
};
+
/**
- * A result list for namestore queries
+ * Handle to a get auhtority operation from api
*/
-struct GNUNET_GNS_PendingQuery
+struct ClientGetAuthHandle
{
- /* the answer packet */
- struct GNUNET_DNSPARSER_Packet *answer;
+ /* the requesting client that */
+ struct GNUNET_SERVER_Client *client;
- /* records to put into answer packet */
- struct GNUNET_GNS_QueryRecordList * records_head;
- struct GNUNET_GNS_QueryRecordList * records_tail;
+ /* request id */
+ uint64_t unique_id;
- int num_records;
- int num_authority_records; //FIXME are all of our replies auth?
-
- char *name;
- uint16_t type;
- /* the dns request id */
- int id; // FIXME can handle->request_id also be used here?
+ /* name to lookup authority */
+ char* name;
+
+};
- /* the request handle to reply to */
- struct GNUNET_DNS_RequestHandle *request_handle;
- /* hast this query been answered? */
- int answered;
+/**
+ * Handle to a lookup operation from api
+ */
+struct ClientLookupHandle
+{
+ /* the requesting client that */
+ struct GNUNET_SERVER_Client *client;
+
+ /* request id */
+ uint64_t unique_id;
+
+ /* request type */
+ enum GNUNET_GNS_RecordType type;
+
+ /* the name to look up */
+ char* name; //Needed?
};
+/**
+ * Our handle to the DHT
+ */
+static struct GNUNET_DHT_Handle *dht_handle;
/**
- * Our handle to the DNS handler library
+ * Our zone's private key
*/
-struct GNUNET_DNS_Handle *dns_handle;
-struct GNUNET_DNS_Handle *dns_res_handle;
+struct GNUNET_CRYPTO_RsaPrivateKey *zone_key;
/**
* Our handle to the namestore service
+ * FIXME maybe need a second handle for iteration
*/
struct GNUNET_NAMESTORE_Handle *namestore_handle;
+/**
+ * Handle to iterate over our authoritative zone in namestore
+ */
+struct GNUNET_NAMESTORE_ZoneIterator *namestore_iter;
+
/**
* The configuration the GNS service is running with
*/
/**
* Our zone hash
*/
-const GNUNET_HashCode *my_zone;
+struct GNUNET_CRYPTO_ShortHashCode zone_hash;
+
+/**
+ * Useful for zone update for DHT put
+ */
+static int num_public_records = 3600;
+
+/**
+ * update interval in seconds
+ */
+static unsigned long long int dht_max_update_interval;
+
+/* dht update interval FIXME define? */
+static struct GNUNET_TIME_Relative dht_update_interval;
+
+/* zone update task */
+GNUNET_SCHEDULER_TaskIdentifier zone_update_taskid = GNUNET_SCHEDULER_NO_TASK;
+
+/* automatic pkey import for name shortening */
+static int auto_import_pkey;
+
+/* lookup timeout */
+static struct GNUNET_TIME_Relative default_lookup_timeout;
+
+/**
+ * Continue shutdown
+ */
+static void
+on_resolver_cleanup(void)
+{
+ GNUNET_NAMESTORE_disconnect(namestore_handle, 1);
+ GNUNET_DHT_disconnect(dht_handle);
+}
/**
* Task run during shutdown.
static void
shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- GNUNET_DNS_disconnect(dns_handle);
- GNUNET_NAMESTORE_disconnect(namestore_handle, 0);
+
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Shutting down!");
+ /* Kill zone task for it may make the scheduler hang */
+ if (zone_update_taskid)
+ GNUNET_SCHEDULER_cancel(zone_update_taskid);
+
+ GNUNET_SERVER_notification_context_destroy (nc);
+
+ gns_interceptor_stop();
+ gns_resolver_cleanup(&on_resolver_cleanup);
+
}
+
/**
- * Phase 2 of resolution.
+ * Method called periodicattluy that triggers
+ * iteration over root zone
+ *
+ * @param cls closure
+ * @param tc task context
*/
-void
-lookup_dht()
+static void
+update_zone_dht_next(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
+ GNUNET_NAMESTORE_zone_iterator_next(namestore_iter);
}
-void
-reply_to_dns(struct GNUNET_GNS_PendingQuery *answer)
+/**
+ * Continuation for DHT put
+ *
+ * @param cls closure
+ * @param tc task context
+ */
+static void
+record_dht_put(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "put request transmitted\n");
+}
+
+/* prototype */
+static void
+update_zone_dht_start(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
+
+/**
+ * Function used to put all records successively into the DHT.
+ *
+ * @param cls the closure (NULL)
+ * @param key the public key of the authority (ours)
+ * @param expiration lifetime of the namestore entry
+ * @param name the name of the records
+ * @param rd_count the number of records in data
+ * @param rd the record data
+ * @param signature the signature for the record data
+ */
+static void
+put_gns_record(void *cls,
+ const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *key,
+ struct GNUNET_TIME_Absolute expiration,
+ const char *name,
+ unsigned int rd_count,
+ const struct GNUNET_NAMESTORE_RecordData *rd,
+ const struct GNUNET_CRYPTO_RsaSignature *signature)
{
- struct GNUNET_GNS_QueryRecordList *i;
- struct GNUNET_DNSPARSER_Packet *packet;
- struct GNUNET_DNSPARSER_Flags dnsflags;
- int j;
- size_t len;
- int ret;
- char *buf;
-
- packet = GNUNET_malloc(sizeof(struct GNUNET_DNSPARSER_Packet));
- packet->answers =
- GNUNET_malloc(sizeof(struct GNUNET_DNSPARSER_Record) * answer->num_records);
- len = sizeof(struct GNUNET_DNSPARSER_Record*);
- j = 0;
- for (i=answer->records_head; i != NULL; i=i->next)
+ struct GNSNameRecordBlock *nrb;
+ struct GNUNET_CRYPTO_ShortHashCode name_hash;
+ GNUNET_HashCode xor_hash;
+ GNUNET_HashCode name_hash_double;
+ GNUNET_HashCode zone_hash_double;
+ struct GNUNET_CRYPTO_HashAsciiEncoded xor_hash_string;
+ uint32_t rd_payload_length;
+ char* nrb_data = NULL;
+ size_t namelen;
+
+ /* we're done */
+ if (NULL == name)
{
- GNUNET_log(GNUNET_ERROR_TYPE_INFO,
- "Adding %s to DNS response\n", i->record->name);
- memcpy(&packet->answers[j],
- i->record,
- sizeof (struct GNUNET_DNSPARSER_Record));
- GNUNET_free(i->record);
- j++;
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Zone iteration finished. Rescheduling put in %ds\n",
+ dht_max_update_interval);
+ zone_update_taskid = GNUNET_SCHEDULER_add_delayed (
+ GNUNET_TIME_relative_multiply(
+ GNUNET_TIME_UNIT_SECONDS,
+ dht_max_update_interval
+ ),
+ &update_zone_dht_start,
+ NULL);
+ return;
}
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "after memcpy\n");
- /* FIXME how to handle auth, additional etc */
- packet->num_answers = answer->num_records;
- packet->num_authority_records = answer->num_authority_records;
-
- dnsflags.authoritative_answer = 1;
- dnsflags.opcode = GNUNET_DNSPARSER_OPCODE_QUERY;
- dnsflags.return_code = GNUNET_DNSPARSER_RETURN_CODE_NO_ERROR; //not sure
- dnsflags.query_or_response = 1;
- packet->flags = dnsflags;
-
- packet->id = answer->id;
- ret = GNUNET_DNSPARSER_pack (packet,
- 1024, /* FIXME magic from dns redirector */
- &buf,
- &len);
- GNUNET_log(GNUNET_ERROR_TYPE_INFO,
- "Built DNS response! (ret=%d)\n", ret);
- if (ret == GNUNET_OK)
+
+ namelen = strlen(name) + 1;
+
+ if (signature == NULL)
{
- GNUNET_log(GNUNET_ERROR_TYPE_INFO,
- "Answering DNS request\n");
- GNUNET_DNS_request_answer(answer->request_handle,
- len,
- buf);
- GNUNET_free(answer);
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Answered DNS request\n");
- //FIXME return code, free datastructures
+ GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+ "No signature for %s record data provided! Skipping...\n",
+ name);
+ zone_update_taskid = GNUNET_SCHEDULER_add_now (&update_zone_dht_next,
+ NULL);
+ return;
+
}
- else
+
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Putting records for %s into the DHT\n", name);
+
+ rd_payload_length = GNUNET_NAMESTORE_records_get_size (rd_count, rd);
+
+ nrb = GNUNET_malloc(rd_payload_length + namelen
+ + sizeof(struct GNSNameRecordBlock));
+
+ nrb->signature = *signature;
+
+ nrb->public_key = *key;
+
+ nrb->rd_count = htonl(rd_count);
+
+ memcpy(&nrb[1], name, namelen);
+
+ nrb_data = (char*)&nrb[1];
+ nrb_data += namelen;
+
+ rd_payload_length += sizeof(struct GNSNameRecordBlock) + namelen;
+
+ if (-1 == GNUNET_NAMESTORE_records_serialize (rd_count,
+ rd,
+ rd_payload_length,
+ nrb_data))
{
GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
- "Error building DNS response! (ret=%d)", ret);
+ "Record serialization failed! Skipping...\n");
+ GNUNET_free(nrb);
+ zone_update_taskid = GNUNET_SCHEDULER_add_now (&update_zone_dht_next,
+ NULL);
+ return;
}
+
+
+ /*
+ * calculate DHT key: H(name) xor H(pubkey)
+ */
+ GNUNET_CRYPTO_short_hash(name, strlen(name), &name_hash);
+ GNUNET_CRYPTO_short_hash_double (&name_hash, &name_hash_double);
+ GNUNET_CRYPTO_short_hash_double (&zone_hash, &zone_hash_double);
+ GNUNET_CRYPTO_hash_xor(&zone_hash_double, &name_hash_double, &xor_hash);
+ GNUNET_CRYPTO_hash_to_enc (&xor_hash, &xor_hash_string);
+
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "putting records for %s under key: %s with size %d\n",
+ name, (char*)&xor_hash_string, rd_payload_length);
+
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "DHT req to %d\n", DHT_OPERATION_TIMEOUT.rel_value);
+
+ GNUNET_DHT_put (dht_handle, &xor_hash,
+ DHT_GNS_REPLICATION_LEVEL,
+ GNUNET_DHT_RO_NONE,
+ GNUNET_BLOCK_TYPE_GNS_NAMERECORD,
+ rd_payload_length,
+ (char*)nrb,
+ expiration,
+ DHT_OPERATION_TIMEOUT,
+ &record_dht_put,
+ NULL); //cls for cont
+
+ num_public_records++;
+
+ /**
+ * Reschedule periodic put
+ */
+ zone_update_taskid = GNUNET_SCHEDULER_add_delayed (dht_update_interval,
+ &update_zone_dht_next,
+ NULL);
+
+ GNUNET_free(nrb);
+
}
+/**
+ * Periodically iterate over our zone and store everything in dht
+ *
+ * @param cls NULL
+ * @param tc task context
+ */
static void
-process_ns_result(void* cls, const GNUNET_HashCode *zone,
- const char *name, uint32_t record_type,
- struct GNUNET_TIME_Absolute expiration,
- enum GNUNET_NAMESTORE_RecordFlags flags,
- const struct GNUNET_NAMESTORE_SignatureLocation *sig_loc,
- size_t size, const void *data)
+update_zone_dht_start(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- struct GNUNET_GNS_PendingQuery *query;
- struct GNUNET_GNS_QueryRecordList *qrecord;
- struct GNUNET_DNSPARSER_Record *record;
- query = (struct GNUNET_GNS_PendingQuery *) cls;
- char bufA[INET6_ADDRSTRLEN];
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Scheduling DHT zone update!\n");
+ if (0 == num_public_records)
+ {
+ dht_update_interval = GNUNET_TIME_relative_multiply(
+ GNUNET_TIME_UNIT_SECONDS,
+ dht_max_update_interval);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "No records in db. Adjusted DHT update interval to %ds\n",
+ dht_max_update_interval);
+ }
+ else
+ {
+
+ dht_update_interval = GNUNET_TIME_relative_multiply(
+ GNUNET_TIME_UNIT_SECONDS,
+ (dht_max_update_interval/num_public_records));
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Adjusted DHT update interval to %ds!\n",
+ (dht_max_update_interval/num_public_records));
+ }
+ /* start counting again */
+ num_public_records = 0;
+ namestore_iter = GNUNET_NAMESTORE_zone_iteration_start (namestore_handle,
+ &zone_hash,
+ GNUNET_NAMESTORE_RF_AUTHORITY,
+ GNUNET_NAMESTORE_RF_PRIVATE,
+ &put_gns_record,
+ NULL);
+}
- if (NULL == data)
- {
- /**
- * Last result received (or none)
- * Do we have what we need to answer?
- * If not -> DHT Phase
- * FIXME free memory
- */
- GNUNET_log(GNUNET_ERROR_TYPE_INFO,
- "Namestore lookup terminated. (answered=%d)", query->answered);
- if (query->answered)
- reply_to_dns(query);
- else
- lookup_dht(); //TODO
+/* END DHT ZONE PROPAGATION */
- }
- else
+/**
+ * Send shorten response back to client
+ *
+ * @param cls the closure containing a client shorten handle
+ * @param name the shortened name result or NULL if cannot be shortened
+ */
+static void
+send_shorten_response(void* cls, const char* name)
+{
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending `%s' message with %s\n",
+ "SHORTEN_RESULT", name);
+ struct GNUNET_GNS_ClientShortenResultMessage *rmsg;
+ struct ClientShortenHandle *csh = (struct ClientShortenHandle *)cls;
+
+ if (name == NULL)
{
- /**
- * New result
- */
- GNUNET_log(GNUNET_ERROR_TYPE_INFO,
- "Processing additional result %s from namestore\n", name);
+ name = "";
+ }
- qrecord = GNUNET_malloc(sizeof(struct GNUNET_GNS_QueryRecordList));
- record = GNUNET_malloc(sizeof(struct GNUNET_DNSPARSER_Record));
- qrecord->record = record;
+ rmsg = GNUNET_malloc(sizeof(struct GNUNET_GNS_ClientShortenResultMessage)
+ + strlen(name) + 1);
+
+ rmsg->id = csh->unique_id;
+ rmsg->header.type = htons(GNUNET_MESSAGE_TYPE_GNS_SHORTEN_RESULT);
+ rmsg->header.size =
+ htons(sizeof(struct GNUNET_GNS_ClientShortenResultMessage) +
+ strlen(name) + 1);
+
+ strcpy((char*)&rmsg[1], name);
+
+ GNUNET_SERVER_notification_context_unicast (nc, csh->client,
+ (const struct GNUNET_MessageHeader *) rmsg,
+ GNUNET_NO);
+ GNUNET_SERVER_receive_done (csh->client, GNUNET_OK);
+
+ GNUNET_free(rmsg);
+ GNUNET_free_non_null(csh->name);
+ GNUNET_free(csh);
- record->name = (char*)name;
- /* FIXME for gns records this requires the dnsparser to be modified!
- * or use RAW
- * */
- if (record_type == GNUNET_DNSPARSER_TYPE_A)
- {
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "A record: %s\n", data);
- record->data.raw.data = GNUNET_malloc(sizeof (struct in_addr));
- GNUNET_assert(1 == inet_pton (AF_INET, data,
- record->data.raw.data));
- record->data.raw.data_len = sizeof (struct in_addr);
- }
- record->expiration_time = expiration;
- record->type = record_type;
- record->class = GNUNET_DNSPARSER_CLASS_INTERNET; /* srsly? */
+}
- if (flags == GNUNET_NAMESTORE_RF_AUTHORITY)
- {
- //query->num_authority_records++;
- }
+/**
+ * Handle a shorten message from the api
+ *
+ * @param cls the closure
+ * @param client the client
+ * @param message the message
+ */
+static void handle_shorten(void *cls,
+ struct GNUNET_SERVER_Client * client,
+ const struct GNUNET_MessageHeader * message)
+{
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", "SHORTEN");
- if ((0 == strcmp(query->name , name)) &&
- (query->type == record_type))
- {
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Found answer to query!\n");
- query->answered = 1;
- }
+ size_t msg_size = 0;
+ struct ClientShortenHandle *csh;
+ char name[MAX_DNS_NAME_LENGTH];
+ char* nameptr = name;
+
+ if (ntohs (message->size) < sizeof (struct GNUNET_GNS_ClientShortenMessage))
+ {
+ GNUNET_break_op (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ return;
+ }
- query->num_records++;
+ GNUNET_SERVER_notification_context_add (nc, client);
- //FIXME watch for leaks
- GNUNET_CONTAINER_DLL_insert(query->records_head,
- query->records_tail,
- qrecord);
+ struct GNUNET_GNS_ClientShortenMessage *sh_msg =
+ (struct GNUNET_GNS_ClientShortenMessage *) message;
+
+ msg_size = ntohs(message->size);
+
+ if (msg_size > GNUNET_SERVER_MAX_MESSAGE_SIZE)
+ {
+ GNUNET_break_op (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ return;
}
-}
+ csh = GNUNET_malloc(sizeof(struct ClientShortenHandle));
+ csh->client = client;
+ csh->unique_id = sh_msg->id;
+
+ GNUNET_STRINGS_utf8_tolower((char*)&sh_msg[1], &nameptr);
-void
-handle_dns_response(void *cls,
- struct GNUNET_DNS_RequestHandle *rh,
- size_t request_length,
- const char *request)
-{
- GNUNET_DNS_request_forward (rh);
+ if (strlen (name) < strlen(GNUNET_GNS_TLD)) {
+ csh->name = NULL;
+ send_shorten_response(csh, name);
+ return;
+ }
+
+ if (!is_gnunet_tld(name) && !is_zkey_tld(name))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "%s is not our domain. Returning\n", name);
+ csh->name = NULL;
+ send_shorten_response(csh, name);
+ return;
+ }
+
+ /* Start shortening */
+ if (GNUNET_YES == auto_import_pkey)
+ gns_resolver_shorten_name(zone_hash, name, zone_key,
+ &send_shorten_response, csh);
+ else
+ gns_resolver_shorten_name(zone_hash, name, NULL,
+ &send_shorten_response, csh);
}
/**
- * Phase 1 of name resolution: Lookup local namestore
- *
- * @param name the name to look up
- * @param id the id of the dns request (for the reply)
- * @param type the record type to look for
+ * Send get authority response back to client
+ *
+ * @param cls the closure containing a client get auth handle
+ * @param name the shortened name result or NULL if cannot be shortened
*/
-void
-lookup_namestore(struct GNUNET_DNS_RequestHandle *rh, char* name, uint16_t id, uint16_t type)
+static void
+send_get_auth_response(void *cls, const char* name)
{
- struct GNUNET_GNS_PendingQuery *answer;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending `%s' message with %s\n",
+ "GET_AUTH_RESULT", name);
+ struct GNUNET_GNS_ClientGetAuthResultMessage *rmsg;
+ struct ClientGetAuthHandle *cah = (struct ClientGetAuthHandle *)cls;
- /**
- * Do db lookup here. Make dht lookup if necessary
- * FIXME for now only local lookups for our zone!
- */
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "This is .gnunet (%s)!\n", name);
- answer = GNUNET_malloc(sizeof (struct GNUNET_GNS_PendingQuery));
- answer->id = id;
- answer->name = name;
- answer->type =type;
- answer->request_handle = rh;
-
- GNUNET_NAMESTORE_lookup_name(namestore_handle,
- my_zone,
- name,
- type,
- &process_ns_result,
- answer);
+ if (name == NULL)
+ {
+ name = "";
+ }
+
+ rmsg = GNUNET_malloc(sizeof(struct GNUNET_GNS_ClientGetAuthResultMessage)
+ + strlen(name) + 1);
+
+ rmsg->id = cah->unique_id;
+ rmsg->header.type = htons(GNUNET_MESSAGE_TYPE_GNS_GET_AUTH_RESULT);
+ rmsg->header.size =
+ htons(sizeof(struct GNUNET_GNS_ClientGetAuthResultMessage) +
+ strlen(name) + 1);
+
+ strcpy((char*)&rmsg[1], name);
+
+ GNUNET_SERVER_notification_context_unicast (nc, cah->client,
+ (const struct GNUNET_MessageHeader *) rmsg,
+ GNUNET_NO);
+ GNUNET_SERVER_receive_done (cah->client, GNUNET_OK);
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Cleaning up handles...\n");
+
+ GNUNET_free(rmsg);
+ GNUNET_free_non_null(cah->name);
+ GNUNET_free(cah);
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "done.\n");
+
}
+
/**
- * The DNS request handler
+ * Handle a get authority message from the api
*
- * @param cls closure
- * @param rh request handle to user for reply
- * @param request_length number of bytes in request
- * @param request udp payload of the DNS request
+ * @param cls the closure
+ * @param client the client
+ * @param message the message
*/
-void
-handle_dns_request(void *cls,
- struct GNUNET_DNS_RequestHandle *rh,
- size_t request_length,
- const char *request)
+static void handle_get_authority(void *cls,
+ struct GNUNET_SERVER_Client * client,
+ const struct GNUNET_MessageHeader * message)
{
- /**
- * parse request for tld
- */
- struct GNUNET_DNSPARSER_Packet *p;
- int namelen;
- int i;
- char *tail;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", "GET_AUTH");
+
+ size_t msg_size = 0;
+ struct ClientGetAuthHandle *cah;
+ char name[MAX_DNS_NAME_LENGTH];
+ char* nameptr = name;
+
+
+ if (ntohs (message->size) < sizeof (struct GNUNET_GNS_ClientGetAuthMessage))
+ {
+ GNUNET_break_op (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ return;
+ }
+
+ GNUNET_SERVER_notification_context_add (nc, client);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "hijacked a request...processing\n");
- p = GNUNET_DNSPARSER_parse (request, request_length);
+ struct GNUNET_GNS_ClientGetAuthMessage *sh_msg =
+ (struct GNUNET_GNS_ClientGetAuthMessage *) message;
- if (NULL == p)
+ msg_size = ntohs(message->size);
+
+ if (msg_size > GNUNET_SERVER_MAX_MESSAGE_SIZE)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Received malformed DNS packet, leaving it untouched\n");
- GNUNET_DNS_request_forward (rh);
+ GNUNET_break_op (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
}
- /**
- * Check tld and decide if we or
- * legacy dns is responsible
- */
- for (i=0;i<p->num_queries;i++)
+ GNUNET_STRINGS_utf8_tolower((char*)&sh_msg[1], &nameptr);
+
+
+ cah = GNUNET_malloc(sizeof(struct ClientGetAuthHandle));
+ cah->client = client;
+ cah->unique_id = sh_msg->id;
+
+ if (strlen(name) < strlen(GNUNET_GNS_TLD))
{
- namelen = strlen(p->queries[i].name);
-
- if (namelen < 7) /* this can't be .gnunet */
- continue;
- /**
- * FIXME off by 1?
- * Move our tld/root to config file
- * Generate fake DNS reply that replaces .gnunet with .org for testing?
- */
- tail = p->queries[i].name+(namelen-7);
- if (0 == strcmp(tail, ".gnunet"))
- {
- /* FIXME we need to answer to ALL queries in ONE response...
- * Like this we only answer one...
- */
- lookup_namestore(rh, p->queries[i].name, p->id, p->queries[i].type);
- }
- else
- {
- /**
- * This request does not concern us. Forward to real DNS.
- */
- GNUNET_log(GNUNET_ERROR_TYPE_INFO,
- "Request for %s is forwarded to DNS\n", p->queries[i].name);
- GNUNET_DNS_request_forward (rh);
- }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "%s is too short. Returning\n", name);
+ cah->name = NULL;
+ send_get_auth_response(cah, name);
+ return;
+ }
+
+ if (strcmp(name+strlen(name)-strlen(GNUNET_GNS_TLD),
+ GNUNET_GNS_TLD) != 0)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "%s is not our domain. Returning\n", name);
+ cah->name = NULL;
+ send_get_auth_response(cah, name);
+ return;
+ }
+
+ if (strcmp(name, GNUNET_GNS_TLD) == 0)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "%s is us. Returning\n", name);
+ cah->name = NULL;
+ send_get_auth_response(cah, name);
+ return;
}
+
+ cah->name = GNUNET_malloc(strlen(name)
+ - strlen(GNUNET_GNS_TLD) + 1);
+ memset(cah->name, 0,
+ strlen(name)-strlen(GNUNET_GNS_TLD) + 1);
+ memcpy(cah->name, name,
+ strlen(name)-strlen(GNUNET_GNS_TLD));
+
+ /* Start delegation resolution in our namestore */
+ gns_resolver_get_authority(zone_hash, name, &send_get_auth_response, cah);
}
-/*TODO*/
+
+/**
+ * Reply to client with the result from our lookup.
+ *
+ * @param cls the closure (our client lookup handle)
+ * @param rd_count the number of records
+ * @param rd the record data
+ */
static void
-handle_client_record_lookup(void *cls,
- struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *message)
+send_lookup_response(void* cls,
+ uint32_t rd_count,
+ const struct GNUNET_NAMESTORE_RecordData *rd)
{
+ struct ClientLookupHandle* clh = (struct ClientLookupHandle*)cls;
+ struct GNUNET_GNS_ClientLookupResultMessage *rmsg;
+ size_t len;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending `%s' message with %d results\n",
+ "LOOKUP_RESULT", rd_count);
+
+ len = GNUNET_NAMESTORE_records_get_size (rd_count, rd);
+ rmsg = GNUNET_malloc(len+sizeof(struct GNUNET_GNS_ClientLookupResultMessage));
+
+ rmsg->id = clh->unique_id;
+ rmsg->rd_count = htonl(rd_count);
+ rmsg->header.type = htons(GNUNET_MESSAGE_TYPE_GNS_LOOKUP_RESULT);
+ rmsg->header.size =
+ htons(len+sizeof(struct GNUNET_GNS_ClientLookupResultMessage));
+
+ GNUNET_NAMESTORE_records_serialize (rd_count, rd, len, (char*)&rmsg[1]);
+
+ GNUNET_SERVER_notification_context_unicast (nc, clh->client,
+ (const struct GNUNET_MessageHeader *) rmsg,
+ GNUNET_NO);
+ GNUNET_SERVER_receive_done (clh->client, GNUNET_OK);
+
+ GNUNET_free(rmsg);
+ GNUNET_free(clh->name);
+ GNUNET_free(clh);
+
}
+
/**
- * test function
+ * Handle lookup requests from client
+ *
+ * @param cls the closure
+ * @param client the client
+ * @param message the message
*/
-void
-put_some_records(void)
+static void
+handle_lookup(void *cls,
+ struct GNUNET_SERVER_Client * client,
+ const struct GNUNET_MessageHeader * message)
{
- /* put a few records into namestore */
- char* ipA = "1.2.3.4";
- char* ipB = "5.6.7.8";
- GNUNET_NAMESTORE_record_put (namestore_handle,
- my_zone,
- "alice.gnunet",
- GNUNET_GNS_RECORD_TYPE_A,
- GNUNET_TIME_absolute_get_forever(),
- GNUNET_NAMESTORE_RF_AUTHORITY,
- NULL, //sig loc
- strlen (ipA),
- ipA,
- NULL,
- NULL);
- GNUNET_NAMESTORE_record_put (namestore_handle,
- my_zone,
- "bob.gnunet",
- GNUNET_GNS_RECORD_TYPE_A,
- GNUNET_TIME_absolute_get_forever(),
- GNUNET_NAMESTORE_RF_AUTHORITY,
- NULL, //sig loc
- strlen (ipB),
- ipB,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", "LOOKUP");
+
+ size_t msg_size = 0;
+ size_t namelen;
+ char name[MAX_DNS_NAME_LENGTH];
+ struct ClientLookupHandle *clh;
+ char* nameptr = name;
+
+ if (ntohs (message->size) < sizeof (struct GNUNET_GNS_ClientLookupMessage))
+ {
+ GNUNET_break_op (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ return;
+ }
+
+ GNUNET_SERVER_notification_context_add (nc, client);
+
+ struct GNUNET_GNS_ClientLookupMessage *sh_msg =
+ (struct GNUNET_GNS_ClientLookupMessage *) message;
+
+ msg_size = ntohs(message->size);
+
+ if (msg_size > GNUNET_SERVER_MAX_MESSAGE_SIZE)
+ {
+ GNUNET_break_op (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ return;
+ }
+
+ GNUNET_STRINGS_utf8_tolower((char*)&sh_msg[1], &nameptr);
+ namelen = strlen(name)+1;
+ clh = GNUNET_malloc(sizeof(struct ClientLookupHandle));
+ clh->client = client;
+ clh->name = GNUNET_malloc(namelen);
+ strcpy(clh->name, name);
+ clh->unique_id = sh_msg->id;
+ clh->type = ntohl(sh_msg->type);
+
+ if (GNUNET_YES == auto_import_pkey)
+ {
+ gns_resolver_lookup_record(zone_hash, clh->type, name,
+ zone_key,
+ default_lookup_timeout,
+ &send_lookup_response, clh);
+ }
+ else
+ {
+ gns_resolver_lookup_record(zone_hash, clh->type, name,
NULL,
- NULL);
+ default_lookup_timeout,
+ &send_lookup_response, clh);
+ }
}
+
+
/**
* Process GNS requests.
*
- * @param cls closure
+ * @param cls closure)
* @param server the initialized server
* @param c configuration to use
*/
run (void *cls, struct GNUNET_SERVER_Handle *server,
const struct GNUNET_CONFIGURATION_Handle *c)
{
- /* The IPC message types */
- static const struct GNUNET_SERVER_MessageHandler handlers[] = {
- /* callback, cls, type, size */
- {&handle_client_record_lookup, NULL, GNUNET_MESSAGE_TYPE_GNS_CLIENT_LOOKUP,
- 0},
- {NULL, NULL, 0, 0}
- };
- nc = GNUNET_SERVER_notification_context_create (server, 1);
-
- /* FIXME - do some config parsing
- * - Maybe only hijack dns if option is set (HIJACK_DNS=1)
- */
-
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task,
- NULL);
- /**
- * Do gnunet dns init here
- */
- dns_handle = GNUNET_DNS_connect(c,
- GNUNET_DNS_FLAG_PRE_RESOLUTION,
- &handle_dns_request, /* rh */
- NULL); /* Closure */
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Initializing GNS\n");
- dns_res_handle = GNUNET_DNS_connect(c,
- GNUNET_DNS_FLAG_PRE_RESOLUTION,
- &handle_dns_response, /* rh */
- NULL); /* Closure */
+ char* keyfile;
+ struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pkey;
+ unsigned long long max_parallel_bg_queries = 0;
+ unsigned long long default_lookup_timeout_secs = 0;
+ int ignore_pending = GNUNET_NO;
- if (NULL == dns_handle)
+ static const struct GNUNET_SERVER_MessageHandler handlers[] = {
+ {&handle_shorten, NULL, GNUNET_MESSAGE_TYPE_GNS_SHORTEN, 0},
+ {&handle_lookup, NULL, GNUNET_MESSAGE_TYPE_GNS_LOOKUP, 0},
+ {&handle_get_authority, NULL, GNUNET_MESSAGE_TYPE_GNS_GET_AUTH, 0}
+ };
+
+ if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (c, "gns",
+ "ZONEKEY", &keyfile))
{
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
- "Failed to connect to the dnsservice!\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "No private key for root zone specified!\n");
+ GNUNET_SCHEDULER_shutdown(0);
+ return;
}
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Using keyfile %s for root zone.\n", keyfile);
+
+ zone_key = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
+ GNUNET_CRYPTO_rsa_key_get_public (zone_key, &pkey);
+
+ GNUNET_CRYPTO_short_hash(&pkey,
+ sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
+ &zone_hash);
+ GNUNET_free(keyfile);
+
/**
* handle to our local namestore
*/
//FIXME do error handling;
GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
"Failed to connect to the namestore!\n");
+ GNUNET_SCHEDULER_shutdown(0);
+ return;
}
+
+
- put_some_records();
+ auto_import_pkey = GNUNET_NO;
- GNUNET_SERVER_add_handlers (server, handlers);
+ if (GNUNET_YES ==
+ GNUNET_CONFIGURATION_get_value_yesno (c, "gns",
+ "AUTO_IMPORT_PKEY"))
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+ "Automatic PKEY import is enabled.\n");
+ auto_import_pkey = GNUNET_YES;
+
+ }
+
+ dht_max_update_interval = GNUNET_GNS_DHT_MAX_UPDATE_INTERVAL;
+
+ if (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_number (c, "gns",
+ "DHT_MAX_UPDATE_INTERVAL",
+ &dht_max_update_interval))
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+ "DHT zone update interval: %d\n",
+ dht_max_update_interval);
+ }
+
+ if (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_number (c, "gns",
+ "MAX_PARALLEL_BACKGROUND_QUERIES",
+ &max_parallel_bg_queries))
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+ "Number of allowed parallel background queries: %d\n",
+ max_parallel_bg_queries);
+ }
+
+ if (GNUNET_YES ==
+ GNUNET_CONFIGURATION_get_value_yesno (c, "gns",
+ "AUTO_IMPORT_CONFIRMATION_REQ"))
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+ "Auto import requires user confirmation\n");
+ ignore_pending = GNUNET_YES;
+ }
+
+ if (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_number(c, "gns",
+ "DEFAULT_LOOKUP_TIMEOUT",
+ &default_lookup_timeout_secs))
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+ "Default lookup timeout: %ds\n", default_lookup_timeout_secs);
+ default_lookup_timeout = GNUNET_TIME_relative_multiply(
+ GNUNET_TIME_UNIT_SECONDS,
+ default_lookup_timeout_secs);
+ }
+
/**
- * Esp the lookup would require to keep track of the clients' context
- * See dht.
- * GNUNET_SERVER_disconnect_notify (server, &client_disconnect, NULL);
- **/
+ * handle to the dht
+ */
+ dht_handle = GNUNET_DHT_connect(c,
+ //max_parallel_bg_queries); //FIXME get ht_len from cfg
+ 1024);
+
+ if (NULL == dht_handle)
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Could not connect to DHT!\n");
+ }
+
+ if (gns_resolver_init(namestore_handle, dht_handle, zone_hash,
+ max_parallel_bg_queries,
+ ignore_pending)
+ == GNUNET_SYSERR)
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+ "Unable to initialize resolver!\n");
+ GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
+ return;
+ }
+
+ if (GNUNET_YES ==
+ GNUNET_CONFIGURATION_get_value_yesno (c, "gns", "HIJACK_DNS"))
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+ "DNS hijacking enabled... connecting to service.\n");
+
+ if (gns_interceptor_init(zone_hash, zone_key, c) == GNUNET_SYSERR)
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+ "Failed to enable the dns interceptor!\n");
+ }
+ }
+
+ /**
+ * Schedule periodic put
+ * for our records
+ * We have roughly an hour for all records;
+ */
+ dht_update_interval = GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS,
+ 1);
+ zone_update_taskid = GNUNET_SCHEDULER_add_now (&update_zone_dht_start, NULL);
+
+ GNUNET_SERVER_add_handlers (server, handlers);
+
+ //FIXME
+ //GNUNET_SERVER_disconnect_notify (server,
+ // &client_disconnect_notification,
+ // NULL);
+
+ nc = GNUNET_SERVER_notification_context_create (server, 1);
+
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task,
+ NULL);
}
projects / oweals / gnunet.git / blobdiff