diff -Nur qmail-1.03/Makefile qmail-1.03-new/Makefile --- qmail-1.03/Makefile Mon Jun 15 12:53:16 1998 +++ qmail-1.03-new/Makefile Tue Mar 18 22:54:42 2003 @@ -136,6 +136,10 @@ compile auto_usera.c ./compile auto_usera.c +base64.o: \ +compile base64.c + ./compile base64.c + binm1: \ binm1.sh conf-qmail cat binm1.sh \ @@ -941,6 +945,14 @@ mbox.5 nroff -man mbox.5 > mbox.0 +myMd5.o: \ +compile myMd5.c + ./compile myMd5.c + +myMd5Keyed.o: \ +compile myMd5Keyed.c + ./compile myMd5Keyed.c + myctime.o: \ compile myctime.c datetime.h fmt.h myctime.h ./compile myctime.c @@ -1440,10 +1452,12 @@ qmail-remote: \ load qmail-remote.o control.o constmap.o timeoutread.o timeoutwrite.o \ timeoutconn.o tcpto.o now.o dns.o ip.o ipalloc.o ipme.o quote.o \ +base64.o myMd5.o myMd5Keyed.o \ ndelay.a case.a sig.a open.a lock.a seek.a getln.a stralloc.a alloc.a \ substdio.a error.a str.a fs.a auto_qmail.o dns.lib socket.lib ./load qmail-remote control.o constmap.o timeoutread.o \ timeoutwrite.o timeoutconn.o tcpto.o now.o dns.o ip.o \ + base64.o myMd5.o myMd5Keyed.o \ ipalloc.o ipme.o quote.o ndelay.a case.a sig.a open.a \ lock.a seek.a getln.a stralloc.a alloc.a substdio.a error.a \ str.a fs.a auto_qmail.o `cat dns.lib` `cat socket.lib` diff -Nur qmail-1.03/TARGETS qmail-1.03-new/TARGETS --- qmail-1.03/TARGETS Mon Jun 15 12:53:16 1998 +++ qmail-1.03-new/TARGETS Tue Mar 18 22:55:24 2003 @@ -103,6 +103,9 @@ str_chr.o str_rchr.o str_start.o +base64.o +myMd5.o +myMd5Keyed.o byte_chr.o byte_rchr.o byte_diff.o diff -Nur qmail-1.03/base64.c qmail-1.03-new/base64.c --- qmail-1.03/base64.c Thu Jan 1 01:00:00 1970 +++ qmail-1.03-new/base64.c Tue Mar 18 22:29:49 2003 @@ -0,0 +1,106 @@ +#include "stralloc.h" + +static char numToChar[66]="ABCDEFGHIJKLMNOPQRSTUVWXYZ" + "abcdefghijklmnopqrstuvwxyz" + "0123456789+/="; + +/* + * Return value: 0 -> success + * 1 -> stralloc_append failed (no memory) + * 2 -> illegal length of src + */ +int base64Encode(dst,src,len) +stralloc *dst; +unsigned char *src; +int len; +{ + if (len<0) return 2; + dst->len=0; + while (len>=3) { + if ( !stralloc_append(dst,&(numToChar[src[0]>>2])) ) + return 1; + if ( !stralloc_append(dst,&(numToChar[((src[0]<<4)|(src[1]>>4))&0x3f])) ) + return 1; + if ( !stralloc_append(dst,&(numToChar[((src[1]<<2)|(src[2]>>6))&0x3f])) ) + return 1; + if ( !stralloc_append(dst,&(numToChar[(src[2]&0x3f)])) ) + return 1; + src+=3; + len-=3; + } + if (len==0) + return 0; + + if ( !stralloc_append(dst,&(numToChar[src[0]>>2])) ) + return 1; + + if (len==1) { + if (!stralloc_append(dst,&(numToChar[(src[0]<<4)&0x3f]))) + return 1; + if (!stralloc_append(dst,&(numToChar[64]))) + return 1; + if (!stralloc_append(dst,&(numToChar[64]))) + return 1; + return 0; + } + + if ( !stralloc_append(dst,&(numToChar[((src[0]<<4)|(src[1]>>4))&0x3f])) ) + return 1; + if ( !stralloc_append(dst,&(numToChar[(src[1]<<2)&0x3f])) ) + return 1; + if ( !stralloc_append(dst,&(numToChar[64])) ) + return 1; + return 0; +} + +static unsigned int charToNum(unsigned char src) +{ + if (src>='A' && src<='Z') + return (int)(src-'A'); + + if (src>='a' && src<='z') + return ((int)(src-'a'))+26; + + if (src>='0' && src<='9') + return ((int)(src-'0'))+52; + + if (src=='+') return 62; + if (src=='/') return 63; + return 100; +} + +/* + * Return value: 0 -> success + * 1 -> stralloc_append failed (no memory) + * 2 -> illegal character + */ +int base64Decode(dst,src,len) +stralloc *dst; +unsigned char *src; +int len; +{ + unsigned int h1,h2; + unsigned char ch; + dst->len=0; + while (len>3) + { + if ( (h1=charToNum(*(src++))) > 63) return 0; + if ( (h2=charToNum(*(src++))) > 63) return 2; + ch=( (h1<<2)|(h2>>4) ); + if (!stralloc_append(dst,&ch)) return 1; + + if (*src=='=') return 0; + h1=h2; + if ( (h2=charToNum(*(src++))) > 63) return 2; + ch=( (h1<<4)|(h2>>2) ); + if (!stralloc_append(dst,&ch)) return 1; + + if (*src=='=') return 0; + h1=h2; + if ( (h2=charToNum(*(src++))) > 63) return 2; + ch=( (h1<<6)|h2 ); + if (!stralloc_append(dst,&ch)) return 1; + len-=4; + } + return 0; +} diff -Nur qmail-1.03/base64.h qmail-1.03-new/base64.h --- qmail-1.03/base64.h Thu Jan 1 01:00:00 1970 +++ qmail-1.03-new/base64.h Tue Mar 18 22:29:49 2003 @@ -0,0 +1,2 @@ +int base64Encode(); +int base64Decode(); diff -Nur qmail-1.03/myMd5.c qmail-1.03-new/myMd5.c --- qmail-1.03/myMd5.c Thu Jan 1 01:00:00 1970 +++ qmail-1.03-new/myMd5.c Tue Mar 18 22:29:43 2003 @@ -0,0 +1,290 @@ +/* MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm */ + +/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All + rights reserved. + + License to copy and use this software is granted provided that it + is identified as the "RSA Data Security, Inc. MD5 Message-Digest + Algorithm" in all material mentioning or referencing this software + or this function. + + License is also granted to make and use derivative works provided + that such works are identified as "derived from the RSA Data + Security, Inc. MD5 Message-Digest Algorithm" in all material + mentioning or referencing the derived work. + + RSA Data Security, Inc. makes no representations concerning either + the merchantability of this software or the suitability of this + software for any particular purpose. It is provided "as is" + without express or implied warranty of any kind. + + These notices must be retained in any copies of any part of this + documentation and/or software. + + Modified to fit my needs and style by Ingo Rohloff. + */ + +#include "myMd5.h" + +/* Constants for MD5Transform routine. */ +#define S11 7 +#define S12 12 +#define S13 17 +#define S14 22 +#define S21 5 +#define S22 9 +#define S23 14 +#define S24 20 +#define S31 4 +#define S32 11 +#define S33 16 +#define S34 23 +#define S41 6 +#define S42 10 +#define S43 15 +#define S44 21 + +static void md5Transform(unsigned int out[4],unsigned char[64]); +static void lsbEncode (unsigned char *out, unsigned int *in, + unsigned int len); +static void lsbDecode (unsigned int *out,unsigned char *in, + unsigned int len); + +static unsigned char PADDING[64] = { + 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 +}; + +/* F, G, H and I are basic MD5 functions. + */ +#define F(x, y, z) (((x) & (y)) | ((~x) & (z))) +#define G(x, y, z) (((x) & (z)) | ((y) & (~z))) +#define H(x, y, z) ((x) ^ (y) ^ (z)) +#define I(x, y, z) ((y) ^ ((x) | (~z))) + +/* ROTATE_LEFT rotates x left n bits. + */ +#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n)))) + +/* FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4. + Rotation is separate from addition to prevent recomputation. + */ +#define FF(a, b, c, d, x, s, ac) { \ + (a) += F ((b), (c), (d)) + (x) + (unsigned int)(ac); \ + (a) = ROTATE_LEFT ((a), (s)); \ + (a) += (b); \ + } +#define GG(a, b, c, d, x, s, ac) { \ + (a) += G ((b), (c), (d)) + (x) + (unsigned int)(ac); \ + (a) = ROTATE_LEFT ((a), (s)); \ + (a) += (b); \ + } +#define HH(a, b, c, d, x, s, ac) { \ + (a) += H ((b), (c), (d)) + (x) + (unsigned int)(ac); \ + (a) = ROTATE_LEFT ((a), (s)); \ + (a) += (b); \ + } +#define II(a, b, c, d, x, s, ac) { \ + (a) += I ((b), (c), (d)) + (x) + (unsigned int)(ac); \ + (a) = ROTATE_LEFT ((a), (s)); \ + (a) += (b); \ + } + +/* MD5 initialization. Begins an MD5 operation, writing a new context. + */ +void md5Init(md5ctxP context) +{ + context->count[0] = context->count[1] = 0; + + /* Load magic initialization constants. + */ + context->state[0] = 0x67452301; + context->state[1] = 0xefcdab89; + context->state[2] = 0x98badcfe; + context->state[3] = 0x10325476; +} + +/* MD5 block update operation. Continues an MD5 message-digest + operation, processing another message block, and updating the + context. + */ +void md5Update (md5ctxP context, + unsigned char *input, + unsigned int inputLen) +{ + unsigned int i, index, partLen; + + /* Compute number of bytes mod 64 */ + index = (context->count[0]/8) & 0x3F; + + /* Update number of bits */ + if ( (context->count[0] += inputLen*8) < inputLen*8 ) + context->count[1]++; + context->count[1] += (inputLen >> 29); + + partLen = 64 - index; + + /* + Transform as many times as possible. + */ + if (inputLen >= partLen) + { + memcpy(&(context->buffer[index]), input, partLen); + md5Transform(context->state, context->buffer); + + for (i = partLen; i + 63 < inputLen; i += 64) + md5Transform(context->state, &input[i]); + + index = 0; + } + else + i = 0; + + /* Buffer remaining input */ + memcpy(&(context->buffer[index]), &(input[i]), inputLen-i); +} + +/* MD5 finalization. Ends an MD5 message-digest operation, writing the + the message digest and zeroizing the context. + */ +void md5Final(unsigned char *digest, md5ctxP context) +{ + unsigned char bits[8]; + unsigned int index, padLen; + + /* Save number of bits */ + lsbEncode(bits, context->count, 8); + + /* Pad out to 56 mod 64. */ + index = (context->count[0]/8) & 0x3f; + padLen = (index < 56) ? (56 - index) : (120 - index); + md5Update (context, PADDING, padLen); + + /* Append length (before padding) */ + md5Update (context, bits, 8); + + /* Store state in digest */ + lsbEncode (digest, context->state, 16); +} + +/* + MD5 basic transformation. Transforms state based on block. + */ +static void md5Transform (unsigned int *state, unsigned char *block) +{ + unsigned int a = state[0], b = state[1], c = state[2], d = state[3]; + unsigned int x[16]; + + lsbDecode (x, block, 64); + + /* Round 1 */ + FF (a, b, c, d, x[ 0], S11, 0xd76aa478); /* 1 */ + FF (d, a, b, c, x[ 1], S12, 0xe8c7b756); /* 2 */ + FF (c, d, a, b, x[ 2], S13, 0x242070db); /* 3 */ + FF (b, c, d, a, x[ 3], S14, 0xc1bdceee); /* 4 */ + FF (a, b, c, d, x[ 4], S11, 0xf57c0faf); /* 5 */ + FF (d, a, b, c, x[ 5], S12, 0x4787c62a); /* 6 */ + FF (c, d, a, b, x[ 6], S13, 0xa8304613); /* 7 */ + FF (b, c, d, a, x[ 7], S14, 0xfd469501); /* 8 */ + FF (a, b, c, d, x[ 8], S11, 0x698098d8); /* 9 */ + FF (d, a, b, c, x[ 9], S12, 0x8b44f7af); /* 10 */ + FF (c, d, a, b, x[10], S13, 0xffff5bb1); /* 11 */ + FF (b, c, d, a, x[11], S14, 0x895cd7be); /* 12 */ + FF (a, b, c, d, x[12], S11, 0x6b901122); /* 13 */ + FF (d, a, b, c, x[13], S12, 0xfd987193); /* 14 */ + FF (c, d, a, b, x[14], S13, 0xa679438e); /* 15 */ + FF (b, c, d, a, x[15], S14, 0x49b40821); /* 16 */ + + /* Round 2 */ + GG (a, b, c, d, x[ 1], S21, 0xf61e2562); /* 17 */ + GG (d, a, b, c, x[ 6], S22, 0xc040b340); /* 18 */ + GG (c, d, a, b, x[11], S23, 0x265e5a51); /* 19 */ + GG (b, c, d, a, x[ 0], S24, 0xe9b6c7aa); /* 20 */ + GG (a, b, c, d, x[ 5], S21, 0xd62f105d); /* 21 */ + GG (d, a, b, c, x[10], S22, 0x2441453); /* 22 */ + GG (c, d, a, b, x[15], S23, 0xd8a1e681); /* 23 */ + GG (b, c, d, a, x[ 4], S24, 0xe7d3fbc8); /* 24 */ + GG (a, b, c, d, x[ 9], S21, 0x21e1cde6); /* 25 */ + GG (d, a, b, c, x[14], S22, 0xc33707d6); /* 26 */ + GG (c, d, a, b, x[ 3], S23, 0xf4d50d87); /* 27 */ + GG (b, c, d, a, x[ 8], S24, 0x455a14ed); /* 28 */ + GG (a, b, c, d, x[13], S21, 0xa9e3e905); /* 29 */ + GG (d, a, b, c, x[ 2], S22, 0xfcefa3f8); /* 30 */ + GG (c, d, a, b, x[ 7], S23, 0x676f02d9); /* 31 */ + GG (b, c, d, a, x[12], S24, 0x8d2a4c8a); /* 32 */ + + /* Round 3 */ + HH (a, b, c, d, x[ 5], S31, 0xfffa3942); /* 33 */ + HH (d, a, b, c, x[ 8], S32, 0x8771f681); /* 34 */ + HH (c, d, a, b, x[11], S33, 0x6d9d6122); /* 35 */ + HH (b, c, d, a, x[14], S34, 0xfde5380c); /* 36 */ + HH (a, b, c, d, x[ 1], S31, 0xa4beea44); /* 37 */ + HH (d, a, b, c, x[ 4], S32, 0x4bdecfa9); /* 38 */ + HH (c, d, a, b, x[ 7], S33, 0xf6bb4b60); /* 39 */ + HH (b, c, d, a, x[10], S34, 0xbebfbc70); /* 40 */ + HH (a, b, c, d, x[13], S31, 0x289b7ec6); /* 41 */ + HH (d, a, b, c, x[ 0], S32, 0xeaa127fa); /* 42 */ + HH (c, d, a, b, x[ 3], S33, 0xd4ef3085); /* 43 */ + HH (b, c, d, a, x[ 6], S34, 0x4881d05); /* 44 */ + HH (a, b, c, d, x[ 9], S31, 0xd9d4d039); /* 45 */ + HH (d, a, b, c, x[12], S32, 0xe6db99e5); /* 46 */ + HH (c, d, a, b, x[15], S33, 0x1fa27cf8); /* 47 */ + HH (b, c, d, a, x[ 2], S34, 0xc4ac5665); /* 48 */ + + /* Round 4 */ + II (a, b, c, d, x[ 0], S41, 0xf4292244); /* 49 */ + II (d, a, b, c, x[ 7], S42, 0x432aff97); /* 50 */ + II (c, d, a, b, x[14], S43, 0xab9423a7); /* 51 */ + II (b, c, d, a, x[ 5], S44, 0xfc93a039); /* 52 */ + II (a, b, c, d, x[12], S41, 0x655b59c3); /* 53 */ + II (d, a, b, c, x[ 3], S42, 0x8f0ccc92); /* 54 */ + II (c, d, a, b, x[10], S43, 0xffeff47d); /* 55 */ + II (b, c, d, a, x[ 1], S44, 0x85845dd1); /* 56 */ + II (a, b, c, d, x[ 8], S41, 0x6fa87e4f); /* 57 */ + II (d, a, b, c, x[15], S42, 0xfe2ce6e0); /* 58 */ + II (c, d, a, b, x[ 6], S43, 0xa3014314); /* 59 */ + II (b, c, d, a, x[13], S44, 0x4e0811a1); /* 60 */ + II (a, b, c, d, x[ 4], S41, 0xf7537e82); /* 61 */ + II (d, a, b, c, x[11], S42, 0xbd3af235); /* 62 */ + II (c, d, a, b, x[ 2], S43, 0x2ad7d2bb); /* 63 */ + II (b, c, d, a, x[ 9], S44, 0xeb86d391); /* 64 */ + + state[0] += a; + state[1] += b; + state[2] += c; + state[3] += d; +} + +/* + encodes an array of ints into an array of chars using + least significant byte first order. +*/ +static void lsbEncode (unsigned char *output, unsigned int *input, + unsigned int len) +{ + unsigned int i, j; + + for (i = 0, j = 0; j < len; i++, j += 4) + { + output[j] = (unsigned char)(input[i] & 0xff); + output[j+1] = (unsigned char)((input[i] >> 8) & 0xff); + output[j+2] = (unsigned char)((input[i] >> 16) & 0xff); + output[j+3] = (unsigned char)((input[i] >> 24) & 0xff); + } +} + +/* + decodes an array of chars into an array of ints using + least significant byte first order. + */ +static void lsbDecode (unsigned int *output, unsigned char *input, + unsigned int len) +{ + unsigned int i, j; + + for (i = 0, j = 0; j < len; i++, j += 4) + output[i] = + ((unsigned int)input[j]) | (((unsigned int)input[j+1]) << 8) | + (((unsigned int)input[j+2]) << 16) | (((unsigned int)input[j+3]) << 24); +} diff -Nur qmail-1.03/myMd5.h qmail-1.03-new/myMd5.h --- qmail-1.03/myMd5.h Thu Jan 1 01:00:00 1970 +++ qmail-1.03-new/myMd5.h Tue Mar 18 22:29:43 2003 @@ -0,0 +1,42 @@ +/* MD5.H - header file for MD5C.C + */ + +/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All + rights reserved. + + License to copy and use this software is granted provided that it + is identified as the "RSA Data Security, Inc. MD5 Message-Digest + Algorithm" in all material mentioning or referencing this software + or this function. + + License is also granted to make and use derivative works provided + that such works are identified as "derived from the RSA Data + Security, Inc. MD5 Message-Digest Algorithm" in all material + mentioning or referencing the derived work. + + RSA Data Security, Inc. makes no representations concerning either + the merchantability of this software or the suitability of this + software for any particular purpose. It is provided "as is" + without express or implied warranty of any kind. + + These notices must be retained in any copies of any part of this + documentation and/or software. + + Modified to fit my needs and style by Ingo Rohloff + */ + +#ifndef _MD5_H_ +#define _MD5_H_ 1 + +/* MD5 context. */ +typedef struct { + unsigned int state[4]; /* state (ABCD) */ + unsigned int count[2]; /* number of bits, modulo 2^64 (lsb first) */ + unsigned char buffer[64]; /* input buffer */ +} md5ctxT,*md5ctxP; + +void md5Init(md5ctxP context); +void md5Update (md5ctxP context, unsigned char *input, unsigned int inputLen); +void md5Final(unsigned char *digest, md5ctxP context); + +#endif diff -Nur qmail-1.03/myMd5Keyed.c qmail-1.03-new/myMd5Keyed.c --- qmail-1.03/myMd5Keyed.c Thu Jan 1 01:00:00 1970 +++ qmail-1.03-new/myMd5Keyed.c Tue Mar 18 22:29:43 2003 @@ -0,0 +1,47 @@ +#include "stralloc.h" +#include "myMd5.h" + +static char numToChar[17]="0123456789abcdef"; + +/* + * Return values : 0 -> success + * 1 -> stralloc_append failed (no memory) + */ +int md5Keyed(digest,text,textLen,key,keyLen) +stralloc *digest; +unsigned char *text; +unsigned int textLen; +unsigned char *key; +unsigned int keyLen; +{ + int i; + md5ctxT ctx; + unsigned char ipad[64]; + unsigned char opad[64]; + unsigned char tmp[16]; + + for (i=0;i>4]))) return 1; + if (!stralloc_append(digest,&(numToChar[tmp[i]&0xF]))) return 1; + } + return 0; +} diff -Nur qmail-1.03/myMd5Keyed.h qmail-1.03-new/myMd5Keyed.h --- qmail-1.03/myMd5Keyed.h Thu Jan 1 01:00:00 1970 +++ qmail-1.03-new/myMd5Keyed.h Tue Mar 18 22:29:43 2003 @@ -0,0 +1 @@ +int md5Keyed(); diff -Nur qmail-1.03/qmail-remote.c qmail-1.03-new/qmail-remote.c --- qmail-1.03/qmail-remote.c Mon Jun 15 12:53:16 1998 +++ qmail-1.03-new/qmail-remote.c Tue Apr 6 00:02:28 2004 @@ -28,6 +28,8 @@ #include "timeoutconn.h" #include "timeoutread.h" #include "timeoutwrite.h" +#include "base64.h" +#include "myMd5Keyed.h" #define HUGESMTPTEXT 5000 @@ -41,6 +43,8 @@ stralloc helohost = {0}; stralloc routes = {0}; struct constmap maproutes; +stralloc secrets = {0}; +struct constmap mapsecrets; stralloc host = {0}; stralloc sender = {0}; @@ -131,6 +135,58 @@ stralloc smtptext = {0}; +int flagauthcrammd5 = 0; +int flagauthplain = 0; +int flagauthlogin = 0; +char *stateMatchChar="plain login cram-md5 "; +void scan_auth_flags(pos) /* Overkill but hey, I was bored */ +int pos; +{ + int state; + unsigned char c; + state=300; + while (pos='A' && c<='Z' ) c+=('a'-'A'); + if (state<21) + { + if ( c==stateMatchChar[state] ) + { + if (stateMatchChar[state]==' ') + { + if (state==5) flagauthplain=1; + if (state==11) flagauthlogin=1; + if (state==20) flagauthcrammd5=1; + state=300; + } + else + state++; + pos++; + } + else + state=301; + } + else if (state==300) + { + if (c=='p') state=0; + if (c=='l') state=6; + if (c=='c') state=12; + if (state==300 && c!=' ') state=301; + if (state==300) pos++; + } + else if (state==301) + { + if (c==' ') state=300; + if (state==301) pos++; + } + } + if (state==5) flagauthplain=1; + if (state==11) flagauthlogin=1; + if (state==20) flagauthcrammd5=1; +} + void get(ch) char *ch; { @@ -140,25 +196,34 @@ if (!stralloc_append(&smtptext,ch)) temp_nomem(); } -unsigned long smtpcode() +unsigned long smtpcode(flagehlo) +int flagehlo; { unsigned char ch; unsigned long code; - + unsigned int pos; + if (!stralloc_copys(&smtptext,"")) temp_nomem(); - + get(&ch); code = ch - '0'; get(&ch); code = code * 10 + (ch - '0'); get(&ch); code = code * 10 + (ch - '0'); for (;;) { get(&ch); + pos=smtptext.len; if (ch != '-') break; while (ch != '\n') get(&ch); + if (flagehlo) + if (!case_diffb("AUTH",4,smtptext.s+pos)) + scan_auth_flags(pos+4); get(&ch); get(&ch); get(&ch); } while (ch != '\n') get(&ch); + if (flagehlo) + if (!case_diffb("AUTH",4,smtptext.s+pos)) + scan_auth_flags(pos+4); return code; } @@ -214,6 +279,107 @@ substdio_flush(&smtpto); } +char * remotesecret = 0; +char * remoteuser = 0; + +stralloc challenge = {0}; +stralloc response = {0}; + +int smtp_auth_crammd5() +{ + unsigned long code; + + substdio_puts(&smtpto,"AUTH CRAM-MD5\r\n"); + substdio_flush(&smtpto); + code = smtpcode(0); + if (code != 334) return 1; + if (smtptext.len<8) return 1; + + switch (base64Decode(&challenge,smtptext.s+4,smtptext.len-4)) { + case 1: + temp_nomem(); + case 2: + return 2; + } + if (!stralloc_copys(&response,remoteuser)) temp_nomem(); + if (!stralloc_catb(&response," ",1)) temp_nomem(); + if (md5Keyed(&response,challenge.s,challenge.len, + remotesecret,str_len(remotesecret))) temp_nomem(); + if (base64Encode(&challenge,response.s,response.len)) temp_nomem(); + if (!stralloc_catb(&challenge,"\r\n",2)) temp_nomem(); + substdio_put(&smtpto,challenge.s,challenge.len); + substdio_flush(&smtpto); + code=smtpcode(0); + if (code!=235) return 3; + return 0; +} + +int smtp_auth_plain() +{ + unsigned long code; + char nullChar; + + nullChar=0; + if (!stralloc_copys(&challenge,remoteuser)) temp_nomem(); + if (!stralloc_append(&challenge,&nullChar)) temp_nomem(); + if (!stralloc_cats(&challenge,remoteuser)) temp_nomem(); + if (!stralloc_append(&challenge,&nullChar)) temp_nomem(); + if (!stralloc_cats(&challenge,remotesecret)) temp_nomem(); + if (base64Encode(&response,challenge.s,challenge.len)) temp_nomem(); + if (!stralloc_copyb(&challenge,"AUTH PLAIN ",11)) temp_nomem(); + if (!stralloc_cat(&challenge,&response)) temp_nomem(); + if (!stralloc_catb(&challenge,"\r\n",2)) temp_nomem(); + substdio_put(&smtpto,challenge.s,challenge.len); + substdio_flush(&smtpto); + code=smtpcode(0); + if (code!=235) return 3; + return 0; +} + +int smtp_auth_login() +{ + unsigned long code; + + substdio_put(&smtpto,"AUTH LOGIN\r\n",12); + substdio_flush(&smtpto); + code=smtpcode(0); + if (code!=334) return 1; + if (!stralloc_copys(&challenge,remoteuser)) temp_nomem(); + if (base64Encode(&response,challenge.s,challenge.len)) temp_nomem(); + if (!stralloc_catb(&response,"\r\n",2)) temp_nomem(); + substdio_put(&smtpto,response.s,response.len); + substdio_flush(&smtpto); + code=smtpcode(0); + if (code!=334) return 1; + if (!stralloc_copys(&challenge,remotesecret)) temp_nomem(); + if (base64Encode(&response,challenge.s,challenge.len)) temp_nomem(); + if (!stralloc_catb(&response,"\r\n",2)) temp_nomem(); + substdio_put(&smtpto,response.s,response.len); + substdio_flush(&smtpto); + code=smtpcode(0); + if (code!=235) return 3; + return 0; +} + +void smtp_auth() +{ + if (remotesecret==0 || remoteuser==0) return; + + if (flagauthcrammd5) + if (!smtp_auth_crammd5()) + return; + + if (flagauthplain) + if (!smtp_auth_plain()) + return; + + if (flagauthlogin) + if (!smtp_auth_login()) + return; + + quit("ZNo valid authentication method for","found"); +} + stralloc recip = {0}; void smtp() @@ -222,19 +388,32 @@ int flagbother; int i; - if (smtpcode() != 220) quit("ZConnected to "," but greeting failed"); + if (smtpcode(0) != 220) quit("ZConnected to "," but greeting failed"); - substdio_puts(&smtpto,"HELO "); + substdio_puts(&smtpto,"EHLO "); substdio_put(&smtpto,helohost.s,helohost.len); substdio_puts(&smtpto,"\r\n"); substdio_flush(&smtpto); - if (smtpcode() != 250) quit("ZConnected to "," but my name was rejected"); - + if (smtpcode(1)==250) + { + smtp_auth(); + } + else + { + /* handle braindead mailservers, which don't understand EHLO */ + substdio_puts(&smtpto,"HELO "); + substdio_put(&smtpto,helohost.s,helohost.len); + substdio_puts(&smtpto,"\r\n"); + substdio_flush(&smtpto); + if (smtpcode(0) != 250) + quit("ZConnected to "," but my name was rejected"); + } + substdio_puts(&smtpto,"MAIL FROM:<"); substdio_put(&smtpto,sender.s,sender.len); substdio_puts(&smtpto,">\r\n"); substdio_flush(&smtpto); - code = smtpcode(); + code = smtpcode(0); if (code >= 500) quit("DConnected to "," but sender was rejected"); if (code >= 400) quit("ZConnected to "," but sender was rejected"); @@ -244,7 +423,7 @@ substdio_put(&smtpto,reciplist.sa[i].s,reciplist.sa[i].len); substdio_puts(&smtpto,">\r\n"); substdio_flush(&smtpto); - code = smtpcode(); + code = smtpcode(0); if (code >= 500) { out("h"); outhost(); out(" does not like recipient.\n"); outsmtptext(); zero(); @@ -261,12 +440,12 @@ if (!flagbother) quit("DGiving up on ",""); substdio_putsflush(&smtpto,"DATA\r\n"); - code = smtpcode(); + code = smtpcode(0); if (code >= 500) quit("D"," failed on DATA command"); if (code >= 400) quit("Z"," failed on DATA command"); blast(); - code = smtpcode(); + code = smtpcode(0); flagcritical = 0; if (code >= 500) quit("D"," failed after I sent the message"); if (code >= 400) quit("Z"," failed after I sent the message"); @@ -324,6 +503,14 @@ case 1: if (!constmap_init(&maproutes,routes.s,routes.len,1)) temp_nomem(); break; } + switch(control_readfile(&secrets,"control/remotesecrets",0)) { + case -1: + temp_control(); + case 0: + if (!constmap_init(&mapsecrets,"",0,1)) temp_nomem(); break; + case 1: + if (!constmap_init(&mapsecrets,secrets.s,secrets.len,1)) temp_nomem(); break; + } } void main(argc,argv) @@ -361,8 +548,18 @@ relayhost[i] = 0; } if (!stralloc_copys(&host,relayhost)) temp_nomem(); + remoteuser = constmap(&mapsecrets,host.s,host.len); + if (remoteuser && !*remoteuser) remoteuser = 0; + if (remoteuser) + { + i = str_chr(remoteuser,':'); + if (remoteuser[i]) { + remoteuser[i] = 0; + remotesecret = remoteuser+i+1; + if (!*remotesecret) remotesecret = 0; + } + } } - addrmangle(&sender,argv[2],&flagalias,0);