From 0311d0479109a12d995a3dc6d5385df575a81e14 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 14 Nov 2025 12:39:33 +0100 Subject: [PATCH] Bug 41167: Add test to compare both apache conf Content-Type: text/plain; charset=utf-8 Signed-off-by: Marcel de Rooy [EDIT] chmod 755, shebang, remove Data::Printer, enable NoWarnings one regex delimiter; replaced a grep by a map --- xt/check_apache_conf.t | 48 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100755 xt/check_apache_conf.t diff --git a/xt/check_apache_conf.t b/xt/check_apache_conf.t new file mode 100755 index 0000000000..0f929d4b0c --- /dev/null +++ b/xt/check_apache_conf.t @@ -0,0 +1,48 @@ +#!/usr/bin/perl + +# This file is part of Koha. +# +# Koha 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 3 of the License, or (at your option) any later +# version. +# +# Koha 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. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with Koha; if not, see . + +use Modern::Perl; + +use Test::More tests => 2; + +use Test::NoWarnings; + +use Array::Utils qw( array_minus ); +use File::Slurp qw(read_file); + +subtest 'Intranet RewriteRule statements' => sub { + plan tests => 1; + my @debian_content = map { chomp; $_ } read_file('debian/templates/apache-shared-intranet.conf'); + my @httpd_content = map { chomp; $_ } read_file('etc/koha-httpd.conf'); + + my @debian_rewrite_rules = + map { my $x = $_; $x =~ s/^\s+//; $x =~ m/RewriteRule|RewriteCond/ ? $x : () } @debian_content; + + my @httpd_intranet_rewrite_rules; + my $pattern = "## Intranet"; + my $found = 0; + foreach my $line (@httpd_content) { + if ( $found && $line !~ m/^#/ && $line =~ m/RewriteRule|RewriteCond/ ) { + $line =~ s/^\s+//; + push @httpd_intranet_rewrite_rules, $line; + } elsif ( $line =~ m/$pattern/ ) { + $found = 1; + } + } + my @diff = array_minus @debian_rewrite_rules, @httpd_intranet_rewrite_rules; + is( scalar(@diff), 0, "All RewriteRule and RewriteCond directives must be copied to etc/koha-httpd.conf" ) + or diag @diff; +}; -- 2.39.5