ETM-Schurig/powersync-core
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added async setup and fixed inline comments

Browse Source
This commit is contained in:
Simon Stürz 2014-10-22 13:06:05 +02:00 committed by Michael Zanetti
parent 0938509c09
commit 669ff65be8
5 changed files with 93 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
guh.pri
View File

@ -2,7 +2,7 @@
GUH_VERSION_STRING=$$system('dpkg-parsechangelog | sed -n -e "s/^Version: //p"') GUH_VERSION_STRING=$$system('dpkg-parsechangelog | sed -n -e "s/^Version: //p"')
DEFINES += GUH_VERSION_STRING=\\\"$${GUH_VERSION_STRING}\\\" DEFINES += GUH_VERSION_STRING=\\\"$${GUH_VERSION_STRING}\\\"
#QMAKE_CXXFLAGS += -Werror QMAKE_CXXFLAGS += -Werror
CONFIG += c++11 CONFIG += c++11
# Enable coverage option # Enable coverage option

84
plugins/deviceplugins/mailnotification/devicepluginmailnotification.cpp
View File

@ -247,22 +247,25 @@ DeviceManager::DeviceSetupStatus DevicePluginMailNotification::setupDevice(Devic
// Google mail // Google mail
if(device->deviceClassId() == googleMailDeviceClassId){ if(device->deviceClassId() == googleMailDeviceClassId){
device->setName("Google Mail (" + device->paramValue("user").toString() + ")"); device->setName("Google Mail (" + device->paramValue("user").toString() + ")");
SmtpClient *smtpClient = new SmtpClient("smtp.gmail.com", SmtpClient *smtpClient = new SmtpClient(this);
465, smtpClient->setHost("smtp.gmail.com");
device->paramValue("user").toString(), smtpClient->setPort(465);
device->paramValue("password").toString(), smtpClient->setUser(device->paramValue("user").toString());
SmtpClient::AuthLogin,
SmtpClient::EncryptionSSL, // TODO: use cryptography to save password not as plain text
this); smtpClient->setPassword(device->paramValue("password").toString());
smtpClient->setAuthMethod(SmtpClient::AuthMethodLogin);
smtpClient->setEncryptionType(SmtpClient::EncryptionTypeSSL);
smtpClient->setSender(device->paramValue("user").toString()); smtpClient->setSender(device->paramValue("user").toString());
smtpClient->setRecipiant(device->paramValue("recipient").toString()); smtpClient->setRecipient(device->paramValue("recipient").toString());
connect(smtpClient, &SmtpClient::testLoginFinished, this, &DevicePluginMailNotification::testLoginFinished);
connect(smtpClient, &SmtpClient::sendMailFinished, this, &DevicePluginMailNotification::sendMailFinished); connect(smtpClient, &SmtpClient::sendMailFinished, this, &DevicePluginMailNotification::sendMailFinished);
// TODO: test connection;
m_clients.insert(smtpClient,device); m_clients.insert(smtpClient,device);
return DeviceManager::DeviceSetupStatusSuccess;
//return DeviceManager::DeviceSetupStatusAsync; smtpClient->testLogin();
return DeviceManager::DeviceSetupStatusAsync;
} }
// Custom mail // Custom mail
if(device->deviceClassId() == customMailDeviceClassId){ if(device->deviceClassId() == customMailDeviceClassId){
@ -271,33 +274,38 @@ DeviceManager::DeviceSetupStatus DevicePluginMailNotification::setupDevice(Devic
smtpClient->setHost(device->paramValue("SMTP server").toString()); smtpClient->setHost(device->paramValue("SMTP server").toString());
smtpClient->setPort(device->paramValue("port").toInt()); smtpClient->setPort(device->paramValue("port").toInt());
smtpClient->setUser(device->paramValue("user").toString()); smtpClient->setUser(device->paramValue("user").toString());
// TODO: use cryptography to save password not as plain text
smtpClient->setPassword(device->paramValue("password").toString()); smtpClient->setPassword(device->paramValue("password").toString());
if(device->paramValue("authentification").toString() == "PLAIN"){ if(device->paramValue("authentification").toString() == "PLAIN"){
smtpClient->setAuthMethod(SmtpClient::AuthPlain); smtpClient->setAuthMethod(SmtpClient::AuthMethodPlain);
} }else if(device->paramValue("authentification").toString() == "LOGIN"){
if(device->paramValue("authentification").toString() == "LOGIN"){ smtpClient->setAuthMethod(SmtpClient::AuthMethodLogin);
smtpClient->setAuthMethod(SmtpClient::AuthLogin); }else{
return DeviceManager::DeviceSetupStatusFailure;
} }
if(device->paramValue("encryption").toString() == "NONE"){ if(device->paramValue("encryption").toString() == "NONE"){
smtpClient->setEncryptionType(SmtpClient::EncryptionNone); smtpClient->setEncryptionType(SmtpClient::EncryptionTypeNone);
} else if(device->paramValue("encryption").toString() == "SSL"){
smtpClient->setEncryptionType(SmtpClient::EncryptionTypeSSL);
}else if(device->paramValue("encryption").toString() == "TLS"){
smtpClient->setEncryptionType(SmtpClient::EncryptionTypeTLS);
}else{
return DeviceManager::DeviceSetupStatusFailure;
} }
if(device->paramValue("encryption").toString() == "SSL"){
smtpClient->setEncryptionType(SmtpClient::EncryptionSSL); smtpClient->setRecipient(device->paramValue("recipient").toString());
}
if(device->paramValue("encryption").toString() == "TLS"){
smtpClient->setEncryptionType(SmtpClient::EncryptionTLS);
}
smtpClient->setRecipiant(device->paramValue("recipient").toString());
smtpClient->setSender(device->paramValue("sender mail").toString()); smtpClient->setSender(device->paramValue("sender mail").toString());
connect(smtpClient, &SmtpClient::testLoginFinished, this, &DevicePluginMailNotification::testLoginFinished);
connect(smtpClient, &SmtpClient::sendMailFinished, this, &DevicePluginMailNotification::sendMailFinished); connect(smtpClient, &SmtpClient::sendMailFinished, this, &DevicePluginMailNotification::sendMailFinished);
// TODO: test connection;
m_clients.insert(smtpClient,device); m_clients.insert(smtpClient,device);
return DeviceManager::DeviceSetupStatusSuccess;
//return DeviceManager::DeviceSetupStatusAsync; smtpClient->testLogin();
return DeviceManager::DeviceSetupStatusAsync;
} }
return DeviceManager::DeviceSetupStatusFailure; return DeviceManager::DeviceSetupStatusFailure;
} }
@ -318,6 +326,26 @@ DeviceManager::DeviceError DevicePluginMailNotification::executeAction(Device *d
return DeviceManager::DeviceErrorActionTypeNotFound; return DeviceManager::DeviceErrorActionTypeNotFound;
} }
void DevicePluginMailNotification::deviceRemoved(Device *device)
{
SmtpClient *smtpClient = m_clients.key(device);
m_clients.remove(smtpClient);
delete smtpClient;
}
void DevicePluginMailNotification::testLoginFinished(const bool &success)
{
SmtpClient *smtpClient = static_cast<SmtpClient*>(sender());
Device *device = m_clients.value(smtpClient);
if(success){
emit deviceSetupFinished(device, DeviceManager::DeviceSetupStatusSuccess);
}else{
emit deviceSetupFinished(device, DeviceManager::DeviceSetupStatusFailure);
m_clients.remove(smtpClient);
delete smtpClient;
}
}
void DevicePluginMailNotification::sendMailFinished(const bool &success, const ActionId &actionId) void DevicePluginMailNotification::sendMailFinished(const bool &success, const ActionId &actionId)
{ {
if(success){ if(success){

4
plugins/deviceplugins/mailnotification/devicepluginmailnotification.h
View File

@ -42,11 +42,9 @@ private:
QHash <SmtpClient*, Device*> m_clients; QHash <SmtpClient*, Device*> m_clients;
private slots: private slots:
void testLoginFinished(const bool &success);
public slots:
void sendMailFinished(const bool &success, const ActionId &actionId); void sendMailFinished(const bool &success, const ActionId &actionId);
}; };
#endif // DEVICEPLUGINMAILNOTIFICATION_H #endif // DEVICEPLUGINMAILNOTIFICATION_H

91
plugins/deviceplugins/mailnotification/smtpclient.cpp
View File

@ -21,8 +21,9 @@
SmtpClient::SmtpClient(QObject *parent): SmtpClient::SmtpClient(QObject *parent):
QObject(parent) QObject(parent)
{ {
m_state = InitState;
m_socket = new QSslSocket(this); m_socket = new QSslSocket(this);
m_state = InitState;
m_testLogin = false;
connect(m_socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(socketError(QAbstractSocket::SocketError))); connect(m_socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(socketError(QAbstractSocket::SocketError)));
// error because QSslSocket has also a method called error...also QAbstractSocket or QTcpSocket don't work... // error because QSslSocket has also a method called error...also QAbstractSocket or QTcpSocket don't work...
@ -33,35 +34,16 @@ SmtpClient::SmtpClient(QObject *parent):
} }
SmtpClient::SmtpClient(QString host, int port, QString user, QString password, SmtpClient::AuthMethod authMethod, SmtpClient::EncryptionType encryptionType, QObject *parent):
m_host(host),
m_port(port),
m_user(user),
m_password(password),
m_authMethod(authMethod),
m_encryptionType(encryptionType),
QObject(parent)
{
m_state = InitState;
m_socket = new QSslSocket(this);
connect(m_socket,SIGNAL(error(QAbstractSocket::SocketError)),this,SLOT(socketError(QAbstractSocket::SocketError)));
connect(m_socket,SIGNAL(connected()),this,SLOT(connected()));
connect(m_socket,SIGNAL(readyRead()),this,SLOT(readData()));
connect(m_socket,SIGNAL(disconnected()),this,SLOT(disconnected()));
}
void SmtpClient::connectToHost() void SmtpClient::connectToHost()
{ {
switch (m_encryptionType) { switch (m_encryptionType) {
case EncryptionNone: case EncryptionTypeNone:
m_socket->connectToHost(m_host, m_port); m_socket->connectToHost(m_host, m_port);
break; break;
case EncryptionSSL: case EncryptionTypeSSL:
m_socket->connectToHostEncrypted(m_host, m_port); m_socket->connectToHostEncrypted(m_host, m_port);
break; break;
case EncryptionTLS: case EncryptionTypeTLS:
m_socket->connectToHost(m_host,m_port); m_socket->connectToHost(m_host,m_port);
break; break;
default: default:
@ -78,8 +60,10 @@ void SmtpClient::testLogin()
void SmtpClient::connected() void SmtpClient::connected()
{ {
// qDebug() << "connected to" << m_host; }
// qDebug() << "-----------------------";
void SmtpClient::disconnected()
{
} }
void SmtpClient::readData() void SmtpClient::readData()
@ -93,25 +77,19 @@ void SmtpClient::readData()
} }
responseLine.truncate( 3 ); responseLine.truncate( 3 );
// qDebug() << "---------------------------------------------";
// qDebug() << "Server code:" << responseLine;
// qDebug() << "---------------------------------------------";
// qDebug() << "Server data: " << response;
// qDebug() << "---------------------------------------------";
switch (m_state) { switch (m_state) {
case InitState: case InitState:
if(responseLine == "220"){ if(responseLine == "220"){
send("EHLO localhost"); send("EHLO localhost");
if(m_encryptionType == EncryptionNone){ if(m_encryptionType == EncryptionTypeNone){
m_state = AuthentificationState; m_state = AuthentificationState;
break; break;
} }
if(m_encryptionType == EncryptionSSL){ if(m_encryptionType == EncryptionTypeSSL){
m_state = HandShakeState; m_state = HandShakeState;
break; break;
} }
if(m_encryptionType == EncryptionTLS){ if(m_encryptionType == EncryptionTypeTLS){
m_state = StartTlsState; m_state = StartTlsState;
break; break;
} }
@ -119,14 +97,14 @@ void SmtpClient::readData()
break; break;
case HandShakeState: case HandShakeState:
if(responseLine == "250"){ if(responseLine == "250"){
if(!m_socket->isEncrypted() && m_encryptionType != EncryptionNone){ if(!m_socket->isEncrypted() && m_encryptionType != EncryptionTypeNone){
m_socket->startClientEncryption(); m_socket->startClientEncryption();
} }
send("EHLO localhost"); send("EHLO localhost");
m_state = AuthentificationState; m_state = AuthentificationState;
} }
if(responseLine == "220"){ if(responseLine == "220"){
if(!m_socket->isEncrypted() && m_encryptionType != EncryptionNone){ if(!m_socket->isEncrypted() && m_encryptionType != EncryptionTypeNone){
m_socket->startClientEncryption(); m_socket->startClientEncryption();
} }
send("EHLO localhost"); send("EHLO localhost");
@ -154,7 +132,7 @@ void SmtpClient::readData()
break; break;
case AuthentificationState: case AuthentificationState:
if(responseLine == "250"){ if(responseLine == "250"){
if(m_authMethod == AuthLogin){ if(m_authMethod == AuthMethodLogin){
send("AUTH LOGIN"); send("AUTH LOGIN");
m_state = UserState; m_state = UserState;
break; break;
@ -222,10 +200,7 @@ void SmtpClient::readData()
case QuitState: case QuitState:
if(responseLine == "250"){ if(responseLine == "250"){
emit sendMailFinished(true, m_actionId); emit sendMailFinished(true, m_actionId);
// qDebug() << "--------------------------------------------"; send("QUIT");
// qDebug() << " MAIL SENT!!!!";
// qDebug() << "--------------------------------------------";
logout();
m_state = CloseState; m_state = CloseState;
} }
break; break;
@ -233,34 +208,23 @@ void SmtpClient::readData()
if(responseLine == "221"){ if(responseLine == "221"){
m_socket->close(); m_socket->close();
} }
// some mail server does not recognize the QUIT command...so close the connection either way
m_socket->close(); m_socket->close();
break; break;
default: default:
//qDebug() << "ERROR: unexpected response from server: " << response; // unexpecterd response code received...
if(m_testLogin){
emit testLoginFinished(false);
m_testLogin = false;
m_socket->close();
break;
}
emit sendMailFinished(false, m_actionId); emit sendMailFinished(false, m_actionId);
m_socket->close();
break; break;
} }
} }
bool SmtpClient::sendMail(const QString &subject, const QString &body, const ActionId &actionId)
{
// qDebug() << "disconnected from" << m_host;
// qDebug() << "-----------------------";
}
void SmtpClient::login(const QString &user, const QString &password)
{
if(!m_socket->isOpen()){
connectToHost();
}
// qDebug() << "Try to login with: " << user << password;
}
void SmtpClient::logout()
{
send("QUIT");
}
bool SmtpClient::sendMail(const QString &subject, const QString &body, const ActionId &actionId) bool SmtpClient::sendMail(const QString &subject, const QString &body, const ActionId &actionId)
{ {
m_actionId = actionId; m_actionId = actionId;
@ -271,7 +235,7 @@ bool SmtpClient::sendMail(const QString &subject, const QString &body, const Act
m_message = "To: " + m_rcpt + "\n"; m_message = "To: " + m_rcpt + "\n";
m_message.append("From: " + m_sender + "\n"); m_message.append("From: " + m_sender + "\n");
m_message.append("Subject: " + subject + "\n"); m_message.append("Subject: [guh notification] | " + subject + "\n");
m_message.append(body); m_message.append(body);
m_message.replace( QString::fromLatin1( "\n" ), QString::fromLatin1( "\r\n" ) ); m_message.replace( QString::fromLatin1( "\n" ), QString::fromLatin1( "\r\n" ) );
m_message.replace( QString::fromLatin1( "\r\n.\r\n" ), QString::fromLatin1( "\r\n..\r\n" ) ); m_message.replace( QString::fromLatin1( "\r\n.\r\n" ), QString::fromLatin1( "\r\n..\r\n" ) );
@ -317,7 +281,7 @@ void SmtpClient::setSender(const QString &sender)
m_sender = sender; m_sender = sender;
} }
void SmtpClient::setRecipiant(const QString &rcpt) void SmtpClient::setRecipient(const QString &rcpt)
{ {
m_rcpt = rcpt; m_rcpt = rcpt;
} }
@ -329,7 +293,6 @@ void SmtpClient::socketError(QAbstractSocket::SocketError error)
void SmtpClient::send(const QString &data) void SmtpClient::send(const QString &data)
{ {
//qDebug() << "sending to host:" << data;
m_socket->write(data.toUtf8() + "\r\n"); m_socket->write(data.toUtf8() + "\r\n");
m_socket->flush(); m_socket->flush();
} }

15
plugins/deviceplugins/mailnotification/smtpclient.h
View File

@ -53,17 +53,15 @@ public:
}; };
enum EncryptionType{ enum EncryptionType{
EncryptionNone, // no encryption EncryptionTypeNone,
EncryptionSSL, // SSL EncryptionTypeSSL,
EncryptionTLS // STARTTLS EncryptionTypeTLS
}; };
explicit SmtpClient(QObject *parent = 0); explicit SmtpClient(QObject *parent = 0);
explicit SmtpClient(QString host = QString(), int port = 465, QString user = QString(), QString password = QString(), AuthMethod authMethod = AuthPlain, EncryptionType encryptionType = EncryptionNone, QObject *parent = 0);
void connectToHost(); void connectToHost();
void login(const QString &user, const QString &password); void testLogin();
void logout();
bool sendMail(const QString &subject, const QString &body, const ActionId &actionId); bool sendMail(const QString &subject, const QString &body, const ActionId &actionId);
void setHost(const QString &host); void setHost(const QString &host);
@ -73,7 +71,7 @@ public:
void setUser(const QString &user); void setUser(const QString &user);
void setPassword(const QString &password); void setPassword(const QString &password);
void setSender(const QString &sender); void setSender(const QString &sender);
void setRecipiant(const QString &rcpt); void setRecipient(const QString &rcpt);
private: private:
@ -92,8 +90,11 @@ private:
QString m_message; QString m_message;
ActionId m_actionId; ActionId m_actionId;
bool m_testLogin;
signals: signals:
void sendMailFinished(const bool &success, const ActionId &actionId); void sendMailFinished(const bool &success, const ActionId &actionId);
void testLoginFinished(const bool &success);
private slots: private slots:
void socketError(QAbstractSocket::SocketError error); void socketError(QAbstractSocket::SocketError error);