feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
23,178 Commits 108 Branches 368 Tags
be1afbd6bb59d50c8d5ed1e69ea27a6fe0fee945
Commit Graph

76 Commits

Author SHA1 Message Date
Christian Kandeler
a899654ef4 SSH: Add debug message. 
Change-Id: I246ae125285da6c5be8e2acbe8547270a185d298
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2012-02-23 14:47:59 +01:00
Erik Verbruggen
3fa55b7ab9 Removed module names from #include directives. 
Getting the #include directives ready for Qt5. This includes the
new-project wizards.

Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-02-15 16:24:46 +01:00
Christian Kandeler
220f67dfdf SSH: Export information about the underlying TCP connection. 
Change-Id: I62bce3b563b6aba481642fac0d427c0f0d3b2ddd
Reviewed-by: hjk <qthjk@ovi.com>
 2012-02-10 16:16:42 +01:00
Christian Kandeler
05aa2b01fe SSH: Add download capability to SftpFileSystemModel. 
Change-Id: I156fa2ecc179f7f9a75ea0c1357b7e6881f5740f
Reviewed-by: hjk <qthjk@ovi.com>
 2012-02-06 18:06:57 +01:00
Christian Kandeler
24b4b0cfca SSH: Add SFTP-based remote file system model. 
- Read-only for now.
- Should get features such as download(QModelIndex) etc.

Change-Id: I491674484b9dbc729b1ffc762bd8e489a613dd25
Reviewed-by: hjk <qthjk@ovi.com>
 2012-02-03 16:23:12 +01:00
Christian Kandeler
7c0abc29cd SSH: Add SFTP operations needed to implement remote FS traversal. 
Change-Id: I3e7b52513211959a976545667e8e8372f2001c7e
Reviewed-by: hjk <qthjk@ovi.com>
 2012-02-02 13:23:37 +01:00
hjk
2931a499e6 Long live the king! 
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-26 19:55:36 +01:00
Christian Kandeler
8287cbe1fa SSH: Use enum for signals API. 
There is no reason to bother the user with the protocol-internal
strings.

Change-Id: I7ebec9147b2d00cfdc779920d9ceb18e26c59755
Reviewed-by: hjk <qthjk@ovi.com>
 2012-01-20 16:01:29 +01:00
Christian Kandeler
e1dbb3e5a9 SSH: Add possibility to force unencrypted private key. 
Change-Id: I1161ac5b40bc2d32b3a5a825ba907eea310e7691
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@nokia.com>
 2012-01-10 10:18:56 +01:00
Friedemann Kleint
ac54974b32 Utils: Compile with QT_NO_CAST_FROM_ASCII. 
Change-Id: I5cd5607fcd3311915217a1615b948587ef808cfa
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2012-01-06 09:31:14 +01:00
Tobias Hunger
6477d3f8c8 Fix crash in sshconnectionmanager 
Change-Id: I1cd3cc8eb93342685b14e41881d12852584adef4
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-12-13 17:26:15 +01:00
Tobias Hunger
da647ad690 ssh: Add option to force a new connection 
Allow for users to force the ssh connection manager to reconnect
instead of re-using an existing connection.

This makes sure the connection is never handed out again for new
requests but keeps it functional for as long as it is still in use
elsewhere.

Change-Id: I9c816c4af380bc3a898bd5cc3669e7062d58b172
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-12-13 11:47:40 +01:00
Christian Kandeler
16ad21be9d SSH: Print more helpful error message on key decoding error. 
The botan exception string doesn't help anybody.

Change-Id: I81b8b837b0cf3406a8293cbf85b8fd1bff9bfa74
Reviewed-by: hjk <qthjk@ovi.com>
 2011-12-07 17:40:09 +01:00
Eike Ziller
d30196daf3 Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/utils/ssh/sshconnection.cpp
	src/plugins/madde/maemopackagecreationstep.cpp
	src/plugins/qt4projectmanager/qmakestep.cpp

Change-Id: Id0c9185638038f7506bc9507872d6699345414a9
 2011-12-07 13:24:45 +01:00
Christian Kandeler
51511a3c59 SSH: Don't expose SshRemoteProcess object from SshRemoteProcessRunner. 
It's part of the internal state.

Change-Id: I2670be2d55c791435bd286150f4b4097e8d92f6d
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-12-05 12:54:37 +01:00
Christian Kandeler
1166dcd441 SSH: Ask for private key password right on connection start. 
This prevents event loop issues (e.g. connection timeout).

Task-number: QTCREATORBUG-6641
Change-Id: Ibeecaac2621e171a0590621fd9fdde8f7e3ab9c5
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-12-02 11:40:26 +01:00
Christian Kandeler
57c0979012 SSH: Support different read channels in SshRemoteProcess. 
This is part of the effort to support more QProcess concepts.

Change-Id: Idb888e733570a58d3810f371409b657b30bbd929
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-29 14:00:39 +01:00
Christian Kandeler
c43415e4ea SSH: Don't call FileReader::fetch() with empty file name. 
Harmless, but triggers a warning in Qt.

Change-Id: I8d86a5bf28a66e47a680d9dd277c4c85b1a8f63f
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-11-22 17:50:22 +01:00
Christian Kandeler
826354e3da SSH: Fix packet size bug. 
Uncovered by testing with dropbear.

Change-Id: Icd06ad5a20b568f7eef66d7f7381165cac4908d7
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-11-17 14:52:25 +01:00
Christian Kandeler
de03b1d7c9 SSH: SshRemoteProcessRunnerPrivate does not need to be a QObject. 
Change-Id: Iac8120ecdbb9d79a40924f9bbbdfe55fdd7fbf14
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-17 12:14:17 +01:00
Christian Kandeler
20520dd073 SSH: Replace idiosyncratic state checking with standard macros. 
Change-Id: I1dc92982749b601c803fea033820dcbf5cc75725
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-16 17:14:35 +01:00
Christian Kandeler
4c76e40617 SSH: Derive SshRemoteProcess from QIODevice. 
Now it looks even more like QProcess. Things like process channels are
still missing.

Change-Id: I3f30cd00ed4a054d02e83add9a6f4162b48f8345
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-11-15 17:32:55 +01:00
Christian Kandeler
232724cc11 SSH: Make API of SshRemoteProcess more similar to the one of QProcess. 
In the end, we want to derive it from QIODevice as well.

Change-Id: I30e7cb23ec8e5753c363d1f4457b650556860ac2
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-11-14 17:42:27 +01:00
Eike Ziller
85cf2b661e Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/plugins/debugger/qml/scriptconsole.cpp
	src/plugins/git/gitplugin.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h

Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
 2011-11-11 09:46:25 +01:00
Christian Kandeler
5d5db225a8 SSH: Don't allow external access to process runner's connection object. 
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>
 2011-11-09 17:41:27 +01:00
Christian Kandeler
fd26ab22e9 SSH: Improve SshRemoteProcessRunner API. 
It's silly that we fix the connection parameters in the constructor. A
given object of the class, once created, should be able to repeatedly
run any command with any connection.

Change-Id: Ia45b9d5b6f25c25fb46751cdb47cf81877d8f9a9
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-11-09 14:28:49 +01:00
hjk
31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/ 
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-11-03 10:33:19 +01:00
Christian Kandeler
2faf3b2548 SSH: SshRemoteProcessRunner does not need to be a shared pointer. 
Change-Id: I49cf2e113d23ebebe0939adbf90a1a88c84998a5
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-10-28 16:27:03 +02:00
Jarek Kobus
f86b05f5cb Fix typo 
Change-Id: I257c749ea8376a424cf343c5695bd983ffb457a4
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-10-12 14:36:02 +02:00
Christian Kandeler
1c52bed5d0 SSH: Allow querying of IP protocol version. 
Change-Id: I97c8b89da8c8d46afb0bdc840627e142567d5d98
Reviewed-on: http://codereview.qt-project.org/5981
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-10-04 14:34:29 +02:00
hjk
aea628a973 whitespace 
Change-Id: I67b156ab6f44ccdfe199b4928f6f62129b05b0b7
Reviewed-on: http://codereview.qt-project.org/5074
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-16 11:34:54 +02:00
Christian Kandeler
8801c76a8e Coding style: Pure virtual functions, private implementation pointers. 
Change-Id: I293f8dbd4e467e866bab381841659a07e32b9d90
Reviewed-on: http://codereview.qt-project.org/4948
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-15 10:33:56 +02:00
hjk
2a0f162132 utils/ssh: suppress warnings in release build 
Change-Id: I531a6b657b52540506662e670d1a2a6404fbc7b8
Reviewed-on: http://codereview.qt.nokia.com/3332
Reviewed-by: hjk <qthjk@ovi.com>
 2011-08-22 18:41:44 +02:00
Christian Kandeler
791ee38298 SSH: Support password input for private keys in non-GUI applications. 
Change-Id: Ibd5e47409e92edb6909053d7f17e67b6fa72e642
Reviewed-on: http://codereview.qt.nokia.com/2384
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-07-29 10:17:37 +02:00
Christian Kandeler
d037858091 SSH: Allow creation of encrypted keys. 
Change-Id: Id896246ad9f82d37cc7594c80e5bcf9c042149ce
Reviewed-on: http://codereview.qt.nokia.com/2351
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-07-28 16:55:10 +02:00
Christian Kandeler
70407c73e5 SSH: Produce "mixed" key files by default. 
I.e. the private key in PKCS8 format, the public key in a format
suitable for OpenSSH's authorized_keys file. Seems like the most
pragmatic solution for now.

Change-Id: I02d9bf4d98d836d9fc33453bff0b3f4834e7e173
Reviewed-on: http://codereview.qt.nokia.com/2350
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-07-28 16:53:35 +02:00
Christian Kandeler
a82551641f SSH: Support encrypted private keys in PKCS8 format. 
Change-Id: I2fd10c1992442317b3ba7a7012f66a328930ef84
Reviewed-on: http://codereview.qt.nokia.com/2349
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-07-28 16:49:23 +02:00
Christian Kandeler
344e00aabe SSH: Fix PKCS8 key reading. 
Change-Id: I68db752269119cc4231151991eadf5ba176f056e
Reviewed-on: http://codereview.qt.nokia.com/2348
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-07-28 16:47:58 +02:00
Christian Kandeler
d59a64c7df SSH: Implement remote shell support. 
Change-Id: Ifcddd930bbf027f4828f8ba01544aca5dea1eeed
Reviewed-on: http://codereview.qt.nokia.com/2220
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-07-26 18:17:11 +02:00
hjk
82bbac7f90 Remove unneeded defines. 
Mostly Q_DISABLE_COPY that were covered by the un-copy-ability of the
respective base classes. Includes a few "stylistic" whitespace changes.

Change-Id: I31ca0e7bada5ed0f34776976efe22ddc444a5bf2
Reviewed-on: http://codereview.qt.nokia.com/1609
Reviewed-by: hjk <qthjk@ovi.com>
 2011-07-14 12:15:38 +02:00
Christian Kandeler
9198aa23f2 RemoteLinux: Improve handling of symbolic links when deploying. 
We used to follow the links, resulting in unnecessary traffic.
Now we just recreate the links.
Note: This requires the user to not have dependencies that resolve to
something outside the set of files to deploy.

Change-Id: I3f439739115b4d07b36a71fe2041d8725a25abfd
Reviewed-on: http://codereview.qt.nokia.com/1582
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-07-13 12:59:19 +02:00
Christian Kandeler
72e436de44 SSH: Add ability to create symbolic links on remote host. 
Change-Id: I6fda991c342acb2b64fe1e0078e9df43590119c6
Reviewed-on: http://codereview.qt.nokia.com/1531
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-07-13 11:19:50 +02:00
Christian Kandeler
0efdb6cde6 SSH: Fix race condition. 
Change-Id: I4f52a2b604db14d088f2416989a502f91a16deab
Reviewed-on: http://codereview.qt.nokia.com/1237
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-07-06 15:06:20 +02:00
Christian Kandeler
ee635dcf9e SSH: Don't allow connectToHost() while already connecting/connected. 
Also fix callers potentially violating this policy.

Change-Id: I630f1c544885df93a81e217e792363c0c2314108
Reviewed-on: http://codereview.qt.nokia.com/1186
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-07-06 13:09:05 +02:00
Christian Kandeler
2101eff1ef SSH: Set keep-alive timer period to connection timeout. 
The Qt SDK's Qemu can be so slow that a single packet takes more
than the old fixed value of five seconds for a round trip.

Change-Id: I06f442c3c080fec8d1b1d10bd26e2e27b06e6863
Reviewed-on: http://codereview.qt.nokia.com/854
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-06-28 18:10:32 +02:00
Christian Kandeler
efbcb3860d SSH: set correct attributes when uploading a file. 
Change-Id: I59484d5e66491e8941992abdd2a478364ec258a7
Reviewed-on: http://codereview.qt.nokia.com/710
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-06-24 15:33:23 +02:00
Tobias Hunger
6e5db5f444 Fix: Consistently use class for sshconnectionparameters 
Change-Id: I4b281418589e3e86a59175cd0388c7f6c73619d3
Reviewed-on: http://codereview.qt.nokia.com/346
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-06-07 09:55:03 +02:00
Christian Kandeler
7404b4c3f4 Make constructor explicit. 2011-05-13 09:50:14 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +02:00
Christian Kandeler
53ff5b187c SSH: Don't send keep-alive packet during key exchange. 
Only certain types of messages are allowed in that phase.
 2011-04-28 11:22:08 +02:00