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

Vcs: Do not expose passwords to the output windows

Browse Source 
Partially reverts bbde6ac9bf and
3be9f52980.

Fixes: QTCREATORBUG-28413
Change-Id: Iccfb787a5261f3963e862554fa266d62ac49ca50
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Stenger
2022-11-11 14:54:32 +01:00
parent a6774dbad5
commit 8dd939bb27
1 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -414,11 +414,38 @@ void VcsOutputWindow::appendWarning(const QString &text)
append(text + '\n', Warning, false);
}
// Helper to format arguments for log windows hiding common password options.
static inline QString formatArguments(const QStringList &args)
{
const char passwordOptionC[] = "--password";
QString rc;
QTextStream str(&rc);
const int size = args.size();
// Skip authentication options
for (int i = 0; i < size; i++) {
const QString arg = filterPasswordFromUrls(args.at(i));
if (i)
str << ' ';
if (arg.startsWith(QString::fromLatin1(passwordOptionC) + '=')) {
str << ProcessArgs::quoteArg("--password=********");
continue;
}
str << ProcessArgs::quoteArg(arg);
if (arg == passwordOptionC) {
str << ' ' << ProcessArgs::quoteArg("********");
i++;
}
}
return rc;
}
QString VcsOutputWindow::msgExecutionLogEntry(const FilePath &workingDir, const CommandLine &command)
{
const QString maskedCmdline = ProcessArgs::quoteArg(command.executable().toUserOutput())
+ ' ' + formatArguments(command.splitArguments());
if (workingDir.isEmpty())
return tr("Running: %1").arg(command.toUserOutput()) + '\n';
return tr("Running in %1: %2").arg(workingDir.toUserOutput(), command.toUserOutput()) + '\n';
return tr("Running: %1").arg(maskedCmdline) + '\n';
return tr("Running in %1: %2").arg(workingDir.toUserOutput(), maskedCmdline) + '\n';
}
void VcsOutputWindow::appendShellCommandLine(const QString &text)