Skip to content

[mod_xml_curl] Added "auth-token" to support token-based authorization methods #2807

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[mod_xml_curl] Added "auth-token" to support token-based authorization methods #2807

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5ff194
Added "auth-token" variable to support token-based authorization meth…
May 10, 2025
2da6427
Removing logging.
May 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 21 additions & 4 deletions src/mod/xml_int/mod_xml_curl/mod_xml_curl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ struct xml_binding {
char *ssl_cacert_file;
uint32_t enable_ssl_verifyhost;
char *cookie_file;
char *auth_token;
switch_hash_t *vars_map;
int use_dynamic_url;
long auth_scheme;
Expand Down Expand Up @@ -152,7 +153,6 @@ static switch_xml_t xml_url_fetch(const char *section, const char *tag_name, con
char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1];
xml_binding_t *binding = (xml_binding_t *) user_data;
char *file_url;
switch_curl_slist_t *slist = NULL;
long httpRes = 0;
switch_curl_slist_t *headers = NULL;
char hostname[256] = "";
Expand Down Expand Up @@ -220,6 +220,17 @@ static switch_xml_t xml_url_fetch(const char *section, const char *tag_name, con
curl_handle = switch_curl_easy_init();
headers = switch_curl_slist_append(headers, "Content-Type: application/x-www-form-urlencoded");

if (binding->auth_token) {
char *auth_key = "Authorization: ";
int auth_header_len = strlen(auth_key) + strlen(binding->auth_token)+2;
char *auth_header = (char *)malloc(auth_header_len);
switch_assert(auth_header);

switch_snprintf(auth_header, auth_header_len, "%s%s", auth_key, binding->auth_token);
headers = switch_curl_slist_append(headers, auth_header);
switch_safe_free(auth_header);
}

if (!strncasecmp(binding->url, "https", 5)) {
switch_curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, 0);
switch_curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYHOST, 0);
Expand Down Expand Up @@ -248,8 +259,8 @@ static switch_xml_t xml_url_fetch(const char *section, const char *tag_name, con
}

if (binding->disable100continue) {
slist = switch_curl_slist_append(slist, "Expect:");
switch_curl_easy_setopt(curl_handle, CURLOPT_HTTPHEADER, slist);
headers = switch_curl_slist_append(headers, "Expect:");
switch_curl_easy_setopt(curl_handle, CURLOPT_HTTPHEADER, headers);
}

if (binding->enable_cacert_check) {
Expand Down Expand Up @@ -301,7 +312,6 @@ static switch_xml_t xml_url_fetch(const char *section, const char *tag_name, con
switch_curl_easy_getinfo(curl_handle, CURLINFO_RESPONSE_CODE, &httpRes);
switch_curl_easy_cleanup(curl_handle);
switch_curl_slist_free_all(headers);
switch_curl_slist_free_all(slist);
close(config_data.fd);
} else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening temp file!\n");
Expand Down Expand Up @@ -382,6 +392,7 @@ static switch_status_t do_config(void)
char *ssl_cacert_file = NULL;
uint32_t enable_ssl_verifyhost = 0;
char *cookie_file = NULL;
char *auth_token = NULL;
hash_node_t *hash_node;
long auth_scheme = CURLAUTH_BASIC;
need_vars_map = 0;
Expand Down Expand Up @@ -443,6 +454,8 @@ static switch_status_t do_config(void)
enable_ssl_verifyhost = 1;
} else if (!strcasecmp(var, "cookie-file")) {
cookie_file = val;
} else if (!strcasecmp(var, "auth-token")) {
auth_token = val;
} else if (!strcasecmp(var, "use-dynamic-url") && switch_true(val)) {
use_dynamic_url = 1;
} else if (!strcasecmp(var, "enable-post-var")) {
Expand Down Expand Up @@ -538,6 +551,10 @@ static switch_status_t do_config(void)
binding->cookie_file = switch_core_strdup(globals.pool, cookie_file);
}

if (auth_token) {
binding->auth_token = auth_token;
}

binding->vars_map = vars_map;

if (vars_map) {
Expand Down