Permalink
Browse files

Item14150: Merge branch 'Release02x01'

  • Loading branch information...
2 parents 44c1c3f + 377070f commit c47158abfb4981a05092f319f6b6f25df8b2d19d @gac410 gac410 committed Aug 31, 2016
Showing with 17 additions and 0 deletions.
  1. +8 −0 core/lib/Foswiki/PageCache.pm
  2. +9 −0 core/lib/Foswiki/Validation.pm
@@ -683,6 +683,14 @@ sub _handleDirtyArea {
$prefs->popTopicContext();
};
+ my $request = $session->{request};
+ my $context = $request->url( -full => 1, -path => 1, -query => 1 ) . time();
+ my $cgis = $session->{users}->getCGISession();
+ my $usingStrikeOne = $Foswiki::cfg{Validation}{Method} eq 'strikeone';
+
+ $text =~
+s/<input type='hidden' name='validation_key' value='(\?.*?)' \/>/Foswiki::Validation::updateValidationKey($cgis, $context, $usingStrikeOne, $1)/gei;
+
#Foswiki::Func::writeDebug("out text='$text'") if TRACE;
return $text;
}
@@ -92,6 +92,15 @@ sub addValidationKey {
return "<input type='hidden' name='validation_key' value='?$nonce' />";
}
+sub updateValidationKey {
+ my ( $cgis, $context, $strikeone, $oldKey ) = @_;
+
+ # expire old key
+ expireValidationKeys( $cgis, $oldKey );
+
+ return addValidationKey( $cgis, $context, $strikeone );
+}
+
=begin TML
---++ StaticMethod generateValidationKey( $cgis, $context, $strikeone ) -> $nonce

0 comments on commit c47158a

Please sign in to comment.