Differential D18394 Diff 49906 vpn/openconnect/openconnectauth.cpp

Changeset View

Standalone View

View Options

vpn/openconnect/openconnectauth.cpp

Context not available.
57#include <fcntl.h> 57​#include <fcntl.h>
58} 58​}
59 59​
60​#if !OPENCONNECT_CHECK_VER(2,1)
61​#define __openconnect_set_token_mode(...) -EOPNOTSUPP
62​#elif !OPENCONNECT_CHECK_VER(2,2)
63​#define __openconnect_set_token_mode(vpninfo, mode, secret) openconnect_set_stoken_mode(vpninfo, 1, secret)
64​#else
65​#define __openconnect_set_token_mode openconnect_set_token_mode
66​#endif
pinoUnsubmitted
Not Done

IMHO it is better to define the macros in the same way for all the cases, specifying their parameters

pino: IMHO it is better to define the macros in the same way for all the cases, specifying their…
67​
68​#if OPENCONNECT_CHECK_VER(3,4)
69​ static int updateToken(void*, const char*);
70​#endif
71​
60// name/address: IP/domain name of the host (OpenConnect accepts both, so no difference here) 72​// name/address: IP/domain name of the host (OpenConnect accepts both, so no difference here)
61// group: user group on the server 73​// group: user group on the server
62typedef struct { 74​typedef struct {
Context not available.
65 QString address; 77​ QString address;
66} VPNHost; 78​} VPNHost;
67 79​
80​typedef struct {
81​ oc_token_mode_t tokenMode;
82​ QByteArray tokenSecret;
83​} Token;
84​
68class OpenconnectAuthWidgetPrivate 85​class OpenconnectAuthWidgetPrivate
69{ 86​{
70public: 87​public:
Context not available.
82 int cancelPipes[2]; 99​ int cancelPipes[2];
83 QList<QPair<QString, int> > serverLog; 100​ QList<QPair<QString, int> > serverLog;
84 int passwordFormIndex; 101​ int passwordFormIndex;
102​ QByteArray tokenMode;
103​ Token token;
85 104​
86 enum LogLevels {Error = 0, Info, Debug, Trace}; 105​ enum LogLevels {Error = 0, Info, Debug, Trace};
87}; 106​};
Context not available.
122 connect(d->worker, &OpenconnectAuthWorkerThread::updateLog, this, &OpenconnectAuthWidget::updateLog); 141​ connect(d->worker, &OpenconnectAuthWorkerThread::updateLog, this, &OpenconnectAuthWidget::updateLog);
123 connect(d->worker, QOverload<const QString&>::of(&OpenconnectAuthWorkerThread::writeNewConfig), this, &OpenconnectAuthWidget::writeNewConfig); 142​ connect(d->worker, QOverload<const QString&>::of(&OpenconnectAuthWorkerThread::writeNewConfig), this, &OpenconnectAuthWidget::writeNewConfig);
124 connect(d->worker, &OpenconnectAuthWorkerThread::cookieObtained, this, &OpenconnectAuthWidget::workerFinished); 143​ connect(d->worker, &OpenconnectAuthWorkerThread::cookieObtained, this, &OpenconnectAuthWidget::workerFinished);
144​ connect(d->worker, &OpenconnectAuthWorkerThread::initTokens, this, &OpenconnectAuthWidget::initTokens);
125 145​
126 readConfig(); 146​ readConfig();
127 readSecrets(); 147​ readSecrets();
128 148​
149​#if OPENCONNECT_CHECK_VER(3,4)
150​ openconnect_set_token_callbacks(d->vpninfo, &d->secrets, NULL, &updateToken);
151​#endif
152​
129 // This might be set by readSecrets() so don't connect it until now 153​ // This might be set by readSecrets() so don't connect it until now
130 connect(d->ui.cmbHosts, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &OpenconnectAuthWidget::connectHost); 154​ connect(d->ui.cmbHosts, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &OpenconnectAuthWidget::connectHost);
131 155​
Context not available.
196 const QString protocol = dataMap[NM_OPENCONNECT_KEY_PROTOCOL]; 220​ const QString protocol = dataMap[NM_OPENCONNECT_KEY_PROTOCOL];
197 openconnect_set_protocol(d->vpninfo, OC3DUP(protocol == "juniper" ? "nc" : protocol.toUtf8().data())); 221​ openconnect_set_protocol(d->vpninfo, OC3DUP(protocol == "juniper" ? "nc" : protocol.toUtf8().data()));
198 } 222​ }
223​
224​ d->tokenMode = dataMap[NM_OPENCONNECT_KEY_TOKEN_MODE].toUtf8();
225​
pinoUnsubmitted
Not Done

extra empty line

pino: extra empty line
199} 226​}
200 227​
201void OpenconnectAuthWidget::readSecrets() 228​void OpenconnectAuthWidget::readSecrets()
Context not available.
248 if (d->secrets["save_passwords"] == "yes") { 275​ if (d->secrets["save_passwords"] == "yes") {
249 d->ui.chkStorePasswords->setChecked(true); 276​ d->ui.chkStorePasswords->setChecked(true);
250 } 277​ }
278​
279​ QByteArray tokenSecret = d->secrets[NM_OPENCONNECT_KEY_TOKEN_SECRET].toUtf8();
pinoUnsubmitted
Not Done

this is needed only in the block within the if in the line below, so move it inside that block; also, make tokenSecret const

pino: this is needed only in the block within the if in the line below, so move it inside that block…
280​ if (!d->tokenMode.isEmpty()) {
281​ int ret = 0;
282​
283​ if (d->tokenMode == "manual" && !tokenSecret.isEmpty())
284​ ret = __openconnect_set_token_mode(d->vpninfo, OC_TOKEN_MODE_STOKEN, tokenSecret);
285​ else if (d->tokenMode =="stokenrc")
jgrulichUnsubmitted
Not Done

QStringLiteral("manual")

Same below.

jgrulich: QStringLiteral("manual") Same below.
286​ ret = __openconnect_set_token_mode(d->vpninfo, OC_TOKEN_MODE_STOKEN, NULL);
287​ else if (d->tokenMode == "totp" && !tokenSecret.isEmpty())
jgrulichUnsubmitted
Not Done

Missing space after "==".

jgrulich: Missing space after "==".
288​ ret = __openconnect_set_token_mode(d->vpninfo, OC_TOKEN_MODE_TOTP, tokenSecret);
jgrulichUnsubmitted
Not Done

Coding style. The "else if" should be on the same line as the "}" bracket. Same below.

jgrulich: Coding style. The "else if" should be on the same line as the "}" bracket. Same below.
289​#if OPENCONNECT_CHECK_VER(3,4)
290​ else if (d->tokenMode == "hotp" && !tokenSecret.isEmpty())
291​ ret = __openconnect_set_token_mode(d->vpninfo, OC_TOKEN_MODE_HOTP, tokenSecret);
292​#endif
293​#if OPENCONNECT_CHECK_VER(5,0)
jgrulichUnsubmitted
Not Done

And here is one additional space after "=="

jgrulich: And here is one additional space after "=="
294​ else if (d->tokenMode == "yubioath") {
295​ /* This needs to be done from a thread because it can call back to
296​ ask for the PIN */
297​ d->token.tokenMode = OC_TOKEN_MODE_YUBIOATH;
298​ if (!tokenSecret.isEmpty() && tokenSecret.length())
pinoUnsubmitted
Not Done

if tokenSecret is not empty, then its length will always be greater than 0, so the second condition is redundant

pino: if tokenSecret is not empty, then its length will always be greater than 0, so the second…
299​ d->token.tokenSecret = tokenSecret;
300​ else
301​ d->token.tokenSecret = NULL;
pinoUnsubmitted
Not Done

d->token.tokenSecret is a QByteArray, so if you want to clear it just call clear()

pino: d->token.tokenSecret is a QByteArray, so if you want to clear it just call clear()
302​ }
303​#endif
304​ if (ret) {
305​ addFormInfo(QLatin1String("dialog-error"), i18n("Failed to initialize software token: %1\n", ret));
pinoUnsubmitted
Not Done

it looks like all the other messages for addFormInfo() do not have a trailing newline, so please remove it

pino: it looks like all the other messages for addFormInfo() do not have a trailing newline, so…
306​ }
307​ }
251} 308​}
252 309​
253void OpenconnectAuthWidget::acceptDialog() 310​void OpenconnectAuthWidget::acceptDialog()
254{ 311​{
255 // Find top-level widget as this should be the QDialog itself 312​ // Find top-level widget as this should be the QDialog itself
313​ updateLog(QLatin1String("acceptDialog"),PRG_INFO);
256 QWidget *widget = parentWidget(); 314​ QWidget *widget = parentWidget();
257 while (widget->parentWidget() != nullptr) { 315​ while (widget->parentWidget() != nullptr) {
258 widget = widget->parentWidget(); 316​ widget = widget->parentWidget();
Context not available.
269void OpenconnectAuthWidget::connectHost() 327​void OpenconnectAuthWidget::connectHost()
270{ 328​{
271 Q_D(OpenconnectAuthWidget); 329​ Q_D(OpenconnectAuthWidget);
330​ updateLog(QLatin1String("connectHost"),PRG_INFO);
272 d->userQuit = true; 331​ d->userQuit = true;
273 if (write(d->cancelPipes[1], "x", 1)) { 332​ if (write(d->cancelPipes[1], "x", 1)) {
274 // not a lot we can do 333​ // not a lot we can do
Context not available.
298 } 357​ }
299 d->secrets["lasthost"] = host.name; 358​ d->secrets["lasthost"] = host.name;
300 addFormInfo(QLatin1String("dialog-information"), i18n("Contacting host, please wait...")); 359​ addFormInfo(QLatin1String("dialog-information"), i18n("Contacting host, please wait..."));
360​
pinoUnsubmitted
Not Done

extra empty line

pino: extra empty line
301 d->worker->start(); 361​ d->worker->start();
302} 362​}
303 363​
364​void OpenconnectAuthWidget::initTokens()
365​{
366​ Q_D(OpenconnectAuthWidget);
367​ updateLog(QString("initTokens"),PRG_INFO);
368​ if (d->token.tokenMode != OC_TOKEN_MODE_NONE)
369​ __openconnect_set_token_mode(d->vpninfo, d->token.tokenMode, d->token.tokenSecret);
370​}
371​
304QVariantMap OpenconnectAuthWidget::setting() const 372​QVariantMap OpenconnectAuthWidget::setting() const
305{ 373​{
374​
pinoUnsubmitted
Not Done

extra empty line

pino: extra empty line
306 Q_D(const OpenconnectAuthWidget); 375​ Q_D(const OpenconnectAuthWidget);
307 376​
308 NMStringMap secrets; 377​ NMStringMap secrets;
309 QVariantMap secretData; 378​ QVariantMap secretData;
310 379​
380​
pinoUnsubmitted
Not Done

extra empty line

pino: extra empty line
311 secrets.unite(d->secrets); 381​ secrets.unite(d->secrets);
312 QString host(openconnect_get_hostname(d->vpninfo)); 382​ QString host(openconnect_get_hostname(d->vpninfo));
313 const QString port = QString::number(openconnect_get_port(d->vpninfo)); 383​ const QString port = QString::number(openconnect_get_port(d->vpninfo));
Context not available.
346 return secretData; 416​ return secretData;
347} 417​}
348 418​
419​#if OPENCONNECT_CHECK_VER(3,4)
420​static int updateToken(void *cbdata, const char *tok)
421​{
422​ NMStringMap *secrets = static_cast<NMStringMap *>(cbdata);
423​ secrets->insert(QLatin1String(NM_OPENCONNECT_KEY_TOKEN_SECRET), QLatin1String(tok));
424​ return 0;
425​}
426​#endif
427​
349void OpenconnectAuthWidget::writeNewConfig(const QString & buf) 428​void OpenconnectAuthWidget::writeNewConfig(const QString & buf)
350{ 429​{
351 Q_D(OpenconnectAuthWidget); 430​ Q_D(OpenconnectAuthWidget);
Context not available.
401void OpenconnectAuthWidget::addFormInfo(const QString &iconName, const QString &message) 480​void OpenconnectAuthWidget::addFormInfo(const QString &iconName, const QString &message)
402{ 481​{
403 Q_D(OpenconnectAuthWidget); 482​ Q_D(OpenconnectAuthWidget);
483​ updateLog("addFormInfo",PRG_INFO);
404 QHBoxLayout *layout = new QHBoxLayout(); 484​ QHBoxLayout *layout = new QHBoxLayout();
405 QLabel *icon = new QLabel(this); 485​ QLabel *icon = new QLabel(this);
406 QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); 486​ QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
Context not available.
426void OpenconnectAuthWidget::processAuthForm(struct oc_auth_form *form) 506​void OpenconnectAuthWidget::processAuthForm(struct oc_auth_form *form)
427{ 507​{
428 Q_D(OpenconnectAuthWidget); 508​ Q_D(OpenconnectAuthWidget);
509​ updateLog("processAuthForm",PRG_INFO);
429 deleteAllFromLayout(d->ui.loginBoxLayout); 510​ deleteAllFromLayout(d->ui.loginBoxLayout);
430 if (form->banner) { 511​ if (form->banner) {
431 addFormInfo(QLatin1String("dialog-information"), form->banner); 512​ addFormInfo(QLatin1String("dialog-information"), form->banner);
Context not available.
451 QWidget *widget = nullptr; 532​ QWidget *widget = nullptr;
452 const QString key = QString("form:%1:%2").arg(QLatin1String(form->auth_id)).arg(QLatin1String(opt->name)); 533​ const QString key = QString("form:%1:%2").arg(QLatin1String(form->auth_id)).arg(QLatin1String(opt->name));
453 const QString value = d->secrets.value(key); 534​ const QString value = d->secrets.value(key);
535​ updateLog(QString(opt->type),PRG_INFO);
454 if (opt->type == OC_FORM_OPT_PASSWORD || opt->type == OC_FORM_OPT_TEXT) { 536​ if (opt->type == OC_FORM_OPT_PASSWORD || opt->type == OC_FORM_OPT_TEXT) {
455 PasswordField *le = new PasswordField(this); 537​ PasswordField *le = new PasswordField(this);
456 le->setText(value); 538​ le->setText(value);
Context not available.
571 connect(buttons, &QDialogButtonBox::rejected, dialog.data(), &QDialog::reject); 653​ connect(buttons, &QDialogButtonBox::rejected, dialog.data(), &QDialog::reject);
572 dialog->layout()->addWidget(widget); 654​ dialog->layout()->addWidget(widget);
573 dialog->layout()->addWidget(buttons); 655​ dialog->layout()->addWidget(buttons);
656​
657​ const NMStringMap dataMap = d->setting->data();
658​ buttons->button(QDialogButtonBox::Ok)->setEnabled(dataMap[NM_OPENCONNECT_KEY_PREVENT_INVALID_CERT] != "yes");
659​
jgrulichUnsubmitted
Not Done

Also leftover from the other review.

jgrulich: Also leftover from the other review.
574 if(dialog.data()->exec() == QDialog::Accepted) { 660​ if(dialog.data()->exec() == QDialog::Accepted) {
575 *accepted = true; 661​ *accepted = true;
576 } else { 662​ } else {
Context not available.
594void OpenconnectAuthWidget::formGroupChanged() 680​void OpenconnectAuthWidget::formGroupChanged()
595{ 681​{
596 Q_D(OpenconnectAuthWidget); 682​ Q_D(OpenconnectAuthWidget);
683​ updateLog("formGroupChanged",PRG_INFO);
597 684​
598 d->formGroupChanged = true; 685​ d->formGroupChanged = true;
599 formLoginClicked(); 686​ formLoginClicked();
Context not available.
605void OpenconnectAuthWidget::formLoginClicked() 692​void OpenconnectAuthWidget::formLoginClicked()
606{ 693​{
607 Q_D(OpenconnectAuthWidget); 694​ Q_D(OpenconnectAuthWidget);
695​ updateLog("formLoginClicked",PRG_INFO);
608 696​
609 const int lastIndex = d->ui.loginBoxLayout->count() - 1; 697​ const int lastIndex = d->ui.loginBoxLayout->count() - 1;
610 QLayout *layout = d->ui.loginBoxLayout->itemAt(d->passwordFormIndex)->layout(); 698​ QLayout *layout = d->ui.loginBoxLayout->itemAt(d->passwordFormIndex)->layout();
Context not available.
623 if (opt->type == OC_FORM_OPT_TEXT) { 711​ if (opt->type == OC_FORM_OPT_TEXT) {
624 d->secrets.insert(key, le->text()); 712​ d->secrets.insert(key, le->text());
625 } else { 713​ } else {
714​ updateLog(QString("formLoginClicked: insert")+key+": "+le->text(),PRG_INFO);
626 d->tmpSecrets.insert(key, le->text()); 715​ d->tmpSecrets.insert(key, le->text());
627 } 716​ }
628 } else if (opt->type == OC_FORM_OPT_SELECT) { 717​ } else if (opt->type == OC_FORM_OPT_SELECT) {
Context not available.
641void OpenconnectAuthWidget::workerFinished(const int &ret) 730​void OpenconnectAuthWidget::workerFinished(const int &ret)
642{ 731​{
643 Q_D(OpenconnectAuthWidget); 732​ Q_D(OpenconnectAuthWidget);
733​ updateLog("workerFinished",PRG_INFO);
644 if (ret < 0) { 734​ if (ret < 0) {
645 QString message; 735​ QString message;
646 QList<QPair<QString, int> >::const_iterator i; 736​ QList<QPair<QString, int> >::const_iterator i;
Context not available.