/
0009-Introduce-discovery-of-authentication-from-the-anoun.patch
1400 lines (1306 loc) · 63.5 KB
/
0009-Introduce-discovery-of-authentication-from-the-anoun.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
From 275994691f0f2c292437800d413dc4fd159f4a0c Mon Sep 17 00:00:00 2001
From: Pekka Vuorela <pekka.vuorela@jolla.com>
Date: Wed, 15 Aug 2018 11:26:49 +0300
Subject: [PATCH] Introduce discovery of authentication from the anounced
capabilities(IMAP/SMTP)
Squashed oneliner:
Default to IMAP LOGIN if server does not advertise any auth caps and LOGINDISABLED.
---
src/libraries/qmfclient/ssoauthplugin.h | 4 +-
src/libraries/qmfclient/ssosessionmanager.cpp | 12 +-
src/libraries/qmfclient/ssosessionmanager.h | 7 +-
.../qmfmessageserver/qmailauthenticator.cpp | 9 +-
.../qmfmessageserver/qmailauthenticator.h | 3 +-
.../imap/imapauthenticator.cpp | 135 ++++++++++++----
.../messageservices/imap/imapauthenticator.h | 5 +-
.../messageservices/imap/imapclient.cpp | 41 ++---
src/plugins/messageservices/imap/imapclient.h | 5 +-
.../messageservices/imap/imapprotocol.cpp | 20 +--
.../messageservices/imap/imapprotocol.h | 3 +-
.../messageservices/imap/imapservice.cpp | 35 ++--
.../messageservices/pop/popauthenticator.cpp | 48 +++---
.../messageservices/pop/popauthenticator.h | 5 +-
src/plugins/messageservices/pop/popclient.cpp | 13 +-
src/plugins/messageservices/pop/popclient.h | 4 +-
.../smtp/smtpauthenticator.cpp | 152 ++++++++++++------
.../messageservices/smtp/smtpauthenticator.h | 6 +-
.../messageservices/smtp/smtpclient.cpp | 28 ++--
src/plugins/messageservices/smtp/smtpclient.h | 4 +-
.../smtp/smtpconfiguration.cpp | 9 ++
.../messageservices/smtp/smtpconfiguration.h | 2 +
.../ssoauth/password/passwordplugin.cpp | 109 ++++++++-----
src/plugins/ssoauth/password/passwordplugin.h | 10 +-
24 files changed, 420 insertions(+), 249 deletions(-)
diff --git a/src/libraries/qmfclient/ssoauthplugin.h b/src/libraries/qmfclient/ssoauthplugin.h
index faf3713c..bbc59a76 100644
--- a/src/libraries/qmfclient/ssoauthplugin.h
+++ b/src/libraries/qmfclient/ssoauthplugin.h
@@ -57,8 +57,8 @@ public:
~SSOAuthService();
virtual QString key() const = 0;
- virtual QList<QByteArray> authentication(const SignOn::SessionData &sessionData,
- const QString &serviceType, const QString &userName, int serviceAuthentication) const = 0;
+ virtual QMap<QString, QList<QByteArray> > authentication(const SignOn::SessionData &sessionData,
+ const QString &serviceType, const QString &userName) const = 0;
virtual void credentialsNeedUpdate(int accountId) = 0;
virtual SignOn::SessionData sessionData(const QString &accountProvider, QVariantMap authParameters) const = 0;
virtual SSOAuthService *createService() = 0;
diff --git a/src/libraries/qmfclient/ssosessionmanager.cpp b/src/libraries/qmfclient/ssosessionmanager.cpp
index e988ed61..edb467d1 100644
--- a/src/libraries/qmfclient/ssosessionmanager.cpp
+++ b/src/libraries/qmfclient/ssosessionmanager.cpp
@@ -67,7 +67,7 @@
*/
/*!
- \fn ssoSessionResponse(const QList<QByteArray> &ssoLogin)
+ \fn ssoSessionResponse(const QMap<QString,QList<QByteArray> > &ssoLogin)
This signal is emitted when we receive a reply to a authentication
request from accounts-sso framework, the authentication details are
@@ -125,11 +125,9 @@ void SSOSessionManager::cancel()
\sa ssoSessionResponse(), ssoSessionError()
*/
-bool SSOSessionManager::createSsoIdentity(const QMailAccountId &id, const QString &serviceType,
- int serviceAuthentication)
+bool SSOSessionManager::createSsoIdentity(const QMailAccountId &id, const QString &serviceType)
{
deleteSsoIdentity();
- _serviceAuthentication = serviceAuthentication;
_serviceType = serviceType;
_accountId = id.toULongLong();
@@ -231,7 +229,6 @@ void SSOSessionManager::credentialsNeedUpdate()
*/
void SSOSessionManager::deleteSsoIdentity()
{
- _ssoLogin = QByteArray();
_authMethod.clear();
_serviceType.clear();
if (_identity) {
@@ -344,7 +341,6 @@ void SSOSessionManager::ssoSessionError(const SignOn::Error &code)
if (_waitForSso) {
_waitForSso = false;
- _ssoLogin = QByteArray();
emit ssoSessionError(QString("SSO error %1: %2").arg(code.type()).arg(code.message()));
}
}
@@ -376,8 +372,8 @@ void SSOSessionManager::reAuthenticate()
void SSOSessionManager::sessionResponse(const SignOn::SessionData &sessionData)
{
- QList<QByteArray> ssoLogin = _authService->authentication(sessionData, _serviceType,
- _authUsername, _serviceAuthentication);
+ QMap<QString,QList<QByteArray> > ssoLogin = _authService->authentication(sessionData, _serviceType,
+ _authUsername);
emit ssoSessionResponse(ssoLogin);
}
diff --git a/src/libraries/qmfclient/ssosessionmanager.h b/src/libraries/qmfclient/ssosessionmanager.h
index eaecf916..61806ba4 100644
--- a/src/libraries/qmfclient/ssosessionmanager.h
+++ b/src/libraries/qmfclient/ssosessionmanager.h
@@ -63,8 +63,7 @@ public:
~SSOSessionManager();
void cancel();
- bool createSsoIdentity(const QMailAccountId &id,
- const QString &serviceType, int serviceAuthentication);
+ bool createSsoIdentity(const QMailAccountId &id, const QString &serviceType);
bool checkingCredentials() const;
void credentialsNeedUpdate();
void deleteSsoIdentity();
@@ -73,7 +72,7 @@ public:
bool waitForSso();
signals:
- void ssoSessionResponse(const QList<QByteArray> &ssoLogin);
+ void ssoSessionResponse(const QMap<QString,QList<QByteArray> > &ssoLogin);
void ssoSessionError(const QString &error);
protected slots:
@@ -90,13 +89,11 @@ private:
void forceTokenRefresh();
void sessionResponse(const SignOn::SessionData &sessionData);
- int _serviceAuthentication;
int _accountId;
bool _waitForSso;
bool _recreatingSession;
bool _reAuthenticate;
bool _credentialsCheck;
- QByteArray _ssoLogin;
QString _authMethod;
QString _authMechanism;
QString _authUsername;
diff --git a/src/libraries/qmfmessageserver/qmailauthenticator.cpp b/src/libraries/qmfmessageserver/qmailauthenticator.cpp
index 92a12e70..373bcf21 100644
--- a/src/libraries/qmfmessageserver/qmailauthenticator.cpp
+++ b/src/libraries/qmfmessageserver/qmailauthenticator.cpp
@@ -32,7 +32,6 @@
****************************************************************************/
#include "qmailauthenticator.h"
-#include "qmailnamespace.h"
#include <qmailserviceconfiguration.h>
#include <qcryptographichash.h>
#include <qbytearray.h>
@@ -131,14 +130,14 @@ QByteArray QMailAuthenticator::getAuthentication(const QMailAccountConfiguration
transmission.
*/
#ifdef USE_ACCOUNTS_QT
-QByteArray QMailAuthenticator::getResponse(const QMailAccountConfiguration::ServiceConfiguration &svcCfg, const QByteArray &challenge, QString password)
+QByteArray QMailAuthenticator::getResponse(const QMailAccountConfiguration::ServiceConfiguration &svcCfg, const QByteArray &challenge,
+ const QMail::SaslMechanism authType, const QString password)
{
QMailServiceConfiguration configuration(svcCfg);
- if (!configuration.value("smtpusername").isEmpty()
- && (configuration.value("authentication") == QString::number(QMail::CramMd5Mechanism))) {
+ if (!configuration.value("smtpusername").isEmpty() && authType == QMail::CramMd5Mechanism) {
// SMTP server CRAM-MD5 authentication
return cramMd5Response(challenge, configuration.value("smtpusername").toUtf8(), password.toUtf8());
- } else if (configuration.value("authentication") == QString::number(QMail::CramMd5Mechanism)) {
+ } else if (authType == QMail::CramMd5Mechanism) {
// IMAP/POP server CRAM-MD5 authentication
return cramMd5Response(challenge, configuration.value("username").toUtf8(), password.toUtf8());
}
diff --git a/src/libraries/qmfmessageserver/qmailauthenticator.h b/src/libraries/qmfmessageserver/qmailauthenticator.h
index a9f2d214..3891139d 100644
--- a/src/libraries/qmfmessageserver/qmailauthenticator.h
+++ b/src/libraries/qmfmessageserver/qmailauthenticator.h
@@ -35,6 +35,7 @@
#define QMAILAUTHENTICATOR_H
#include <qmailaccountconfiguration.h>
+#include "qmailnamespace.h"
#include <QByteArray>
#include <QStringList>
@@ -45,7 +46,7 @@ public:
static bool useEncryption(const QMailAccountConfiguration::ServiceConfiguration &svcCfg, const QStringList &capabilities);
static QByteArray getAuthentication(const QMailAccountConfiguration::ServiceConfiguration &svcCfg, const QStringList &capabilities);
#ifdef USE_ACCOUNTS_QT
- static QByteArray getResponse(const QMailAccountConfiguration::ServiceConfiguration &svcCfg, const QByteArray &challenge, QString password);
+ static QByteArray getResponse(const QMailAccountConfiguration::ServiceConfiguration &svcCfg, const QByteArray &challenge, const QMail::SaslMechanism authType, const QString password);
#else
static QByteArray getResponse(const QMailAccountConfiguration::ServiceConfiguration &svcCfg, const QByteArray &challenge);
#endif
diff --git a/src/plugins/messageservices/imap/imapauthenticator.cpp b/src/plugins/messageservices/imap/imapauthenticator.cpp
index 941801dd..38dd4d9f 100644
--- a/src/plugins/messageservices/imap/imapauthenticator.cpp
+++ b/src/plugins/messageservices/imap/imapauthenticator.cpp
@@ -40,11 +40,16 @@
#include <qmailtransport.h>
#include <qmailnamespace.h>
#include <qmaillog.h>
+#include <qmailstore.h>
namespace {
QMap<QMailAccountId, QList<QByteArray> > gResponses;
+#ifdef USE_ACCOUNTS_QT
+QString authPassword;
+QMail::SaslMechanism responseAuthType;
+#endif
}
bool ImapAuthenticator::useEncryption(const QMailAccountConfiguration::ServiceConfiguration &svcCfg, const QStringList &capabilities)
@@ -71,42 +76,112 @@ bool ImapAuthenticator::useEncryption(const QMailAccountConfiguration::ServiceCo
#endif
}
#ifdef USE_ACCOUNTS_QT
-QByteArray ImapAuthenticator::getAuthentication(const QMailAccountConfiguration::ServiceConfiguration &svcCfg, const QStringList &capabilities, const QByteArray &ssoLogin)
+// Returns authentication type from more secure to less secure supported
+static QMail::SaslMechanism authFromCapabilities(const QStringList &capabilities, const QMap<QString, QList<QByteArray> > &ssoLogin)
{
- QString _password;
- QByteArray result(QMailAuthenticator::getAuthentication(svcCfg, capabilities));
- if (!result.isEmpty())
- return QByteArray("AUTHENTICATE ") + result;
-
- // If not handled by the authenticator, fall back to login
- ImapConfiguration imapCfg(svcCfg);
- if (ssoLogin.isEmpty()) {
- _password = imapCfg.mailPassword();
- qMailLog(IMAP) << Q_FUNC_INFO << "SSO identity is not found for account id: "<< imapCfg.id()
- << ", using password from accounts configuration";
- } else {
- return ssoLogin;
+ QStringList authCaps;
+ foreach (QString const& capability, capabilities) {
+ if (capability.startsWith("AUTH=", Qt::CaseInsensitive)) {
+ authCaps.append(capability.mid(5));
+ }
}
- if (imapCfg.mailAuthentication() == QMail::PlainMechanism) {
- QByteArray username(imapCfg.mailUserName().toLatin1());
- QByteArray pass(_password.toLatin1());
- return QByteArray("AUTHENTICATE PLAIN ") + QByteArray(username + '\0' + username + '\0' + pass).toBase64();
+ qMailLog(IMAP) << "Auths found: " << authCaps;
+
+ if (authCaps.contains("CRAM-MD5", Qt::CaseInsensitive) && ssoLogin.contains("CRAM-MD5")) {
+ qMailLog(IMAP) << "Returning auth CRAM-MD5";
+ return QMail::CramMd5Mechanism;
+ } else if (!authCaps.contains("PLAIN", Qt::CaseInsensitive)
+ && !capabilities.contains("LOGINDISABLED", Qt::CaseInsensitive) && ssoLogin.contains("LOGIN")) {
+ qMailLog(IMAP) << "Returning auth LOGIN";
+ // According to RFC3501, LOGIN should be used as last resort(for retro-compatibility)
+ // We should check that plain is not advertised(this can be omitted even if server supports it),
+ // and that LOGINDISABLED capability is not advertised.
+ return QMail::LoginMechanism;
+ } else if (ssoLogin.contains("PLAIN")) {
+ qMailLog(IMAP) << "Returning auth PLAIN";
+ // According to RFC3501, IMAP4 servers MUST implement plain auth
+ return QMail::PlainMechanism;
+ } else {
+ // return empty auth in order to send empty reply and make auth process fail
+ qMailLog(IMAP) << "Returning auth NONE";
+ return QMail::NoMechanism;
}
-
- return QByteArray("LOGIN") + ' ' + ImapProtocol::quoteString(imapCfg.mailUserName().toLatin1())
- + ' ' + ImapProtocol::quoteString(_password.toLatin1());
}
-QByteArray ImapAuthenticator::getResponse(const QMailAccountConfiguration::ServiceConfiguration &svcCfg, const QByteArray &challenge, const QByteArray &ssoLogin)
+
+QByteArray ImapAuthenticator::getAuthentication(const QMailAccountConfiguration::ServiceConfiguration &svcCfg, const QStringList &capabilities, const QMap<QString, QList<QByteArray> > &ssoLogin)
{
- if (ssoLogin.size()) {
- return QMailAuthenticator::getResponse(svcCfg, challenge, QString::fromLatin1(ssoLogin.constData()));
- } else {
- return QByteArray();
+ QByteArray result;
+ ImapConfiguration imapCfg(svcCfg);
+ QMailAccountId id(imapCfg.id());
+ QMail::SaslMechanism authType = static_cast<QMail::SaslMechanism>(imapCfg.mailAuthentication());
+
+ // if we don't have auth yet, try to get it from the capabilities
+ if (ssoLogin.size() > 1 && authType == QMail::NoMechanism) {
+ qMailLog(IMAP) << "Discovering authentication from capabilities for account id:" << id;
+ QMail::SaslMechanism discoveredAuth = authFromCapabilities(capabilities, ssoLogin);
+ authType = discoveredAuth;
+ if (authType != QMail::NoMechanism) {
+ QMailAccount account(id);
+ QMailAccountConfiguration accountConfig(id);
+ QMailAccountConfiguration::ServiceConfiguration serviceConf(accountConfig.serviceConfiguration("imap4"));
+ serviceConf.setValue("authentication",QString::number(authType));
+ if (!QMailStore::instance()->updateAccount(&account, &accountConfig)) {
+ qWarning() << "Unable to update account" << account.id() << "to auth type!!!!";
+ }
+ }
}
-}
+ if (authType != QMail::NoMechanism) {
+ if (!ssoLogin.isEmpty()) {
+ QList<QByteArray> auth;
+
+ if (ssoLogin.size() == 1) {
+ QList<QString> keys = ssoLogin.keys();
+ auth = ssoLogin.value(keys.at(0));
+ result = auth.takeFirst();
+ if (auth.size()) {
+ // None of the current supported auths uses this
+ gResponses[id] = auth;
+ }
+ qMailLog(IMAP) << "Using authentication method " << keys.at(0)
+ << " for account id:" << id;
+ } else {
+ if (authType == QMail::CramMd5Mechanism) {
+ auth = ssoLogin.value("CRAM-MD5");
+ if (!auth.empty()) {
+ result = auth.takeFirst();
+ authPassword = QString::fromLatin1(auth.takeFirst());
+ responseAuthType = QMail::CramMd5Mechanism;
+ } else {
+ qMailLog(IMAP) << "Failed to get authentication for method CRAM-MD5 in account id:" << id;
+ }
+ } else if (authType == QMail::PlainMechanism) {
+ auth = ssoLogin.value("PLAIN");
+ if (!auth.empty()) {
+ result = auth.takeFirst();
+ gResponses[id] = auth;
+ } else {
+ qMailLog(IMAP) << "Failed to get authentication for method PLAIN in account id:" << id;
+ }
+ } else if (authType == QMail::LoginMechanism) {
+ auth = ssoLogin.value("LOGIN");
+ if (!auth.empty()) {
+ result = auth.takeFirst();
+ gResponses[id] = auth;
+ } else {
+ qMailLog(IMAP) << "Failed to get authentication for method LOGIN in account id:" << id;
+ }
+ }
+ }
+ } else {
+ qMailLog(IMAP) << Q_FUNC_INFO << "SSO identity is not found for account id: "<< id
+ << ", returning empty authentication";
+ }
+ }
+ return result;
+}
#else
QByteArray ImapAuthenticator::getAuthentication(const QMailAccountConfiguration::ServiceConfiguration &svcCfg, const QStringList &capabilities)
{
@@ -125,10 +200,14 @@ QByteArray ImapAuthenticator::getAuthentication(const QMailAccountConfiguration:
return QByteArray("LOGIN") + ' ' + ImapProtocol::quoteString(imapCfg.mailUserName().toLatin1())
+ ' ' + ImapProtocol::quoteString(imapCfg.mailPassword().toLatin1());
}
+#endif
QByteArray ImapAuthenticator::getResponse(const QMailAccountConfiguration::ServiceConfiguration &svcCfg, const QByteArray &challenge)
{
+#ifdef USE_ACCOUNTS_QT
+ return QMailAuthenticator::getResponse(svcCfg, challenge, responseAuthType, authPassword);
+#else
return QMailAuthenticator::getResponse(svcCfg, challenge);
-}
#endif
+}
diff --git a/src/plugins/messageservices/imap/imapauthenticator.h b/src/plugins/messageservices/imap/imapauthenticator.h
index 879629ff..02b3d67c 100644
--- a/src/plugins/messageservices/imap/imapauthenticator.h
+++ b/src/plugins/messageservices/imap/imapauthenticator.h
@@ -44,12 +44,11 @@ class ImapAuthenticator
public:
static bool useEncryption(const QMailAccountConfiguration::ServiceConfiguration &svcCfg, const QStringList &capabilities);
#ifdef USE_ACCOUNTS_QT
- static QByteArray getAuthentication(const QMailAccountConfiguration::ServiceConfiguration &svcCfg, const QStringList &capabilities, const QByteArray &ssoLogin);
- static QByteArray getResponse(const QMailAccountConfiguration::ServiceConfiguration &svcCfg, const QByteArray &challenge, const QByteArray &ssoLogin);
+ static QByteArray getAuthentication(const QMailAccountConfiguration::ServiceConfiguration &svcCfg, const QStringList &capabilities, const QMap<QString, QList<QByteArray> > &ssoLogin);
#else
static QByteArray getAuthentication(const QMailAccountConfiguration::ServiceConfiguration &svcCfg, const QStringList &capabilities);
- static QByteArray getResponse(const QMailAccountConfiguration::ServiceConfiguration &svcCfg, const QByteArray &challenge);
#endif
+ static QByteArray getResponse(const QMailAccountConfiguration::ServiceConfiguration &svcCfg, const QByteArray &challenge);
};
diff --git a/src/plugins/messageservices/imap/imapclient.cpp b/src/plugins/messageservices/imap/imapclient.cpp
index f5028aa3..949c254c 100644
--- a/src/plugins/messageservices/imap/imapclient.cpp
+++ b/src/plugins/messageservices/imap/imapclient.cpp
@@ -183,7 +183,7 @@ class IdleProtocol : public ImapProtocol {
public:
#ifdef USE_ACCOUNTS_QT
- IdleProtocol(ImapClient *client, const QMailFolder &folder, const bool ssoAccount, QByteArray &ssoLogin);
+ IdleProtocol(ImapClient *client, const QMailFolder &folder, const bool ssoAccount, QMap<QString, QList<QByteArray> > &ssoLogin);
#else
IdleProtocol(ImapClient *client, const QMailFolder &folder);
#endif
@@ -222,12 +222,12 @@ private:
int _idleRetryDelay; // Try to restablish IDLE state
enum IdleRetryDelay { InitialIdleRetryDelay = 30 }; //seconds
bool _ssoAccount;
- QByteArray &_ssoLogin;
+ QMap<QString, QList<QByteArray> > _ssoLogin;
#endif
};
#ifdef USE_ACCOUNTS_QT
-IdleProtocol::IdleProtocol(ImapClient *client, const QMailFolder &folder, const bool ssoAccount, QByteArray &ssoLogin)
+IdleProtocol::IdleProtocol(ImapClient *client, const QMailFolder &folder, const bool ssoAccount, QMap<QString, QList<QByteArray> > &ssoLogin)
: _idleRetryDelay(InitialIdleRetryDelay),
_ssoAccount(ssoAccount),
_ssoLogin(ssoLogin)
@@ -335,7 +335,7 @@ void IdleProtocol::idleCommandTransition(const ImapCommand command, const Operat
if (_ssoAccount)
sendLogin(config, _ssoLogin);
else
- sendLogin(config, "");
+ sendLogin(config, QMap<QString, QList<QByteArray> >());
#else
// We are now connected
sendLogin(config);
@@ -348,7 +348,7 @@ void IdleProtocol::idleCommandTransition(const ImapCommand command, const Operat
if (_ssoAccount)
sendLogin(config, _ssoLogin);
else
- sendLogin(config, "");
+ sendLogin(config, QMap<QString, QList<QByteArray> >());
#else
sendLogin(config);
#endif
@@ -723,7 +723,7 @@ void ImapClient::commandTransition(ImapCommand command, OperationStatus status)
_sendLogin = true;
ssoProcessLogin();
} else
- _protocol.sendLogin(_config, "");
+ _protocol.sendLogin(_config, QMap<QString, QList<QByteArray> >());
#else
_protocol.sendLogin(_config);
#endif
@@ -739,7 +739,7 @@ void ImapClient::commandTransition(ImapCommand command, OperationStatus status)
_sendLogin = true;
ssoProcessLogin();
} else
- _protocol.sendLogin(_config, "");
+ _protocol.sendLogin(_config, QMap<QString, QList<QByteArray> >());
#else
_protocol.sendLogin(_config);
#endif
@@ -1588,11 +1588,10 @@ void ImapClient::setAccount(const QMailAccountId &id)
#ifdef USE_ACCOUNTS_QT
if (!_ssoSessionManager) {
- ImapConfiguration imapCfg(_config);
_ssoSessionManager = new SSOSessionManager(this);
- if (_ssoSessionManager->createSsoIdentity(id, "imap4", imapCfg.mailAuthentication())) {
- ENFORCE(connect(_ssoSessionManager, SIGNAL(ssoSessionResponse(QList<QByteArray>))
- ,this, SLOT(onSsoSessionResponse(QList<QByteArray>))));
+ if (_ssoSessionManager->createSsoIdentity(id, "imap4")) {
+ ENFORCE(connect(_ssoSessionManager, SIGNAL(ssoSessionResponse(QMap<QString,QList<QByteArray> >))
+ ,this, SLOT(onSsoSessionResponse(QMap<QString,QList<QByteArray> >))));
ENFORCE(connect(_ssoSessionManager, SIGNAL(ssoSessionError(QString))
,this, SLOT(onSsoSessionError(QString))));
qMailLog(IMAP) << Q_FUNC_INFO << "SSO identity is found for account id: "<< id;
@@ -1770,6 +1769,15 @@ void ImapClient::updateFolderCountStatus(QMailFolder *folder)
folder->setStatus(QMailFolder::PartialContent, (count < folder->serverCount()));
}
+bool ImapClient::loggingIn() const
+{
+ if (_protocol.inUse()) {
+ return _protocol.loggingIn();
+ } else {
+ return false;
+ }
+}
+
bool ImapClient::idlesEstablished()
{
ImapConfiguration imapCfg(_config);
@@ -1943,15 +1951,11 @@ void ImapClient::ssoCredentialsNeedUpdate()
}
}
-void ImapClient::onSsoSessionResponse(const QList<QByteArray> &ssoLogin)
+void ImapClient::onSsoSessionResponse(const QMap<QString,QList<QByteArray> > &ssoLogin)
{
qMailLog(IMAP) << "Got SSO response";
if (!ssoLogin.isEmpty()) {
- if (_ssoLogin != ssoLogin[0]) {
- _ssoLogin = ssoLogin[0];
- } else {
- _ssoLogin = ssoLogin[0];
- }
+ _ssoLogin = ssoLogin;
}
if (_loginFailed) {
@@ -1976,8 +1980,7 @@ void ImapClient::onSsoSessionError(const QString &error)
void ImapClient::onAccountsUpdated(const QMailAccountIdList &list)
{
- if (list.contains(_config.id())) {
-
+ if (list.contains(_config.id()) && !loggingIn()) {
ImapConfiguration imapCfg1(_config);
// copying here as the data is shared
QMailAccountConfiguration config = QMailAccountConfiguration(_config.id());
diff --git a/src/plugins/messageservices/imap/imapclient.h b/src/plugins/messageservices/imap/imapclient.h
index b4dc7b32..bd4b320f 100644
--- a/src/plugins/messageservices/imap/imapclient.h
+++ b/src/plugins/messageservices/imap/imapclient.h
@@ -92,6 +92,7 @@ public:
QMailMessageKey trashKey(const QMailFolderId &folderId) const;
QStringList deletedMessages(const QMailFolderId &folderId) const;
+ bool loggingIn() const;
bool idlesEstablished();
void idling(const QMailFolderId &id);
QMailFolderIdList configurationIdleFolderIds();
@@ -155,7 +156,7 @@ protected slots:
#ifdef USE_ACCOUNTS_QT
void onAccountsUpdated(const QMailAccountIdList& list);
void onSsoSessionError(const QString &error);
- void onSsoSessionResponse(const QList<QByteArray> &ssoLogin);
+ void onSsoSessionResponse(const QMap<QString, QList<QByteArray> > &ssoLogin);
#endif
private:
@@ -204,7 +205,7 @@ private:
bool _loginFailed;
bool _sendLogin;
bool _recreateIdentity;
- QByteArray _ssoLogin;
+ QMap<QString, QList<QByteArray> > _ssoLogin;
#endif
};
diff --git a/src/plugins/messageservices/imap/imapprotocol.cpp b/src/plugins/messageservices/imap/imapprotocol.cpp
index e4e0f0e1..1b05dc19 100644
--- a/src/plugins/messageservices/imap/imapprotocol.cpp
+++ b/src/plugins/messageservices/imap/imapprotocol.cpp
@@ -560,7 +560,7 @@ public:
LoginState() : ImapState(IMAP_Login, "Login") { LoginState::init(); }
#ifdef USE_ACCOUNTS_QT
- void setConfiguration(const QMailAccountConfiguration &config, const QStringList &capabilities, const QByteArray &ssoLogin);
+ void setConfiguration(const QMailAccountConfiguration &config, const QStringList &capabilities, const QMap<QString, QList<QByteArray> > &ssoLogin);
#else
void setConfiguration(const QMailAccountConfiguration &config, const QStringList &capabilities);
#endif
@@ -573,12 +573,12 @@ private:
QMailAccountConfiguration _config;
QStringList _capabilities;
#ifdef USE_ACCOUNTS_QT
- QByteArray _ssoLogin;
+ QMap<QString, QList<QByteArray> > _ssoLogin;
#endif
};
#ifdef USE_ACCOUNTS_QT
-void LoginState::setConfiguration(const QMailAccountConfiguration &config, const QStringList &capabilities, const QByteArray &ssoLogin)
+void LoginState::setConfiguration(const QMailAccountConfiguration &config, const QStringList &capabilities, const QMap<QString, QList<QByteArray> > &ssoLogin)
{
_config = config;
_capabilities = capabilities;
@@ -598,7 +598,7 @@ void LoginState::init()
_config = QMailAccountConfiguration();
_capabilities = QStringList();
#ifdef USE_ACCOUNTS_QT
- _ssoLogin = QByteArray();
+ _ssoLogin = QMap<QString, QList<QByteArray> >();
#endif
}
@@ -615,11 +615,8 @@ bool LoginState::continuationResponse(ImapContext *c, const QString &received)
{
// The server input is Base64 encoded
QByteArray challenge = QByteArray::fromBase64(received.toLatin1());
-#ifdef USE_ACCOUNTS_QT
- QByteArray response(ImapAuthenticator::getResponse(_config.serviceConfiguration("imap4"), challenge, _ssoLogin));
-#else
QByteArray response(ImapAuthenticator::getResponse(_config.serviceConfiguration("imap4"), challenge));
-#endif
+
if (!response.isEmpty()) {
c->sendData(response.toBase64(), true);
} else {
@@ -3192,6 +3189,11 @@ void ImapProtocol::setReceivedCapabilities(bool received)
_receivedCapabilities = received;
}
+bool ImapProtocol::loggingIn() const
+{
+ return _fsm->state() == &_fsm->loginState;
+}
+
bool ImapProtocol::loggingOut() const
{
return _fsm->state() == &_fsm->logoutState;
@@ -3224,7 +3226,7 @@ void ImapProtocol::sendStartTLS()
}
#ifdef USE_ACCOUNTS_QT
-void ImapProtocol::sendLogin(const QMailAccountConfiguration &config , const QByteArray &ssoLogin)
+void ImapProtocol::sendLogin(const QMailAccountConfiguration &config , const QMap<QString, QList<QByteArray> > &ssoLogin)
{
_fsm->loginState.setConfiguration(config, _capabilities, ssoLogin);
_fsm->setState(&_fsm->loginState);
diff --git a/src/plugins/messageservices/imap/imapprotocol.h b/src/plugins/messageservices/imap/imapprotocol.h
index d3147ea4..166919b8 100644
--- a/src/plugins/messageservices/imap/imapprotocol.h
+++ b/src/plugins/messageservices/imap/imapprotocol.h
@@ -144,6 +144,7 @@ public:
bool connected() const;
bool encrypted() const;
bool inUse() const;
+ bool loggingIn() const;
bool loggingOut() const;
bool delimiterUnknown() const;
@@ -176,7 +177,7 @@ public:
void sendCapability();
void sendStartTLS();
#ifdef USE_ACCOUNTS_QT
- void sendLogin(const QMailAccountConfiguration &config, const QByteArray &ssoLogin);
+ void sendLogin(const QMailAccountConfiguration &config, const QMap<QString, QList<QByteArray> > &ssoLogin);
#else
void sendLogin(const QMailAccountConfiguration &config);
#endif
diff --git a/src/plugins/messageservices/imap/imapservice.cpp b/src/plugins/messageservices/imap/imapservice.cpp
index 7cc00856..c5c61189 100644
--- a/src/plugins/messageservices/imap/imapservice.cpp
+++ b/src/plugins/messageservices/imap/imapservice.cpp
@@ -1616,6 +1616,10 @@ void ImapService::accountsUpdated(const QMailAccountIdList &ids)
bool isPushEnabled(imapCfg.pushEnabled());
QStringList pushFolders(imapCfg.pushFolders());
QString newConnectionSettings(connectionSettings(imapCfg));
+ bool loggingIn = false;
+ if (_client) {
+ loggingIn = _client->loggingIn();
+ }
if (!isEnabled) {
if (_accountWasEnabled) {
// Account changed from enabled to disabled
@@ -1626,18 +1630,27 @@ void ImapService::accountsUpdated(const QMailAccountIdList &ids)
return;
}
- if ((_accountWasPushEnabled != isPushEnabled)
- || (_previousPushFolders != pushFolders)
- || (_previousConnectionSettings != newConnectionSettings)) {
- // push email or connection settings have changed, restart client
- _initiatePushDelay.remove(_accountId);
- if (_accountWasEnabled) {
- disable();
+ // if we are in logging state let it fail first before removing the connections
+ // update settings anyway
+ if (!loggingIn) {
+ if ((_accountWasPushEnabled != isPushEnabled)
+ || (_previousPushFolders != pushFolders)
+ || (_previousConnectionSettings != newConnectionSettings)) {
+ // push email or connection settings have changed, restart client
+ _initiatePushDelay.remove(_accountId);
+ if (_accountWasEnabled) {
+ disable();
+ }
+ enable();
+ } else if (!_accountWasEnabled) {
+ // account changed from disabled to enabled
+ enable();
}
- enable();
- } else if (!_accountWasEnabled) {
- // account changed from disabled to enabled
- enable();
+ } else {
+ // Update the settings
+ _accountWasPushEnabled = imapCfg.pushEnabled();
+ _previousPushFolders = imapCfg.pushFolders();
+ _previousConnectionSettings = connectionSettings(imapCfg);
}
// account was enabled and still is, update checkinterval
diff --git a/src/plugins/messageservices/pop/popauthenticator.cpp b/src/plugins/messageservices/pop/popauthenticator.cpp
index 87fa0791..843b1675 100644
--- a/src/plugins/messageservices/pop/popauthenticator.cpp
+++ b/src/plugins/messageservices/pop/popauthenticator.cpp
@@ -40,6 +40,15 @@
#include <qmaillog.h>
+#ifdef USE_ACCOUNTS_QT
+namespace {
+
+QString authPassword;
+QMail::SaslMechanism responseAuthType;
+
+}
+#endif
+
bool PopAuthenticator::useEncryption(const QMailAccountConfiguration::ServiceConfiguration &svcCfg, const QStringList &capabilities)
{
#ifdef QT_NO_SSL
@@ -70,36 +79,20 @@ bool PopAuthenticator::useEncryption(const QMailAccountConfiguration::ServiceCon
}
#ifdef USE_ACCOUNTS_QT
-QList<QByteArray> PopAuthenticator::getAuthentication(const QMailAccountConfiguration::ServiceConfiguration &svcCfg, const QStringList &capabilities, const QList<QByteArray> &ssoLogin)
+QList<QByteArray> PopAuthenticator::getAuthentication(const QMailAccountConfiguration::ServiceConfiguration &svcCfg, const QStringList &capabilities, const QMap<QString, QList<QByteArray> > &ssoLogin)
{
+ Q_UNUSED(capabilities);
QList<QByteArray> result;
- QByteArray auth(QMailAuthenticator::getAuthentication(svcCfg, capabilities));
- if (!auth.isEmpty()) {
- result.append(QByteArray("AUTH ") + auth);
- } else {
- // If not handled by the authenticator, fall back to user/pass
+ // Currently pop account does not have any auth settings, so only plain can be used
+ if(ssoLogin.isEmpty()){
PopConfiguration popCfg(svcCfg);
- if(ssoLogin.isEmpty()){
- qMailLog(POP) << Q_FUNC_INFO << "SSO identity is not found for account id: "<< popCfg.id()
- << ", using password from accounts configuration";
- } else {
- return ssoLogin;
- }
- result.append(QByteArray("USER ") + popCfg.mailUserName().toLatin1());
- result.append(QByteArray("PASS ") + popCfg.mailPassword().toLatin1());
- }
-
- return result;
-}
-QByteArray PopAuthenticator::getResponse(const QMailAccountConfiguration::ServiceConfiguration &svcCfg, const QByteArray &challenge, const QList<QByteArray> &ssoLogin)
-{
- if (ssoLogin.size()) {
- QByteArray pass = ssoLogin.at(0);
- return QMailAuthenticator::getResponse(svcCfg, challenge, QString::fromLatin1(pass.constData()));
+ qMailLog(POP) << Q_FUNC_INFO << "SSO identity is not found for account id: "<< popCfg.id()
+ << ", returning empty authentication";
} else {
- return QByteArray();
+ result = ssoLogin.value("PLAIN");
}
+ return result;
}
#else
QList<QByteArray> PopAuthenticator::getAuthentication(const QMailAccountConfiguration::ServiceConfiguration &svcCfg, const QStringList &capabilities)
@@ -119,10 +112,13 @@ QList<QByteArray> PopAuthenticator::getAuthentication(const QMailAccountConfigur
return result;
}
-
+#endif
QByteArray PopAuthenticator::getResponse(const QMailAccountConfiguration::ServiceConfiguration &svcCfg, const QByteArray &challenge)
{
+#ifdef USE_ACCOUNTS_QT
+ return QMailAuthenticator::getResponse(svcCfg, challenge, responseAuthType, authPassword);
+#else
return QMailAuthenticator::getResponse(svcCfg, challenge);
-}
#endif
+}
diff --git a/src/plugins/messageservices/pop/popauthenticator.h b/src/plugins/messageservices/pop/popauthenticator.h
index 2d1a1040..419b9508 100644
--- a/src/plugins/messageservices/pop/popauthenticator.h
+++ b/src/plugins/messageservices/pop/popauthenticator.h
@@ -44,12 +44,11 @@ class PopAuthenticator
public:
static bool useEncryption(const QMailAccountConfiguration::ServiceConfiguration &svcCfg, const QStringList &capabilities);
#ifdef USE_ACCOUNTS_QT
- static QList<QByteArray> getAuthentication(const QMailAccountConfiguration::ServiceConfiguration &svcCfg, const QStringList &capabilities, const QList<QByteArray> &ssoLogin);
- static QByteArray getResponse(const QMailAccountConfiguration::ServiceConfiguration &svcCfg, const QByteArray &challenge, const QList<QByteArray> &ssoLogin);
+ static QList<QByteArray> getAuthentication(const QMailAccountConfiguration::ServiceConfiguration &svcCfg, const QStringList &capabilities, const QMap<QString, QList<QByteArray> > &ssoLogin);
#else
static QList<QByteArray> getAuthentication(const QMailAccountConfiguration::ServiceConfiguration &svcCfg, const QStringList &capabilities);
- static QByteArray getResponse(const QMailAccountConfiguration::ServiceConfiguration &svcCfg, const QByteArray &challenge);
#endif
+ static QByteArray getResponse(const QMailAccountConfiguration::ServiceConfiguration &svcCfg, const QByteArray &challenge);
};
#endif
diff --git a/src/plugins/messageservices/pop/popclient.cpp b/src/plugins/messageservices/pop/popclient.cpp
index c34e9e89..f44528fd 100644
--- a/src/plugins/messageservices/pop/popclient.cpp
+++ b/src/plugins/messageservices/pop/popclient.cpp
@@ -273,11 +273,10 @@ void PopClient::setAccount(const QMailAccountId &id)
#ifdef USE_ACCOUNTS_QT
if (!ssoSessionManager) {
- PopConfiguration popCfg(config);
ssoSessionManager = new SSOSessionManager(this);
- if (ssoSessionManager->createSsoIdentity(id, "pop3", popCfg.mailEncryption())) {
- ENFORCE(connect(ssoSessionManager, SIGNAL(ssoSessionResponse(QList<QByteArray>))
- ,this, SLOT(onSsoSessionResponse(QList<QByteArray>))));
+ if (ssoSessionManager->createSsoIdentity(id, "pop3")) {
+ ENFORCE(connect(ssoSessionManager, SIGNAL(ssoSessionResponse(QMap<QString,QList<QByteArray> >))
+ ,this, SLOT(onSsoSessionResponse(QMap<QString,QList<QByteArray> >))));
ENFORCE(connect(ssoSessionManager, SIGNAL(ssoSessionError(QString)),this, SLOT(onSsoSessionError(QString))));
qMailLog(POP) << Q_FUNC_INFO << "SSO identity is found for account id: "<< id;
} else {
@@ -579,11 +578,7 @@ void PopClient::processResponse(const QString &response)
if ((response.length() > 2) && (response[1] == ' ')) {
// This is a continuation containing a challenge string (in Base64)
QByteArray challenge = QByteArray::fromBase64(response.mid(2).toLatin1());
-#ifdef USE_ACCOUNTS_QT
- QByteArray response(PopAuthenticator::getResponse(config.serviceConfiguration("pop3"), challenge, ssoLogin));
-#else
QByteArray response(PopAuthenticator::getResponse(config.serviceConfiguration("pop3"), challenge));
-#endif
if (!response.isEmpty()) {
// Send the response as Base64 encoded
@@ -1408,7 +1403,7 @@ void PopClient::removeSsoIdentity(const QMailAccountId &accountId)
}
}
-void PopClient::onSsoSessionResponse(const QList<QByteArray> &ssoCredentials)
+void PopClient::onSsoSessionResponse(const QMap<QString, QList<QByteArray> > &ssoCredentials)
{
qMailLog(POP) << "Got SSO response";
if(!ssoCredentials.isEmpty()) {
diff --git a/src/plugins/messageservices/pop/popclient.h b/src/plugins/messageservices/pop/popclient.h
index f7df5d5d..44b778bb 100644
--- a/src/plugins/messageservices/pop/popclient.h
+++ b/src/plugins/messageservices/pop/popclient.h
@@ -111,7 +111,7 @@ protected slots:
#ifdef USE_ACCOUNTS_QT
void onAccountsUpdated(const QMailAccountIdList& list);
void onSsoSessionError(const QString &error);
- void onSsoSessionResponse(const QList<QByteArray> &ssoCredentials);
+ void onSsoSessionResponse(const QMap<QString, QList<QByteArray> > &ssoCredentials);
#endif
void connectionInactive();
@@ -205,7 +205,7 @@ private:
SSOSessionManager* ssoSessionManager;
bool loginFailed;
bool sendLogin;
- QList<QByteArray> ssoLogin;
+ QMap<QString, QList<QByteArray> > ssoLogin;
#endif
};
diff --git a/src/plugins/messageservices/smtp/smtpauthenticator.cpp b/src/plugins/messageservices/smtp/smtpauthenticator.cpp
index 0dae24c5..8e57a76f 100644
--- a/src/plugins/messageservices/smtp/smtpauthenticator.cpp
+++ b/src/plugins/messageservices/smtp/smtpauthenticator.cpp
@@ -33,78 +33,124 @@
#include "smtpauthenticator.h"
-#include "smtpconfiguration.h"
-
#include <qmailauthenticator.h>
-
+#include <qmailstore.h>
#include <qmaillog.h>
namespace {
QMap<QMailAccountId, QList<QByteArray> > gResponses;
+#ifdef USE_ACCOUNTS_QT
+QString authPassword;
+QMail::SaslMechanism responseAuthType;
+#endif
}
#ifdef USE_ACCOUNTS_QT
-QByteArray SmtpAuthenticator::getAuthentication(const QMailAccountConfiguration::ServiceConfiguration &svcCfg, const QStringList &capabilities, QList<QByteArray> &ssoLogin)
+// Returns authentication type from more secure to less secure supported
+static SmtpConfiguration::AuthType authFromCapabilities(const QStringList &capabilities, const QMap<QString, QList<QByteArray> > &ssoLogin)
{
- QByteArray result(QMailAuthenticator::getAuthentication(svcCfg, capabilities));
- if (!result.isEmpty())
- return result.prepend("AUTH ");
-
-#ifndef QT_NO_SSL
- SmtpConfiguration smtpCfg(svcCfg);
- if (smtpCfg.smtpAuthentication() != SmtpConfiguration::Auth_NONE) {
- QMailAccountId id(smtpCfg.id());
- QByteArray username(smtpCfg.smtpUsername().toUtf8());
- QByteArray pass;
- if (ssoLogin.isEmpty()) {
- pass = smtpCfg.smtpPassword().toUtf8();
- qMailLog(SMTP) << Q_FUNC_INFO << "SSO identity is not found for account id: "<< id
- << ", using password from accounts configuration";
- } else {
- QList<QByteArray> responses = ssoLogin;
- QByteArray res = responses.takeFirst();
- gResponses[id] = responses;
- return res;
- }
-
- if (smtpCfg.smtpAuthentication() == SmtpConfiguration::Auth_LOGIN) {
- result = QByteArray("LOGIN");
- gResponses[id] = (QList<QByteArray>() << username << pass);
- } else if (smtpCfg.smtpAuthentication() == SmtpConfiguration::Auth_PLAIN) {
- result = QByteArray("PLAIN ") + QByteArray(username + '\0' + username + '\0' + pass).toBase64();
- gResponses[id] = (QList<QByteArray>() << QByteArray(username + '\0' + username + '\0' + pass));
+ QStringList authCaps;
+ foreach (QString const& capability, capabilities) {
+ if (capability.startsWith("AUTH", Qt::CaseInsensitive)) {
+ authCaps.append(capability.split(" ",QString::SkipEmptyParts));
}
}
-#endif
-
- if (!result.isEmpty()) {
- result.prepend("AUTH ");
+ qMailLog(SMTP) << "Auths found: " << authCaps;
+
+ if (authCaps.contains("CRAM-MD5", Qt::CaseInsensitive) && ssoLogin.contains("CRAM-MD5")) {
+ qMailLog(SMTP) << "Returning auth CRAM-MD5";
+ return SmtpConfiguration::Auth_CRAMMD5;
+ } else if (authCaps.contains("LOGIN", Qt::CaseInsensitive) && !authCaps.contains("PLAIN", Qt::CaseInsensitive)
+ && ssoLogin.contains("LOGIN")) {
+ // LOGIN mechanism is obsolete, use it as last resort, see: http://www.iana.org/assignments/sasl-mechanisms/sasl-mechanisms.xhtml
+ qMailLog(SMTP) << "Returning auth LOGIN";
+ return SmtpConfiguration::Auth_LOGIN;
+ } else if (ssoLogin.contains("PLAIN")) {
+ qMailLog(SMTP) << "Returning auth PLAIN";
+ return SmtpConfiguration::Auth_PLAIN;
+ } else {
+ qMailLog(SMTP) << "Returning auth NONE";
+ return SmtpConfiguration::Auth_NONE;
}
- return result;
}
-QByteArray SmtpAuthenticator::getResponse(const QMailAccountConfiguration::ServiceConfiguration &svcCfg, const QByteArray &challenge, QList<QByteArray> &ssoLogin)
+QByteArray SmtpAuthenticator::getAuthentication(const QMailAccountConfiguration::ServiceConfiguration &svcCfg, const QStringList &capabilities, const QMap<QString, QList<QByteArray> > &ssoLogin)
{
QByteArray result;
-
- QMap<QMailAccountId, QList<QByteArray> >::iterator it = gResponses.find(svcCfg.id());
- if (it != gResponses.end()) {
- QList<QByteArray> &responses = it.value();
- result = responses.takeFirst();
-
- if (responses.isEmpty())
- gResponses.erase(it);
- } else {
- if (ssoLogin.size()) {
- QByteArray pass = ssoLogin.at(0);
- result = QMailAuthenticator::getResponse(svcCfg, challenge, QString::fromLatin1(pass.constData()));
+ SmtpConfiguration smtpCfg(svcCfg);
+ QMailAccountId id(smtpCfg.id());
+ SmtpConfiguration::AuthType authType = static_cast<SmtpConfiguration::AuthType>(smtpCfg.smtpAuthentication());
+
+ // if we don't have auth yet, try to get it from the capabilities
+ if (ssoLogin.size() > 1 && authType == SmtpConfiguration::Auth_NONE
+ && smtpCfg.smtpAuthFromCapabilities()) {
+ qMailLog(SMTP) << "Discovering authentication from capabilities for account id:" << id;
+ SmtpConfiguration::AuthType discoveredAuth = authFromCapabilities(capabilities, ssoLogin);
+ authType = discoveredAuth;
+ if (authType != SmtpConfiguration::Auth_NONE) {
+ QMailAccount account(id);
+ QMailAccountConfiguration accountConfig(id);
+ QMailAccountConfiguration::ServiceConfiguration serviceConf(accountConfig.serviceConfiguration("smtp"));
+ serviceConf.setValue("authentication",QString::number(authType));
+ if (!QMailStore::instance()->updateAccount(&account, &accountConfig)) {
+ qWarning() << "Unable to update account" << account.id() << "to auth type!!!!";
+ }
}
}
+#ifndef QT_NO_OPENSSL
+ if (authType != SmtpConfiguration::Auth_NONE) {
+ if (!ssoLogin.isEmpty()) {
+ QList<QByteArray> auth;
+
+ if (ssoLogin.size() == 1) {
+ QList<QString> keys = ssoLogin.keys();
+ auth = ssoLogin.value(keys.at(0));
+ result = auth.takeFirst();
+ if (auth.size()) {
+ gResponses[id] = auth;
+ }
+ qMailLog(SMTP) << "Using authentication method " << keys.at(0)
+ << " for account id:" << id;
+ } else {
+ if (authType == SmtpConfiguration::Auth_CRAMMD5) {
+ auth = ssoLogin.value("CRAM-MD5");
+ if (!auth.empty()) {
+ result = auth.takeFirst();
+ authPassword = QString::fromLatin1(auth.takeFirst());
+ responseAuthType = QMail::CramMd5Mechanism;
+ } else {
+ qMailLog(SMTP) << "Failed to get authentication for method CRAM-MD5 in account id:" << id;
+ }
+ } else if (authType == SmtpConfiguration::Auth_PLAIN) {
+ auth = ssoLogin.value("PLAIN");
+ if (!auth.empty()) {