samba-vscan/f-secure vscan-fsav.c,1.1.2.7,1.1.2.8 vscan-fsav.h,1.1.2.2,1.1.2.3
Rainer Link <[email protected]> Wed, 29 Sep 2004 13:59:05 +0000
| Newsgroups | gmane.comp.security.virus.openantivirus.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/openantivirus/samba-vscan/f-secure
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5117/f-secure
Modified Files:
Tag: VSCAN_0_3
vscan-fsav.c vscan-fsav.h
Log Message:
updated to use the new global configuration parsing module
Index: vscan-fsav.h
===================================================================
RCS file: /cvsroot/openantivirus/samba-vscan/f-secure/Attic/vscan-fsav.h,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- vscan-fsav.h 7 Apr 2004 10:01:34 -0000 1.1.2.2
+++ vscan-fsav.h 29 Sep 2004 13:59:03 -0000 1.1.2.3
@@ -33,76 +33,14 @@
#include "vscan-fsav_core.h"
-/* configuration section */
-
-/* default location of samba-style configuration file (needs Samba >= 2.2.4 or Samba 3.0 */
-
-#define PARAMCONF "/etc/samba/vscan-fsav.conf"
#define VSCAN_MODULE_STR "vscan-fsav"
+/* configuration section */
-/* False = log only infected file, True = log every file access */
-
-#ifndef VSCAN_VERBOSE_FILE_LOGGING
-# define VSCAN_VERBOSE_FILE_LOGGING False
-#endif
-
-/* if a file is bigger than VSCAN_MAX_SIZE it won't be scanned. Has to be
- specified in bytes! If it set to 0, the file size check is disabled */
-
-#ifndef VSCAN_MAX_SIZE
-# define VSCAN_MAX_SIZE 0
-#endif
-
-
-/* True = scan files on open */
-
-#ifndef VSCAN_SCAN_ON_OPEN
-# define VSCAN_SCAN_ON_OPEN True
-#endif
-
-/* True = scan files on close */
-
-#ifndef VSCAN_SCAN_ON_CLOSE
-# define VSCAN_SCAN_ON_CLOSE False
-#endif
-
-/* True = deny access in case of virus scanning failure */
-
-#ifndef VSCAN_DENY_ACCESS_ON_ERROR
-# define VSCAN_DENY_ACCESS_ON_ERROR True
-#endif
-
-/* True = deny access in case of minor virus scanning failure */
-
-#ifndef VSCAN_DENY_ACCESS_ON_MINOR_ERROR
-# define VSCAN_DENY_ACCESS_ON_MINOR_ERROR True
-#endif
-
-/* True = send a warning message via window messenger service for viruses found */
-
-#ifndef VSCAN_SEND_WARNING_MESSAGE
-# define VSCAN_SEND_WARNING_MESSAGE True
-#endif
-
-/* default infected file action */
-#define VSCAN_INFECTED_FILE_ACTION INFECTED_QUARANTINE
-
-/* default quarantine settings; hopefully the user changes this */
-#define VSCAN_QUARANTINE_DIRECTORY "/tmp"
-#define VSCAN_QUARANTINE_PREFIX "vir-"
-
-/* set default value for maximum lrufile entries */
-#define VSCAN_MAX_LRUFILES 100
-
-/* time after an entry is considered as expired */
-#define VSCAN_LRUFILES_INVALIDATE_TIME 5
-
-/* MIME-types of files to be exluded from scanning; that's an
- semi-colon seperated list */
-#define VSCAN_FT_EXCLUDE_LIST ""
+/* default location of samba-style configuration file (needs Samba >= 2.2.4 or Samba 3.0 */
+#define PARAMCONF "/etc/samba/vscan-fsav.conf"
/* FSAV-related settings */
Index: vscan-fsav.c
===================================================================
RCS file: /cvsroot/openantivirus/samba-vscan/f-secure/Attic/vscan-fsav.c,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -d -r1.1.2.7 -r1.1.2.8
--- vscan-fsav.c 25 Sep 2004 12:27:04 -0000 1.1.2.7
+++ vscan-fsav.c 29 Sep 2004 13:59:03 -0000 1.1.2.8
@@ -32,16 +32,11 @@
#include "vscan-vfs.h"
#include "vscan-fsav.h"
+
static const char module_id[] =
VSCAN_MODULE_STR " " SAMBA_VSCAN_VERSION_STR;
-fstring config_file; /* location of config file, either
- PARAMCONF or as set via vfs options
- */
-
-ssize_t max_size; /* do not scan files greater than max_size
- if max_size = 0, scan any file
- */
+vscan_config_struct vscan_config; /* contains the vscan module configuration */
BOOL fsav_userinstance; /* start own fsavd for each user */
pstring fsav_config_file; /* location of config file */
@@ -56,144 +51,49 @@
int fsav_timeout; /* scan timeout */
BOOL verbose_file_logging; /* log ever file access */
-
-BOOL scan_on_open; /* scan a file before it is opened
- Defaults to True
- */
-
-BOOL scan_on_close; /* scan a new file put on share or
- if file was modified
- Defaults to False
- */
-
-BOOL deny_access_on_error; /* if connection to daemon fails, should access to any
- file be denied? Defaults to True
- */
-
-
-BOOL deny_access_on_minor_error; /* if daemon returns non-critical error,
- should access to the file be denied? */
-
BOOL send_warning_message; /* send a warning message using the windows
messenger service? */
-fstring quarantine_dir; /* directory for infected files */
-fstring quarantine_prefix; /* prefix for infected files */
-
-enum infected_file_action_enum infected_file_action; /* what to do with infected files;
- defaults to quarantine */
-
-int max_lrufiles; /* specified the maximum entries in lrufiles list */
-time_t lrufiles_invalidate_time; /* specified the time in seconds after the lifetime
- of an entry is expired and entry will be invalidated */
-
-pstring exclude_file_types; /* list of file types which should be excluded from scanning */
-
-
-
static BOOL do_parameter(const char *param, const char *value)
{
- if (StrCaseCmp("max file size", param) == 0) {
- /* FIXME: sanity check missing! what, if value is out of range?
- atoi returns int - what about LFS? atoi should be avoided!
- */
- max_size = atoi(value);
- DEBUG(3, ("max file size is: %d\n", max_size));
- } else if (StrCaseCmp("verbose file logging", param) == 0) {
- set_boolean(&verbose_file_logging, value);
- DEBUG(3,
- ("verbose file logging is: %d\n",
- verbose_file_logging));
- } else if (StrCaseCmp("scan on open", param) == 0) {
- set_boolean(&scan_on_open, value);
- DEBUG(3, ("scan on open: %d\n", scan_on_open));
- } else if (StrCaseCmp("scan on close", param) == 0) {
- set_boolean(&scan_on_close, value);
- DEBUG(3, ("scan on close is: %d\n", scan_on_close));
- } else if (StrCaseCmp("deny access on error", param) == 0) {
- set_boolean(&deny_access_on_error, value);
- DEBUG(3,
- ("deny access on error is: %d\n",
- deny_access_on_error));
- } else if (StrCaseCmp("deny access on minor error", param) == 0) {
- set_boolean(&deny_access_on_minor_error, value);
- DEBUG(3,
- ("deny access on minor error is: %d\n",
- deny_access_on_minor_error));
- } else if (StrCaseCmp("send warning message", param) == 0) {
- set_boolean(&send_warning_message, value);
- DEBUG(3,
- ("send warning message is: %d\n",
- send_warning_message));
- } else if (StrCaseCmp("infected file action", param) == 0) {
- if (StrCaseCmp("quarantine", value) == 0) {
- infected_file_action = INFECTED_QUARANTINE;
- } else if (StrCaseCmp("delete", value) == 0) {
- infected_file_action = INFECTED_DELETE;
- } else if (StrCaseCmp("nothing", value) == 0) {
- infected_file_action = INFECTED_DO_NOTHING;
- } else {
- DEBUG(2,
- ("samba-vscan: badly formed infected file action in configuration file, parameter %s\n",
- value));
- }
- DEBUG(3,
- ("infected file action is: %d\n",
- infected_file_action));
- } else if (StrCaseCmp("quarantine directory", param) == 0) {
- fstrcpy(quarantine_dir, value);
- DEBUG(3,
- ("quarantine directory is: %s\n", quarantine_dir));
- } else if (StrCaseCmp("quarantine prefix", param) == 0) {
- fstrcpy(quarantine_prefix, value);
- DEBUG(3,
- ("quarantine prefix is: %s\n", quarantine_prefix));
- } else if (StrCaseCmp("max lru files entries", param) == 0) {
- max_lrufiles = atoi(value);
- DEBUG(3, ("max lru files entries is: %d\n", max_lrufiles));
- } else if (StrCaseCmp("lru file entry lifetime", param) == 0) {
- lrufiles_invalidate_time = atol(value);
- DEBUG(3,
- ("lru file entry lifetime is: %li\n",
- (long) lrufiles_invalidate_time));
- } else if (StrCaseCmp("exclude file types", param) == 0) {
- pstrcpy(exclude_file_types, value);
- DEBUG(3, ("Exclude list is: %s\n", exclude_file_types));
- } else if (StrCaseCmp("fsav userinstance", param) == 0) {
- DEBUG(3, ("fsav user instance value : %s\n", value));
- set_boolean(&fsav_userinstance, value);
- DEBUG(3,
- ("fsav user instance is: %d\n", fsav_userinstance));
- } else if (StrCaseCmp("fsav config file", param) == 0) {
- pstrcpy(fsav_config_file, value);
- DEBUG(3, ("fsav config file is: %s\n", fsav_config_file));
- } else if (StrCaseCmp("fsav binary", param) == 0) {
- pstrcpy(fsav_binary, value);
- DEBUG(3, ("fsav binary: %s\n", fsav_binary));
- } else if (StrCaseCmp("fsav db dir", param) == 0) {
- pstrcpy(fsav_db_dir, value);
- DEBUG(3, ("fsav db dir is: %s\n", fsav_db_dir));
- } else if (StrCaseCmp("fsav socket", param) == 0) {
- pstrcpy(fsav_socket, value);
- DEBUG(3, ("fsav socket is: %s\n", fsav_socket));
- } else if (StrCaseCmp("fsav mime scan", param) == 0) {
- set_boolean(&fsav_mime, value);
- DEBUG(3, ("fsav mime scan is : %d\n", fsav_mime));
- } else if (StrCaseCmp("fsav connect uid", param) == 0) {
- fsav_connect_uid = atoi(value);
- DEBUG(3, ("fsav connect uid is : %i\n", fsav_connect_uid));
- } else if (StrCaseCmp("fsav archive scan", param) == 0) {
- set_boolean(&fsav_archive, value);
- DEBUG(3, ("fsav archive scan is : %d\n", fsav_mime));
- } else if (StrCaseCmp("fsav max nested level", param) == 0) {
- fsav_maxnested = atoi(value);
- DEBUG(3,
- ("fsav max nested level is : %i\n", fsav_maxnested));
- } else if (StrCaseCmp("fsav timeout", param) == 0) {
- fsav_timeout = atoi(value);
- DEBUG(3, ("fsav timeout is : %i\n", fsav_timeout));
- } else
- DEBUG(3, ("unknown parameter: %s\n", param));
+ if ( do_common_parameter(&vscan_config, param, value) == False ) {
+ /* parse VFS module specific configuration values */
+ if (StrCaseCmp("fsav userinstance", param) == 0) {
+ DEBUG(3, ("fsav user instance value : %s\n", value));
+ set_boolean(&fsav_userinstance, value);
+ DEBUG(3,
+ ("fsav user instance is: %d\n", fsav_userinstance));
+ } else if (StrCaseCmp("fsav config file", param) == 0) {
+ pstrcpy(fsav_config_file, value);
+ DEBUG(3, ("fsav config file is: %s\n", fsav_config_file));
+ } else if (StrCaseCmp("fsav binary", param) == 0) {
+ pstrcpy(fsav_binary, value);
+ DEBUG(3, ("fsav binary: %s\n", fsav_binary));
+ } else if (StrCaseCmp("fsav db dir", param) == 0) {
+ pstrcpy(fsav_db_dir, value);
+ DEBUG(3, ("fsav db dir is: %s\n", fsav_db_dir));
+ } else if (StrCaseCmp("fsav socket", param) == 0) {
+ pstrcpy(fsav_socket, value);
+ DEBUG(3, ("fsav socket is: %s\n", fsav_socket));
+ } else if (StrCaseCmp("fsav mime scan", param) == 0) {
+ set_boolean(&fsav_mime, value);
+ DEBUG(3, ("fsav mime scan is : %d\n", fsav_mime));
+ } else if (StrCaseCmp("fsav connect uid", param) == 0) {
+ fsav_connect_uid = atoi(value);
+ DEBUG(3, ("fsav connect uid is : %i\n", fsav_connect_uid));
+ } else if (StrCaseCmp("fsav archive scan", param) == 0) {
+ set_boolean(&fsav_archive, value);
+ DEBUG(3, ("fsav archive scan is : %d\n", fsav_mime));
+ } else if (StrCaseCmp("fsav max nested level", param) == 0) {
+ fsav_maxnested = atoi(value);
+ DEBUG(3,
+ ("fsav max nested level is : %i\n", fsav_maxnested));
+ } else if (StrCaseCmp("fsav timeout", param) == 0) {
+ fsav_timeout = atoi(value);
+ DEBUG(3, ("fsav timeout is : %i\n", fsav_timeout));
+ } else
+ DEBUG(3, ("unknown parameter: %s\n", param));
+ }
return True;
}
@@ -217,6 +117,10 @@
PROTOTYPE_CONST char *user)
#endif
{
+ fstring config_file; /* location of config file, either
+ PARAMCONF or as set via vfs options
+ */
+
#if (SAMBA_VERSION_MAJOR==2 && SAMBA_VERSION_RELEASE>=4) || SAMBA_VERSION_MAJOR==3
#if !(SMB_VFS_INTERFACE_VERSION >= 6)
pstring opts_str;
@@ -234,44 +138,9 @@
/* set default value for configuration files */
fstrcpy(config_file, PARAMCONF);
- /* set default value for max file size */
- max_size = VSCAN_MAX_SIZE;
-
- /* set default value for file logging */
- verbose_file_logging = VSCAN_VERBOSE_FILE_LOGGING;
-
- /* set default value for scan on open() */
- scan_on_open = VSCAN_SCAN_ON_OPEN;
-
- /* set default value for scan on close() */
- scan_on_close = VSCAN_SCAN_ON_CLOSE;
-
- /* set default value for deny access on error */
- deny_access_on_error = VSCAN_DENY_ACCESS_ON_ERROR;
-
- /* set default value for deny access on minor error */
- deny_access_on_minor_error = VSCAN_DENY_ACCESS_ON_MINOR_ERROR;
-
- /* set default value for send warning message */
- send_warning_message = VSCAN_SEND_WARNING_MESSAGE;
-
- /* set default value for infected file action */
- infected_file_action = VSCAN_INFECTED_FILE_ACTION;
-
- /* set default value for quarantine directory */
- fstrcpy(quarantine_dir, VSCAN_QUARANTINE_DIRECTORY);
-
- /* set default value for quarantine prefix */
- fstrcpy(quarantine_prefix, VSCAN_QUARANTINE_PREFIX);
-
- /* set default value for maximum lrufile entries */
- max_lrufiles = VSCAN_MAX_LRUFILES;
-
- /* time after an entry is considered as expired */
- lrufiles_invalidate_time = VSCAN_LRUFILES_INVALIDATE_TIME;
-
- /* file type exclude ist */
- pstrcpy(exclude_file_types, VSCAN_FT_EXCLUDE_LIST);
+ /* set default values */
+ set_common_default_settings(&vscan_config);
+ DEBUG(0, ("max size: %d\n", vscan_config.common.max_size));
/* fsav specific defaults */
@@ -290,37 +159,17 @@
vscan_syslog("INFO: connect to service %s by user %s", svc, user);
#if (SAMBA_VERSION_MAJOR==2 && SAMBA_VERSION_RELEASE>=4) || SAMBA_VERSION_MAJOR==3
- #if (SMB_VFS_INTERFACE_VERSION >= 6)
- fstrcpy(config_file, lp_parm_const_string(SNUM(conn),VSCAN_MODULE_STR,"config-file",PARAMCONF));
- #else
- pstrcpy(opts_str, (const char*) lp_vfs_options(SNUM(conn)));
- if( !*opts_str ) {
- DEBUG(3, ("samba-vscan: no configuration file set - using default value (%s).\n", lp_vfs_options(SNUM(conn))));
- } else {
- p = opts_str;
- if ( next_token(&p, config_file, "=", sizeof(config_file)) ) {
- trim_string(config_file, " ", " ");
- if ( !strequal("config-file", config_file) ) {
- DEBUG(3, ("samba-vscan - connect: options %s is not config-file\n", config_file));
- /* setting default value */
- fstrcpy(config_file, PARAMCONF);
- } else {
- if ( !next_token(&p, config_file," \n",sizeof(config_file)) ) {
- DEBUG(3, ("samba-vscan - connect: no option after config-file=\n"));
- /* setting default value */
- fstrcpy(config_file, PARAMCONF);
- } else {
- trim_string(config_file, " ", " ");
- DEBUG(3, ("samba-vscan - connect: config file name is %s\n", config_file));
- }
- }
- }
- }
- #endif /* #if (SMB_VFS_INTERFACE_VERSION >= 6)*/
+ fstrcpy(config_file, get_configuration_file(conn, VSCAN_MODULE_STR, PARAMCONF));
+ DEBUG(0, ("configuration file is: %s\n", config_file));
retval = pm_process(config_file, do_section, do_parameter);
DEBUG(10, ("pm_process returned %d\n", retval));
+
+ /* FIXME: this is lame! */
+ verbose_file_logging = vscan_config.common.verbose_file_logging;
+ send_warning_message = vscan_config.common.send_warning_message;
+
if (!retval)
vscan_syslog
("ERROR: could not parse configuration file '%s'. File not found or not read-able. Using compiled-in defaults",
@@ -329,11 +178,11 @@
/* initialise lrufiles list */
DEBUG(5, ("init lrufiles list\n"));
- lrufiles_init(max_lrufiles, lrufiles_invalidate_time);
+ lrufiles_init(vscan_config.common.max_lrufiles, vscan_config.common.lrufiles_invalidate_time);
/* initialise filetype */
DEBUG(5, ("init file type\n"));
- filetype_init(0, exclude_file_types);
+ filetype_init(0, vscan_config.common.exclude_file_types);
#if (SMB_VFS_INTERFACE_VERSION >= 6)
return SMB_VFS_NEXT_CONNECT(handle, conn, svc, user);
@@ -386,7 +235,7 @@
pstrcat(filepath, fname);
/* scan files while opening? */
- if ( !scan_on_open ) {
+ if ( !vscan_config.common.scan_on_open ) {
DEBUG(3, ("samba-vscan - open: File '%s' not scanned as scan_on_open is not set\n", fname));
#if (SMB_VFS_INTERFACE_VERSION >= 6)
return SMB_VFS_NEXT_OPEN(handle, conn, fname, flags, mode);
@@ -408,7 +257,7 @@
#else
return default_vfs_ops.open(conn, fname, flags, mode);
#endif
- else if ( ( stat_buf.st_size > max_size ) && ( max_size > 0 ) ) /* file is too large */
+ else if ( ( stat_buf.st_size > vscan_config.common.max_size ) && ( vscan_config.common.max_size > 0 ) ) /* file is too large */
vscan_syslog("INFO: File %s is larger than specified maximum file size! Not scanned!", fname);
else if ( stat_buf.st_size == 0 ) /* do not scan empty files */
#if (SMB_VFS_INTERFACE_VERSION >= 6)
@@ -443,7 +292,7 @@
fsav = NULL;
}
}
- if (!fsav && deny_access_on_error) {
+ if (!fsav && vscan_config.common.deny_access_on_error) {
/* an error occured - can not communicate to daemon - deny access */
vscan_syslog
("ERROR: can not communicate to daemon - access denied");
@@ -462,7 +311,7 @@
if (must_be_checked == VSCAN_LRU_DENY_ACCESS) {
/* file has already been checked and marked as infected */
/* deny access */
- if (verbose_file_logging)
+ if ( vscan_config.common.verbose_file_logging )
vscan_syslog
("File '%s' has already been scanned and marked as infected. Not scanned any more. Access denied",
filepath);
@@ -476,7 +325,7 @@
} else if (must_be_checked == VSCAN_LRU_GRANT_ACCESS) {
/* file has already been checked,
not marked as infected and not modified */
- if (verbose_file_logging)
+ if ( vscan_config.common.verbose_file_logging )
vscan_syslog
("File '%s' has already been scanned, not marked as infected and not modified. Not scanned anymore. Access granted",
filepath);
@@ -497,7 +346,7 @@
/* scan file */
retval = fsav_scan(fsav, filepath, client_ip);
- if (retval == VSCAN_SCAN_MINOR_ERROR && deny_access_on_minor_error) {
+ if (retval == VSCAN_SCAN_MINOR_ERROR && vscan_config.common.deny_access_on_minor_error) {
/* a minor error occured - deny access */
vscan_syslog
("ERROR: daemon failed with a minor error - access to file %s denied",
@@ -512,7 +361,7 @@
/* deny access */
errno = EACCES;
return -1;
- } else if (retval == VSCAN_SCAN_ERROR && deny_access_on_error) {
+ } else if (retval == VSCAN_SCAN_ERROR && vscan_config.common.deny_access_on_error) {
/* an error occured - can not communicate to daemon - deny access */
vscan_syslog
("ERROR: can not communicate to daemon - access to file %s denied",
@@ -535,16 +384,16 @@
rc = vscan_do_infected_file_action(handle,
conn,
filepath,
- quarantine_dir,
- quarantine_prefix,
- infected_file_action);
+ vscan_config.common.quarantine_dir,
+ vscan_config.common.quarantine_prefix,
+ vscan_config.common.infected_file_action);
#else
rc = rc = vscan_do_infected_file_action(&default_vfs_ops,
conn,
filepath,
- quarantine_dir,
- quarantine_prefix,
- infected_file_action);
+ vscan_config.common.quarantine_dir,
+ vscan_config.common.quarantine_prefix,
+ vscan_config.common.infected_file_action);
#endif
/* add/update file. mark file as infected! */
@@ -591,7 +440,7 @@
retval = default_vfs_ops.close(fsp, fd);
#endif
- if (!scan_on_close) {
+ if (!vscan_config.common.scan_on_close) {
DEBUG(3,
("samba-vscan - close: File '%s' not scanned as scan_on_close is not set\n",
fsp->fsp_name));
@@ -610,7 +459,7 @@
if (!fsp->modified) {
- if (verbose_file_logging)
+ if ( vscan_config.common.verbose_file_logging )
vscan_syslog
("INFO: file %s was not modified - not scanned",
filepath);
@@ -620,7 +469,7 @@
/* don't scan files which are in the list of exclude file types */
if (filetype_skipscan(filepath) == VSCAN_FT_SKIP_SCAN) {
- if (verbose_file_logging)
+ if ( vscan_config.common.verbose_file_logging )
vscan_syslog
("File '%s' not scanned as file type is on exclude list",
filepath);
@@ -659,16 +508,16 @@
rc = vscan_do_infected_file_action(handle,
fsp->conn,
filepath,
- quarantine_dir,
- quarantine_prefix,
- infected_file_action);
+ vscan_config.common.quarantine_dir,
+ vscan_config.common.quarantine_prefix,
+ vscan_config.common.infected_file_action);
#else
rc = vscan_do_infected_file_action(&default_vfs_ops,
fsp->conn,
filepath,
- quarantine_dir,
- quarantine_prefix,
- infected_file_action);
+ vscan_config.common.quarantine_dir,
+ vscan_config.common.quarantine_prefix,
+ vscan_config.common.infected_file_action);
#endif
}
/* FIXME: shouldn't we handle errors as well? */
-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl