Procházet zdrojové kódy

[Web] Fix mta-sts server_name

FreddleSpl0it před 2 týdny
rodič
revize
9045319c53
2 změnil soubory, kde provedl 4 přidání a 4 odebrání
  1. 2 2
      data/conf/nginx/templates/nginx.conf.j2
  2. 2 2
      data/web/mta-sts.php

+ 2 - 2
data/conf/nginx/templates/nginx.conf.j2

@@ -48,7 +48,7 @@ http {
         listen {{ HTTP_PORT }} default_server;
         listen [::]:{{ HTTP_PORT }} default_server;
 
-        server_name {{ MAILCOW_HOSTNAME }} autodiscover.* autoconfig.* _mta-sts.* {{ ADDITIONAL_SERVER_NAMES | join(' ') }};
+        server_name {{ MAILCOW_HOSTNAME }} autodiscover.* autoconfig.* mta-sts.* {{ ADDITIONAL_SERVER_NAMES | join(' ') }};
 
         if ( $request_uri ~* "%0A|%0D" ) { return 403; }
         location ^~ /.well-known/acme-challenge/ {
@@ -90,7 +90,7 @@ http {
         ssl_certificate /etc/ssl/mail/cert.pem;
         ssl_certificate_key /etc/ssl/mail/key.pem;
 
-        server_name {{ MAILCOW_HOSTNAME }} autodiscover.* autoconfig.* _mta-sts.*;
+        server_name {{ MAILCOW_HOSTNAME }} autodiscover.* autoconfig.* mta-sts.*;
 
         include /etc/nginx/includes/sites-default.conf;
     }

+ 2 - 2
data/web/mta-sts.php

@@ -1,12 +1,12 @@
 <?php
 require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/prerequisites.inc.php';
 
-if (!isset($_SERVER['HTTP_HOST']) || strpos($_SERVER['HTTP_HOST'], '_mta-sts.') !== 0) {
+if (!isset($_SERVER['HTTP_HOST']) || strpos($_SERVER['HTTP_HOST'], 'mta-sts.') !== 0) {
   http_response_code(404);
   exit;
 }
 
-$domain = str_replace('_mta-sts.', '', $_SERVER['HTTP_HOST']);
+$domain = str_replace('mta-sts.', '', $_SERVER['HTTP_HOST']);
 $mta_sts = mailbox('get', 'mta_sts', $domain);
 
 if (count($mta_sts) == 0 ||