X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/2f8e0a5f6bc17ccd0749c0dc28f5da28da5d25a2..f49d9ed0b8cbf4b87e9c8d9007767ba48f440332:/src/src/globals.h diff --git a/src/src/globals.h b/src/src/globals.h index 937cce776..5bd936452 100644 --- a/src/src/globals.h +++ b/src/src/globals.h @@ -3,7 +3,7 @@ *************************************************/ /* Copyright (c) University of Cambridge 1995 - 2018 */ -/* Copyright (c) The Exim Maintainers 2020 */ +/* Copyright (c) The Exim Maintainers 2020 - 2021 */ /* See the file NOTICE for conditions of use and distribution. */ /* Almost all the global variables are defined together in this one header, so @@ -77,6 +77,10 @@ extern int sqlite_lock_timeout; /* Internal lock waiting timeout */ extern BOOL move_frozen_messages; /* Get them out of the normal directory */ #endif +#ifdef ALLOW_INSECURE_TAINTED_DATA +extern BOOL allow_insecure_tainted_data; +#endif + /* These variables are outside the #ifdef because it keeps the code less cluttered in several places (e.g. during logging) if we can always refer to them. Also, the tls_ variables are now always visible. */ @@ -121,8 +125,10 @@ extern tls_support tls_out; #ifndef DISABLE_TLS extern BOOL gnutls_compat_mode; /* Less security, more compatibility */ extern BOOL gnutls_allow_auto_pkcs11; /* Let GnuTLS autoload PKCS11 modules */ +extern uschar *hosts_require_alpn; /* Mandatory ALPN successful nogitiation */ extern uschar *openssl_options; /* OpenSSL compatibility options */ -extern const pcre *regex_STARTTLS; /* For recognizing STARTTLS settings */ +extern const pcre2_code *regex_STARTTLS; /* For recognizing STARTTLS settings */ +extern uschar *tls_alpn; /* ALPN names acceptable */ extern uschar *tls_certificate; /* Certificate file */ extern uschar *tls_crl; /* CRL File */ extern int tls_dh_max_bits; /* don't accept higher lib suggestions */ @@ -147,7 +153,7 @@ extern uschar *tls_advertise_hosts; /* host for which TLS is advertised */ extern uschar *dsn_envid; /* DSN envid string */ extern int dsn_ret; /* DSN ret type*/ -extern const pcre *regex_DSN; /* For recognizing DSN settings */ +extern const pcre2_code *regex_DSN; /* For recognizing DSN settings */ extern uschar *dsn_advertise_hosts; /* host for which TLS is advertised */ /* Input-reading functions for messages, so we can use special ones for @@ -155,14 +161,16 @@ incoming TCP/IP. */ extern int (*lwr_receive_getc)(unsigned); extern uschar * (*lwr_receive_getbuf)(unsigned *); +extern BOOL (*lwr_receive_hasc)(void); extern int (*lwr_receive_ungetc)(int); + extern int (*receive_getc)(unsigned); extern uschar * (*receive_getbuf)(unsigned *); -extern void (*receive_get_cache)(void); +extern BOOL (*receive_hasc)(void); +extern void (*receive_get_cache)(unsigned); extern int (*receive_ungetc)(int); extern int (*receive_feof)(void); extern int (*receive_ferror)(void); -extern BOOL (*receive_smtp_buffered)(void); /* For clearing, saving, restoring address expansion variables. We have to have @@ -266,7 +274,7 @@ extern struct global_flags { BOOL sender_set_untrusted :1; /* Sender set by untrusted caller */ BOOL smtp_authenticated :1; /* Sending client has authenticated */ #ifndef DISABLE_PIPE_CONNECT - BOOL smtp_in_early_pipe_advertised :1; /* server advertised PIPE_CONNECT */ + BOOL smtp_in_early_pipe_advertised :1; /* server advertised PIPECONNECT */ BOOL smtp_in_early_pipe_no_auth :1; /* too many authenticator names */ BOOL smtp_in_early_pipe_used :1; /* client did send early data */ #endif @@ -314,7 +322,7 @@ extern uschar *acl_smtp_connect; /* ACL run on SMTP connection */ extern uschar *acl_smtp_data; /* ACL run after DATA received */ #ifndef DISABLE_PRDR extern uschar *acl_smtp_data_prdr; /* ACL run after DATA received if in PRDR mode*/ -const extern pcre *regex_PRDR; /* For recognizing PRDR settings */ +const extern pcre2_code *regex_PRDR; /* For recognizing PRDR settings */ #endif #ifndef DISABLE_DKIM extern uschar *acl_smtp_dkim; /* ACL run for DKIM signatures / domains */ @@ -366,7 +374,7 @@ extern auth_instance *auths; /* Chain of instantiated auths */ extern auth_instance auth_defaults; /* Default values */ extern uschar *auth_defer_msg; /* Error message for log */ extern uschar *auth_defer_user_msg; /* Error message for user */ -extern uschar *auth_vars[]; /* $authn variables */ +extern const uschar *auth_vars[]; /* $authn variables */ extern int auto_thaw; /* Auto-thaw interval */ #ifdef WITH_CONTENT_SCAN extern int av_failed; /* TRUE if the AV process failed */ @@ -594,7 +602,7 @@ extern int expand_level; /* Nesting depth; indent for debug */ extern int expand_forbid; /* RDO flags for forbidding things */ extern int expand_nlength[]; /* Lengths of numbered strings */ extern int expand_nmax; /* Max numerical value */ -extern uschar *expand_nstring[]; /* Numbered strings */ +extern const uschar *expand_nstring[]; /* Numbered strings */ extern BOOL extract_addresses_remove_arguments; /* Controls -t behaviour */ extern uschar *extra_local_interfaces; /* Local, non-listen interfaces */ @@ -718,7 +726,6 @@ extern uschar message_id_option[]; /* -E for use as option */ extern uschar *message_id_external; /* External form of following */ extern uschar *message_id_domain; /* Expanded to form domain-part of message_id */ extern uschar *message_id_text; /* Expanded to form message_id */ -extern struct timeval message_id_tv; /* Time used to create last message_id */ extern int message_linecount; /* As it says */ extern BOOL message_logs; /* TRUE to write message logs */ extern int message_size; /* Size of message */ @@ -726,7 +733,7 @@ extern uschar *message_size_limit; /* As it says */ #ifdef SUPPORT_I18N extern BOOL message_smtputf8; /* Internationalized mail handling */ extern int message_utf8_downconvert; /* convert from utf8 */ -const extern pcre *regex_UTF8; /* For recognizing SMTPUTF8 settings */ +const extern pcre2_code *regex_UTF8; /* For recognizing SMTPUTF8 settings */ #endif extern uschar message_subdir[]; /* Subdirectory for messages */ extern uschar *message_reference; /* Reference for error messages */ @@ -774,6 +781,10 @@ extern uid_t originator_uid; /* Uid of ditto */ extern uschar *override_local_interfaces; /* Value of -oX argument */ extern uschar *override_pid_file_path; /* Value of -oP argument */ +extern pcre2_general_context * pcre_gen_ctx; /* pcre memory management */ +extern pcre2_compile_context * pcre_cmp_ctx; +extern pcre2_match_context * pcre_mtc_ctx; + extern uschar *percent_hack_domains; /* Local domains for which '% operates */ extern uschar *pid_file_path; /* For writing daemon pids */ #ifndef DISABLE_PIPE_CONNECT @@ -860,24 +871,24 @@ extern uschar *recipient_verify_failure; /* What went wrong */ extern int recipients_list_max; /* Maximum number fitting in list */ extern int recipients_max; /* Max permitted */ extern BOOL recipients_max_reject; /* If TRUE, reject whole message */ -extern const pcre *regex_AUTH; /* For recognizing AUTH settings */ -extern const pcre *regex_check_dns_names; /* For DNS name checking */ -extern const pcre *regex_From; /* For recognizing "From_" lines */ -extern const pcre *regex_CHUNKING; /* For recognizing CHUNKING (RFC 3030) */ -extern const pcre *regex_IGNOREQUOTA; /* For recognizing IGNOREQUOTA (LMTP) */ +extern const pcre2_code *regex_AUTH; /* For recognizing AUTH settings */ +extern const pcre2_code *regex_check_dns_names; /* For DNS name checking */ +extern const pcre2_code *regex_From; /* For recognizing "From_" lines */ +extern const pcre2_code *regex_CHUNKING; /* For recognizing CHUNKING (RFC 3030) */ +extern const pcre2_code *regex_IGNOREQUOTA; /* For recognizing IGNOREQUOTA (LMTP) */ #ifdef EXPERIMENTAL_ESMTP_LIMITS -extern const pcre *regex_LIMITS; /* For recognizing LIMITS */ +extern const pcre2_code *regex_LIMITS; /* For recognizing LIMITS */ #endif -extern const pcre *regex_PIPELINING; /* For recognizing PIPELINING */ -extern const pcre *regex_SIZE; /* For recognizing SIZE settings */ +extern const pcre2_code *regex_PIPELINING; /* For recognizing PIPELINING */ +extern const pcre2_code *regex_SIZE; /* For recognizing SIZE settings */ #ifndef DISABLE_PIPE_CONNECT -extern const pcre *regex_EARLY_PIPE; /* For recognizing PIPE_CONNCT */ +extern const pcre2_code *regex_EARLY_PIPE; /* For recognizing PIPE_CONNCT */ #endif -extern const pcre *regex_ismsgid; /* Compiled r.e. for message it */ -extern const pcre *regex_smtp_code; /* For recognizing SMTP codes */ -extern uschar *regex_vars[]; /* $regexN variables */ +extern const pcre2_code *regex_ismsgid; /* Compiled r.e. for message ID */ +extern const pcre2_code *regex_smtp_code; /* For recognizing SMTP codes */ +extern const uschar *regex_vars[]; /* $regexN variables */ #ifdef WHITELIST_D_MACROS -extern const pcre *regex_whitelisted_macro; /* For -D macro values */ +extern const pcre2_code *regex_whitelisted_macro; /* For -D macro values */ #endif #ifdef WITH_CONTENT_SCAN extern uschar *regex_match_string; /* regex that matched a line (regex ACL condition) */