add optional IP logging to server

disabled by default

Author: Skycoder42

src/datasync/datatypestore.h

@@ -306,7 +306,8 @@ void DataTypeStore<TType, TKey>::evalDataChanged(int metaTypeId, const QString &
 				emit dataChanged(key, QVariant::fromValue(_store->load<TType>(key)));
 		}
 	} catch(QException &e) {
-		qWarning(QLoggingCategory{qUtf8Printable(QStringLiteral("qtdatasync.%1.DataTypeStore"))}) << "Failed to loaded changed data with error" << e.what(); //TODO arg setup name
+		qWarning(QLoggingCategory{qUtf8Printable(QStringLiteral("qtdatasync.%1.DataTypeStore").arg(setupName()))})
+				<< "Failed to loaded changed data with error" << e.what();
 	}
 }
 
@@ -439,7 +440,8 @@ void CachingDataTypeStore<TType, TKey>::evalDataChanged(int metaTypeId, const QS
 			}
 		}
 	} catch(QException &e) {
-		qWarning(QLoggingCategory{qUtf8Printable(QStringLiteral("qtdatasync.%1.CachingDataTypeStore"))}) << "Failed to loaded changed data with error" << e.what(); //TODO arg setup name
+		qWarning(QLoggingCategory{qUtf8Printable(QStringLiteral("qtdatasync.%1.CachingDataTypeStore").arg(setupName()))})
+				<< "Failed to loaded changed data with error" << e.what();
 	}
 }
 
@@ -599,7 +601,8 @@ void CachingDataTypeStore<TType*, TKey>::evalDataChanged(int metaTypeId, const Q
 			}
 		}
 	} catch(QException &e) {
-		qWarning(QLoggingCategory{qUtf8Printable(QStringLiteral("qtdatasync.%1.CachingDataTypeStore"))}) << "Failed to loaded changed data with error" << e.what(); //TODO arg setup name
+		qWarning(QLoggingCategory{qUtf8Printable(QStringLiteral("qtdatasync.%1.CachingDataTypeStore").arg(setupName()))})
+				<< "Failed to loaded changed data with error" << e.what();
 	}
 }
 

tests/auto/datasync/TestAppServer/qdsapp.conf

@@ -1,3 +1,6 @@
+[general]
+logIpAddress=true
+
 [server]
 host=localhost
 port=14242

tests/auto/datasync/TestEventCursor/tst_eventcursor.cpp

@@ -180,7 +180,7 @@ void TestEventCursor::testAdvanceSkip()
 			ObjectKey key;
 			bool wasRemoved;
 			std::tie(index, key, wasRemoved) = dataList.takeFirst();
-			//TODO c++17: auto[index, key, wasRemoved] = dataList.takeFirst();
+			//NOTE c++17: auto[index, key, wasRemoved] = dataList.takeFirst();
 
 			QCOMPARE(cursor->index(), index);
 			QCOMPARE(cursor->key(), key);
@@ -220,7 +220,7 @@ void TestEventCursor::testScanLog()
 				ObjectKey key;
 				bool wasRemoved;
 				std::tie(index, key, wasRemoved) = dataList.takeFirst();
-				//TODO c++17: auto[index, key, wasRemoved] = dataList.takeFirst();
+				//NOTE c++17: auto[index, key, wasRemoved] = dataList.takeFirst();
 
 				QCOMPARE(scanCursor, cursor);
 				QCOMPARE(scanCursor->index(), index);

tools/appserver/client.cpp

@@ -77,23 +77,16 @@ QThreadStorage<Client::Rng> Client::rngPool;
 
 Client::Client(DatabaseController *database, QWebSocket *websocket, QObject *parent) :
 	QObject(parent),
-	_catStr(),
-	_logCat(new QLoggingCategory("client.unknown")),
 	_database(database),
 	_socket(websocket),
-	_idleTimer(nullptr),
-	_uploadLimit(10),
-	_downLimit(20),
-	_downThreshold(10),
-	_queue(new SingleTaskQueue(qService->threadPool(), this)),
-	_state(Authenticating),
-	_deviceId(),
-	_loginNonce(),
-	_cachedChanges(0),
-	_activeDownloads()
+	_queue(new SingleTaskQueue(qService->threadPool(), this))
 {
 	_socket->setParent(this);
 
+	_logIp = qService->configuration()->value(QStringLiteral("logIpAddress"), _logIp).toBool();
+	_catStr = catBaseStr() + "unknown";
+	_logCat.reset(new QLoggingCategory(_catStr.constData()));
+
 	connect(_socket, &QWebSocket::disconnected,
 			this, &Client::closeClient);
 	connect(_socket, &QWebSocket::binaryMessageReceived,
@@ -328,6 +321,13 @@ void Client::run(const function<void ()> &fn)
 	});
 }
 
+QByteArray Client::catBaseStr() const
+{
+	return _logIp ?
+				QByteArray{"client.[" + _socket->peerAddress().toString().toUtf8() + "]."} :
+				QByteArray{"client."};
+}
+
 const QLoggingCategory &Client::logFn() const
 {
 	return *_logCat;
@@ -395,7 +395,7 @@ void Client::onRegister(const RegisterMessage &message, QDataStream &stream)
 		throw ClientErrorException(ErrorMessage::AuthenticationError);
 	}
 
-	_catStr = "client." + _deviceId.toByteArray();
+	_catStr = catBaseStr() + _deviceId.toByteArray();
 	_logCat.reset(new QLoggingCategory(_catStr.constData()));
 
 	qDebug() << "Created new device and user accounts";
@@ -424,7 +424,7 @@ void Client::onLogin(const LoginMessage &message, QDataStream &stream)
 	}
 
 	_deviceId = message.deviceId;
-	_catStr = "client." + _deviceId.toByteArray();
+	_catStr = catBaseStr() + _deviceId.toByteArray();
 	_logCat.reset(new QLoggingCategory(_catStr.constData()));
 
 	_database->updateLogin(_deviceId, message.deviceName);
@@ -463,7 +463,7 @@ void Client::onAccess(const AccessMessage &message, QDataStream &stream)
 	_deviceId = QUuid::createUuid(); //not stored yet!!!
 	_cachedAccessRequest = message;
 	//_cachedFingerPrint done inside of try/catch block
-	_catStr = "client." + _deviceId.toByteArray();
+	_catStr = catBaseStr() + _deviceId.toByteArray();
 	_logCat.reset(new QLoggingCategory(_catStr.constData()));
 
 	qDebug() << "New Devices requested account access from" << message.partnerId;

tools/appserver/client.h

@@ -94,25 +94,27 @@ private Q_SLOTS:
 	QWebSocket *_socket; //must only be accessed from the main thread
 
 	// "constant" members, that wont change after the constructor
-	QTimer *_idleTimer;
-	quint32 _uploadLimit;
-	quint32 _downLimit;
-	quint32 _downThreshold;
+	QTimer *_idleTimer = nullptr;
+	quint32 _uploadLimit = 10;
+	quint32 _downLimit = 20;
+	quint32 _downThreshold = 10;
+	bool _logIp = false;
 
 	// thread safe task queue, ensures only 1 task per client is run at the same time
 	SingleTaskQueue *_queue;
 
 	//following members must only be accessed from within a task (to ensure thread safety)
-	State _state;
+	State _state = Authenticating;
 	QUuid _deviceId;
 	QByteArray _loginNonce;
-	quint32 _cachedChanges;
+	quint32 _cachedChanges = 0;
 	QList<quint64> _activeDownloads;
 	//cached:
 	QtDataSync::AccessMessage _cachedAccessRequest;
 	QByteArray _cachedFingerPrint;
 
 	void run(const std::function<void()> &fn);
+	QByteArray catBaseStr() const;
 	const QLoggingCategory &logFn() const;
 
 	template<typename TMessage>

tools/appserver/qdsapp.conf

@@ -7,6 +7,7 @@ cleanup/auto=
 quota/limit=
 quota/force=
 loglevel=
+logIpAddress=
 
 [server]
 name=