1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
|
diff -u protocols/protocol.cc protocols/protocol.cc
--- protocols/protocol.cc 2003-01-03 13:00:29.000000000 -0800
+++ protocols/protocol.cc 2004-08-04 12:20:34.000000000 -0700
@@ -30,10 +30,12 @@
const char* cli_help_suffix = "";
const char* cli_args_usage = "remote-address < mail-file";
const int cli_args_min = 1;
-const int cli_args_max = 1;
+const int cli_args_max = 2;
cli_option cli_options[] = {
{ 'p', "port", cli_option::integer, 0, &port,
"Set the port number on the remote host to connect to", 0 },
+ { 'a', "auth", cli_option::string, 0, &auth,
+ "Set the user and password for authentication (user,pass)", 0 } ,
{0}
};
diff -u protocols/protocol.h protocols/protocol.h
--- protocols/protocol.h 2002-12-23 10:14:53.000000000 -0800
+++ protocols/protocol.h 2004-08-04 12:21:25.000000000 -0700
@@ -8,6 +8,7 @@
// This must be provided by the protocol, but will be set by the lib.
extern int port;
+extern char* auth;
extern void protocol_prep(fdibuf* in);
extern void protocol_send(fdibuf* in, int fd);
diff -u protocols/qmqp.cc protocols/qmqp.cc
--- protocols/qmqp.cc 2003-01-03 13:00:31.000000000 -0800
+++ protocols/qmqp.cc 2004-08-04 12:21:13.000000000 -0700
@@ -31,6 +31,7 @@
#include "protocol.h"
int port = 628;
+char* auth = "";
const char* cli_program = "qmqp";
const char* cli_help_prefix = "Send an emal message via QMQP\n";
diff -u protocols/smtp.cc protocols/smtp.cc
--- protocols/smtp.cc 2003-01-03 13:00:32.000000000 -0800
+++ protocols/smtp.cc 2004-08-04 20:46:15.605469184 -0700
@@ -30,6 +30,7 @@
#include "protocol.h"
int port = 25;
+char* auth = "";
const char* cli_program = "smtp";
const char* cli_help_prefix = "Send an email message via SMTP\n";
@@ -136,6 +137,11 @@
{
}
+void to64(char* infile, char* outfile);
+void to64(const mystring& infile, mystring& outfile);
+void output64chunk(int c1, int c2, int c3, int pads, char** outfile);
+void output64chunk(int c1, int c2, int c3, int pads, mystring& outfile);
+
void protocol_send(fdibuf* in, int fd)
{
mystring hh = getenv("HELOHOST");
@@ -143,5 +149,67 @@
smtp conn(fd);
conn.docmd("", 200);
conn.docmd("HELO " + hh, 200);
+
+ if ( strlen(auth) > 0 )
+ {
+ mystring authstr = auth;
+ mystring uname = authstr.left(authstr.find_first(','));
+ mystring pass = authstr.sub(authstr.find_first(',')+1,authstr.length());
+ mystring plain = uname + "\1" + uname + "\1" + pass;
+ mystring encoded = "AUTH PLAIN ";
+ to64(plain,encoded);
+ conn.docmd(encoded,200);
+ }
conn.send(in);
}
+
+static char basis_64[] =
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+void to64(const mystring& infile, mystring& outfile)
+{
+ int c1, c2, c3;
+ size_t inpos = 0;
+ while ((c1 = infile[inpos++])) {
+ c2 = infile[inpos++];
+ if (!c2) {
+ output64chunk(c1, 0, 0, 2, outfile);
+ } else {
+ c3 = infile[inpos++];
+ if (!c3) {
+ output64chunk(c1, c2, 0, 1, outfile);
+ } else {
+ output64chunk(c1, c2, c3, 0, outfile);
+ }
+ }
+ }
+}
+
+void output64chunk(int c1, int c2, int c3, int pads, mystring& outfile)
+{
+ if (c1==1) c1 = 0;
+ if (c2==1) c2 = 0;
+ if (c3==1) c3 = 0;
+
+ char out[5];
+ out[0] = basis_64[c1>>2];
+ out[1] = basis_64[((c1 & 0x3)<< 4) | ((c2 & 0xF0) >> 4)];
+ switch (pads)
+ {
+ case 0:
+ out[2] = basis_64[((c2 & 0xF) << 2) | ((c3 & 0xC0) >>6)];
+ out[3] = basis_64[c3 & 0x3F];
+ break;
+ case 1:
+ out[2] = basis_64[((c2 & 0xF) << 2) | ((c3 & 0xC0) >>6)];
+ out[3] = '=';
+ break;
+ case 2:
+ out[2] = '=';
+ out[3] = '=';
+ break;
+ };
+ out[4] = 0;
+ outfile += out;
+}
+// vim:cin:si:ai:et:ts=2:sw=2:
|
