X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=pfix-srsd%2Fmain-srsd.c;h=0c656f8ce5d665ebcd359238bfefba00ae2cbfe0;hb=HEAD;hp=02739c115e5d3fd52b58192c1fbc3d6b432518b7;hpb=8ca147e634f83b185dd4cddebde78878a69f315f;p=apps%2Fpfixtools.git

diff --git a/pfix-srsd/main-srsd.c b/pfix-srsd/main-srsd.c
index 02739c1..0c656f8 100644
--- a/pfix-srsd/main-srsd.c
+++ b/pfix-srsd/main-srsd.c
@@ -57,6 +57,8 @@ DECLARE_MAIN
 typedef struct srs_config_t {
     srs_t* srs;
     const char* domain;
+    int domainlen;
+    int ignore_ext;
 } srs_config_t;
 
 
@@ -75,7 +77,7 @@ static void *srsd_starter(listener_t *server)
 /* Processing {{{1
  */
 
-void urldecode(char *s, char *end)
+char *urldecode(char *s, char *end)
 {
     char *p = s;
 
@@ -92,7 +94,8 @@ void urldecode(char *s, char *end)
 
         *s++ = *p++;
     }
-    *s++ = '\0';
+    *s = '\0';
+    return s;
 }
 
 int process_srs(client_t *srsd, void* vconfig)
@@ -123,7 +126,7 @@ int process_srs(client_t *srsd, void* vconfig)
         }
 
         if (strncmp("get ", ibuf->data, 4)) {
-						err("bad request, not starting with \"get \"");
+            err("bad request, not starting with \"get \"");
             return -1;
         }
 
@@ -131,30 +134,42 @@ int process_srs(client_t *srsd, void* vconfig)
         for (q = nl++; q >= p && isspace(*q); *q-- = '\0');
 
         if (p == q) {
-            buffer_addstr(&*obuf, "400 empty request ???\n");
+            buffer_addstr(obuf, "400 empty request ???\n");
             warn("empty request");
             goto skip;
         }
 
-        urldecode(p, q);
+        q = urldecode(p, q);
 
         if (decoder) {
+            if (config->ignore_ext) {
+                int dlen = config->domainlen;
+
+                if (q - p <= dlen || q[-1 - dlen] != '@' ||
+                    memcmp(q - dlen, config->domain, dlen))
+                {
+                    buffer_addstr(obuf, "200 ");
+                    buffer_add(obuf, p, q - p);
+                    buffer_addch(obuf, '\n');
+                    goto skip;
+                }
+            }
             err = srs_reverse(config->srs, buf, ssizeof(buf), p);
         } else {
             err = srs_forward(config->srs, buf, ssizeof(buf), p, config->domain);
         }
 
         if (err == 0) {
-            buffer_addstr(&*obuf, "200 ");
-            buffer_addstr(&*obuf, buf);
+            buffer_addstr(obuf, "200 ");
+            buffer_addstr(obuf, buf);
         } else {
             switch (SRS_ERROR_TYPE(err)) {
               case SRS_ERRTYPE_SRS:
               case SRS_ERRTYPE_SYNTAX:
-                buffer_addstr(&*obuf, "500 ");
+                buffer_addstr(obuf, "500 ");
                 break;
               default:
-                buffer_addstr(&*obuf, "400 ");
+                buffer_addstr(obuf, "400 ");
                 break;
             }
             buffer_addstr(obuf, srs_strerror(err));
@@ -260,6 +275,7 @@ void usage(void)
           "                 (default: "STR(DEFAULT_DECODER_PORT)")\n"
           "    -p <pidfile> file to write our pid to\n"
           "    -u           unsafe mode: don't drop privilegies\n"
+          "    -I           do not touch mails outside of \"domain\" in decoding mode\n"
           "    -f           stay in foreground\n"
          , stderr);
 }
@@ -275,7 +291,7 @@ int main(int argc, char *argv[])
     int port_dec = DEFAULT_DECODER_PORT;
     const char *pidfile = NULL;
 
-    for (int c = 0; (c = getopt(argc, argv, "hfu" "e:d:p:")) >= 0; ) {
+    for (int c = 0; (c = getopt(argc, argv, "hfuI" "e:d:p:")) >= 0; ) {
         switch (c) {
           case 'e':
             port_enc = atoi(optarg);
@@ -292,6 +308,9 @@ int main(int argc, char *argv[])
           case 'u':
             unsafe = true;
             break;
+          case 'I':
+            config.ignore_ext = true;
+            break;
           default:
             usage();
             return EXIT_FAILURE;
@@ -310,6 +329,7 @@ int main(int argc, char *argv[])
     info("%s v%s...", DAEMON_NAME, DAEMON_VERSION);
 
     config.domain = argv[optind];
+    config.domainlen = strlen(config.domain);
     config.srs = srs_read_secrets(argv[optind + 1]);
     if (!config.srs
         || common_setup(pidfile, unsafe, RUNAS_USER, RUNAS_GROUP,