Skip to content

slapos
slapos
Commit f46c53e8 authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

Merge remote-tracking branch 'origin/master' into goodbye-openssl-1.0.x

parents e976ceae a8a2f06a
Pipeline #20293 failed with stage
    in 0 seconds
    Show whitespace changes
    Inline Side-by-side
    Showing with 526 additions and 936 deletions
    .editorconfig
    View file @ f46c53e8
    root = true root = true
    [*.{cfg,in,md,json}] [*.{cfg,in,md,json,py}]
    end_of_line = lf end_of_line = lf
    charset = utf-8 charset = utf-8
    insert_final_newline = true insert_final_newline = true
    trim_trailing_whitespace = true
    [**.json] [*.{json,py}]
    indent_style = space indent_style = space
    indent_size = 2 indent_size = 2
    ......
    component/apache/buildout.cfg
    View file @ f46c53e8
    ...@@ -7,7 +7,7 @@ extends = ...@@ -7,7 +7,7 @@ extends =
    ../nghttp2/buildout.cfg ../nghttp2/buildout.cfg
    ../gdbm/buildout.cfg ../gdbm/buildout.cfg
    ../libexpat/buildout.cfg ../libexpat/buildout.cfg
    ../libuuid/buildout.cfg ../util-linux/buildout.cfg
    ../libxml2/buildout.cfg ../libxml2/buildout.cfg
    ../openssl/buildout.cfg ../openssl/buildout.cfg
    ../patch/buildout.cfg ../patch/buildout.cfg
    ......
    component/firefox/buildout.cfg
    View file @ f46c53e8
    ...@@ -148,7 +148,7 @@ library = ...@@ -148,7 +148,7 @@ library =
    ${libpng:location}/lib ${libpng:location}/lib
    ${libSM:location}/lib ${libSM:location}/lib
    ${libtool:location}/lib ${libtool:location}/lib
    ${libuuid:location}/lib ${util-linux:location}/lib
    ${libX11:location}/lib ${libX11:location}/lib
    ${libXau:location}/lib ${libXau:location}/lib
    ${libxcb:location}/lib ${libxcb:location}/lib
    ......
    component/libsecret/buildout.cfg
    View file @ f46c53e8
    ...@@ -6,7 +6,7 @@ extends = ...@@ -6,7 +6,7 @@ extends =
    ../pkgconfig/buildout.cfg ../pkgconfig/buildout.cfg
    ../glib/buildout.cfg ../glib/buildout.cfg
    ../gettext/buildout.cfg ../gettext/buildout.cfg
    ../libuuid/buildout.cfg ../util-linux/buildout.cfg
    ../xz-utils/buildout.cfg ../xz-utils/buildout.cfg
    ......
    component/libuuid/buildout.cfg deleted 100644 → 0
    View file @ e976ceae
    [buildout]
    parts =
    libuuid
    extends =
    ../perl/buildout.cfg
    [libuuid]
    recipe = slapos.recipe.cmmi
    shared = true
    url = http://www.kernel.org/pub/linux/utils/util-linux/v2.37/util-linux-2.37.2.tar.xz
    md5sum = d659bf7cd417d93dc609872f6334b019
    configure-options =
    --disable-static
    --disable-all-programs
    --enable-libuuid
    --without-libiconv-prefix
    --without-libintl-prefix
    --without-ncurses
    --without-slang
    --without-pam
    --without-selinux
    --without-audit
    environment =
    PATH=${perl:location}/bin:%(PATH)s
    component/pcre/buildout.cfg
    View file @ f46c53e8
    ...@@ -7,7 +7,7 @@ parts = ...@@ -7,7 +7,7 @@ parts =
    [pcre] [pcre]
    recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
    shared = true shared = true
    url = https://ftp.pcre.org/pub/pcre/pcre-8.45.tar.bz2 url = https://download.sourceforge.net/pcre/pcre/8.45/pcre-8.45.tar.bz2
    md5sum = 4452288e6a0eefb2ab11d36010a1eebb md5sum = 4452288e6a0eefb2ab11d36010a1eebb
    configure-options = configure-options =
    --disable-static --disable-static
    ......
    component/qemu-kvm/buildout.cfg
    View file @ f46c53e8
    ...@@ -8,7 +8,7 @@ extends = ...@@ -8,7 +8,7 @@ extends =
    ../libcap-ng/buildout.cfg ../libcap-ng/buildout.cfg
    ../libpng/buildout.cfg ../libpng/buildout.cfg
    ../liburing/buildout.cfg ../liburing/buildout.cfg
    ../libuuid/buildout.cfg ../util-linux/buildout.cfg
    ../meson/buildout.cfg ../meson/buildout.cfg
    ../ncurses/buildout.cfg ../ncurses/buildout.cfg
    ../ninja/buildout.cfg ../ninja/buildout.cfg
    ......
    component/quic_client-bin/buildout.cfg
    View file @ f46c53e8
    ...@@ -11,7 +11,7 @@ extends = ...@@ -11,7 +11,7 @@ extends =
    ../pcre/buildout.cfg ../pcre/buildout.cfg
    ../libffi/buildout.cfg ../libffi/buildout.cfg
    ../zlib/buildout.cfg ../zlib/buildout.cfg
    ../libuuid/buildout.cfg ../util-linux/buildout.cfg
    # compilation # compilation
    ../git/buildout.cfg ../git/buildout.cfg
    ......
    component/rsyslogd/buildout.cfg
    View file @ f46c53e8
    ...@@ -5,7 +5,7 @@ extends = ...@@ -5,7 +5,7 @@ extends =
    ../curl/buildout.cfg ../curl/buildout.cfg
    ../libestr/buildout.cfg ../libestr/buildout.cfg
    ../libfastjson/buildout.cfg ../libfastjson/buildout.cfg
    ../libuuid/buildout.cfg ../util-linux/buildout.cfg
    ../zlib/buildout.cfg ../zlib/buildout.cfg
    [rsyslogd] [rsyslogd]
    ......
    component/serf/buildout.cfg
    View file @ f46c53e8
    ...@@ -3,7 +3,7 @@ parts = ...@@ -3,7 +3,7 @@ parts =
    serf serf
    extends = extends =
    ../apache/buildout.cfg ../apache/buildout.cfg
    ../libuuid/buildout.cfg ../util-linux/buildout.cfg
    ../openssl/buildout.cfg ../openssl/buildout.cfg
    ../zlib/buildout.cfg ../zlib/buildout.cfg
    ......
    component/subversion/buildout.cfg
    View file @ f46c53e8
    ...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
    extends = extends =
    ../apache/buildout.cfg ../apache/buildout.cfg
    ../libexpat/buildout.cfg ../libexpat/buildout.cfg
    ../libuuid/buildout.cfg ../util-linux/buildout.cfg
    ../openssl/buildout.cfg ../openssl/buildout.cfg
    ../patch/buildout.cfg ../patch/buildout.cfg
    ../perl/buildout.cfg ../perl/buildout.cfg
    ......
    component/trafficserver/buildout.cfg
    View file @ f46c53e8
    ...@@ -45,6 +45,7 @@ patch-options = -p1 ...@@ -45,6 +45,7 @@ patch-options = -p1
    # (see https://github.com/apache/trafficserver/issues/8539 for the detail) # (see https://github.com/apache/trafficserver/issues/8539 for the detail)
    patches = patches =
    ${:_profile_base_location_}/trafficserver-9.1.1-TSHttpTxnCacheLookupStatusGet-fix.patch#d8ed3db3a48e97eb72aaaf7d7598a2d2 ${:_profile_base_location_}/trafficserver-9.1.1-TSHttpTxnCacheLookupStatusGet-fix.patch#d8ed3db3a48e97eb72aaaf7d7598a2d2
    ${:_profile_base_location_}/trafficserver-9.1.1-via-string-rapid-cdn.patch#8c39243d7525222385d5964485734f99
    environment = environment =
    PATH=${libtool:location}/bin:${make:location}/bin:${patch:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:%(PATH)s PATH=${libtool:location}/bin:${make:location}/bin:${patch:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:%(PATH)s
    LDFLAGS =-L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${tcl:location}/lib -Wl,-rpath=${tcl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${luajit:location}/lib -lm LDFLAGS =-L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${tcl:location}/lib -Wl,-rpath=${tcl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${luajit:location}/lib -lm
    ......
    component/trafficserver/trafficserver-9.1.1-via-string-rapid-cdn.patch 0 → 100644
    View file @ f46c53e8
    diff -ur trafficserver-9.1.1.orig/proxy/http/HttpTransactHeaders.cc trafficserver-9.1.1/proxy/http/HttpTransactHeaders.cc
    --- trafficserver-9.1.1.orig/proxy/http/HttpTransactHeaders.cc 2022-02-09 12:21:56.591350540 +0100
    +++ trafficserver-9.1.1/proxy/http/HttpTransactHeaders.cc 2022-03-07 13:02:31.503849619 +0100
    @@ -758,15 +758,6 @@
    write_hdr_protocol_stack(via_string, via_limit - via_string, ProtocolStackDetail::Standard, proto_buf.data(), n_proto);
    *via_string++ = ' ';
    - via_string += nstrcpy(via_string, s->http_config_param->proxy_hostname);
    -
    - *via_string++ = '[';
    - memcpy(via_string, Machine::instance()->uuid.getString(), TS_UUID_STRING_LEN);
    - via_string += TS_UUID_STRING_LEN;
    - *via_string++ = ']';
    - *via_string++ = ' ';
    - *via_string++ = '(';
    -
    memcpy(via_string, s->http_config_param->proxy_request_via_string, s->http_config_param->proxy_request_via_string_len);
    via_string += s->http_config_param->proxy_request_via_string_len;
    @@ -793,7 +784,6 @@
    }
    }
    - *via_string++ = ')';
    *via_string = 0;
    ink_assert((size_t)(via_string - new_via_string) < (sizeof(new_via_string) - 1));
    @@ -848,10 +838,6 @@
    write_hdr_protocol_stack(via_string, via_limit - via_string, ProtocolStackDetail::Standard, proto_buf.data(), n_proto);
    *via_string++ = ' ';
    - via_string += nstrcpy(via_string, s->http_config_param->proxy_hostname);
    - *via_string++ = ' ';
    - *via_string++ = '(';
    -
    memcpy(via_string, s->http_config_param->proxy_response_via_string, s->http_config_param->proxy_response_via_string_len);
    via_string += s->http_config_param->proxy_response_via_string_len;
    @@ -877,7 +863,6 @@
    }
    }
    - *via_string++ = ')';
    *via_string = 0;
    ink_assert((size_t)(via_string - new_via_string) < (sizeof(new_via_string) - 1));
    component/unstable/accords/buildout.cfg
    View file @ f46c53e8
    ...@@ -5,7 +5,7 @@ extends = ...@@ -5,7 +5,7 @@ extends =
    ../libtool/buildout.cfg ../libtool/buildout.cfg
    ../git/buildout.cfg ../git/buildout.cfg
    ../openssl/buildout.cfg ../openssl/buildout.cfg
    ../libuuid/buildout.cfg ../util-linux/buildout.cfg
    parts = accords parts = accords
    ......
    component/unstable/apache-perl/buildout.cfg
    View file @ f46c53e8
    ...@@ -4,7 +4,7 @@ parts = apache-perl perl-Apache2-Request ...@@ -4,7 +4,7 @@ parts = apache-perl perl-Apache2-Request
    extends = extends =
    ../apache/buildout.cfg ../apache/buildout.cfg
    ../perl/buildout.cfg ../perl/buildout.cfg
    ../libuuid/buildout.cfg ../util-linux/buildout.cfg
    [apache-perl] [apache-perl]
    # Note: Shall react on each build of apache and reinstall itself # Note: Shall react on each build of apache and reinstall itself
    ......
    component/util-linux/buildout.cfg
    View file @ f46c53e8
    ...@@ -7,8 +7,8 @@ extends = ...@@ -7,8 +7,8 @@ extends =
    [util-linux] [util-linux]
    recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
    shared = true shared = true
    url = https://www.kernel.org/pub/linux/utils/util-linux/v2.37/util-linux-2.37.1.tar.xz url = https://www.kernel.org/pub/linux/utils/util-linux/v2.37/util-linux-2.37.2.tar.xz
    md5sum = 6d244f0f59247e9109f47d6e5dd0556b md5sum = d659bf7cd417d93dc609872f6334b019
    configure-options = configure-options =
    --disable-static --disable-static
    --enable-libuuid --enable-libuuid
    ...@@ -50,3 +50,21 @@ environment = ...@@ -50,3 +50,21 @@ environment =
    PATH=${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s PATH=${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s
    LDFLAGS=-L${libcap-ng:location}/lib -Wl,-rpath=${libcap-ng:location}/lib LDFLAGS=-L${libcap-ng:location}/lib -Wl,-rpath=${libcap-ng:location}/lib
    CFLAGS=-I${libcap-ng:location}/include CFLAGS=-I${libcap-ng:location}/include
    [libuuid]
    # libuuid is inside util-linux source code with only libuuid feature enabled.
    <= util-linux
    configure-options =
    --disable-static
    --disable-all-programs
    --enable-libuuid
    --without-libiconv-prefix
    --without-libintl-prefix
    --without-ncurses
    --without-slang
    --without-pam
    --without-selinux
    --without-audit
    environment =
    PATH=${perl:location}/bin:%(PATH)s
    component/xapian/buildout.cfg
    View file @ f46c53e8
    ...@@ -3,7 +3,7 @@ parts = ...@@ -3,7 +3,7 @@ parts =
    xapian xapian
    extends = extends =
    ../zlib/buildout.cfg ../zlib/buildout.cfg
    ../libuuid/buildout.cfg ../util-linux/buildout.cfg
    [xapian] [xapian]
    recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
    ......
    component/xorg/buildout.cfg
    View file @ f46c53e8
    ...@@ -10,7 +10,7 @@ extends = ...@@ -10,7 +10,7 @@ extends =
    ../icu/buildout.cfg ../icu/buildout.cfg
    ../intltool/buildout.cfg ../intltool/buildout.cfg
    ../libtool/buildout.cfg ../libtool/buildout.cfg
    ../libuuid/buildout.cfg ../util-linux/buildout.cfg
    ../libxml2/buildout.cfg ../libxml2/buildout.cfg
    ../libxslt/buildout.cfg ../libxslt/buildout.cfg
    ../meson/buildout.cfg ../meson/buildout.cfg
    ......
    component/zeromq/buildout.cfg
    View file @ f46c53e8
    [buildout] [buildout]
    extends = extends =
    ../libtool/buildout.cfg ../libtool/buildout.cfg
    ../libuuid/buildout.cfg ../util-linux/buildout.cfg
    [zeromq] [zeromq]
    <= zeromq3 <= zeromq3
    ......
    software/caddy-frontend/buildout.hash.cfg
    View file @ f46c53e8
    ...@@ -22,19 +22,19 @@ md5sum = 5784bea3bd608913769ff9a8afcccb68 ...@@ -22,19 +22,19 @@ md5sum = 5784bea3bd608913769ff9a8afcccb68
    [profile-caddy-frontend] [profile-caddy-frontend]
    filename = instance-apache-frontend.cfg.in filename = instance-apache-frontend.cfg.in
    md5sum = 3e3021b86c3cfe93553489441da85496 md5sum = 04e550480d3057ca65d87c6fadbaed6e
    [profile-caddy-replicate] [profile-caddy-replicate]
    filename = instance-apache-replicate.cfg.in filename = instance-apache-replicate.cfg.in
    md5sum = c028f1c5947494e7f25cf8266a3ecd2d md5sum = 63b418626ef0f8ac54d6359fb6637371
    [profile-slave-list] [profile-slave-list]
    _update_hash_filename_ = templates/apache-custom-slave-list.cfg.in _update_hash_filename_ = templates/apache-custom-slave-list.cfg.in
    md5sum = 6b6ab13d82bf9ecff6a37c3402ddbf95 md5sum = e3ba0da5d137dcbd56c2604d200ac3b9
    [profile-replicate-publish-slave-information] [profile-replicate-publish-slave-information]
    _update_hash_filename_ = templates/replicate-publish-slave-information.cfg.in _update_hash_filename_ = templates/replicate-publish-slave-information.cfg.in
    md5sum = df304a8aee87b6f2425241016a48f7a5 md5sum = be54431846fe7f3cee65260eefc83d62
    [profile-caddy-frontend-configuration] [profile-caddy-frontend-configuration]
    _update_hash_filename_ = templates/Caddyfile.in _update_hash_filename_ = templates/Caddyfile.in
    ...@@ -46,11 +46,11 @@ md5sum = 88af61e7abbf30dc99a1a2526161128d ...@@ -46,11 +46,11 @@ md5sum = 88af61e7abbf30dc99a1a2526161128d
    [template-default-slave-virtualhost] [template-default-slave-virtualhost]
    _update_hash_filename_ = templates/default-virtualhost.conf.in _update_hash_filename_ = templates/default-virtualhost.conf.in
    md5sum = 37475d79f28c5f126bc1947fdb938fdb md5sum = 57c86795293b11300a036f5f8cf2c868
    [template-backend-haproxy-configuration] [template-backend-haproxy-configuration]
    _update_hash_filename_ = templates/backend-haproxy.cfg.in _update_hash_filename_ = templates/backend-haproxy.cfg.in
    md5sum = ae4c9ce775ea003aa51eda5ecbbeec73 md5sum = 6d4ad68ac44ccc72fe9148bd8e05a6f0
    [template-empty] [template-empty]
    _update_hash_filename_ = templates/empty.in _update_hash_filename_ = templates/empty.in
    ...@@ -62,7 +62,7 @@ md5sum = 975177dedf677d24e14cede5d13187ce ...@@ -62,7 +62,7 @@ md5sum = 975177dedf677d24e14cede5d13187ce
    [template-trafficserver-records-config] [template-trafficserver-records-config]
    _update_hash_filename_ = templates/trafficserver/records.config.jinja2 _update_hash_filename_ = templates/trafficserver/records.config.jinja2
    md5sum = e87238c53d080ef9ef90040e57bc1395 md5sum = 715baa302d562a7e4eddc3d1bf72f981
    [template-trafficserver-storage-config] [template-trafficserver-storage-config]
    _update_hash_filename_ = templates/trafficserver/storage.config.jinja2 _update_hash_filename_ = templates/trafficserver/storage.config.jinja2
    ...@@ -94,7 +94,7 @@ md5sum = 8c150e1e6c993708d31936742f3a7302 ...@@ -94,7 +94,7 @@ md5sum = 8c150e1e6c993708d31936742f3a7302
    [caddyprofiledeps-setup] [caddyprofiledeps-setup]
    filename = setup.py filename = setup.py
    md5sum = 6aad2b4c271294f524214192ee197c15 md5sum = f6f72d03af7d9dc29fb4d4fef1062e73
    [caddyprofiledeps-dummy] [caddyprofiledeps-dummy]
    filename = caddyprofiledummy.py filename = caddyprofiledummy.py
    ......
    software/caddy-frontend/instance-apache-frontend.cfg.in
    View file @ f46c53e8
    ...@@ -63,6 +63,75 @@ parts = ...@@ -63,6 +63,75 @@ parts =
    [caddyprofiledeps] [caddyprofiledeps]
    recipe = caddyprofiledeps recipe = caddyprofiledeps
    [frontend-node-id]
    # Store id file in top of hierarchy, so it does not depend on directory creation
    file = ${buildout:directory}/.frontend-node-id.txt
    recipe = slapos.recipe.build
    init =
    import os
    import secrets
    if not os.path.exists(options['file']):
    with open(options['file'], 'w') as fh:
    fh.write(secrets.token_urlsafe(4))
    with open(options['file'], 'r') as fh:
    options['value'] = fh.read()
    [frontend-node-private-salt]
    # Private, not communicated, stable hash, which can be used to salt other
    # hashes, so their values are connected to the node, but practicaly impossible
    # to crack (until the node is hacked itself, but then those values are
    # stolen anyway)
    recipe = slapos.recipe.build
    init =
    import os
    import uuid
    if not os.path.exists(options['file']):
    with open(options['file'], 'w') as fh:
    fh.write(uuid.uuid4().hex)
    with open(options['file'], 'r') as fh:
    options['value'] = fh.read()
    file = ${buildout:directory}/.frontend-node-private-salt.txt
    [version-hash]
    recipe = slapos.recipe.build
    software-release-url = ${slap-connection:software-release-url}
    hash-salt = ${frontend-node-private-salt:value}
    init =
    import hashlib
    import base64
    options['value'] = base64.urlsafe_b64encode(hashlib.md5(''.join([options['software-release-url'].strip(), options['hash-salt']])).digest())
    [frontend-node-information]
    recipe = slapos.recipe.build
    file = ${buildout:directory}/.frontend-node-information.json
    node-id = ${frontend-node-id:value}
    current-hash = ${version-hash:value}
    current-software-release-url = ${version-hash:software-release-url}
    init =
    import json
    changed = False
    try:
    with open(options['file'], 'r') as fh:
    data = json.load(fh)
    except Exception:
    changed = True
    data = {
    'node-id': options['node-id'],
    'version-hash-history': {options['current-hash']: options['current-software-release-url']}
    }
    if 'node-id' not in data:
    data['node-id'] = options['node-id']
    changed = True
    if 'version-hash-history' not in data:
    data['version-hash-history'] = {}
    changed = True
    if options['current-hash'] not in data['version-hash-history']:
    data['version-hash-history'][options['current-hash']] = options['current-software-release-url']
    changed = True
    if changed:
    with open(options['file'], 'w') as fh:
    json.dump(data, fh)
    options['value'] = data
    # Create all needed directories # Create all needed directories
    [directory] [directory]
    recipe = slapos.cookbook:mkdirectory recipe = slapos.cookbook:mkdirectory
    ...@@ -305,6 +374,10 @@ extra-context = ...@@ -305,6 +374,10 @@ extra-context =
    key software_type :software_type key software_type :software_type
    key frontend_lazy_graceful_reload frontend-caddy-lazy-graceful:rendered key frontend_lazy_graceful_reload frontend-caddy-lazy-graceful:rendered
    key monitor_base_url monitor-instance-parameter:monitor-base-url key monitor_base_url monitor-instance-parameter:monitor-base-url
    key node_id frontend-node-id:value
    key version_hash version-hash:value
    key software_release_url version-hash:software-release-url
    key node_information frontend-node-information:value
    key custom_ssl_directory caddy-directory:custom-ssl-directory key custom_ssl_directory caddy-directory:custom-ssl-directory
    # BBB: SlapOS Master non-zero knowledge BEGIN # BBB: SlapOS Master non-zero knowledge BEGIN
    key apache_certificate apache-certificate:rendered key apache_certificate apache-certificate:rendered
    ...@@ -462,6 +535,8 @@ disk-cache-size = ${configuration:disk-cache-size} ...@@ -462,6 +535,8 @@ disk-cache-size = ${configuration:disk-cache-size}
    ram-cache-size = ${configuration:ram-cache-size} ram-cache-size = ${configuration:ram-cache-size}
    templates-dir = {{ software_parameter_dict['trafficserver'] }}/etc/trafficserver/body_factory templates-dir = {{ software_parameter_dict['trafficserver'] }}/etc/trafficserver/body_factory
    request-timeout = ${configuration:request-timeout} request-timeout = ${configuration:request-timeout}
    version-hash = ${version-hash:value}
    node-id = ${frontend-node-id:value}
    [trafficserver-configuration-directory] [trafficserver-configuration-directory]
    recipe = plone.recipe.command recipe = plone.recipe.command
    ......
    software/caddy-frontend/instance-apache-replicate.cfg.in
    View file @ f46c53e8
    ...@@ -286,7 +286,7 @@ config-monitor-username = ${monitor-instance-parameter:username} ...@@ -286,7 +286,7 @@ config-monitor-username = ${monitor-instance-parameter:username}
    config-monitor-password = ${monitor-htpasswd:passwd} config-monitor-password = ${monitor-htpasswd:passwd}
    software-type = {{frontend_type}} software-type = {{frontend_type}}
    return = slave-instance-information-list monitor-base-url backend-client-csr-url kedifa-csr-url csr-certificate backend-haproxy-statistic-url return = slave-instance-information-list monitor-base-url backend-client-csr-url kedifa-csr-url csr-certificate backend-haproxy-statistic-url node-information-json
    {#- Send only needed parameters to frontend nodes #} {#- Send only needed parameters to frontend nodes #}
    {%- set base_node_configuration_dict = {} %} {%- set base_node_configuration_dict = {} %}
    ...@@ -376,6 +376,7 @@ kedifa-csr-certificate = ${request-kedifa:connection-csr-certificate} ...@@ -376,6 +376,7 @@ kedifa-csr-certificate = ${request-kedifa:connection-csr-certificate}
    {% for frontend in frontend_list %} {% for frontend in frontend_list %}
    {% set section_part = '${request-' + frontend %} {% set section_part = '${request-' + frontend %}
    {{ frontend }}-backend-haproxy-statistic-url = {{ section_part }}:connection-backend-haproxy-statistic-url} {{ frontend }}-backend-haproxy-statistic-url = {{ section_part }}:connection-backend-haproxy-statistic-url}
    {{ frontend }}-node-information-json = ${frontend-information:{{ frontend }}-node-information-json}
    {% endfor %} {% endfor %}
    {% if not aibcc_enabled %} {% if not aibcc_enabled %}
    {% for frontend in frontend_list %} {% for frontend in frontend_list %}
    ...@@ -461,6 +462,12 @@ warning-slave-dict = {{ dumps(warning_slave_dict) }} ...@@ -461,6 +462,12 @@ warning-slave-dict = {{ dumps(warning_slave_dict) }}
    {# sort_keys are important in order to avoid shuffling parameters on each run #} {# sort_keys are important in order to avoid shuffling parameters on each run #}
    active-slave-instance-list = {{ json_module.dumps(active_slave_instance_list, sort_keys=True) }} active-slave-instance-list = {{ json_module.dumps(active_slave_instance_list, sort_keys=True) }}
    [frontend-information]
    {% for frontend in frontend_list %}
    {% set section_part = '${request-' + frontend %}
    {{ frontend }}-node-information-json = {{ section_part }}:connection-node-information-json}
    {% endfor %}
    [dynamic-publish-slave-information] [dynamic-publish-slave-information]
    < = jinja2-template-base < = jinja2-template-base
    template = {{ software_parameter_dict['profile_replicate_publish_slave_information'] }} template = {{ software_parameter_dict['profile_replicate_publish_slave_information'] }}
    ...@@ -468,6 +475,7 @@ filename = dynamic-publish-slave-information.cfg ...@@ -468,6 +475,7 @@ filename = dynamic-publish-slave-information.cfg
    extensions = jinja2.ext.do extensions = jinja2.ext.do
    extra-context = extra-context =
    section slave_information slave-information section slave_information slave-information
    section frontend_information frontend-information
    section rejected_slave_information rejected-slave-information section rejected_slave_information rejected-slave-information
    section active_slave_instance_dict active-slave-instance section active_slave_instance_dict active-slave-instance
    section warning_slave_information warning-slave-information section warning_slave_information warning-slave-information
    ......
    software/caddy-frontend/setup.py
    View file @ f46c53e8
    ...@@ -10,6 +10,7 @@ setup( ...@@ -10,6 +10,7 @@ setup(
    'furl', 'furl',
    'orderedmultidict', 'orderedmultidict',
    'caucase', 'caucase',
    'python2-secrets',
    ], ],
    entry_points={ entry_points={
    'zc.buildout': [ 'zc.buildout': [
    ......
    software/caddy-frontend/software.cfg
    View file @ f46c53e8
    ...@@ -214,6 +214,7 @@ kedifa = 0.0.6 ...@@ -214,6 +214,7 @@ kedifa = 0.0.6
    # Modern KeDiFa requires zc.lockfile # Modern KeDiFa requires zc.lockfile
    zc.lockfile = 1.4 zc.lockfile = 1.4
    python2-secrets = 1.0.5
    validators = 0.12.2 validators = 0.12.2
    PyRSS2Gen = 1.1 PyRSS2Gen = 1.1
    cns.recipe.symlink = 0.2.3 cns.recipe.symlink = 0.2.3
    ......
    software/caddy-frontend/templates/apache-custom-slave-list.cfg.in
    View file @ f46c53e8
    ...@@ -330,6 +330,8 @@ certificate = {{ certificate }} ...@@ -330,6 +330,8 @@ certificate = {{ certificate }}
    https_port = {{ dumps('' ~ configuration['port']) }} https_port = {{ dumps('' ~ configuration['port']) }}
    http_port = {{ dumps('' ~ configuration['plain_http_port']) }} http_port = {{ dumps('' ~ configuration['plain_http_port']) }}
    local_ipv4 = {{ dumps('' ~ instance_parameter_dict['ipv4-random']) }} local_ipv4 = {{ dumps('' ~ instance_parameter_dict['ipv4-random']) }}
    version-hash = {{ version_hash }}
    node-id = {{ node_id }}
    {%- for key, value in slave_instance.iteritems() %} {%- for key, value in slave_instance.iteritems() %}
    {%- if value is not none %} {%- if value is not none %}
    {{ key }} = {{ dumps(value) }} {{ key }} = {{ dumps(value) }}
    ...@@ -463,6 +465,8 @@ csr-certificate = ${expose-csr-certificate-get:certificate} ...@@ -463,6 +465,8 @@ csr-certificate = ${expose-csr-certificate-get:certificate}
    {#- We unquote, as furl quotes automatically, but there is buildout value on purpose like ${...:...} in the passwod #} {#- We unquote, as furl quotes automatically, but there is buildout value on purpose like ${...:...} in the passwod #}
    {%- set statistic_url = urlparse_module.unquote(furled.tostr()) %} {%- set statistic_url = urlparse_module.unquote(furled.tostr()) %}
    backend-haproxy-statistic-url = {{ statistic_url }} backend-haproxy-statistic-url = {{ statistic_url }}
    {#- sort_keys are important in order to avoid shuffling parameters on each run #}
    node-information-json = {{ json_module.dumps(node_information, sort_keys=True) }}
    [kedifa-updater] [kedifa-updater]
    recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
    ...@@ -513,6 +517,8 @@ global-ipv6 = ${slap-configuration:ipv6-random} ...@@ -513,6 +517,8 @@ global-ipv6 = ${slap-configuration:ipv6-random}
    request-timeout = {{ dumps('' ~ configuration['request-timeout']) }} request-timeout = {{ dumps('' ~ configuration['request-timeout']) }}
    backend-connect-timeout = {{ dumps('' ~ configuration['backend-connect-timeout']) }} backend-connect-timeout = {{ dumps('' ~ configuration['backend-connect-timeout']) }}
    backend-connect-retries = {{ dumps('' ~ configuration['backend-connect-retries']) }} backend-connect-retries = {{ dumps('' ~ configuration['backend-connect-retries']) }}
    version-hash = {{ version_hash }}
    node-id = {{ node_id }}
    [template-expose-csr-link-csr] [template-expose-csr-link-csr]
    recipe = plone.recipe.command recipe = plone.recipe.command
    ......
    software/caddy-frontend/templates/backend-haproxy.cfg.in
    View file @ f46c53e8
    ...@@ -58,6 +58,8 @@ frontend statistic ...@@ -58,6 +58,8 @@ frontend statistic
    frontend http-backend frontend http-backend
    bind {{ configuration['local-ipv4'] }}:{{ configuration['http-port'] }} bind {{ configuration['local-ipv4'] }}:{{ configuration['http-port'] }}
    http-request add-header Via "%HV rapid-cdn-backend-{{ configuration['node-id'] }}-{{ configuration['version-hash'] }}"
    http-response add-header Via "%HV rapid-cdn-backend-{{ configuration['node-id'] }}-{{ configuration['version-hash']}}"
    {%- for slave_instance in backend_slave_list -%} {%- for slave_instance in backend_slave_list -%}
    {{ frontend_entry(slave_instance, 'http', False) }} {{ frontend_entry(slave_instance, 'http', False) }}
    {%- endfor %} {%- endfor %}
    ......
    software/caddy-frontend/templates/default-virtualhost.conf.in
    View file @ f46c53e8
    ...@@ -21,6 +21,10 @@ ...@@ -21,6 +21,10 @@
    # workaround for lost connection to haproxy by reconnecting # workaround for lost connection to haproxy by reconnecting
    try_duration 3s try_duration 3s
    try_interval 250ms try_interval 250ms
    header_upstream +Via "{proto} rapid-cdn-frontend-{{ slave_parameter['node-id'] }}-{{ slave_parameter['version-hash'] }}"
    {%- if not slave_parameter['disable-via-header'] %}
    header_downstream +Via "{proto} rapid-cdn-frontend-{{ slave_parameter['node-id'] }}-{{ slave_parameter['version-hash'] }}"
    {%- endif %}
    {%- endmacro %} {# proxy_header #} {%- endmacro %} {# proxy_header #}
    {%- macro hsts_header(tls) %} {%- macro hsts_header(tls) %}
    ......
    software/caddy-frontend/templates/replicate-publish-slave-information.cfg.in
    View file @ f46c53e8
    ...@@ -72,6 +72,9 @@ log-access-url = {{ dumps(json_module.dumps(log_access_url, sort_keys=True)) }} ...@@ -72,6 +72,9 @@ log-access-url = {{ dumps(json_module.dumps(log_access_url, sort_keys=True)) }}
    {{ key }} = {{ dumps(value) }} {{ key }} = {{ dumps(value) }}
    {% endfor %} {% endfor %}
    {% endif %} {% endif %}
    {% for frontend_key, frontend_value in frontend_information.iteritems() %}
    {{ frontend_key }} = {{ frontend_value }}
    {% endfor %}
    {% endfor %} {% endfor %}
    [buildout] [buildout]
    ......
    software/caddy-frontend/templates/trafficserver/records.config.jinja2
    View file @ f46c53e8
    ...@@ -18,6 +18,12 @@ LOCAL proxy.local.incoming_ip_to_bind STRING {{ ats_configuration['local-ip'] }} ...@@ -18,6 +18,12 @@ LOCAL proxy.local.incoming_ip_to_bind STRING {{ ats_configuration['local-ip'] }}
    CONFIG proxy.config.log.logfile_dir STRING {{ ats_directory['log'] }} CONFIG proxy.config.log.logfile_dir STRING {{ ats_directory['log'] }}
    # Never change Server header # Never change Server header
    CONFIG proxy.config.http.response_server_enabled INT 0 CONFIG proxy.config.http.response_server_enabled INT 0
    # Handle Via header
    CONFIG proxy.config.http.insert_request_via_str INT 1
    CONFIG proxy.config.http.request_via_str STRING rapid-cdn-cache-{{ ats_configuration['node-id'] }}-{{ ats_configuration['version-hash'] }}
    CONFIG proxy.config.http.insert_response_via_str INT 1
    CONFIG proxy.config.http.response_via_str STRING rapid-cdn-cache-{{ ats_configuration['node-id'] }}-{{ ats_configuration['version-hash'] }}
    # Implement RFC 5861 with core # Implement RFC 5861 with core
    CONFIG proxy.config.http.cache.open_write_fail_action INT 2 CONFIG proxy.config.http.cache.open_write_fail_action INT 2
    CONFIG proxy.config.body_factory.template_sets_dir STRING {{ ats_configuration['templates-dir'] }} CONFIG proxy.config.body_factory.template_sets_dir STRING {{ ats_configuration['templates-dir'] }}
    ...@@ -53,13 +59,6 @@ CONFIG proxy.config.exec_thread.affinity INT 1 ...@@ -53,13 +59,6 @@ CONFIG proxy.config.exec_thread.affinity INT 1
    ############################################################################## ##############################################################################
    CONFIG proxy.config.http.server_ports STRING {{ ats_configuration['local-ip'] + ':' + ats_configuration['input-port'] }} CONFIG proxy.config.http.server_ports STRING {{ ats_configuration['local-ip'] + ':' + ats_configuration['input-port'] }}
    ##############################################################################
    # Via: headers. Docs:
    # https://docs.trafficserver.apache.org/records.config#proxy-config-http-insert-response-via-str
    ##############################################################################
    CONFIG proxy.config.http.insert_request_via_str INT 1
    CONFIG proxy.config.http.insert_response_via_str INT 0
    ############################################################################## ##############################################################################
    # Parent proxy configuration, in addition to these settings also see parent.config. Docs: # Parent proxy configuration, in addition to these settings also see parent.config. Docs:
    # https://docs.trafficserver.apache.org/records.config#parent-proxy-configuration # https://docs.trafficserver.apache.org/records.config#parent-proxy-configuration
    ......
    software/caddy-frontend/test/test.py
    View file @ f46c53e8
    ...@@ -95,12 +95,6 @@ KEDIFA_PORT = '15080' ...@@ -95,12 +95,6 @@ KEDIFA_PORT = '15080'
    # has to be not partition one # has to be not partition one
    SOURCE_IP = '127.0.0.1' SOURCE_IP = '127.0.0.1'
    # ATS version expectation in Via string
    VIA_STRING = (
    r'^http\/1.1 caddy-frontend-1\[.*\] '
    r'\(ApacheTrafficServer\/9\.[0-9]\.[0-9]+\)$',
    )[0]
    # IP on which test run, in order to mimic HTTP[s] access # IP on which test run, in order to mimic HTTP[s] access
    TEST_IP = os.environ['SLAPOS_TEST_IPV4'] TEST_IP = os.environ['SLAPOS_TEST_IPV4']
    ...@@ -302,7 +296,7 @@ class TestDataMixin(object): ...@@ -302,7 +296,7 @@ class TestDataMixin(object):
    def assertTestData(self, runtime_data, hash_value_dict=None, msg=None): def assertTestData(self, runtime_data, hash_value_dict=None, msg=None):
    if hash_value_dict is None: if hash_value_dict is None:
    hash_value_dict = {} hash_value_dict = {}
    filename = '%s-%s.txt' % (self.id(), 'CADDY') filename = '%s-%s.txt' % (self.id().replace('zz_', ''), 'CADDY')
    test_data_file = os.path.join( test_data_file = os.path.join(
    os.path.dirname(os.path.realpath(__file__)), 'test_data', filename) os.path.dirname(os.path.realpath(__file__)), 'test_data', filename)
    ...@@ -347,7 +341,9 @@ class TestDataMixin(object): ...@@ -347,7 +341,9 @@ class TestDataMixin(object):
    runtime_data = '\n'.join(sorted(runtime_data)) runtime_data = '\n'.join(sorted(runtime_data))
    self.assertTestData(runtime_data) self.assertTestData(runtime_data)
    def test_file_list_log(self): # convince test to be run last; it's a hack, but log files shall be checked
    # after all other tests had chance to execute
    def zz_test_file_list_log(self):
    self._test_file_list(['var', 'log'], [ self._test_file_list(['var', 'log'], [
    # no control at all when cron would kick in, ignore it # no control at all when cron would kick in, ignore it
    'cron.log', 'cron.log',
    ...@@ -430,6 +426,8 @@ def fakeHTTPSResult(domain, path, port=HTTPS_PORT, ...@@ -430,6 +426,8 @@ def fakeHTTPSResult(domain, path, port=HTTPS_PORT,
    headers.setdefault('X-Forwarded-For', '192.168.0.1') headers.setdefault('X-Forwarded-For', '192.168.0.1')
    headers.setdefault('X-Forwarded-Proto', 'irc') headers.setdefault('X-Forwarded-Proto', 'irc')
    headers.setdefault('X-Forwarded-Port', '17') headers.setdefault('X-Forwarded-Port', '17')
    # Expose some Via to show how nicely it arrives to the backend
    headers.setdefault('Via', 'http/1.1 clientvia')
    session = requests.Session() session = requests.Session()
    if source_ip is not None: if source_ip is not None:
    ...@@ -470,6 +468,8 @@ def fakeHTTPResult(domain, path, port=HTTP_PORT, ...@@ -470,6 +468,8 @@ def fakeHTTPResult(domain, path, port=HTTP_PORT,
    headers.setdefault('X-Forwarded-For', '192.168.0.1') headers.setdefault('X-Forwarded-For', '192.168.0.1')
    headers.setdefault('X-Forwarded-Proto', 'irc') headers.setdefault('X-Forwarded-Proto', 'irc')
    headers.setdefault('X-Forwarded-Port', '17') headers.setdefault('X-Forwarded-Port', '17')
    # Expose some Via to show how nicely it arrives to the backend
    headers.setdefault('Via', 'http/1.1 clientvia')
    headers['Host'] = '%s:%s' % (domain, port) headers['Host'] = '%s:%s' % (domain, port)
    session = requests.Session() session = requests.Session()
    if source_ip is not None: if source_ip is not None:
    ...@@ -572,9 +572,18 @@ class TestHandler(BaseHTTPRequestHandler): ...@@ -572,9 +572,18 @@ class TestHandler(BaseHTTPRequestHandler):
    header_dict[header] = value.strip() header_dict[header] = value.strip()
    if response is None: if response is None:
    if 'x-reply-body' not in self.headers.dict: if 'x-reply-body' not in self.headers.dict:
    headers_dict = dict()
    for header in self.headers.keys():
    content = self.headers.getheaders(header)
    if len(content) == 0:
    headers_dict[header] = None
    elif len(content) == 1:
    headers_dict[header] = content[0]
    else:
    headers_dict[header] = content
    response = { response = {
    'Path': self.path, 'Path': self.path,
    'Incoming Headers': self.headers.dict 'Incoming Headers': headers_dict
    } }
    response = json.dumps(response, indent=2) response = json.dumps(response, indent=2)
    else: else:
    ...@@ -595,6 +604,8 @@ class TestHandler(BaseHTTPRequestHandler): ...@@ -595,6 +604,8 @@ class TestHandler(BaseHTTPRequestHandler):
    self.send_header('Set-Cookie', 'secured=value;secure') self.send_header('Set-Cookie', 'secured=value;secure')
    self.send_header('Set-Cookie', 'nonsecured=value') self.send_header('Set-Cookie', 'nonsecured=value')
    if 'Via' not in drop_header_list:
    self.send_header('Via', 'http/1.1 backendvia')
    if compress: if compress:
    self.send_header('Content-Encoding', 'gzip') self.send_header('Content-Encoding', 'gzip')
    out = StringIO.StringIO() out = StringIO.StringIO()
    ...@@ -865,7 +876,8 @@ class HttpFrontendTestCase(SlapOSInstanceTestCase): ...@@ -865,7 +876,8 @@ class HttpFrontendTestCase(SlapOSInstanceTestCase):
    except Exception as e: except Exception as e:
    self.fail(e) self.fail(e)
    def assertResponseHeaders(self, result): def assertResponseHeaders(
    self, result, cached=False, via=True, backend_reached=True):
    headers = result.headers.copy() headers = result.headers.copy()
    self.assertKeyWithPop('Date', headers) self.assertKeyWithPop('Date', headers)
    # drop vary-keys # drop vary-keys
    ...@@ -874,8 +886,31 @@ class HttpFrontendTestCase(SlapOSInstanceTestCase): ...@@ -874,8 +886,31 @@ class HttpFrontendTestCase(SlapOSInstanceTestCase):
    headers.pop('Keep-Alive', None) headers.pop('Keep-Alive', None)
    headers.pop('Transfer-Encoding', None) headers.pop('Transfer-Encoding', None)
    if backend_reached:
    self.assertEqual('TestBackend', headers.pop('Server', '')) self.assertEqual('TestBackend', headers.pop('Server', ''))
    via_id = '%s-%s' % (
    self.node_information_dict['node-id'],
    self.node_information_dict['version-hash-history'].keys()[0])
    if via:
    self.assertIn('Via', headers)
    if cached:
    self.assertEqual(
    'http/1.1 backendvia, '
    'HTTP/1.1 rapid-cdn-backend-%(via_id)s, '
    'http/1.0 rapid-cdn-cache-%(via_id)s, '
    'HTTP/1.1 rapid-cdn-frontend-%(via_id)s' % dict(via_id=via_id),
    headers.pop('Via')
    )
    else:
    self.assertEqual(
    'http/1.1 backendvia, '
    'HTTP/1.1 rapid-cdn-backend-%(via_id)s, '
    'HTTP/1.1 rapid-cdn-frontend-%(via_id)s' % dict(via_id=via_id),
    headers.pop('Via')
    )
    else:
    self.assertNotIn('Via', headers)
    return headers return headers
    def assertLogAccessUrlWithPop(self, parameter_dict): def assertLogAccessUrlWithPop(self, parameter_dict):
    ...@@ -945,6 +980,23 @@ class HttpFrontendTestCase(SlapOSInstanceTestCase): ...@@ -945,6 +980,23 @@ class HttpFrontendTestCase(SlapOSInstanceTestCase):
    return generate_auth_url, upload_url return generate_auth_url, upload_url
    def assertNodeInformationWithPop(self, parameter_dict):
    key = 'caddy-frontend-1-node-information-json'
    node_information_json_dict = {}
    for k in parameter_dict.keys():
    if k.startswith('caddy-frontend') and k.endswith(
    'node-information-json'):
    node_information_json_dict[k] = parameter_dict.pop(k)
    self.assertEqual(
    [key],
    node_information_json_dict.keys()
    )
    node_information_dict = json.loads(node_information_json_dict[key])
    self.assertIn("node-id", node_information_dict)
    self.assertIn("version-hash-history", node_information_dict)
    self.node_information_dict = node_information_dict
    def assertBackendHaproxyStatisticUrl(self, parameter_dict): def assertBackendHaproxyStatisticUrl(self, parameter_dict):
    url_key = 'caddy-frontend-1-backend-haproxy-statistic-url' url_key = 'caddy-frontend-1-backend-haproxy-statistic-url'
    backend_haproxy_statistic_url_dict = {} backend_haproxy_statistic_url_dict = {}
    ...@@ -1267,20 +1319,27 @@ class SlaveHttpFrontendTestCase(HttpFrontendTestCase): ...@@ -1267,20 +1319,27 @@ class SlaveHttpFrontendTestCase(HttpFrontendTestCase):
    ] ]
    ) )
    def assertSlaveBase(self, reference): def assertSlaveBase(
    self, reference, expected_parameter_dict=None, hostname=None):
    if expected_parameter_dict is None:
    expected_parameter_dict = {}
    parameter_dict = self.parseSlaveParameterDict(reference) parameter_dict = self.parseSlaveParameterDict(reference)
    self.assertLogAccessUrlWithPop(parameter_dict) self.assertLogAccessUrlWithPop(parameter_dict)
    self.current_generate_auth, self.current_upload_url = \
    self.assertKedifaKeysWithPop(parameter_dict, '') self.assertKedifaKeysWithPop(parameter_dict, '')
    self.assertNodeInformationWithPop(parameter_dict)
    if hostname is None:
    hostname = reference.translate(None, '_-').lower() hostname = reference.translate(None, '_-').lower()
    self.assertEqual( expected_parameter_dict.update(**{
    {
    'domain': '%s.example.com' % (hostname,), 'domain': '%s.example.com' % (hostname,),
    'replication_number': '1', 'replication_number': '1',
    'url': 'http://%s.example.com' % (hostname, ), 'url': 'http://%s.example.com' % (hostname, ),
    'site_url': 'http://%s.example.com' % (hostname, ), 'site_url': 'http://%s.example.com' % (hostname, ),
    'secure_access': 'https://%s.example.com' % (hostname, ), 'secure_access': 'https://%s.example.com' % (hostname, ),
    'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address, 'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
    }, })
    self.assertEqual(
    expected_parameter_dict,
    parameter_dict parameter_dict
    ) )
    ...@@ -1314,6 +1373,7 @@ class TestMasterRequestDomain(HttpFrontendTestCase, TestDataMixin): ...@@ -1314,6 +1373,7 @@ class TestMasterRequestDomain(HttpFrontendTestCase, TestDataMixin):
    self.assertBackendHaproxyStatisticUrl(parameter_dict) self.assertBackendHaproxyStatisticUrl(parameter_dict)
    self.assertKedifaKeysWithPop(parameter_dict, 'master-') self.assertKedifaKeysWithPop(parameter_dict, 'master-')
    self.assertRejectedSlavePromiseEmptyWithPop(parameter_dict) self.assertRejectedSlavePromiseEmptyWithPop(parameter_dict)
    self.assertNodeInformationWithPop(parameter_dict)
    self.assertEqual( self.assertEqual(
    { {
    ...@@ -1345,6 +1405,7 @@ class TestMasterRequest(HttpFrontendTestCase, TestDataMixin): ...@@ -1345,6 +1405,7 @@ class TestMasterRequest(HttpFrontendTestCase, TestDataMixin):
    self.assertBackendHaproxyStatisticUrl(parameter_dict) self.assertBackendHaproxyStatisticUrl(parameter_dict)
    self.assertKedifaKeysWithPop(parameter_dict, 'master-') self.assertKedifaKeysWithPop(parameter_dict, 'master-')
    self.assertRejectedSlavePromiseEmptyWithPop(parameter_dict) self.assertRejectedSlavePromiseEmptyWithPop(parameter_dict)
    self.assertNodeInformationWithPop(parameter_dict)
    self.assertEqual( self.assertEqual(
    { {
    'monitor-base-url': 'https://[%s]:8401' % self._ipv6_address, 'monitor-base-url': 'https://[%s]:8401' % self._ipv6_address,
    ...@@ -1459,6 +1520,7 @@ class TestMasterAIKCDisabledAIBCCDisabledRequest( ...@@ -1459,6 +1520,7 @@ class TestMasterAIKCDisabledAIBCCDisabledRequest(
    'caddy-frontend-1-backend-client-csr-url', parameter_dict) 'caddy-frontend-1-backend-client-csr-url', parameter_dict)
    self.assertKeyWithPop( self.assertKeyWithPop(
    'caddy-frontend-1-csr-certificate', parameter_dict) 'caddy-frontend-1-csr-certificate', parameter_dict)
    self.assertNodeInformationWithPop(parameter_dict)
    self.assertEqual( self.assertEqual(
    { {
    'monitor-base-url': 'https://[%s]:8401' % self._ipv6_address, 'monitor-base-url': 'https://[%s]:8401' % self._ipv6_address,
    ...@@ -1915,6 +1977,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -1915,6 +1977,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
    self.assertBackendHaproxyStatisticUrl(parameter_dict) self.assertBackendHaproxyStatisticUrl(parameter_dict)
    self.assertKedifaKeysWithPop(parameter_dict, 'master-') self.assertKedifaKeysWithPop(parameter_dict, 'master-')
    self.assertRejectedSlavePromiseEmptyWithPop(parameter_dict) self.assertRejectedSlavePromiseEmptyWithPop(parameter_dict)
    self.assertNodeInformationWithPop(parameter_dict)
    expected_parameter_dict = { expected_parameter_dict = {
    'monitor-base-url': 'https://[%s]:8401' % self._ipv6_address, 'monitor-base-url': 'https://[%s]:8401' % self._ipv6_address,
    ...@@ -1946,6 +2009,40 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -1946,6 +2009,40 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
    os.path.join( os.path.join(
    partition_path, 'etc', 'httpd-cors.cfg'), 'r').read().strip()) partition_path, 'etc', 'httpd-cors.cfg'), 'r').read().strip())
    def test_node_information_json(self):
    node_information_file_path = glob.glob(os.path.join(
    self.instance_path, '*', '.frontend-node-information.json'))[0]
    with open(node_information_file_path, 'r') as fh:
    current_node_information = json.load(fh)
    modified_node_information = current_node_information.copy()
    modified_node_information['version-hash-history'] = {'testhash': 'testurl'}
    def writeNodeInformation(node_information, path):
    with open(path, 'w') as fh:
    json.dump(node_information, fh, sort_keys=True)
    self.waitForInstance()
    self.waitForInstance()
    self.waitForInstance()
    self.addCleanup(
    writeNodeInformation, current_node_information,
    node_information_file_path)
    # simulate that upgrade happened
    writeNodeInformation(
    modified_node_information,
    node_information_file_path)
    parameter_dict = self.parseConnectionParameterDict()
    expected_node_information = {
    'node-id': current_node_information['node-id'],
    'version-hash-history': current_node_information['version-hash-history']
    }
    expected_node_information['version-hash-history']['testhash'] = 'testurl'
    self.assertEqual(
    json.loads(parameter_dict['caddy-frontend-1-node-information-json']),
    expected_node_information
    )
    def test_slave_partition_state(self): def test_slave_partition_state(self):
    partition_path = self.getSlavePartitionPath() partition_path = self.getSlavePartitionPath()
    self.assertTrue( self.assertTrue(
    ...@@ -2032,7 +2129,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -2032,7 +2129,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
    def assertBackendHeaders( def assertBackendHeaders(
    self, backend_header_dict, domain, source_ip=SOURCE_IP, port=HTTPS_PORT, self, backend_header_dict, domain, source_ip=SOURCE_IP, port=HTTPS_PORT,
    proto='https', ignore_header_list=None): proto='https', ignore_header_list=None, cached=False):
    if ignore_header_list is None: if ignore_header_list is None:
    ignore_header_list = [] ignore_header_list = []
    if 'Host' not in ignore_header_list: if 'Host' not in ignore_header_list:
    ...@@ -2051,6 +2148,28 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -2051,6 +2148,28 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
    backend_header_dict['x-forwarded-proto'], backend_header_dict['x-forwarded-proto'],
    proto proto
    ) )
    via_id = '%s-%s' % (
    self.node_information_dict['node-id'],
    self.node_information_dict['version-hash-history'].keys()[0])
    if cached:
    self.assertEqual(
    [
    'http/1.1 clientvia',
    'HTTP/1.1 rapid-cdn-frontend-%(via_id)s, '
    'http/1.1 rapid-cdn-cache-%(via_id)s' % dict(via_id=via_id),
    'HTTP/1.1 rapid-cdn-backend-%(via_id)s' % dict(via_id=via_id)
    ],
    backend_header_dict['via']
    )
    else:
    self.assertEqual(
    [
    'http/1.1 clientvia',
    'HTTP/1.1 rapid-cdn-frontend-%(via_id)s' % dict(via_id=via_id),
    'HTTP/1.1 rapid-cdn-backend-%(via_id)s' % dict(via_id=via_id)
    ],
    backend_header_dict['via']
    )
    def test_telemetry_disabled(self): def test_telemetry_disabled(self):
    # here we trust that telemetry not present in error log means it was # here we trust that telemetry not present in error log means it was
    ...@@ -2062,26 +2181,14 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -2062,26 +2181,14 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
    self.assertNotIn('Sending telemetry', fh.read(), 'Telemetry enabled') self.assertNotIn('Sending telemetry', fh.read(), 'Telemetry enabled')
    def test_url(self): def test_url(self):
    reference = 'Url' parameter_dict = self.assertSlaveBase(
    parameter_dict = self.parseSlaveParameterDict(reference) 'Url',
    self.assertLogAccessUrlWithPop(parameter_dict)
    self.assertKedifaKeysWithPop(parameter_dict, '')
    hostname = reference.translate(None, '_-').lower()
    self.assertEqual(
    { {
    'domain': '%s.example.com' % (hostname,),
    'replication_number': '1',
    'url': 'http://%s.example.com' % (hostname, ),
    'site_url': 'http://%s.example.com' % (hostname, ),
    'secure_access': 'https://%s.example.com' % (hostname, ),
    'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
    'warning-list': [ 'warning-list': [
    "slave url ' %s/?a=b&c= ' has been converted to '%s/?a=b&c='" % ( "slave url ' %s/?a=b&c= ' has been converted to '%s/?a=b&c='" % (
    self.backend_url, self.backend_url)], self.backend_url, self.backend_url)],
    }, }
    parameter_dict
    ) )
    result = fakeHTTPSResult( result = fakeHTTPSResult(
    parameter_dict['domain'], parameter_dict['domain'],
    'test-path/deep/.././deeper', 'test-path/deep/.././deeper',
    ...@@ -2096,7 +2203,8 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -2096,7 +2203,8 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
    self.certificate_pem, self.certificate_pem,
    der2pem(result.peercert)) der2pem(result.peercert))
    self.assertNotIn('Strict-Transport-Security', result.headers) headers = self.assertResponseHeaders(result)
    self.assertNotIn('Strict-Transport-Security', headers)
    self.assertEqualResultJson(result, 'Path', '?a=b&c=/test-path/deeper') self.assertEqualResultJson(result, 'Path', '?a=b&c=/test-path/deeper')
    try: try:
    ...@@ -2105,12 +2213,12 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -2105,12 +2213,12 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
    raise ValueError('JSON decode problem in:\n%s' % (result.text,)) raise ValueError('JSON decode problem in:\n%s' % (result.text,))
    self.assertEqual(j['Incoming Headers']['timeout'], '10') self.assertEqual(j['Incoming Headers']['timeout'], '10')
    self.assertFalse('Content-Encoding' in result.headers) self.assertFalse('Content-Encoding' in headers)
    self.assertBackendHeaders(j['Incoming Headers'], parameter_dict['domain']) self.assertBackendHeaders(j['Incoming Headers'], parameter_dict['domain'])
    self.assertEqual( self.assertEqual(
    'secured=value;secure, nonsecured=value', 'secured=value;secure, nonsecured=value',
    result.headers['Set-Cookie'] headers['Set-Cookie']
    ) )
    self.assertLastLogLineRegexp( self.assertLastLogLineRegexp(
    ...@@ -2141,9 +2249,11 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -2141,9 +2249,11 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
    result_http.status_code result_http.status_code
    ) )
    headers = self.assertResponseHeaders(
    result_http, via=False, backend_reached=False)
    self.assertEqual( self.assertEqual(
    'https://url.example.com:%s/test-path/deeper' % (HTTP_PORT,), 'https://url.example.com:%s/test-path/deeper' % (HTTP_PORT,),
    result_http.headers['Location'] headers['Location']
    ) )
    # check that timeouts are correctly set in the haproxy configuration # check that timeouts are correctly set in the haproxy configuration
    ...@@ -2309,24 +2419,13 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -2309,24 +2419,13 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
    ) )
    def test_compressed_result(self): def test_compressed_result(self):
    reference = 'Url' parameter_dict = self.assertSlaveBase(
    parameter_dict = self.parseSlaveParameterDict(reference) 'Url',
    self.assertLogAccessUrlWithPop(parameter_dict)
    self.assertKedifaKeysWithPop(parameter_dict, '')
    hostname = reference.translate(None, '_-').lower()
    self.assertEqual(
    { {
    'domain': '%s.example.com' % (hostname,),
    'replication_number': '1',
    'url': 'http://%s.example.com' % (hostname, ),
    'site_url': 'http://%s.example.com' % (hostname, ),
    'secure_access': 'https://%s.example.com' % (hostname, ),
    'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
    'warning-list': [ 'warning-list': [
    "slave url ' %s/?a=b&c= ' has been converted to '%s/?a=b&c='" % ( "slave url ' %s/?a=b&c= ' has been converted to '%s/?a=b&c='" % (
    self.backend_url, self.backend_url)], self.backend_url, self.backend_url)],
    }, }
    parameter_dict
    ) )
    result_compressed = fakeHTTPSResult( result_compressed = fakeHTTPSResult(
    ...@@ -2361,24 +2460,13 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -2361,24 +2460,13 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
    self.assertFalse('Content-Encoding' in result_not_compressed.headers) self.assertFalse('Content-Encoding' in result_not_compressed.headers)
    def test_no_content_type_alter(self): def test_no_content_type_alter(self):
    reference = 'Url' parameter_dict = self.assertSlaveBase(
    parameter_dict = self.parseSlaveParameterDict(reference) 'Url',
    self.assertLogAccessUrlWithPop(parameter_dict)
    self.assertKedifaKeysWithPop(parameter_dict, '')
    hostname = reference.translate(None, '_-').lower()
    self.assertEqual(
    { {
    'domain': '%s.example.com' % (hostname,),
    'replication_number': '1',
    'url': 'http://%s.example.com' % (hostname, ),
    'site_url': 'http://%s.example.com' % (hostname, ),
    'secure_access': 'https://%s.example.com' % (hostname, ),
    'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
    'warning-list': [ 'warning-list': [
    "slave url ' %s/?a=b&c= ' has been converted to '%s/?a=b&c='" % ( "slave url ' %s/?a=b&c= ' has been converted to '%s/?a=b&c='" % (
    self.backend_url, self.backend_url)], self.backend_url, self.backend_url)],
    }, }
    parameter_dict
    ) )
    result = fakeHTTPSResult( result = fakeHTTPSResult(
    parameter_dict['domain'], parameter_dict['domain'],
    ...@@ -2547,20 +2635,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -2547,20 +2635,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
    ) )
    def test_server_alias_wildcard(self): def test_server_alias_wildcard(self):
    parameter_dict = self.parseSlaveParameterDict('server-alias-wildcard') parameter_dict = self.assertSlaveBase('server-alias-wildcard')
    self.assertLogAccessUrlWithPop(parameter_dict)
    self.assertKedifaKeysWithPop(parameter_dict)
    self.assertEqual(
    {
    'domain': 'serveraliaswildcard.example.com',
    'replication_number': '1',
    'url': 'http://serveraliaswildcard.example.com',
    'site_url': 'http://serveraliaswildcard.example.com',
    'secure_access': 'https://serveraliaswildcard.example.com',
    'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
    },
    parameter_dict
    )
    result = fakeHTTPSResult( result = fakeHTTPSResult(
    parameter_dict['domain'], 'test-path') parameter_dict['domain'], 'test-path')
    ...@@ -2587,20 +2662,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -2587,20 +2662,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
    self.assertEqualResultJson(result, 'Path', '/test-path') self.assertEqualResultJson(result, 'Path', '/test-path')
    def test_server_alias_duplicated(self): def test_server_alias_duplicated(self):
    parameter_dict = self.parseSlaveParameterDict('server-alias-duplicated') parameter_dict = self.assertSlaveBase('server-alias-duplicated')
    self.assertLogAccessUrlWithPop(parameter_dict)
    self.assertKedifaKeysWithPop(parameter_dict)
    self.assertEqual(
    {
    'domain': 'serveraliasduplicated.example.com',
    'replication_number': '1',
    'url': 'http://serveraliasduplicated.example.com',
    'site_url': 'http://serveraliasduplicated.example.com',
    'secure_access': 'https://serveraliasduplicated.example.com',
    'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
    },
    parameter_dict
    )
    result = fakeHTTPSResult( result = fakeHTTPSResult(
    parameter_dict['domain'], 'test-path') parameter_dict['domain'], 'test-path')
    ...@@ -2621,22 +2683,8 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -2621,22 +2683,8 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
    self.assertEqualResultJson(result, 'Path', '/test-path') self.assertEqualResultJson(result, 'Path', '/test-path')
    def test_server_alias_custom_domain_duplicated(self): def test_server_alias_custom_domain_duplicated(self):
    parameter_dict = self.parseSlaveParameterDict( parameter_dict = self.assertSlaveBase(
    'server-alias_custom_domain-duplicated') 'server-alias_custom_domain-duplicated', hostname='alias4')
    self.assertLogAccessUrlWithPop(parameter_dict)
    self.assertKedifaKeysWithPop(parameter_dict)
    self.assertEqual(
    {
    'domain': 'alias4.example.com',
    'replication_number': '1',
    'url': 'http://alias4.example.com',
    'site_url': 'http://alias4.example.com',
    'secure_access': 'https://alias4.example.com',
    'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
    },
    parameter_dict
    )
    result = fakeHTTPSResult( result = fakeHTTPSResult(
    parameter_dict['domain'], 'test-path') parameter_dict['domain'], 'test-path')
    ...@@ -2652,26 +2700,12 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -2652,26 +2700,12 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
    raise NotImplementedError(self.id()) raise NotImplementedError(self.id())
    def test_ssl_ca_crt(self): def test_ssl_ca_crt(self):
    parameter_dict = self.parseSlaveParameterDict( parameter_dict = self.assertSlaveBase(
    'custom_domain_ssl_crt_ssl_key_ssl_ca_crt') 'custom_domain_ssl_crt_ssl_key_ssl_ca_crt')
    self.assertLogAccessUrlWithPop(parameter_dict)
    generate_auth, upload_url = self.assertKedifaKeysWithPop(parameter_dict)
    self.assertEqual(
    {
    'domain': 'customdomainsslcrtsslkeysslcacrt.example.com',
    'replication_number': '1',
    'url': 'http://customdomainsslcrtsslkeysslcacrt.example.com',
    'site_url': 'http://customdomainsslcrtsslkeysslcacrt.example.com',
    'secure_access':
    'https://customdomainsslcrtsslkeysslcacrt.example.com',
    'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
    },
    parameter_dict
    )
    # as now the place to put the key is known put the key there # as now the place to put the key is known put the key there
    auth = requests.get( auth = requests.get(
    generate_auth, self.current_generate_auth,
    verify=self.kedifa_caucase_ca_certificate_file) verify=self.kedifa_caucase_ca_certificate_file)
    self.assertEqual(httplib.CREATED, auth.status_code) self.assertEqual(httplib.CREATED, auth.status_code)
    ...@@ -2680,7 +2714,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -2680,7 +2714,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
    self.ca.certificate_pem self.ca.certificate_pem
    upload = requests.put( upload = requests.put(
    upload_url + auth.text, self.current_upload_url + auth.text,
    data=data, data=data,
    verify=self.kedifa_caucase_ca_certificate_file) verify=self.kedifa_caucase_ca_certificate_file)
    self.assertEqual(httplib.CREATED, upload.status_code) self.assertEqual(httplib.CREATED, upload.status_code)
    ...@@ -2704,31 +2738,17 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -2704,31 +2738,17 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
    self.assertEqual(data, out.read()) self.assertEqual(data, out.read())
    def test_ssl_ca_crt_only(self): def test_ssl_ca_crt_only(self):
    parameter_dict = self.parseSlaveParameterDict('ssl_ca_crt_only') self.assertSlaveBase('ssl_ca_crt_only')
    self.assertLogAccessUrlWithPop(parameter_dict)
    generate_auth, upload_url = self.assertKedifaKeysWithPop(parameter_dict)
    self.assertEqual(
    {
    'domain': 'sslcacrtonly.example.com',
    'replication_number': '1',
    'url': 'http://sslcacrtonly.example.com',
    'site_url': 'http://sslcacrtonly.example.com',
    'secure_access':
    'https://sslcacrtonly.example.com',
    'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
    },
    parameter_dict
    )
    # as now the place to put the key is known put the key there # as now the place to put the key is known put the key there
    auth = requests.get( auth = requests.get(
    generate_auth, self.current_generate_auth,
    verify=self.kedifa_caucase_ca_certificate_file) verify=self.kedifa_caucase_ca_certificate_file)
    self.assertEqual(httplib.CREATED, auth.status_code) self.assertEqual(httplib.CREATED, auth.status_code)
    data = self.ca.certificate_pem data = self.ca.certificate_pem
    upload = requests.put( upload = requests.put(
    upload_url + auth.text, self.current_upload_url + auth.text,
    data=data, data=data,
    verify=self.kedifa_caucase_ca_certificate_file) verify=self.kedifa_caucase_ca_certificate_file)
    ...@@ -2736,25 +2756,11 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -2736,25 +2756,11 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
    self.assertEqual('Key incorrect', upload.text) self.assertEqual('Key incorrect', upload.text)
    def test_ssl_ca_crt_garbage(self): def test_ssl_ca_crt_garbage(self):
    parameter_dict = self.parseSlaveParameterDict('ssl_ca_crt_garbage') parameter_dict = self.assertSlaveBase('ssl_ca_crt_garbage')
    self.assertLogAccessUrlWithPop(parameter_dict)
    generate_auth, upload_url = self.assertKedifaKeysWithPop(parameter_dict)
    self.assertEqual(
    {
    'domain': 'sslcacrtgarbage.example.com',
    'replication_number': '1',
    'url': 'http://sslcacrtgarbage.example.com',
    'site_url': 'http://sslcacrtgarbage.example.com',
    'secure_access':
    'https://sslcacrtgarbage.example.com',
    'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
    },
    parameter_dict
    )
    # as now the place to put the key is known put the key there # as now the place to put the key is known put the key there
    auth = requests.get( auth = requests.get(
    generate_auth, self.current_generate_auth,
    verify=self.kedifa_caucase_ca_certificate_file) verify=self.kedifa_caucase_ca_certificate_file)
    self.assertEqual(httplib.CREATED, auth.status_code) self.assertEqual(httplib.CREATED, auth.status_code)
    ...@@ -2764,7 +2770,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -2764,7 +2770,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
    data = ca_certificate_pem + ca_key_pem + 'some garbage' data = ca_certificate_pem + ca_key_pem + 'some garbage'
    upload = requests.put( upload = requests.put(
    upload_url + auth.text, self.current_upload_url + auth.text,
    data=data, data=data,
    verify=self.kedifa_caucase_ca_certificate_file) verify=self.kedifa_caucase_ca_certificate_file)
    ...@@ -2790,31 +2796,17 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -2790,31 +2796,17 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
    self.assertEqual(data, out.read()) self.assertEqual(data, out.read())
    def test_ssl_ca_crt_does_not_match(self): def test_ssl_ca_crt_does_not_match(self):
    parameter_dict = self.parseSlaveParameterDict('ssl_ca_crt_does_not_match') parameter_dict = self.assertSlaveBase('ssl_ca_crt_does_not_match')
    self.assertLogAccessUrlWithPop(parameter_dict)
    generate_auth, upload_url = self.assertKedifaKeysWithPop(parameter_dict)
    self.assertEqual(
    {
    'domain': 'sslcacrtdoesnotmatch.example.com',
    'replication_number': '1',
    'url': 'http://sslcacrtdoesnotmatch.example.com',
    'site_url': 'http://sslcacrtdoesnotmatch.example.com',
    'secure_access':
    'https://sslcacrtdoesnotmatch.example.com',
    'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
    },
    parameter_dict
    )
    # as now the place to put the key is known put the key there # as now the place to put the key is known put the key there
    auth = requests.get( auth = requests.get(
    generate_auth, self.current_generate_auth,
    verify=self.kedifa_caucase_ca_certificate_file) verify=self.kedifa_caucase_ca_certificate_file)
    self.assertEqual(httplib.CREATED, auth.status_code) self.assertEqual(httplib.CREATED, auth.status_code)
    data = self.certificate_pem + self.key_pem + self.ca.certificate_pem data = self.certificate_pem + self.key_pem + self.ca.certificate_pem
    upload = requests.put( upload = requests.put(
    upload_url + auth.text, self.current_upload_url + auth.text,
    data=data, data=data,
    verify=self.kedifa_caucase_ca_certificate_file) verify=self.kedifa_caucase_ca_certificate_file)
    ...@@ -2858,22 +2850,8 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -2858,22 +2850,8 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
    self.assertEqualResultJson(result_http, 'Path', '/test-path/deeper') self.assertEqualResultJson(result_http, 'Path', '/test-path/deeper')
    def test_custom_domain(self): def test_custom_domain(self):
    reference = 'custom_domain' parameter_dict = self.assertSlaveBase(
    hostname = 'mycustomdomain' 'custom_domain', hostname='mycustomdomain')
    parameter_dict = self.parseSlaveParameterDict(reference)
    self.assertLogAccessUrlWithPop(parameter_dict)
    self.assertKedifaKeysWithPop(parameter_dict, '')
    self.assertEqual(
    {
    'domain': '%s.example.com' % (hostname,),
    'replication_number': '1',
    'url': 'http://%s.example.com' % (hostname, ),
    'site_url': 'http://%s.example.com' % (hostname, ),
    'secure_access': 'https://%s.example.com' % (hostname, ),
    'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
    },
    parameter_dict
    )
    result = fakeHTTPSResult( result = fakeHTTPSResult(
    parameter_dict['domain'], 'test-path') parameter_dict['domain'], 'test-path')
    ...@@ -2885,22 +2863,8 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -2885,22 +2863,8 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
    self.assertEqualResultJson(result, 'Path', '/test-path') self.assertEqualResultJson(result, 'Path', '/test-path')
    def test_custom_domain_server_alias(self): def test_custom_domain_server_alias(self):
    reference = 'custom_domain_server_alias' parameter_dict = self.assertSlaveBase(
    hostname = 'mycustomdomainserveralias' 'custom_domain_server_alias', hostname='mycustomdomainserveralias')
    parameter_dict = self.parseSlaveParameterDict(reference)
    self.assertLogAccessUrlWithPop(parameter_dict)
    self.assertKedifaKeysWithPop(parameter_dict, '')
    self.assertEqual(
    {
    'domain': '%s.example.com' % (hostname,),
    'replication_number': '1',
    'url': 'http://%s.example.com' % (hostname, ),
    'site_url': 'http://%s.example.com' % (hostname, ),
    'secure_access': 'https://%s.example.com' % (hostname, ),
    'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
    },
    parameter_dict
    )
    result = fakeHTTPSResult( result = fakeHTTPSResult(
    parameter_dict['domain'], 'test-path') parameter_dict['domain'], 'test-path')
    ...@@ -2922,20 +2886,8 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -2922,20 +2886,8 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
    self.assertEqualResultJson(result, 'Path', '/test-path/deeper') self.assertEqualResultJson(result, 'Path', '/test-path/deeper')
    def test_custom_domain_wildcard(self): def test_custom_domain_wildcard(self):
    parameter_dict = self.parseSlaveParameterDict('custom_domain_wildcard') self.assertSlaveBase(
    self.assertLogAccessUrlWithPop(parameter_dict) 'custom_domain_wildcard', hostname='*.customdomain')
    self.assertKedifaKeysWithPop(parameter_dict)
    self.assertEqual(
    {
    'domain': '*.customdomain.example.com',
    'replication_number': '1',
    'url': 'http://*.customdomain.example.com',
    'site_url': 'http://*.customdomain.example.com',
    'secure_access': 'https://*.customdomain.example.com',
    'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
    },
    parameter_dict
    )
    result = fakeHTTPSResult( result = fakeHTTPSResult(
    'wild.customdomain.example.com', 'wild.customdomain.example.com',
    ...@@ -2948,33 +2900,17 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -2948,33 +2900,17 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
    self.assertEqualResultJson(result, 'Path', '/test-path') self.assertEqualResultJson(result, 'Path', '/test-path')
    def test_custom_domain_ssl_crt_ssl_key(self): def test_custom_domain_ssl_crt_ssl_key(self):
    reference = 'custom_domain_ssl_crt_ssl_key' parameter_dict = self.assertSlaveBase('custom_domain_ssl_crt_ssl_key')
    parameter_dict = self.parseSlaveParameterDict(reference)
    self.assertLogAccessUrlWithPop(parameter_dict)
    generate_auth, upload_url = self.assertKedifaKeysWithPop(parameter_dict)
    hostname = reference.translate(None, '_-')
    self.assertEqual(
    {
    'domain': '%s.example.com' % (hostname,),
    'replication_number': '1',
    'url': 'http://%s.example.com' % (hostname, ),
    'site_url': 'http://%s.example.com' % (hostname, ),
    'secure_access': 'https://%s.example.com' % (hostname, ),
    'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
    },
    parameter_dict
    )
    # as now the place to put the key is known put the key there # as now the place to put the key is known put the key there
    auth = requests.get( auth = requests.get(
    generate_auth, self.current_generate_auth,
    verify=self.kedifa_caucase_ca_certificate_file) verify=self.kedifa_caucase_ca_certificate_file)
    self.assertEqual(httplib.CREATED, auth.status_code) self.assertEqual(httplib.CREATED, auth.status_code)
    data = self.customdomain_certificate_pem + \ data = self.customdomain_certificate_pem + \
    self.customdomain_key_pem self.customdomain_key_pem
    upload = requests.put( upload = requests.put(
    upload_url + auth.text, self.current_upload_url + auth.text,
    data=data, data=data,
    verify=self.kedifa_caucase_ca_certificate_file) verify=self.kedifa_caucase_ca_certificate_file)
    self.assertEqual(httplib.CREATED, upload.status_code) self.assertEqual(httplib.CREATED, upload.status_code)
    ...@@ -3221,22 +3157,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -3221,22 +3157,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
    ) )
    def test_type_notebook(self): def test_type_notebook(self):
    reference = 'type-notebook' parameter_dict = self.assertSlaveBase('type-notebook')
    parameter_dict = self.parseSlaveParameterDict(reference)
    self.assertLogAccessUrlWithPop(parameter_dict)
    hostname = reference.translate(None, '_-')
    self.assertKedifaKeysWithPop(parameter_dict)
    self.assertEqual(
    {
    'domain': '%s.example.com' % (hostname,),
    'replication_number': '1',
    'url': 'http://%s.example.com' % (hostname, ),
    'site_url': 'http://%s.example.com' % (hostname, ),
    'secure_access': 'https://%s.example.com' % (hostname, ),
    'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
    },
    parameter_dict
    )
    result = fakeHTTPSResult( result = fakeHTTPSResult(
    parameter_dict['domain'], parameter_dict['domain'],
    ...@@ -3495,22 +3416,8 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -3495,22 +3416,8 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
    ) )
    def test_type_redirect_custom_domain(self): def test_type_redirect_custom_domain(self):
    reference = 'type-redirect-custom_domain' parameter_dict = self.assertSlaveBase(
    hostname = 'customdomaintyperedirect' 'type-redirect-custom_domain', hostname='customdomaintyperedirect')
    parameter_dict = self.parseSlaveParameterDict(reference)
    self.assertLogAccessUrlWithPop(parameter_dict)
    self.assertKedifaKeysWithPop(parameter_dict, '')
    self.assertEqual(
    {
    'domain': '%s.example.com' % (hostname,),
    'replication_number': '1',
    'url': 'http://%s.example.com' % (hostname, ),
    'site_url': 'http://%s.example.com' % (hostname, ),
    'secure_access': 'https://%s.example.com' % (hostname, ),
    'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
    },
    parameter_dict
    )
    result = fakeHTTPSResult( result = fakeHTTPSResult(
    parameter_dict['domain'], parameter_dict['domain'],
    ...@@ -3531,25 +3438,9 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -3531,25 +3438,9 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
    ) )
    def test_ssl_proxy_verify_ssl_proxy_ca_crt_unverified(self): def test_ssl_proxy_verify_ssl_proxy_ca_crt_unverified(self):
    parameter_dict = self.parseSlaveParameterDict( parameter_dict = self.assertSlaveBase(
    'ssl-proxy-verify_ssl_proxy_ca_crt-unverified') 'ssl-proxy-verify_ssl_proxy_ca_crt-unverified')
    self.assertLogAccessUrlWithPop(parameter_dict)
    self.assertKedifaKeysWithPop(parameter_dict)
    self.assertEqual(
    {
    'domain': 'sslproxyverifysslproxycacrtunverified.example.com',
    'replication_number': '1',
    'url': 'http://sslproxyverifysslproxycacrtunverified.example.com',
    'site_url':
    'http://sslproxyverifysslproxycacrtunverified.example.com',
    'secure_access':
    'https://sslproxyverifysslproxycacrtunverified.example.com',
    'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
    },
    parameter_dict
    )
    result = fakeHTTPSResult( result = fakeHTTPSResult(
    parameter_dict['domain'], 'test-path') parameter_dict['domain'], 'test-path')
    ...@@ -3740,22 +3631,9 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -3740,22 +3631,9 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
    ) )
    def test_enable_cache_custom_domain(self): def test_enable_cache_custom_domain(self):
    reference = 'enable_cache_custom_domain' parameter_dict = self.assertSlaveBase(
    hostname = 'customdomainenablecache' 'enable_cache_custom_domain',
    parameter_dict = self.parseSlaveParameterDict(reference) hostname='customdomainenablecache')
    self.assertLogAccessUrlWithPop(parameter_dict)
    self.assertKedifaKeysWithPop(parameter_dict, '')
    self.assertEqual(
    {
    'domain': '%s.example.com' % (hostname,),
    'replication_number': '1',
    'url': 'http://%s.example.com' % (hostname, ),
    'site_url': 'http://%s.example.com' % (hostname, ),
    'secure_access': 'https://%s.example.com' % (hostname, ),
    'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
    },
    parameter_dict
    )
    result = fakeHTTPSResult( result = fakeHTTPSResult(
    parameter_dict['domain'], parameter_dict['domain'],
    ...@@ -3765,7 +3643,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -3765,7 +3643,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
    self.assertEqualResultJson(result, 'Path', '/test-path/deeper') self.assertEqualResultJson(result, 'Path', '/test-path/deeper')
    headers = self.assertResponseHeaders(result) headers = self.assertResponseHeaders(result, True)
    self.assertKeyWithPop('Age', headers) self.assertKeyWithPop('Age', headers)
    self.assertEqual( self.assertEqual(
    ...@@ -3779,13 +3657,8 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -3779,13 +3657,8 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
    ) )
    backend_headers = result.json()['Incoming Headers'] backend_headers = result.json()['Incoming Headers']
    self.assertBackendHeaders(backend_headers, parameter_dict['domain']) self.assertBackendHeaders(
    via = backend_headers.pop('via', None) backend_headers, parameter_dict['domain'], cached=True)
    self.assertNotEqual(via, None)
    self.assertRegexpMatches(
    via,
    VIA_STRING
    )
    def test_enable_cache_server_alias(self): def test_enable_cache_server_alias(self):
    parameter_dict = self.assertSlaveBase('enable_cache_server_alias') parameter_dict = self.assertSlaveBase('enable_cache_server_alias')
    ...@@ -3798,7 +3671,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -3798,7 +3671,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
    self.assertEqualResultJson(result, 'Path', '/test-path/deeper') self.assertEqualResultJson(result, 'Path', '/test-path/deeper')
    headers = self.assertResponseHeaders(result) headers = self.assertResponseHeaders(result, cached=True)
    self.assertKeyWithPop('Age', headers) self.assertKeyWithPop('Age', headers)
    self.assertEqual( self.assertEqual(
    ...@@ -3812,13 +3685,8 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -3812,13 +3685,8 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
    ) )
    backend_headers = result.json()['Incoming Headers'] backend_headers = result.json()['Incoming Headers']
    self.assertBackendHeaders(backend_headers, parameter_dict['domain']) self.assertBackendHeaders(
    via = backend_headers.pop('via', None) backend_headers, parameter_dict['domain'], cached=True)
    self.assertNotEqual(via, None)
    self.assertRegexpMatches(
    via,
    VIA_STRING
    )
    result = fakeHTTPResult( result = fakeHTTPResult(
    'enablecacheserveralias1.example.com', 'enablecacheserveralias1.example.com',
    ...@@ -3847,7 +3715,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -3847,7 +3715,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
    self.assertEqualResultJson(result, 'Path', '/test-path/deeper') self.assertEqualResultJson(result, 'Path', '/test-path/deeper')
    headers = self.assertResponseHeaders(result) headers = self.assertResponseHeaders(result, cached=True)
    self.assertKeyWithPop('Age', headers) self.assertKeyWithPop('Age', headers)
    self.assertEqual( self.assertEqual(
    { {
    ...@@ -3868,17 +3736,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -3868,17 +3736,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
    self.assertEqual(httplib.OK, result.status_code) self.assertEqual(httplib.OK, result.status_code)
    self.assertEqualResultJson(result, 'Path', '/HTTPS/test') self.assertEqualResultJson(result, 'Path', '/HTTPS/test')
    self.assertResponseHeaders(result) self.assertResponseHeaders(result, cached=True)
    result = fakeHTTPSResult(
    parameter_dict['domain'],
    'HTTP/test', headers={
    'X-Reply-Header-Cache-Control': 'max-age=1, stale-while-'
    'revalidate=3600, stale-if-error=3600'})
    self.assertEqual(httplib.OK, result.status_code)
    self.assertEqualResultJson(result, 'Path', '/HTTP/test')
    self.assertResponseHeaders(result)
    def test_enable_cache(self): def test_enable_cache(self):
    parameter_dict = self.assertSlaveBase('enable_cache') parameter_dict = self.assertSlaveBase('enable_cache')
    ...@@ -3895,7 +3753,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -3895,7 +3753,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
    self.assertEqualResultJson(result, 'Path', '/test-path/deeper') self.assertEqualResultJson(result, 'Path', '/test-path/deeper')
    headers = self.assertResponseHeaders(result) headers = self.assertResponseHeaders(result, cached=True)
    self.assertKeyWithPop('Age', headers) self.assertKeyWithPop('Age', headers)
    ...@@ -3910,13 +3768,8 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -3910,13 +3768,8 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
    ) )
    backend_headers = result.json()['Incoming Headers'] backend_headers = result.json()['Incoming Headers']
    self.assertBackendHeaders(backend_headers, parameter_dict['domain']) self.assertBackendHeaders(
    via = backend_headers.pop('via', None) backend_headers, parameter_dict['domain'], cached=True)
    self.assertNotEqual(via, None)
    self.assertRegexpMatches(
    via,
    VIA_STRING
    )
    # BEGIN: Check that squid.log is correctly filled in # BEGIN: Check that squid.log is correctly filled in
    ats_log_file_list = glob.glob( ats_log_file_list = glob.glob(
    ...@@ -4104,13 +3957,8 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -4104,13 +3957,8 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
    ) )
    backend_headers = result.json()['Incoming Headers'] backend_headers = result.json()['Incoming Headers']
    self.assertBackendHeaders(backend_headers, parameter_dict['domain']) self.assertBackendHeaders(
    via = backend_headers.pop('via', None) backend_headers, parameter_dict['domain'], cached=True)
    self.assertNotEqual(via, None)
    self.assertRegexpMatches(
    via,
    VIA_STRING
    )
    # check stale-if-error support is really respected if not present in the # check stale-if-error support is really respected if not present in the
    # request # request
    ...@@ -4226,7 +4074,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -4226,7 +4074,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
    self.assertEqualResultJson(result, 'Path', '/test-path') self.assertEqualResultJson(result, 'Path', '/test-path')
    headers = self.assertResponseHeaders(result) headers = self.assertResponseHeaders(result, cached=True)
    self.assertKeyWithPop('Age', headers) self.assertKeyWithPop('Age', headers)
    ...@@ -4239,13 +4087,8 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -4239,13 +4087,8 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
    ) )
    backend_headers = result.json()['Incoming Headers'] backend_headers = result.json()['Incoming Headers']
    self.assertBackendHeaders(backend_headers, parameter_dict['domain']) self.assertBackendHeaders(
    via = backend_headers.pop('via', None) backend_headers, parameter_dict['domain'], cached=True)
    self.assertNotEqual(via, None)
    self.assertRegexpMatches(
    via,
    VIA_STRING
    )
    try: try:
    j = result.json() j = result.json()
    ...@@ -4265,7 +4108,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -4265,7 +4108,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
    self.assertEqualResultJson(result, 'Path', '/test-path') self.assertEqualResultJson(result, 'Path', '/test-path')
    headers = self.assertResponseHeaders(result) headers = self.assertResponseHeaders(result, via=False)
    self.assertKeyWithPop('Age', headers) self.assertKeyWithPop('Age', headers)
    ...@@ -4278,13 +4121,8 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -4278,13 +4121,8 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
    ) )
    backend_headers = result.json()['Incoming Headers'] backend_headers = result.json()['Incoming Headers']
    self.assertBackendHeaders(backend_headers, parameter_dict['domain']) self.assertBackendHeaders(
    via = backend_headers.pop('via', None) backend_headers, parameter_dict['domain'], cached=True)
    self.assertNotEqual(via, None)
    self.assertRegexpMatches(
    via,
    VIA_STRING
    )
    def test_enable_http2_false(self): def test_enable_http2_false(self):
    parameter_dict = self.assertSlaveBase('enable-http2-false') parameter_dict = self.assertSlaveBase('enable-http2-false')
    ...@@ -4655,6 +4493,24 @@ class TestReplicateSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -4655,6 +4493,24 @@ class TestReplicateSlave(SlaveHttpFrontendTestCase, TestDataMixin):
    parameter_dict = self.parseSlaveParameterDict('replicate') parameter_dict = self.parseSlaveParameterDict('replicate')
    self.assertLogAccessUrlWithPop(parameter_dict) self.assertLogAccessUrlWithPop(parameter_dict)
    self.assertKedifaKeysWithPop(parameter_dict) self.assertKedifaKeysWithPop(parameter_dict)
    key_list = [
    'caddy-frontend-1-node-information-json',
    'caddy-frontend-2-node-information-json'
    ]
    node_information_json_dict = {}
    for k in parameter_dict.keys():
    if k.startswith('caddy-frontend') and k.endswith(
    'node-information-json'):
    node_information_json_dict[k] = parameter_dict.pop(k)
    self.assertEqual(
    key_list,
    node_information_json_dict.keys()
    )
    node_information_dict = json.loads(node_information_json_dict[key_list[0]])
    self.assertIn("node-id", node_information_dict)
    self.assertIn("version-hash-history", node_information_dict)
    self.node_information_dict = node_information_dict
    self.assertEqual( self.assertEqual(
    { {
    'domain': 'replicate.example.com', 'domain': 'replicate.example.com',
    ...@@ -4783,61 +4639,19 @@ class TestEnableHttp2ByDefaultFalseSlave(SlaveHttpFrontendTestCase, ...@@ -4783,61 +4639,19 @@ class TestEnableHttp2ByDefaultFalseSlave(SlaveHttpFrontendTestCase,
    } }
    def test_enable_http2_default(self): def test_enable_http2_default(self):
    parameter_dict = self.parseSlaveParameterDict('enable-http2-default') parameter_dict = self.assertSlaveBase('enable-http2-default')
    self.assertLogAccessUrlWithPop(parameter_dict)
    self.assertKedifaKeysWithPop(parameter_dict)
    self.assertEqual(
    {
    'domain': 'enablehttp2default.example.com',
    'replication_number': '1',
    'url': 'http://enablehttp2default.example.com',
    'site_url': 'http://enablehttp2default.example.com',
    'secure_access':
    'https://enablehttp2default.example.com',
    'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
    },
    parameter_dict
    )
    self.assertFalse( self.assertFalse(
    isHTTP2(parameter_dict['domain'])) isHTTP2(parameter_dict['domain']))
    def test_enable_http2_false(self): def test_enable_http2_false(self):
    parameter_dict = self.parseSlaveParameterDict('enable-http2-false') parameter_dict = self.assertSlaveBase('enable-http2-false')
    self.assertLogAccessUrlWithPop(parameter_dict)
    self.assertKedifaKeysWithPop(parameter_dict)
    self.assertEqual(
    {
    'domain': 'enablehttp2false.example.com',
    'replication_number': '1',
    'url': 'http://enablehttp2false.example.com',
    'site_url': 'http://enablehttp2false.example.com',
    'secure_access':
    'https://enablehttp2false.example.com',
    'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
    },
    parameter_dict
    )
    self.assertFalse( self.assertFalse(
    isHTTP2(parameter_dict['domain'])) isHTTP2(parameter_dict['domain']))
    def test_enable_http2_true(self): def test_enable_http2_true(self):
    parameter_dict = self.parseSlaveParameterDict('enable-http2-true') parameter_dict = self.assertSlaveBase('enable-http2-true')
    self.assertLogAccessUrlWithPop(parameter_dict)
    self.assertKedifaKeysWithPop(parameter_dict)
    self.assertEqual(
    {
    'domain': 'enablehttp2true.example.com',
    'replication_number': '1',
    'url': 'http://enablehttp2true.example.com',
    'site_url': 'http://enablehttp2true.example.com',
    'secure_access':
    'https://enablehttp2true.example.com',
    'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
    },
    parameter_dict
    )
    self.assertTrue( self.assertTrue(
    isHTTP2(parameter_dict['domain'])) isHTTP2(parameter_dict['domain']))
    ...@@ -4873,61 +4687,19 @@ class TestEnableHttp2ByDefaultDefaultSlave(SlaveHttpFrontendTestCase, ...@@ -4873,61 +4687,19 @@ class TestEnableHttp2ByDefaultDefaultSlave(SlaveHttpFrontendTestCase,
    } }
    def test_enable_http2_default(self): def test_enable_http2_default(self):
    parameter_dict = self.parseSlaveParameterDict('enable-http2-default') parameter_dict = self.assertSlaveBase('enable-http2-default')
    self.assertLogAccessUrlWithPop(parameter_dict)
    self.assertKedifaKeysWithPop(parameter_dict)
    self.assertEqual(
    {
    'domain': 'enablehttp2default.example.com',
    'replication_number': '1',
    'url': 'http://enablehttp2default.example.com',
    'site_url': 'http://enablehttp2default.example.com',
    'secure_access':
    'https://enablehttp2default.example.com',
    'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
    },
    parameter_dict
    )
    self.assertTrue( self.assertTrue(
    isHTTP2(parameter_dict['domain'])) isHTTP2(parameter_dict['domain']))
    def test_enable_http2_false(self): def test_enable_http2_false(self):
    parameter_dict = self.parseSlaveParameterDict('enable-http2-false') parameter_dict = self.assertSlaveBase('enable-http2-false')
    self.assertLogAccessUrlWithPop(parameter_dict)
    self.assertKedifaKeysWithPop(parameter_dict)
    self.assertEqual(
    {
    'domain': 'enablehttp2false.example.com',
    'replication_number': '1',
    'url': 'http://enablehttp2false.example.com',
    'site_url': 'http://enablehttp2false.example.com',
    'secure_access':
    'https://enablehttp2false.example.com',
    'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
    },
    parameter_dict
    )
    self.assertFalse( self.assertFalse(
    isHTTP2(parameter_dict['domain'])) isHTTP2(parameter_dict['domain']))
    def test_enable_http2_true(self): def test_enable_http2_true(self):
    parameter_dict = self.parseSlaveParameterDict('enable-http2-true') parameter_dict = self.assertSlaveBase('enable-http2-true')
    self.assertLogAccessUrlWithPop(parameter_dict)
    self.assertKedifaKeysWithPop(parameter_dict)
    self.assertEqual(
    {
    'domain': 'enablehttp2true.example.com',
    'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
    'replication_number': '1',
    'url': 'http://enablehttp2true.example.com',
    'site_url': 'http://enablehttp2true.example.com',
    'secure_access':
    'https://enablehttp2true.example.com',
    },
    parameter_dict
    )
    self.assertTrue( self.assertTrue(
    isHTTP2(parameter_dict['domain'])) isHTTP2(parameter_dict['domain']))
    ...@@ -4938,6 +4710,7 @@ class TestRe6stVerificationUrlDefaultSlave(SlaveHttpFrontendTestCase, ...@@ -4938,6 +4710,7 @@ class TestRe6stVerificationUrlDefaultSlave(SlaveHttpFrontendTestCase,
    @classmethod @classmethod
    def getInstanceParameterDict(cls): def getInstanceParameterDict(cls):
    return { return {
    'domain': 'example.com',
    'port': HTTPS_PORT, 'port': HTTPS_PORT,
    'plain_http_port': HTTP_PORT, 'plain_http_port': HTTP_PORT,
    'kedifa_port': KEDIFA_PORT, 'kedifa_port': KEDIFA_PORT,
    ...@@ -4959,20 +4732,7 @@ class TestRe6stVerificationUrlDefaultSlave(SlaveHttpFrontendTestCase, ...@@ -4959,20 +4732,7 @@ class TestRe6stVerificationUrlDefaultSlave(SlaveHttpFrontendTestCase,
    return True return True
    def test_default(self): def test_default(self):
    parameter_dict = self.parseSlaveParameterDict('default') self.assertSlaveBase('default')
    self.assertLogAccessUrlWithPop(parameter_dict)
    self.assertKedifaKeysWithPop(parameter_dict)
    self.assertEqual(
    {
    'domain': 'default.None',
    'replication_number': '1',
    'url': 'http://default.None',
    'site_url': 'http://default.None',
    'secure_access': 'https://default.None',
    'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
    },
    parameter_dict
    )
    re6st_connectivity_promise_list = glob.glob( re6st_connectivity_promise_list = glob.glob(
    os.path.join( os.path.join(
    ...@@ -5025,20 +4785,7 @@ class TestRe6stVerificationUrlSlave(SlaveHttpFrontendTestCase, ...@@ -5025,20 +4785,7 @@ class TestRe6stVerificationUrlSlave(SlaveHttpFrontendTestCase,
    except Exception: except Exception:
    pass pass
    parameter_dict = self.parseSlaveParameterDict('default') self.assertSlaveBase('default')
    self.assertLogAccessUrlWithPop(parameter_dict)
    self.assertKedifaKeysWithPop(parameter_dict)
    self.assertEqual(
    {
    'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
    'domain': 'default.example.com',
    'replication_number': '1',
    'url': 'http://default.example.com',
    'site_url': 'http://default.example.com',
    'secure_access': 'https://default.example.com',
    },
    parameter_dict
    )
    re6st_connectivity_promise_list = glob.glob( re6st_connectivity_promise_list = glob.glob(
    os.path.join( os.path.join(
    ...@@ -5065,21 +4812,7 @@ class TestSlaveGlobalDisableHttp2(TestSlave): ...@@ -5065,21 +4812,7 @@ class TestSlaveGlobalDisableHttp2(TestSlave):
    return instance_parameter_dict return instance_parameter_dict
    def test_enable_http2_default(self): def test_enable_http2_default(self):
    parameter_dict = self.parseSlaveParameterDict('enable-http2-default') parameter_dict = self.assertSlaveBase('enable-http2-default')
    self.assertLogAccessUrlWithPop(parameter_dict)
    self.assertKedifaKeysWithPop(parameter_dict)
    self.assertEqual(
    {
    'domain': 'enablehttp2default.example.com',
    'replication_number': '1',
    'url': 'http://enablehttp2default.example.com',
    'site_url': 'http://enablehttp2default.example.com',
    'secure_access':
    'https://enablehttp2default.example.com',
    'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
    },
    parameter_dict
    )
    result = fakeHTTPSResult( result = fakeHTTPSResult(
    parameter_dict['domain'], 'test-path') parameter_dict['domain'], 'test-path')
    ...@@ -5114,21 +4847,7 @@ class TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2( ...@@ -5114,21 +4847,7 @@ class TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2(
    return instance_parameter_dict return instance_parameter_dict
    def test_enable_http2_true(self): def test_enable_http2_true(self):
    parameter_dict = self.parseSlaveParameterDict('enable-http2-true') parameter_dict = self.assertSlaveBase('enable-http2-true')
    self.assertLogAccessUrlWithPop(parameter_dict)
    self.assertKedifaKeysWithPop(parameter_dict)
    self.assertEqual(
    {
    'domain': 'enablehttp2true.example.com',
    'replication_number': '1',
    'url': 'http://enablehttp2true.example.com',
    'site_url': 'http://enablehttp2true.example.com',
    'secure_access':
    'https://enablehttp2true.example.com',
    'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
    },
    parameter_dict
    )
    self.assertFalse( self.assertFalse(
    isHTTP2(parameter_dict['domain'])) isHTTP2(parameter_dict['domain']))
    ...@@ -5145,41 +4864,13 @@ class TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2( ...@@ -5145,41 +4864,13 @@ class TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2(
    return instance_parameter_dict return instance_parameter_dict
    def test_enable_http2_true(self): def test_enable_http2_true(self):
    parameter_dict = self.parseSlaveParameterDict('enable-http2-true') parameter_dict = self.assertSlaveBase('enable-http2-true')
    self.assertLogAccessUrlWithPop(parameter_dict)
    self.assertKedifaKeysWithPop(parameter_dict)
    self.assertEqual(
    {
    'domain': 'enablehttp2true.example.com',
    'replication_number': '1',
    'url': 'http://enablehttp2true.example.com',
    'site_url': 'http://enablehttp2true.example.com',
    'secure_access':
    'https://enablehttp2true.example.com',
    'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
    },
    parameter_dict
    )
    self.assertFalse( self.assertFalse(
    isHTTP2(parameter_dict['domain'])) isHTTP2(parameter_dict['domain']))
    def test_enable_http2_default(self): def test_enable_http2_default(self):
    parameter_dict = self.parseSlaveParameterDict('enable-http2-default') parameter_dict = self.assertSlaveBase('enable-http2-default')
    self.assertLogAccessUrlWithPop(parameter_dict)
    self.assertKedifaKeysWithPop(parameter_dict)
    self.assertEqual(
    {
    'domain': 'enablehttp2default.example.com',
    'replication_number': '1',
    'url': 'http://enablehttp2default.example.com',
    'site_url': 'http://enablehttp2default.example.com',
    'secure_access':
    'https://enablehttp2default.example.com',
    'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
    },
    parameter_dict
    )
    self.assertFalse( self.assertFalse(
    isHTTP2(parameter_dict['domain'])) isHTTP2(parameter_dict['domain']))
    ...@@ -5220,22 +4911,8 @@ class TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster( ...@@ -5220,22 +4911,8 @@ class TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster(
    } }
    def test_ssl_from_master_kedifa_overrides_master_certificate(self): def test_ssl_from_master_kedifa_overrides_master_certificate(self):
    reference = 'ssl_from_master_kedifa_overrides_master_certificate' parameter_dict = self.assertSlaveBase(
    parameter_dict = self.parseSlaveParameterDict(reference) 'ssl_from_master_kedifa_overrides_master_certificate')
    self.assertLogAccessUrlWithPop(parameter_dict)
    self.assertKedifaKeysWithPop(parameter_dict)
    hostname = reference.translate(None, '_-')
    self.assertEqual(
    {
    'domain': '%s.example.com' % (hostname,),
    'replication_number': '1',
    'url': 'http://%s.example.com' % (hostname, ),
    'site_url': 'http://%s.example.com' % (hostname, ),
    'secure_access': 'https://%s.example.com' % (hostname, ),
    'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
    },
    parameter_dict
    )
    result = fakeHTTPSResult( result = fakeHTTPSResult(
    parameter_dict['domain'], 'test-path') parameter_dict['domain'], 'test-path')
    ...@@ -5417,6 +5094,7 @@ class TestSlaveSlapOSMasterCertificateCompatibility( ...@@ -5417,6 +5094,7 @@ class TestSlaveSlapOSMasterCertificateCompatibility(
    self.assertKeyWithPop('monitor-setup-url', parameter_dict) self.assertKeyWithPop('monitor-setup-url', parameter_dict)
    self.assertBackendHaproxyStatisticUrl(parameter_dict) self.assertBackendHaproxyStatisticUrl(parameter_dict)
    self.assertKedifaKeysWithPop(parameter_dict, 'master-') self.assertKedifaKeysWithPop(parameter_dict, 'master-')
    self.assertNodeInformationWithPop(parameter_dict)
    self.assertRejectedSlavePromiseEmptyWithPop(parameter_dict) self.assertRejectedSlavePromiseEmptyWithPop(parameter_dict)
    expected_parameter_dict = { expected_parameter_dict = {
    ...@@ -5484,21 +5162,7 @@ class TestSlaveSlapOSMasterCertificateCompatibility( ...@@ -5484,21 +5162,7 @@ class TestSlaveSlapOSMasterCertificateCompatibility(
    ) )
    def test_ssl_from_master(self): def test_ssl_from_master(self):
    parameter_dict = self.parseSlaveParameterDict('ssl_from_master') parameter_dict = self.assertSlaveBase('ssl_from_master')
    self.assertLogAccessUrlWithPop(parameter_dict)
    self.assertKedifaKeysWithPop(parameter_dict, '')
    hostname = 'ssl_from_master'.translate(None, '_-')
    self.assertEqual(
    {
    'domain': '%s.example.com' % (hostname,),
    'replication_number': '1',
    'url': 'http://%s.example.com' % (hostname, ),
    'site_url': 'http://%s.example.com' % (hostname, ),
    'secure_access': 'https://%s.example.com' % (hostname, ),
    'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
    },
    parameter_dict
    )
    result = fakeHTTPSResult( result = fakeHTTPSResult(
    parameter_dict['domain'], 'test-path') parameter_dict['domain'], 'test-path')
    ...@@ -5510,22 +5174,7 @@ class TestSlaveSlapOSMasterCertificateCompatibility( ...@@ -5510,22 +5174,7 @@ class TestSlaveSlapOSMasterCertificateCompatibility(
    self.assertEqualResultJson(result, 'Path', '/test-path') self.assertEqualResultJson(result, 'Path', '/test-path')
    def test_ssl_from_master_kedifa_overrides(self): def test_ssl_from_master_kedifa_overrides(self):
    reference = 'ssl_from_master_kedifa_overrides' parameter_dict = self.assertSlaveBase('ssl_from_master_kedifa_overrides')
    parameter_dict = self.parseSlaveParameterDict(reference)
    self.assertLogAccessUrlWithPop(parameter_dict)
    generate_auth, upload_url = self.assertKedifaKeysWithPop(parameter_dict)
    hostname = reference.translate(None, '_-')
    self.assertEqual(
    {
    'domain': '%s.example.com' % (hostname,),
    'replication_number': '1',
    'url': 'http://%s.example.com' % (hostname, ),
    'site_url': 'http://%s.example.com' % (hostname, ),
    'secure_access': 'https://%s.example.com' % (hostname, ),
    'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
    },
    parameter_dict
    )
    result = fakeHTTPSResult( result = fakeHTTPSResult(
    parameter_dict['domain'], 'test-path') parameter_dict['domain'], 'test-path')
    ...@@ -5541,14 +5190,14 @@ class TestSlaveSlapOSMasterCertificateCompatibility( ...@@ -5541,14 +5190,14 @@ class TestSlaveSlapOSMasterCertificateCompatibility(
    # as now the place to put the key is known put the key there # as now the place to put the key is known put the key there
    auth = requests.get( auth = requests.get(
    generate_auth, self.current_generate_auth,
    verify=self.kedifa_caucase_ca_certificate_file) verify=self.kedifa_caucase_ca_certificate_file)
    self.assertEqual(httplib.CREATED, auth.status_code) self.assertEqual(httplib.CREATED, auth.status_code)
    data = certificate_pem + key_pem data = certificate_pem + key_pem
    upload = requests.put( upload = requests.put(
    upload_url + auth.text, self.current_upload_url + auth.text,
    data=data, data=data,
    verify=self.kedifa_caucase_ca_certificate_file) verify=self.kedifa_caucase_ca_certificate_file)
    self.assertEqual(httplib.CREATED, upload.status_code) self.assertEqual(httplib.CREATED, upload.status_code)
    ...@@ -5564,27 +5213,14 @@ class TestSlaveSlapOSMasterCertificateCompatibility( ...@@ -5564,27 +5213,14 @@ class TestSlaveSlapOSMasterCertificateCompatibility(
    self.assertEqualResultJson(result, 'Path', '/test-path') self.assertEqualResultJson(result, 'Path', '/test-path')
    def test_ssl_from_slave(self): def test_ssl_from_slave(self):
    reference = 'ssl_from_slave' parameter_dict = self.assertSlaveBase(
    parameter_dict = self.parseSlaveParameterDict(reference) 'ssl_from_slave',
    self.assertLogAccessUrlWithPop(parameter_dict) expected_parameter_dict={
    self.assertKedifaKeysWithPop(parameter_dict)
    hostname = reference.translate(None, '_-')
    self.assertEqual(
    {
    'domain': '%s.example.com' % (hostname,),
    'replication_number': '1',
    'url': 'http://%s.example.com' % (hostname, ),
    'site_url': 'http://%s.example.com' % (hostname, ),
    'secure_access': 'https://%s.example.com' % (hostname, ),
    'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
    'warning-list': [ 'warning-list': [
    'ssl_crt is obsolete, please use key-upload-url', 'ssl_crt is obsolete, please use key-upload-url',
    'ssl_key is obsolete, please use key-upload-url', 'ssl_key is obsolete, please use key-upload-url',
    ] ]
    }, })
    parameter_dict
    )
    result = fakeHTTPSResult( result = fakeHTTPSResult(
    parameter_dict['domain'], 'test-path') parameter_dict['domain'], 'test-path')
    ...@@ -5596,27 +5232,12 @@ class TestSlaveSlapOSMasterCertificateCompatibility( ...@@ -5596,27 +5232,12 @@ class TestSlaveSlapOSMasterCertificateCompatibility(
    self.assertEqualResultJson(result, 'Path', '/test-path') self.assertEqualResultJson(result, 'Path', '/test-path')
    def test_ssl_from_slave_kedifa_overrides(self): def test_ssl_from_slave_kedifa_overrides(self):
    reference = 'ssl_from_slave_kedifa_overrides' parameter_dict = self.assertSlaveBase(
    parameter_dict = self.parseSlaveParameterDict(reference) 'ssl_from_slave_kedifa_overrides',
    self.assertLogAccessUrlWithPop(parameter_dict) expected_parameter_dict={
    generate_auth, upload_url = self.assertKedifaKeysWithPop(parameter_dict) 'warning-list': ['ssl_crt is obsolete, please use key-upload-url',
    'ssl_key is obsolete, please use key-upload-url']
    hostname = reference.translate(None, '_-') })
    self.assertEqual(
    {
    'domain': '%s.example.com' % (hostname,),
    'replication_number': '1',
    'url': 'http://%s.example.com' % (hostname, ),
    'site_url': 'http://%s.example.com' % (hostname, ),
    'secure_access': 'https://%s.example.com' % (hostname, ),
    'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
    'warning-list': [
    'ssl_crt is obsolete, please use key-upload-url',
    'ssl_key is obsolete, please use key-upload-url',
    ]
    },
    parameter_dict
    )
    result = fakeHTTPSResult( result = fakeHTTPSResult(
    parameter_dict['domain'], 'test-path') parameter_dict['domain'], 'test-path')
    ...@@ -5632,14 +5253,14 @@ class TestSlaveSlapOSMasterCertificateCompatibility( ...@@ -5632,14 +5253,14 @@ class TestSlaveSlapOSMasterCertificateCompatibility(
    # as now the place to put the key is known put the key there # as now the place to put the key is known put the key there
    auth = requests.get( auth = requests.get(
    generate_auth, self.current_generate_auth,
    verify=self.kedifa_caucase_ca_certificate_file) verify=self.kedifa_caucase_ca_certificate_file)
    self.assertEqual(httplib.CREATED, auth.status_code) self.assertEqual(httplib.CREATED, auth.status_code)
    data = certificate_pem + key_pem data = certificate_pem + key_pem
    upload = requests.put( upload = requests.put(
    upload_url + auth.text, self.current_upload_url + auth.text,
    data=data, data=data,
    verify=self.kedifa_caucase_ca_certificate_file) verify=self.kedifa_caucase_ca_certificate_file)
    self.assertEqual(httplib.CREATED, upload.status_code) self.assertEqual(httplib.CREATED, upload.status_code)
    ...@@ -5656,22 +5277,7 @@ class TestSlaveSlapOSMasterCertificateCompatibility( ...@@ -5656,22 +5277,7 @@ class TestSlaveSlapOSMasterCertificateCompatibility(
    self.assertEqualResultJson(result, 'Path', '/test-path') self.assertEqualResultJson(result, 'Path', '/test-path')
    def test_type_notebook_ssl_from_master(self): def test_type_notebook_ssl_from_master(self):
    reference = 'type-notebook-ssl_from_master' parameter_dict = self.assertSlaveBase('type-notebook-ssl_from_master')
    parameter_dict = self.parseSlaveParameterDict(reference)
    self.assertLogAccessUrlWithPop(parameter_dict)
    hostname = reference.translate(None, '_-')
    self.assertKedifaKeysWithPop(parameter_dict)
    self.assertEqual(
    {
    'domain': '%s.example.com' % (hostname,),
    'replication_number': '1',
    'url': 'http://%s.example.com' % (hostname, ),
    'site_url': 'http://%s.example.com' % (hostname, ),
    'secure_access': 'https://%s.example.com' % (hostname, ),
    'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
    },
    parameter_dict
    )
    result = fakeHTTPSResult( result = fakeHTTPSResult(
    parameter_dict['domain'], 'test-path', parameter_dict['domain'], 'test-path',
    ...@@ -5684,22 +5290,8 @@ class TestSlaveSlapOSMasterCertificateCompatibility( ...@@ -5684,22 +5290,8 @@ class TestSlaveSlapOSMasterCertificateCompatibility(
    self.assertEqualResultJson(result, 'Path', '/test-path') self.assertEqualResultJson(result, 'Path', '/test-path')
    def test_type_notebook_ssl_from_master_kedifa_overrides(self): def test_type_notebook_ssl_from_master_kedifa_overrides(self):
    reference = 'type-notebook-ssl_from_master_kedifa_overrides' parameter_dict = self.assertSlaveBase(
    parameter_dict = self.parseSlaveParameterDict(reference) 'type-notebook-ssl_from_master_kedifa_overrides')
    self.assertLogAccessUrlWithPop(parameter_dict)
    generate_auth, upload_url = self.assertKedifaKeysWithPop(parameter_dict)
    hostname = reference.translate(None, '_-')
    self.assertEqual(
    {
    'domain': '%s.example.com' % (hostname,),
    'replication_number': '1',
    'url': 'http://%s.example.com' % (hostname, ),
    'site_url': 'http://%s.example.com' % (hostname, ),
    'secure_access': 'https://%s.example.com' % (hostname, ),
    'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
    },
    parameter_dict
    )
    result = fakeHTTPSResult( result = fakeHTTPSResult(
    parameter_dict['domain'], 'test-path', parameter_dict['domain'], 'test-path',
    ...@@ -5716,14 +5308,14 @@ class TestSlaveSlapOSMasterCertificateCompatibility( ...@@ -5716,14 +5308,14 @@ class TestSlaveSlapOSMasterCertificateCompatibility(
    # as now the place to put the key is known put the key there # as now the place to put the key is known put the key there
    auth = requests.get( auth = requests.get(
    generate_auth, self.current_generate_auth,
    verify=self.kedifa_caucase_ca_certificate_file) verify=self.kedifa_caucase_ca_certificate_file)
    self.assertEqual(httplib.CREATED, auth.status_code) self.assertEqual(httplib.CREATED, auth.status_code)
    data = certificate_pem + key_pem data = certificate_pem + key_pem
    upload = requests.put( upload = requests.put(
    upload_url + auth.text, self.current_upload_url + auth.text,
    data=data, data=data,
    verify=self.kedifa_caucase_ca_certificate_file) verify=self.kedifa_caucase_ca_certificate_file)
    self.assertEqual(httplib.CREATED, upload.status_code) self.assertEqual(httplib.CREATED, upload.status_code)
    ...@@ -5741,26 +5333,14 @@ class TestSlaveSlapOSMasterCertificateCompatibility( ...@@ -5741,26 +5333,14 @@ class TestSlaveSlapOSMasterCertificateCompatibility(
    self.assertEqualResultJson(result, 'Path', '/test-path') self.assertEqualResultJson(result, 'Path', '/test-path')
    def test_type_notebook_ssl_from_slave(self): def test_type_notebook_ssl_from_slave(self):
    reference = 'type-notebook-ssl_from_slave' parameter_dict = self.assertSlaveBase(
    parameter_dict = self.parseSlaveParameterDict(reference) 'type-notebook-ssl_from_slave',
    self.assertLogAccessUrlWithPop(parameter_dict) expected_parameter_dict={
    hostname = reference.translate(None, '_-')
    self.assertKedifaKeysWithPop(parameter_dict)
    self.assertEqual(
    {
    'domain': '%s.example.com' % (hostname,),
    'replication_number': '1',
    'url': 'http://%s.example.com' % (hostname, ),
    'site_url': 'http://%s.example.com' % (hostname, ),
    'secure_access': 'https://%s.example.com' % (hostname, ),
    'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
    'warning-list': [ 'warning-list': [
    'ssl_crt is obsolete, please use key-upload-url', 'ssl_crt is obsolete, please use key-upload-url',
    'ssl_key is obsolete, please use key-upload-url', 'ssl_key is obsolete, please use key-upload-url',
    ] ]
    }, })
    parameter_dict
    )
    result = fakeHTTPSResult( result = fakeHTTPSResult(
    parameter_dict['domain'], 'test-path', parameter_dict['domain'], 'test-path',
    ...@@ -5773,26 +5353,12 @@ class TestSlaveSlapOSMasterCertificateCompatibility( ...@@ -5773,26 +5353,12 @@ class TestSlaveSlapOSMasterCertificateCompatibility(
    self.assertEqualResultJson(result, 'Path', '/test-path') self.assertEqualResultJson(result, 'Path', '/test-path')
    def test_type_notebook_ssl_from_slave_kedifa_overrides(self): def test_type_notebook_ssl_from_slave_kedifa_overrides(self):
    reference = 'type-notebook-ssl_from_slave_kedifa_overrides' parameter_dict = self.assertSlaveBase(
    parameter_dict = self.parseSlaveParameterDict(reference) 'type-notebook-ssl_from_slave_kedifa_overrides',
    self.assertLogAccessUrlWithPop(parameter_dict) expected_parameter_dict={
    generate_auth, upload_url = self.assertKedifaKeysWithPop(parameter_dict) 'warning-list': ['ssl_crt is obsolete, please use key-upload-url',
    hostname = reference.translate(None, '_-') 'ssl_key is obsolete, please use key-upload-url']
    self.assertEqual( })
    {
    'domain': '%s.example.com' % (hostname,),
    'replication_number': '1',
    'url': 'http://%s.example.com' % (hostname, ),
    'site_url': 'http://%s.example.com' % (hostname, ),
    'secure_access': 'https://%s.example.com' % (hostname, ),
    'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
    'warning-list': [
    'ssl_crt is obsolete, please use key-upload-url',
    'ssl_key is obsolete, please use key-upload-url',
    ]
    },
    parameter_dict
    )
    result = fakeHTTPSResult( result = fakeHTTPSResult(
    parameter_dict['domain'], 'test-path', parameter_dict['domain'], 'test-path',
    ...@@ -5809,14 +5375,14 @@ class TestSlaveSlapOSMasterCertificateCompatibility( ...@@ -5809,14 +5375,14 @@ class TestSlaveSlapOSMasterCertificateCompatibility(
    # as now the place to put the key is known put the key there # as now the place to put the key is known put the key there
    auth = requests.get( auth = requests.get(
    generate_auth, self.current_generate_auth,
    verify=self.kedifa_caucase_ca_certificate_file) verify=self.kedifa_caucase_ca_certificate_file)
    self.assertEqual(httplib.CREATED, auth.status_code) self.assertEqual(httplib.CREATED, auth.status_code)
    data = certificate_pem + key_pem data = certificate_pem + key_pem
    upload = requests.put( upload = requests.put(
    upload_url + auth.text, self.current_upload_url + auth.text,
    data=data, data=data,
    verify=self.kedifa_caucase_ca_certificate_file) verify=self.kedifa_caucase_ca_certificate_file)
    self.assertEqual(httplib.CREATED, upload.status_code) self.assertEqual(httplib.CREATED, upload.status_code)
    ...@@ -5835,25 +5401,12 @@ class TestSlaveSlapOSMasterCertificateCompatibility( ...@@ -5835,25 +5401,12 @@ class TestSlaveSlapOSMasterCertificateCompatibility(
    @skip('Not implemented in new test system') @skip('Not implemented in new test system')
    def test_custom_domain_ssl_crt_ssl_key(self): def test_custom_domain_ssl_crt_ssl_key(self):
    reference = 'custom_domain_ssl_crt_ssl_key' parameter_dict = self.assertSlaveBase(
    parameter_dict = self.parseSlaveParameterDict(reference) 'custom_domain_ssl_crt_ssl_key',
    self.assertLogAccessUrlWithPop(parameter_dict) expected_parameter_dict={
    generate_auth, upload_url = self.assertKedifaKeysWithPop(parameter_dict)
    hostname = reference.translate(None, '_-')
    self.assertEqual(
    {
    'domain': '%s.example.com' % (hostname,),
    'replication_number': '1',
    'url': 'http://%s.example.com' % (hostname, ),
    'site_url': 'http://%s.example.com' % (hostname, ),
    'secure_access': 'https://%s.example.com' % (hostname, ),
    'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
    'warning-list': ['ssl_key is obsolete, please use key-upload-url', 'warning-list': ['ssl_key is obsolete, please use key-upload-url',
    'ssl_crt is obsolete, please use key-upload-url'] 'ssl_crt is obsolete, please use key-upload-url']
    }, })
    parameter_dict
    )
    result = fakeHTTPSResult( result = fakeHTTPSResult(
    parameter_dict['domain'], 'test-path') parameter_dict['domain'], 'test-path')
    ...@@ -5865,27 +5418,15 @@ class TestSlaveSlapOSMasterCertificateCompatibility( ...@@ -5865,27 +5418,15 @@ class TestSlaveSlapOSMasterCertificateCompatibility(
    self.assertEqualResultJson(result, 'Path', '/test-path') self.assertEqualResultJson(result, 'Path', '/test-path')
    def test_ssl_ca_crt(self): def test_ssl_ca_crt(self):
    parameter_dict = self.parseSlaveParameterDict( parameter_dict = self.assertSlaveBase(
    'custom_domain_ssl_crt_ssl_key_ssl_ca_crt') 'custom_domain_ssl_crt_ssl_key_ssl_ca_crt',
    self.assertLogAccessUrlWithPop(parameter_dict) expected_parameter_dict={
    generate_auth, upload_url = self.assertKedifaKeysWithPop(parameter_dict)
    self.assertEqual(
    {
    'domain': 'customdomainsslcrtsslkeysslcacrt.example.com',
    'replication_number': '1',
    'url': 'http://customdomainsslcrtsslkeysslcacrt.example.com',
    'site_url': 'http://customdomainsslcrtsslkeysslcacrt.example.com',
    'secure_access':
    'https://customdomainsslcrtsslkeysslcacrt.example.com',
    'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
    'warning-list': [ 'warning-list': [
    'ssl_ca_crt is obsolete, please use key-upload-url', 'ssl_ca_crt is obsolete, please use key-upload-url',
    'ssl_crt is obsolete, please use key-upload-url', 'ssl_crt is obsolete, please use key-upload-url',
    'ssl_key is obsolete, please use key-upload-url' 'ssl_key is obsolete, please use key-upload-url'
    ] ]
    }, })
    parameter_dict
    )
    result = fakeHTTPSResult( result = fakeHTTPSResult(
    parameter_dict['domain'], 'test-path') parameter_dict['domain'], 'test-path')
    ...@@ -5954,25 +5495,14 @@ class TestSlaveSlapOSMasterCertificateCompatibility( ...@@ -5954,25 +5495,14 @@ class TestSlaveSlapOSMasterCertificateCompatibility(
    ) )
    def test_ssl_ca_crt_garbage(self): def test_ssl_ca_crt_garbage(self):
    parameter_dict = self.parseSlaveParameterDict('ssl_ca_crt_garbage') parameter_dict = self.assertSlaveBase(
    self.assertLogAccessUrlWithPop(parameter_dict) 'ssl_ca_crt_garbage',
    self.assertKedifaKeysWithPop(parameter_dict) expected_parameter_dict={
    self.assertEqual(
    {
    'domain': 'sslcacrtgarbage.example.com',
    'replication_number': '1',
    'url': 'http://sslcacrtgarbage.example.com',
    'site_url': 'http://sslcacrtgarbage.example.com',
    'secure_access':
    'https://sslcacrtgarbage.example.com',
    'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
    'warning-list': [ 'warning-list': [
    'ssl_ca_crt is obsolete, please use key-upload-url', 'ssl_ca_crt is obsolete, please use key-upload-url',
    'ssl_crt is obsolete, please use key-upload-url', 'ssl_crt is obsolete, please use key-upload-url',
    'ssl_key is obsolete, please use key-upload-url'] 'ssl_key is obsolete, please use key-upload-url']
    }, })
    parameter_dict
    )
    result = fakeHTTPSResult( result = fakeHTTPSResult(
    parameter_dict['domain'], 'test-path') parameter_dict['domain'], 'test-path')
    ...@@ -5985,26 +5515,15 @@ class TestSlaveSlapOSMasterCertificateCompatibility( ...@@ -5985,26 +5515,15 @@ class TestSlaveSlapOSMasterCertificateCompatibility(
    self.assertEqualResultJson(result, 'Path', '/test-path') self.assertEqualResultJson(result, 'Path', '/test-path')
    def test_ssl_ca_crt_does_not_match(self): def test_ssl_ca_crt_does_not_match(self):
    parameter_dict = self.parseSlaveParameterDict('ssl_ca_crt_does_not_match') parameter_dict = self.assertSlaveBase(
    self.assertLogAccessUrlWithPop(parameter_dict) 'ssl_ca_crt_does_not_match',
    self.assertKedifaKeysWithPop(parameter_dict) expected_parameter_dict={
    self.assertEqual(
    {
    'domain': 'sslcacrtdoesnotmatch.example.com',
    'replication_number': '1',
    'url': 'http://sslcacrtdoesnotmatch.example.com',
    'site_url': 'http://sslcacrtdoesnotmatch.example.com',
    'secure_access':
    'https://sslcacrtdoesnotmatch.example.com',
    'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
    'warning-list': [ 'warning-list': [
    'ssl_ca_crt is obsolete, please use key-upload-url', 'ssl_ca_crt is obsolete, please use key-upload-url',
    'ssl_crt is obsolete, please use key-upload-url', 'ssl_crt is obsolete, please use key-upload-url',
    'ssl_key is obsolete, please use key-upload-url' 'ssl_key is obsolete, please use key-upload-url'
    ] ]
    }, })
    parameter_dict
    )
    result = fakeHTTPSResult( result = fakeHTTPSResult(
    parameter_dict['domain'], 'test-path') parameter_dict['domain'], 'test-path')
    ...@@ -6071,6 +5590,7 @@ class TestSlaveSlapOSMasterCertificateCompatibilityUpdate( ...@@ -6071,6 +5590,7 @@ class TestSlaveSlapOSMasterCertificateCompatibilityUpdate(
    self.assertKeyWithPop('monitor-setup-url', parameter_dict) self.assertKeyWithPop('monitor-setup-url', parameter_dict)
    self.assertBackendHaproxyStatisticUrl(parameter_dict) self.assertBackendHaproxyStatisticUrl(parameter_dict)
    self.assertKedifaKeysWithPop(parameter_dict, 'master-') self.assertKedifaKeysWithPop(parameter_dict, 'master-')
    self.assertNodeInformationWithPop(parameter_dict)
    self.assertRejectedSlavePromiseEmptyWithPop(parameter_dict) self.assertRejectedSlavePromiseEmptyWithPop(parameter_dict)
    expected_parameter_dict = { expected_parameter_dict = {
    ...@@ -6093,21 +5613,7 @@ class TestSlaveSlapOSMasterCertificateCompatibilityUpdate( ...@@ -6093,21 +5613,7 @@ class TestSlaveSlapOSMasterCertificateCompatibilityUpdate(
    ) )
    def test_apache_key_apache_certificate_update(self): def test_apache_key_apache_certificate_update(self):
    parameter_dict = self.parseSlaveParameterDict('ssl_from_master') parameter_dict = self.assertSlaveBase('ssl_from_master')
    self.assertLogAccessUrlWithPop(parameter_dict)
    self.assertKedifaKeysWithPop(parameter_dict, '')
    hostname = 'ssl_from_master'.translate(None, '_-')
    self.assertEqual(
    {
    'domain': '%s.example.com' % (hostname,),
    'replication_number': '1',
    'url': 'http://%s.example.com' % (hostname, ),
    'site_url': 'http://%s.example.com' % (hostname, ),
    'secure_access': 'https://%s.example.com' % (hostname, ),
    'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
    },
    parameter_dict
    )
    result = fakeHTTPSResult( result = fakeHTTPSResult(
    parameter_dict['domain'], 'test-path') parameter_dict['domain'], 'test-path')
    ...@@ -6176,6 +5682,7 @@ class TestSlaveCiphers(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -6176,6 +5682,7 @@ class TestSlaveCiphers(SlaveHttpFrontendTestCase, TestDataMixin):
    self.assertKeyWithPop('monitor-setup-url', parameter_dict) self.assertKeyWithPop('monitor-setup-url', parameter_dict)
    self.assertBackendHaproxyStatisticUrl(parameter_dict) self.assertBackendHaproxyStatisticUrl(parameter_dict)
    self.assertKedifaKeysWithPop(parameter_dict, 'master-') self.assertKedifaKeysWithPop(parameter_dict, 'master-')
    self.assertNodeInformationWithPop(parameter_dict)
    self.assertRejectedSlavePromiseEmptyWithPop(parameter_dict) self.assertRejectedSlavePromiseEmptyWithPop(parameter_dict)
    expected_parameter_dict = { expected_parameter_dict = {
    ...@@ -6444,6 +5951,7 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase): ...@@ -6444,6 +5951,7 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase):
    self.assertKeyWithPop('monitor-setup-url', parameter_dict) self.assertKeyWithPop('monitor-setup-url', parameter_dict)
    self.assertBackendHaproxyStatisticUrl(parameter_dict) self.assertBackendHaproxyStatisticUrl(parameter_dict)
    self.assertKedifaKeysWithPop(parameter_dict, 'master-') self.assertKedifaKeysWithPop(parameter_dict, 'master-')
    self.assertNodeInformationWithPop(parameter_dict)
    self.assertRejectedSlavePromiseWithPop(parameter_dict) self.assertRejectedSlavePromiseWithPop(parameter_dict)
    expected_parameter_dict = { expected_parameter_dict = {
    ...@@ -6533,6 +6041,7 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase): ...@@ -6533,6 +6041,7 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase):
    def test_url(self): def test_url(self):
    parameter_dict = self.parseSlaveParameterDict('URL') parameter_dict = self.parseSlaveParameterDict('URL')
    self.assertNodeInformationWithPop(parameter_dict)
    self.assertEqual( self.assertEqual(
    { {
    'request-error-list': [ 'request-error-list': [
    ...@@ -6543,6 +6052,7 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase): ...@@ -6543,6 +6052,7 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase):
    def test_https_url(self): def test_https_url(self):
    parameter_dict = self.parseSlaveParameterDict('HTTPS-URL') parameter_dict = self.parseSlaveParameterDict('HTTPS-URL')
    self.assertNodeInformationWithPop(parameter_dict)
    self.assertEqual( self.assertEqual(
    { {
    'request-error-list': [ 'request-error-list': [
    ...@@ -6554,6 +6064,7 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase): ...@@ -6554,6 +6064,7 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase):
    def test_ssl_proxy_verify_ssl_proxy_ca_crt_damaged(self): def test_ssl_proxy_verify_ssl_proxy_ca_crt_damaged(self):
    parameter_dict = self.parseSlaveParameterDict( parameter_dict = self.parseSlaveParameterDict(
    'SSL-PROXY-VERIFY_SSL_PROXY_CA_CRT_DAMAGED') 'SSL-PROXY-VERIFY_SSL_PROXY_CA_CRT_DAMAGED')
    self.assertNodeInformationWithPop(parameter_dict)
    self.assertEqual( self.assertEqual(
    {'request-error-list': ["ssl_proxy_ca_crt is invalid"]}, {'request-error-list': ["ssl_proxy_ca_crt is invalid"]},
    parameter_dict parameter_dict
    ...@@ -6562,6 +6073,7 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase): ...@@ -6562,6 +6073,7 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase):
    def test_ssl_proxy_verify_ssl_proxy_ca_crt_empty(self): def test_ssl_proxy_verify_ssl_proxy_ca_crt_empty(self):
    parameter_dict = self.parseSlaveParameterDict( parameter_dict = self.parseSlaveParameterDict(
    'SSL-PROXY-VERIFY_SSL_PROXY_CA_CRT_EMPTY') 'SSL-PROXY-VERIFY_SSL_PROXY_CA_CRT_EMPTY')
    self.assertNodeInformationWithPop(parameter_dict)
    self.assertEqual( self.assertEqual(
    {'request-error-list': ["ssl_proxy_ca_crt is invalid"]}, {'request-error-list': ["ssl_proxy_ca_crt is invalid"]},
    parameter_dict parameter_dict
    ...@@ -6570,6 +6082,7 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase): ...@@ -6570,6 +6082,7 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase):
    def test_health_check_failover_ssl_proxy_ca_crt_damaged(self): def test_health_check_failover_ssl_proxy_ca_crt_damaged(self):
    parameter_dict = self.parseSlaveParameterDict( parameter_dict = self.parseSlaveParameterDict(
    'health-check-failover-SSL-PROXY-VERIFY_SSL_PROXY_CA_CRT_DAMAGED') 'health-check-failover-SSL-PROXY-VERIFY_SSL_PROXY_CA_CRT_DAMAGED')
    self.assertNodeInformationWithPop(parameter_dict)
    self.assertEqual( self.assertEqual(
    { {
    'request-error-list': [ 'request-error-list': [
    ...@@ -6581,6 +6094,7 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase): ...@@ -6581,6 +6094,7 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase):
    def test_health_check_failover_ssl_proxy_ca_crt_empty(self): def test_health_check_failover_ssl_proxy_ca_crt_empty(self):
    parameter_dict = self.parseSlaveParameterDict( parameter_dict = self.parseSlaveParameterDict(
    'health-check-failover-SSL-PROXY-VERIFY_SSL_PROXY_CA_CRT_EMPTY') 'health-check-failover-SSL-PROXY-VERIFY_SSL_PROXY_CA_CRT_EMPTY')
    self.assertNodeInformationWithPop(parameter_dict)
    self.assertEqual( self.assertEqual(
    { {
    'request-error-list': [ 'request-error-list': [
    ...@@ -6590,20 +6104,8 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase): ...@@ -6590,20 +6104,8 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase):
    ) )
    def test_server_alias_same(self): def test_server_alias_same(self):
    parameter_dict = self.parseSlaveParameterDict('SERVER-ALIAS-SAME') parameter_dict = self.assertSlaveBase(
    self.assertLogAccessUrlWithPop(parameter_dict) 'SERVER-ALIAS-SAME')
    self.assertKedifaKeysWithPop(parameter_dict)
    self.assertEqual(
    {
    'domain': 'serveraliassame.example.com',
    'replication_number': '1',
    'url': 'http://serveraliassame.example.com',
    'site_url': 'http://serveraliassame.example.com',
    'secure_access': 'https://serveraliassame.example.com',
    'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
    },
    parameter_dict
    )
    result = fakeHTTPSResult( result = fakeHTTPSResult(
    parameter_dict['domain'], 'test-path') parameter_dict['domain'], 'test-path')
    ...@@ -6616,6 +6118,7 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase): ...@@ -6616,6 +6118,7 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase):
    def test_custom_domain_unsafe(self): def test_custom_domain_unsafe(self):
    parameter_dict = self.parseSlaveParameterDict('CUSTOM_DOMAIN-UNSAFE') parameter_dict = self.parseSlaveParameterDict('CUSTOM_DOMAIN-UNSAFE')
    self.assertNodeInformationWithPop(parameter_dict)
    self.assertEqual( self.assertEqual(
    { {
    'request-error-list': [ 'request-error-list': [
    ...@@ -6627,6 +6130,7 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase): ...@@ -6627,6 +6130,7 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase):
    def test_server_alias_unsafe(self): def test_server_alias_unsafe(self):
    parameter_dict = self.parseSlaveParameterDict('SERVER-ALIAS-UNSAFE') parameter_dict = self.parseSlaveParameterDict('SERVER-ALIAS-UNSAFE')
    self.assertNodeInformationWithPop(parameter_dict)
    self.assertEqual( self.assertEqual(
    { {
    'request-error-list': [ 'request-error-list': [
    ...@@ -6638,6 +6142,7 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase): ...@@ -6638,6 +6142,7 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase):
    def test_bad_ciphers(self): def test_bad_ciphers(self):
    parameter_dict = self.parseSlaveParameterDict('BAD-CIPHERS') parameter_dict = self.parseSlaveParameterDict('BAD-CIPHERS')
    self.assertNodeInformationWithPop(parameter_dict)
    self.assertEqual( self.assertEqual(
    { {
    'request-error-list': [ 'request-error-list': [
    ...@@ -6651,6 +6156,7 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase): ...@@ -6651,6 +6156,7 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase):
    def test_virtualhostroot_http_port_unsafe(self): def test_virtualhostroot_http_port_unsafe(self):
    parameter_dict = self.parseSlaveParameterDict( parameter_dict = self.parseSlaveParameterDict(
    'VIRTUALHOSTROOT-HTTP-PORT-UNSAFE') 'VIRTUALHOSTROOT-HTTP-PORT-UNSAFE')
    self.assertNodeInformationWithPop(parameter_dict)
    self.assertEqual( self.assertEqual(
    { {
    'request-error-list': [ 'request-error-list': [
    ...@@ -6663,6 +6169,7 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase): ...@@ -6663,6 +6169,7 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase):
    def test_virtualhostroot_https_port_unsafe(self): def test_virtualhostroot_https_port_unsafe(self):
    parameter_dict = self.parseSlaveParameterDict( parameter_dict = self.parseSlaveParameterDict(
    'VIRTUALHOSTROOT-HTTPS-PORT-UNSAFE') 'VIRTUALHOSTROOT-HTTPS-PORT-UNSAFE')
    self.assertNodeInformationWithPop(parameter_dict)
    self.assertEqual( self.assertEqual(
    { {
    'request-error-list': [ 'request-error-list': [
    ...@@ -6676,6 +6183,7 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase): ...@@ -6676,6 +6183,7 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase):
    parameter_dict = self.parseSlaveParameterDict('DEFAULT-PATH-UNSAFE') parameter_dict = self.parseSlaveParameterDict('DEFAULT-PATH-UNSAFE')
    self.assertLogAccessUrlWithPop(parameter_dict) self.assertLogAccessUrlWithPop(parameter_dict)
    self.assertKedifaKeysWithPop(parameter_dict, 'master-') self.assertKedifaKeysWithPop(parameter_dict, 'master-')
    self.assertNodeInformationWithPop(parameter_dict)
    self.assertEqual( self.assertEqual(
    { {
    'domain': 'defaultpathunsafe.example.com', 'domain': 'defaultpathunsafe.example.com',
    ...@@ -6707,20 +6215,7 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase): ...@@ -6707,20 +6215,7 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase):
    ) )
    def test_monitor_ipv4_test_unsafe(self): def test_monitor_ipv4_test_unsafe(self):
    parameter_dict = self.parseSlaveParameterDict('MONITOR-IPV4-TEST-UNSAFE') parameter_dict = self.assertSlaveBase('MONITOR-IPV4-TEST-UNSAFE')
    self.assertLogAccessUrlWithPop(parameter_dict)
    self.assertKedifaKeysWithPop(parameter_dict)
    self.assertEqual(
    {
    'domain': 'monitoripv4testunsafe.example.com',
    'replication_number': '1',
    'url': 'http://monitoripv4testunsafe.example.com',
    'site_url': 'http://monitoripv4testunsafe.example.com',
    'secure_access': 'https://monitoripv4testunsafe.example.com',
    'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
    },
    parameter_dict
    )
    result = fakeHTTPSResult( result = fakeHTTPSResult(
    parameter_dict['domain'], 'test-path') parameter_dict['domain'], 'test-path')
    ...@@ -6751,20 +6246,7 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase): ...@@ -6751,20 +6246,7 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase):
    ) )
    def test_monitor_ipv6_test_unsafe(self): def test_monitor_ipv6_test_unsafe(self):
    parameter_dict = self.parseSlaveParameterDict('MONITOR-IPV6-TEST-UNSAFE') parameter_dict = self.assertSlaveBase('MONITOR-IPV6-TEST-UNSAFE')
    self.assertLogAccessUrlWithPop(parameter_dict)
    self.assertKedifaKeysWithPop(parameter_dict)
    self.assertEqual(
    {
    'domain': 'monitoripv6testunsafe.example.com',
    'replication_number': '1',
    'url': 'http://monitoripv6testunsafe.example.com',
    'site_url': 'http://monitoripv6testunsafe.example.com',
    'secure_access': 'https://monitoripv6testunsafe.example.com',
    'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
    },
    parameter_dict
    )
    result = fakeHTTPSResult( result = fakeHTTPSResult(
    parameter_dict['domain'], 'test-path') parameter_dict['domain'], 'test-path')
    ...@@ -6793,23 +6275,11 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase): ...@@ -6793,23 +6275,11 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase):
    ) )
    def test_site_1(self): def test_site_1(self):
    parameter_dict = self.parseSlaveParameterDict('SITE_1') self.assertSlaveBase('SITE_1', hostname='duplicate')
    self.assertLogAccessUrlWithPop(parameter_dict)
    self.assertKedifaKeysWithPop(parameter_dict)
    self.assertEqual(
    {
    'domain': 'duplicate.example.com',
    'replication_number': '1',
    'url': 'http://duplicate.example.com',
    'site_url': 'http://duplicate.example.com',
    'secure_access': 'https://duplicate.example.com',
    'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
    },
    parameter_dict
    )
    def test_site_2(self): def test_site_2(self):
    parameter_dict = self.parseSlaveParameterDict('SITE_2') parameter_dict = self.parseSlaveParameterDict('SITE_2')
    self.assertNodeInformationWithPop(parameter_dict)
    self.assertEqual( self.assertEqual(
    { {
    'request-error-list': ["custom_domain 'duplicate.example.com' clashes"] 'request-error-list': ["custom_domain 'duplicate.example.com' clashes"]
    ...@@ -6819,6 +6289,7 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase): ...@@ -6819,6 +6289,7 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase):
    def test_site_3(self): def test_site_3(self):
    parameter_dict = self.parseSlaveParameterDict('SITE_3') parameter_dict = self.parseSlaveParameterDict('SITE_3')
    self.assertNodeInformationWithPop(parameter_dict)
    self.assertEqual( self.assertEqual(
    { {
    'request-error-list': ["server-alias 'duplicate.example.com' clashes"] 'request-error-list': ["server-alias 'duplicate.example.com' clashes"]
    ...@@ -6828,6 +6299,7 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase): ...@@ -6828,6 +6299,7 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase):
    def test_site_4(self): def test_site_4(self):
    parameter_dict = self.parseSlaveParameterDict('SITE_4') parameter_dict = self.parseSlaveParameterDict('SITE_4')
    self.assertNodeInformationWithPop(parameter_dict)
    self.assertEqual( self.assertEqual(
    { {
    'request-error-list': ["custom_domain 'duplicate.example.com' clashes"] 'request-error-list': ["custom_domain 'duplicate.example.com' clashes"]
    ...@@ -6837,7 +6309,7 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase): ...@@ -6837,7 +6309,7 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase):
    def test_ssl_ca_crt_only(self): def test_ssl_ca_crt_only(self):
    parameter_dict = self.parseSlaveParameterDict('SSL_CA_CRT_ONLY') parameter_dict = self.parseSlaveParameterDict('SSL_CA_CRT_ONLY')
    self.assertNodeInformationWithPop(parameter_dict)
    self.assertEqual( self.assertEqual(
    parameter_dict, parameter_dict,
    { {
    ...@@ -6851,6 +6323,7 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase): ...@@ -6851,6 +6323,7 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase):
    def test_ssl_key_ssl_crt_unsafe(self): def test_ssl_key_ssl_crt_unsafe(self):
    parameter_dict = self.parseSlaveParameterDict('SSL_KEY-SSL_CRT-UNSAFE') parameter_dict = self.parseSlaveParameterDict('SSL_KEY-SSL_CRT-UNSAFE')
    self.assertNodeInformationWithPop(parameter_dict)
    self.assertEqual( self.assertEqual(
    { {
    'request-error-list': ["slave ssl_key and ssl_crt does not match"], 'request-error-list': ["slave ssl_key and ssl_crt does not match"],
    ...@@ -6863,6 +6336,7 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase): ...@@ -6863,6 +6336,7 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase):
    def test_bad_backend(self): def test_bad_backend(self):
    parameter_dict = self.parseSlaveParameterDict('BAD-BACKEND') parameter_dict = self.parseSlaveParameterDict('BAD-BACKEND')
    self.assertNodeInformationWithPop(parameter_dict)
    self.assertEqual( self.assertEqual(
    { {
    'request-error-list': [ 'request-error-list': [
    ...@@ -6874,6 +6348,7 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase): ...@@ -6874,6 +6348,7 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase):
    def test_empty_backend(self): def test_empty_backend(self):
    parameter_dict = self.parseSlaveParameterDict('EMPTY-BACKEND') parameter_dict = self.parseSlaveParameterDict('EMPTY-BACKEND')
    self.assertNodeInformationWithPop(parameter_dict)
    self.assertEqual( self.assertEqual(
    { {
    'request-error-list': [ 'request-error-list': [
    ...@@ -6916,36 +6391,10 @@ class TestSlaveHostHaproxyClash(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -6916,36 +6391,10 @@ class TestSlaveHostHaproxyClash(SlaveHttpFrontendTestCase, TestDataMixin):
    } }
    def test(self): def test(self):
    parameter_dict_wildcard = self.parseSlaveParameterDict('wildcard') self.assertSlaveBase(
    self.assertLogAccessUrlWithPop(parameter_dict_wildcard) 'wildcard', hostname='*.alias1')
    self.assertKedifaKeysWithPop(parameter_dict_wildcard, '') self.assertSlaveBase(
    hostname = '*.alias1' 'zspecific', hostname='zspecific.alias1')
    self.assertEqual(
    {
    'domain': '%s.example.com' % (hostname,),
    'replication_number': '1',
    'url': 'http://%s.example.com' % (hostname, ),
    'site_url': 'http://%s.example.com' % (hostname, ),
    'secure_access': 'https://%s.example.com' % (hostname, ),
    'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
    },
    parameter_dict_wildcard
    )
    parameter_dict_specific = self.parseSlaveParameterDict('zspecific')
    self.assertLogAccessUrlWithPop(parameter_dict_specific)
    self.assertKedifaKeysWithPop(parameter_dict_specific, '')
    hostname = 'zspecific.alias1'
    self.assertEqual(
    {
    'domain': '%s.example.com' % (hostname,),
    'replication_number': '1',
    'url': 'http://%s.example.com' % (hostname, ),
    'site_url': 'http://%s.example.com' % (hostname, ),
    'secure_access': 'https://%s.example.com' % (hostname, ),
    'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
    },
    parameter_dict_specific
    )
    result_wildcard = fakeHTTPSResult( result_wildcard = fakeHTTPSResult(
    'other.alias1.example.com', 'other.alias1.example.com',
    ......
    stack/slapos.cfg
    View file @ f46c53e8
    ...@@ -190,7 +190,7 @@ setuptools-dso = 1.7 ...@@ -190,7 +190,7 @@ setuptools-dso = 1.7
    rubygemsrecipe = 0.4.3 rubygemsrecipe = 0.4.3
    six = 1.12.0 six = 1.12.0
    slapos.cookbook = 1.0.226 slapos.cookbook = 1.0.226
    slapos.core = 1.7.4 slapos.core = 1.7.5
    slapos.extension.strip = 0.4 slapos.extension.strip = 0.4
    slapos.extension.shared = 1.0 slapos.extension.shared = 1.0
    slapos.libnetworkcache = 0.22 slapos.libnetworkcache = 0.22
    ...@@ -249,10 +249,12 @@ certifi = 2020.6.20 ...@@ -249,10 +249,12 @@ certifi = 2020.6.20
    chardet = 3.0.4 chardet = 3.0.4
    urllib3 = 1.25.9 urllib3 = 1.25.9
    pkgconfig = 1.5.1 pkgconfig = 1.5.1
    distro = 1.7.0
    [versions:python2] [versions:python2]
    Werkzeug = 1.0.1 Werkzeug = 1.0.1
    distro = 1.6.0
    [networkcache] [networkcache]
    ......
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment
    GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7