feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

VcsOutputWindow: Modernize password obfuscation

Browse Source 
Use QRegularExpression and the QString::replace()
function with capturing groups to replace the
existing loop.

Change-Id: Ia9c0587dcdae40cff2b09379ac3ba84db4d30ce8
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Andre Hartmann
2020-05-16 19:07:00 +02:00
committed by André Hartmann
parent 02d216fa13
commit 9c71e41ad1
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/vcsbase/vcsoutputwindow.cpp
View File

@@ -46,7 +46,7 @@
#include <QPlainTextEdit>
#include <QPoint>
#include <QPointer>
#include <QRegExp>
#include <QRegularExpression>
#include <QTextBlock>
#include <QTextBlockUserData>
#include <QTextCharFormat>
@@ -285,7 +285,7 @@ class VcsOutputWindowPrivate
public:
Internal::OutputWindowPlainTextEdit widget;
QString repository;
QRegExp passwordRegExp;
const QRegularExpression passwordRegExp = QRegularExpression("://([^@:]+):([^@]+)@");
};
static VcsOutputWindow *m_instance = nullptr;
@@ -294,7 +294,6 @@ static VcsOutputWindowPrivate *d = nullptr;
VcsOutputWindow::VcsOutputWindow()
{
d = new VcsOutputWindowPrivate;
d->passwordRegExp = QRegExp("://([^@:]+):([^@]+)@");
Q_ASSERT(d->passwordRegExp.isValid());
m_instance = this;
@@ -315,18 +314,9 @@ VcsOutputWindow::VcsOutputWindow()
VcsOutputWindow::instance(), &VcsOutputWindow::referenceClicked);
}
static QString filterPasswordFromUrls(const QString &input)
static QString filterPasswordFromUrls(QString input)
{
int pos = 0;
QString result = input;
while ((pos = d->passwordRegExp.indexIn(result, pos)) >= 0) {
QString tmp = result.left(pos + 3) + d->passwordRegExp.cap(1) + ":***@";
int newStart = tmp.count();
tmp += result.midRef(pos + d->passwordRegExp.matchedLength());
result = tmp;
pos = newStart;
}
return result;
return input.replace(d->passwordRegExp, "://\\1:***@");
}
VcsOutputWindow::~VcsOutputWindow()