token may not be available

mojolicious · Dec 4, 2013 · a82a5be · a82a5be
1 parent 230d86f
commit a82a5be
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/lib/Mojolicious/Validator/Validation.pm b/lib/Mojolicious/Validator/Validation.pm
@@ -43,7 +43,7 @@ sub csrf_protect {
   my $self  = shift;
   my $token = $self->input->{csrf_token};
   $self->{error}{csrf_token} = ['csrf_protect']
-    unless $token && $token eq $self->csrf_token;
+    unless $token && $token eq ($self->csrf_token // '');
   return $self;
 }
 

diff --git a/t/mojolicious/validation_lite_app.t b/t/mojolicious/validation_lite_app.t
@@ -129,8 +129,14 @@ is $validation->param('0'), 0, 'right value';
 
 # CSRF protection
 $validation = $t->app->validation->input({foo => 'bar'})->csrf_protect;
+ok $validation->has_data,  'has data';
 ok $validation->has_error, 'has error';
 is_deeply $validation->error('csrf_token'), ['csrf_protect'], 'right error';
+$validation = $t->app->validation->input({csrf_token => 'abc'});
+ok $validation->has_data, 'has data';
+ok $validation->csrf_protect->has_error, 'has error';
+ok $validation->has_data, 'has data';
+is_deeply $validation->error('csrf_token'), ['csrf_protect'], 'right error';
 $validation = $t->app->validation->input({csrf_token => 'abc', foo => 'bar'})
   ->csrf_token('cba')->csrf_protect;
 ok $validation->has_error, 'has error';