Rename ThreadAuth to ThreadGlobals

Because that's what's it is now. A lot of code can be refactored to get the settings from this now, but I'm not going to do that yet.

Rename ThreadAuth to ThreadGlobals
Because that's what's it is now. A lot of code can be refactored to get the settings from this now, but I'm not going to do that yet.
Wiebe Cazemier
1 parent 3f3708fd
Showing 11 changed files with 70 additions and 61 deletions
CMakeLists.txt
FlashMQTests/FlashMQTests.pro
FlashMQTests/tst_maintests.cpp
mainapp.cpp
mqttpacket.cpp
session.cpp
threadauth.cpp
threadglobals.cpp
threadauth.h → threadglobals.h
threadloop.cpp
threadloop.h
@@ -56,7 +56,7 @@ add_executable(FlashMQ
     persistencefile.h
     sessionsandsubscriptionsdb.h
     qospacketqueue.h
-    threadauth.h
+    threadglobals.h
     threadloop.h
     mainapp.cpp
@@ -93,7 +93,7 @@ add_executable(FlashMQ
     persistencefile.cpp
     sessionsandsubscriptionsdb.cpp
     qospacketqueue.cpp
-    threadauth.cpp
+    threadglobals.cpp
     threadloop.cpp
     )
@@ -47,7 +47,7 @@ SOURCES +=  tst_maintests.cpp \
     ../persistencefile.cpp \
     ../sessionsandsubscriptionsdb.cpp \
     ../qospacketqueue.cpp \
-    ../threadauth.cpp \
+    ../threadglobals.cpp \
     ../threadloop.cpp \
     mainappthread.cpp \
     twoclienttestcontext.cpp
@@ -88,7 +88,7 @@ HEADERS += \
     ../persistencefile.h \
     ../sessionsandsubscriptionsdb.h \
     ../qospacketqueue.h \
-    ../threadauth.h \
+    ../threadglobals.h \
     ../threadloop.h \
     mainappthread.h \
     twoclienttestcontext.h
@@ -33,7 +33,7 @@ License along with FlashMQ. If not, see &lt;https://www.gnu.org/licenses/&gt;.
 #include "sessionsandsubscriptionsdb.h"
 #include "session.h"
 #include "threaddata.h"
-#include "threadauth.h"
+#include "threadglobals.h"
 // Dumb Qt version gives warnings when comparing uint with number literal.
 template <typename T1, typename T2>
@@ -996,7 +996,7 @@ void MainTests::testSavingSessions()
         // Kind of a hack...
         Authentication auth(*settings.get());
-        ThreadAuth::assign(&auth);
+        ThreadGlobals::assign(&auth);
         std::shared_ptr<Client> c1(new Client(0, t, nullptr, false, nullptr, settings, false));
         c1->setClientProperties(ProtocolVersion::Mqtt311, "c1", "user1", true, 60, false);
@@ -1115,7 +1115,7 @@ void testCopyPacketHelper(const std::string &amp;topic, char from_qos, char to_qos, 
     // Kind of a hack...
     Authentication auth(*settings.get());
-    ThreadAuth::assign(&auth);
+    ThreadGlobals::assign(&auth);
     std::shared_ptr<Client> dummyClient(new Client(0, t, nullptr, false, nullptr, settings, false));
     dummyClient->setClientProperties(ProtocolVersion::Mqtt311, "qostestclient", "user1", true, 60, false);
@@ -28,7 +28,7 @@ License along with FlashMQ. If not, see &lt;https://www.gnu.org/licenses/&gt;.
 #include <openssl/err.h>
 #include "logger.h"
-#include "threadauth.h"
+#include "threadglobals.h"
 #include "threadloop.h"
 MainApp *MainApp::instance = nullptr;
@@ -645,7 +645,7 @@ void MainApp::loadConfig()
     confFileParser->loadFile(false);
     settings = confFileParser->moveSettings();
     settingsLocalCopy = *settings.get();
-    ThreadAuth::assignSettings(&settingsLocalCopy);
+    ThreadGlobals::assignSettings(&settingsLocalCopy);
     if (settings->listeners.empty())
     {
@@ -22,7 +22,7 @@ License along with FlashMQ. If not, see &lt;https://www.gnu.org/licenses/&gt;.
 #include <cassert>
 #include "utils.h"
-#include "threadauth.h"
+#include "threadglobals.h"
 RemainingLength::RemainingLength()
 {
@@ -460,7 +460,7 @@ void MqttPacket::handleConnect()
         bool accessGranted = false;
         std::string denyLogMsg;
-        Authentication &authentication = *ThreadAuth::getAuth();
+        Authentication &authentication = *ThreadGlobals::getAuth();
         if (!user_name_flag && settings.allowAnonymous)
         {
@@ -531,7 +531,7 @@ void MqttPacket::handleSubscribe()
         throw ProtocolError("Packet ID 0 when subscribing is invalid."); // [MQTT-2.3.1-1]
     }
-    Authentication &authentication = *ThreadAuth::getAuth();
+    Authentication &authentication = *ThreadGlobals::getAuth();
     std::list<char> subs_reponse_codes;
     while (remainingAfterPos() > 0)
@@ -691,7 +691,7 @@ void MqttPacket::handlePublish()
     payloadLen = remainingAfterPos();
     payloadStart = pos;
-    Authentication &authentication = *ThreadAuth::getAuth();
+    Authentication &authentication = *ThreadGlobals::getAuth();
     if (authentication.aclCheck(sender->getClientId(), sender->getUsername(), topic, subtopics, AclAccess::write, qos, retain) == AuthResult::success)
     {
         if (retain)
@@ -19,13 +19,13 @@ License along with FlashMQ. If not, see &lt;https://www.gnu.org/licenses/&gt;.
 #include "session.h"
 #include "client.h"
-#include "threadauth.h"
+#include "threadglobals.h"
 std::chrono::time_point<std::chrono::steady_clock> appStartTime = std::chrono::steady_clock::now();
 Session::Session() :
-    maxQosMsgPending(ThreadAuth::getSettings()->maxQosMsgPendingPerClient),
-    maxQosBytesPending(ThreadAuth::getSettings()->maxQosBytesPendingPerClient)
+    maxQosMsgPending(ThreadGlobals::getSettings()->maxQosMsgPendingPerClient),
+    maxQosBytesPending(ThreadGlobals::getSettings()->maxQosBytesPendingPerClient)
 {
 }
@@ -152,7 +152,7 @@ void Session::writePacket(MqttPacket &amp;packet, char max_qos, std::shared_ptr&lt;Mqtt
     assert(max_qos <= 2);
     const char effectiveQos = std::min<char>(packet.getQos(), max_qos);
-    Authentication *_auth = ThreadAuth::getAuth();
+    Authentication *_auth = ThreadGlobals::getAuth();
     assert(_auth);
     Authentication &auth = *_auth;
     if (auth.aclCheck(client_id, username, packet.getTopic(), packet.getSubtopics(), AclAccess::read, effectiveQos, packet.getRetain()) == AuthResult::success)
-#include "threadauth.h"
-
-thread_local Authentication *ThreadAuth::auth = nullptr;
-thread_local ThreadData *ThreadAuth::threadData = nullptr;
-thread_local Settings *ThreadAuth::settings = nullptr;
-
-void ThreadAuth::assign(Authentication *auth)
-{
-    ThreadAuth::auth = auth;
-}
-
-Authentication *ThreadAuth::getAuth()
-{
-    return auth;
-}
-
-void ThreadAuth::assignThreadData(ThreadData *threadData)
-{
-    ThreadAuth::threadData = threadData;
-}
-
-ThreadData *ThreadAuth::getThreadData()
-{
-    return threadData;
-}
-
-void ThreadAuth::assignSettings(Settings *settings)
-{
-    ThreadAuth::settings = settings;
-}
-
-Settings *ThreadAuth::getSettings()
-{
-    return settings;
-}
+#include "threadglobals.h"
+#include "cassert"
+
+thread_local Authentication *ThreadGlobals::auth = nullptr;
+thread_local ThreadData *ThreadGlobals::threadData = nullptr;
+thread_local Settings *ThreadGlobals::settings = nullptr;
+
+void ThreadGlobals::assign(Authentication *auth)
+{
+#ifndef TESTING
+    assert(ThreadGlobals::auth == nullptr);
+#endif
+    ThreadGlobals::auth = auth;
+}
+
+Authentication *ThreadGlobals::getAuth()
+{
+    return auth;
+}
+
+void ThreadGlobals::assignThreadData(ThreadData *threadData)
+{
+#ifndef TESTING
+    assert(ThreadGlobals::threadData == nullptr);
+#endif
+    ThreadGlobals::threadData = threadData;
+}
+
+ThreadData *ThreadGlobals::getThreadData()
+{
+    return threadData;
+}
+
+void ThreadGlobals::assignSettings(Settings *settings)
+{
+#ifndef TESTING
+    assert(ThreadGlobals::settings == nullptr || ThreadGlobals::settings == settings);
+#endif
+    ThreadGlobals::settings = settings;
+}
+
+Settings *ThreadGlobals::getSettings()
+{
+    return settings;
+}
-#ifndef THREADAUTH_H
-#define THREADAUTH_H
+#ifndef THREADGLOBALS_H
+#define THREADGLOBALS_H
 #include "forward_declarations.h"
 class Authentication;
-// TODO: rename, this is no longer just auth, but thread local globals.
-class ThreadAuth
+class ThreadGlobals
 {
     static thread_local Authentication *auth;
     static thread_local ThreadData *threadData;
@@ -22,4 +21,4 @@ public:
     static Settings *getSettings();
 };
-#endif // THREADAUTH_H
+#endif // THREADGLOBALS_H
@@ -20,9 +20,9 @@ License along with FlashMQ. If not, see &lt;https://www.gnu.org/licenses/&gt;.
 void do_thread_work(ThreadData *threadData)
 {
     int epoll_fd = threadData->epollfd;
-    ThreadAuth::assign(&threadData->authentication);
-    ThreadAuth::assignThreadData(threadData);
-    ThreadAuth::assignSettings(&threadData->settingsLocalCopy);
+    ThreadGlobals::assign(&threadData->authentication);
+    ThreadGlobals::assignThreadData(threadData);
+    ThreadGlobals::assignSettings(&threadData->settingsLocalCopy);
     struct epoll_event events[MAX_EVENTS];
     memset(&events, 0, sizeof (struct epoll_event)*MAX_EVENTS);
@@ -19,7 +19,7 @@ License along with FlashMQ. If not, see &lt;https://www.gnu.org/licenses/&gt;.
 #define THREADLOOP_H
 #include "threaddata.h"
-#include "threadauth.h"
+#include "threadglobals.h"
 #define MAX_EVENTS 65536