From e94ca9f3b9c474e91becb8e1769fe596a763e525 Mon Sep 17 00:00:00 2001
From: Ninos <me@ninosego.de>
Date: Mon, 6 Sep 2021 15:16:55 +0200
Subject: [PATCH] Fixed: Rewrite proxy for ssl targets
---
server/conf/vhost.conf.master | 3 +++
server/plugins-available/apache2_plugin.inc.php | 7 ++++---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index 5b5e1f059e..0b432f2bf4 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -517,6 +517,9 @@
RewriteCond %{REQUEST_URI} !^/php-fcgi/
RewriteCond %{REQUEST_URI} !^<tmpl_var name='rewrite_target'>
</tmpl_if>
+<tmpl_if name="rewrite_target_is_ssl" op="==" value="y">
+ SSLProxyEngine On
+</tmpl_if>
RewriteRule ^/(.*)$ <tmpl_var name='rewrite_target'><tmpl_if name="rewrite_add_path" op="==" value="y">$1</tmpl_if> <tmpl_var name='rewrite_type'>
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 2db717c92a..0965b79e3b 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -1372,13 +1372,14 @@ class apache2_plugin {
$rewrite_rules[] = array('rewrite_domain' => '^'.$this->_rewrite_quote($data['new']['domain']),
'rewrite_type' => ($data['new']['redirect_type'] == 'no')?'':'['.$data['new']['redirect_type'].']',
'rewrite_target' => $rewrite_target,
+ 'rewrite_target_is_ssl' => ('https://' === substr($rewrite_target, 0, 8) ? 'y' : 'n'),
'rewrite_target_ssl' => $rewrite_target_ssl,
'rewrite_is_url' => ($this->_is_url($rewrite_target) ? 'y' : 'n'),
'rewrite_add_path' => (substr($rewrite_target, -1) == '/' ? 'y' : 'n'));
$rewrite_rules[] = array('rewrite_domain' => '^' . $this->_rewrite_quote('www.'.$data['new']['domain']),
'rewrite_type' => ($data['new']['redirect_type'] == 'no')?'':'['.$data['new']['redirect_type'].']',
'rewrite_target' => $rewrite_target,
- 'rewrite_target_ssl' => $rewrite_target_ssl,
+ 'rewrite_target_is_ssl' => ('https://' === substr($rewrite_target, 0, 8) ? 'y' : 'n'),
'rewrite_is_url' => ($this->_is_url($rewrite_target) ? 'y' : 'n'),
'rewrite_add_path' => (substr($rewrite_target, -1) == '/' ? 'y' : 'n'));
break;
@@ -1386,7 +1387,7 @@ class apache2_plugin {
$rewrite_wildcard_rules[] = array( 'rewrite_domain' => '(^|\.)'.$this->_rewrite_quote($data['new']['domain']),
'rewrite_type' => ($data['new']['redirect_type'] == 'no')?'':'['.$data['new']['redirect_type'].']',
'rewrite_target' => $rewrite_target,
- 'rewrite_target_ssl' => $rewrite_target_ssl,
+ 'rewrite_target_is_ssl' => ('https://' === substr($rewrite_target, 0, 8) ? 'y' : 'n'),
'rewrite_is_url' => ($this->_is_url($rewrite_target) ? 'y' : 'n'),
'rewrite_add_path' => (substr($rewrite_target, -1) == '/' ? 'y' : 'n'));
break;
@@ -1394,7 +1395,7 @@ class apache2_plugin {
$rewrite_rules[] = array( 'rewrite_domain' => '^'.$this->_rewrite_quote($data['new']['domain']),
'rewrite_type' => ($data['new']['redirect_type'] == 'no')?'':'['.$data['new']['redirect_type'].']',
'rewrite_target' => $rewrite_target,
- 'rewrite_target_ssl' => $rewrite_target_ssl,
+ 'rewrite_target_is_ssl' => ('https://' === substr($rewrite_target, 0, 8) ? 'y' : 'n'),
'rewrite_is_url' => ($this->_is_url($rewrite_target) ? 'y' : 'n'),
'rewrite_add_path' => (substr($rewrite_target, -1) == '/' ? 'y' : 'n'));
}
--
GitLab