svn commit: r1896791 - /spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DecodeShortURLs.pm

[gb...@apache.org]

Author: gbechis
Date: Fri Jan  7 12:00:49 2022
New Revision: 1896791

URL: http://svn.apache.org/viewvc?rev=1896791&view=rev
Log:
do not try to cache urls longer then permitted

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DecodeShortURLs.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DecodeShortURLs.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DecodeShortURLs.pm?rev=1896791&r1=1896790&r2=1896791&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DecodeShortURLs.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DecodeShortURLs.pm Fri Jan  7 12:00:49 2022
@@ -457,8 +457,14 @@ sub recursive_lookup {
     $location = $response->headers->{location};
     # Bail out if $short_url redirects to itself
     return undef if ($short_url eq $location);
-    $self->cache_add($short_url, $location) if $self->{caching};
     dbg("Found $short_url => $location");
+    if ($self->{caching}) {
+      if ($self->cache_add($short_url, $location)) {
+        dbg("Added $short_url to cache");
+      } else {
+        dbg("Cannot add $short_url to cache");
+      }
+    }
     if($self->{url_shortener_loginfo}) {
       info("Found $short_url => $location");
     } else {
@@ -507,7 +513,9 @@ sub recursive_lookup {
 
 sub cache_add {
   my ($self, $short_url, $decoded_url) = @_;
-  return undef if not $self->{caching};
+  return 0 if not $self->{caching};
+
+  return 0 if((length($short_url) > 256) or (length($decoded_url) > 512));
 
   eval {
     $self->{sth_insert} = $self->{dbh}->prepare_cached("
@@ -517,11 +525,11 @@ sub cache_add {
   };
   if ($@) {
     dbg("warn: $@");
-    return undef;
+    return 0;
   };
 
   $self->{sth_insert}->execute($short_url, $decoded_url, time(), time());
-  return undef;
+  return 1;
 }
 
 sub cache_get {