Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-10-19 14:23:42 (GMT) |
|---|---|---|
| committer | Swift Review <review@swift.im> | 2015-11-10 18:28:39 (GMT) |
| commit | ab651834c9088e34e6e66eb105e0fb855f1572c4 (patch) | |
| tree | 611d434fedcb69f6698af9dc4696e59fba9d97b7 /Swiften/Session | |
| parent | 9b090062d0270d556c9253e0ddf767d7c5bbadbf (diff) | |
| download | swift-ab651834c9088e34e6e66eb105e0fb855f1572c4.zip swift-ab651834c9088e34e6e66eb105e0fb855f1572c4.tar.bz2 | |
Add support for client certificate authentication in BOSH
This allows to authenticate using SASL EXTERNAL over BOSH
using a client TLS certificate for the HTTPS connection of
the BOSH channel.
The implementation also enforces the HTTPS server certificate
of subsequent BOSH connections not to change.
This commit also removes TLSConnection and TLSConnectionFactory
as no code is using them.
Test-Information:
Tested against M-Link 16.3v6-0 on Debian 7.9 and Swift on
OS X 10.10.5. Verified working client certificate authentication.
Verified Swift not falling back to password-based authentication,
in case EXTERNAL is not allowed by the server over BOSH or
the client certificate is invalid.
Change-Id: Ia96bcac27cac9fc9261ed847c82c6328307bfbd1
Diffstat (limited to 'Swiften/Session')
| -rw-r--r-- | Swiften/Session/BOSHSessionStream.cpp | 13 | ||||
| -rw-r--r-- | Swiften/Session/BOSHSessionStream.h | 1 |
2 files changed, 10 insertions, 4 deletions
diff --git a/Swiften/Session/BOSHSessionStream.cpp b/Swiften/Session/BOSHSessionStream.cpp index 99af71d..7fb8b31 100644 --- a/Swiften/Session/BOSHSessionStream.cpp +++ b/Swiften/Session/BOSHSessionStream.cpp @@ -83,6 +83,11 @@ BOSHSessionStream::~BOSHSessionStream() { xmppLayer = NULL; } +void BOSHSessionStream::open() { + connectionPool->setTLSCertificate(getTLSCertificate()); + connectionPool->open(); +} + void BOSHSessionStream::handlePoolXMPPDataRead(const SafeByteArray& data) { xmppLayer->handleDataRead(data); } @@ -118,19 +123,19 @@ void BOSHSessionStream::addTLSEncryption() { } bool BOSHSessionStream::isTLSEncrypted() { - return false; + return connectionPool->isTLSEncrypted(); } Certificate::ref BOSHSessionStream::getPeerCertificate() const { - return Certificate::ref(); + return connectionPool->getPeerCertificate(); } std::vector<Certificate::ref> BOSHSessionStream::getPeerCertificateChain() const { - return std::vector<Certificate::ref>(); + return connectionPool->getPeerCertificateChain(); } boost::shared_ptr<CertificateVerificationError> BOSHSessionStream::getPeerCertificateVerificationError() const { - return boost::shared_ptr<CertificateVerificationError>(); + return connectionPool->getPeerCertificateVerificationError(); } ByteArray BOSHSessionStream::getTLSFinishMessage() const { diff --git a/Swiften/Session/BOSHSessionStream.h b/Swiften/Session/BOSHSessionStream.h index 191a6f4..66e41ea 100644 --- a/Swiften/Session/BOSHSessionStream.h +++ b/Swiften/Session/BOSHSessionStream.h @@ -51,6 +51,7 @@ namespace Swift { ); virtual ~BOSHSessionStream(); + void open(); virtual void close(); virtual bool isOpen(); |