spec/clamav-testfiles/jquery.tooltip.pack.js @@ -6,6 +6,7 @@ static VALUE cClamAV; struct ClamAV_R { struct cl_engine *root; int options; + int db_options; struct cl_stat dbstat; unsigned int signo; }; @@ -26,10 +27,15 @@ static VALUE clamavr_new(argc, argv, klass) { const char *v_fname; int v_options; - rb_scan_args(argc, argv, "01", &v_options); + int v_db_options; + rb_scan_args(argc, argv, "02", &v_options, &v_db_options); if(NIL_P(v_options)){ v_options = INT2FIX(CL_SCAN_STDOPT); /* default value */ } + if(NIL_P(v_db_options)){ + v_db_options = INT2FIX(CL_DB_STDOPT); /* default value */ + } + int ret; ret = cl_init(FIX2INT(v_options)); if(ret != CL_SUCCESS) { @@ -43,13 +49,14 @@ static VALUE clamavr_new(argc, argv, klass) /* save options */ ptr->options = v_options; + ptr->db_options = v_db_options; ptr->signo = 0; const char *dbdir; dbdir = cl_retdbdir(); - ret = cl_load(dbdir, ptr->root, &ptr->signo, CL_DB_STDOPT); + ret = cl_load(dbdir, ptr->root, &ptr->signo, FIX2INT(v_db_options)); if(ret != CL_SUCCESS) { rb_raise(rb_eRuntimeError, "cl_load() error: %s\n", cl_strerror(ret)); } @@ -174,7 +181,7 @@ static VALUE clamavr_dbreload(VALUE self) { const char *dbdir; dbdir = cl_retdbdir(); int ret; - ret = cl_load(dbdir, ptr->root, &ptr->signo, CL_DB_STDOPT); + ret = cl_load(dbdir, ptr->root, &ptr->signo, FIX2INT(ptr->db_options)); if(ret != CL_SUCCESS) { rb_raise(rb_eRuntimeError, "cl_load() error: %s\n", cl_strerror(ret)); } ext/clamav/clamav.c @@ -72,6 +72,20 @@ class ClamAV end + describe "with custom db options" do + + before(:all) do + @clam = ClamAV.new(CL_SCAN_STDOPT, CL_DB_STDOPT | CL_DB_PUA) + end + + it "should detect PUA" do + @clam.scanfile(File.join(File.dirname(__FILE__), "../clamav-testfiles/", + 'jquery.tooltip.pack.js')).should == 'PUA.Script.Packed-2' + end + + end + + describe "limits" do before(:each) do @clam = ClamAV.new spec/unit/clamav_spec.rb 80b98de3d538801849e19c0b4d6f3ae07ff5a489 Alex Eagle eagle.alex@gmail.com http://github.com/eagleas/clamav/commit/26f973775e5e8c0ae42b67c45c16ed2a166f6a96 26f973775e5e8c0ae42b67c45c16ed2a166f6a96 2009-04-07T08:06:55-07:00 2009-04-07T08:06:55-07:00 Add optional db_options to new() 69ae389fc506d8596d9fb5785174b1632261fcf6 Alex Eagle eagle.alex@gmail.com