avs-device-sdk/Authorization/CBLAuthDelegate/src/SQLiteCBLAuthDelegateStorag...

230 lines
7.2 KiB
C++
Raw Normal View History

Version 1.7.0 of the avs-device-sdk Changes in this update: **Enhancements** * `AuthDelegate` and `AuthServer.py` have been replaced by `CBLAUthDelegate`, which provides a more straightforward path to authorization. * Added a new configuration property called [`cblAuthDelegate`](https://github.com/alexa/avs-device-sdk/blob/master/Integration/AlexaClientSDKConfig.json#L2). This object specifies parameters for `CBLAuthDelegate`. * Added a new configuration property called [`miscDatabase`](https://github.com/alexa/avs-device-sdk/blob/master/Integration/AlexaClientSDKConfig.json#L34), which is a generic key/value database to be used by various components. * Added a new configuration property called [`dcfDelegate`](https://github.com/alexa/avs-device-sdk/blob/master/Integration/AlexaClientSDKConfig.json#L17) This object specifies parameters for `DCFDelegate`. Within this object, values were added for the 'endpoint' and `overridenDcfPublishMessageBody`. 'endpoint' is the endpoint to connect to in order to send device capabilities. `overridenDcfPublishMessageBody`is the message that will get sent out to the Capabilities API. Note: values within the `dcfDelegate` object will only work in `DEBUG` builds. * Added a new configuration property called [`deviceInfo`](https://github.com/alexa/avs-device-sdk/blob/master/Integration/AlexaClientSDKConfig.json#L9) which specifies device-identifying information for use by the Device Capability Framework (DCF), and for authorization (CBLAuthDelegate). * Updated the Directive Sequencer to support wildcard directive handlers. This allows a handler for a given AVS interface to register at the namespace level, rather than specifying the names of all directives within that namespace. * Updated the Raspberry Pi installation script to include `alsasink` in the configuration file. * Added `audioSink` as a configuration option. This allows users to override the audio sink element used in `Gstreamer`. * Added an interface for monitoring internet connection status: `InternetConnectionMonitorInterface.h`. * The Alexa Communications Library (ACL) is no longer required to wait until authorization has succeeded before attempting to connect to AVS. Instead, `HTTP2Transport` handles waiting for authorization to complete. * Added the Device Capabilities Framework (DCF) delegate. Device capabilities can now be sent for each capability interface using DCF publish messages. * The sample app has been updated to send DCF publish messages, which will automatically occur when the sample app starts. Note: a DCF publish message must be successfully sent in order for communication with AVS to occur. * The SDK now supports HTTP PUT messages. * Added support for opt-arg style arguments and multiple configuration files. Now, the sample app can be invoked by either of these commands: `SampleApp <configfile> <debuglevel>` OR `SampleApp -C file1 -C file2 ... -L loglevel`. **Bug Fixes** * Issues [447](https://github.com/alexa/avs-device-sdk/issues/447) and [553](https://github.com/alexa/avs-device-sdk/issues/553) Fixed the `AttachmentRenderSource`'s handling of `BLOCKING` `AttachmentReaders`. * Updated the `Logger` implementation to be more resilient to `nullptr` string inputs. * Fixed a `TimeUtils` utility-related compile issue. * Fixed a bug in which alerts failed to activate if the system was restarted without network connection. * Fixed Android 64-bit build failure issue. **Known Issues** * The `ACL` may encounter issues if audio attachments are received but not consumed. * `SpeechSynthesizerState` currently uses `GAINING_FOCUS` and `LOSING_FOCUS` as a workaround for handling intermediate state. These states may be removed in a future release. * Some ERROR messages may be printed during start-up event if initialization proceeds normally and successfully. * If an unrecoverable authorization error or an unrecoverable DCF error is encountered, the sample app may crash on shutdown. * If a non-CBL `clientId` is included in the `deviceInfo` section of `AlexaClientSDKConfig.json`, the error will be reported as an unrecoverable authorization error, rather than a more specific error.
2018-04-18 22:17:28 +00:00
/*
* Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
* A copy of the License is located at
*
* http://aws.amazon.com/apache2.0/
*
* or in the "license" file accompanying this file. This file is distributed
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
* express or implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
#include <SQLiteStorage/SQLiteStatement.h>
#include <SQLiteStorage/SQLiteUtils.h>
#include <AVSCommon/Utils/Configuration/ConfigurationNode.h>
#include <AVSCommon/Utils/File/FileUtils.h>
#include <AVSCommon/Utils/Logger/Logger.h>
#include <AVSCommon/Utils/String/StringUtils.h>
#include "CBLAuthDelegate/SQLiteCBLAuthDelegateStorage.h"
namespace alexaClientSDK {
namespace authorization {
namespace cblAuthDelegate {
using namespace avsCommon::utils::logger;
using namespace avsCommon::utils::string;
using namespace avsCommon::utils::file;
using namespace alexaClientSDK::storage::sqliteStorage;
/// String to identify log entries originating from this file.
static const std::string TAG("SQLiteCBLAuthDelegateStorage");
/**
* Create a LogEntry using this file's TAG and the specified event string.
*
* @param The event string for this @c LogEntry.
*/
#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
/// Name of @c ConfigurationNode for CBLAuthDelegate
static const std::string CONFIG_KEY_CBL_AUTH_DELEGATE = "cblAuthDelegate";
/// Name of @c databaseFilePath value in in CBLAuthDelegate's @c ConfigurationNode.
static const std::string CONFIG_KEY_DB_FILE_PATH_KEY = "databaseFilePath";
/// The name of the refreshToken table.
#define REFRESH_TOKEN_TABLE_NAME "refreshToken"
/// The name of the refreshToken column.
#define REFRESH_TOKEN_COLUMN_NAME "refreshToken"
/// String for creating the refreshToken table
static const std::string CREATE_REFRESH_TOKEN_TABLE_SQL_STRING =
"CREATE TABLE " REFRESH_TOKEN_COLUMN_NAME " (" REFRESH_TOKEN_COLUMN_NAME " TEXT);";
std::unique_ptr<SQLiteCBLAuthDelegateStorage> SQLiteCBLAuthDelegateStorage::create(
const avsCommon::utils::configuration::ConfigurationNode& configurationRoot) {
auto cblAuthDelegateConfigurationRoot = configurationRoot[CONFIG_KEY_CBL_AUTH_DELEGATE];
if (!cblAuthDelegateConfigurationRoot) {
ACSDK_ERROR(LX("createFailed").d("reason", "missingConfigurationValue").d("key", CONFIG_KEY_CBL_AUTH_DELEGATE));
return nullptr;
}
std::string databaseFilePath;
if (!cblAuthDelegateConfigurationRoot.getString(CONFIG_KEY_DB_FILE_PATH_KEY, &databaseFilePath) ||
databaseFilePath.empty()) {
ACSDK_ERROR(LX("createFailed").d("reason", "missingConfigurationValue").d("key", CONFIG_KEY_DB_FILE_PATH_KEY));
return nullptr;
}
return std::unique_ptr<SQLiteCBLAuthDelegateStorage>(new SQLiteCBLAuthDelegateStorage(databaseFilePath));
}
SQLiteCBLAuthDelegateStorage::~SQLiteCBLAuthDelegateStorage() {
ACSDK_DEBUG5(LX("~SQLiteCBLAuthDelegateStorage"));
close();
}
bool SQLiteCBLAuthDelegateStorage::createDatabase() {
ACSDK_DEBUG5(LX("createDatabase"));
std::lock_guard<std::mutex> lock(m_mutex);
if (!m_database.initialize()) {
ACSDK_ERROR(LX("createDatabaseFailed").d("reason", "SQLiteCreateDatabaseFailed"));
return false;
}
if (!m_database.performQuery(CREATE_REFRESH_TOKEN_TABLE_SQL_STRING)) {
ACSDK_ERROR(LX("createDatabaseFailed").d("reason", "failed to create refreshToken table"));
close();
return false;
}
return true;
}
bool SQLiteCBLAuthDelegateStorage::open() {
ACSDK_DEBUG5(LX("open"));
std::lock_guard<std::mutex> lock(m_mutex);
if (!m_database.open()) {
ACSDK_ERROR(LX("openFailed").d("reason", "openSQLiteDatabaseFailed"));
return false;
}
if (!m_database.tableExists(REFRESH_TOKEN_TABLE_NAME)) {
ACSDK_ERROR(LX("openFailed").d("reason", "missingTable").d("name", REFRESH_TOKEN_TABLE_NAME));
return false;
}
return true;
}
bool SQLiteCBLAuthDelegateStorage::setRefreshToken(const std::string& refreshToken) {
ACSDK_DEBUG5(LX("setRefreshToken"));
std::lock_guard<std::mutex> lock(m_mutex);
if (refreshToken.empty()) {
ACSDK_ERROR(LX("setRefreshTokenFailed").d("reason", "refreshTokenIsEmpty"));
return false;
}
if (!m_database.clearTable(REFRESH_TOKEN_TABLE_NAME)) {
ACSDK_ERROR(LX("setRefreshTokenFailed").d("reason", "clearTableFailed"));
return false;
}
std::string sqlString = "INSERT INTO " REFRESH_TOKEN_TABLE_NAME " (" REFRESH_TOKEN_COLUMN_NAME ") VALUES (?);";
auto statement = m_database.createStatement(sqlString);
if (!statement) {
ACSDK_ERROR(LX("setRefreshToken").d("reason", "createStatementFailed"));
return false;
}
if (!statement->bindStringParameter(1, refreshToken)) {
ACSDK_ERROR(LX("setRefreshToken").d("reason", "bindStringParameter"));
return false;
}
if (!statement->step()) {
ACSDK_ERROR(LX("setRefreshToken").d("reason", "stepFailed"));
return false;
}
return true;
}
bool SQLiteCBLAuthDelegateStorage::clearRefreshToken() {
ACSDK_DEBUG5(LX("clearRefreshToken"));
std::lock_guard<std::mutex> lock(m_mutex);
if (!m_database.clearTable(REFRESH_TOKEN_TABLE_NAME)) {
ACSDK_ERROR(LX("clearRefreshTokenFailed").d("reason", "clearTableFailed"));
return false;
}
return true;
}
bool SQLiteCBLAuthDelegateStorage::getRefreshToken(std::string* refreshToken) {
ACSDK_DEBUG5(LX("getRefreshToken"));
std::lock_guard<std::mutex> lock(m_mutex);
if (!refreshToken) {
ACSDK_ERROR(LX("getRefreshTokenFailed").d("reason", "nullRefreshToken"));
return false;
}
std::string sqlString = "SELECT * FROM " REFRESH_TOKEN_TABLE_NAME ";";
auto statement = m_database.createStatement(sqlString);
if (!statement) {
ACSDK_ERROR(LX("getRefreshTokenFailed").d("reason", "createStatementFailed"));
return false;
}
if (!statement->step()) {
ACSDK_ERROR(LX("getRefreshTokenFailed").d("reason", "stepFailed"));
return false;
}
if (statement->getStepResult() != SQLITE_ROW) {
ACSDK_DEBUG0(LX("getRefreshTokenFailed").d("reason", "stepResultWasNotRow"));
return false;
}
std::string columnName = statement->getColumnName(0);
if (columnName != REFRESH_TOKEN_COLUMN_NAME) {
ACSDK_ERROR(LX("getRefreshTokenFailed").d("reason", "unexpectedColumnName"));
return false;
}
auto text = statement->getColumnText(0);
*refreshToken = text;
return true;
}
bool SQLiteCBLAuthDelegateStorage::clear() {
ACSDK_DEBUG5(LX("clear"));
return clearRefreshToken();
}
void SQLiteCBLAuthDelegateStorage::close() {
ACSDK_DEBUG5(LX("close"));
std::lock_guard<std::mutex> lock(m_mutex);
m_database.close();
}
SQLiteCBLAuthDelegateStorage::SQLiteCBLAuthDelegateStorage(const std::string& databaseFilePath) :
m_database{databaseFilePath} {
}
} // namespace cblAuthDelegate
} // namespace authorization
} // namespace alexaClientSDK