Merge branch 'fix-6144' into 'develop'

Ensure that we always have two capture groups in nginx redirect regex expressions

Closes #6144

See merge request ispconfig/ispconfig3!1468

Author: Marius Burkard

server/conf/nginx_vhost.conf.master

@@ -60,13 +60,13 @@ server {
 </tmpl_loop>
 <tmpl_loop name="local_redirects">
         if ($http_host <tmpl_var name='local_redirect_operator'> "<tmpl_var name='local_redirect_origin_domain'>") {
-            rewrite ^<tmpl_var name='local_redirect_exclude'>(.*)$ <tmpl_var name='local_redirect_target'>$1 <tmpl_var name='local_redirect_type'>;
+            rewrite ^<tmpl_var name='local_redirect_exclude'>(.*)$ <tmpl_var name='local_redirect_target'>$2 <tmpl_var name='local_redirect_type'>;
         }
 </tmpl_loop>
 
 <tmpl_loop name="own_redirects">
 <tmpl_if name='use_rewrite'>
-        <tmpl_if name='exclude_own_hostname'>if ($http_host != "<tmpl_var name='exclude_own_hostname'>") { </tmpl_if>rewrite ^<tmpl_var name='rewrite_exclude'>(.*)$ <tmpl_var name='rewrite_target'>$1 <tmpl_var name='rewrite_type'>;<tmpl_if name='exclude_own_hostname'> }</tmpl_if>
+        <tmpl_if name='exclude_own_hostname'>if ($http_host != "<tmpl_var name='exclude_own_hostname'>") { </tmpl_if>rewrite ^<tmpl_var name='rewrite_exclude'>(.*)$ <tmpl_var name='rewrite_target'>$2 <tmpl_var name='rewrite_type'>;<tmpl_if name='exclude_own_hostname'> }</tmpl_if>
 </tmpl_if>
 <tmpl_if name='use_proxy'>
         location / {

server/plugins-available/nginx_plugin.inc.php

@@ -1499,7 +1499,7 @@ function update($event_name, $data) {
 						}
 					} else {
 						// external URL
-						$rewrite_exclude = '(?!\.well-known/acme-challenge)/';
+						$rewrite_exclude = '(?!/(\.well-known/acme-challenge))/';
 						if($data['new']['redirect_type'] == 'proxy'){
 							$vhost_data['use_proxy'] = 'y';
 							$rewrite_subdir = $tmp_redirect_path_parts['path'];
@@ -1551,7 +1551,7 @@ function update($event_name, $data) {
 						}
 					} else {
 						// external URL
-						$rewrite_exclude = '(?!\.well-known/acme-challenge)/';
+						$rewrite_exclude = '(?!/(\.well-known/acme-challenge))/';
 						if($data['new']['redirect_type'] == 'proxy'){
 							$vhost_data['use_proxy'] = 'y';
 							$rewrite_subdir = $tmp_redirect_path_parts['path'];
@@ -1601,7 +1601,7 @@ function update($event_name, $data) {
 						}
 					} else {
 						// external URL
-						$rewrite_exclude = '(?!\.well-known/acme-challenge)/';
+						$rewrite_exclude = '(?!/(\.well-known/acme-challenge))/';
 						if($data['new']['redirect_type'] == 'proxy'){
 							$vhost_data['use_proxy'] = 'y';
 							$rewrite_subdir = $tmp_redirect_path_parts['path'];