lobo/isync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

factor out ensure_user() and ensure_password()

Browse Source
This commit is contained in:
Oswald Buddenhagen 2014-07-27 19:29:07 +02:00
parent 1217193fbb
commit 360600b98d
1 changed files with 39 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/drv_imap.c
View File

@ -1648,23 +1648,19 @@ imap_open_store_authenticate_p3( imap_store_t *ctx, struct imap_cmd *cmd ATTR_UN
} }
#endif #endif
static void static const char *
imap_open_store_authenticate2( imap_store_t *ctx ) ensure_user( imap_server_conf_t *srvc )
{ {
imap_store_conf_t *cfg = (imap_store_conf_t *)ctx->gen.conf;
imap_server_conf_t *srvc = cfg->server;
string_list_t *mech, *cmech;
char *arg;
#ifdef HAVE_LIBSSL
int auth_cram = 0;
#endif
int auth_login = 0;
info ("Logging in...\n");
if (!srvc->user) { if (!srvc->user) {
error( "Skipping account %s, no user\n", srvc->name ); error( "Skipping account %s, no user\n", srvc->name );
goto bail; return 0;
} }
return srvc->user;
}
static const char *
ensure_password( imap_server_conf_t *srvc )
{
if (srvc->pass_cmd) { if (srvc->pass_cmd) {
FILE *fp; FILE *fp;
int ret; int ret;
@ -1673,7 +1669,7 @@ imap_open_store_authenticate2( imap_store_t *ctx )
if (!(fp = popen( srvc->pass_cmd, "r" ))) { if (!(fp = popen( srvc->pass_cmd, "r" ))) {
pipeerr: pipeerr:
sys_error( "Skipping account %s, password command failed", srvc->name ); sys_error( "Skipping account %s, password command failed", srvc->name );
goto bail; return 0;
} }
if (!fgets( buffer, sizeof(buffer), fp )) if (!fgets( buffer, sizeof(buffer), fp ))
buffer[0] = 0; buffer[0] = 0;
@ -1684,33 +1680,46 @@ imap_open_store_authenticate2( imap_store_t *ctx )
error( "Skipping account %s, password command crashed\n", srvc->name ); error( "Skipping account %s, password command crashed\n", srvc->name );
else else
error( "Skipping account %s, password command exited with status %d\n", srvc->name, WEXITSTATUS( ret ) ); error( "Skipping account %s, password command exited with status %d\n", srvc->name, WEXITSTATUS( ret ) );
goto bail; return 0;
} }
if (!buffer[0]) { if (!buffer[0]) {
error( "Skipping account %s, password command produced no output\n", srvc->name ); error( "Skipping account %s, password command produced no output\n", srvc->name );
goto bail; return 0;
} }
buffer[strcspn( buffer, "\n" )] = 0; /* Strip trailing newline */ buffer[strcspn( buffer, "\n" )] = 0; /* Strip trailing newline */
free( srvc->pass ); /* From previous runs */ free( srvc->pass ); /* From previous runs */
srvc->pass = nfstrdup( buffer ); srvc->pass = nfstrdup( buffer );
} else if (!srvc->pass) { } else if (!srvc->pass) {
char prompt[80]; char *pass, prompt[80];
sprintf( prompt, "Password (%s): ", srvc->name ); sprintf( prompt, "Password (%s): ", srvc->name );
arg = getpass( prompt ); pass = getpass( prompt );
if (!arg) { if (!pass) {
perror( "getpass" ); perror( "getpass" );
exit( 1 ); exit( 1 );
} }
if (!*arg) { if (!*pass) {
error( "Skipping account %s, no password\n", srvc->name ); error( "Skipping account %s, no password\n", srvc->name );
goto bail; return 0;
} }
/* /* getpass() returns a pointer to a static buffer. Make a copy for long term storage. */
* getpass() returns a pointer to a static buffer. make a copy srvc->pass = nfstrdup( pass );
* for long term storage.
*/
srvc->pass = nfstrdup( arg );
} }
return srvc->pass;
}
static void
imap_open_store_authenticate2( imap_store_t *ctx )
{
imap_store_conf_t *cfg = (imap_store_conf_t *)ctx->gen.conf;
imap_server_conf_t *srvc = cfg->server;
string_list_t *mech, *cmech;
#ifdef HAVE_LIBSSL
int auth_cram = 0;
#endif
int auth_login = 0;
info( "Logging in...\n" );
for (mech = srvc->auth_mechs; mech; mech = mech->next) { for (mech = srvc->auth_mechs; mech; mech = mech->next) {
int any = !strcmp( mech->string, "*" ); int any = !strcmp( mech->string, "*" );
for (cmech = ctx->auth_mechs; cmech; cmech = cmech->next) { for (cmech = ctx->auth_mechs; cmech; cmech = cmech->next) {
@ -1735,6 +1744,8 @@ imap_open_store_authenticate2( imap_store_t *ctx )
if (auth_cram) { if (auth_cram) {
struct imap_cmd *cmd = new_imap_cmd( sizeof(*cmd) ); struct imap_cmd *cmd = new_imap_cmd( sizeof(*cmd) );
if (!ensure_user( srvc ) || !ensure_password( srvc ))
goto bail;
info( "Authenticating with CRAM-MD5...\n" ); info( "Authenticating with CRAM-MD5...\n" );
cmd->param.cont = do_cram_auth; cmd->param.cont = do_cram_auth;
imap_exec( ctx, cmd, imap_open_store_authenticate2_p2, "AUTHENTICATE CRAM-MD5" ); imap_exec( ctx, cmd, imap_open_store_authenticate2_p2, "AUTHENTICATE CRAM-MD5" );
@ -1742,6 +1753,8 @@ imap_open_store_authenticate2( imap_store_t *ctx )
} }
#endif #endif
if (auth_login) { if (auth_login) {
if (!ensure_user( srvc ) || !ensure_password( srvc ))
goto bail;
info( "Logging in...\n" ); info( "Logging in...\n" );
#ifdef HAVE_LIBSSL #ifdef HAVE_LIBSSL
if (!ctx->conn.ssl) if (!ctx->conn.ssl)