Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Add support for TOP and CAPA to pop3d. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
2c18ed076e008633641ff49d4ca0e178 |
| User & Date: | drh 2018-07-18 02:09:33 |
Context
|
2018-07-18
| ||
| 02:14 | Enhance the pop3 TOP command so that the second argument can be zero. check-in: 64493163 user: drh tags: trunk | |
| 02:09 | Add support for TOP and CAPA to pop3d. check-in: 2c18ed07 user: drh tags: trunk | |
| 01:41 | Fix a harmless compiler warning. check-in: 2332efb7 user: drh tags: trunk | |
Changes
Changes to src/smtp.c.
1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 .... 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 .... 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 .... 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 |
** before entering the chroot jail.
*/
void pop3d_command(void){
char *zDbName;
char *zA1, *zA2, *zCmd, *z;
int inAuth = 1;
int i;
FILE *pLog;
const char *zDir;
Stmt q;
char zIn[1000];
char zUser[100];
zDir = find_option("logdir",0,1);
if( zDir ){
char *zFile = file_time_tempname(zDir, ".txt");
................................................................................
pop3_print(pLog, "+OK POP3 server ready");
while( fgets(zIn, sizeof(zIn), stdin) ){
if( pLog ) fprintf(pLog, "C: %s", zIn);
zCmd = zIn;
zA1 = pop3d_arg(zCmd);
zA2 = zA1 ? pop3d_arg(zA1) : 0;
for(i=0; zCmd[i]; i++){ zCmd[i] = fossil_tolower(zCmd[i]); }
if( inAuth ){
if( strcmp(zCmd,"user")==0 ){
if( zA1==0 || zA2!=0 ) goto cmd_error;
sqlite3_snprintf(sizeof(zUser),zUser,"%s",zA1);
goto cmd_ok;
}
if( strcmp(zCmd,"pass")==0 ){
................................................................................
db_column_int(&q,0), db_column_int(&q,1));
}
pop3_print(pLog, ".");
}
db_finalize(&q);
continue;
}
if( strcmp(zCmd,"retr")==0 ){
Blob all, line;
int nLine = 0;
if( zA1==0 ) goto cmd_error;
z = db_text(0, "SELECT decompress(emailblob.etxt) "
" FROM emailblob, pop3"
" WHERE emailblob.emailid=pop3.emailid"
" AND pop3.id=%d AND NOT pop3.isDel",
atoi(zA1));
if( z==0 ) goto cmd_error;
pop3_print(pLog, "+OK");
blob_init(&all, z, -1);
while( blob_line(&all, &line) ){
if( blob_buffer(&line)[0]=='.' ){
fputc('.', stdout);
}
fwrite(blob_buffer(&line), 1, blob_size(&line), stdout);
nLine++;
}
if( pLog ) fprintf(pLog, "S: # %d lines of content\n", nLine);
pop3_print(pLog, ".");
fossil_free(z);
blob_reset(&all);
blob_reset(&line);
fflush(stdout);
................................................................................
db_multi_exec("UPDATE pop3 SET isDel=1 WHERE id=%d",atoi(zA1));
goto cmd_ok;
}
if( strcmp(zCmd,"rset")==0 ){
db_multi_exec("UPDATE pop3 SET isDel=0");
goto cmd_ok;
}
if( strcmp(zCmd,"top")==0 ){
goto cmd_error;
}
if( strcmp(zCmd,"uidl")==0 ){
if( zA1 ){
db_prepare(&q, "SELECT id, emailid FROM pop3"
" WHERE id=%d AND NOT isDel", atoi(zA1));
if( db_step(&q)==SQLITE_ROW ){
pop3_print(pLog, "+OK %d %d",
db_column_int(&q,0), db_column_int(&q,1));
|
| > > > > > > > > > > > > | > > > > | | > > > > < < < |
1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 .... 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 .... 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 .... 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 |
** before entering the chroot jail.
*/
void pop3d_command(void){
char *zDbName;
char *zA1, *zA2, *zCmd, *z;
int inAuth = 1;
int i;
FILE *pLog = 0;
const char *zDir;
Stmt q;
char zIn[1000];
char zUser[100];
zDir = find_option("logdir",0,1);
if( zDir ){
char *zFile = file_time_tempname(zDir, ".txt");
................................................................................
pop3_print(pLog, "+OK POP3 server ready");
while( fgets(zIn, sizeof(zIn), stdin) ){
if( pLog ) fprintf(pLog, "C: %s", zIn);
zCmd = zIn;
zA1 = pop3d_arg(zCmd);
zA2 = zA1 ? pop3d_arg(zA1) : 0;
for(i=0; zCmd[i]; i++){ zCmd[i] = fossil_tolower(zCmd[i]); }
if( strcmp(zCmd,"capa")==0 ){
static const char *azCap[] = {
"TOP", "USER", "UIDL",
};
int i;
pop3_print(pLog, "+OK");
for(i=0; i<sizeof(azCap)/sizeof(azCap[0]); i++){
pop3_print(pLog, azCap[i]);
}
pop3_print(pLog, ".");
continue;
}
if( inAuth ){
if( strcmp(zCmd,"user")==0 ){
if( zA1==0 || zA2!=0 ) goto cmd_error;
sqlite3_snprintf(sizeof(zUser),zUser,"%s",zA1);
goto cmd_ok;
}
if( strcmp(zCmd,"pass")==0 ){
................................................................................
db_column_int(&q,0), db_column_int(&q,1));
}
pop3_print(pLog, ".");
}
db_finalize(&q);
continue;
}
if( strcmp(zCmd,"retr")==0 || strcmp(zCmd,"top")==0 ){
Blob all, line;
int nLine = 0;
int iLimit;
int hdrSeen = 0;
if( zA1==0 ) goto cmd_error;
iLimit = zA2 ? atoi(zA2) : 2147483647;
if( iLimit<=0 ) goto cmd_error;
z = db_text(0, "SELECT decompress(emailblob.etxt) "
" FROM emailblob, pop3"
" WHERE emailblob.emailid=pop3.emailid"
" AND pop3.id=%d AND NOT pop3.isDel",
atoi(zA1));
if( z==0 ) goto cmd_error;
pop3_print(pLog, "+OK");
blob_init(&all, z, -1);
while( iLimit && blob_line(&all, &line) ){
char c = blob_buffer(&line)[0];
if( c=='.' ){
fputc('.', stdout);
}else if( c=='\r' || c=='\n' ){
hdrSeen = 1;
}
fwrite(blob_buffer(&line), 1, blob_size(&line), stdout);
nLine++;
if( hdrSeen ) iLimit--;
}
if( pLog ) fprintf(pLog, "S: # %d lines of content\n", nLine);
pop3_print(pLog, ".");
fossil_free(z);
blob_reset(&all);
blob_reset(&line);
fflush(stdout);
................................................................................
db_multi_exec("UPDATE pop3 SET isDel=1 WHERE id=%d",atoi(zA1));
goto cmd_ok;
}
if( strcmp(zCmd,"rset")==0 ){
db_multi_exec("UPDATE pop3 SET isDel=0");
goto cmd_ok;
}
if( strcmp(zCmd,"uidl")==0 ){
if( zA1 ){
db_prepare(&q, "SELECT id, emailid FROM pop3"
" WHERE id=%d AND NOT isDel", atoi(zA1));
if( db_step(&q)==SQLITE_ROW ){
pop3_print(pLog, "+OK %d %d",
db_column_int(&q,0), db_column_int(&q,1));
|