caddy-frontend: Drop needless tests for ssl-proxy-verify

This verification happens on the connection to the backend with
backend-haproxy component, and changes like type of the slave or cache usage
does not impact it.

software/caddy-frontend/test/test.py

@@ -1356,23 +1356,6 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
         'type': 'zope',
         'https-only': 'false',
       },
-      'type-zope-ssl-proxy-verify_ssl_proxy_ca_crt': {
-        'url': cls.backend_https_url,
-        'type': 'zope',
-        'ssl-proxy-verify': True,
-        'ssl_proxy_ca_crt': cls.test_server_ca.certificate_pem,
-      },
-      'type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified': {
-        'url': cls.backend_https_url,
-        'type': 'zope',
-        'ssl-proxy-verify': True,
-        'ssl_proxy_ca_crt': cls.another_server_ca.certificate_pem,
-      },
-      'type-zope-ssl-proxy-verify-unverified': {
-        'url': cls.backend_https_url,
-        'type': 'zope',
-        'ssl-proxy-verify': True,
-      },
       'type-zope-virtualhostroot-http-port': {
         'url': cls.backend_url,
         'type': 'zope',
@@ -1459,23 +1442,6 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
         'url': cls.backend_url,
         'enable-http2': False,
       },
-      'enable_cache-ssl-proxy-verify-unverified': {
-        'url': cls.backend_https_url,
-        'enable_cache': True,
-        'ssl-proxy-verify': True,
-      },
-      'enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt': {
-        'url': cls.backend_https_url,
-        'enable_cache': True,
-        'ssl_proxy_ca_crt': cls.test_server_ca.certificate_pem,
-        'ssl-proxy-verify': True,
-      },
-      'enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified': {
-        'url': cls.backend_https_url,
-        'enable_cache': True,
-        'ssl_proxy_ca_crt': cls.another_server_ca.certificate_pem,
-        'ssl-proxy-verify': True,
-      },
       'enable-http2-default': {
         'url': cls.backend_url,
       },
@@ -1668,9 +1634,9 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
       'monitor-base-url': 'https://[%s]:8401' % self._ipv6_address,
       'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
       'domain': 'example.com',
-      'accepted-slave-amount': '56',
+      'accepted-slave-amount': '50',
       'rejected-slave-amount': '0',
-      'slave-amount': '56',
+      'slave-amount': '50',
       'rejected-slave-dict': {
       },
       'warning-slave-dict': {
@@ -3505,208 +3471,6 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
       result.status_code
     )
 
-  def test_enable_cache_ssl_proxy_verify_ssl_proxy_ca_crt_unverified(self):
-    parameter_dict = self.parseSlaveParameterDict(
-      'enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified')
-
-    self.assertLogAccessUrlWithPop(parameter_dict)
-    self.assertKedifaKeysWithPop(parameter_dict)
-    self.assertEqual(
-      {
-        'domain':
-        'enablecachesslproxyverifysslproxycacrtunverified.example.com',
-        'replication_number': '1',
-        'url':
-        'http://enablecachesslproxyverifysslproxycacrtunverified.example.com',
-        'site_url':
-        'http://enablecachesslproxyverifysslproxycacrtunverified.example.com',
-        'secure_access':
-        'https://enablecachesslproxyverifysslproxycacrtunverified.example.com',
-        'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
-      },
-      parameter_dict
-    )
-
-    result = fakeHTTPSResult(
-      parameter_dict['domain'],
-      'test-path/deep/.././deeper')
-
-    self.assertEqual(
-      self.certificate_pem,
-      der2pem(result.peercert))
-
-    self.assertEqual(
-      httplib.SERVICE_UNAVAILABLE,
-      result.status_code
-    )
-
-    result_http = fakeHTTPResult(
-      parameter_dict['domain'],
-      'test-path/deeper')
-
-    self.assertEqual(
-      httplib.FOUND,
-      result_http.status_code
-    )
-
-    self.assertEqual(
-      'https://enablecachesslproxyverifysslproxycacrtunverified.example.com'
-      ':%s/test-path/deeper' % (HTTP_PORT,),
-      result_http.headers['Location']
-    )
-
-  def test_enable_cache_ssl_proxy_verify_ssl_proxy_ca_crt(self):
-    parameter_dict = self.assertSlaveBase(
-      'enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt')
-
-    result = fakeHTTPSResult(
-      parameter_dict['domain'],
-      'test-path/deep/.././deeper')
-
-    self.assertEqual(
-      self.certificate_pem,
-      der2pem(result.peercert))
-
-    self.assertEqualResultJson(result, 'Path', '/test-path/deeper')
-
-    headers = result.headers.copy()
-
-    self.assertKeyWithPop('Server', headers)
-    self.assertKeyWithPop('Date', headers)
-    self.assertKeyWithPop('Age', headers)
-
-    # drop keys appearing randomly in headers
-    headers.pop('Transfer-Encoding', None)
-    headers.pop('Content-Length', None)
-    headers.pop('Connection', None)
-    headers.pop('Keep-Alive', None)
-
-    self.assertEqual(
-      {
-        'Content-type': 'application/json',
-        'Set-Cookie': 'secured=value;secure, nonsecured=value',
-      },
-      headers
-    )
-
-  def test_enable_cache_ssl_proxy_verify_unverified(self):
-    parameter_dict = self.assertSlaveBase(
-      'enable_cache-ssl-proxy-verify-unverified')
-
-    result = fakeHTTPSResult(
-      parameter_dict['domain'], 'test-path')
-
-    self.assertEqual(
-      self.certificate_pem,
-      der2pem(result.peercert))
-
-    self.assertEqual(
-      httplib.SERVICE_UNAVAILABLE,
-      result.status_code
-    )
-
-  def test_type_zope_ssl_proxy_verify_ssl_proxy_ca_crt_unverified(self):
-    parameter_dict = self.parseSlaveParameterDict(
-      'type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified')
-
-    self.assertLogAccessUrlWithPop(parameter_dict)
-    self.assertKedifaKeysWithPop(parameter_dict)
-    self.assertEqual(
-      {
-        'domain': 'typezopesslproxyverifysslproxycacrtunverified.example.com',
-        'replication_number': '1',
-        'url':
-        'http://typezopesslproxyverifysslproxycacrtunverified.example.com',
-        'site_url':
-        'http://typezopesslproxyverifysslproxycacrtunverified.example.com',
-        'secure_access':
-        'https://typezopesslproxyverifysslproxycacrtunverified.example.com',
-        'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
-      },
-      parameter_dict
-    )
-
-    result = fakeHTTPSResult(
-      parameter_dict['domain'], 'test-path')
-
-    self.assertEqual(
-      self.certificate_pem,
-      der2pem(result.peercert))
-
-    self.assertEqual(
-      httplib.SERVICE_UNAVAILABLE,
-      result.status_code
-    )
-
-    result_http = fakeHTTPResult(
-      parameter_dict['domain'], 'test-path')
-
-    self.assertEqual(
-      httplib.FOUND,
-      result_http.status_code
-    )
-
-    self.assertEqual(
-      'https://typezopesslproxyverifysslproxycacrtunverified.example.com:%s/'
-      'test-path' % (HTTP_PORT,),
-      result_http.headers['Location']
-    )
-
-  def test_type_zope_ssl_proxy_verify_ssl_proxy_ca_crt(self):
-    parameter_dict = self.assertSlaveBase(
-      'type-zope-ssl-proxy-verify_ssl_proxy_ca_crt')
-
-    result = fakeHTTPSResult(
-      parameter_dict['domain'], 'test-path')
-
-    self.assertEqual(
-      self.certificate_pem,
-      der2pem(result.peercert))
-
-    try:
-      j = result.json()
-    except Exception:
-      raise ValueError('JSON decode problem in:\n%s' % (result.text,))
-    self.assertBackendHeaders(j['Incoming Headers'], parameter_dict['domain'])
-
-    self.assertEqualResultJson(
-      result,
-      'Path',
-      '/VirtualHostBase/https//'
-      'typezopesslproxyverifysslproxycacrt.example.com:443/'
-      '/VirtualHostRoot/test-path'
-    )
-
-    result = fakeHTTPResult(
-      parameter_dict['domain'], 'test-path')
-
-    self.assertEqual(
-      httplib.FOUND,
-      result.status_code
-    )
-
-    self.assertEqual(
-      'https://typezopesslproxyverifysslproxycacrt.example.com:'
-      '%s/test-path' % (HTTP_PORT,),
-      result.headers['Location']
-    )
-
-  def test_type_zope_ssl_proxy_verify_unverified(self):
-    parameter_dict = self.assertSlaveBase(
-      'type-zope-ssl-proxy-verify-unverified')
-
-    result = fakeHTTPSResult(
-      parameter_dict['domain'], 'test-path')
-
-    self.assertEqual(
-      self.certificate_pem,
-      der2pem(result.peercert))
-
-    self.assertEqual(
-      httplib.SERVICE_UNAVAILABLE,
-      result.status_code
-    )
-
   def test_monitor_ipv6_test(self):
     parameter_dict = self.assertSlaveBase('monitor-ipv6-test')
 

software/caddy-frontend/test/test_data/test.TestSlave.test_file_list_log-CADDY.txt

@@ -55,15 +55,6 @@ T-2/var/log/httpd/_enable_cache-disable-no-cache-request_error_log
 T-2/var/log/httpd/_enable_cache-disable-via-header_access_log
 T-2/var/log/httpd/_enable_cache-disable-via-header_backend_log
 T-2/var/log/httpd/_enable_cache-disable-via-header_error_log
-T-2/var/log/httpd/_enable_cache-ssl-proxy-verify-unverified_access_log
-T-2/var/log/httpd/_enable_cache-ssl-proxy-verify-unverified_backend_log
-T-2/var/log/httpd/_enable_cache-ssl-proxy-verify-unverified_error_log
-T-2/var/log/httpd/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_access_log
-T-2/var/log/httpd/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_backend_log
-T-2/var/log/httpd/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_error_log
-T-2/var/log/httpd/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt_access_log
-T-2/var/log/httpd/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt_backend_log
-T-2/var/log/httpd/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt_error_log
 T-2/var/log/httpd/_enable_cache_access_log
 T-2/var/log/httpd/_enable_cache_backend_log
 T-2/var/log/httpd/_enable_cache_custom_domain_access_log
@@ -150,15 +141,6 @@ T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend-https-only_error_lo
 T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend_access_log
 T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend_backend_log
 T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend_error_log
-T-2/var/log/httpd/_type-zope-ssl-proxy-verify-unverified_access_log
-T-2/var/log/httpd/_type-zope-ssl-proxy-verify-unverified_backend_log
-T-2/var/log/httpd/_type-zope-ssl-proxy-verify-unverified_error_log
-T-2/var/log/httpd/_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_access_log
-T-2/var/log/httpd/_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_backend_log
-T-2/var/log/httpd/_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_error_log
-T-2/var/log/httpd/_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt_access_log
-T-2/var/log/httpd/_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt_backend_log
-T-2/var/log/httpd/_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt_error_log
 T-2/var/log/httpd/_type-zope-virtualhostroot-http-port_access_log
 T-2/var/log/httpd/_type-zope-virtualhostroot-http-port_backend_log
 T-2/var/log/httpd/_type-zope-virtualhostroot-http-port_error_log

software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_file_list_log-CADDY.txt

@@ -55,15 +55,6 @@ T-2/var/log/httpd/_enable_cache-disable-no-cache-request_error_log
 T-2/var/log/httpd/_enable_cache-disable-via-header_access_log
 T-2/var/log/httpd/_enable_cache-disable-via-header_backend_log
 T-2/var/log/httpd/_enable_cache-disable-via-header_error_log
-T-2/var/log/httpd/_enable_cache-ssl-proxy-verify-unverified_access_log
-T-2/var/log/httpd/_enable_cache-ssl-proxy-verify-unverified_backend_log
-T-2/var/log/httpd/_enable_cache-ssl-proxy-verify-unverified_error_log
-T-2/var/log/httpd/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_access_log
-T-2/var/log/httpd/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_backend_log
-T-2/var/log/httpd/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_error_log
-T-2/var/log/httpd/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt_access_log
-T-2/var/log/httpd/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt_backend_log
-T-2/var/log/httpd/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt_error_log
 T-2/var/log/httpd/_enable_cache_access_log
 T-2/var/log/httpd/_enable_cache_backend_log
 T-2/var/log/httpd/_enable_cache_custom_domain_access_log
@@ -150,15 +141,6 @@ T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend-https-only_error_lo
 T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend_access_log
 T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend_backend_log
 T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend_error_log
-T-2/var/log/httpd/_type-zope-ssl-proxy-verify-unverified_access_log
-T-2/var/log/httpd/_type-zope-ssl-proxy-verify-unverified_backend_log
-T-2/var/log/httpd/_type-zope-ssl-proxy-verify-unverified_error_log
-T-2/var/log/httpd/_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_access_log
-T-2/var/log/httpd/_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_backend_log
-T-2/var/log/httpd/_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_error_log
-T-2/var/log/httpd/_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt_access_log
-T-2/var/log/httpd/_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt_backend_log
-T-2/var/log/httpd/_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt_error_log
 T-2/var/log/httpd/_type-zope-virtualhostroot-http-port_access_log
 T-2/var/log/httpd/_type-zope-virtualhostroot-http-port_backend_log
 T-2/var/log/httpd/_type-zope-virtualhostroot-http-port_error_log