Changeset 33717 for gs2-extensions/malware-checker/trunk/perllib/plugins/PDFv3Plugin.pm

Timestamp:

2019-11-22T10:44:13+13:00 (4 years ago)

Author:

davidb

Message:

Code tidy up; better error checking on running Java cmd; public/private key for TotalVirus added; sleep added if public key

File:

• gs2-extensions/malware-checker/trunk/perllib/plugins/PDFv3Plugin.pm (modified) (2 diffs)

gs2-extensions/malware-checker/trunk/perllib/plugins/PDFv3Plugin.pm

@@ -112 +112 @@
      ];
 
+my $virustotal_keytype_list =
+    [ { 'name' => "public",
+    'desc' => "{PDFv3Plugin.virustotal_type_list.public}" },
+      { 'name' => "private",
+    'desc' => "{PDFv3Plugin.virustotal_type_list.private}" }
+    ];
+
+      
 my $opt_malwarechecker_args = [ { 'name' => "malware_checker",
                   'desc' => "{MalwareChecker.malware_checker}",
                   'type' => "flag",               
-                  'reqd' => "no" } ];
-
-
-my $options = { 'name'     => "PDFv2Plugin",
+                  'reqd' => "no" },
+                { 'name' => "virustotal_keytype",
+                  'desc' => "{PDFv3Plugin.virustotal_keytype}",
+                  'type' => "enum",
+                  'list' => $virustotal_keytype_list,                 
+                  'deft' => "public" },
+                { 'name' => "virustotal_apikey",
+                  'desc' => "{PDFv3Plugin.virustotal_apikey}",
+                  'type' => "string",
+                  'deft' => "CHANGEME" }
+    ];
+
+
+my $options = { 'name'     => "PDFv3Plugin",
         'desc'     => "{PDFv2Plugin.desc}",
         'abstract' => "no",
@@ -756 +774 @@
     print STDERR "\n\n\n\n\n***** PDFv3Plugin::process()\n";
     if ($self->{'malware_checker'}) {
+
     my $filename = &FileUtils::filenameConcatenate($base_dir, $file);
-    print STDERR "**** want to check: $filename\n";
-
-    # java -cp $ENV{'GEXT_MALWARECHECK'}/lib/java/malware-checker-1.0-SNAPSHOT-jar-with-dependencies.jar org.greenstone.virustotal.ScanFile
-
-    my $cmd = "java -cp $ENV{'GEXT_MALWARECHECKER'}/lib/java/malware-checker-1.0-SNAPSHOT-jar-with-dependencies.jar org.greenstone.virustotal.ScanFile $filename";
-    my $status = system($cmd);
-    print "STATUS = $status\n";
+
+    $self->MalwareCheckerConverter::checker($doc_obj,$filename);
     }