|
|
|
|
@ -26,6 +26,7 @@ |
|
|
|
|
#include <string.h> |
|
|
|
|
#include <unistd.h> |
|
|
|
|
#include <sys/types.h> |
|
|
|
|
#include <dirent.h> |
|
|
|
|
#include <sys/socket.h> |
|
|
|
|
#include <sys/time.h> |
|
|
|
|
#include <pthread.h> |
|
|
|
|
@ -45,8 +46,166 @@ |
|
|
|
|
#include "server.h" |
|
|
|
|
#include "clamuko.h" |
|
|
|
|
#include "session.h" |
|
|
|
|
#include "thrmgr.h" |
|
|
|
|
#include "shared.h" |
|
|
|
|
|
|
|
|
|
static pthread_mutex_t ctime_mutex = PTHREAD_MUTEX_INITIALIZER; |
|
|
|
|
extern int progexit; |
|
|
|
|
|
|
|
|
|
struct multi_tag { |
|
|
|
|
int sd; |
|
|
|
|
int options; |
|
|
|
|
const struct cfgstruct *copt; |
|
|
|
|
char *fname; |
|
|
|
|
const struct cl_node *root; |
|
|
|
|
const struct cl_limits *limits; |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
void multiscanfile(void *arg) |
|
|
|
|
{ |
|
|
|
|
struct multi_tag *tag = (struct multi_tag *) arg; |
|
|
|
|
const char *virname; |
|
|
|
|
sigset_t sigset; |
|
|
|
|
int ret; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* ignore all signals */ |
|
|
|
|
sigfillset(&sigset); |
|
|
|
|
pthread_sigmask(SIG_SETMASK, &sigset, NULL); |
|
|
|
|
|
|
|
|
|
ret = cl_scanfile(tag->fname, &virname, NULL, tag->root, tag->limits, tag->options); |
|
|
|
|
|
|
|
|
|
if(ret == CL_VIRUS) { |
|
|
|
|
mdprintf(tag->sd, "%s: %s FOUND\n", tag->fname, virname); |
|
|
|
|
logg("%s: %s FOUND\n", tag->fname, virname); |
|
|
|
|
virusaction(tag->fname, virname, tag->copt); |
|
|
|
|
} else if(ret != CL_CLEAN) { |
|
|
|
|
mdprintf(tag->sd, "%s: %s ERROR\n", tag->fname, cl_strerror(ret)); |
|
|
|
|
logg("%s: %s ERROR\n", tag->fname, cl_strerror(ret)); |
|
|
|
|
} else if(logok) { |
|
|
|
|
logg("%s: OK\n", tag->fname); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
free(tag->fname); |
|
|
|
|
free(tag); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
static int multiscan(const char *dirname, const struct cl_node *root, const struct cl_limits *limits, int options, const struct cfgstruct *copt, int odesc, unsigned int *reclev, threadpool_t *multi_pool) |
|
|
|
|
{ |
|
|
|
|
DIR *dd; |
|
|
|
|
struct dirent *dent; |
|
|
|
|
#if defined(HAVE_READDIR_R_3) || defined(HAVE_READDIR_R_2) |
|
|
|
|
union { |
|
|
|
|
struct dirent d; |
|
|
|
|
char b[offsetof(struct dirent, d_name) + NAME_MAX + 1]; |
|
|
|
|
} result; |
|
|
|
|
#endif |
|
|
|
|
struct stat statbuf; |
|
|
|
|
char *fname; |
|
|
|
|
int scanret = 0; |
|
|
|
|
unsigned int maxdirrec = 0; |
|
|
|
|
struct multi_tag *scandata; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
maxdirrec = cfgopt(copt, "MaxDirectoryRecursion")->numarg; |
|
|
|
|
if(maxdirrec) { |
|
|
|
|
if(*reclev > maxdirrec) { |
|
|
|
|
logg("*multiscan: Directory recursion limit exceeded at %s\n", dirname); |
|
|
|
|
return 0; |
|
|
|
|
} |
|
|
|
|
(*reclev)++; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if((dd = opendir(dirname)) != NULL) { |
|
|
|
|
#ifdef HAVE_READDIR_R_3 |
|
|
|
|
while(!readdir_r(dd, &result.d, &dent) && dent) { |
|
|
|
|
#elif defined(HAVE_READDIR_R_2) |
|
|
|
|
while((dent = (struct dirent *) readdir_r(dd, &result.d))) { |
|
|
|
|
#else |
|
|
|
|
while((dent = readdir(dd))) { |
|
|
|
|
#endif |
|
|
|
|
if (!is_fd_connected(odesc)) { |
|
|
|
|
logg("multiscan: Client disconnected\n"); |
|
|
|
|
closedir(dd); |
|
|
|
|
return -1; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if(progexit) { |
|
|
|
|
closedir(dd); |
|
|
|
|
return -1; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
#ifndef C_INTERIX |
|
|
|
|
if(dent->d_ino) |
|
|
|
|
#endif |
|
|
|
|
{ |
|
|
|
|
if(strcmp(dent->d_name, ".") && strcmp(dent->d_name, "..")) { |
|
|
|
|
/* build the full name */ |
|
|
|
|
fname = (char *) mcalloc(strlen(dirname) + strlen(dent->d_name) + 2, sizeof(char)); |
|
|
|
|
if(!fname) { |
|
|
|
|
logg("!multiscan: Can't allocate memory for fname\n"); |
|
|
|
|
closedir(dd); |
|
|
|
|
return -1; |
|
|
|
|
} |
|
|
|
|
sprintf(fname, "%s/%s", dirname, dent->d_name); |
|
|
|
|
|
|
|
|
|
/* stat the file */ |
|
|
|
|
if(lstat(fname, &statbuf) != -1) { |
|
|
|
|
if((S_ISDIR(statbuf.st_mode) && !S_ISLNK(statbuf.st_mode)) || (S_ISLNK(statbuf.st_mode) && (checksymlink(fname) == 1) && cfgopt(copt, "FollowDirectorySymlinks")->enabled)) { |
|
|
|
|
if(multiscan(fname, root, limits, options, copt, odesc, reclev, multi_pool) == -1) { |
|
|
|
|
free(fname); |
|
|
|
|
closedir(dd); |
|
|
|
|
return -1; |
|
|
|
|
} |
|
|
|
|
} else { |
|
|
|
|
if(S_ISREG(statbuf.st_mode) || (S_ISLNK(statbuf.st_mode) && (checksymlink(fname) == 2) && cfgopt(copt, "FollowFileSymlinks")->enabled)) { |
|
|
|
|
|
|
|
|
|
#ifdef C_LINUX |
|
|
|
|
if(procdev && (statbuf.st_dev == procdev)) |
|
|
|
|
scanret = CL_CLEAN; |
|
|
|
|
else |
|
|
|
|
#endif |
|
|
|
|
{ |
|
|
|
|
scandata = (struct multi_tag *) mmalloc(sizeof(struct multi_tag)); |
|
|
|
|
if(!scandata) { |
|
|
|
|
logg("!multiscan: Can't allocate memory for scandata\n"); |
|
|
|
|
free(fname); |
|
|
|
|
closedir(dd); |
|
|
|
|
return -1; |
|
|
|
|
} |
|
|
|
|
scandata->sd = odesc; |
|
|
|
|
scandata->options = options; |
|
|
|
|
scandata->copt = copt; |
|
|
|
|
scandata->fname = fname; |
|
|
|
|
scandata->root = root; |
|
|
|
|
scandata->limits = limits; |
|
|
|
|
if(!thrmgr_dispatch(multi_pool, scandata)) { |
|
|
|
|
logg("!multiscan: thread dispatch failed for multi_pool (file %s)\n", fname); |
|
|
|
|
mdprintf(odesc, "ERROR: Can't scan file %s\n", fname); |
|
|
|
|
free(fname); |
|
|
|
|
free(scandata); |
|
|
|
|
closedir(dd); |
|
|
|
|
return -1; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
while(!multi_pool->thr_idle) /* non-critical */ |
|
|
|
|
usleep(200); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
closedir(dd); |
|
|
|
|
} else { |
|
|
|
|
return -1; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
(*reclev)--; |
|
|
|
|
return 0; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
int command(int desc, const struct cl_node *root, const struct cl_limits *limits, int options, const struct cfgstruct *copt, int timeout) |
|
|
|
|
{ |
|
|
|
|
@ -139,6 +298,51 @@ int command(int desc, const struct cl_node *root, const struct cl_limits *limits |
|
|
|
|
scanfd(fd, NULL, root, limits, options, copt, desc); |
|
|
|
|
close(fd); /* FIXME: should we close it here? */ |
|
|
|
|
|
|
|
|
|
} else if(!strncmp(buff, CMD13, strlen(CMD13))) { /* MULTISCAN */ |
|
|
|
|
threadpool_t *multi_pool; |
|
|
|
|
int idletimeout = cfgopt(copt, "IdleTimeout")->numarg; |
|
|
|
|
int max_threads = cfgopt(copt, "MaxThreads")->numarg; |
|
|
|
|
int ret; |
|
|
|
|
unsigned int reclev = 0; |
|
|
|
|
const char *path = buff + strlen(CMD13) + 1; |
|
|
|
|
const char *virname; |
|
|
|
|
struct stat sb; |
|
|
|
|
|
|
|
|
|
if(stat(path, &sb) == -1) { |
|
|
|
|
mdprintf(desc, "Can't stat file %s\n", path); |
|
|
|
|
return -1; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if(S_ISDIR(sb.st_mode)) { |
|
|
|
|
if((multi_pool = thrmgr_new(max_threads, idletimeout, multiscanfile)) == NULL) { |
|
|
|
|
logg("!thrmgr_new failed for multi_pool\n"); |
|
|
|
|
mdprintf(desc, "ERROR: thrmgr_new failed for multi_pool\n"); |
|
|
|
|
return -1; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
ret = multiscan(path, root, limits, options, copt, desc, &reclev, multi_pool); |
|
|
|
|
thrmgr_destroy(multi_pool); |
|
|
|
|
|
|
|
|
|
if(ret < 0) |
|
|
|
|
return -1; |
|
|
|
|
|
|
|
|
|
} else { |
|
|
|
|
ret = cl_scanfile(path, &virname, NULL, root, limits, options); |
|
|
|
|
|
|
|
|
|
if(ret == CL_VIRUS) { |
|
|
|
|
mdprintf(desc, "%s: %s FOUND\n", path, virname); |
|
|
|
|
logg("%s: %s FOUND\n", path, virname); |
|
|
|
|
virusaction(path, virname, copt); |
|
|
|
|
} else if(ret != CL_CLEAN) { |
|
|
|
|
mdprintf(desc, "%s: %s ERROR\n", path, cl_strerror(ret)); |
|
|
|
|
logg("%s: %s ERROR\n", path, cl_strerror(ret)); |
|
|
|
|
} else { |
|
|
|
|
mdprintf(desc, "%s: OK\n", path);
|
|
|
|
|
if(logok) |
|
|
|
|
logg("%s: OK\n", path); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} else { |
|
|
|
|
mdprintf(desc, "UNKNOWN COMMAND\n"); |
|
|
|
|
} |
|
|
|
|
|
Tomasz Kojm
19 years ago