Merge remote-tracking branch 'origin/master' into squash_db_migration…

…_7.x
rimashah25 · Sep 6, 2023 · 7187ad2 · 7187ad2
2 parents 1b37282 + 352337d
commit 7187ad2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/infrastructure/ansible/roles/traffic_ops/defaults/main.yml b/infrastructure/ansible/roles/traffic_ops/defaults/main.yml
@@ -98,10 +98,13 @@ to_go_supported_ds_metrics:
   - tps_4xx
   - tps_5xx
 
+to_go_client_auth_enabled: 0
 to_go_whitelisted_oauth_urls: ""
 to_go_oauth_user_attribute: ""
 to_go_oauth_client_secret: ""
 
+to_client_cert_root_directory: "/etc/pki/tls/traffic_ops/"
+
 to_plugin_config: {}
 
 to_le_user_email: [email protected]

diff --git a/infrastructure/ansible/roles/traffic_ops/templates/cdn.conf.j2 b/infrastructure/ansible/roles/traffic_ops/templates/cdn.conf.j2
@@ -68,6 +68,9 @@
       "plugins": {{ to_plugin_config.keys() | list | to_json }},
       "plugin_config" : {{ to_plugin_config | to_nice_json(indent=2) }},
       "traffic_vault_backend": "{{ to_traffic_vault_backend }}",
+      "tls_config": {
+         "ClientAuth": "{{ to_go_client_auth_enabled }}"
+      },
       "traffic_vault_config": {
 {% if to_traffic_vault_backend == "postgres" %}
          "dbname": "{{ to_tvdb_db_name }}",
@@ -86,6 +89,11 @@
       "oauth_client_secret": "{{ to_go_oauth_client_secret }}",
       "oauth_user_attribute": "{{ to_go_oauth_user_attribute }}"
    },
+{% if to_go_client_auth_enabled == 1 %}
+   "client_certificate_authentication" : {
+      "root_certificates_directory" : "{{ to_client_cert_root_directory }}"
+   },
+{% endif %}
    "lets_encrypt": {
       "user_email": "{{ to_le_user_email }}",
       "send_expiration_email": {{ to_le_send_expiration_email | bool | lower }},

diff --git a/traffic_ops/v5-client/profile.go b/traffic_ops/v5-client/profile.go
@@ -70,9 +70,9 @@ func (to *Session) UpdateProfile(id int, pl tc.ProfileV5, opts RequestOptions) (
 
 // GetParametersByProfileName returns all of the Parameters that are assigned
 // to the Profile with the given Name.
-func (to *Session) GetParametersByProfileName(profileName string, opts RequestOptions) (tc.ParametersResponse, toclientlib.ReqInf, error) {
+func (to *Session) GetParametersByProfileName(profileName string, opts RequestOptions) (tc.ParametersResponseV5, toclientlib.ReqInf, error) {
 	route := fmt.Sprintf(apiProfilesNameParameters, profileName)
-	var data tc.ParametersResponse
+	var data tc.ParametersResponseV5
 	reqInf, err := to.get(route, opts, &data)
 	return data, reqInf, err
 }