sipp11
/
mbsync
mirror of https://git.code.sf.net/p/isync/isync
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

patch from Daniel Resare <noa@metamatrix.se>: 

1 giving a path to a nonexistant rc-file with the -c argument dumps core

  The patch adds a check to ensure that the given rc-file is accessible

2 the error messages given from failed openssl calls are bogus

  The handles the error from SSL_connect () correctly. The bug is
  understndable since the error handling in openssl is quite obfuscated.
  Good news is that the documentation manapges has been greatly updated in
  the latest version (0.9.6). See in particular err(3), ERR_get_error(3)
  and SSL_get_error(3).

  Please note that possible SSL_ERROR_SSL type errors from SSL_read() and
  SSL_write() is not handled. This should also be fixed.

3 connecting using the STARTTLS command with an imap server that is
  configured only to accept the TLSv1 protocol gives an error because isync
  sends an SSLv2 Hello message for backwards compability. (This is the case
  with the uw-imap 2000 that ships with redhat-7.0)
  I've read RFC2595 several times to see if it says something about
  compability SSL2/SSL3 hello messages but can't find anything. IMHO the
  correct thing to do is change the default to not use SSL2/3 compability
  hello when using the STARTTLS command but use it if the imaps port is
  used. The patch implements this change

4 repeated calls to SSL_CTX_set_options overwrites the old settings (the
  values needs to be ORed together)

  fixed in the patch

patch from me@mutt.org:
	\Recent messages were put in the cur/ directory instead of new/

	give error message when the LOGIN command fails
0.9
Michael Elkins 24 years ago
parent
6dba87f0ec
commit
1db31aabd7
5 changed files with 105 additions and 31 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      config.c
  2. 115
      imap.c
  3. 4
      isync.1
  4. 4
      main.c
  5. 4
      sync.c

9
config.c
Unescape View File

@ -105,16 +105,15 @@ load_config (const char *where)
snprintf (path, sizeof (path), "%s/.isyncrc", pw->pw_dir); snprintf (path, sizeof (path), "%s/.isyncrc", pw->pw_dir);
where = path; where = path;
} }
printf ("Reading %s\n", where); printf ("Reading %s\n", where);
fp = fopen (where, "r"); fp = fopen (where, "r");
if (!fp) if (!fp)
{ {
if (errno != ENOENT) if (errno != ENOENT)
{
perror ("fopen"); perror ("fopen");
return; return;
}
} }
buf[sizeof buf - 1] = 0; buf[sizeof buf - 1] = 0;
while ((fgets (buf, sizeof (buf) - 1, fp))) while ((fgets (buf, sizeof (buf) - 1, fp)))
@ -149,11 +148,15 @@ load_config (const char *where)
{ {
(*cur)->use_imaps = 1; (*cur)->use_imaps = 1;
(*cur)->port = 993; (*cur)->port = 993;
(*cur)->use_sslv2 = 1;
(*cur)->use_sslv3 = 1;
} }
else else
{ {
global.use_imaps = 1; global.use_imaps = 1;
global.port = 993; global.port = 993;
global.use_sslv2 = 1;
global.use_sslv3 = 1;
} }
} }
#endif #endif

115
imap.c
Unescape View File

@ -120,6 +120,9 @@ verify_cert (SSL * ssl)
static int static int
init_ssl (config_t * conf) init_ssl (config_t * conf)
{ {
SSL_METHOD *method;
int options = 0;
if (!conf->cert_file) if (!conf->cert_file)
{ {
puts ("Error, CertificateFile not defined"); puts ("Error, CertificateFile not defined");
@ -127,7 +130,14 @@ init_ssl (config_t * conf)
} }
SSL_library_init (); SSL_library_init ();
SSL_load_error_strings (); SSL_load_error_strings ();
SSLContext = SSL_CTX_new (SSLv23_client_method ());
if (conf->use_tlsv1 && !conf->use_sslv2 && !conf->use_sslv3)
method = TLSv1_client_method ();
else
method = SSLv23_client_method ();
SSLContext = SSL_CTX_new (method);
if (access (conf->cert_file, F_OK)) if (access (conf->cert_file, F_OK))
{ {
if (errno != ENOENT) if (errno != ENOENT)
@ -148,11 +158,13 @@ init_ssl (config_t * conf)
} }
if (!conf->use_sslv2) if (!conf->use_sslv2)
SSL_CTX_set_options (SSLContext, SSL_OP_NO_SSLv2); options |= SSL_OP_NO_SSLv2;
if (!conf->use_sslv3) if (!conf->use_sslv3)
SSL_CTX_set_options (SSLContext, SSL_OP_NO_SSLv3); options |= SSL_OP_NO_SSLv3;
if (!conf->use_tlsv1) if (!conf->use_tlsv1)
SSL_CTX_set_options (SSLContext, SSL_OP_NO_TLSv1); options |= SSL_OP_NO_TLSv1;
SSL_CTX_set_options (SSLContext, options);
/* we check the result of the verification after SSL_connect() */ /* we check the result of the verification after SSL_connect() */
SSL_CTX_set_verify (SSLContext, SSL_VERIFY_NONE, 0); SSL_CTX_set_verify (SSLContext, SSL_VERIFY_NONE, 0);
@ -180,6 +192,40 @@ socket_write (Socket_t * sock, char *buf, size_t len)
return write (sock->fd, buf, len); return write (sock->fd, buf, len);
} }
static void
socket_perror (const char *func, Socket_t *sock, int ret)
{
#if HAVE_LIBSSL
int err;
if (sock->use_ssl)
{
switch ((err = SSL_get_error (sock->ssl, ret)))
{
case SSL_ERROR_SYSCALL:
case SSL_ERROR_SSL:
if ((err = ERR_get_error ()) == 0)
{
if (ret == 0)
fprintf (stderr, "SSL_%s:got EOF\n", func);
else
fprintf (stderr, "SSL_%s:%d:%s\n", func,
errno, strerror (errno));
}
else
fprintf (stderr, "SSL_%s:%d:%s\n", func, err,
ERR_error_string (err, 0));
return;
default:
fprintf (stderr, "SSL_%s:%d:unhandled SSL error\n", func, err);
break;
}
return;
}
#endif
perror (func);
}
/* simple line buffering */ /* simple line buffering */
static int static int
buffer_gets (buffer_t * b, char **s) buffer_gets (buffer_t * b, char **s)
@ -215,10 +261,7 @@ buffer_gets (buffer_t * b, char **s)
if (n <= 0) if (n <= 0)
{ {
if (n == -1) socket_perror ("read", b->sock, n);
perror ("read");
else
puts ("EOF");
return -1; return -1;
} }
@ -367,6 +410,7 @@ imap_exec (imap_t * imap, const char *fmt, ...)
char *cmd; char *cmd;
char *arg; char *arg;
char *arg1; char *arg1;
int n;
va_start (ap, fmt); va_start (ap, fmt);
vsnprintf (tmp, sizeof (tmp), fmt, ap); vsnprintf (tmp, sizeof (tmp), fmt, ap);
@ -375,7 +419,12 @@ imap_exec (imap_t * imap, const char *fmt, ...)
snprintf (buf, sizeof (buf), "%d %s\r\n", ++Tag, tmp); snprintf (buf, sizeof (buf), "%d %s\r\n", ++Tag, tmp);
if (Verbose) if (Verbose)
fputs (buf, stdout); fputs (buf, stdout);
socket_write (imap->sock, buf, strlen (buf)); n = socket_write (imap->sock, buf, strlen (buf));
if (n <= 0)
{
socket_perror ("write", imap->sock, n);
return -1;
}
for (;;) for (;;)
{ {
@ -459,10 +508,20 @@ imap_exec (imap_t * imap, const char *fmt, ...)
} }
resp = cram (cmd, imap->box->user, imap->box->pass); resp = cram (cmd, imap->box->user, imap->box->pass);
socket_write (imap->sock, resp, strlen (resp)); n = socket_write (imap->sock, resp, strlen (resp));
if (n <= 0)
{
socket_perror ("write", imap->sock, n);
return -1;
}
if (Verbose) if (Verbose)
puts (resp); puts (resp);
socket_write (imap->sock, "\r\n", 2); n = socket_write (imap->sock, "\r\n", 2);
if (n <= 0)
{
socket_perror ("write", imap->sock, n);
return -1;
}
free (resp); free (resp);
imap->cram = 0; imap->cram = 0;
} }
@ -629,10 +688,7 @@ imap_open (config_t * box, unsigned int minuid, imap_t * imap)
ret = SSL_connect (imap->sock->ssl); ret = SSL_connect (imap->sock->ssl);
if (ret <= 0) if (ret <= 0)
{ {
ret = SSL_get_error (imap->sock->ssl, ret); socket_perror ("connect", imap->sock, ret);
printf ("Error, SSL_connect: %s\n",
ERR_error_string (ret, 0));
ret = -1;
break; break;
} }
@ -680,7 +736,10 @@ imap_open (config_t * box, unsigned int minuid, imap_t * imap)
(ret = (ret =
imap_exec (imap, "LOGIN \"%s\" \"%s\"", box->user, imap_exec (imap, "LOGIN \"%s\" \"%s\"", box->user,
box->pass))) box->pass)))
{
puts ("Error, LOGIN failed");
break; break;
}
} }
/* get NAMESPACE info */ /* get NAMESPACE info */
@ -701,7 +760,9 @@ imap_open (config_t * box, unsigned int minuid, imap_t * imap)
fputs ("Selecting mailbox... ", stdout); fputs ("Selecting mailbox... ", stdout);
fflush (stdout); fflush (stdout);
if ((ret = imap_exec (imap, "SELECT \"%s%s\"", imap->prefix, box->box))) if (
(ret =
imap_exec (imap, "SELECT \"%s%s\"", imap->prefix, box->box)))
break; break;
printf ("%d messages, %d recent\n", imap->count, imap->recent); printf ("%d messages, %d recent\n", imap->count, imap->recent);
@ -754,22 +815,30 @@ write_strip (int fd, char *buf, size_t len)
return 0; return 0;
} }
static void static int
send_server (Socket_t * sock, const char *fmt, ...) send_server (Socket_t * sock, const char *fmt, ...)
{ {
char buf[128]; char buf[128];
char cmd[128]; char cmd[128];
va_list ap; va_list ap;
int n;
va_start (ap, fmt); va_start (ap, fmt);
vsnprintf (buf, sizeof (buf), fmt, ap); vsnprintf (buf, sizeof (buf), fmt, ap);
va_end (ap); va_end (ap);
snprintf (cmd, sizeof (cmd), "%d %s\r\n", ++Tag, buf); snprintf (cmd, sizeof (cmd), "%d %s\r\n", ++Tag, buf);
socket_write (sock, cmd, strlen (cmd)); n = socket_write (sock, cmd, strlen (cmd));
if (n <= 0)
{
socket_perror ("write", sock, n);
return -1;
}
if (Verbose) if (Verbose)
fputs (cmd, stdout); fputs (cmd, stdout);
return 0;
} }
int int
@ -847,10 +916,7 @@ imap_fetch_message (imap_t * imap, unsigned int uid, int fd)
} }
else else
{ {
if (n == (size_t) - 1) socket_perror ("read", imap->sock, n);
perror ("read");
else
puts ("EOF");
return -1; return -1;
} }
} }
@ -906,7 +972,8 @@ imap_expunge (imap_t * imap)
int int
imap_copy_message (imap_t * imap, unsigned int uid, const char *mailbox) imap_copy_message (imap_t * imap, unsigned int uid, const char *mailbox)
{ {
return imap_exec (imap, "UID COPY %u \"%s%s\"", uid, imap->prefix, mailbox); return imap_exec (imap, "UID COPY %u \"%s%s\"", uid, imap->prefix,
mailbox);
} }
int int
@ -969,7 +1036,7 @@ imap_append_message (imap_t * imap, int fd, message_t * msg)
} }
send_server (imap->sock, "APPEND %s%s %s{%d}", send_server (imap->sock, "APPEND %s%s %s{%d}",
imap->prefix, imap->box->box, flagstr, msg->size + lines); imap->prefix, imap->box->box, flagstr, msg->size + lines);
if (buffer_gets (imap->buf, &s)) if (buffer_gets (imap->buf, &s))
return -1; return -1;

4
isync.1
Unescape View File

@ -226,6 +226,8 @@ Should
.B isync .B isync
use SSLv2 for communication with the IMAP server over SSL? (Default: use SSLv2 for communication with the IMAP server over SSL? (Default:
.I yes .I yes
if the imaps port is used, otherwise
.I no
) )
.. ..
.TP .TP
@ -234,6 +236,8 @@ Should
.B isync .B isync
use SSLv3 for communication with the IMAP server over SSL? (Default: use SSLv3 for communication with the IMAP server over SSL? (Default:
.I yes .I yes
if the imaps port is used, otherwise
.I no
) )
.. ..
.TP .TP

4
main.c
Unescape View File

@ -152,8 +152,8 @@ main (int argc, char **argv)
* case people forget to turn it on * case people forget to turn it on
*/ */
global.require_ssl = 1; global.require_ssl = 1;
global.use_sslv2 = 1; global.use_sslv2 = 0;
global.use_sslv3 = 1; global.use_sslv3 = 0;
global.use_tlsv1 = 1; global.use_tlsv1 = 1;
#endif #endif

4
sync.c
Unescape View File

@ -231,7 +231,7 @@ sync_mailbox (mailbox_t * mbox, imap_t * imap, int flags,
/* construct the flags part of the file name. */ /* construct the flags part of the file name. */
*suffix = 0; *suffix = 0;
if (cur->flags) if (cur->flags & ~D_RECENT)
{ {
snprintf (suffix, sizeof (suffix), ":2,%s%s%s%s", snprintf (suffix, sizeof (suffix), ":2,%s%s%s%s",
(cur->flags & D_FLAGGED) ? "F" : "", (cur->flags & D_FLAGGED) ? "F" : "",
@ -275,7 +275,7 @@ sync_mailbox (mailbox_t * mbox, imap_t * imap, int flags,
p = strrchr (path, '/'); p = strrchr (path, '/');
snprintf (newpath, sizeof (newpath), "%s/%s%s", mbox->path, snprintf (newpath, sizeof (newpath), "%s/%s%s", mbox->path,
cur->flags ? "cur" : "new", p); (cur->flags & ~D_RECENT) ? "cur" : "new", p);
/* its ok if this fails, the next time we sync the message /* its ok if this fails, the next time we sync the message
* will get pulled down * will get pulled down

Write Preview
Loading…
Cancel
Save