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

Subversion: Mask credentials in command line everywhere

Browse Source 
Fixes: QTCREATORBUG-28413
Change-Id: I763c26944d89a8dcc7151e10b8eed5d9642fb982
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
Orgad Shaneh
2023-01-17 13:10:21 +02:00
committed by Orgad Shaneh
parent edd3c16382
commit 87e5ac7438
7 changed files with 150 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/libs/utils/commandline.cpp
View File

@@ -622,6 +622,18 @@ void ProcessArgs::addArgs(QString *args, const QStringList &inArgs)
addArg(args, arg);
}
CommandLine &CommandLine::operator<<(const QString &arg)
{
addArg(arg);
return *this;
}
CommandLine &CommandLine::operator<<(const QStringList &args)
{
addArgs(args);
return *this;
}
bool ProcessArgs::prepareCommand(const CommandLine &cmdLine, QString *outCmd, ProcessArgs *outArgs,
const Environment *env, const FilePath *pwd)
{
@@ -1432,7 +1444,7 @@ CommandLine CommandLine::fromUserInput(const QString &cmdline, MacroExpander *ex
void CommandLine::addArg(const QString &arg)
{
ProcessArgs::addArg(&m_arguments, arg, m_executable.osType());
addArg(arg, m_executable.osType());
}
void CommandLine::addArg(const QString &arg, OsType osType)
@@ -1440,6 +1452,20 @@ void CommandLine::addArg(const QString &arg, OsType osType)
ProcessArgs::addArg(&m_arguments, arg, osType);
}
void CommandLine::addMaskedArg(const QString &arg)
{
addMaskedArg(arg, m_executable.osType());
}
void CommandLine::addMaskedArg(const QString &arg, OsType osType)
{
int start = m_arguments.size();
if (start > 0)
++start;
addArg(arg, osType);
m_masked.push_back({start, m_arguments.size() - start});
}
void CommandLine::addArgs(const QStringList &inArgs)
{
for (const QString &arg : inArgs)
@@ -1509,8 +1535,12 @@ void CommandLine::prependArgs(const QString &inArgs, RawType)
QString CommandLine::toUserOutput() const
{
QString res = m_executable.toUserOutput();
if (!m_arguments.isEmpty())
res += ' ' + m_arguments;
if (!m_arguments.isEmpty()) {
QString args = m_arguments;
for (auto it = m_masked.crbegin(), end = m_masked.crend(); it != end; ++it)
args.replace(it->first, it->second, "*******");
res += ' ' + args;
}
return res;
}