1 files changed, 29 insertions, 10 deletions
diff --git a/tests/arthur/baselineserver/src/baselineserver.cpp b/tests/arthur/baselineserver/src/baselineserver.cpp
index 0c0871ae6f..97ee80ce7c 100644
--- a/tests/arthur/baselineserver/src/baselineserver.cpp
+++ b/tests/arthur/baselineserver/src/baselineserver.cpp
@@ -60,6 +60,7 @@ const QString PI_CreationDate(QLS("CreationDate"));
 
 QString BaselineServer::storage;
 QString BaselineServer::url;
+QString BaselineServer::settingsFile;
 
 BaselineServer::BaselineServer(QObject *parent)
     : QTcpServer(parent), lastRunIdIdx(0)
@@ -91,6 +92,15 @@ QString BaselineServer::baseUrl()
     return url;
 }
 
+QString BaselineServer::settingsFilePath()
+{
+    if (settingsFile.isEmpty()) {
+        QString exeName = QCoreApplication::applicationFilePath().section(QLC('/'), -1);
+        settingsFile = storagePath() + QLC('/') + exeName + QLS(".ini");
+    }
+    return settingsFile;
+}
+
 void BaselineServer::incomingConnection(int socketDescriptor)
 {
     QString runId = QDateTime::currentDateTime().toString(QLS("MMMdd-hhmmss"));
@@ -144,6 +154,8 @@ void BaselineThread::run()
 BaselineHandler::BaselineHandler(const QString &runId, int socketDescriptor)
     : QObject(), runId(runId), connectionEstablished(false)
 {
+    settings = new QSettings(BaselineServer::settingsFilePath(), QSettings::IniFormat, this);
+
     if (socketDescriptor == -1)
         return;
 
@@ -162,6 +174,7 @@ bool BaselineHandler::establishConnection()
 {
     if (!proto.acceptConnection(&plat)) {
         qWarning() << runId << logtime() << "Accepting new connection from" << proto.socket.peerAddress().toString() << "failed." << proto.errorMessage();
+        proto.sendBlock(BaselineProtocol::Abort, proto.errorMessage().toLatin1());  // In case the client can hear us, tell it what's wrong.
         proto.socket.disconnectFromHost();
         return false;
     }
@@ -173,17 +186,23 @@ bool BaselineHandler::establishConnection()
     qDebug() << runId << logtime() << "Connection established with" << plat.value(PI_HostName)
              << "[" << qPrintable(plat.value(PI_HostAddress)) << "]" << logMsg;
 
-    // Filter on branch
-    QString branch = plat.value(PI_PulseGitBranch);
-    if (branch.isEmpty()) {
-        // Not run by Pulse, i.e. ad hoc run: Ok.
-    }
-    else if (branch != QLS("master-integration") || !plat.value(PI_GitCommit).contains(QLS("Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration"))) {
-        qDebug() << runId << logtime() << "Did not pass branch/staging repo filter, disconnecting.";
-        proto.sendBlock(BaselineProtocol::Abort, QByteArray("This branch/staging repo is not assigned to be tested."));
-        proto.socket.disconnectFromHost();
-        return false;
+    settings->beginGroup("ClientFilters");
+    if (!settings->childKeys().isEmpty() && !plat.value(PI_PulseGitBranch).isEmpty()) {  // i.e. not adhoc client
+        // Abort if client does not match the filters
+        foreach (QString filterKey, settings->childKeys()) {
+            QString filter = settings->value(filterKey).toString();
+            QString platVal = plat.value(filterKey);
+            if (filter.isEmpty() || platVal.isEmpty())
+                continue;  // tbd: add a syntax for specifying a "value-must-be-present" filter
+            if (!platVal.contains(filter)) {
+                qDebug() << runId << logtime() << "Did not pass client filter on" << filterKey << "; disconnecting.";
+                proto.sendBlock(BaselineProtocol::Abort, QByteArray("Configured to not do testing for this client or repo, ref. ") + BaselineServer::settingsFilePath().toLatin1());
+                proto.socket.disconnectFromHost();
+                return false;
+            }
+        }
     }
+    settings->endGroup();
 
     proto.sendBlock(BaselineProtocol::Ack, QByteArray());