dnsbl: src/dnsbl.cpp comparison

comparison src/dnsbl.cpp @ 75:1142e46be550

start coding on new config syntax

author	carl
date	Wed, 13 Jul 2005 23:04:14 -0700
parents	b7449114ebb0
children	81f1e400e8ab

comparison

equal deleted inserted replaced

-:b7449114ebb0
+:1142e46be550
 void sig_chld(int signo);
 }
 bool debug_syslog  = false;
 bool syslog_opened = false;
-bool loader_run    = true;   // used to stop the config loader thread
+bool use_syslog    = true;  // false to printf
-CONFIG * config = NULL;      // protected by the config_mutex
+bool loader_run    = true;  // used to stop the config loader thread
-int  generation = 0;         // protected by the config_mutex
+CONFIG * config = NULL;     // protected by the config_mutex
+int  generation = 0;        // protected by the config_mutex
 pthread_mutex_t  config_mutex;
 pthread_mutex_t  syslog_mutex;
 pthread_mutex_t  resolve_mutex;
 pthread_mutex_t  fd_pool_mutex;
 char buf[1000];
 if (priv) {
 snprintf(buf, sizeof(buf), "%s: %s", priv->queueid, text);
 text = buf;
 }
-pthread_mutex_lock(&syslog_mutex);
+if (use_syslog) {
-if (!syslog_opened) {
+pthread_mutex_lock(&syslog_mutex);
-openlog("dnsbl", LOG_PID, LOG_MAIL);
+if (!syslog_opened) {
-syslog_opened = true;
+openlog("dnsbl", LOG_PID, LOG_MAIL);
-}
+syslog_opened = true;
-syslog(LOG_NOTICE, "%s", text);
+}
-pthread_mutex_unlock(&syslog_mutex);
+syslog(LOG_NOTICE, "%s", text);
+pthread_mutex_unlock(&syslog_mutex);
+}
+else {
+printf("%s \n", text);
+}
 }
 void my_syslog(char *text) {
 my_syslog(NULL, text);
 }
 //
 bool check_single(mlfiPriv &priv, int ip, char *suffix);
 bool check_single(mlfiPriv &priv, int ip, char *suffix) {
 // make a dns question
 const u_char *src = (const u_char *)&ip;
-if (src[0] == 127) return oksofar;  // don't do dns lookups on localhost
+if (src[0] == 127) return false;    // don't do dns lookups on localhost
 #ifdef NS_MAXDNAME
 char question[NS_MAXDNAME];
 #else
 char question[1000];
 #endif
 ////////////////////////////////////////////////
 //  check the dnsbls specified for this recipient
 //
 bool check_dnsbl(mlfiPriv &priv, dnsblp_list &dnsbll, DNSBLP &rejectlist);
 bool check_dnsbl(mlfiPriv &priv, dnsblp_list &dnsbll, DNSBLP &rejectlist) {
-if (priv.authenticated) return oksofar;
+if (priv.authenticated) return false;
 for (dnsblp_list::iterator i=dnsbll.begin(); i!=dnsbll.end(); i++) {
 DNSBLP dp = *i;     // non null by construction
 bool st;
 map<DNSBLP, bool>::iterator f = priv.checked.find(dp);
 if (f == priv.checked.end()) {
 ////////////////////////////////////////////////
 //  check the hosts from the body against the content dnsbl
 //
 bool check_hosts(mlfiPriv &priv, bool random, int limit, char *&host, int ip);
 bool check_hosts(mlfiPriv &priv, bool random, int limit, char *&host, int ip) {
-CONFIG &dc = *priv.pc;
+CONFIG     &dc     = *priv.pc;
 string_set &hosts  = priv.memory->get_hosts();
 string_set &ignore = dc.get_content_host_ignore();
+char       *suffix = dc.get_content_suffix();
 int count = 0;
 int   cnt = hosts.size();   // number of hosts we could look at
 int_set ips;
 ns_map  nameservers;
 }
 if (ip) {
 int_set::iterator i = ips.find(ip);
 if (i == ips.end()) {
 ips.insert(ip);
-if (check_single(priv, ip, dc.get_content_suffix())) {
+if (check_single(priv, ip, suffix)) {
 return true;
 }
 }
 }
 }
 }
 if (ip) {
 int_set::iterator i = ips.find(ip);
 if (i == ips.end()) {
 ips.insert(ip);
-if (check_single(priv, ip, dc.get_content_suffix())) {
+if (check_single(priv, ip, suffix)) {
 string_map::iterator j = nameservers.ns_host.find(host);
 if (j != nameservers.ns_host.end()) {
 char *refer = (*j).second;
 char buf[1000];
 snprintf(buf, sizeof(buf), "%s with nameserver %s", refer, host);
 return false;
 }
 ////////////////////////////////////////////////
+// this email address is passed in from sendmail, and will
+// always be enclosed in <>. It may have mixed case, just
+// as the mail client sent it. We dup the string and convert
+// the duplicate to lower case.
+//
+char *to_lower_string(char *email);
+char *to_lower_string(char *email) {
+int n = strlen(email)-2;
+if (n < 1) return strdup(email);
+char *key = strdup(email+1);
+key[n] = '\0';
+for (int i=0; i<n; i++) key[i] = tolower(key[i]);
+return key;
+}
+////////////////////////////////////////////////
 // start of sendmail milter interfaces
 //
 sfsistat mlfi_connect(SMFICTX *ctx, char *hostname, _SOCK_ADDR *hostaddr)
 {
 // allocate some private memory
 }
 sfsistat mlfi_envfrom(SMFICTX *ctx, char **from)
 {
 mlfiPriv &priv = *MLFIPRIV;
-priv.mailaddr      = strdup(from[0]);
+priv.mailaddr      = to_lower_string(from[0]);
 priv.authenticated = (smfi_getsymval(ctx, "{auth_authen}") != NULL);
 return SMFIS_CONTINUE;
 }
 sfsistat mlfi_envrcpt(SMFICTX *ctx, char **rcpt)
 {
 DNSBLP rejectlist = NULL;   // list that caused the reject
 mlfiPriv &priv = *MLFIPRIV;
 CONFIG &dc = *priv.pc;
 if (!priv.queueid) priv.queueid = strdup(smfi_getsymval(ctx, "i"));
-char *rcptaddr = rcpt[0];
+char *rcptaddr  = rcpt[0];
-CONTEXT &con = *(dc.find_context(rcptaddr, priv.mailaddr));
+char *loto      = to_lower_string(rcptaddr);
+CONTEXT     con = *(dc.find_context(loto)->find_context(priv.mailaddr));
 char *fromvalue = con.find_from(priv.mailaddr);
+free(loto);
 status st;
 if (fromvalue == token_black) {
 st = black;
 }
 else if (fromvalue == token_white) {
 void usage(char *prog);
 void usage(char *prog)
 {
-fprintf(stderr, "Usage: %s  [-d] [-c] -r port -p sm-sock-addr [-t timeout]\n", prog);
+fprintf(stderr, "Usage: %s  [-d] [-c] [-s] [-e from|to] -r port -p sm-sock-addr [-t timeout]\n", prog);
 fprintf(stderr, "where port is for the connection to our own dns resolver processes\n");
 fprintf(stderr, "    and should be local-domain-socket-file-name\n");
 fprintf(stderr, "where sm-sock-addr is for the connection to sendmail\n");
 fprintf(stderr, "    and should be one of\n");
 fprintf(stderr, "        inet:port@ip-address\n");
 fprintf(stderr, "        local:local-domain-socket-file-name\n");
 fprintf(stderr, "-c will load and dump the config to stdout\n");
+fprintf(stderr, "-s will stress test the config loading code by repeating the load/free cycle\n");
+fprintf(stderr, "        in an infinte loop.\n");
 fprintf(stderr, "-d will add some syslog debug messages\n");
+fprintf(stderr, "-e will print the results of looking up the from and to addresses in the\n");
+fprintf(stderr, "        current config. The | character is used to separate the from and to\n");
+fprintf(stderr, "        addresses in the argument to the -e switch\n");
 }
 void setup_socket(char *sock);
 int main(int argc, char**argv)
 {
 token_init();
 bool check   = false;
+bool stress  = false;
 bool setconn = false;
 bool setreso = false;
+char *email = NULL;
 int c;
-const char *args = "r:p:t:hcd";
+const char *args = "r:p:t:e:cdhs";
 extern char *optarg;
 // Process command line options
 while ((c = getopt(argc, argv, args)) != -1) {
 switch (c) {
 fprintf(stderr, "smfi_settimeout failed\n");
 exit(EX_SOFTWARE);
 }
 break;
+case 'e':
+if (email) free(email);
+email = strdup(optarg);
+break;
 case 'c':
 check = true;
+break;
+case 's':
+stress = true;
 break;
 case 'd':
 debug_syslog = true;
 break;
 exit(EX_USAGE);
 }
 }
 if (check) {
+use_syslog = false;
 CONFIG *conf = new_conf();
 if (conf) {
 conf->dump();
 delete conf;
 return 0;
 }
 else {
 return 1;   // config failed to load
 }
+}
+if (stress) {
+fprintf(stdout, "stress testing\n");
+while (1) {
+for (int i=0; i<10; i++) {
+CONFIG *conf = new_conf();
+if (conf) delete conf;
+}
+fprintf(stdout, ".");
+fflush(stdout);
+sleep(1);
+}
+}
+if (email) {
+char *x = strchr(email, '|');
+if (x) {
+*x = '\0';
+char *from = strdup(email);
+char *to   = strdup(x+1);
+use_syslog = false;
+CONFIG *conf = new_conf();
+if (conf) {
+CONTEXTP con = conf->find_context(to);
+const int maxlen = 1000;
+char buf[maxlen];
+fprintf(stdout, "envelope to   <%s> finds context %s\n", to, con->get_full_name(buf,maxlen));
+CONTEXTP fc = con->find_context(from);
+fprintf(stdout, "envelope from <%s> finds context %s\n", from, fc->get_full_name(buf,maxlen));
+char *st = fc->find_from(from);
+fprintf(stdout, "envelope from <%s> finds status %s\n", from, st);
+delete conf;
+}
+}
+return 0;
 }
 if (!setconn) {
 fprintf(stderr, "%s: Missing required -p argument\n", argv[0]);
 usage(argv[0]);

Mercurial > dnsbl

comparison src/dnsbl.cpp @ 75:1142e46be550