Commit graph

8227 commits

Author SHA1 Message Date
Shawn Webb
172c4dd280 Add JSON properties to PE parsing 2014-05-07 10:56:35 -04:00
Kevin Lin
546e168bb7 api: added safety checks 2014-05-06 18:18:05 -04:00
Kevin Lin
7f6262e808 Merge branch 'master' of git.clam.sourcefire.com:/var/lib/git/clamav-devel 2014-05-06 18:13:13 -04:00
Kevin Lin
61e3637d08 bytecode api: added support for querying int and booleans from json properties 2014-05-06 16:15:08 -04:00
Kevin Lin
fa7ae4ccbc bytecode api: updated copyright information
bytecode api: added json properties reading implementation
2014-05-06 16:13:48 -04:00
Kevin Lin
9a7511a195 json_api: fixed null object generation 2014-05-06 13:49:09 -04:00
Kevin Lin
f3575db23c bytecode: added json-specific ctx members 2014-05-06 13:43:02 -04:00
Kevin Lin
fc97496b4e bytecode api: updated copyright 2014-05-06 13:41:47 -04:00
Kevin Lin
e91e438340 ooxml: added header file 2014-05-06 13:39:52 -04:00
Steven Morgan
bd238a6d96 Merge branch 'master' of git.clam.sourcefire.com:/var/lib/git/clamav-devel 2014-05-05 17:06:03 -04:00
Steven Morgan
5043b1f384 Only scan json props file if a virus is not found in the initial scan. Add --leave-temps support for json props file. 2014-05-05 17:05:26 -04:00
Shawn Webb
bec7539d75 Add the JSON properties flag to the unit tests 2014-05-05 15:53:30 -04:00
Kevin Lin
527772790b Merge branch 'master' of git.clam.sourcefire.com:/var/lib/git/clamav-devel 2014-05-02 10:08:48 -04:00
Shawn Webb
1662c6ec04 Wrap gen-json option for clamscan in an #if HAVE_JSON macro 2014-05-02 10:10:50 -04:00
Kevin Lin
242b4f9ab4 ooxml: fixed minor issue when compiling without certain dependencies 2014-05-02 10:08:25 -04:00
Kevin Lin
25556519f9 ooxml: moved ooxml specific functions to new source
added new source files to Makefile and win32 project
autojunk'd
2014-05-01 16:59:01 -04:00
Kevin Lin
23509742df ooxml: outputs properties to json file
ooxml: json uses integers and booleans with conversion
2014-05-01 16:49:17 -04:00
Steven Morgan
5b7892278c Stronger magic for internal json file typing. 2014-04-30 18:32:06 -04:00
Kevin Lin
52017fbba3 ooxml: added process of locating property files
ooxml: added property file specific callbacks
2014-04-30 18:01:55 -04:00
Kevin Lin
ad0e85a3db Merge branch 'master' of git.clam.sourcefire.com:/var/lib/git/clamav-devel 2014-04-30 16:46:43 -04:00
Kevin Lin
f85f7323b3 ooxml: parsing for [Content_Types].xml 2014-04-30 16:45:33 -04:00
Shawn Webb
cfeac6cde1 Add PDF flags to json file 2014-04-30 16:38:55 -04:00
Steven Morgan
2f84284606 Add virus names to preclass properties json file. 2014-04-30 16:28:46 -04:00
Shawn Webb
9b9dcbc17b Add flag to clamscan for generating the json properties file 2014-04-30 16:20:04 -04:00
Shawn Webb
221825fd59 Update copyright information. 2014-04-30 15:42:11 -04:00
Kevin Lin
b2743d5d1f json_api: added cli_jsonstrlen for truncating strings for json 2014-04-30 15:16:11 -04:00
Shawn Webb
49aeff1fb0 Merge remote-tracking branch 'origin/master' 2014-04-30 15:01:09 -04:00
Shawn Webb
ff2d5e61d8 Convert two macros to functions 2014-04-30 15:01:05 -04:00
Steven Morgan
9a90c677d2 #if 0 around test code: ctx.options |= CL_SCAN_FILE_PROPERTIES; 2014-04-30 13:42:02 -04:00
Steven Morgan
ddc4afc858 Merge branch 'master' of git.clam.sourcefire.com:/var/lib/git/clamav-devel 2014-04-29 17:27:26 -04:00
Shawn Webb
ebcca55f8b Add count-based properties for PDFs 2014-04-29 17:27:02 -04:00
Steven Morgan
f76e3ad7d7 up flevel for internal json file typing. 2014-04-29 17:26:56 -04:00
Steven Morgan
de46d3e356 Add new target type for json properties file and scanning of the same. 2014-04-29 17:15:07 -04:00
Shawn Webb
6a16a8285f Add macros to standardize certain JSON properties file keys and values 2014-04-29 15:39:06 -04:00
Shawn Webb
cf1f8e06ab Bump FLEVEL to 78 2014-04-29 13:22:38 -04:00
Kevin Lin
23e4d22c1c ole2: fixed issue with str management 2014-04-28 18:28:27 -04:00
Kevin Lin
9ecf6c2bf0 json: fixed various issues caused by turning off json option 2014-04-28 17:25:14 -04:00
Kevin Lin
252a31c587 Merge branch 'master' of git.clam.sourcefire.com:/var/lib/git/clamav-devel 2014-04-28 17:09:20 -04:00
Kevin Lin
fd151ff6c6 ole2: fixed issue with multi-propset streams
ole2: json output now includes array of stream names
doc/xls/ppt: reclassify file based on stream and not SummaryInfo
2014-04-28 17:01:57 -04:00
Steven Morgan
585717e168 Re-tab previous commit. 2014-04-28 16:37:05 -04:00
Steven Morgan
4d45d69980 Restrict top level file types enabled for properties collection. 2014-04-28 16:16:08 -04:00
Kevin Lin
4f351352c1 fixed make_pair issue in LLVMjit 2014-04-28 12:47:13 -04:00
Kevin Lin
c8c878f92e zip(ooxml): added function for search by name
zip(ooxml): added callback functionality for simgle file processing
2014-04-28 12:45:51 -04:00
Kevin Lin
0aaea29ce5 fixed typos 2014-04-28 12:43:48 -04:00
Kevin Lin
395516f8a5 ole2: fixed an issue in JSON output 2014-04-28 12:42:41 -04:00
Steven Morgan
92e0ae1504 bz#10978 fix for allmatch/unzip issue. 2014-04-25 17:40:17 -04:00
Shawn Webb
b9bf2586a8 Enable stats in freshclam 2014-04-25 08:46:09 -04:00
Shawn Webb
09fcff6a0d Revert "Re-enable the intelligence gathering framework"
This reverts commit 487f270148.
2014-04-25 08:07:08 -04:00
Shawn Webb
487f270148 Re-enable the intelligence gathering framework 2014-04-24 15:02:23 -04:00
Kevin Lin
a69adec148 json_api: returns error codes or CL_SUCCESS w or w/o JSON
doc/ppt/xls: propagates error codes to topmost lvl w/ premature termination
2014-04-24 14:22:00 -04:00