Skip to content

Commit

Permalink
Item10566: Fix rest+ApacheLogin incorrect 403 (expect 401) problem
Browse files Browse the repository at this point in the history
Added a restauth script. This problem only occurs if you're not forcing
auth on the rest script in apache.

git-svn-id: http://svn.foswiki.org/trunk@11263 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
PaulHarvey authored and PaulHarvey committed Mar 29, 2011
1 parent 69372f5 commit 9d279a9
Show file tree
Hide file tree
Showing 4 changed files with 61 additions and 1 deletion.
54 changes: 54 additions & 0 deletions core/bin/restauth
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
#!/usr/bin/perl -wT
# See bottom of file for license and copyright information
use strict;
use warnings;

use File::Spec;
use FindBin qw( $Bin $Script );

BEGIN {
if ( defined $ENV{GATEWAY_INTERFACE} || defined $ENV{MOD_PERL} ) {
$Foswiki::cfg{Engine} = 'Foswiki::Engine::CGI';
use CGI::Carp qw(fatalsToBrowser);
$SIG{__DIE__} = \&CGI::Carp::confess;
}
else {
$Foswiki::cfg{Engine} = 'Foswiki::Engine::CLI';
require Carp;
$SIG{__DIE__} = \&Carp::confess;
}
my @path = File::Spec->splitpath($Bin);
my $setlib = File::Spec->catfile( @path, 'setlib.cfg' );
require $setlib;
$Script =~ s/\..*$//; # Remove optional file extension
$ENV{FOSWIKI_ACTION} = $Script;
}

use Foswiki ();
use Foswiki::UI ();
$Foswiki::engine->run();
__END__
Foswiki - The Free and Open Source Wiki, http://foswiki.org/
Copyright (C) 2008-2010 Foswiki Contributors. Foswiki Contributors
are listed in the AUTHORS file in the root of this distribution.
NOTE: Please extend that file, not this notice.
Additional copyrights apply to some or all of the code in this
file as follows:
Copyright (C) 1999-2007 Peter Thoeny, peter@thoeny.org
and TWiki Contributors. All Rights Reserved. TWiki Contributors
are listed in the AUTHORS file in the root of this distribution.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version. For
more details read LICENSE in the root of this distribution.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
As per the GPL, removal of this notice is prohibited.
2 changes: 1 addition & 1 deletion core/lib/Foswiki.spec
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ $Foswiki::cfg{LoginManager} = 'Foswiki::LoginManager::TemplateLogin';
# to require a valid user for access to these scripts. <code>edit</code> and
# <code>save</code> should be removed from this list if the guest user is permitted to
# edit topics without authentication.
$Foswiki::cfg{AuthScripts} = 'attach,edit,manage,rename,save,upload,viewauth,rdiffauth,rest';
$Foswiki::cfg{AuthScripts} = 'attach,edit,manage,rename,save,upload,viewauth,rdiffauth,restauth,rest';

# **BOOLEAN EXPERT**
# Browsers typically remember your login and passwords to make authentication
Expand Down
1 change: 1 addition & 0 deletions core/lib/Foswiki/Contrib/core/MANIFEST
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ bin/register 0555
bin/rename 0555
bin/resetpasswd 0555
bin/rest 0555
bin/restauth 0555
bin/save 0555
bin/search 0555
bin/setlib.cfg 0444
Expand Down
5 changes: 5 additions & 0 deletions core/lib/Foswiki/UI.pm
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,11 @@ BEGIN {
function => 'rest',
context => { rest => 1 },
};
$Foswiki::cfg{SwitchBoard}{restauth} = {
package => 'Foswiki::UI::Rest',
function => 'rest',
context => { rest => 1 },
};
$Foswiki::cfg{SwitchBoard}{save} = {
package => 'Foswiki::UI::Save',
function => 'save',
Expand Down

0 comments on commit 9d279a9

Please sign in to comment.