diff --git a/UnitTestContrib/test/unit/AccessControlTests.pm b/UnitTestContrib/test/unit/AccessControlTests.pm
index 8e559f1776..81e35fc97c 100644
--- a/UnitTestContrib/test/unit/AccessControlTests.pm
+++ b/UnitTestContrib/test/unit/AccessControlTests.pm
@@ -953,8 +953,15 @@ THIS
my ($status) = $text =~ m/^Status: (\d+)\r?$/m;
$this->assert_not_null( $status,
"Request did not return a Status header" );
- $this->assert_equals( 401, $status,
- "Request should have returned a 401, not a $status" );
+ $this->assert_equals(
+ 401, $status,
+ "Request should have returned a 401, not a $status"
+ . (
+ $status == 500
+ ? "\n--- CAPTURED OUTPUT:\n" . $text . "\n--- END OF CAPTURE\n"
+ : ''
+ )
+ );
# Extract what we've been redirected to
my ($formAction) =
diff --git a/core/lib/Foswiki/Exception.pm b/core/lib/Foswiki/Exception.pm
index 580060de0e..05a9373a53 100644
--- a/core/lib/Foswiki/Exception.pm
+++ b/core/lib/Foswiki/Exception.pm
@@ -60,7 +60,7 @@ BEGIN {
has line => ( is => 'rwp' );
has file => ( is => 'rwp' );
-has text => ( is => 'ro', required => 1, );
+has text => ( is => 'ro', );
has stacktrace => ( is => 'rwp' );
sub BUILD {
diff --git a/core/lib/Foswiki/OopsException.pm b/core/lib/Foswiki/OopsException.pm
index 958d42b9ac..5a8db174ed 100644
--- a/core/lib/Foswiki/OopsException.pm
+++ b/core/lib/Foswiki/OopsException.pm
@@ -129,8 +129,8 @@ has params => (
default => '',
);
has status => (
- is => 'rwp',
- default => '',
+ is => 'rw',
+ default => 500,
);
=begin TML
@@ -154,7 +154,6 @@ NOTE: parameter values are automatically and unconditionally entity-encoded
sub BUILD {
my $this = shift;
$this->_set_template( $this->template || 'generic' );
- $this->_set_status(500); # default server error
if ( ref( $this->params ) ne 'ARRAY' ) {
$this->_set_params( [ $this->params ] );
}
diff --git a/core/lib/Foswiki/UI/Register.pm b/core/lib/Foswiki/UI/Register.pm
index d35d5aada5..a910b4ddbf 100755
--- a/core/lib/Foswiki/UI/Register.pm
+++ b/core/lib/Foswiki/UI/Register.pm
@@ -13,7 +13,7 @@ package Foswiki::UI::Register;
use strict;
use warnings;
use Assert;
-use Error qw( :try );
+use Try::Tiny;
use Foswiki ();
use Foswiki::LoginManager ();
@@ -489,10 +489,14 @@ sub _registerSingleBulkUser {
_validateRegistration( $session, $row, 0 );
}
- catch Foswiki::OopsException with {
+ catch {
my $e = shift;
- $log .= '' . $e->stringify($session) . "
\n";
- $tryError = "$b1 Registration failed\n";
+ if ( $e->isa('Foswiki::OopsException') ) {
+ $log .=
+ '' . $e->stringify($session) . "
\n";
+ $tryError = "$b1 Registration failed\n";
+ }
+
};
return $log . $tryError if ($tryError);
@@ -541,9 +545,8 @@ sub _registerSingleBulkUser {
}
);
}
- catch Error with {
- my $e = shift;
- $log .= "$b1 Failed to add user: " . $e->stringify() . "\n";
+ catch {
+ $log .= "$b1 Failed to add user: " . $_->stringify() . "\n";
};
#if ($Foswiki::cfg{EmailUserDetails}) {
@@ -909,12 +912,11 @@ sub addUserToGroup {
try {
$session->{users}->addUserToGroup( undef, $groupName, $create );
}
- catch Error with {
- my $e = shift;
+ catch {
# Log the error
$session->logger->log( 'warning',
- "catch: Failed to upgrade $groupName " . $e->stringify() );
+ "catch: Failed to upgrade $groupName " . $_->stringify() );
};
throw Foswiki::OopsException(
@@ -980,8 +982,8 @@ sub addUserToGroup {
$session->{users}->addUserToGroup( $u, $groupName, $create );
push( @succeeded, $u );
}
- catch Error with {
- my $e = shift;
+ catch {
+ my $e = $_;
my $mess = $e->stringify();
$mess =~ s/ at .*$//s;
@@ -1073,8 +1075,8 @@ sub removeUserFromGroup {
Foswiki::Func::removeUserFromGroup( $u, $groupName );
push( @succeeded, $u );
}
- catch Error with {
- my $e = shift;
+ catch {
+ my $e = $_;
my $mess = $e->stringify();
$mess =~ s/ at .*$//s;
@@ -1204,43 +1206,48 @@ sub _complete {
$users->addUserToGroup( $cUID, $groupName );
push @addedTo, $groupName;
}
- catch Error with {
+ catch {
my $e = shift;
$session->logger->log( 'warning',
"Registration: Failure adding $cUID to $groupName" );
}
finally {
$session->{user} = $safe;
+ if (@_) {
+ $_[0]->throw;
+ }
+
};
}
}
$data->{AddToGroups} = join( ',', @addedTo );
}
- catch Foswiki::OopsException with {
- my $e = shift;
- $users->removeUser( $data->{LoginName}, $data->{WikiName} )
- if ( $users->userExists( $data->{WikiName} ) );
- $e->throw();
+ catch {
+ my $e = $_;
+ if ( $e->isa('Foswiki::OopsException') ) {
+ $users->removeUser( $data->{LoginName}, $data->{WikiName} )
+ if ( $users->userExists( $data->{WikiName} ) );
+ $e->throw();
- #throw Foswiki::OopsException ( @_ ); # Propagate
- }
- catch Error with {
- my $e = shift;
+ #throw Foswiki::OopsException ( @_ ); # Propagate
+ }
+ else {
- $users->removeUser( $data->{LoginName}, $data->{WikiName} )
- if ( $users->userExists( $data->{WikiName} ) );
+ $users->removeUser( $data->{LoginName}, $data->{WikiName} )
+ if ( $users->userExists( $data->{WikiName} ) );
- # Log the error
- $session->logger->log( 'warning',
- 'Registration failed: ' . $e->stringify() );
- throw Foswiki::OopsException(
- 'register',
- web => $data->{webName},
- topic => $topic,
- def => 'problem_adding',
- params => [ $data->{WikiName}, $e->stringify() ]
- );
+ # Log the error
+ $session->logger->log( 'warning',
+ 'Registration failed: ' . $e->stringify() );
+ throw Foswiki::OopsException(
+ 'register',
+ web => $data->{webName},
+ topic => $topic,
+ def => 'problem_adding',
+ params => [ $data->{WikiName}, $e->stringify() ]
+ );
+ }
};
# Plugin to do some other post processing of the user.
@@ -1419,6 +1426,10 @@ sub _writeRegistrationDetailsToTopic {
}
finally {
$session->{user} = $safe;
+ if (@_) {
+ $_[0]->throw;
+ }
+
};
return $log;
}
@@ -1507,7 +1518,7 @@ sub _emailRegistrationConfirmations {
$template =
$session->templates->readTemplate('registerfailednotremoved');
}
- catch Error with {
+ catch {
# Most Mapping Managers don't support removeUser, unfortunately
$template =
@@ -1901,19 +1912,21 @@ sub _validateRegistration {
# better get it right!
$session->{plugins}->dispatch( 'validateRegistrationHandler', $data );
}
- catch Foswiki::OopsException with {
- shift->throw(); # propagate
- }
- catch Error with {
- my $e = shift;
- throw Foswiki::OopsException(
- 'register',
- web => $data->{webName},
- topic => $session->{topicName},
- def => 'registration_invalid',
- params => [ $e->stringify ]
- );
+ catch {
+ my $e = $_;
+ if ( $e->isa('Foswiki::OopsException') ) {
+ $e->throw(); # propagate
+ }
+ else {
+ throw Foswiki::OopsException(
+ 'register',
+ web => $data->{webName},
+ topic => $session->{topicName},
+ def => 'registration_invalid',
+ params => [ $e->stringify ]
+ );
+ }
};
}
@@ -1990,7 +2003,7 @@ sub _loadPendingRegistration {
try {
$file = _codeFile($code);
}
- catch Error with {
+ catch {
throw Foswiki::OopsException(
'register',
def => 'bad_ver_code',
@@ -2052,8 +2065,7 @@ sub _getDataFromQuery {
$data->{$name} =
$users->validateRegistrationField( $name, $value );
}
- catch Error with {
- my $e = shift;
+ catch {
throw Foswiki::OopsException(
'register',
def => 'invalid_field',
@@ -2258,9 +2270,12 @@ sub _processDeleteUser {
"User topic moved to $Foswiki::cfg{TrashWebName}.$newTopic, ";
}
finally {
-
# Restore the original user
$Foswiki::Plugins::SESSION->{user} = $safe;
+ if (@_) {
+ $_[0]->throw;
+ }
+
};
}
else {