@@ -1,4 +1,8 @@

+Tue Feb 5 19:38:35 EDT 2013 (dar)

+------------------------------------

+ * Add runtime enable/disable of SWF scanning

+

 Tue Jan 8 12:18:35 EDT 2013 (morgan)

 ------------------------------------

  * Fix for CL_ENULLARG reported in regression run of 0021468992.gz

@@ -925,6 +925,13 @@ int recvloop_th(int *socketds, unsigned nsockets, struct cl_engine *engine, unsi

 	logg("PDF support disabled.\n");

     }

+    if(optget(opts, "ScanSWF")->enabled) {

+	logg("SWF support enabled.\n");

+	options |= CL_SCAN_SWF;

+    } else {

+	logg("SWF support disabled.\n");

+    }

+

     if(optget(opts, "ScanHTML")->enabled) {

 	logg("HTML support enabled.\n");

 	options |= CL_SCAN_HTML;

@@ -250,6 +250,7 @@ void help(void)

     mprintf("    --scan-elf[=yes(*)/no]               Scan ELF files\n");

     mprintf("    --scan-ole2[=yes(*)/no]              Scan OLE2 containers\n");

     mprintf("    --scan-pdf[=yes(*)/no]               Scan PDF files\n");

+    mprintf("    --scan-swf[=yes(*)/no]               Scan SWF files\n");

     mprintf("    --scan-html[=yes(*)/no]              Scan HTML files\n");

     mprintf("    --scan-archive[=yes(*)/no]           Scan archive files (supported by libclamav)\n");

     mprintf("    --detect-broken[=yes/no(*)]          Try to detect broken executable files\n");

@@ -821,6 +821,9 @@ int scanmanager(const struct optstruct *opts)

     if(optget(opts, "scan-pdf")->enabled)

 	options |= CL_SCAN_PDF;

+    if(optget(opts, "scan-swf")->enabled)

+	options |= CL_SCAN_SWF;

+

     if(optget(opts, "scan-html")->enabled)

 	options |= CL_SCAN_HTML;

@@ -1035,6 +1035,8 @@ const char *cl_engine_get_str(const struct cl_engine *engine,

 	      files).

 	\item \textbf{CL\_SCAN\_PDF}\\

 	      Enables scanning within PDF files.

+	\item \textbf{CL\_SCAN\_SWF}\\

+	      Enables scanning within SWF files, notably compressed SWF.

 	\item \textbf{CL\_SCAN\_PE}\\

 	      This flag enables deep scanning of Portable Executable files and

 	      allows libclamav to unpack executables compressed with run-time

@@ -296,6 +296,12 @@ Example

 # Default: yes

 #ScanPDF yes

+# This option enables scanning within SWF files.

+# If you turn off this option, the original files will still be scanned, but

+# without decoding and additional processing.

+# Default: yes

+#ScanSWF yes

+

 ##

 ## Mail files

@@ -148,12 +148,13 @@ typedef enum {

 #define CL_SCAN_HEURISTIC_PRECEDENCE    0x80000

 #define CL_SCAN_BLOCKMACROS		0x100000

 #define CL_SCAN_ALLMATCHES		0x200000

+#define CL_SCAN_SWF			0x400000

 #define CL_SCAN_PERFORMANCE_INFO        0x40000000 /* collect performance timings */

 #define CL_SCAN_INTERNAL_COLLECT_SHA    0x80000000 /* Enables hash output in sha-collect builds - for internal use only */

 /* recommended scan settings */

-#define CL_SCAN_STDOPT		(CL_SCAN_ARCHIVE | CL_SCAN_MAIL | CL_SCAN_OLE2 | CL_SCAN_PDF | CL_SCAN_HTML | CL_SCAN_PE | CL_SCAN_ALGORITHMIC | CL_SCAN_ELF)

+#define CL_SCAN_STDOPT		(CL_SCAN_ARCHIVE | CL_SCAN_MAIL | CL_SCAN_OLE2 | CL_SCAN_PDF | CL_SCAN_HTML | CL_SCAN_PE | CL_SCAN_ALGORITHMIC | CL_SCAN_ELF | CL_SCAN_SWF)

 /* cl_countsigs options */

 #define CL_COUNTSIGS_OFFICIAL	    0x1

@@ -341,6 +341,7 @@ extern int have_rar;

 #define BLOCK_MACROS	    (ctx->options & CL_SCAN_BLOCKMACROS)

 #define SCAN_STRUCTURED	    (ctx->options & CL_SCAN_STRUCTURED)

 #define SCAN_ALL            (ctx->options & CL_SCAN_ALLMATCHES)

+#define SCAN_SWF            (ctx->options & CL_SCAN_SWF)

 /* based on macros from A. Melnikoff */

 #define cbswap16(v) (((v & 0xff) << 8) | (((v) >> 8) & 0xff))

@@ -2476,7 +2476,7 @@ static int magic_scandesc(cli_ctx *ctx, cli_file_t type)

 	    break;

 	case CL_TYPE_SWF:

-	    if(DCONF_DOC & DOC_CONF_SWF)

+	    if(SCAN_SWF && (DCONF_DOC & DOC_CONF_SWF))

 		ret = cli_scanswf(ctx);

 	    break;

@@ -325,6 +325,8 @@ const struct clam_option __clam_options[] = {

     { "ScanPDF", "scan-pdf", 0, TYPE_BOOL, MATCH_BOOL, 1, NULL, 0, OPT_CLAMD | OPT_CLAMSCAN, "This option enables scanning within PDF files.\nIf you turn off this option, the original files will still be scanned, but\nwithout decoding and additional processing.", "yes" },

+    { "ScanSWF", "scan-swf", 0, TYPE_BOOL, MATCH_BOOL, 1, NULL, 0, OPT_CLAMD | OPT_CLAMSCAN, "This option enables scanning within SWF files.\nIf you turn off this option, the original files will still be scanned, but\nwithout decoding and additional processing.", "yes" },

+

     { "ScanArchive", "scan-archive", 0, TYPE_BOOL, MATCH_BOOL, 1, NULL, 0, OPT_CLAMD | OPT_CLAMSCAN, "Scan within archives and compressed files.\nIf you turn off this option, the original files will still be scanned, but\nwithout unpacking and additional processing.", "yes" },

     { "ArchiveBlockEncrypted", "block-encrypted", 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_CLAMSCAN, "Mark encrypted archives as viruses (Encrypted.Zip, Encrypted.RAR).", "no" },

@@ -65,7 +65,8 @@ enum CLAM_SCAN_OPTIONS {

     CLAM_OPTION_SCAN_PE,	/* Enable/disable scanning of archive PE (aka windows) executables */

     CLAM_OPTION_SCAN_ALGORITHMIC, /* Enable/disable scanning for certain viruses and exploits */

     CLAM_OPTION_SCAN_ELF,	/* Enable/disable scanning of archive ELF (aka linux) executables */ /* FIXME: is this needed */

-    CLAM_OPTION_SCAN_PDF	/* Enable/disable scanning of Adobe PDF files */

+    CLAM_OPTION_SCAN_PDF,	/* Enable/disable scanning of Adobe PDF files */

+    CLAM_OPTION_SCAN_SWF	/* Enable/disable scanning of Adobe Flash files */

 };

 /* NOTE: by default (i.e. before calling Scan_SetOption) ALL the options are ENABLED! */

@@ -647,6 +647,10 @@ int CLAMAPI Scan_SetOption(CClamAVScanner *pScanner, int option, void *value, un

 	    logg("CLAM_OPTION_SCAN_ELF: %s on instance %p\n", newval ? "enabled" : "disabled", inst);

 	    whichopt = CL_SCAN_ELF;

 	    break;

+	case CLAM_OPTION_SCAN_SWF:

+	    logg("CLAM_OPTION_SCAN_SWF: %s on instance %p\n", newval ? "enabled" : "disabled", inst);

+	    whichopt = CL_SCAN_SWF;

+	    break;

 	default:

 	    unlock_instances();

 	    FAIL(CL_EARG, "Unsupported option: %d", option);

@@ -702,6 +706,9 @@ int CLAMAPI Scan_GetOption(CClamAVScanner *pScanner, int option, void *value, un

 	case CLAM_OPTION_SCAN_ELF:

 	    whichopt = CL_SCAN_ELF;

 	    break;

+	case CLAM_OPTION_SCAN_SWF:

+	    whichopt = CL_SCAN_SWF;

+	    break;

 	default:

 	    unlock_instances();

 	    FAIL(CL_EARG, "Unsupported option: %d", option);