rapid-cdn: Fix redirect for standard ports

When the backend to redirect to uses scheme standard port it's cleaner to
redirect to URL without the port.

See https://www.rfc-editor.org/rfc/rfc9110.html#name-https-normalization-and-com:

"If the port is equal to the default port for a scheme, the normal form is to
omit the port subcomponent."

software/rapid-cdn/buildout.hash.cfg

@@ -38,7 +38,7 @@ md5sum = cba4d995962f7fbeae3f61c9372c4181
 
 [template-frontend-haproxy-configuration]
 _update_hash_filename_ = templates/frontend-haproxy.cfg.in
-md5sum = fc68a825c656bde0ae69a936936b0478
+md5sum = 545a0ff2f2dfaeb4342232398d8c8ebe
 
 [template-frontend-haproxy-crt-list]
 _update_hash_filename_ = templates/frontend-haproxy-crt-list.in

software/rapid-cdn/templates/frontend-haproxy.cfg.in

@@ -87,7 +87,12 @@ backend {{ slave_instance['slave_reference'] }}-{{ scheme }}
 {%-     else %}
 {%-       if 'hostname' in info_dict and 'port' in info_dict %}
 {%-         if slave_instance['type'] == 'redirect' %}
-  redirect prefix {{ info_dict['scheme'] }}://{{ info_dict['hostname'] }}:{{ info_dict['port'] }} code 302
+{%-           if (info_dict['scheme'] == 'https' and info_dict['port'] == 443) or (info_dict['scheme'] == 'http' and info_dict['port'] == 80) %}
+{%-             set port_suffix = '' %}
+{%-           else %}
+{%-             set port_suffix = ':%s' % (info_dict['port'],) %}
+{%-           endif %}
+  redirect prefix {{ info_dict['scheme'] }}://{{ info_dict['hostname'] }}{{ port_suffix }} code 302
 {%-         else %}
   server {{ slave_instance['slave_reference'] }}-backend-{{ scheme }} {{ info_dict['hostname'] }}:{{ info_dict['port'] }}
 {%-           if slave_instance['disable-via-header'] %}

software/rapid-cdn/test/test.py

@@ -1868,6 +1868,12 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin, AtsMixin):
         'type': 'redirect',
         'custom_domain': 'customdomaintyperedirect.example.com',
       },
+      'type-redirect-to-standard-port': {
+        'url': 'http://example.com/',
+        'https-url': 'https://example.com/',
+        'type': 'redirect',
+        'https-only': False,
+      },
       'enable_cache': {
         'url': cls.backend_url,
         'enable_cache': True,
@@ -2133,9 +2139,9 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin, AtsMixin):
       'monitor-base-url': 'https://[%s]:8401' % self.master_ipv6,
       'backend-client-caucase-url': 'http://[%s]:8990' % self.master_ipv6,
       'domain': 'example.com',
-      'accepted-slave-amount': '64',
+      'accepted-slave-amount': '65',
       'rejected-slave-amount': '0',
-      'slave-amount': '64',
+      'slave-amount': '65',
       'rejected-slave-dict': {
       },
       'warning-slave-dict': {
@@ -3641,6 +3647,47 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin, AtsMixin):
     self.assertResponseHeaders(
       result, via=False, backend_reached=False)
 
+  def test_type_redirect_to_standard_port(self):
+    parameter_dict = self.assertSlaveBase('type-redirect-to-standard-port')
+
+    result = fakeHTTPSResult(
+      parameter_dict['domain'],
+      'test-path/deep/.././deeper')
+
+    self.assertEqual(
+      self.certificate_pem,
+      result.certificate)
+
+    self.assertEqual(
+      http.client.FOUND,
+      result.status_code
+    )
+
+    self.assertEqual(
+      'https://example.com/test-path/deeper',
+      result.headers['Location']
+    )
+
+    self.assertResponseHeaders(
+      result, via=False, backend_reached=False)
+
+    result = fakeHTTPResult(
+      parameter_dict['domain'],
+      'test-path/deep/.././deeper')
+
+    self.assertEqual(
+      http.client.FOUND,
+      result.status_code
+    )
+
+    self.assertEqual(
+      'http://example.com/test-path/deeper',
+      result.headers['Location']
+    )
+
+    self.assertResponseHeaders(
+      result, via=False, backend_reached=False, alt_svc=False)
+
   def test_ssl_proxy_verify_ssl_proxy_ca_crt_unverified(self):
     parameter_dict = self.assertSlaveBase(
       'ssl-proxy-verify_ssl_proxy_ca_crt-unverified')

software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test00file_list_log.txt

@@ -139,6 +139,8 @@ T-2/var/log/httpd/_type-notebook_backend_log
 T-2/var/log/httpd/_type-notebook_frontend_log
 T-2/var/log/httpd/_type-redirect-custom_domain_access_log
 T-2/var/log/httpd/_type-redirect-custom_domain_frontend_log
+T-2/var/log/httpd/_type-redirect-to-standard-port_access_log
+T-2/var/log/httpd/_type-redirect-to-standard-port_frontend_log
 T-2/var/log/httpd/_type-redirect_access_log
 T-2/var/log/httpd/_type-redirect_frontend_log
 T-2/var/log/httpd/_type-websocket-websocket-path-list-empty_access_log

software/rapid-cdn/test/test_data/test.TestSlave.test00file_list_log.txt

@@ -139,6 +139,8 @@ T-2/var/log/httpd/_type-notebook_backend_log
 T-2/var/log/httpd/_type-notebook_frontend_log
 T-2/var/log/httpd/_type-redirect-custom_domain_access_log
 T-2/var/log/httpd/_type-redirect-custom_domain_frontend_log
+T-2/var/log/httpd/_type-redirect-to-standard-port_access_log
+T-2/var/log/httpd/_type-redirect-to-standard-port_frontend_log
 T-2/var/log/httpd/_type-redirect_access_log
 T-2/var/log/httpd/_type-redirect_frontend_log
 T-2/var/log/httpd/_type-websocket-websocket-path-list-empty_access_log

software/rapid-cdn/test/test_data/test.TestSlaveHttp3.test00file_list_log.txt

@@ -139,6 +139,8 @@ T-2/var/log/httpd/_type-notebook_backend_log
 T-2/var/log/httpd/_type-notebook_frontend_log
 T-2/var/log/httpd/_type-redirect-custom_domain_access_log
 T-2/var/log/httpd/_type-redirect-custom_domain_frontend_log
+T-2/var/log/httpd/_type-redirect-to-standard-port_access_log
+T-2/var/log/httpd/_type-redirect-to-standard-port_frontend_log
 T-2/var/log/httpd/_type-redirect_access_log
 T-2/var/log/httpd/_type-redirect_frontend_log
 T-2/var/log/httpd/_type-websocket-websocket-path-list-empty_access_log