Swiftdiff options
| author | Mili Verma <mili.verma@isode.com> | 2015-07-08 15:27:52 (GMT) |
|---|---|---|
| committer | Mili Verma <mili.verma@isode.com> | 2015-07-08 15:33:09 (GMT) |
| commit | 58bb58557368c520e8a9368fcacff8d22466e759 (patch) | |
| tree | bfd8bb3b93ab771482fe46e1d558f4ad399bdaa1 /Swiften/Client/ClientSession.h | |
| parent | 0e6beadc1b4427e8ab5109e52872f99a5f85c3d8 (diff) | |
| download | swift-58bb58557368c520e8a9368fcacff8d22466e759.zip swift-58bb58557368c520e8a9368fcacff8d22466e759.tar.bz2 | |
Use GSSAPI when SSO is used
This patch uses the GSSAPI authenticator on Windows if the server advertises it
and the client requests it. (The user is not able to request it in the UI yet)
Also sends the manual port to the GSSAPI authenticator to construct the SPN if
a non-default port is used.
Test-information:
Tested on Windows using WIP code. Tested both on TLS & without.
Unit tests pass.
Change-Id: I9a9ad9604fe084d5fb2003b7a91174a9512e2eec
Diffstat (limited to 'Swiften/Client/ClientSession.h')
| -rw-r--r-- | Swiften/Client/ClientSession.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/Swiften/Client/ClientSession.h b/Swiften/Client/ClientSession.h index 9bbc3f2..c4b6abe 100644 --- a/Swiften/Client/ClientSession.h +++ b/Swiften/Client/ClientSession.h | |||
| @@ -124,10 +124,22 @@ namespace Swift { | |||
| 124 | 124 | ||
| 125 | void setCertificateTrustChecker(CertificateTrustChecker* checker) { | 125 | void setCertificateTrustChecker(CertificateTrustChecker* checker) { |
| 126 | certificateTrustChecker = checker; | 126 | certificateTrustChecker = checker; |
| 127 | } | 127 | } |
| 128 | 128 | ||
| 129 | void setSingleSignOn(bool b) { | ||
| 130 | singleSignOn = b; | ||
| 131 | } | ||
| 132 | |||
| 133 | /** | ||
| 134 | * Sets the port number used in Kerberos authentication | ||
| 135 | * Does not affect network connectivity. | ||
| 136 | */ | ||
| 137 | void setAuthenticationPort(int i) { | ||
| 138 | authenticationPort = i; | ||
| 139 | } | ||
| 140 | |||
| 129 | public: | 141 | public: |
| 130 | boost::signal<void ()> onNeedCredentials; | 142 | boost::signal<void ()> onNeedCredentials; |
| 131 | boost::signal<void ()> onInitialized; | 143 | boost::signal<void ()> onInitialized; |
| 132 | boost::signal<void (boost::shared_ptr<Swift::Error>)> onFinished; | 144 | boost::signal<void (boost::shared_ptr<Swift::Error>)> onFinished; |
| 133 | boost::signal<void (boost::shared_ptr<Stanza>)> onStanzaReceived; | 145 | boost::signal<void (boost::shared_ptr<Stanza>)> onStanzaReceived; |
| @@ -181,7 +193,9 @@ namespace Swift { | |||
| 181 | ClientAuthenticator* authenticator; | 193 | ClientAuthenticator* authenticator; |
| 182 | boost::shared_ptr<StanzaAckRequester> stanzaAckRequester_; | 194 | boost::shared_ptr<StanzaAckRequester> stanzaAckRequester_; |
| 183 | boost::shared_ptr<StanzaAckResponder> stanzaAckResponder_; | 195 | boost::shared_ptr<StanzaAckResponder> stanzaAckResponder_; |
| 184 | boost::shared_ptr<Swift::Error> error_; | 196 | boost::shared_ptr<Swift::Error> error_; |
| 185 | CertificateTrustChecker* certificateTrustChecker; | 197 | CertificateTrustChecker* certificateTrustChecker; |
| 198 | bool singleSignOn; | ||
| 199 | int authenticationPort; | ||
| 186 | }; | 200 | }; |
| 187 | } | 201 | } |