Changeset 98

Timestamp:

09.12.2006 19:17:22 (2 years ago)

Author:

jorge

Message:

Change: check headers of all files and determine if they are images only after header checks. This makes sure images are checked even though they are sent as application/octet-stream and either without an extension or a name=xxx header, or with wrong or invalid extensions. Still, we only check for mime parts that indicate an image or a generic binary stream.
Change: only generate a temporary $imgdir if we find an image. This should speed things up a little, since now we don't blindly create a directory only to be destroyed later, which is OS or File system dependent.

Files:

• trunk/devel/FuzzyOcr.pm (modified) (10 diffs)

trunk/devel/FuzzyOcr.pm

@@ -41 +41 @@
-use FuzzyOcr::Deanimate qw(deanimate);
-use FuzzyOcr::Scoring qw(wrong_ctype wrong_extension corrupt_img known_img_hash);
-
+ removedir
-
-our @ISA = qw(Mail::SpamAssassin::Plugin);
@@ -146 +146 @@
-            $fname =~ tr/\@\$\%\&/_/s;
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-        my $pdata = $p->decode();
-        my $pdatalen = length($pdata);
@@ -191 +154 @@
-        if ( substr($pdata,0,3) eq "\x47\x49\x46" ) {
-            ## GIF File
-img
+
-            ($w,$h) = unpack("vv",substr($pdata,6,4));
-img
-img
-img
+
+
+
-        } elsif ( substr($pdata,0,2) eq "\xff\xd8" ) {
-            ## JPEG File
@@ -220 +183 @@
-            } else {
-                ($h,$w) = unpack("nn",substr($pdata,$pos+3,4));
-img
-img
-img
-img
+
+
+
+
-            }
-        } elsif ( substr($pdata,0,4) eq "\x89\x50\x4e\x47" ) {
-            # PNG File
-            ($w,$h) = unpack("NN",substr($pdata,16,8));
-img
-img
-img
-img
+
+
+
+
-        } elsif ( substr($pdata,0,2) eq "BM" ) {
-            ## BMP File
-            ($w,$h) = unpack("NN",substr($pdata,18,8));
-img
-img
-img
-img
+
+
+
+
-        } elsif (
+            ## TIFF File
-            (substr($pdata,0,4) eq "\x4d\x4d\x00\x2a") or
-            (substr($pdata,0,4) eq "\x49\x49\x2a\x00")
@@ -253 +217 @@
-                last if ($h != 0 and $w != 0);
-            }
-img
+
-            infolog("Cannot determite size of TIFF image, setting to '1x1'") if ($h == 0 and $w == 0);
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        unless (open PICT, ">$imgfilename") {
-            errorlog("Cannot write \"$imgfilename\", skipping...");
-
+
+
-            next;
-        }
@@ -272 +269 @@
-        close PICT;
-        debuglog("Saved: $imgfilename");
+
+        #Increment valid image file counter
-        $cnt++;
+
+        #keep raw email for debugging later
+        my $rawfilename = $imgdir . "/raw.eml";
+        if (open RAW, ">$imgfilename") {
+            print RAW $pms->{msg}->get_pristine();
+            close RAW;
+            debuglog("Saved: $rawfilename");
+        }
+
-    }
-
-    if ($cnt == 0) {
-        debuglog("Skipping OCR, no image files found...");
-        removedirs(get_all_tmpdirs()) if (defined($imgdir) and ($conf->{focr_keep_bad_images}<2));
-        return 0;
-    }
@@ -284 +291 @@
-        $conf->{focr_mysql_ddb} = get_mysql_ddb();
-    }
-
-    my $haserr = open RAWERR, ">$imgdir/raw.err";
-    debuglog("Errors to: $imgdir/raw.err") if ($haserr>0);
-
-    # Try to load personal wordlist
@@ -304 +308 @@
-
-    IMAGE:
-
-
-
+name
+name
+#
-        my @used_scansets = ();
-        my $corrupt = 0;
@@ -312 +316 @@
-        my $generic_ctype = 0;
-        my $digest;
+        my $file  = $$pic{fpath};
-        my $tfile = $file;
-        my $pfile = $file . ".pnm";
@@ -317 +322 @@
-        debuglog("pfile => $pfile");
-        debuglog("efile => $efile");
+
+        #Open ERRORLOG
+        my $haserr = $Mail::SpamAssassin::Logger::LOG_SA{level} == 3;
+
+        if ($haserr) {
+            $haserr = open RAWERR, ">$imgdir/raw.err";
+            debuglog("Errors to: $imgdir/raw.err") if ($haserr>0);
+        }
-
-        my $mimetype = $$pic{ctype};