-added core functionality of the messenger service

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

formatting messenger code

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

-completed core functionality of messenger service

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

-code cleanup and reuse

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

+added structure to memberships of rooms

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

-implemented member permission checks and deletion of messages

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

-moved solving requests out of updating last messages (also forward before update)

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

-reduced complexity of permisson check and changed load/save of rooms

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

-added save/load for accessed keys and basement peers of a room

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

-implemented save/load for members with their history and session

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

-abstracted management of egos and contacts

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

-fix warning

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

-abstracted management of members

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

-fixed and adjusted test case

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

-separated handling of direct and anonymous contacts

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

-messenger added member-sessions which fix multiple edge cases, also additional cleanup

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

-updated docs and fixed memory leak

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

-changed info messages and added protocol version exchange

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

-adjusted client api to use contacts from sessions

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

-added more logging and fixed wrong session usage

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

-adjusted comm0 test case and removed adding members from checking messages

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

-fixed test-case for peer exchange

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

-getting multiple peers connected in test-case with cadet

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

-fixed wrong assert and added tunnel version check

-simplified handling and forwarding

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

-fixed merging last messages and cycling info messages

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

-automated adding sessions and members

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

-corrected use of identity keys and signatures

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

-adding local joining on entering external room

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

-fixed test-case comm0

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

-added more test-cases with generic setup

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

-fixed multiple simultaneous channels blocking each other

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

-making test-cases more precise

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

-added check of members in test-cases, reduced merge messages

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

-unified delayed operations: requests, deletions and merges

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

-finished handling of operations

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

-fixed member session historystorage, added request permission check and padding for transmission

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

-improved padding and removed automatic recursive requests

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

-implemented filter for sending messages and added private messages to API level

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

-wrong setups fixed with proper ego lookups

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

-fixed problem with anonymous ego and changed to discrete-level padding

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

-added links to replace deleted messages, added local deletion and fixed anonymous id changing

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

-added session completion and removal through completion process

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

1 files changed, 164 insertions, 50 deletions

diff --git a/src/messenger/messenger_api_room.c b/src/messenger/messenger_api_room.c
index 5fedf1a78..df141ca12 100644
--- a/src/messenger/messenger_api_room.c
+++ b/src/messenger/messenger_api_room.c
@@ -1,6 +1,6 @@
 /*
    This file is part of GNUnet.
-   Copyright (C) 2020 GNUnet e.V.
+   Copyright (C) 2020--2021 GNUnet e.V.
 
    GNUnet is free software: you can redistribute it and/or modify it
    under the terms of the GNU Affero General Public License as published
@@ -30,6 +30,8 @@
 struct GNUNET_MESSENGER_Room*
 create_room (struct GNUNET_MESSENGER_Handle *handle, const struct GNUNET_HashCode *key)
 {
+  GNUNET_assert((handle) && (key));
+
   struct GNUNET_MESSENGER_Room *room = GNUNET_new(struct GNUNET_MESSENGER_Room);
 
   room->handle = handle;
@@ -38,11 +40,10 @@ create_room (struct GNUNET_MESSENGER_Handle *handle, const struct GNUNET_HashCod
   room->opened = GNUNET_NO;
   room->contact_id = NULL;
 
-  room->members = GNUNET_CONTAINER_multishortmap_create (8, GNUNET_NO);
-
   init_list_tunnels (&(room->entries));
 
   room->messages = GNUNET_CONTAINER_multihashmap_create (8, GNUNET_NO);
+  room->members = GNUNET_CONTAINER_multishortmap_create (8, GNUNET_NO);
 
   return room;
 }
@@ -50,9 +51,10 @@ create_room (struct GNUNET_MESSENGER_Handle *handle, const struct GNUNET_HashCod
 static int
 iterate_destroy_message (void *cls, const struct GNUNET_HashCode *key, void *value)
 {
-  struct GNUNET_MESSENGER_Message *message = value;
+  struct GNUNET_MESSENGER_RoomMessageEntry *entry = value;
 
-  destroy_message (message);
+  destroy_message (entry->message);
+  GNUNET_free(entry);
 
   return GNUNET_YES;
 }
@@ -60,8 +62,7 @@ iterate_destroy_message (void *cls, const struct GNUNET_HashCode *key, void *val
 void
 destroy_room (struct GNUNET_MESSENGER_Room *room)
 {
-  if (room->members)
-    GNUNET_CONTAINER_multishortmap_destroy (room->members);
+  GNUNET_assert(room);
 
   clear_list_tunnels (&(room->entries));
 
@@ -72,6 +73,9 @@ destroy_room (struct GNUNET_MESSENGER_Room *room)
     GNUNET_CONTAINER_multihashmap_destroy (room->messages);
   }
 
+  if (room->members)
+    GNUNET_CONTAINER_multishortmap_destroy (room->members);
+
   if (room->contact_id)
     GNUNET_free(room->contact_id);
 
@@ -81,65 +85,111 @@ destroy_room (struct GNUNET_MESSENGER_Room *room)
 const struct GNUNET_MESSENGER_Message*
 get_room_message (const struct GNUNET_MESSENGER_Room *room, const struct GNUNET_HashCode *hash)
 {
-  return GNUNET_CONTAINER_multihashmap_get (room->messages, hash);
+  GNUNET_assert((room) && (hash));
+
+  struct GNUNET_MESSENGER_RoomMessageEntry *entry = GNUNET_CONTAINER_multihashmap_get (
+      room->messages, hash
+  );
+
+  return (entry? entry->message : NULL);
+}
+
+struct GNUNET_MESSENGER_Contact*
+get_room_sender (const struct GNUNET_MESSENGER_Room *room, const struct GNUNET_HashCode *hash)
+{
+  GNUNET_assert((room) && (hash));
+
+  struct GNUNET_MESSENGER_RoomMessageEntry *entry = GNUNET_CONTAINER_multihashmap_get (
+      room->messages, hash
+  );
+
+  return (entry? entry->sender : NULL);
 }
 
 static void
-handle_join_message (struct GNUNET_MESSENGER_Room *room, const struct GNUNET_MESSENGER_Message *message,
-                     const struct GNUNET_HashCode *hash)
+handle_join_message (struct GNUNET_MESSENGER_Room *room, struct GNUNET_MESSENGER_Contact *sender,
+                     const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
 {
-  struct GNUNET_MESSENGER_Contact *contact = get_handle_contact_by_pubkey (room->handle, &(message->body.join.key));
+  if (!sender)
+  {
+    struct GNUNET_MESSENGER_ContactStore *store = get_handle_contact_store(room->handle);
+    struct GNUNET_HashCode context;
+
+    get_context_from_member(&(room->key), &(message->header.sender_id), &context);
+
+    sender = get_store_contact(store, &context, &(message->body.join.key));
+  }
 
-  if (contact)
-    GNUNET_CONTAINER_multishortmap_put (room->members, &(message->header.sender_id), contact,
-                                        GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
+  if ((GNUNET_YES != GNUNET_CONTAINER_multishortmap_contains_value(room->members, &(message->header.sender_id), sender)) &&
+      (GNUNET_OK == GNUNET_CONTAINER_multishortmap_put(room->members, &(message->header.sender_id), sender,
+                                                       GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE)))
+    increase_contact_rc(sender);
 }
 
 static void
-handle_leave_message (struct GNUNET_MESSENGER_Room *room, const struct GNUNET_MESSENGER_Message *message,
-                      const struct GNUNET_HashCode *hash)
+handle_leave_message (struct GNUNET_MESSENGER_Room *room, struct GNUNET_MESSENGER_Contact *sender,
+                      const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
 {
-  GNUNET_CONTAINER_multishortmap_remove_all (room->members, &(message->header.sender_id));
+  if ((!sender) ||
+      (GNUNET_YES != GNUNET_CONTAINER_multishortmap_remove(room->members, &(message->header.sender_id), sender)))
+    return;
+
+  struct GNUNET_HashCode context;
+  get_context_from_member(&(room->key), &(message->header.sender_id), &context);
+
+  struct GNUNET_MESSENGER_ContactStore *store = get_handle_contact_store(room->handle);
+
+  if (GNUNET_YES == decrease_contact_rc(sender))
+    remove_store_contact(store, sender, &context);
 }
 
 static void
-handle_name_message (struct GNUNET_MESSENGER_Room *room, const struct GNUNET_MESSENGER_Message *message,
-                     const struct GNUNET_HashCode *hash)
+handle_name_message (struct GNUNET_MESSENGER_Room *room, struct GNUNET_MESSENGER_Contact *sender,
+                     const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
 {
-  struct GNUNET_MESSENGER_Contact *contact = GNUNET_CONTAINER_multishortmap_get (room->members,
-                                                                                 &(message->header.sender_id));
+  if (!sender)
+    return;
 
-  if (contact)
-    set_contact_name (contact, message->body.name.name);
+  set_contact_name (sender, message->body.name.name);
 }
 
 static void
-handle_key_message (struct GNUNET_MESSENGER_Room *room, const struct GNUNET_MESSENGER_Message *message,
-                    const struct GNUNET_HashCode *hash)
+handle_key_message (struct GNUNET_MESSENGER_Room *room, struct GNUNET_MESSENGER_Contact *sender,
+                    const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
 {
-  struct GNUNET_MESSENGER_Contact *contact = GNUNET_CONTAINER_multishortmap_get (room->members,
-                                                                                 &(message->header.sender_id));
+  if (!sender)
+    return;
+
+  struct GNUNET_HashCode context;
+  get_context_from_member(&(room->key), &(message->header.sender_id), &context);
 
-  if (contact)
-    swap_handle_contact_by_pubkey (room->handle, contact, &(message->body.key.key));
+  struct GNUNET_MESSENGER_ContactStore *store = get_handle_contact_store(room->handle);
+
+  update_store_contact(store, sender, &context, &context, &(message->body.key.key));
 }
 
 static void
-handle_id_message (struct GNUNET_MESSENGER_Room *room, const struct GNUNET_MESSENGER_Message *message,
-                   const struct GNUNET_HashCode *hash)
+handle_id_message (struct GNUNET_MESSENGER_Room *room, struct GNUNET_MESSENGER_Contact *sender,
+                   const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
 {
-  struct GNUNET_MESSENGER_Contact *contact = GNUNET_CONTAINER_multishortmap_get (room->members,
-                                                                                 &(message->header.sender_id));
+  if ((!sender) ||
+      (GNUNET_YES != GNUNET_CONTAINER_multishortmap_remove(room->members, &(message->header.sender_id), sender)) ||
+      (GNUNET_OK != GNUNET_CONTAINER_multishortmap_put(room->members, &(message->body.id.id), sender,
+                                                       GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE)))
+    return;
+
+  struct GNUNET_HashCode context, next_context;
+  get_context_from_member(&(room->key), &(message->header.sender_id), &context);
+  get_context_from_member(&(room->key), &(message->body.id.id), &next_context);
 
-  if ((contact) && (GNUNET_OK
-      == GNUNET_CONTAINER_multishortmap_put (room->members, &(message->body.id.id), contact,
-                                             GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST)))
-    GNUNET_CONTAINER_multishortmap_remove (room->members, &(message->header.sender_id), contact);
+  struct GNUNET_MESSENGER_ContactStore *store = get_handle_contact_store(room->handle);
+
+  update_store_contact(store, sender, &context, &next_context, get_contact_key(sender));
 }
 
 static void
-handle_miss_message (struct GNUNET_MESSENGER_Room *room, const struct GNUNET_MESSENGER_Message *message,
-                     const struct GNUNET_HashCode *hash)
+handle_miss_message (struct GNUNET_MESSENGER_Room *room, struct GNUNET_MESSENGER_Contact *sender,
+                     const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
 {
   if ((room->contact_id) && (0 == GNUNET_memcmp(&(message->header.sender_id), room->contact_id)))
   {
@@ -150,9 +200,25 @@ handle_miss_message (struct GNUNET_MESSENGER_Room *room, const struct GNUNET_MES
   }
 }
 
+static void
+handle_delete_message (struct GNUNET_MESSENGER_Room *room, struct GNUNET_MESSENGER_Contact *sender,
+                     const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
+{
+  struct GNUNET_MESSENGER_RoomMessageEntry *entry = GNUNET_CONTAINER_multihashmap_get (
+      room->messages, &(message->body.delete.hash)
+  );
+
+  if ((entry) && ((entry->sender == sender) || (get_handle_contact (room->handle, &(room->key)) == sender)) &&
+      (GNUNET_YES == GNUNET_CONTAINER_multihashmap_remove (room->messages, &(message->body.delete.hash), entry)))
+  {
+    destroy_message (entry->message);
+    GNUNET_free(entry);
+  }
+}
+
 void
-handle_room_message (struct GNUNET_MESSENGER_Room *room, const struct GNUNET_MESSENGER_Message *message,
-                     const struct GNUNET_HashCode *hash)
+handle_room_message (struct GNUNET_MESSENGER_Room *room, struct GNUNET_MESSENGER_Contact *sender,
+                     const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
 {
   if (GNUNET_NO != GNUNET_CONTAINER_multihashmap_contains (room->messages, hash))
     return;
@@ -160,30 +226,78 @@ handle_room_message (struct GNUNET_MESSENGER_Room *room, const struct GNUNET_MES
   switch (message->header.kind)
   {
   case GNUNET_MESSENGER_KIND_JOIN:
-    handle_join_message (room, message, hash);
+    handle_join_message (room, sender, message, hash);
     break;
   case GNUNET_MESSENGER_KIND_LEAVE:
-    handle_leave_message (room, message, hash);
+    handle_leave_message (room, sender, message, hash);
     break;
   case GNUNET_MESSENGER_KIND_NAME:
-    handle_name_message (room, message, hash);
+    handle_name_message (room, sender, message, hash);
     break;
   case GNUNET_MESSENGER_KIND_KEY:
-    handle_key_message (room, message, hash);
+    handle_key_message (room, sender, message, hash);
     break;
   case GNUNET_MESSENGER_KIND_ID:
-    handle_id_message (room, message, hash);
+    handle_id_message (room, sender, message, hash);
     break;
   case GNUNET_MESSENGER_KIND_MISS:
-    handle_miss_message (room, message, hash);
+    handle_miss_message (room, sender, message, hash);
+    break;
+  case GNUNET_MESSENGER_KIND_DELETE:
+    handle_delete_message (room, sender, message, hash);
     break;
   default:
     break;
   }
 
-  struct GNUNET_MESSENGER_Message *clone = copy_message (message);
+  struct GNUNET_MESSENGER_RoomMessageEntry *entry = GNUNET_new(struct GNUNET_MESSENGER_RoomMessageEntry);
+
+  if (!entry)
+    return;
+
+  entry->sender = sender;
+  entry->message = copy_message (message);
 
-  if (GNUNET_OK != GNUNET_CONTAINER_multihashmap_put (room->messages, hash, clone,
+  if (GNUNET_OK != GNUNET_CONTAINER_multihashmap_put (room->messages, hash, entry,
                                                       GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST))
-    destroy_message (clone);
+  {
+    destroy_message (entry->message);
+    GNUNET_free(entry);
+  }
+}
+
+struct GNUNET_MESSENGER_MemberCall
+{
+  struct GNUNET_MESSENGER_Room *room;
+  GNUNET_MESSENGER_MemberCallback callback;
+  void *cls;
+};
+
+static int
+iterate_local_members (void* cls, const struct GNUNET_ShortHashCode *key, void *value)
+{
+  struct GNUNET_MESSENGER_MemberCall *call = cls;
+  struct GNUNET_MESSENGER_Contact *contact = value;
+
+  return call->callback(call->cls, call->room, contact);
+}
+
+int
+iterate_room_members (struct GNUNET_MESSENGER_Room *room, GNUNET_MESSENGER_MemberCallback callback,
+                      void* cls)
+{
+  GNUNET_assert(room);
+
+  if (!callback)
+    return GNUNET_CONTAINER_multishortmap_iterate(room->members, NULL, NULL);
+
+  struct GNUNET_MESSENGER_MemberCall call;
+
+  call.room = room;
+  call.callback = callback;
+  call.cls = cls;
+
+  GNUNET_assert(callback);
+
+  return GNUNET_CONTAINER_multishortmap_iterate(room->members, iterate_local_members, &call);
 }