Swift
summaryrefslogtreecommitdiffstats
path: root/Swiften/SASL
diff options
context:
space:
mode:
authorEdwin Mons <edwin.mons@isode.com>2019-11-19 13:36:05 (GMT)
committerEdwin Mons <edwin.mons@isode.com>2019-11-19 13:58:45 (GMT)
commit261ba8d8595ed8cb90f9c4feb1d6ef642942bcba (patch)
treec7e60d473509db8c4dbff5aa83fbde963d8dd75e /Swiften/SASL
parent697ae6ae84512a744958b24118197ec7bfdbc1f0 (diff)
downloadswift-261ba8d8595ed8cb90f9c4feb1d6ef642942bcba.zip
swift-261ba8d8595ed8cb90f9c4feb1d6ef642942bcba.tar.bz2
Remove std::endl from SWIFT_LOG calls
The std::endl is now added by ~Log, but only for output to stderr or a log file. Calls to the Android logging system or manually set callbacks will not include the newline in the logging output. JIRA: SWIFT-430 Test-Information: Unit tests pass on Debian 9 Checked that running Swift with logging to stderr still had a newline. Change-Id: I096fdba78a3b8f87db2097951c28c528592183e8
Diffstat (limited to 'Swiften/SASL')
-rw-r--r--Swiften/SASL/WindowsAuthentication.cpp34
-rw-r--r--Swiften/SASL/WindowsGSSAPIClientAuthenticator.cpp24
-rw-r--r--Swiften/SASL/WindowsServicePrincipalName.cpp20
3 files changed, 39 insertions, 39 deletions
diff --git a/Swiften/SASL/WindowsAuthentication.cpp b/Swiften/SASL/WindowsAuthentication.cpp
index b86381b..f951fac 100644
--- a/Swiften/SASL/WindowsAuthentication.cpp
+++ b/Swiften/SASL/WindowsAuthentication.cpp
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (c) 2015-2016 Isode Limited. 2 * Copyright (c) 2015-2019 Isode Limited.
3 * All rights reserved. 3 * All rights reserved.
4 * See the COPYING file for more information. 4 * See the COPYING file for more information.
5 */ 5 */
@@ -16,14 +16,14 @@
16#define ASSIGN_ERROR(status, errorCode) \ 16#define ASSIGN_ERROR(status, errorCode) \
17{ \ 17{ \
18 errorCode = std::make_shared<boost::system::error_code>(status, boost::system::system_category()); \ 18 errorCode = std::make_shared<boost::system::error_code>(status, boost::system::system_category()); \
19 SWIFT_LOG(debug) << std::hex << "status: 0x" << status << ": " << errorCode->message() << std::endl; \ 19 SWIFT_LOG(debug) << std::hex << "status: 0x" << status << ": " << errorCode->message(); \
20} 20}
21 21
22#define ASSIGN_SEC_ERROR(status, errorCode) \ 22#define ASSIGN_SEC_ERROR(status, errorCode) \
23{ \ 23{ \
24 if (status == SEC_E_OK) \ 24 if (status == SEC_E_OK) \
25 { \ 25 { \
26 SWIFT_LOG(debug) << "success" << std::endl; \ 26 SWIFT_LOG(debug) << "success"; \
27 } \ 27 } \
28 else { \ 28 else { \
29 ASSIGN_ERROR(status, errorCode); \ 29 ASSIGN_ERROR(status, errorCode); \
@@ -46,14 +46,14 @@ std::shared_ptr<boost::system::error_code> getUserNameEx(std::string& userName,
46 std::size_t position; 46 std::size_t position;
47 47
48 userName = convertWStringToString(std::wstring(vecptr(value), length)); 48 userName = convertWStringToString(std::wstring(vecptr(value), length));
49 SWIFT_LOG(debug) << "User Name: " << userName << std::endl; 49 SWIFT_LOG(debug) << "User Name: " << userName;
50 50
51 position = userName.find("\\"); 51 position = userName.find("\\");
52 clientName = userName.substr(position + 1); 52 clientName = userName.substr(position + 1);
53 SWIFT_LOG(debug) << "Client name: " << clientName << std::endl; 53 SWIFT_LOG(debug) << "Client name: " << clientName;
54 54
55 serverName = userName.substr(0, position); 55 serverName = userName.substr(0, position);
56 SWIFT_LOG(debug) << "Server name: " << serverName << std::endl; 56 SWIFT_LOG(debug) << "Server name: " << serverName;
57 57
58 break; 58 break;
59 } 59 }
@@ -161,7 +161,7 @@ std::shared_ptr<boost::system::error_code> initializeSecurityContext(const boost
161 } 161 }
162 if ((status == SEC_E_OK) || (status == SEC_I_COMPLETE_AND_CONTINUE) || (status == SEC_I_COMPLETE_NEEDED) || (status == SEC_I_CONTINUE_NEEDED)) { 162 if ((status == SEC_E_OK) || (status == SEC_I_COMPLETE_AND_CONTINUE) || (status == SEC_I_COMPLETE_NEEDED) || (status == SEC_I_CONTINUE_NEEDED)) {
163 outputToken = createSafeByteArray (static_cast<unsigned char *>(outputTokenBuffer.pvBuffer), outputTokenBuffer.cbBuffer); 163 outputToken = createSafeByteArray (static_cast<unsigned char *>(outputTokenBuffer.pvBuffer), outputTokenBuffer.cbBuffer);
164 SWIFT_LOG(debug) << "outputToken.size(): " << outputToken.size() << std::endl; 164 SWIFT_LOG(debug) << "outputToken.size(): " << outputToken.size();
165 freeContextBuffer(outputTokenBuffer.pvBuffer); 165 freeContextBuffer(outputTokenBuffer.pvBuffer);
166 166
167 return std::shared_ptr<boost::system::error_code>(); /* success */ 167 return std::shared_ptr<boost::system::error_code>(); /* success */
@@ -229,7 +229,7 @@ std::shared_ptr<boost::system::error_code> decryptMessage(const PCtxtHandle cont
229 messageBuffer[1].cbBuffer = 0; 229 messageBuffer[1].cbBuffer = 0;
230 messageBuffer[1].pvBuffer = NULL; 230 messageBuffer[1].pvBuffer = NULL;
231 231
232 SWIFT_LOG(debug) << "inputMessage.size(): " << inputMessage.size() << std::endl; 232 SWIFT_LOG(debug) << "inputMessage.size(): " << inputMessage.size();
233 233
234 status = DecryptMessage( 234 status = DecryptMessage(
235 contextHandle, 235 contextHandle,
@@ -239,13 +239,13 @@ std::shared_ptr<boost::system::error_code> decryptMessage(const PCtxtHandle cont
239 ASSIGN_SEC_ERROR(status, errorCode); 239 ASSIGN_SEC_ERROR(status, errorCode);
240 if (status == SEC_E_OK) { 240 if (status == SEC_E_OK) {
241 if (qualityOfProtection == SECQOP_WRAP_NO_ENCRYPT) { 241 if (qualityOfProtection == SECQOP_WRAP_NO_ENCRYPT) {
242 SWIFT_LOG(debug) << "Message was signed only" << std::endl; 242 SWIFT_LOG(debug) << "Message was signed only";
243 } 243 }
244 else { 244 else {
245 SWIFT_LOG(debug) << "Message was encrypted" << std::endl; 245 SWIFT_LOG(debug) << "Message was encrypted";
246 } 246 }
247 247
248 SWIFT_LOG(debug) << "messageBuffer[1].cbBuffer: " << messageBuffer[1].cbBuffer << std::endl; 248 SWIFT_LOG(debug) << "messageBuffer[1].cbBuffer: " << messageBuffer[1].cbBuffer;
249 249
250 decrypted = createSafeByteArray (static_cast<unsigned char *>(messageBuffer[1].pvBuffer), messageBuffer[1].cbBuffer); 250 decrypted = createSafeByteArray (static_cast<unsigned char *>(messageBuffer[1].pvBuffer), messageBuffer[1].cbBuffer);
251 } 251 }
@@ -281,9 +281,9 @@ std::shared_ptr<boost::system::error_code> encryptMessage(const PCtxtHandle cont
281 messageBuffer[2].cbBuffer = sizes.cbBlockSize; 281 messageBuffer[2].cbBuffer = sizes.cbBlockSize;
282 messageBuffer[2].pvBuffer = vecptr(blockSize); 282 messageBuffer[2].pvBuffer = vecptr(blockSize);
283 283
284 SWIFT_LOG(debug) << "sizes.cbSecurityTrailer: " << sizes.cbSecurityTrailer << std::endl; 284 SWIFT_LOG(debug) << "sizes.cbSecurityTrailer: " << sizes.cbSecurityTrailer;
285 SWIFT_LOG(debug) << "inputMessage.size(): " << inputMessage.size() << std::endl; 285 SWIFT_LOG(debug) << "inputMessage.size(): " << inputMessage.size();
286 SWIFT_LOG(debug) << "sizes.cbBlockSize: " << sizes.cbBlockSize << std::endl; 286 SWIFT_LOG(debug) << "sizes.cbBlockSize: " << sizes.cbBlockSize;
287 287
288 status = EncryptMessage( 288 status = EncryptMessage(
289 contextHandle, 289 contextHandle,
@@ -294,9 +294,9 @@ std::shared_ptr<boost::system::error_code> encryptMessage(const PCtxtHandle cont
294 if (status == SEC_E_OK) { 294 if (status == SEC_E_OK) {
295 unsigned char* pointer; 295 unsigned char* pointer;
296 296
297 SWIFT_LOG(debug) << "messageBuffer[0].cbBuffer: " << messageBuffer[0].cbBuffer << std::endl; 297 SWIFT_LOG(debug) << "messageBuffer[0].cbBuffer: " << messageBuffer[0].cbBuffer;
298 SWIFT_LOG(debug) << "messageBuffer[1].cbBuffer: " << messageBuffer[1].cbBuffer << std::endl; 298 SWIFT_LOG(debug) << "messageBuffer[1].cbBuffer: " << messageBuffer[1].cbBuffer;
299 SWIFT_LOG(debug) << "messageBuffer[2].cbBuffer: " << messageBuffer[2].cbBuffer << std::endl; 299 SWIFT_LOG(debug) << "messageBuffer[2].cbBuffer: " << messageBuffer[2].cbBuffer;
300 300
301 output.resize(messageBuffer[0].cbBuffer + messageBuffer[1].cbBuffer + messageBuffer[2].cbBuffer); 301 output.resize(messageBuffer[0].cbBuffer + messageBuffer[1].cbBuffer + messageBuffer[2].cbBuffer);
302 pointer = vecptr(output); 302 pointer = vecptr(output);
diff --git a/Swiften/SASL/WindowsGSSAPIClientAuthenticator.cpp b/Swiften/SASL/WindowsGSSAPIClientAuthenticator.cpp
index aae437f..10e8c89 100644
--- a/Swiften/SASL/WindowsGSSAPIClientAuthenticator.cpp
+++ b/Swiften/SASL/WindowsGSSAPIClientAuthenticator.cpp
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (c) 2015-2016 Isode Limited. 2 * Copyright (c) 2015-2019 Isode Limited.
3 * All rights reserved. 3 * All rights reserved.
4 * See the COPYING file for more information. 4 * See the COPYING file for more information.
5 */ 5 */
@@ -44,7 +44,7 @@ WindowsGSSAPIClientAuthenticator::~WindowsGSSAPIClientAuthenticator() {
44} 44}
45 45
46boost::optional<SafeByteArray> WindowsGSSAPIClientAuthenticator::getResponse() const { 46boost::optional<SafeByteArray> WindowsGSSAPIClientAuthenticator::getResponse() const {
47 SWIFT_LOG(debug) << "response_.size(): " << response_.size() << std::endl; 47 SWIFT_LOG(debug) << "response_.size(): " << response_.size();
48 return response_; 48 return response_;
49} 49}
50 50
@@ -56,7 +56,7 @@ bool WindowsGSSAPIClientAuthenticator::setChallenge(const boost::optional<ByteAr
56 } 56 }
57 else if (step_ == SecurityLayerNegotiation) { 57 else if (step_ == SecurityLayerNegotiation) {
58 if (!challengeData) { 58 if (!challengeData) {
59 SWIFT_LOG(debug) << "Empty message received from the server" << std::endl; 59 SWIFT_LOG(debug) << "Empty message received from the server";
60 error_ = true; 60 error_ = true;
61 return false; 61 return false;
62 } 62 }
@@ -68,7 +68,7 @@ bool WindowsGSSAPIClientAuthenticator::setChallenge(const boost::optional<ByteAr
68 } 68 }
69 69
70 if (challenge.size() != 4) { 70 if (challenge.size() != 4) {
71 SWIFT_LOG(debug) << "Token received from the server of incorrect length: " << challenge.size() << std::endl; 71 SWIFT_LOG(debug) << "Token received from the server of incorrect length: " << challenge.size();
72 error_ = true; 72 error_ = true;
73 return false; 73 return false;
74 } 74 }
@@ -77,14 +77,14 @@ bool WindowsGSSAPIClientAuthenticator::setChallenge(const boost::optional<ByteAr
77 77
78 unsigned char serverSecurityLayer = challengePointer[0]; 78 unsigned char serverSecurityLayer = challengePointer[0];
79 if (serverSecurityLayer == 0) { 79 if (serverSecurityLayer == 0) {
80 SWIFT_LOG(debug) << "Server supports unknown security layer, assuming no security layer" << std::endl; 80 SWIFT_LOG(debug) << "Server supports unknown security layer, assuming no security layer";
81 serverSecurityLayer = SECURITY_LAYER_NONE; 81 serverSecurityLayer = SECURITY_LAYER_NONE;
82 } 82 }
83 else if (serverSecurityLayer == SECURITY_LAYER_NONE) { 83 else if (serverSecurityLayer == SECURITY_LAYER_NONE) {
84 SWIFT_LOG(debug) << "Server supports no security layer" << std::endl; 84 SWIFT_LOG(debug) << "Server supports no security layer";
85 } 85 }
86 else { 86 else {
87 SWIFT_LOG(debug) << "Server supports security layer" << std::endl; 87 SWIFT_LOG(debug) << "Server supports security layer";
88 } 88 }
89 89
90 unsigned int serverMaximumBuffer = (challengePointer[1] << 16) | 90 unsigned int serverMaximumBuffer = (challengePointer[1] << 16) |
@@ -92,7 +92,7 @@ bool WindowsGSSAPIClientAuthenticator::setChallenge(const boost::optional<ByteAr
92 (challengePointer[3] << 0); 92 (challengePointer[3] << 0);
93 93
94 if ((serverSecurityLayer == SECURITY_LAYER_NONE) && (serverMaximumBuffer != 0)) { 94 if ((serverSecurityLayer == SECURITY_LAYER_NONE) && (serverMaximumBuffer != 0)) {
95 SWIFT_LOG(debug) << "Server supports no security layer but has maximum buffer size" << serverMaximumBuffer << std::endl; 95 SWIFT_LOG(debug) << "Server supports no security layer but has maximum buffer size" << serverMaximumBuffer;
96 error_ = true; 96 error_ = true;
97 return false; 97 return false;
98 } 98 }
@@ -158,7 +158,7 @@ void WindowsGSSAPIClientAuthenticator::buildSecurityContext(const boost::optiona
158 } 158 }
159 159
160 if (contextSupported & ISC_REQ_MUTUAL_AUTH == 0) { 160 if (contextSupported & ISC_REQ_MUTUAL_AUTH == 0) {
161 SWIFT_LOG(debug) << "Mutual authentication not supported" << std::endl; 161 SWIFT_LOG(debug) << "Mutual authentication not supported";
162 error_ = true; 162 error_ = true;
163 return; 163 return;
164 } 164 }
@@ -181,14 +181,14 @@ void WindowsGSSAPIClientAuthenticator::buildSecurityContext(const boost::optiona
181 } 181 }
182 182
183 userName_ = names.sUserName; 183 userName_ = names.sUserName;
184 SWIFT_LOG(debug) << "User name: " << userName_ << std::endl; 184 SWIFT_LOG(debug) << "User name: " << userName_;
185 185
186 std::size_t position = userName_.find("\\"); 186 std::size_t position = userName_.find("\\");
187 clientName_ = userName_.substr(position + 1); 187 clientName_ = userName_.substr(position + 1);
188 SWIFT_LOG(debug) << "Client name: " << clientName_ << std::endl; 188 SWIFT_LOG(debug) << "Client name: " << clientName_;
189 189
190 serverName_ = userName_.substr(0, position); 190 serverName_ = userName_.substr(0, position);
191 SWIFT_LOG(debug) << "Server name: " << serverName_ << std::endl; 191 SWIFT_LOG(debug) << "Server name: " << serverName_;
192 192
193 freeContextBuffer(names.sUserName); 193 freeContextBuffer(names.sUserName);
194 step_ = SecurityLayerNegotiation; 194 step_ = SecurityLayerNegotiation;
diff --git a/Swiften/SASL/WindowsServicePrincipalName.cpp b/Swiften/SASL/WindowsServicePrincipalName.cpp
index 419395c..6c87925 100644
--- a/Swiften/SASL/WindowsServicePrincipalName.cpp
+++ b/Swiften/SASL/WindowsServicePrincipalName.cpp
@@ -64,7 +64,7 @@ std::string WindowsServicePrincipalName::toString() {
64 firstCall = false; 64 firstCall = false;
65 } 65 }
66 66
67 SWIFT_LOG(debug) << "SPN: " << str << std::endl; 67 SWIFT_LOG(debug) << "SPN: " << str;
68 return str; 68 return str;
69} 69}
70 70
@@ -72,17 +72,17 @@ DWORD WindowsServicePrincipalName::dsMakeSpn(DWORD* length, wchar_t* value) {
72 DWORD status; 72 DWORD status;
73 73
74#ifdef UNICODE 74#ifdef UNICODE
75 SWIFT_LOG(debug) << "UNICODE is defined" << std::endl; 75 SWIFT_LOG(debug) << "UNICODE is defined";
76#else 76#else
77 SWIFT_LOG(debug) << "UNICODE is not defined" << std::endl; 77 SWIFT_LOG(debug) << "UNICODE is not defined";
78#endif 78#endif
79 79
80 SWIFT_LOG(debug) << "serviceClass_: " << convertWStringToString(serviceClass_.c_str()) << std::endl; 80 SWIFT_LOG(debug) << "serviceClass_: " << convertWStringToString(serviceClass_.c_str());
81 SWIFT_LOG(debug) << "serviceName_: " << convertWStringToString(serviceName_.c_str()) << std::endl; 81 SWIFT_LOG(debug) << "serviceName_: " << convertWStringToString(serviceName_.c_str());
82 SWIFT_LOG(debug) << "instanceName_: " << convertWStringToString(instanceName_.c_str()) << std::endl; 82 SWIFT_LOG(debug) << "instanceName_: " << convertWStringToString(instanceName_.c_str());
83 SWIFT_LOG(debug) << "referrer_: " << convertWStringToString(referrer_.c_str()) << std::endl; 83 SWIFT_LOG(debug) << "referrer_: " << convertWStringToString(referrer_.c_str());
84 SWIFT_LOG(debug) << "instancePort_: " << instancePort_ << std::endl; 84 SWIFT_LOG(debug) << "instancePort_: " << instancePort_;
85 SWIFT_LOG(debug) << "length: " << *length << std::endl; 85 SWIFT_LOG(debug) << "length: " << *length;
86 86
87 /* Call the Unicode function because that is recommended: 87 /* Call the Unicode function because that is recommended:
88https://msdn.microsoft.com/en-us/library/windows/desktop/ff381407%28v=vs.85%29.aspx */ 88https://msdn.microsoft.com/en-us/library/windows/desktop/ff381407%28v=vs.85%29.aspx */
@@ -97,7 +97,7 @@ https://msdn.microsoft.com/en-us/library/windows/desktop/ff381407%28v=vs.85%29.a
97 if (status != ERROR_SUCCESS) { 97 if (status != ERROR_SUCCESS) {
98 boost::system::error_code errorCode(status, boost::system::system_category()); 98 boost::system::error_code errorCode(status, boost::system::system_category());
99 99
100 SWIFT_LOG(debug) << std::hex << "status: 0x" << status << ": " << errorCode.message() << std::endl; 100 SWIFT_LOG(debug) << std::hex << "status: 0x" << status << ": " << errorCode.message();
101 } 101 }
102 102
103 return status; 103 return status;