From abaa483aa34e10c1473968dc6f0373cfb7527a31 Mon Sep 17 00:00:00 2001 From: arjan Date: Tue, 23 Oct 2018 11:52:45 +0200 Subject: [PATCH] moved honeypot check to www_processSubscription --- lib/WebGUI/AssetAspect/Subscriber.pm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/WebGUI/AssetAspect/Subscriber.pm b/lib/WebGUI/AssetAspect/Subscriber.pm index ad34612..fed9da6 100644 --- a/lib/WebGUI/AssetAspect/Subscriber.pm +++ b/lib/WebGUI/AssetAspect/Subscriber.pm @@ -395,13 +395,13 @@ sub sendSubscriptionConfirmation { my $action = shift || 'subscribe'; my $session = $self->session; my $i18n = WebGUI::International->new( $session, 'AssetAspect_Subscriber' ); - +=pod my $honeypot = $session->form->honeypot( 'hp' ); if ( $self->get('useHoneypot') && $honeypot ) { $session->log->warn( "Honeypot triggered: $honeypot" ); return; } - +=cut my $var = $self->getEmailVars( $user ); my $url = $session->url->getSiteURL . $self->getUrl( "func=confirmMutation;code=$code" ); @@ -440,13 +440,13 @@ sub sendNoMutationEmail { my $action = shift || 'subscribe'; my $session = $self->session; my $i18n = WebGUI::International->new( $session, 'AssetAspect_Subscriber' ); - +=pod my $honeypot = $session->form->honeypot( 'hp' ); if ( $self->get('useHoneypot') && $honeypot ) { $session->log->warn( "Honeypot triggered: $honeypot" ); return; } - +=cut my $var = $self->getEmailVars( $user ); $var->{ actionIsSubscribe } = $action eq 'subscribe'; @@ -682,6 +682,12 @@ sub www_processSubscription { my $action = $form->get( 'action' ); return unless $action eq 'subscribe' || $action eq 'unsubscribe'; + my $honeypot = $session->form->honeypot( 'hp' ); + if ( $self->get('useHoneypot') && $honeypot ) { + $session->log->warn( "Honeypot triggered: $honeypot" ); + return; + } + if ( $session->user->isRegistered ) { if ( $action eq 'subscribe' && $self->canSubscribe ) { $self->subscribe;