ENGINE-847: more test adjustments, rating bug fixes

src/message_api.c

@@ -5094,6 +5094,10 @@ static PEP_STATUS _decrypt_message(
                 if (!EMPTYSTR(key_claim_fpr))
                     status = _check_and_set_default_key(session, src->from, key_claim_fpr);
 
+                if (_keylist) {
+                    if (!EMPTYSTR(_keylist->value))
+                        msg->_sender_fpr = strdup(_keylist->value); // will be checked against sender info later
+                }
                 break;
 
             default:

src/rating_api.c

@@ -391,28 +391,26 @@ static PEP_STATUS message_rating_for_identities(
         PEP_rating *rating
     )
 {
-    assert(session && msg && msg->from && rating);
-    if (!(session && msg && msg->from && rating))
+    assert(session && msg && rating);
+    if (!(session && msg && rating))
         return PEP_ILLEGAL_VALUE;
 
     PEP_STATUS status = PEP_STATUS_OK;
     *rating = PEP_rating_undefined;
 
-    if (msg->dir == PEP_dir_incoming) {
-        if (is_me(session, msg->from))
+    if (msg->from) {
+        if (msg->dir == PEP_dir_incoming) {
+            if (is_me(session, msg->from))
+                status = myself(session, msg->from);
+            else
+                status = update_identity(session, msg->from);
+        } else {
             status = myself(session, msg->from);
-        else
-            status = update_identity(session, msg->from);
-    }
-    else {
-        status = myself(session, msg->from);
+        }
+        if (status)
+            return status;
     }
-    if (status)
-        return status;
-
-    PEP_rating from_rating = rating_from_comm_type(msg->from->comm_type);
-    if (!from_rating)
-        goto the_end;
+    PEP_rating from_rating = msg->from ? rating_from_comm_type(msg->from->comm_type) : PEP_rating_unreliable;
 
     PEP_rating _rating = PEP_rating_undefined;
     status = rating_sum(session, msg, rating_of_existing_channel, &_rating);
@@ -421,7 +419,7 @@ static PEP_STATUS message_rating_for_identities(
 
     *rating = add_rating(from_rating, _rating);
 
-    if (*rating == PEP_rating_have_no_key)
+    if (*rating == PEP_rating_have_no_key || *rating == PEP_rating_undefined)
         *rating = PEP_rating_unreliable;
 
 the_end:
@@ -738,10 +736,12 @@ DYNAMIC_API PEP_STATUS incoming_message_rating(
     }
 
     PEP_rating crypto_rating = PEP_rating_undefined;
-    if (src->from && is_me(session, src->from))
-        status = myself(session, src->from);
-    else
-        status = update_identity(session, src->from);
+    if (src->from) {
+        if (is_me(session, src->from))
+            status = myself(session, src->from);
+        else
+            status = update_identity(session, src->from);
+    }
 
     if (status)
         return status;

test/src/LeastCommonDenomColorTest.cc

@@ -127,7 +127,7 @@ TEST_F(LeastCommonDenomColorTest, check_least_common_denom_color) {
     recip1->fpr = strdup("9F371BACD583EE26347899F21CCE13DE07B29090");
     status = set_identity(session, recip1);
     ASSERT_OK;
-    key_reset_trust(session, recip1);
+//    key_reset_trust(session, recip1);
 
     pEp_identity * recip2 = new_identity("banmetwice@kgrothoff.org", NULL, "TOFU_banmetwice@kgrothoff.org", "Ban Me Twice");
     recip2->me = false;
@@ -136,7 +136,7 @@ TEST_F(LeastCommonDenomColorTest, check_least_common_denom_color) {
     recip2->fpr = strdup("84A33862CC664EA1086B7E94ADF10A134080C3E7");
     status = set_identity(session, recip2);
     ASSERT_OK;
-    key_reset_trust(session, recip2);
+//    key_reset_trust(session, recip2);
 
     const string mailtext = slurp(mailfile);
 

test/src/VerifyTest.cc

@@ -307,7 +307,8 @@ TEST_F(VerifyTest, check_expired_signing_key) {
     msg->longmsg = strdup(ciphertext.c_str());
     msg->from = new_identity("1960@example.org", NULL, "MARY", "Mary Susan Maria Karen Lisa Linda Donna Patricia Smith");
     message* pt_msg = NULL;
-    decrypt_message(session, msg, &pt_msg, &keylist, &rating, &flags);
+    status = decrypt_message(session, msg, &pt_msg, &keylist, &rating, &flags);
+    ASSERT_OK;
     free_message(msg);
     free_message(pt_msg);
     ASSERT_EQ(rating, PEP_rating_unreliable);