Attachment 109897 Details for Bug 20582 – Bug 20582: Fix PSGI file when behind a reverse proxy

[patch] Bug 20582: Fix PSGI file when behind a reverse proxy

Bug-20582-Fix-PSGI-file-when-behind-a-reverse-prox.patch (text/plain), 1.44 KB, created by Martin Renvoize (ashimema) on 2020-09-11 10:49:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2020-09-11 10:49:48 UTC

Size: 1.44 KB

patch

obsolete

>From c9277901bda126d26378557c2e647e06002b2982 Mon Sep 17 00:00:00 2001
>From: Julian Maurice <julian.maurice@biblibre.com>
>Date: Fri, 28 Aug 2020 17:35:14 +0400
>Subject: [PATCH] Bug 20582: Fix PSGI file when behind a reverse proxy
>
>ReverseProxy middleware can modify SERVER_PORT which is used to
>determines which app (opac or intranet) to run, so the choice should be
>made before ReverseProxy middleware
>
>Signed-off-by: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> app.psgi | 16 ++++++++++++++--
> 1 file changed, 14 insertions(+), 2 deletions(-)
>
>diff --git a/app.psgi b/app.psgi
>index 9a0d287fc4..0824a3ebc6 100644
>--- a/app.psgi
>+++ b/app.psgi
>@@ -41,12 +41,24 @@ my $port2app = {
> };
> 
> builder {
>+    # This middleware decides which app to run (opac or intranet) depending on
>+    # SERVER_PORT.  It must be run before ReverseProxy middleware which can
>+    # modify SERVER_PORT
>+    enable sub {
>+        my $app = shift;
>+        sub {
>+            my $env = shift;
>+            $env->{'koha.app'} = $port2app->{$env->{SERVER_PORT}} || $intranet;
>+            return $app->($env);
>+        }
>+    };
>+
>     enable 'ReverseProxy';
>     enable '+Koha::Middleware::SetEnv';
>     enable '+Koha::Middleware::RealIP';
>+
>     sub {
>         my $env = shift;
>-        my $app = $port2app->{$env->{SERVER_PORT}} || $intranet;
>-        $app->($env);
>+        $env->{'koha.app'}->($env);
>     };
> }
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 20582: 74173 | 74517 | 74518 | 74519 | 74520 | 79648 | 81687 | 81857 | 82423 | 84526 | 84527 | 84528 | 84529 | 84530 | 84531 | 91009 | 99267 | 103633 | 103720 | 103721 | 109282 | 109283 | 109284 | 109895 | 109896 | 109897 | 109898 | 109899 | 109900 | 111282 | 111315 | 111374