ben.carrasco/freeswitch-modules
1
0
Fork 0
mirror of https://github.com/jambonz/freeswitch-modules.git synced 2025-12-19 08:57:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

support aws sessionToken (#58)

Browse Source 
* support aws sessionToken

Signed-off-by: Hoan HL <quan.luuhoang8@gmail.com>

* wip

Signed-off-by: Hoan HL <quan.luuhoang8@gmail.com>

* fix code style

---------

Signed-off-by: Hoan HL <quan.luuhoang8@gmail.com>
This commit is contained in:
Hoan Luu Huu
2024-05-02 19:28:01 +07:00
committed by GitHub
parent b495dba126
commit be3714465b
4 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mod_aws_lex/aws_lex_glue.cpp
View File

@@ -173,13 +173,12 @@ public:
char *metadata, char *metadata,
const char* awsAccessKeyId, const char* awsAccessKeyId,
const char* awsSecretAccessKey, const char* awsSecretAccessKey,
const char* awsSessionToken,
responseHandler_t responseHandler, responseHandler_t responseHandler,
errorHandler_t errorHandler) : errorHandler_t errorHandler) :
m_bot(bot), m_alias(alias), m_region(region), m_sessionId(sessionId), m_finished(false), m_finishing(false), m_packets(0), m_bot(bot), m_alias(alias), m_region(region), m_sessionId(sessionId), m_finished(false), m_finishing(false), m_packets(0),
m_pStream(nullptr), m_bPlayDone(false), m_bDiscardAudio(false) m_pStream(nullptr), m_bPlayDone(false), m_bDiscardAudio(false)
{ {
Aws::String key(awsAccessKeyId);
Aws::String secret(awsSecretAccessKey);
Aws::String awsLocale(locale); Aws::String awsLocale(locale);
Aws::Client::ClientConfiguration config; Aws::Client::ClientConfiguration config;
config.region = region; config.region = region;
@@ -191,7 +190,10 @@ public:
keySnippet[19] = '\0'; keySnippet[19] = '\0';
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "GStreamer %p ACCESS_KEY_ID %s\n", this, keySnippet); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "GStreamer %p ACCESS_KEY_ID %s\n", this, keySnippet);
if (*awsAccessKeyId && *awsSecretAccessKey) { if (*awsAccessKeyId && *awsSecretAccessKey && *awsSessionToken) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "using AWS creds %s %s %s\n", awsAccessKeyId, awsSecretAccessKey, awsSessionToken);
m_client = Aws::MakeUnique<LexRuntimeV2Client>(ALLOC_TAG, AWSCredentials(awsAccessKeyId, awsSecretAccessKey, awsSessionToken), config);
} else if (*awsAccessKeyId && *awsSecretAccessKey) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "using AWS creds %s %s\n", awsAccessKeyId, awsSecretAccessKey); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "using AWS creds %s %s\n", awsAccessKeyId, awsSecretAccessKey);
m_client = Aws::MakeUnique<LexRuntimeV2Client>(ALLOC_TAG, AWSCredentials(awsAccessKeyId, awsSecretAccessKey), config); m_client = Aws::MakeUnique<LexRuntimeV2Client>(ALLOC_TAG, AWSCredentials(awsAccessKeyId, awsSecretAccessKey), config);
} }
@@ -540,7 +542,7 @@ static void *SWITCH_THREAD_FUNC lex_thread(switch_thread_t *thread, void *obj) {
bool ok = true; bool ok = true;
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "lex_thread: starting cb %p\n", (void *) cb); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "lex_thread: starting cb %p\n", (void *) cb);
GStreamer* pStreamer = new GStreamer(cb->sessionId, cb->bot, cb->alias, cb->region, cb->locale, GStreamer* pStreamer = new GStreamer(cb->sessionId, cb->bot, cb->alias, cb->region, cb->locale,
cb->intent, cb->metadata, cb->awsAccessKeyId, cb->awsSecretAccessKey, cb->intent, cb->metadata, cb->awsAccessKeyId, cb->awsSecretAccessKey, cb->awsSessionToken,
cb->responseHandler, cb->errorHandler); cb->responseHandler, cb->errorHandler);
if (!pStreamer) { if (!pStreamer) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "lex_thread: Error allocating streamer\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "lex_thread: Error allocating streamer\n");
@@ -641,6 +643,7 @@ extern "C" {
memset(cb, sizeof(cb), 0); memset(cb, sizeof(cb), 0);
const char* awsAccessKeyId = switch_channel_get_variable(channel, "AWS_ACCESS_KEY_ID"); const char* awsAccessKeyId = switch_channel_get_variable(channel, "AWS_ACCESS_KEY_ID");
const char* awsSecretAccessKey = switch_channel_get_variable(channel, "AWS_SECRET_ACCESS_KEY"); const char* awsSecretAccessKey = switch_channel_get_variable(channel, "AWS_SECRET_ACCESS_KEY");
const char* awsSessionToken = switch_channel_get_variable(channel, "AWS_SESSION_TOKEN");
if (!hasDefaultCredentials && (!awsAccessKeyId || !awsSecretAccessKey)) { if (!hasDefaultCredentials && (!awsAccessKeyId || !awsSecretAccessKey)) {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR,
@@ -654,6 +657,7 @@ extern "C" {
if (awsAccessKeyId && awsSecretAccessKey) { if (awsAccessKeyId && awsSecretAccessKey) {
strncpy(cb->awsAccessKeyId, awsAccessKeyId, 128); strncpy(cb->awsAccessKeyId, awsAccessKeyId, 128);
strncpy(cb->awsSecretAccessKey, awsSecretAccessKey, 128); strncpy(cb->awsSecretAccessKey, awsSecretAccessKey, 128);
if (awsSessionToken) strncpy(cb->awsSessionToken, awsSessionToken, 1024);
} }
else { else {
strncpy(cb->awsAccessKeyId, std::getenv("AWS_ACCESS_KEY_ID"), 128); strncpy(cb->awsAccessKeyId, std::getenv("AWS_ACCESS_KEY_ID"), 128);

1
mod_aws_lex/mod_aws_lex.h
View File

@@ -30,6 +30,7 @@ struct cap_cb {
char sessionId[256]; char sessionId[256];
char awsAccessKeyId[128]; char awsAccessKeyId[128];
char awsSecretAccessKey[128]; char awsSecretAccessKey[128];
char awsSessionToken[1024];
SpeexResamplerState *resampler; SpeexResamplerState *resampler;
void* streamer; void* streamer;
responseHandler_t responseHandler; responseHandler_t responseHandler;

18
mod_aws_transcribe/aws_transcribe_glue.cpp
View File

@@ -49,12 +49,11 @@ public:
const char* region, const char* region,
const char* awsAccessKeyId, const char* awsAccessKeyId,
const char* awsSecretAccessKey, const char* awsSecretAccessKey,
const char* awsSessionToken,
responseHandler_t responseHandler responseHandler_t responseHandler
) : m_sessionId(sessionId), m_bugname(bugname), m_finished(false), m_interim(interim), m_finishing(false), m_connected(false), m_connecting(false), ) : m_sessionId(sessionId), m_bugname(bugname), m_finished(false), m_interim(interim), m_finishing(false), m_connected(false), m_connecting(false),
m_packets(0), m_responseHandler(responseHandler), m_pStream(nullptr), m_packets(0), m_responseHandler(responseHandler), m_pStream(nullptr),
m_audioBuffer(320 * (samples_per_second == 8000 ? 1 : 2), 15) { m_audioBuffer(320 * (samples_per_second == 8000 ? 1 : 2), 15) {
Aws::String key(awsAccessKeyId);
Aws::String secret(awsSecretAccessKey);
Aws::Client::ClientConfiguration config; Aws::Client::ClientConfiguration config;
if (region != nullptr && strlen(region) > 0) config.region = region; if (region != nullptr && strlen(region) > 0) config.region = region;
char keySnippet[20]; char keySnippet[20];
@@ -64,7 +63,9 @@ public:
keySnippet[19] = '\0'; keySnippet[19] = '\0';
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "GStreamer %p ACCESS_KEY_ID %s, region %s\n", this, keySnippet, region); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "GStreamer %p ACCESS_KEY_ID %s, region %s\n", this, keySnippet, region);
if (*awsAccessKeyId && *awsSecretAccessKey) { if (*awsAccessKeyId && *awsSecretAccessKey && *awsSessionToken) {
m_client = Aws::MakeUnique<TranscribeStreamingServiceClient>(ALLOC_TAG, AWSCredentials(awsAccessKeyId, awsSecretAccessKey, awsSessionToken), config);
} else if (*awsAccessKeyId && *awsSecretAccessKey) {
m_client = Aws::MakeUnique<TranscribeStreamingServiceClient>(ALLOC_TAG, AWSCredentials(awsAccessKeyId, awsSecretAccessKey), config); m_client = Aws::MakeUnique<TranscribeStreamingServiceClient>(ALLOC_TAG, AWSCredentials(awsAccessKeyId, awsSecretAccessKey), config);
} }
else { else {
@@ -320,8 +321,8 @@ static void *SWITCH_THREAD_FUNC aws_transcribe_thread(switch_thread_t *thread, v
struct cap_cb *cb = (struct cap_cb *) obj; struct cap_cb *cb = (struct cap_cb *) obj;
bool ok = true; bool ok = true;
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "transcribe_thread: starting cb %p\n", (void *) cb); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "transcribe_thread: starting cb %p\n", (void *) cb);
GStreamer* pStreamer = new GStreamer(cb->sessionId, cb->bugname, cb->channels, cb->lang, cb->interim, cb->samples_per_second, cb->region, cb->awsAccessKeyId, cb->awsSecretAccessKey, GStreamer* pStreamer = new GStreamer(cb->sessionId, cb->bugname, cb->channels, cb->lang, cb->interim, cb->samples_per_second,
cb->responseHandler); cb->region, cb->awsAccessKeyId, cb->awsSecretAccessKey, cb->awsSessionToken, cb->responseHandler);
if (!pStreamer) { if (!pStreamer) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "transcribe_thread: Error allocating streamer\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "transcribe_thread: Error allocating streamer\n");
return nullptr; return nullptr;
@@ -408,6 +409,7 @@ extern "C" {
memset(cb, sizeof(cb), 0); memset(cb, sizeof(cb), 0);
const char* awsAccessKeyId = switch_channel_get_variable(channel, "AWS_ACCESS_KEY_ID"); const char* awsAccessKeyId = switch_channel_get_variable(channel, "AWS_ACCESS_KEY_ID");
const char* awsSecretAccessKey = switch_channel_get_variable(channel, "AWS_SECRET_ACCESS_KEY"); const char* awsSecretAccessKey = switch_channel_get_variable(channel, "AWS_SECRET_ACCESS_KEY");
const char* awsSessionToken = switch_channel_get_variable(channel, "AWS_SESSION_TOKEN");
const char* awsRegion = switch_channel_get_variable(channel, "AWS_REGION"); const char* awsRegion = switch_channel_get_variable(channel, "AWS_REGION");
cb->channels = channels; cb->channels = channels;
LanguageCode code = LanguageCodeMapper::GetLanguageCodeForName(lang); LanguageCode code = LanguageCodeMapper::GetLanguageCodeForName(lang);
@@ -419,12 +421,12 @@ extern "C" {
strncpy(cb->sessionId, switch_core_session_get_uuid(session), MAX_SESSION_ID); strncpy(cb->sessionId, switch_core_session_get_uuid(session), MAX_SESSION_ID);
strncpy(cb->bugname, bugname, MAX_BUG_LEN); strncpy(cb->bugname, bugname, MAX_BUG_LEN);
if (awsAccessKeyId && awsSecretAccessKey && awsRegion) { if (awsRegion) strncpy(cb->region, awsRegion, MAX_REGION);
if (awsAccessKeyId && awsSecretAccessKey) {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Using channel vars for aws authentication\n"); switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Using channel vars for aws authentication\n");
strncpy(cb->awsAccessKeyId, awsAccessKeyId, 128); strncpy(cb->awsAccessKeyId, awsAccessKeyId, 128);
strncpy(cb->awsSecretAccessKey, awsSecretAccessKey, 128); strncpy(cb->awsSecretAccessKey, awsSecretAccessKey, 128);
strncpy(cb->region, awsRegion, MAX_REGION); if (awsSessionToken) strncpy(cb->awsSessionToken, awsSessionToken, 1024);
} }
else if (std::getenv("AWS_ACCESS_KEY_ID") && else if (std::getenv("AWS_ACCESS_KEY_ID") &&
std::getenv("AWS_SECRET_ACCESS_KEY") && std::getenv("AWS_SECRET_ACCESS_KEY") &&

1
mod_aws_transcribe/mod_aws_transcribe.h
View File

@@ -28,6 +28,7 @@ struct cap_cb {
char sessionId[MAX_SESSION_ID+1]; char sessionId[MAX_SESSION_ID+1];
char awsAccessKeyId[128]; char awsAccessKeyId[128];
char awsSecretAccessKey[128]; char awsSecretAccessKey[128];
char awsSessionToken[1024];
uint32_t channels; uint32_t channels;
SpeexResamplerState *resampler; SpeexResamplerState *resampler;
void* streamer; void* streamer;