Store encrypted passwords with connections.
Closes #22 as encrypted password is now deleted as part of the connection record.
This commit is contained in:
eelke
parent
e5ae9663c4
commit
d489f11e52
11 changed files with 252 additions and 695 deletions
|
|
@ -36,7 +36,7 @@ CREATE TABLE IF NOT EXISTS connection (
|
|||
sslkey TEXT NOT NULL,
|
||||
sslrootcert TEXT NOT NULL,
|
||||
sslcrl TEXT NOT NULL,
|
||||
passwordstate INTEGER NOT NULL
|
||||
password TEXT NOT NULL
|
||||
);)__";
|
||||
|
||||
|
||||
|
|
@ -44,7 +44,7 @@ CREATE TABLE IF NOT EXISTS connection (
|
|||
const char * const q_insert_or_replace_into_connection =
|
||||
R"__(INSERT OR REPLACE INTO connection
|
||||
VALUES (:uuid, :name, :conngroup_id, :host, :hostaddr, :port, :user, :dbname,
|
||||
:sslmode, :sslcert, :sslkey, :sslrootcert, :sslcrl, :passwordstate);
|
||||
:sslmode, :sslcert, :sslkey, :sslrootcert, :sslcrl, :password);
|
||||
)__" ;
|
||||
|
||||
std::tuple<bool, QSqlError> InitConnectionTables(QSqlDatabase &db)
|
||||
|
|
@ -80,7 +80,7 @@ R"__(INSERT OR REPLACE INTO connection
|
|||
q.bindValue(":sslkey", stdStrToQ(cc.sslKey()));
|
||||
q.bindValue(":sslrootcert", stdStrToQ(cc.sslRootCert()));
|
||||
q.bindValue(":sslcrl", stdStrToQ(cc.sslCrl()));
|
||||
q.bindValue(":passwordstate", static_cast<int>(cc.passwordState()));
|
||||
q.bindValue(":password", stdStrToQ(cc.encodedPassword()));
|
||||
|
||||
if (!q.exec()) {
|
||||
return q.lastError();
|
||||
|
|
@ -88,311 +88,8 @@ R"__(INSERT OR REPLACE INTO connection
|
|||
return {};
|
||||
}
|
||||
|
||||
/** Saves a connection configuration.
|
||||
|
||||
Before calling this you may want to call beginGroup.
|
||||
*/
|
||||
// void SaveConnectionConfig(QSettings &settings, const ConnectionConfig &cc)
|
||||
// {
|
||||
// settings.setValue("name", stdStrToQ(cc.name()));
|
||||
// settings.setValue("host", stdStrToQ(cc.host()));
|
||||
// settings.setValue("hostaddr", stdStrToQ(cc.hostAddr()));
|
||||
// settings.setValue("port", cc.port());
|
||||
// settings.setValue("user", stdStrToQ(cc.user()));
|
||||
// //settings.setValue("password", stdStrToQ(cc.password()));
|
||||
// settings.setValue("dbname", stdStrToQ(cc.dbname()));
|
||||
// settings.setValue("sslmode", static_cast<int>(cc.sslMode()));
|
||||
// settings.setValue("sslcert", stdStrToQ(cc.sslCert()));
|
||||
// settings.setValue("sslkey", stdStrToQ(cc.sslKey()));
|
||||
// settings.setValue("sslrootcert", stdStrToQ(cc.sslRootCert()));
|
||||
// settings.setValue("sslcrl", stdStrToQ(cc.sslCrl()));
|
||||
// settings.setValue("passwordState", static_cast<int>(cc.passwordState()));
|
||||
// }
|
||||
|
||||
|
||||
|
||||
// template <typename S, typename T>
|
||||
// bool in_range(T value)
|
||||
// {
|
||||
// return value >= std::numeric_limits<S>::min() && value <= std::numeric_limits<S>::max();
|
||||
// }
|
||||
|
||||
// void LoadConnectionConfig(QSettings &settings, ConnectionConfig &cc)
|
||||
// {
|
||||
// cc.setName(qvarToStdStr(settings.value("name")));
|
||||
// cc.setHost(qvarToStdStr(settings.value("host")));
|
||||
// cc.setHostAddr(qvarToStdStr(settings.value("hostaddr")));
|
||||
// int p = settings.value("port", 5432).toInt();
|
||||
// if (!in_range<uint16_t>(p)) {
|
||||
// p = 0; // let the user re-enter a valid value
|
||||
// }
|
||||
|
||||
// cc.setPort(static_cast<uint16_t>(p));
|
||||
// cc.setUser(qvarToStdStr(settings.value("user")));
|
||||
|
||||
// //cc.setPassword(qvarToStdStr(settings.value("password")));
|
||||
|
||||
// cc.setDbname(qvarToStdStr(settings.value("dbname")));
|
||||
// cc.setSslMode(static_cast<SslMode>(settings.value("sslmode").toInt()));
|
||||
// cc.setSslCert(qvarToStdStr(settings.value("sslcert")));
|
||||
// cc.setSslKey(qvarToStdStr(settings.value("sslkey")));
|
||||
// cc.setSslRootCert(qvarToStdStr(settings.value("sslrootcert")));
|
||||
// cc.setSslCrl(qvarToStdStr(settings.value("sslcrl")));
|
||||
|
||||
// PasswordState pwstate;
|
||||
// QVariant v = settings.value("passwordState");
|
||||
// if (v.isNull()) pwstate = PasswordState::NotStored;
|
||||
// else pwstate = static_cast<PasswordState>(v.toInt());
|
||||
// cc.setPasswordState(pwstate);
|
||||
// }
|
||||
|
||||
|
||||
} // end of unnamed namespace
|
||||
|
||||
|
||||
#if false
|
||||
ConnectionListModel::ConnectionListModel(QObject *parent)
|
||||
: QAbstractListModel(parent)
|
||||
{
|
||||
}
|
||||
|
||||
ConnectionListModel::~ConnectionListModel() = default;
|
||||
|
||||
int ConnectionListModel::rowCount(const QModelIndex &parent) const
|
||||
{
|
||||
int result = 0;
|
||||
if (parent == QModelIndex()) {
|
||||
result = m_connections.size();
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
int ConnectionListModel::columnCount(const QModelIndex &/*parent*/) const
|
||||
{
|
||||
return ColCount;
|
||||
}
|
||||
|
||||
QVariant ConnectionListModel::data(const QModelIndex &index, int role) const
|
||||
{
|
||||
QVariant result;
|
||||
if (role == Qt::DisplayRole || role == Qt::EditRole) {
|
||||
int row = index.row();
|
||||
int col = index.column();
|
||||
const ConnectionConfig& cfg = m_connections.at(row);
|
||||
switch (col) {
|
||||
case Description:
|
||||
result = makeLongDescription(cfg);
|
||||
break;
|
||||
case Name:
|
||||
result = stdStrToQ(cfg.name());
|
||||
break;
|
||||
case Host:
|
||||
result = stdStrToQ(cfg.host());
|
||||
break;
|
||||
case Port:
|
||||
result = cfg.port();
|
||||
break;
|
||||
case User:
|
||||
result = stdStrToQ(cfg.user());
|
||||
break;
|
||||
case Password:
|
||||
result = stdStrToQ(cfg.password());
|
||||
break;
|
||||
case DbName:
|
||||
result = stdStrToQ(cfg.dbname());
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
bool ConnectionListModel::setData(const QModelIndex &index, const QVariant &value, int role)
|
||||
{
|
||||
bool result = false;
|
||||
if (role == Qt::EditRole) {
|
||||
int row = index.row();
|
||||
int col = index.column();
|
||||
// auto& elem = m_connections.at(row);
|
||||
// elem.m_dirty = true;
|
||||
// ConnectionConfig& cfg = elem.m_config;
|
||||
ConnectionConfig& cfg = m_connections[row];
|
||||
if (col > 0) {
|
||||
result = true;
|
||||
}
|
||||
switch (col) {
|
||||
case Description:
|
||||
break;
|
||||
case Name:
|
||||
cfg.setName( qStrToStd(value.toString()) );
|
||||
break;
|
||||
case Host:
|
||||
cfg.setHost( qStrToStd(value.toString()) );
|
||||
break;
|
||||
case Port:
|
||||
cfg.setPort( value.toInt() );
|
||||
break;
|
||||
case User:
|
||||
cfg.setUser( qStrToStd(value.toString()) );
|
||||
break;
|
||||
case Password:
|
||||
cfg.setPassword( qStrToStd(value.toString()) );
|
||||
break;
|
||||
case DbName:
|
||||
cfg.setDbname( qStrToStd(value.toString()) );
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (result) {
|
||||
emit dataChanged(index, index);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
Qt::ItemFlags ConnectionListModel::flags(const QModelIndex &index) const
|
||||
{
|
||||
Qt::ItemFlags result;
|
||||
int row = index.row();
|
||||
if (row >= 0 && row < m_connections.size()) {
|
||||
result = Qt::ItemIsSelectable | Qt::ItemIsEnabled;
|
||||
if (index.column() != Description)
|
||||
result |= Qt::ItemIsEditable;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
QString ConnectionListModel::makeLongDescription(const ConnectionConfig &cfg)
|
||||
{
|
||||
std::string result(cfg.name());
|
||||
result += " (";
|
||||
result += cfg.user();
|
||||
result += "@";
|
||||
result += cfg.host();
|
||||
result += ":";
|
||||
result += std::to_string(cfg.port());
|
||||
result += "/";
|
||||
result += cfg.dbname();
|
||||
result += ")";
|
||||
return stdStrToQ(result);
|
||||
}
|
||||
|
||||
bool ConnectionListModel::removeRows(int row, int count, const QModelIndex &parent)
|
||||
{
|
||||
bool result = false;
|
||||
|
||||
if (row >= 0 && row < m_connections.size()) {
|
||||
|
||||
beginRemoveRows(parent, row, row + count -1);
|
||||
SCOPE_EXIT { endRemoveRows(); };
|
||||
|
||||
QString file_name = iniFileName();
|
||||
QSettings settings(file_name, QSettings::IniFormat);
|
||||
for (int idx = 0; idx < count; ++idx) {
|
||||
auto&& cc = m_connections[idx+row];
|
||||
settings.remove(cc.uuid().toString());
|
||||
}
|
||||
settings.sync();
|
||||
m_connections.remove(row, count);
|
||||
result = true;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
//void ConnectionListModel::newItem()
|
||||
//{
|
||||
//// int i = m_connections->createNew();
|
||||
//// auto idx = createIndex(i, 0);
|
||||
//// emit dataChanged(idx, idx);
|
||||
//}
|
||||
|
||||
Expected<ConnectionConfig> ConnectionListModel::get(int row)
|
||||
{
|
||||
if (row < m_connections.size()) {
|
||||
return m_connections.at(row);
|
||||
}
|
||||
return Expected<ConnectionConfig>::fromException(std::out_of_range("Invalid row"));
|
||||
}
|
||||
|
||||
void ConnectionListModel::load()
|
||||
{
|
||||
QString file_name = iniFileName();
|
||||
QSettings settings(file_name, QSettings::IniFormat);
|
||||
auto groups = settings.childGroups();
|
||||
for (auto&& grp : groups) {
|
||||
if (grp == "c_IniGroupSecurity") {
|
||||
// Read security settings
|
||||
|
||||
} else {
|
||||
QUuid uuid(grp);
|
||||
if ( ! uuid.isNull() ) {
|
||||
settings.beginGroup(grp);
|
||||
SCOPE_EXIT { settings.endGroup(); };
|
||||
|
||||
ConnectionConfig cc;
|
||||
cc.setUuid(uuid);
|
||||
LoadConnectionConfig(settings, cc);
|
||||
m_connections.push_back(cc);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void ConnectionListModel::save()
|
||||
{
|
||||
QString file_name = iniFileName();
|
||||
QSettings settings(file_name, QSettings::IniFormat);
|
||||
for (auto& e : m_connections) {
|
||||
settings.beginGroup(e.uuid().toString());
|
||||
SCOPE_EXIT { settings.endGroup(); };
|
||||
|
||||
SaveConnectionConfig(settings, e);
|
||||
e.clean();
|
||||
}
|
||||
settings.sync();
|
||||
}
|
||||
|
||||
void ConnectionListModel::save(int index)
|
||||
{
|
||||
auto& e = m_connections[index];
|
||||
if (e.dirty()) {
|
||||
QString file_name = iniFileName();
|
||||
QSettings settings(file_name, QSettings::IniFormat);
|
||||
settings.beginGroup(e.uuid().toString());
|
||||
SaveConnectionConfig(settings, e);
|
||||
e.clean();
|
||||
settings.sync();
|
||||
}
|
||||
}
|
||||
|
||||
void ConnectionListModel::save(const ConnectionConfig &cc)
|
||||
{
|
||||
auto find_res = std::find(m_connections.begin(), m_connections.end(), cc.uuid());
|
||||
int i;
|
||||
if (find_res == m_connections.end()) {
|
||||
m_connections.push_back(cc);
|
||||
i = m_connections.size() - 1;
|
||||
}
|
||||
else {
|
||||
*find_res = cc;
|
||||
i = find_res - m_connections.begin();
|
||||
}
|
||||
emit dataChanged(createIndex(i, 0), createIndex(i, ColCount-1));
|
||||
save(i);
|
||||
}
|
||||
|
||||
QString ConnectionListModel::iniFileName()
|
||||
{
|
||||
QString path = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
|
||||
QDir dir(path);
|
||||
if (!dir.exists()) {
|
||||
dir.mkpath(".");
|
||||
}
|
||||
path += "/connections.ini";
|
||||
return path;
|
||||
}
|
||||
#endif
|
||||
|
||||
ConnectionTreeModel::ConnectionTreeModel(QObject *parent, QSqlDatabase &db)
|
||||
: QAbstractItemModel(parent)
|
||||
, m_db(db)
|
||||
|
|
@ -422,7 +119,7 @@ void ConnectionTreeModel::load()
|
|||
|
||||
q.prepare("SELECT uuid, cname, conngroup_id, host, hostaddr, port, "
|
||||
" user, dbname, sslmode, sslcert, sslkey, sslrootcert, sslcrl, "
|
||||
" passwordstate "
|
||||
" password "
|
||||
"FROM connection ORDER BY conngroup_id, cname;");
|
||||
if (!q.exec()) {
|
||||
// auto err = q_create_table.lastError();
|
||||
|
|
@ -443,7 +140,7 @@ void ConnectionTreeModel::load()
|
|||
cc->setSslKey(qvarToStdStr(q.value(10)));
|
||||
cc->setSslRootCert(qvarToStdStr(q.value(11)));
|
||||
cc->setSslCrl(qvarToStdStr(q.value(12)));
|
||||
cc->setPasswordState(static_cast<PasswordState>(q.value(13).toInt()));
|
||||
cc->setEncodedPassword(qvarToStdStr(q.value(13)));
|
||||
|
||||
int group_id = q.value(2).toInt();
|
||||
auto find_res = std::find_if(m_groups.begin(), m_groups.end(),
|
||||
|
|
@ -455,27 +152,6 @@ void ConnectionTreeModel::load()
|
|||
throw std::runtime_error("conngroup missing");
|
||||
}
|
||||
}
|
||||
|
||||
// auto g1 = std::make_shared<ConnectionGroup>();
|
||||
// g1->name = "Testing";
|
||||
|
||||
// for (int i = 1; i < 3; ++i) {
|
||||
// auto cc = std::make_shared<ConnectionConfig>();
|
||||
// cc->setUuid(QUuid::createUuid());
|
||||
// cc->setName("testconn " + std::to_string(i));
|
||||
// g1->add(cc);
|
||||
// }
|
||||
|
||||
// auto g2 = std::make_shared<ConnectionGroup>();
|
||||
// g2->name = "Production";
|
||||
// for (int i = 1; i < 4; ++i) {
|
||||
// auto cc = std::make_shared<ConnectionConfig>();
|
||||
// cc->setUuid(QUuid::createUuid());
|
||||
// cc->setName("prodconn " + std::to_string(i));
|
||||
// g2->add(cc);
|
||||
// }
|
||||
|
||||
// m_groups = { g1, g2 };
|
||||
}
|
||||
|
||||
QVariant ConnectionTreeModel::data(const QModelIndex &index, int role) const
|
||||
|
|
@ -545,17 +221,6 @@ QModelIndex ConnectionTreeModel::index(int row, int column, const QModelIndex &p
|
|||
node = m_groups[row].get();
|
||||
}
|
||||
return createIndex(row, column, const_cast<ConnectionNode*>(node));
|
||||
|
||||
// void *p = nullptr;
|
||||
// if (parent.isValid()) {
|
||||
// auto cg = static_cast<ConnectionGroup *>(parent.internalPointer());
|
||||
// auto cc = &cg->connections().at(row);
|
||||
// p = const_cast<ConnectionConfig*>(cc);
|
||||
// }
|
||||
// else {
|
||||
// p = const_cast<ConnectionGroup*>(&m_groups.at(row));
|
||||
// }
|
||||
// return createIndex(row, column, p);
|
||||
}
|
||||
|
||||
QModelIndex ConnectionTreeModel::parent(const QModelIndex &index) const
|
||||
|
|
@ -582,12 +247,6 @@ int ConnectionTreeModel::rowCount(const QModelIndex &parent) const
|
|||
{
|
||||
int result = 0;
|
||||
if (parent.isValid()) {
|
||||
// if (parent.column() <= 0) {
|
||||
// result = m_groups[parent.row()].connections().size();
|
||||
// }
|
||||
// else {
|
||||
// result = 1;
|
||||
// }
|
||||
auto privdata = static_cast<ConnectionNode*>(parent.internalPointer());
|
||||
if (auto group = dynamic_cast<ConnectionGroup*>(privdata); group != nullptr) {
|
||||
result = group->connections().size();
|
||||
|
|
@ -767,6 +426,22 @@ int ConnectionTreeModel::findGroup(int conngroup_id) const
|
|||
return find_res - m_groups.begin();
|
||||
}
|
||||
|
||||
ConnectionConfig *ConnectionTreeModel::getConfigFromModelIndex(QModelIndex index)
|
||||
{
|
||||
if (!index.isValid())
|
||||
return nullptr;
|
||||
auto node = static_cast<ConnectionNode*>(index.internalPointer());
|
||||
return dynamic_cast<ConnectionConfig*>(node);
|
||||
}
|
||||
|
||||
ConnectionGroup *ConnectionTreeModel::getGroupFromModelIndex(QModelIndex index)
|
||||
{
|
||||
if (!index.isValid())
|
||||
return nullptr;
|
||||
auto node = static_cast<ConnectionNode*>(index.internalPointer());
|
||||
return dynamic_cast<ConnectionGroup*>(node);
|
||||
}
|
||||
|
||||
std::optional<QSqlError> ConnectionTreeModel::saveToDb(const ConnectionConfig &cc)
|
||||
{
|
||||
return SaveConnectionConfig(m_db, cc, cc.parent()->conngroup_id);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue