Testsuite: better restriction of parallel 2-stage-queue-runners

[users/jgh/exim.git] / src / src / dkim.c

diff --git a/src/src/dkim.c b/src/src/dkim.c
index 043fcc6dc790e55d0d02195b3e70a0a61c1ec084..5c9d2279e165767715385013862a330b81023c9d 100644 (file)
--- a/src/src/dkim.c
+++ b/src/src/dkim.c
@@ -30,32 +30,35 @@ pdkim_ctx dkim_sign_ctx;
 
 int dkim_verify_oldpool;
 pdkim_ctx *dkim_verify_ctx = NULL;
 
 int dkim_verify_oldpool;
 pdkim_ctx *dkim_verify_ctx = NULL;

-pdkim_signature *dkim_signatures = NULL;

 pdkim_signature *dkim_cur_sig = NULL;
 static const uschar * dkim_collect_error = NULL;
 
 pdkim_signature *dkim_cur_sig = NULL;
 static const uschar * dkim_collect_error = NULL;
 

+#define DKIM_MAX_SIGNATURES 20

 
 
 
 

-/*XXX the caller only uses the first record if we return multiple.
+
+/* Look up the DKIM record in DNS for the given hostname.
+Will use the first found if there are multiple.
+The return string is tainted, having come from off-site.

 */
 
 uschar *
 */
 
 uschar *

-dkim_exim_query_dns_txt(uschar * name)
+dkim_exim_query_dns_txt(const uschar * name)

 {
 {

-dns_answer dnsa;
+dns_answer * dnsa = store_get_dns_answer();

 dns_scan dnss;
 dns_scan dnss;

-dns_record *rr;
+rmark reset_point = store_mark();

 gstring * g = NULL;
 
 lookup_dnssec_authenticated = NULL;
 gstring * g = NULL;
 
 lookup_dnssec_authenticated = NULL;

-if (dns_lookup(&dnsa, name, T_TXT, NULL) != DNS_SUCCEED)
+if (dns_lookup(dnsa, name, T_TXT, NULL) != DNS_SUCCEED)

   return NULL; /*XXX better error detail?  logging? */
 
 /* Search for TXT record */
 
   return NULL; /*XXX better error detail?  logging? */
 
 /* Search for TXT record */
 

-for (rr = dns_next_rr(&dnsa, &dnss, RESET_ANSWERS);
+for (dns_record * rr = dns_next_rr(dnsa, &dnss, RESET_ANSWERS);

      rr;
      rr;

-     rr = dns_next_rr(&dnsa, &dnss, RESET_NEXT))
+     rr = dns_next_rr(dnsa, &dnss, RESET_NEXT))

   if (rr->type == T_TXT)
     {
     int rr_offset = 0;
   if (rr->type == T_TXT)
     {
     int rr_offset = 0;


@@ -76,7 +79,7 @@ for (rr = dns_next_rr(&dnsa, &dnss, RESET_ANSWERS);
     /* check if this looks like a DKIM record */
     if (Ustrncmp(g->s, "v=", 2) != 0 || strncasecmp(CS g->s, "v=dkim", 6) == 0)
       {
     /* check if this looks like a DKIM record */
     if (Ustrncmp(g->s, "v=", 2) != 0 || strncasecmp(CS g->s, "v=dkim", 6) == 0)
       {

-      gstring_reset_unused(g);
+      gstring_release_unused(g);

       return string_from_gstring(g);
       }
 
       return string_from_gstring(g);
       }
 


@@ -84,7 +87,7 @@ for (rr = dns_next_rr(&dnsa, &dnss, RESET_ANSWERS);
     }
 
 bad:
     }
 
 bad:

-if (g) store_reset(g);
+store_reset(reset_point);

 return NULL;   /*XXX better error detail?  logging? */
 }
 
 return NULL;   /*XXX better error detail?  logging? */
 }
 


@@ -92,6 +95,8 @@ return NULL;  /*XXX better error detail?  logging? */
 void
 dkim_exim_init(void)
 {
 void
 dkim_exim_init(void)
 {

+if (f.dkim_init_done) return;
+f.dkim_init_done = TRUE;

 pdkim_init();
 }
 
 pdkim_init();
 }
 


@@ -100,6 +105,8 @@ pdkim_init();
 void
 dkim_exim_verify_init(BOOL dot_stuffing)
 {
 void
 dkim_exim_verify_init(BOOL dot_stuffing)
 {

+dkim_exim_init();
+

 /* There is a store-reset between header & body reception
 so cannot use the main pool. Any allocs done by Exim
 memory-handling must use the perm pool. */
 /* There is a store-reset between header & body reception
 so cannot use the main pool. Any allocs done by Exim
 memory-handling must use the perm pool. */


@@ -115,7 +122,7 @@ if (dkim_verify_ctx)
 /* Create new context */
 
 dkim_verify_ctx = pdkim_init_verify(&dkim_exim_query_dns_txt, dot_stuffing);
 /* Create new context */
 
 dkim_verify_ctx = pdkim_init_verify(&dkim_exim_query_dns_txt, dot_stuffing);

-dkim_collect_input = !!dkim_verify_ctx;
+dkim_collect_input = dkim_verify_ctx ? DKIM_MAX_SIGNATURES : 0;

 dkim_collect_error = NULL;
 
 /* Start feed up with any cached data */
 dkim_collect_error = NULL;
 
 /* Start feed up with any cached data */


@@ -137,7 +144,7 @@ if (  dkim_collect_input
   dkim_collect_error = pdkim_errstr(rc);
   log_write(0, LOG_MAIN,
             "DKIM: validation error: %.100s", dkim_collect_error);
   dkim_collect_error = pdkim_errstr(rc);
   log_write(0, LOG_MAIN,
             "DKIM: validation error: %.100s", dkim_collect_error);

-  dkim_collect_input = FALSE;
+  dkim_collect_input = 0;

   }
 store_pool = dkim_verify_oldpool;
 }
   }
 store_pool = dkim_verify_oldpool;
 }


@@ -191,19 +198,18 @@ if (!(s = sig->domain)) s = US"<UNSET>";
 logmsg = string_append(logmsg, 2, "d=", s);
 if (!(s = sig->selector)) s = US"<UNSET>";
 logmsg = string_append(logmsg, 2, " s=", s);
 logmsg = string_append(logmsg, 2, "d=", s);
 if (!(s = sig->selector)) s = US"<UNSET>";
 logmsg = string_append(logmsg, 2, " s=", s);

-logmsg = string_append(logmsg, 7,
-  " c=", sig->canon_headers == PDKIM_CANON_SIMPLE ? "simple" : "relaxed",
-  "/",   sig->canon_body    == PDKIM_CANON_SIMPLE ? "simple" : "relaxed",
-  " a=", dkim_sig_to_a_tag(sig),
-string_sprintf(" b=" SIZE_T_FMT,
-               (int)sig->sighash.len > -1 ? sig->sighash.len * 8 : 0));
+logmsg = string_fmt_append(logmsg, " c=%s/%s a=%s b=" SIZE_T_FMT,
+         sig->canon_headers == PDKIM_CANON_SIMPLE ? "simple" : "relaxed",
+         sig->canon_body    == PDKIM_CANON_SIMPLE ? "simple" : "relaxed",
+         dkim_sig_to_a_tag(sig),
+         (int)sig->sighash.len > -1 ? sig->sighash.len * 8 : (size_t)0);

 if ((s= sig->identity)) logmsg = string_append(logmsg, 2, " i=", s);
 if ((s= sig->identity)) logmsg = string_append(logmsg, 2, " i=", s);

-if (sig->created > 0) logmsg = string_cat(logmsg,
-                             string_sprintf(" t=%lu", sig->created));
-if (sig->expires > 0) logmsg = string_cat(logmsg,
-                             string_sprintf(" x=%lu", sig->expires));
-if (sig->bodylength > -1) logmsg = string_cat(logmsg,
-                             string_sprintf(" l=%lu", sig->bodylength));
+if (sig->created > 0) logmsg = string_fmt_append(logmsg, " t=%lu",
+                                   sig->created);
+if (sig->expires > 0) logmsg = string_fmt_append(logmsg, " x=%lu",
+                                   sig->expires);
+if (sig->bodylength > -1) logmsg = string_fmt_append(logmsg, " l=%lu",
+                                   sig->bodylength);

 
 if (sig->verify_status & PDKIM_VERIFY_POLICY)
   logmsg = string_append(logmsg, 5,
 
 if (sig->verify_status & PDKIM_VERIFY_POLICY)
   logmsg = string_append(logmsg, 5,


@@ -280,15 +286,14 @@ return;
 void
 dkim_exim_verify_log_all(void)
 {
 void
 dkim_exim_verify_log_all(void)
 {

-pdkim_signature * sig;
-for (sig = dkim_signatures; sig; sig = sig->next) dkim_exim_verify_log_sig(sig);
+for (pdkim_signature * sig = dkim_signatures; sig; sig = sig->next)
+  dkim_exim_verify_log_sig(sig);

 }
 
 
 void
 dkim_exim_verify_finish(void)
 {
 }
 
 
 void
 dkim_exim_verify_finish(void)
 {

-pdkim_signature * sig;

 int rc;
 gstring * g = NULL;
 const uschar * errstr = NULL;
 int rc;
 gstring * g = NULL;
 const uschar * errstr = NULL;


@@ -305,21 +310,22 @@ if (dkim_collect_error)
   log_write(0, LOG_MAIN,
       "DKIM: Error during validation, disabling signature verification: %.100s",
       dkim_collect_error);
   log_write(0, LOG_MAIN,
       "DKIM: Error during validation, disabling signature verification: %.100s",
       dkim_collect_error);

-  dkim_disable_verify = TRUE;
+  f.dkim_disable_verify = TRUE;

   goto out;
   }
 
   goto out;
   }
 

-dkim_collect_input = FALSE;
+dkim_collect_input = 0;

 
 /* Finish DKIM operation and fetch link to signatures chain */
 
 
 /* Finish DKIM operation and fetch link to signatures chain */
 

-rc = pdkim_feed_finish(dkim_verify_ctx, &dkim_signatures, &errstr);
+rc = pdkim_feed_finish(dkim_verify_ctx, (pdkim_signature **)&dkim_signatures,
+                       &errstr);

 if (rc != PDKIM_OK && errstr)
   log_write(0, LOG_MAIN, "DKIM: validation error: %s", errstr);
 
 /* Build a colon-separated list of signing domains (and identities, if present) in dkim_signers */
 
 if (rc != PDKIM_OK && errstr)
   log_write(0, LOG_MAIN, "DKIM: validation error: %s", errstr);
 
 /* Build a colon-separated list of signing domains (and identities, if present) in dkim_signers */
 

-for (sig = dkim_signatures; sig; sig = sig->next)
+for (pdkim_signature * sig = dkim_signatures; sig; sig = sig->next)

   {
   if (sig->domain)   g = string_append_listele(g, ':', sig->domain);
   if (sig->identity) g = string_append_listele(g, ':', sig->identity);
   {
   if (sig->domain)   g = string_append_listele(g, ':', sig->domain);
   if (sig->identity) g = string_append_listele(g, ':', sig->identity);


@@ -371,7 +377,6 @@ int
 dkim_exim_acl_run(uschar * id, gstring ** res_ptr,
   uschar ** user_msgptr, uschar ** log_msgptr)
 {
 dkim_exim_acl_run(uschar * id, gstring ** res_ptr,
   uschar ** user_msgptr, uschar ** log_msgptr)
 {

-pdkim_signature * sig;

 uschar * cmp_val;
 int rc = -1;
 
 uschar * cmp_val;
 int rc = -1;
 


@@ -379,12 +384,12 @@ dkim_verify_status = US"none";
 dkim_verify_reason = US"";
 dkim_cur_signer = id;
 
 dkim_verify_reason = US"";
 dkim_cur_signer = id;
 

-if (dkim_disable_verify || !id || !dkim_verify_ctx)
+if (f.dkim_disable_verify || !id || !dkim_verify_ctx)

   return OK;
 
 /* Find signatures to run ACL on */
 
   return OK;
 
 /* Find signatures to run ACL on */
 

-for (sig = dkim_signatures; sig; sig = sig->next)
+for (pdkim_signature * sig = dkim_signatures; sig; sig = sig->next)

   if (  (cmp_val = Ustrchr(id, '@') != NULL ? US sig->identity : US sig->domain)
      && strcmpic(cmp_val, id) == 0
      )
   if (  (cmp_val = Ustrchr(id, '@') != NULL ? US sig->identity : US sig->domain)
      && strcmpic(cmp_val, id) == 0
      )


@@ -395,7 +400,7 @@ for (sig = dkim_signatures; sig; sig = sig->next)
     them here. This is easy since a domain and selector is guaranteed
     to be in a signature. The other dkim_* expansion items are
     dynamically fetched from dkim_cur_sig at expansion time (see
     them here. This is easy since a domain and selector is guaranteed
     to be in a signature. The other dkim_* expansion items are
     dynamically fetched from dkim_cur_sig at expansion time (see

-    function below). */
+    dkim_exim_expand_query() below). */

 
     dkim_cur_sig = sig;
     dkim_signing_domain = US sig->domain;
 
     dkim_cur_sig = sig;
     dkim_signing_domain = US sig->domain;


@@ -451,7 +456,7 @@ switch (what)
 uschar *
 dkim_exim_expand_query(int what)
 {
 uschar *
 dkim_exim_expand_query(int what)
 {

-if (!dkim_verify_ctx || dkim_disable_verify || !dkim_cur_sig)
+if (!dkim_verify_ctx || f.dkim_disable_verify || !dkim_cur_sig)

   return dkim_exim_expand_defaults(what);
 
 switch (what)
   return dkim_exim_expand_defaults(what);
 
 switch (what)


@@ -568,6 +573,8 @@ void
 dkim_exim_sign_init(void)
 {
 int old_pool = store_pool;
 dkim_exim_sign_init(void)
 {
 int old_pool = store_pool;

+
+dkim_exim_init();

 store_pool = POOL_MAIN;
 pdkim_init_context(&dkim_sign_ctx, FALSE, &dkim_exim_query_dns_txt);
 store_pool = old_pool;
 store_pool = POOL_MAIN;
 pdkim_init_context(&dkim_sign_ctx, FALSE, &dkim_exim_query_dns_txt);
 store_pool = old_pool;


@@ -622,6 +629,7 @@ if (dkim_domain)
   /* Only sign once for each domain, no matter how often it
   appears in the expanded list. */
 
   /* Only sign once for each domain, no matter how often it
   appears in the expanded list. */
 

+  dkim_signing_domain = string_copylc(dkim_signing_domain);

   if (match_isinlist(dkim_signing_domain, CUSS &seen_doms,
       0, NULL, NULL, MCL_STRING, TRUE, NULL) == OK)
     continue;
   if (match_isinlist(dkim_signing_domain, CUSS &seen_doms,
       0, NULL, NULL, MCL_STRING, TRUE, NULL) == OK)
     continue;


@@ -632,7 +640,6 @@ if (dkim_domain)
   for this domain. */
 
   if (!(dkim_sel = expand_string(dkim->dkim_selector)))
   for this domain. */
 
   if (!(dkim_sel = expand_string(dkim->dkim_selector)))

-  if (!(dkim_signing_selector = expand_string(dkim->dkim_selector)))

     { errwhen = US"dkim_selector"; goto expand_bad; }
 
   while ((dkim_signing_selector = string_nextinlist(&dkim_sel, &sel_sep,
     { errwhen = US"dkim_selector"; goto expand_bad; }
 
   while ((dkim_signing_selector = string_nextinlist(&dkim_sel, &sel_sep,


@@ -644,6 +651,8 @@ if (dkim_domain)
     uschar * dkim_private_key_expanded;
     uschar * dkim_hash_expanded;
     uschar * dkim_identity_expanded = NULL;
     uschar * dkim_private_key_expanded;
     uschar * dkim_hash_expanded;
     uschar * dkim_identity_expanded = NULL;

+    uschar * dkim_timestamps_expanded = NULL;
+    unsigned long tval = 0, xval = 0;

 
     /* Get canonicalization to use */
 
 
     /* Get canonicalization to use */
 


@@ -694,6 +703,13 @@ if (dkim_domain)
       else if (!*dkim_identity_expanded)
        dkim_identity_expanded = NULL;
 
       else if (!*dkim_identity_expanded)
        dkim_identity_expanded = NULL;
 

+    if (dkim->dkim_timestamps)
+      if (!(dkim_timestamps_expanded = expand_string(dkim->dkim_timestamps)))
+       { errwhen = US"dkim_timestamps"; goto expand_bad; }
+      else
+       xval = (tval = (unsigned long) time(NULL))
+             + strtoul(CCS dkim_timestamps_expanded, NULL, 10);
+

     if (!(sig = pdkim_init_sign(&dkim_sign_ctx, dkim_signing_domain,
                          dkim_signing_selector,
                          dkim_private_key_expanded,
     if (!(sig = pdkim_init_sign(&dkim_sign_ctx, dkim_signing_domain,
                          dkim_signing_selector,
                          dkim_private_key_expanded,


@@ -707,7 +723,7 @@ if (dkim_domain)
                        CS dkim_sign_headers_expanded,
                        CS dkim_identity_expanded,
                        pdkim_canon,
                        CS dkim_sign_headers_expanded,
                        CS dkim_identity_expanded,
                        pdkim_canon,

-                       pdkim_canon, -1, 0, 0);
+                       pdkim_canon, -1, tval, xval);

 
     if (!pdkim_set_sig_bodyhash(&dkim_sign_ctx, sig))
       goto bad;
 
     if (!pdkim_set_sig_bodyhash(&dkim_sign_ctx, sig))
       goto bad;


@@ -773,14 +789,15 @@ CLEANUP:
 
 pk_bad:
   log_write(0, LOG_MAIN|LOG_PANIC,
 
 pk_bad:
   log_write(0, LOG_MAIN|LOG_PANIC,

-               "DKIM: signing failed: %.100s", pdkim_errstr(pdkim_rc));
+               "DKIM: signing failed: %.100s", pdkim_errstr(pdkim_rc));

 bad:
   sigbuf = NULL;
   goto CLEANUP;
 
 expand_bad:
 bad:
   sigbuf = NULL;
   goto CLEANUP;
 
 expand_bad:

-  log_write(0, LOG_MAIN | LOG_PANIC, "failed to expand %s: %s",
-             errwhen, expand_string_message);
+  *errstr = string_sprintf("failed to expand %s: %s",
+              errwhen, expand_string_message);
+  log_write(0, LOG_MAIN | LOG_PANIC, "%s", *errstr);

   goto bad;
 }
 
   goto bad;
 }
 


@@ -790,12 +807,11 @@ expand_bad:
 gstring *
 authres_dkim(gstring * g)
 {
 gstring *
 authres_dkim(gstring * g)
 {

-pdkim_signature * sig;

 int start = 0;         /* compiler quietening */
 
 DEBUG(D_acl) start = g->ptr;
 
 int start = 0;         /* compiler quietening */
 
 DEBUG(D_acl) start = g->ptr;
 

-for (sig = dkim_signatures; sig; sig = sig->next)
+for (pdkim_signature * sig = dkim_signatures; sig; sig = sig->next)

   {
   g = string_catn(g, US";\n\tdkim=", 8);
 
   {
   g = string_catn(g, US";\n\tdkim=", 8);
 


@@ -814,7 +830,7 @@ for (sig = dkim_signatures; sig; sig = sig->next)
           g = string_cat(g, US"permerror (overlong public key record)\n\t\t"); break;
         case PDKIM_VERIFY_INVALID_PUBKEY_DNSRECORD:
         case PDKIM_VERIFY_INVALID_PUBKEY_IMPORT:
           g = string_cat(g, US"permerror (overlong public key record)\n\t\t"); break;
         case PDKIM_VERIFY_INVALID_PUBKEY_DNSRECORD:
         case PDKIM_VERIFY_INVALID_PUBKEY_IMPORT:

-          g = string_cat(g, US"neutral (syntax error in public key record)\n\t\t");
+          g = string_cat(g, US"neutral (public key record import problem)\n\t\t");

           break;
         case PDKIM_VERIFY_INVALID_SIGNATURE_ERROR:
           g = string_cat(g, US"neutral (signature tag missing or invalid)\n\t\t");
           break;
         case PDKIM_VERIFY_INVALID_SIGNATURE_ERROR:
           g = string_cat(g, US"neutral (signature tag missing or invalid)\n\t\t");