reset parser in set_retry

Author: kevinAlbs

src/mongocrypt-kms-ctx.c

@@ -518,6 +518,10 @@ static void set_retry(mongocrypt_kms_ctx_t *kms) {
     kms->should_retry = true;
     kms->attempts++;
     kms->sleep_usec = backoff_time_usec(kms->attempts);
+    // Reset intermediate state of parser.
+    if (kms->parser) {
+        kms_response_parser_reset(kms->parser);
+    }
 }
 
 /* An AWS KMS context has received full response. Parse out the result or error.
@@ -1167,11 +1171,6 @@ bool mongocrypt_kms_ctx_fail(mongocrypt_kms_ctx_t *kms) {
 
     // Mark KMS context as retryable. Return again in `mongocrypt_ctx_next_kms_ctx`.
     set_retry(kms);
-
-    // Reset intermediate state of parser.
-    if (kms->parser) {
-        kms_response_parser_reset(kms->parser);
-    }
     return true;
 }
 

test/test-mongocrypt-datakey.c

@@ -445,7 +445,6 @@ static void _test_create_datakey_with_retry(_mongocrypt_tester_t *tester) {
         ASSERT_OK(mongocrypt_kms_ctx_feed(kms_ctx, TEST_FILE("./test/data/rmd/kms-decrypt-reply-429.txt")), kms_ctx);
         // In-place retry is indicated.
         ASSERT(mongocrypt_kms_ctx_should_retry(kms_ctx));
-        ASSERT(mongocrypt_kms_ctx_fail(kms_ctx));
         // Feed a successful response.
         ASSERT_OK(mongocrypt_kms_ctx_feed(kms_ctx, TEST_FILE("./test/data/kms-aws/encrypt-response.txt")), kms_ctx);
         ASSERT_OK(mongocrypt_ctx_kms_done(ctx), ctx);
@@ -454,6 +453,44 @@ static void _test_create_datakey_with_retry(_mongocrypt_tester_t *tester) {
         mongocrypt_destroy(crypt);
     }
 
+    // Test that HTTP error can be retried after two retryable errors:
+    {
+        mongocrypt_t *crypt = _mongocrypt_tester_mongocrypt(TESTER_MONGOCRYPT_DEFAULT);
+        mongocrypt_ctx_t *ctx = mongocrypt_ctx_new(crypt);
+        ASSERT_OK(
+            mongocrypt_ctx_setopt_key_encryption_key(ctx,
+                                                     TEST_BSON("{'provider': 'aws', 'key': 'foo', 'region': 'bar'}")),
+            ctx);
+        ASSERT_OK(mongocrypt_ctx_datakey_init(ctx), ctx);
+        ASSERT_STATE_EQUAL(mongocrypt_ctx_state(ctx), MONGOCRYPT_CTX_NEED_KMS);
+        mongocrypt_kms_ctx_t *kms = mongocrypt_ctx_next_kms_ctx(ctx);
+        ASSERT_OK(kms, ctx);
+        mongocrypt_binary_t *retryable_http = TEST_FILE("./test/data/rmd/kms-decrypt-reply-429.txt");
+
+        // Feed a retryable HTTP error:
+        {
+            ASSERT_OK(mongocrypt_kms_ctx_feed(kms, retryable_http), kms);
+            ASSERT(mongocrypt_kms_ctx_should_retry(kms));
+        }
+
+        // Feed a retryable HTTP error again:
+        {
+            ASSERT_OK(mongocrypt_kms_ctx_feed(kms, retryable_http), kms);
+            ASSERT(mongocrypt_kms_ctx_should_retry(kms));
+        }
+
+        // Feed a successful response:
+        {
+            ASSERT_OK(mongocrypt_kms_ctx_feed(kms, TEST_FILE("./test/data/kms-aws/encrypt-response.txt")), kms);
+            ASSERT_OK(mongocrypt_ctx_kms_done(ctx), ctx);
+            _mongocrypt_tester_run_ctx_to(tester, ctx, MONGOCRYPT_CTX_DONE);
+        }
+
+        _mongocrypt_tester_run_ctx_to(tester, ctx, MONGOCRYPT_CTX_DONE);
+        mongocrypt_ctx_destroy(ctx);
+        mongocrypt_destroy(crypt);
+    }
+
     // Test that a network error is retried.
     {
         mongocrypt_t *crypt = _mongocrypt_tester_mongocrypt(TESTER_MONGOCRYPT_DEFAULT);