ENGINE-473: have the DB update partially fixed on renewal, but trust status is still not sticky. MOAR DEBUGGING!

src/keymanagement.c

@@ -134,6 +134,19 @@ static PEP_STATUS validate_fpr(PEP_SESSION session,
         get_key_rating(session, fpr, &ct);
         ident->comm_type = ct;
     }
+    else if (ct == PEP_ct_key_expired || ct == PEP_ct_key_expired_but_confirmed) {
+        PEP_comm_type ct_expire_check = PEP_ct_unknown;
+        get_key_rating(session, fpr, &ct_expire_check);
+        if (ct_expire_check >= PEP_ct_strong_but_unconfirmed) {
+            ident->comm_type = ct_expire_check;
+            if (ct == PEP_ct_key_expired_but_confirmed)
+                ident->comm_type |= PEP_ct_confirmed;
+            ct = ident->comm_type;
+            // We need to fix this trust in the DB.
+            status = set_trust(session, ident);
+        }
+    }
+    
     
     bool pep_user = false;
     
@@ -193,18 +206,28 @@ static PEP_STATUS validate_fpr(PEP_SESSION session,
             // if key is valid (second check because pEp key might be extended above)
             //      Return fpr        
             status = key_expired(session, fpr, time(NULL), &expired);            
-            if (status != PEP_STATUS_OK) {
-                 ident->comm_type = PEP_ct_key_expired;
-                 return status;
-             }
+            if (status != PEP_STATUS_OK)
+                return status;
+                
+            if (expired) {
+                if (ident->comm_type & PEP_ct_confirmed || (ident->comm_type == PEP_ct_key_expired_but_confirmed))
+                    ident->comm_type = PEP_ct_key_expired_but_confirmed;
+                else
+                    ident->comm_type = PEP_ct_key_expired;
+                return status;
+            }
             // communicate key(?)
         }        
     }
      
     if (revoked) 
         ct = PEP_ct_key_revoked;
-    else if (expired)
-        ct = PEP_ct_key_expired;        
+    else if (expired) {
+        if (ident->comm_type & PEP_ct_confirmed || (ident->comm_type == PEP_ct_key_expired_but_confirmed))
+            ct = PEP_ct_key_expired_but_confirmed;
+        else
+            ct = PEP_ct_key_expired;
+    }
     else if (blacklisted) { // never true for .me
         ident->comm_type = ct = PEP_ct_key_not_found;
         free(ident->fpr);
@@ -214,6 +237,7 @@ static PEP_STATUS validate_fpr(PEP_SESSION session,
     
     switch (ct) {
         case PEP_ct_key_expired:
+        case PEP_ct_key_expired_but_confirmed:
         case PEP_ct_key_revoked:
         case PEP_ct_key_b0rken:
             // delete key from being default key for all users/identities
@@ -339,6 +363,7 @@ PEP_STATUS get_valid_pubkey(PEP_SESSION session,
         case PEP_ct_key_revoked:
         case PEP_ct_key_b0rken:
         case PEP_ct_key_expired:
+        case PEP_ct_key_expired_but_confirmed:
         case PEP_ct_compromised:
         case PEP_ct_mistrusted:
             // this only happens when it's all there is

src/pEpEngine.h

@@ -432,6 +432,7 @@ typedef enum _PEP_comm_type {
     PEP_ct_key_expired = 0x04,
     PEP_ct_key_revoked = 0x05,
     PEP_ct_key_b0rken = 0x06,
+    PEP_ct_key_expired_but_confirmed = 0x07, // NOT with confirmed bit. Just retaining info here in case of renewal.
     PEP_ct_my_key_not_included = 0x09,
 
     PEP_ct_security_by_obscurity = 0x0a,

test/include/Engine358Tests.h

@@ -0,0 +1,19 @@
+// This file is under GNU General Public License 3.0
+// see LICENSE.txt
+
+#ifndef ENGINE358_H
+#define ENGINE358_H
+
+#include <string>
+#include "EngineTestIndividualSuite.h"
+
+using namespace std;
+
+class Engine358Tests : public EngineTestIndividualSuite {
+    public:
+        Engine358Tests(string test_suite, string test_home_dir);
+    private:
+        void check_engine358();
+};
+
+#endif

test/src/SuiteMaker.cc

@@ -24,6 +24,7 @@
 #include "DecryptAttachPrivateKeyUntrustedTests.h"
 #include "BCCTests.h"
 #include "LeastColorGroupTests.h"
+#include "Engine358Tests.h"
 #include "MistrustUndoTests.h"
 #include "BlacklistAcceptNewKeyTests.h"
 #include "MessageApiTests.h"
@@ -36,6 +37,7 @@
 #include "SequenceTests.h"
 #include "TrustwordsTests.h"
 #include "RevokeRegenAttachTests.h"
+#include "CheckRenewedExpiredKeyTrustStatusTests.h"
 #include "EncryptMissingPrivateKeyTests.h"
 #include "PepSubjectReceivedTests.h"
 #include "KeyeditTests.h"
@@ -67,6 +69,7 @@ const char* SuiteMaker::all_suites[] = {
     "DecryptAttachPrivateKeyUntrustedTests",
     "BCCTests",
     "LeastColorGroupTests",
+    "Engine358Tests",
     "MistrustUndoTests",
     "BlacklistAcceptNewKeyTests",
     "MessageApiTests",
@@ -79,6 +82,7 @@ const char* SuiteMaker::all_suites[] = {
     "SequenceTests",
     "TrustwordsTests",
     "RevokeRegenAttachTests",
+    "CheckRenewedExpiredKeyTrustStatusTests",
     "EncryptMissingPrivateKeyTests",
     "PepSubjectReceivedTests",
     "KeyeditTests",
@@ -98,7 +102,7 @@ const char* SuiteMaker::all_suites[] = {
 };
 
 // This file is generated, so magic constants are ok.
-int SuiteMaker::num_suites = 40;
+int SuiteMaker::num_suites = 42;
 
 void SuiteMaker::suitemaker_build(const char* test_class_name, const char* test_home, Test::Suite** test_suite) {
     if (strcmp(test_class_name, "DecorateTests") == 0)
@@ -125,6 +129,8 @@ void SuiteMaker::suitemaker_build(const char* test_class_name, const char* test_
         *test_suite = new BCCTests(test_class_name, test_home);
     else if (strcmp(test_class_name, "LeastColorGroupTests") == 0)
         *test_suite = new LeastColorGroupTests(test_class_name, test_home);
+    else if (strcmp(test_class_name, "Engine358Tests") == 0)
+        *test_suite = new Engine358Tests(test_class_name, test_home);
     else if (strcmp(test_class_name, "MistrustUndoTests") == 0)
         *test_suite = new MistrustUndoTests(test_class_name, test_home);
     else if (strcmp(test_class_name, "BlacklistAcceptNewKeyTests") == 0)
@@ -149,6 +155,8 @@ void SuiteMaker::suitemaker_build(const char* test_class_name, const char* test_
         *test_suite = new TrustwordsTests(test_class_name, test_home);
     else if (strcmp(test_class_name, "RevokeRegenAttachTests") == 0)
         *test_suite = new RevokeRegenAttachTests(test_class_name, test_home);
+    else if (strcmp(test_class_name, "CheckRenewedExpiredKeyTrustStatusTests") == 0)
+        *test_suite = new CheckRenewedExpiredKeyTrustStatusTests(test_class_name, test_home);
     else if (strcmp(test_class_name, "EncryptMissingPrivateKeyTests") == 0)
         *test_suite = new EncryptMissingPrivateKeyTests(test_class_name, test_home);
     else if (strcmp(test_class_name, "PepSubjectReceivedTests") == 0)

test/src/engine_tests/Engine358Tests.cc

@@ -0,0 +1,54 @@
+// This file is under GNU General Public License 3.0
+// see LICENSE.txt
+
+#include <stdlib.h>
+#include <string>
+#include <cstring>
+#include <cpptest.h>
+
+#include "pEpEngine.h"
+
+#include "test_util.h"
+#include "EngineTestIndividualSuite.h"
+#include "Engine358Tests.h"
+
+using namespace std;
+
+Engine358Tests::Engine358Tests(string suitename, string test_home_dir) :
+    EngineTestIndividualSuite::EngineTestIndividualSuite(suitename, test_home_dir) {
+    add_test_to_suite(std::pair<std::string, void (Test::Suite::*)()>(string("Engine358Tests::check_engine358"),
+                                                                      static_cast<Func>(&Engine358Tests::check_engine358)));
+}
+
+void Engine358Tests::check_engine358() {
+    bool ok = false;
+    ok = slurp_and_import_key(session, "test_keys/pub/pep-test-alice-0x6FF00E97_pub.asc");
+    TEST_ASSERT(ok);    
+    ok = slurp_and_import_key(session, "test_keys/priv/pep-test-alice-0x6FF00E97_priv.asc");    
+    TEST_ASSERT(ok);
+    ok = slurp_and_import_key(session, "test_keys/pub/inquisitor-0xA4728718_full_expired.pub.asc");    
+    TEST_ASSERT(ok);
+
+    const char* alice_fpr = "4ABE3AAF59AC32CFE4F86500A9411D176FF00E97";
+    pEp_identity* alice_from = new_identity("pep.test.alice@pep-project.org", alice_fpr, PEP_OWN_USERID, "Alice Cooper");
+
+    PEP_STATUS status = set_own_key(session, alice_from, alice_fpr); 
+    TEST_ASSERT_MSG((status == PEP_STATUS_OK), tl_status_string(status));
+
+    pEp_identity* expired_inquisitor = new_identity("inquisitor@darthmama.org", NULL, NULL, "Lady Claire Trevelyan");
+    message* msg = new_message(PEP_dir_outgoing);    
+
+    msg->from = alice_from;
+    msg->to = new_identity_list(expired_inquisitor);
+    msg->shortmsg = strdup("Blah!");
+    msg->longmsg = strdup("Blahblahblah!");
+    msg->attachments = new_bloblist(NULL, 0, "application/octet-stream", NULL);
+
+    message* enc_msg = NULL;
+    
+    status = encrypt_message(session, msg, NULL, &enc_msg, PEP_enc_PGP_MIME, 0);
+    TEST_ASSERT(!enc_msg);
+    TEST_ASSERT(msg->to && msg->to->ident);
+    TEST_ASSERT_MSG((status == PEP_UNENCRYPTED), tl_status_string(status));
+}
+

test/test_keys/priv/sercullen-test-0xCEAADED4_priv.asc

@@ -0,0 +1,82 @@
+-----BEGIN PGP PRIVATE KEY BLOCK-----
+
+lQVYBEdLUAgBDADAha/ZeyFZp8U2OfaaUH+TDBPDdte4D6Z/lakRYDpBLAdjWkoV
+6CRjei7NJtYzTtOQIC2FjGd+DYCWQaW28Jj2DMhvUq/qhwUPNzK/mZ7tfA2rXRsY
+34qNWn/g5OnVDw4e1JMv4qUAiaDOTEjrR9zO3iFrFppXhur2SF2ypbP61nG0J+wx
+KJda6/n9H16Krtl4VXesOABSjX4Kn+eZxRcQdu1GXiBXs1YKyvN00za3g/73x+GR
+ZzxAp+W+ns4AanCGpzFhTR72/ZTlwT5hUfx/0xisgRdo/m6ggCLX49kyAqfS6T1F
+ZE0S4HdehFmNg/s5IqTCUt/0iceQpE1QrHJT/dHkF//Mgmvmb8gucXBvExrRYK9f
+1QWFP0w0RJ9ftl3Zs7izTBE6od46rPr60EcJU0u0i0uJvL4Oq7XBxYNAg794ELIm
+5riVmyhV9ZU7bTdeKMLGwByQYZPogchIoG4m2i+qW+9ckt0B4KNNR4s3T3HCBSTj
+DO+ToGKJMWxKwLMAEQEAAQAL/AoOHBgA4amzFpynGQV6Q7on8jaHDOvr4ABRcdn+
+QNre+2EillDf7QTV8mJ8LztfO7NIBZ++c43BMBz+P2vpDJeylzgFsAEYARkzAtZq
++18Y180JcdmHY11eLjnciRWC/HPQNuX+6mQpBOhk/OrgfxVopthlN9H9lbo8H5GR
+SRpGUW350ZgAk9ckEOjknd5bhptNq3P9OaxrcaYJTHB3V96Y8GwG4oEcxrrGd0IK
+GnjUlgrygV98w7n2iu+9Hc6YMkJGDOINWlei5lNE7NU5QD6F4Tn5ejU/M48za8Sw
+kpdQq3i3cqd9fR085o66xhLfCZrQLDeleGcYVjfPMtJxRbF0Gjlqd10HSNBQVBU2
+75jeGcX04fR/JGiQ5rQx11EMnA6Q66mE59txk3kyVgJFz2/ikxLBZRfMSwxZrbaB
+ybGeXyXF89Xn4XrwGyTIp2BTpHBywjhEqLFTGNRURZp6AdUUB95FcZmyePhIqfTR
+Whjji//f79AlNGQHq8cGGx7k8QYAwXYBLPPqLbAmakiF9SntjkI/R9h7oKTQ8Dh0
+wj/rsDFIaclOEY1OY/5hEtlM2MqXBAneyIOQVJGvwb06lz5bmqp/UBk7pKSbFLWt
+/85XGgzq4A7PWlm+h+3hwRn/qfwgHcyTsEfvHKvKgKRDrOWoWGJSObUtaDIuGG5K
+yhvJBrPLwoY+43Whn2Z6chryEVjpiFDPYKfMN7LJpH782kBxoWKRoaIuDTMKXYfN
+nZxdg5zk4x1PlhPYb4z0QTVxGzhtBgD+wf8EkIWRv4gdUx41r55osJACcovSrp4X
+M6FP3lF4ETfiTMXQjpoo+TzVBGOn5LfAW2BS7wkDc6pNxkjEQmJf12CGcq7rdCPZ
+q0fa8ercPCeg2I3/Ygv1wfSdPb2GuzSazjsEZythrkrlyuHOb9odRUAEFW9lutBV
+WjuAyIJxc56i7VYKClcN4x49+8yXbhyiCDcumeEK5k50jx+fZnY3R50yddrWG7rm
+1p1VNQYlBgiEmLYhvAEo7KMdUAB2aZ8GAOhg6Bsu+HU/tpTO6WAMpdbx9PI3W4A4
+kyNco+ta22vmKKLZNpdDbwMVbOtmkeVPtNazEduaQVUpYsHJu9YPwFwku/1/+2Vp
+XYBFy5uHuOLcwqKcSELXT9dtU7oBue3Yif87FhCmbLxScZIjYmYaWAYi0iZg8pOq
+6YvfJJ+o91+GldNc5oY8lYLzXOMm0tdojmOkzt6FVAe4ticmxWjYTLamten1cAgj
+nVHfoOWLiQfqQLdMe9IMJJwvPdm0cTqbeeLJtDRTZXIgQ3VsbGVuIFJ1dGhlcmZv
+cmQgPHNlcmN1bGxlbi10ZXN0QGRhcnRobWFtYS5vcmc+iQHUBBMBCAA+FiEEHJZm
+2LPij0qjhH2omm51486q3tQFAkdLUAgCGwMFCQPCZwAFCwkIBwIGFQoJCAsCBBYC
+AwECHgECF4AACgkQmm51486q3tR6wQv/Y85s1dIOkbqJkO/juRouamzgDboTHcw+
+5yNdrArwhJpd1CUUP4L4l6dTj9RYUxoj2hazDjVH3gC8lV1qdMc6eYjBPSO/g1Mg
+1cF8sBqHmJaUtT7K54O5R6wl+77DmxVmbCLv7XKk6CLGlBQFe3YdlJ4lJ5EwTm4t
+J0m5cvgZOlAqZOBOptwB5IAWZ4jemlllMTwAXzCwW4tPkTvi7qG4HjszOUYL5qd2
+xksvWj0Qhf8nXgKSJctfuTTceVqIbtFgjAGIBa6DtrmqkVf6G8ANmxdjcSawCJNf
+G+MFjm1KTS4CU6RCcrc55aQHqTZglbIfNeQPJeTOsoZLyFdTTX63WnWpgix08Jo/
+YHo8ECWOofO/tKlI9Mq8ZoyAJyJpDhE7PX0UA5uQlxZHxuLTKIWWBB5nZqkkzclW
+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
+YaxF8MSCzkTmFnhdIPMPkTXB
+=6nmY
+-----END PGP PRIVATE KEY BLOCK-----