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

SSH: Don't allow external access to process runner's connection object.

Browse Source 
It does not belong to the runner anymore after the process has finished,
so we must prevent anyone from getting a copy.
(This includes a minor API fix for RemoteLinux code that depended on
the connection being available.)

Change-Id: Icc28dc3c820f4c2210bb6fb08171cd6a84534dee
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
This commit is contained in:
Christian Kandeler
2011-11-09 17:38:19 +01:00
parent bddfae7182
commit 5d5db225a8
14 changed files with 57 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/libs/utils/ssh/sshremoteprocessrunner.cpp
View File

@@ -56,12 +56,13 @@ public:
void runInTerminal(const QByteArray &command, const SshPseudoTerminal &terminal,
const SshConnectionParameters &sshParams);
QByteArray command() const { return m_command; }
Utils::SshError lastConnectionError() const { return m_lastConnectionError; }
QString lastConnectionErrorString() const { return m_lastConnectionErrorString; }
SshConnection::Ptr m_connection;
SshRemoteProcess::Ptr m_process;
signals:
void connectionError(Utils::SshError);
void connectionError();
void processStarted();
void processOutputAvailable(const QByteArray &output);
void processErrorOutputAvailable(const QByteArray &output);
@@ -82,10 +83,13 @@ private:
void assertState(const QList<State> &allowedStates, const char *func);
void assertState(State allowedState, const char *func);
SshConnection::Ptr m_connection;
State m_state;
bool m_runInTerminal;
SshPseudoTerminal m_terminal;
QByteArray m_command;
Utils::SshError m_lastConnectionError;
QString m_lastConnectionErrorString;
};
@@ -120,6 +124,8 @@ void SshRemoteProcessRunnerPrivate::run(const QByteArray &command,
setState(Inactive);
setState(Connecting);
m_lastConnectionError = SshNoError;
m_lastConnectionErrorString.clear();
m_command = command;
m_connection = SshConnectionManager::instance().acquireConnection(sshParams);
connect(m_connection.data(), SIGNAL(error(Utils::SshError)),
@@ -155,8 +161,10 @@ void SshRemoteProcessRunnerPrivate::handleConnected()
void SshRemoteProcessRunnerPrivate::handleConnectionError(Utils::SshError error)
{
m_lastConnectionError = error;
m_lastConnectionErrorString = m_connection->errorString();
handleDisconnected();
emit connectionError(error);
emit connectionError();
}
void SshRemoteProcessRunnerPrivate::handleDisconnected()
@@ -200,6 +208,7 @@ void SshRemoteProcessRunnerPrivate::setState(State state)
if (m_connection) {
disconnect(m_connection.data(), 0, this, 0);
SshConnectionManager::instance().releaseConnection(m_connection);
m_connection.clear();
}
}
}
@@ -223,8 +232,7 @@ void SshRemoteProcessRunnerPrivate::assertState(State allowedState,
SshRemoteProcessRunner::SshRemoteProcessRunner(QObject *parent)
: QObject(parent), d(new Internal::SshRemoteProcessRunnerPrivate(this))
{
connect(d, SIGNAL(connectionError(Utils::SshError)),
SIGNAL(connectionError(Utils::SshError)));
connect(d, SIGNAL(connectionError()), SIGNAL(connectionError()));
connect(d, SIGNAL(processStarted()), SIGNAL(processStarted()));
connect(d, SIGNAL(processClosed(int)), SIGNAL(processClosed(int)));
connect(d, SIGNAL(processOutputAvailable(QByteArray)),
@@ -245,9 +253,15 @@ void SshRemoteProcessRunner::runInTerminal(const QByteArray &command,
}
QByteArray SshRemoteProcessRunner::command() const { return d->command(); }
SshConnection::Ptr SshRemoteProcessRunner::connection() const { return d->m_connection; }
SshError SshRemoteProcessRunner::lastConnectionError() const { return d->lastConnectionError(); }
SshRemoteProcess::Ptr SshRemoteProcessRunner::process() const { return d->m_process; }
QString SshRemoteProcessRunner::lastConnectionErrorString() const
{
return d->lastConnectionErrorString();
}
} // namespace Utils