kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-03-13 04:36:42 +00:00
Code Issues Projects Releases Wiki Activity

FS-8549 [mod_http_cache] add support for AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY environment variables in S3 profiles

Browse Source
This commit is contained in:
Chris Rienzo 2015-11-17 12:00:15 -05:00
parent 6dd5fca10a
commit df6a5315c1
2 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mod/applications/mod_http_cache/conf/autoload_configs/http_cache.conf.xml
View File

@ -14,9 +14,9 @@
<profile name="s3"> <profile name="s3">
<!-- Credentials for AWS account. --> <!-- Credentials for AWS account. -->
<aws-s3> <aws-s3>
<!-- 20 character key identifier --> <!-- 20 character key identifier, can override with AWS_ACCESS_KEY_ID environment variable -->
<access-key-id><![CDATA[AKIAIOSFODNN7EXAMPLE]]></access-key-id> <access-key-id><![CDATA[AKIAIOSFODNN7EXAMPLE]]></access-key-id>
<!-- 40 character secret --> <!-- 40 character secret, can override with AWS_SECRET_ACCESS_KEY environment variable -->
<secret-access-key><![CDATA[wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY]]></secret-access-key> <secret-access-key><![CDATA[wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY]]></secret-access-key>
<!--base-url><![CDATA[s3.example.com]]></base-url--> <!--base-url><![CDATA[s3.example.com]]></base-url-->
</aws-s3> </aws-s3>
@ -29,3 +29,4 @@
</profiles> </profiles>
</configuration> </configuration>

16
src/mod/applications/mod_http_cache/mod_http_cache.c
View File

@ -36,6 +36,8 @@
#include <switch_curl.h> #include <switch_curl.h>
#include "aws.h" #include "aws.h"
#include <stdlib.h>
/* 253 max domain size + '/' + NUL byte */ /* 253 max domain size + '/' + NUL byte */
#define DOMAIN_BUF_SIZE 255 #define DOMAIN_BUF_SIZE 255
@ -1532,8 +1534,21 @@ static switch_status_t do_config(url_cache_t *cache)
char *base_domain = NULL; char *base_domain = NULL;
if (s3) { if (s3) {
switch_xml_t base_domain_xml = switch_xml_child(s3, "base-domain"); switch_xml_t base_domain_xml = switch_xml_child(s3, "base-domain");
/* check if environment variables set the keys */
access_key_id = getenv("AWS_ACCESS_KEY_ID");
secret_access_key = getenv("AWS_SECRET_ACCESS_KEY");
if (!zstr(access_key_id) && !zstr(secret_access_key)) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Using AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY environment variables for s3 access on profile \"%s\"\n", name);
access_key_id = strdup(access_key_id);
secret_access_key = strdup(secret_access_key);
} else {
/* use configuration for keys */
switch_xml_t id = switch_xml_child(s3, "access-key-id"); switch_xml_t id = switch_xml_child(s3, "access-key-id");
switch_xml_t secret = switch_xml_child(s3, "secret-access-key"); switch_xml_t secret = switch_xml_child(s3, "secret-access-key");
access_key_id = NULL;
secret_access_key = NULL;
if (id && secret) { if (id && secret) {
access_key_id = switch_strip_whitespace(switch_xml_txt(id)); access_key_id = switch_strip_whitespace(switch_xml_txt(id));
secret_access_key = switch_strip_whitespace(switch_xml_txt(secret)); secret_access_key = switch_strip_whitespace(switch_xml_txt(secret));
@ -1548,6 +1563,7 @@ static switch_status_t do_config(url_cache_t *cache)
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Missing key id or secret\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Missing key id or secret\n");
continue; continue;
} }
}
if (base_domain_xml) { if (base_domain_xml) {
base_domain = switch_strip_whitespace(switch_xml_txt(base_domain_xml)); base_domain = switch_strip_whitespace(switch_xml_txt(base_domain_xml));
if (zstr(base_domain)) { if (zstr(base_domain)) {