#include "sqlitestorage.h"
-#include <QCryptographicHash>
#include <QtSql>
#include "network.h"
}
UserId SqliteStorage::addUser(const QString &user, const QString &password) {
- QByteArray cryptopass = QCryptographicHash::hash(password.toUtf8(), QCryptographicHash::Sha1);
- cryptopass = cryptopass.toHex();
-
QSqlQuery query(logDb());
query.prepare(queryString("insert_quasseluser"));
query.bindValue(":username", user);
- query.bindValue(":password", cryptopass);
+ query.bindValue(":password", cryptedPassword(password));
query.exec();
if(query.lastError().isValid() && query.lastError().number() == 19) { // user already exists - sadly 19 seems to be the general constraint violation error...
return 0;
}
void SqliteStorage::updateUser(UserId user, const QString &password) {
- QByteArray cryptopass = QCryptographicHash::hash(password.toUtf8(), QCryptographicHash::Sha1);
- cryptopass = cryptopass.toHex();
-
QSqlQuery query(logDb());
query.prepare(queryString("update_userpassword"));
query.bindValue(":userid", user.toInt());
- query.bindValue(":password", cryptopass);
+ query.bindValue(":password", cryptedPassword(password));
query.exec();
}
}
UserId SqliteStorage::validateUser(const QString &user, const QString &password) {
- QByteArray cryptopass = QCryptographicHash::hash(password.toUtf8(), QCryptographicHash::Sha1);
- cryptopass = cryptopass.toHex();
-
QSqlQuery query(logDb());
query.prepare(queryString("select_authuser"));
query.bindValue(":username", user);
- query.bindValue(":password", cryptopass);
+ query.bindValue(":password", cryptedPassword(password));
query.exec();
if(query.first()) {
updateQuery.bindValue(":usecustomencoding", info.useCustomEncodings ? 1 : 0);
updateQuery.bindValue(":encodingcodec", QString(info.codecForEncoding));
updateQuery.bindValue(":decodingcodec", QString(info.codecForDecoding));
+ updateQuery.bindValue(":servercodec", QString(info.codecForServer));
updateQuery.bindValue(":userandomserver", info.useRandomServer ? 1 : 0);
updateQuery.bindValue(":perform", info.perform.join("\n"));
updateQuery.bindValue(":useautoidentify", info.useAutoIdentify ? 1 : 0);
updateQuery.bindValue(":useautoreconnect", info.useAutoReconnect ? 1 : 0);
updateQuery.bindValue(":autoreconnectinterval", info.autoReconnectInterval);
updateQuery.bindValue(":autoreconnectretries", info.autoReconnectRetries);
+ updateQuery.bindValue(":unlimitedconnectretries", info.unlimitedReconnectRetries ? 1 : 0);
updateQuery.bindValue(":rejoinchannels", info.rejoinChannels ? 1 : 0);
updateQuery.bindValue(":networkid", info.networkId.toInt());
updateQuery.exec();
net.networkId = networksQuery.value(0).toInt();
net.networkName = networksQuery.value(1).toString();
net.identity = networksQuery.value(2).toInt();
- net.useCustomEncodings = networksQuery.value(3).toInt() == 1 ? true : false;
+ net.codecForServer = networksQuery.value(3).toString().toAscii();
net.codecForEncoding = networksQuery.value(4).toString().toAscii();
net.codecForDecoding = networksQuery.value(5).toString().toAscii();
net.useRandomServer = networksQuery.value(6).toInt() == 1 ? true : false;
net.useAutoReconnect = networksQuery.value(11).toInt() == 1 ? true : false;
net.autoReconnectInterval = networksQuery.value(12).toUInt();
net.autoReconnectRetries = networksQuery.value(13).toInt();
- net.rejoinChannels = networksQuery.value(14).toInt() == 1 ? true : false;
+ net.unlimitedReconnectRetries = networksQuery.value(14).toInt() == 1 ? true : false;
+ net.rejoinChannels = networksQuery.value(15).toInt() == 1 ? true : false;
serversQuery.bindValue(":networkid", net.networkId.toInt());
serversQuery.exec();
return true;
}
+bool SqliteStorage::isValidBuffer(const UserId &user, const BufferId &bufferId) {
+ QSqlQuery query(logDb());
+ query.prepare(queryString("select_bufferExists"));
+ query.bindValue(":userid", user.toInt());
+ query.bindValue(":bufferid", bufferId.toInt());
+ query.exec();
+
+ watchQuery(&query);
+ if(!query.first())
+ return false;
+
+ Q_ASSERT(!query.next());
+ return true;
+}
+
NetworkId SqliteStorage::getNetworkId(UserId user, const QString &network) {
QSqlQuery query(logDb());
query.prepare("SELECT networkid FROM network "
return NetworkId();
}
-void SqliteStorage::createBuffer(UserId user, const NetworkId &networkId, const QString &buffer) {
+void SqliteStorage::createBuffer(UserId user, const NetworkId &networkId, BufferInfo::Type type, const QString &buffer) {
QSqlQuery *query = cachedQuery("insert_buffer");
query->bindValue(":userid", user.toInt());
query->bindValue(":networkid", networkId.toInt());
+ query->bindValue(":buffertype", (int)type);
query->bindValue(":buffername", buffer);
query->bindValue(":buffercname", buffer.toLower());
query->exec();
watchQuery(query);
}
-BufferInfo SqliteStorage::getBufferInfo(UserId user, const NetworkId &networkId, const QString &buffer) {
+BufferInfo SqliteStorage::getBufferInfo(UserId user, const NetworkId &networkId, BufferInfo::Type type, const QString &buffer) {
QSqlQuery *query = cachedQuery("select_bufferByName");
query->bindValue(":networkid", networkId.toInt());
query->bindValue(":userid", user.toInt());
query->exec();
if(!query->first()) {
- createBuffer(user, networkId, buffer);
+ createBuffer(user, networkId, type, buffer);
query->exec();
if(!query->first()) {
watchQuery(query);
}
}
- BufferInfo bufferInfo = BufferInfo(query->value(0).toInt(), networkId, 0, buffer);
+ BufferInfo bufferInfo = BufferInfo(query->value(0).toInt(), networkId, (BufferInfo::Type)query->value(1).toInt(), 0, buffer);
if(query->next()) {
qWarning() << "SqliteStorage::getBufferInfo(): received more then one Buffer!";
qWarning() << " Query:" << query->lastQuery();
return bufferInfo;
}
+BufferInfo SqliteStorage::getBufferInfo(UserId user, const BufferId &bufferId) {
+ QSqlQuery query(logDb());
+ query.prepare(queryString("select_buffer_by_id"));
+ query.bindValue(":userid", user.toInt());
+ query.bindValue(":bufferid", bufferId.toInt());
+ query.exec();
+ if(!watchQuery(&query))
+ return BufferInfo();
+
+ if(!query.first())
+ return BufferInfo();
+
+ BufferInfo bufferInfo(query.value(0).toInt(), query.value(1).toInt(), (BufferInfo::Type)query.value(2).toInt(), 0, query.value(4).toString());
+ Q_ASSERT(!query.next());
+
+ return bufferInfo;
+}
+
QList<BufferInfo> SqliteStorage::requestBuffers(UserId user, QDateTime since) {
uint time = 0;
if(since.isValid())
query.exec();
watchQuery(&query);
while(query.next()) {
- bufferlist << BufferInfo(query.value(0).toInt(), query.value(2).toInt(), 0, query.value(1).toString());
+ bufferlist << BufferInfo(query.value(0).toInt(), query.value(1).toInt(), (BufferInfo::Type)query.value(2).toInt(), query.value(3).toInt(), query.value(4).toString());
}
return bufferlist;
}
+bool SqliteStorage::removeBuffer(const UserId &user, const BufferId &bufferId) {
+ if(!isValidBuffer(user, bufferId))
+ return false;
+
+ QSqlQuery delBacklogQuery(logDb());
+ delBacklogQuery.prepare(queryString("delete_backlog_for_buffer"));
+ delBacklogQuery.bindValue(":bufferid", bufferId.toInt());
+ delBacklogQuery.exec();
+ if(!watchQuery(&delBacklogQuery))
+ return false;
+
+ QSqlQuery delBufferQuery(logDb());
+ delBufferQuery.prepare(queryString("delete_buffer_for_bufferid"));
+ delBufferQuery.bindValue(":bufferid", bufferId.toInt());
+ delBufferQuery.exec();
+ if(!watchQuery(&delBufferQuery))
+ return false;
+
+ return true;
+}
+
+BufferId SqliteStorage::renameBuffer(const UserId &user, const NetworkId &networkId, const QString &newName, const QString &oldName) {
+ // check if such a buffer exists...
+ QSqlQuery existsQuery(logDb());
+ existsQuery.prepare(queryString("select_bufferByName"));
+ existsQuery.bindValue(":networkid", networkId.toInt());
+ existsQuery.bindValue(":userid", user.toInt());
+ existsQuery.bindValue(":buffercname", oldName.toLower());
+ existsQuery.exec();
+ if(!watchQuery(&existsQuery))
+ return false;
+
+ if(!existsQuery.first())
+ return false;
+
+ const int bufferid = existsQuery.value(0).toInt();
+
+ Q_ASSERT(!existsQuery.next());
+
+ // ... and if the new name is still free.
+ existsQuery.bindValue(":networkid", networkId.toInt());
+ existsQuery.bindValue(":userid", user.toInt());
+ existsQuery.bindValue(":buffercname", newName.toLower());
+ existsQuery.exec();
+ if(!watchQuery(&existsQuery))
+ return false;
+
+ if(existsQuery.first())
+ return false;
+
+ QSqlQuery renameBufferQuery(logDb());
+ renameBufferQuery.prepare(queryString("update_buffer_name"));
+ renameBufferQuery.bindValue(":buffername", newName);
+ renameBufferQuery.bindValue(":buffercname", newName.toLower());
+ renameBufferQuery.bindValue(":bufferid", bufferid);
+ renameBufferQuery.exec();
+ if(watchQuery(&existsQuery))
+ return BufferId(bufferid);
+ else
+ return BufferId();
+}
+
+void SqliteStorage::setBufferLastSeen(UserId user, const BufferId &bufferId, const QDateTime &seenDate) {
+ QSqlQuery *query = cachedQuery("update_buffer_lastseen");
+ query->bindValue(":userid", user.toInt());
+ query->bindValue(":bufferid", bufferId.toInt());
+ query->bindValue(":lastseen", seenDate.toTime_t());
+ query->exec();
+ watchQuery(query);
+}
+
+QHash<BufferId, QDateTime> SqliteStorage::bufferLastSeenDates(UserId user) {
+ QHash<BufferId, QDateTime> lastSeenHash;
+ QSqlQuery query(logDb());
+ query.prepare(queryString("select_buffer_lastseen_dates"));
+ query.bindValue(":userid", user.toInt());
+ query.exec();
+ if(!watchQuery(&query))
+ return lastSeenHash;
+
+ while(query.next()) {
+ lastSeenHash[query.value(0).toInt()] = QDateTime::fromTime_t(query.value(1).toUInt());
+ }
+ return lastSeenHash;
+}
+
MsgId SqliteStorage::logMessage(Message msg) {
QSqlQuery *logMessageQuery = cachedQuery("insert_message");
logMessageQuery->bindValue(":time", msg.timestamp().toTime_t());
}
}
- QSqlQuery *getLastMessageIdQuery = cachedQuery("select_lastMessage");
- getLastMessageIdQuery->bindValue(":time", msg.timestamp().toTime_t());
- getLastMessageIdQuery->bindValue(":bufferid", msg.bufferInfo().bufferId().toInt());
- getLastMessageIdQuery->bindValue(":type", msg.type());
- getLastMessageIdQuery->bindValue(":sender", msg.sender());
- getLastMessageIdQuery->exec();
-
- if(getLastMessageIdQuery->first()) {
- return getLastMessageIdQuery->value(0).toInt();
- } else { // somethin went wrong... :(
- qDebug() << getLastMessageIdQuery->lastQuery() << "time/bufferid/type/sender:" << msg.timestamp().toTime_t() << msg.bufferInfo().bufferId() << msg.type() << msg.sender();
- Q_ASSERT(false);
- return 0;
- }
+ MsgId msgId = logMessageQuery->lastInsertId().toInt();
+ Q_ASSERT(msgId.isValid());
+ return msgId;
}
QList<Message> SqliteStorage::requestMsgs(BufferInfo buffer, int lastmsgs, int offset) {
return quasselDir + "quassel-storage.sqlite";
}
+
+// ONLY NEEDED FOR MIGRATION
+bool SqliteStorage::init(const QVariantMap &settings) {
+ if(!AbstractSqlStorage::init(settings))
+ return false;
+
+ QSqlQuery checkMigratedQuery(logDb());
+ checkMigratedQuery.prepare("SELECT DISTINCT typeOf(password) FROM quasseluser");
+ checkMigratedQuery.exec();
+ if(!watchQuery(&checkMigratedQuery))
+ return false;
+
+ if(!checkMigratedQuery.first())
+ return false;
+
+ QString passType = checkMigratedQuery.value(0).toString().toLower();
+ if(passType == "text")
+ return true; // allready migrated
+
+ Q_ASSERT(passType == "blob");
+
+ QSqlQuery getPasswordsQuery(logDb());
+ getPasswordsQuery.prepare("SELECT userid, password FROM quasseluser");
+ getPasswordsQuery.exec();
+
+ if(!watchQuery(&getPasswordsQuery)) {
+ qWarning() << "unable to migrate to new password format!";
+ return false;
+ }
+
+ QHash<int, QByteArray> passHash;
+ while(getPasswordsQuery.next()) {
+ passHash[getPasswordsQuery.value(0).toInt()] = getPasswordsQuery.value(1).toByteArray();
+ }
+
+ QSqlQuery setPasswordsQuery(logDb());
+ setPasswordsQuery.prepare("UPDATE quasseluser SET password = :password WHERE userid = :userid");
+ foreach(int userId, passHash.keys()) {
+ setPasswordsQuery.bindValue(":password", QString(passHash[userId]));
+ setPasswordsQuery.bindValue(":userid", userId);
+ setPasswordsQuery.exec();
+ watchQuery(&setPasswordsQuery);
+ }
+
+ qDebug() << "successfully migrated passwords!";
+ return true;
+}
projects / quassel.git / blobdiff