Merge branch 'master' into ENGINE-633

.gitignore

@@ -143,3 +143,6 @@ sync/.statemachines
 sync/.copy
 
 *.ignore
+
+# Will remove once KER comes in
+test/test_mails/default_keys_test_*.eml

build-mac/Subprojects/PEPSQLITE3/PEPSQLITE3.xcodeproj/project.pbxproj

@@ -7,14 +7,13 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		151672D0262F38D900E99CE5 /* sqlite3.c in Sources */ = {isa = PBXBuildFile; fileRef = 151672CE262F38D900E99CE5 /* sqlite3.c */; };
+		151672D1262F38D900E99CE5 /* sqlite3.h in Headers */ = {isa = PBXBuildFile; fileRef = 151672CF262F38D900E99CE5 /* sqlite3.h */; };
+		151672D4262F38E500E99CE5 /* sqlite3.h in Headers */ = {isa = PBXBuildFile; fileRef = 151672CF262F38D900E99CE5 /* sqlite3.h */; };
 		15A326372612055F009D07EB /* PEPSQLITE3_iOS.m in Sources */ = {isa = PBXBuildFile; fileRef = 15A326362612055F009D07EB /* PEPSQLITE3_iOS.m */; };
 		15A326382612055F009D07EB /* PEPSQLITE3_iOS.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 15A326352612055F009D07EB /* PEPSQLITE3_iOS.h */; };
 		15A32656261205E7009D07EB /* PEPSQLITE3_macOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 15A32655261205E7009D07EB /* PEPSQLITE3_macOS.h */; };
 		15A32658261205E7009D07EB /* PEPSQLITE3_macOS.m in Sources */ = {isa = PBXBuildFile; fileRef = 15A32657261205E7009D07EB /* PEPSQLITE3_macOS.m */; };
-		15A326722612063B009D07EB /* sqlite3.c in Sources */ = {isa = PBXBuildFile; fileRef = 15A326282611F6D3009D07EB /* sqlite3.c */; };
-		15A3267C2612065A009D07EB /* sqlite3.h in Headers */ = {isa = PBXBuildFile; fileRef = 15A326292611F6D3009D07EB /* sqlite3.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		15A3268426120671009D07EB /* sqlite3.h in Headers */ = {isa = PBXBuildFile; fileRef = 15A326292611F6D3009D07EB /* sqlite3.h */; };
-		15A326C626120858009D07EB /* sqlite3.c in Sources */ = {isa = PBXBuildFile; fileRef = 15A326282611F6D3009D07EB /* sqlite3.c */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -31,10 +30,10 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		151672CE262F38D900E99CE5 /* sqlite3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sqlite3.c; path = ../../../../sqlite/sqlite3.c; sourceTree = "<group>"; };
+		151672CF262F38D900E99CE5 /* sqlite3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqlite3.h; path = ../../../../sqlite/sqlite3.h; sourceTree = "<group>"; };
 		15A3260B2611F646009D07EB /* PEPSQLITE3.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PEPSQLITE3.h; sourceTree = "<group>"; };
 		15A3260C2611F646009D07EB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		15A326282611F6D3009D07EB /* sqlite3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sqlite3.c; path = ../../../../../../sqlite/sqlite3.c; sourceTree = "<group>"; };
-		15A326292611F6D3009D07EB /* sqlite3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqlite3.h; path = ../../../../../../sqlite/sqlite3.h; sourceTree = "<group>"; };
 		15A326332612055F009D07EB /* libPEPSQLITE3_iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPEPSQLITE3_iOS.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		15A326352612055F009D07EB /* PEPSQLITE3_iOS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PEPSQLITE3_iOS.h; sourceTree = "<group>"; };
 		15A326362612055F009D07EB /* PEPSQLITE3_iOS.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PEPSQLITE3_iOS.m; sourceTree = "<group>"; };
@@ -61,9 +60,19 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		151672CD262F388F00E99CE5 /* src */ = {
+			isa = PBXGroup;
+			children = (
+				151672CE262F38D900E99CE5 /* sqlite3.c */,
+				151672CF262F38D900E99CE5 /* sqlite3.h */,
+			);
+			name = src;
+			sourceTree = "<group>";
+		};
 		15A325FE2611F646009D07EB = {
 			isa = PBXGroup;
 			children = (
+				151672CD262F388F00E99CE5 /* src */,
 				15A3260A2611F646009D07EB /* PEPSQLITE3 */,
 				15A326342612055F009D07EB /* PEPSQLITE3_iOS */,
 				15A32654261205E7009D07EB /* PEPSQLITE3_macOS */,
@@ -83,22 +92,12 @@
 		15A3260A2611F646009D07EB /* PEPSQLITE3 */ = {
 			isa = PBXGroup;
 			children = (
-				15A326272611F6BC009D07EB /* src */,
 				15A3260B2611F646009D07EB /* PEPSQLITE3.h */,
 				15A3260C2611F646009D07EB /* Info.plist */,
 			);
 			path = PEPSQLITE3;
 			sourceTree = "<group>";
 		};
-		15A326272611F6BC009D07EB /* src */ = {
-			isa = PBXGroup;
-			children = (
-				15A326292611F6D3009D07EB /* sqlite3.h */,
-				15A326282611F6D3009D07EB /* sqlite3.c */,
-			);
-			path = src;
-			sourceTree = "<group>";
-		};
 		15A326342612055F009D07EB /* PEPSQLITE3_iOS */ = {
 			isa = PBXGroup;
 			children = (
@@ -124,7 +123,7 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				15A3267C2612065A009D07EB /* sqlite3.h in Headers */,
+				151672D4262F38E500E99CE5 /* sqlite3.h in Headers */,
 				15A32656261205E7009D07EB /* PEPSQLITE3_macOS.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -133,7 +132,7 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				15A3268426120671009D07EB /* sqlite3.h in Headers */,
+				151672D1262F38D900E99CE5 /* sqlite3.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -229,7 +228,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "CUSTOM_BUILD_DIR=\"${PROJECT_DIR}/build\"\nCUSTOM_INCLUDE_DIR=\"${CUSTOM_BUILD_DIR}/include\"\nmkdir -p ${CUSTOM_INCLUDE_DIR}\ncp -R \"${TARGET_BUILD_DIR}\"/usr/local/include/sqlite3.h ${CUSTOM_INCLUDE_DIR}\ncp  \"${TARGET_BUILD_DIR}/libPEPSQLITE3_iOS.a\" ${CUSTOM_BUILD_DIR}\n\n";
+			shellScript = "CUSTOM_BUILD_DIR=\"${PROJECT_DIR}/build\"\nCUSTOM_INCLUDE_DIR=\"${CUSTOM_BUILD_DIR}/include\"\nmkdir -p ${CUSTOM_INCLUDE_DIR}\ncp -R \"${PROJECT_DIR}\"/../../../../sqlite/*.h ${CUSTOM_INCLUDE_DIR}\ncp  \"${TARGET_BUILD_DIR}/libPEPSQLITE3_iOS.a\" ${CUSTOM_BUILD_DIR}\n\n";
 			showEnvVarsInLog = 0;
 		};
 		15A3268A26120757009D07EB /* Copy Artefacts & Headers to Custom Build Dir */ = {
@@ -259,7 +258,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				15A326372612055F009D07EB /* PEPSQLITE3_iOS.m in Sources */,
-				15A326722612063B009D07EB /* sqlite3.c in Sources */,
+				151672D0262F38D900E99CE5 /* sqlite3.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -268,7 +267,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				15A32658261205E7009D07EB /* PEPSQLITE3_macOS.m in Sources */,
-				15A326C626120858009D07EB /* sqlite3.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

build-mac/Subprojects/pEpASN1/pEpASN1.xcodeproj/project.pbxproj

@@ -899,7 +899,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "CUSTOM_BUILD_DIR=\"${PROJECT_DIR}/build\"\nCUSTOM_INCLUDE_DIR=\"${CUSTOM_BUILD_DIR}/include\"\nmkdir -p ${CUSTOM_INCLUDE_DIR}\ncp -R \"${TARGET_BUILD_DIR}\"/usr/local/include/* ${CUSTOM_INCLUDE_DIR}\ncp  \"${TARGET_BUILD_DIR}/libpEpASN1_iOS.a\" ${CUSTOM_BUILD_DIR}\n\n";
+			shellScript = "CUSTOM_BUILD_DIR=\"${PROJECT_DIR}/build\"\nCUSTOM_INCLUDE_DIR=\"${CUSTOM_BUILD_DIR}/include\"\nmkdir -p ${CUSTOM_INCLUDE_DIR}\ncp -R \"${PROJECT_DIR}\"/../../../asn.1/*.h ${CUSTOM_INCLUDE_DIR}\ncp  \"${TARGET_BUILD_DIR}/libpEpASN1_iOS.a\" ${CUSTOM_BUILD_DIR}\n\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 

build-windows/pEpEngine.vcxproj

@@ -89,8 +89,10 @@
       <Command>cargo build --manifest-path="$(SolutionDir)sequoia\Cargo.toml"</Command>
     </PreBuildEvent>
     <PostBuildEvent>
-      <Command>xcopy "$(SolutionDir)sequoia\target\debug\sequoia_openpgp_ffi.dll" "$(TargetDir)" /Y</Command>
-      <Command>xcopy "$(SolutionDir)sequoia\target\debug\sq.exe" "$(TargetDir)" /Y</Command>
+      <Command>
+        xcopy "$(SolutionDir)sequoia\target\debug\sequoia_openpgp_ffi.dll" "$(TargetDir)" /Y
+        xcopy "$(SolutionDir)sequoia\target\debug\sq.exe" "$(TargetDir)" /Y
+      </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -122,8 +124,10 @@
       <Command>cargo build --manifest-path="$(SolutionDir)sequoia\Cargo.toml" --release</Command>
     </PreBuildEvent>
     <PostBuildEvent>
-      <Command>xcopy "$(SolutionDir)sequoia\target\release\sequoia_openpgp_ffi.dll" "$(TargetDir)" /Y</Command>
-      <Command>xcopy "$(SolutionDir)sequoia\target\release\sq.exe" "$(TargetDir)" /Y</Command>
+      <Command>
+        xcopy "$(SolutionDir)sequoia\target\release\sequoia_openpgp_ffi.dll" "$(TargetDir)" /Y
+        xcopy "$(SolutionDir)sequoia\target\release\sq.exe" "$(TargetDir)" /Y
+      </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>

src/group.c

@@ -6,6 +6,7 @@
 
 #include "pEp_internal.h"
 #include "message_api.h"
+#include "message_api_internal.h"
 #include "distribution_codec.h"
 #include "map_asn1.h"
 #include "baseprotocol.h"
@@ -1811,6 +1812,27 @@ DYNAMIC_API void free_group(pEp_group *group) {
     free_memberlist(group->members);
 }
 
+static PEP_STATUS _validate_member_ident(PEP_SESSION session, pEp_identity* ident) {
+    if (!ident || EMPTYSTR(ident->address) || EMPTYSTR(ident->username) || EMPTYSTR(ident->fpr))
+        return PEP_ILLEGAL_VALUE;
+    if (_rating(ident->comm_type) < PEP_rating_reliable)
+        return PEP_KEY_UNSUITABLE;
+    return PEP_STATUS_OK;
+}
+
+static PEP_STATUS _validate_member_identities(PEP_SESSION session, identity_list* member_idents) {
+    if (!session)
+        return PEP_ILLEGAL_VALUE;
+
+    identity_list* curr = member_idents;
+
+    for ( ; curr && curr->ident; curr = curr->next) {
+        pEp_identity* the_id = curr->ident;
+        if (_validate_member_ident(session, the_id) != PEP_STATUS_OK)
+            return PEP_CANNOT_ADD_GROUP_MEMBER;
+    }
+    return PEP_STATUS_OK;
+}
 
 DYNAMIC_API PEP_STATUS group_create(
         PEP_SESSION session,
@@ -1825,12 +1847,16 @@ DYNAMIC_API PEP_STATUS group_create(
     if (!group_identity->address || !manager->address)
         return PEP_ILLEGAL_VALUE;
 
-    PEP_STATUS status = PEP_STATUS_OK;
+    PEP_STATUS status = _validate_member_identities(session, member_ident_list);
+    if (status != PEP_STATUS_OK)
+        return status;
+
     pEp_group* _group = NULL;
     pEp_identity* group_ident_clone = NULL;
     pEp_identity* manager_clone = NULL;
     member_list* memberlist = NULL;
 
+
     if (!group_identity->user_id || !is_me(session, group_identity)) {
         char* own_id = NULL;
         status = get_default_own_userid(session, &own_id);
@@ -2155,6 +2181,8 @@ DYNAMIC_API PEP_STATUS group_invite_member(
     size_t key_material_size = 0;
     bloblist_t* key_attachment = NULL;
 
+    if (_validate_member_ident(session, group_member) != PEP_STATUS_OK)
+        return PEP_CANNOT_ADD_GROUP_MEMBER;
 
     status = get_group_manager(session, group_identity, &manager);
     if (status != PEP_STATUS_OK)
@@ -2162,6 +2190,14 @@ DYNAMIC_API PEP_STATUS group_invite_member(
     if (!manager)
         return PEP_UNKNOWN_ERROR;
 
+    // Trying to be sneaky
+    if (!is_me(session, manager))
+        return PEP_ILLEGAL_VALUE;
+
+    status = myself(session, manager);
+    if (status != PEP_STATUS_OK)
+        goto pEp_free;
+
     status = group_add_member(session, group_identity, group_member);
     if (status == PEP_STATUS_OK) {
         if (is_me(session, group_member)) {
@@ -2174,8 +2210,6 @@ DYNAMIC_API PEP_STATUS group_invite_member(
             }
         }
         else {
-            manager = NULL;
-            data = NULL;
 
             status = _build_managed_group_message_payload(session, group_identity,
                                                           manager, &data, &size,
@@ -2184,8 +2218,6 @@ DYNAMIC_API PEP_STATUS group_invite_member(
             if (status != PEP_STATUS_OK)
                 goto pEp_free;
 
-            data = NULL; // avoid double-free
-
             // Let's also get the private key for the group we want to distribute
             status = export_secret_key(session, group_identity->fpr, &key_material_priv, &key_material_size);
             if (status != PEP_STATUS_OK)
@@ -2212,9 +2244,11 @@ DYNAMIC_API PEP_STATUS group_invite_member(
                 }
 
                 // encrypt and send this baby and get out
-                // FIXME: mem?
+                // FIXME: mem? - it gets freed IF all goes well, but if not?
                 status = _create_and_send_managed_group_message(session, manager, group_member, data, size,
                                                                 key_attachment);
+                // FIXME
+                data = NULL; // avoid double-free - check this
             }
         }
     }

src/group.h

@@ -10,6 +10,10 @@
 extern "C" {
 #endif
 
+/***
+ * TODO: Note in EACH call that update_identity/myself must be called before entry into the functions
+ */
+
 /*************************************************************************************************
  * In-memory objects and functions for representation of groups
  *************************************************************************************************/

src/message_api.c

@@ -1650,17 +1650,7 @@ static bool _has_PGP_MIME_format(message* msg) {
 }
 */
 
-/**
- *  @internal
- *
- *  <!--       _rating()       -->
- *
- *  @brief            TODO
- *
- *  @param[in]    ct        PEP_comm_type
- *
- */
-static inline PEP_rating _rating(PEP_comm_type ct)
+PEP_rating _rating(PEP_comm_type ct)
 {
     if (ct == PEP_ct_unknown)
         return PEP_rating_undefined;

src/message_api_internal.h

@@ -106,7 +106,17 @@ PEP_STATUS try_encrypt_message(
         PEP_encrypt_flags_t flags
     );
 
-
+/**
+ *  @internal
+ *
+ *  <!--       _rating()       -->
+ *
+ *  @brief            TODO
+ *
+ *  @param[in]    ct        PEP_comm_type
+ *
+ */
+PEP_rating _rating(PEP_comm_type ct);
 
 #ifdef __cplusplus
 }

test/src/GroupEncryptionTest.cc

@@ -331,7 +331,7 @@ TEST_F(GroupEncryptionTest, check_new_group) {
     free_group(group);
 }
 
-TEST_F(GroupEncryptionTest, check_create_group) {
+TEST_F(GroupEncryptionTest, check_null_membership_from_create_group) {
     pEp_identity* group_leader = new_identity("alistair@lost.pants", NULL, PEP_OWN_USERID, "Alistair Theirin");
     PEP_STATUS status = myself(session, group_leader);
     ASSERT_OK;
@@ -340,27 +340,116 @@ TEST_F(GroupEncryptionTest, check_create_group) {
     status = myself(session, group_ident);
     ASSERT_OK;
 
-    // Create member list
-    pEp_identity* carol = new_identity("carol@bob.bob", NULL, "CAROL_ID", "Carol");
-    ASSERT_NE(carol, nullptr);
-    status = update_identity(session, carol);
+    pEp_group* group = NULL;
+    status = group_create(session, group_ident, group_leader, NULL, &group);
     ASSERT_OK;
 
-    identity_list* list = new_identity_list(carol);
-    ASSERT_NE(list, nullptr);
+    member_list* retrieved_members = NULL;
+    status = retrieve_full_group_membership(session, group_ident, &retrieved_members);
+    ASSERT_OK;
+    ASSERT_EQ(retrieved_members, nullptr);
 
-    pEp_identity* bob = new_identity("bob@bob.bob", NULL, "BOB_ID", NULL);
-    status = update_identity(session, bob);
+    free_group(group);
+}
+
+TEST_F(GroupEncryptionTest, check_null_manager_from_create_group) {
+
+    pEp_identity* group_ident = new_identity("groupies@group.group", NULL, PEP_OWN_USERID, "Bad group");
+    PEP_STATUS status = myself(session, group_ident);
+    ASSERT_OK;
+
+    pEp_group* group = NULL;
+    status = group_create(session, group_ident, NULL, NULL, &group);
+    ASSERT_EQ(status, PEP_ILLEGAL_VALUE);
+    ASSERT_EQ(group, nullptr);
+}
+
+TEST_F(GroupEncryptionTest, check_null_group_ident_from_create_group) {
+    pEp_identity* group_leader = new_identity("alistair@lost.pants", NULL, PEP_OWN_USERID, "Alistair Theirin");
+    PEP_STATUS status = myself(session, group_leader);
+    ASSERT_OK;
+
+    pEp_group* group = NULL;
+    status = group_create(session, NULL, group_leader, NULL, &group);
+    ASSERT_EQ(status, PEP_ILLEGAL_VALUE);
+    ASSERT_EQ(group, nullptr);
+}
+
+TEST_F(GroupEncryptionTest, check_null_group_address_from_create_group) {
+    pEp_identity* group_leader = new_identity("alistair@lost.pants", NULL, PEP_OWN_USERID, "Alistair Theirin");
+    PEP_STATUS status = myself(session, group_leader);
     ASSERT_OK;
-    ASSERT_NE(identity_list_add(list, bob), nullptr);
 
-    pEp_identity* solas = new_identity("solas@solas.solas", NULL, "SOLAS_ID", "The Dread Wolf, Betrayer of All");
-    status = update_identity(session, solas);
+    pEp_identity* group_ident = new_identity("groupies@group.group", NULL, PEP_OWN_USERID, "Bad group");
+    status = myself(session, group_ident);
     ASSERT_OK;
-    ASSERT_NE(identity_list_add(list, solas), nullptr);
+    free(group_ident->address);
+    group_ident->address = NULL;
 
     pEp_group* group = NULL;
-    status = group_create(session, group_ident, group_leader, list, &group);
+    status = group_create(session, group_ident, group_leader, NULL, &group);
+    ASSERT_EQ(status, PEP_ILLEGAL_VALUE);
+    ASSERT_EQ(group, nullptr);
+}
+
+TEST_F(GroupEncryptionTest, check_null_manager_address_from_create_group) {
+    pEp_identity* group_leader = new_identity("alistair@lost.pants", NULL, PEP_OWN_USERID, "Alistair Theirin");
+    PEP_STATUS status = myself(session, group_leader);
+    ASSERT_OK;
+    free(group_leader->address);
+    group_leader->address = NULL;
+
+    pEp_identity* group_ident = new_identity("groupies@group.group", NULL, PEP_OWN_USERID, "Bad group");
+    status = myself(session, group_ident);
+    ASSERT_OK;
+
+    pEp_group* group = NULL;
+    status = group_create(session, group_ident, group_leader, NULL, &group);
+    ASSERT_EQ(status, PEP_ILLEGAL_VALUE);
+    ASSERT_EQ(group, nullptr);
+}
+
+TEST_F(GroupEncryptionTest, check_add_invite_exist_members) {
+    pEp_identity* me = new_identity(manager_1_address, NULL, PEP_OWN_USERID, manager_1_name);
+    read_file_and_import_key(session, kf_name(manager_1_prefix, false).c_str());
+    read_file_and_import_key(session, kf_name(manager_1_prefix, true).c_str());
+    PEP_STATUS status = set_own_key(session, me, manager_1_fpr);
+    ASSERT_OK;
+
+    pEp_identity* member_1 = new_identity(member_1_address, NULL, "MEMBER1", member_1_name);
+    read_file_and_import_key(session, kf_name(member_1_prefix, false).c_str());
+    status = update_identity(session, member_1);
+    ASSERT_OK;
+    status = set_pEp_version(session, member_1, 2, 2);
+    ASSERT_OK;
+    status = set_as_pEp_user(session, member_1);
+    ASSERT_OK;
+    pEp_identity* member_2 = new_identity(member_2_address, NULL, "MEMBER2", member_2_name);
+    read_file_and_import_key(session, kf_name(member_2_prefix, false).c_str());
+    status = update_identity(session, member_2);
+    ASSERT_OK;
+    status = set_pEp_version(session, member_2, 2, 2);
+    ASSERT_OK;
+    status = set_as_pEp_user(session, member_2);
+    ASSERT_OK;
+    pEp_identity* member_3 = new_identity(member_3_address, NULL, "MEMBER3", member_3_name);
+    read_file_and_import_key(session, kf_name(member_3_prefix, false).c_str());
+    status = update_identity(session, member_3);
+    ASSERT_OK;
+    status = set_pEp_version(session, member_3, 2, 2);
+    ASSERT_OK;
+    status = set_as_pEp_user(session, member_3);
+    ASSERT_OK;
+
+    identity_list* new_member_idents = new_identity_list(member_1);
+    ASSERT_NE(new_member_idents, nullptr);
+    identity_list_add(new_member_idents, member_2);
+    identity_list_add(new_member_idents, member_3);
+
+    pEp_identity* group_ident = new_identity(group_1_address, NULL, PEP_OWN_USERID, group_1_name);
+
+    pEp_group* group = NULL;
+    status = group_create(session, group_ident, me, new_member_idents, &group);
     ASSERT_OK;
     ASSERT_NE(group, nullptr);
     ASSERT_NE(group->group_identity, nullptr);
@@ -368,17 +457,18 @@ TEST_F(GroupEncryptionTest, check_create_group) {
     ASSERT_STREQ(group->group_identity->user_id, group_ident->user_id);
     ASSERT_NE(group->group_identity->flags & PEP_idf_group_ident, 0);
     ASSERT_NE(group->manager, nullptr);
-    ASSERT_STREQ(group->manager->address, group_leader->address);
-    ASSERT_STREQ(group->manager->user_id, group_leader->user_id);
+    ASSERT_STREQ(group->manager->address, me->address);
+    ASSERT_STREQ(group->manager->user_id, me->user_id);
     ASSERT_EQ(group->manager->flags & PEP_idf_group_ident, 0);
-    ASSERT_STRNE(group_ident->fpr, group_leader->fpr);
+    ASSERT_STRNE(group_ident->fpr, me->fpr);
 
     // We need to check for identity parity in the input ident list and the member list, I guess:
-    identity_list* input_idents = list;
+    identity_list* input_idents = new_member_idents;
     member_list* group_members = group->members;
 
+    int member_count = 0;
     for ( ; input_idents && group_members && input_idents->ident && group_members->member && group_members->member->ident;
-         group_members = group_members->next, input_idents = input_idents->next) {
+            group_members = group_members->next, input_idents = input_idents->next) {
         // Check that the bare essentials match
         pEp_identity* ident_ident = input_idents->ident;
         pEp_identity* member_ident = group_members->member->ident;
@@ -386,191 +476,256 @@ TEST_F(GroupEncryptionTest, check_create_group) {
         ASSERT_STREQ(ident_ident->user_id, member_ident->user_id);
         ASSERT_STREQ(ident_ident->address, member_ident->address);
         ASSERT_FALSE(group_members->member->joined);
+
+        member_count++;
     }
+
+    ASSERT_EQ(member_count, 3);
+
     // Make sure both lists hit their end
     ASSERT_EQ(input_idents, nullptr);
     ASSERT_EQ(group_members, nullptr);
 
-    free_group(group);
-}
-
-TEST_F(GroupEncryptionTest, check_membership_from_create_group) {
-    pEp_identity* group_leader = new_identity("alistair@lost.pants", NULL, PEP_OWN_USERID, "Alistair Theirin");
-    PEP_STATUS status = myself(session, group_leader);
+    pEp_identity* member_4 = new_identity(member_4_address, NULL, "MEMBER4", member_4_name);
+    read_file_and_import_key(session, kf_name(member_4_prefix, false).c_str());
+    status = update_identity(session, member_4);
     ASSERT_OK;
-
-    pEp_identity* group_ident = new_identity("groupies@group.group", NULL, PEP_OWN_USERID, "Bad group");
-    status = myself(session, group_ident);
+    status = set_pEp_version(session, member_4, 2, 2);
     ASSERT_OK;
-
-    // Create member list
-    pEp_identity* carol = new_identity("carol@bob.bob", NULL, "CAROL_ID", "Carol");
-    ASSERT_NE(carol, nullptr);
-    status = update_identity(session, carol);
+    status = set_as_pEp_user(session, member_4);
     ASSERT_OK;
 
-    identity_list* list = new_identity_list(carol);
-    ASSERT_NE(list, nullptr);
-
-    pEp_identity* bob = new_identity("bob@bob.bob", NULL, "BOB_ID", NULL);
-    status = update_identity(session, bob);
+    // Ok, add Solas to the group
+    status = group_invite_member(session, group_ident, member_4);
     ASSERT_OK;
-    ASSERT_NE(identity_list_add(list, bob), nullptr);
 
-    pEp_identity* solas = new_identity("solas@solas.solas", NULL, "SOLAS_ID", "The Dread Wolf, Betrayer of All");
-    status = update_identity(session, solas);
+    free_group(group);
+    group = NULL;
+    status = retrieve_group_info(session, group_ident, &group);
     ASSERT_OK;
-    ASSERT_NE(identity_list_add(list, solas), nullptr);
+    ASSERT_NE(group, nullptr);
 
-    pEp_group* group = NULL;
-    status = group_create(session, group_ident, group_leader, list, &group);
-    ASSERT_OK;
+    member_list* output_idents = group->members;
+    member_count = 0;
+    bool member_4_found = false;
+    for ( ; output_idents && output_idents->member && output_idents->member->ident ; output_idents = output_idents->next) {
+        pEp_identity* the_member = output_idents->member->ident;
+        ASSERT_FALSE(output_idents->member->joined);
+        member_count++;
+        if (strcmp(the_member->address, member_4_address) == 0 && strcmp(the_member->address, member_4_address) == 0) {
+            member_4_found = true;
+        }
+    }
+    ASSERT_EQ(member_count, 4);
+    ASSERT_TRUE(member_4_found);
 
-    bool carol_found = false;
-    bool solas_found = false;
-    bool bob_found = false;
+    free(group);
+}
 
-    member_list* retrieved_members = NULL;
-    status = retrieve_full_group_membership(session, group_ident, &retrieved_members);
+TEST_F(GroupEncryptionTest, check_add_invite_empty_members) {
+    pEp_identity* me = new_identity(manager_1_address, NULL, PEP_OWN_USERID, manager_1_name);
+    read_file_and_import_key(session, kf_name(manager_1_prefix, false).c_str());
+    read_file_and_import_key(session, kf_name(manager_1_prefix, true).c_str());
+    PEP_STATUS status = set_own_key(session, me, manager_1_fpr);
     ASSERT_OK;
-    ASSERT_NE(retrieved_members, nullptr);
-
-    for (member_list* curr_node = retrieved_members; curr_node && curr_node->member; curr_node = curr_node->next) {
-        if (!curr_node->member->ident)
-            break;
-        pEp_identity* ident = curr_node->member->ident;
-        if ((strcmp(ident->user_id, carol->user_id) == 0) && strcmp(ident->address, carol->address) == 0)
-            carol_found = true;
-        else if ((strcmp(ident->user_id, bob->user_id) == 0) && strcmp(ident->address, bob->address) == 0)
-            bob_found = true;
-        else if ((strcmp(ident->user_id, solas->user_id) == 0) && strcmp(ident->address, solas->address) == 0)
-            solas_found = true;
-        else
-            ASSERT_STREQ("This message is just to make the test fail and give a message, we found an unexpected member node.", "FAIL");
-        ASSERT_FALSE(curr_node->member->joined);
-    }
 
-    ASSERT_TRUE(carol_found);
-    ASSERT_TRUE(bob_found);
-    ASSERT_TRUE(solas_found);
+    identity_list* new_member_idents = NULL; // new_identity_list(member_1);
 
-    free_group(group);
-}
+    pEp_identity* group_ident = new_identity(group_1_address, NULL, PEP_OWN_USERID, group_1_name);
 
-TEST_F(GroupEncryptionTest, check_null_membership_from_create_group) {
-    pEp_identity* group_leader = new_identity("alistair@lost.pants", NULL, PEP_OWN_USERID, "Alistair Theirin");
-    PEP_STATUS status = myself(session, group_leader);
+    pEp_group* group = NULL;
+    status = group_create(session, group_ident, me, new_member_idents, &group);
     ASSERT_OK;
+    ASSERT_NE(group, nullptr);
+    ASSERT_NE(group->group_identity, nullptr);
+    ASSERT_STREQ(group->group_identity->address, group_ident->address);
+    ASSERT_STREQ(group->group_identity->user_id, group_ident->user_id);
+    ASSERT_NE(group->group_identity->flags & PEP_idf_group_ident, 0);
+    ASSERT_NE(group->manager, nullptr);
+    ASSERT_STREQ(group->manager->address, me->address);
+    ASSERT_STREQ(group->manager->user_id, me->user_id);
+    ASSERT_EQ(group->manager->flags & PEP_idf_group_ident, 0);
+    ASSERT_STRNE(group_ident->fpr, me->fpr);
 
-    pEp_identity* group_ident = new_identity("groupies@group.group", NULL, PEP_OWN_USERID, "Bad group");
-    status = myself(session, group_ident);
+    pEp_identity* member_4 = new_identity(member_4_address, NULL, "MEMBER4", member_4_name);
+    read_file_and_import_key(session, kf_name(member_4_prefix, false).c_str());
+    status = update_identity(session, member_4);
     ASSERT_OK;
-
-    pEp_group* group = NULL;
-    status = group_create(session, group_ident, group_leader, NULL, &group);
+    status = set_pEp_version(session, member_4, 2, 2);
+    ASSERT_OK;
+    status = set_as_pEp_user(session, member_4);
     ASSERT_OK;
 
-    member_list* retrieved_members = NULL;
-    status = retrieve_full_group_membership(session, group_ident, &retrieved_members);
+    status = group_invite_member(session, group_ident, member_4);
     ASSERT_OK;
-    ASSERT_EQ(retrieved_members, nullptr);
 
     free_group(group);
-}
-
-TEST_F(GroupEncryptionTest, check_null_manager_from_create_group) {
-
-    pEp_identity* group_ident = new_identity("groupies@group.group", NULL, PEP_OWN_USERID, "Bad group");
-    PEP_STATUS status = myself(session, group_ident);
+    group = NULL;
+    status = retrieve_group_info(session, group_ident, &group);
     ASSERT_OK;
+    ASSERT_NE(group, nullptr);
 
-    pEp_group* group = NULL;
-    status = group_create(session, group_ident, NULL, NULL, &group);
-    ASSERT_EQ(status, PEP_ILLEGAL_VALUE);
-    ASSERT_EQ(group, nullptr);
+    member_list* output_idents = group->members;
+    int member_count = 0;
+    bool member_4_found = false;
+    for ( ; output_idents && output_idents->member && output_idents->member->ident ; output_idents = output_idents->next) {
+        pEp_identity* the_member = output_idents->member->ident;
+        ASSERT_FALSE(output_idents->member->joined);
+        member_count++;
+        if (strcmp(the_member->address, member_4_address) == 0 && strcmp(the_member->address, member_4_address) == 0) {
+            member_4_found = true;
+        }
+    }
+    ASSERT_EQ(member_count, 1);
+    ASSERT_TRUE(member_4_found);
+
+    free(group);
 }
 
-TEST_F(GroupEncryptionTest, check_null_group_ident_from_create_group) {
-    pEp_identity* group_leader = new_identity("alistair@lost.pants", NULL, PEP_OWN_USERID, "Alistair Theirin");
-    PEP_STATUS status = myself(session, group_leader);
+TEST_F(GroupEncryptionTest, check_add_invite_empty_members_empty_head) {
+    pEp_identity* me = new_identity(manager_1_address, NULL, PEP_OWN_USERID, manager_1_name);
+    read_file_and_import_key(session, kf_name(manager_1_prefix, false).c_str());
+    read_file_and_import_key(session, kf_name(manager_1_prefix, true).c_str());
+    PEP_STATUS status = set_own_key(session, me, manager_1_fpr);
     ASSERT_OK;
 
+    identity_list* new_member_idents = new_identity_list(NULL);
+
+    pEp_identity* group_ident = new_identity(group_1_address, NULL, PEP_OWN_USERID, group_1_name);
+
     pEp_group* group = NULL;
-    status = group_create(session, NULL, group_leader, NULL, &group);
-    ASSERT_EQ(status, PEP_ILLEGAL_VALUE);
-    ASSERT_EQ(group, nullptr);
-}
+    status = group_create(session, group_ident, me, new_member_idents, &group);
+    ASSERT_OK;
+    ASSERT_NE(group, nullptr);
+    ASSERT_NE(group->group_identity, nullptr);
+    ASSERT_STREQ(group->group_identity->address, group_ident->address);
+    ASSERT_STREQ(group->group_identity->user_id, group_ident->user_id);
+    ASSERT_NE(group->group_identity->flags & PEP_idf_group_ident, 0);
+    ASSERT_NE(group->manager, nullptr);
+    ASSERT_STREQ(group->manager->address, me->address);
+    ASSERT_STREQ(group->manager->user_id, me->user_id);
+    ASSERT_EQ(group->manager->flags & PEP_idf_group_ident, 0);
+    ASSERT_STRNE(group_ident->fpr, me->fpr);
 
-TEST_F(GroupEncryptionTest, check_null_group_address_from_create_group) {
-    pEp_identity* group_leader = new_identity("alistair@lost.pants", NULL, PEP_OWN_USERID, "Alistair Theirin");
-    PEP_STATUS status = myself(session, group_leader);
+    pEp_identity* member_4 = new_identity(member_4_address, NULL, "MEMBER4", member_4_name);
+    read_file_and_import_key(session, kf_name(member_4_prefix, false).c_str());
+    status = update_identity(session, member_4);
+    ASSERT_OK;
+    status = set_pEp_version(session, member_4, 2, 2);
+    ASSERT_OK;
+    status = set_as_pEp_user(session, member_4);
     ASSERT_OK;
 
-    pEp_identity* group_ident = new_identity("groupies@group.group", NULL, PEP_OWN_USERID, "Bad group");
-    status = myself(session, group_ident);
+    status = group_invite_member(session, group_ident, member_4);
     ASSERT_OK;
-    free(group_ident->address);
-    group_ident->address = NULL;
 
-    pEp_group* group = NULL;
-    status = group_create(session, group_ident, group_leader, NULL, &group);
-    ASSERT_EQ(status, PEP_ILLEGAL_VALUE);
-    ASSERT_EQ(group, nullptr);
+    free_group(group);
+    group = NULL;
+    status = retrieve_group_info(session, group_ident, &group);
+    ASSERT_OK;
+    ASSERT_NE(group, nullptr);
+
+    member_list* output_idents = group->members;
+    int member_count = 0;
+    bool member_4_found = false;
+    for ( ; output_idents && output_idents->member && output_idents->member->ident ; output_idents = output_idents->next) {
+        pEp_identity* the_member = output_idents->member->ident;
+        ASSERT_FALSE(output_idents->member->joined);
+        member_count++;
+        if (strcmp(the_member->address, member_4_address) == 0 && strcmp(the_member->address, member_4_address) == 0) {
+            member_4_found = true;
+        }
+    }
+    ASSERT_EQ(member_count, 1);
+    ASSERT_TRUE(member_4_found);
+
+    free(group);
 }
 
-TEST_F(GroupEncryptionTest, check_null_manager_address_from_create_group) {
-    pEp_identity* group_leader = new_identity("alistair@lost.pants", NULL, PEP_OWN_USERID, "Alistair Theirin");
-    PEP_STATUS status = myself(session, group_leader);
+TEST_F(GroupEncryptionTest, check_add_invite_members_no_member) {
+    pEp_identity* me = new_identity(manager_1_address, NULL, PEP_OWN_USERID, manager_1_name);
+    read_file_and_import_key(session, kf_name(manager_1_prefix, false).c_str());
+    read_file_and_import_key(session, kf_name(manager_1_prefix, true).c_str());
+    PEP_STATUS status = set_own_key(session, me, manager_1_fpr);
     ASSERT_OK;
-    free(group_leader->address);
-    group_leader->address = NULL;
 
-    pEp_identity* group_ident = new_identity("groupies@group.group", NULL, PEP_OWN_USERID, "Bad group");
-    status = myself(session, group_ident);
-    ASSERT_OK;
+    identity_list* new_member_idents = new_identity_list(NULL);
+
+    pEp_identity* group_ident = new_identity(group_1_address, NULL, PEP_OWN_USERID, group_1_name);
 
     pEp_group* group = NULL;
-    status = group_create(session, group_ident, group_leader, NULL, &group);
+    status = group_create(session, group_ident, me, new_member_idents, &group);
+    ASSERT_OK;
+    ASSERT_NE(group, nullptr);
+    ASSERT_NE(group->group_identity, nullptr);
+    ASSERT_STREQ(group->group_identity->address, group_ident->address);
+    ASSERT_STREQ(group->group_identity->user_id, group_ident->user_id);
+    ASSERT_NE(group->group_identity->flags & PEP_idf_group_ident, 0);
+    ASSERT_NE(group->manager, nullptr);
+    ASSERT_STREQ(group->manager->address, me->address);
+    ASSERT_STREQ(group->manager->user_id, me->user_id);
+    ASSERT_EQ(group->manager->flags & PEP_idf_group_ident, 0);
+    ASSERT_STRNE(group_ident->fpr, me->fpr);
+
+    status = group_invite_member(session, group_ident, NULL);
     ASSERT_EQ(status, PEP_ILLEGAL_VALUE);
-    ASSERT_EQ(group, nullptr);
-}
 
-TEST_F(GroupEncryptionTest, check_add_invite) {
-    pEp_identity* own_ident = new_identity("alistair@lost.pants", NULL, PEP_OWN_USERID, "Alistair Theirin");
-    PEP_STATUS status = myself(session, own_ident);
+    free_group(group);
+    group = NULL;
+    status = retrieve_group_info(session, group_ident, &group);
     ASSERT_OK;
+    ASSERT_NE(group, nullptr);
+    ASSERT_EQ(group->members, nullptr);
+    free(group);
+}
 
-    pEp_identity* group_ident = new_identity("groupies@group.group", NULL, PEP_OWN_USERID, "Bad group");
-    status = myself(session, group_ident);
-    ASSERT_OK;
-    status = set_identity_flags(session, group_ident, group_ident->flags | PEP_idf_group_ident);
+TEST_F(GroupEncryptionTest, check_add_invite_member_no_key) {
+    pEp_identity* me = new_identity(manager_1_address, NULL, PEP_OWN_USERID, manager_1_name);
+    read_file_and_import_key(session, kf_name(manager_1_prefix, false).c_str());
+    read_file_and_import_key(session, kf_name(manager_1_prefix, true).c_str());
+    PEP_STATUS status = set_own_key(session, me, manager_1_fpr);
     ASSERT_OK;
 
-    pEp_identity* manager = new_identity("bad_manager@bad.bad", NULL, "BAD_MANAGER", "bad_manager");
-    status = update_identity(session, manager);
-    ASSERT_OK;
+    identity_list* new_member_idents = NULL; // new_identity_list(member_1);
 
-    pEp_group* group = NULL;
+    pEp_identity* group_ident = new_identity(group_1_address, NULL, PEP_OWN_USERID, group_1_name);
 
-    status = group_create(session, group_ident, manager, NULL, &group);
+    pEp_group* group = NULL;
+    status = group_create(session, group_ident, me, new_member_idents, &group);
     ASSERT_OK;
+    ASSERT_NE(group, nullptr);
+    ASSERT_NE(group->group_identity, nullptr);
+    ASSERT_STREQ(group->group_identity->address, group_ident->address);
+    ASSERT_STREQ(group->group_identity->user_id, group_ident->user_id);
+    ASSERT_NE(group->group_identity->flags & PEP_idf_group_ident, 0);
+    ASSERT_NE(group->manager, nullptr);
+    ASSERT_STREQ(group->manager->address, me->address);
+    ASSERT_STREQ(group->manager->user_id, me->user_id);
+    ASSERT_EQ(group->manager->flags & PEP_idf_group_ident, 0);
+    ASSERT_STRNE(group_ident->fpr, me->fpr);
 
-    status = group_enable(session, group_ident);
+    pEp_identity* member_4 = new_identity(member_4_address, NULL, "MEMBER4", member_4_name);
+    status = update_identity(session, member_4);
     ASSERT_OK;
-
-    status = add_own_membership_entry(session, group_ident, manager, own_ident);
+    status = set_pEp_version(session, member_4, 2, 2);
+    ASSERT_OK;
+    status = set_as_pEp_user(session, member_4);
     ASSERT_OK;
 
-    status = retrieve_own_membership_info_for_group_and_identity(session, group, own_ident);
+    status = group_invite_member(session, group_ident, member_4);
+    ASSERT_EQ(status, PEP_CANNOT_ADD_GROUP_MEMBER);
+
+    free_group(group);
+    group = NULL;
+    status = retrieve_group_info(session, group_ident, &group);
     ASSERT_OK;
+    ASSERT_NE(group, nullptr);
+    ASSERT_EQ(group->members, nullptr);
 
-    ASSERT_STREQ(group->manager->user_id, manager->user_id);
-    ASSERT_STREQ(group->manager->address, manager->address);
-    ASSERT_TRUE(group->active);
-    ASSERT_FALSE(group->members->member->joined);
-    ASSERT_EQ(group->members->next, nullptr);
+    free(group);
 }
 
+
 TEST_F(GroupEncryptionTest, check_group_join) {
     pEp_identity* own_ident = new_identity("alistair@lost.pants", NULL, PEP_OWN_USERID, "Alistair Theirin");
     PEP_STATUS status = myself(session, own_ident);