From e595f3c41afd93472c0cef7a259c9be65912f9fb Mon Sep 17 00:00:00 2001 From: Frank Lichtenheld Date: Sat, 14 Apr 2007 14:58:09 +0200 Subject: [PATCH] dispatcher.pl: Add some backwards compatibility handling Try to show something useful if the user reaches us over an older /cgi-bin/search_* URL. --- cgi-bin/dispatcher.pl | 30 +++++++++++++++++++++++++++++- conf/apache.conf.sed.in | 5 ++++- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/cgi-bin/dispatcher.pl b/cgi-bin/dispatcher.pl index b563dc5..4b413d7 100755 --- a/cgi-bin/dispatcher.pl +++ b/cgi-bin/dispatcher.pl @@ -26,7 +26,7 @@ use Deb::Versions; use Packages::Config qw( $DBDIR $ROOT $TEMPLATEDIR $CACHEDIR @SUITES @SECTIONS @ARCHIVES @ARCHITECTURES @PRIORITIES @LANGUAGES $LOCALES ); -use Packages::CGI qw( :DEFAULT get_all_messages ); +use Packages::CGI qw( :DEFAULT error get_all_messages ); use Packages::DB; use Packages::Search qw( :all ); use Packages::Template (); @@ -83,6 +83,32 @@ debug( "LANGUAGES=@LANGUAGES header=". bindtextdomain ( 'pdo', $LOCALES ); textdomain( 'pdo' ); +# backwards compatibility stuff +debug( "SCRIPT_URL=$ENV{SCRIPT_URL} SCRIPT_URI=$ENV{SCRIPT_URI}" ) if DEBUG; + +if ($ENV{SCRIPT_URL} =~ m|^/cgi-bin/search_|) { + error( "You reached this site over an old URL. ". + "Depending on the exact parameters your search might work or not." ); + # contents search changed a lot + if ($ENV{SCRIPT_URL} =~ m|^/cgi-bin/search_contents|) { + $input->param('keywords',$input->param('word')) if $input->param('word'); + $input->param('searchon','contents'); + for ($input->param('searchmode')) { + /^searchfiles/ && do { + $input->param('mode','filename'); + last; + }; + /^filelist/ && do { + $ENV{PATH_INFO} = '/'.join('/',($input->param('version')||'stable', + $input->param('keywords'), + $input->param('arch')||'i386', + 'filelist' )); + $input->delete('searchon','version','keywords','arch'); + last; + }; + } + } +} if ($ENV{is_reportbug}) { $input->param('exact', 1); debug( "reportbug detected, set paramater exact to '1'" ) if DEBUG; @@ -93,6 +119,8 @@ my $source = 0; if (my $path = $input->path_info() || $input->param('PATH_INFO')) { my @components = grep { $_ } map { lc $_ } split /\/+/, $path; + debug( "PATH_INFO=$path components=@components", 3) if DEBUG; + push @components, 'index' if @components && $path =~ m,/$,; my %LANGUAGES = map { $_ => 1 } @LANGUAGES; diff --git a/conf/apache.conf.sed.in b/conf/apache.conf.sed.in index 48bdde3..56dd359 100644 --- a/conf/apache.conf.sed.in +++ b/conf/apache.conf.sed.in @@ -106,8 +106,11 @@ RewriteLog /var/log/apache2/rewrite.log RewriteLogLevel 0 + RewriteRule ^/cgi-bin/search_packages.pl(.*)$ /search$1 + RewriteRule ^/cgi-bin/search_contents.pl(.*)$ /search$1 + # we never want to rewrite those URLs - RewriteRule ^/cgi-(bin|old)/ - [L] + RewriteRule ^/cgi-bin/dispatcher.pl - [L] RewriteRule ^/changelogs/ - [L] RewriteRule ^/Pics/ - [L] RewriteRule ^/about/ - [L] -- 2.39.2