Auth DB Module

cmake/UseODB.cmake

@@ -175,8 +175,9 @@ function(odb_compile outvar)
     list(APPEND ODB_ARGS "-I${dir}")
   endforeach()
 
-  file(REMOVE_RECURSE "${ODB_COMPILE_OUTPUT_DIR}")
-  file(MAKE_DIRECTORY "${ODB_COMPILE_OUTPUT_DIR}")
+  if(NOT EXISTS "${ODB_COMPILE_OUTPUT_DIR}")
+    file(MAKE_DIRECTORY "${ODB_COMPILE_OUTPUT_DIR}")
+  endif()
 
   foreach(input ${PARAM_FILES})
     get_filename_component(fname "${input}" NAME_WE)

src/core/audit/AuditFactory.cpp

@@ -143,8 +143,6 @@ IAuthEventPtr Factory::AuthEvent(const DBPtr &database, Cred::ICredentialPtr cre
     ASSERT_LOG(database, "Database cannot be null.");
     ASSERT_LOG(credential, "Credential must be non null.");
     ASSERT_LOG(!door.empty(), "Door must be set.");
-    ASSERT_LOG(parent, "Parent must be non null.");
-    ASSERT_LOG(parent->id(), "Parent must be already persisted.");
 
     AuditEntryPtr parent_odb;
     if (parent && parent->id())

src/core/audit/AuditFwd.hpp

@@ -124,80 +124,65 @@ using ZoneEventPtr = std::shared_ptr<ZoneEvent>;
 
 enum class EventType
 {
-  /**
-   * Admin & System Event Types
-   */
-  AL_SYSTEM                         = 0x1000,
-  /**
-   * User Event Types
-   */
-  AL_USER                           = 0x2000,
-
-  WSAPI_CALL                        = 0x00 & AL_SYSTEM,
-
-  USER_CREATED                      = 0x10 & AL_SYSTEM,
-  USER_DELETED                      = 0x11 & AL_SYSTEM,
-  USER_EDITED                       = 0x12 & AL_SYSTEM,
-  USER_PASSWORD_CHANGED             = 0x13 & AL_SYSTEM,
-  /**
-   * An attempt to change the password failed.
-   */
-  USER_PASSWORD_CHANGE_FAILURE      = 0x14 & AL_SYSTEM,
-
-  GROUP_CREATED                     = 0x20 & AL_SYSTEM,
-  GROUP_UPDATED                     = 0x21 & AL_SYSTEM,
-  GROUP_DELETED                     = 0x22 & AL_SYSTEM,
-  /**
-   * Someone joined the group.
-   */
-  GROUP_MEMBERSHIP_JOINED           = 0x23 & AL_SYSTEM,
-  /**
-   * Someone left the group.
-   */
-  GROUP_MEMBERSHIP_LEFT             = 0x24 & AL_SYSTEM,
-
-  CREDENTIAL_DELETED                = 0x30 & AL_SYSTEM,
-  CREDENTIAL_CREATED                = 0x31 & AL_SYSTEM,
-  CREDENTIAL_UPDATED                = 0x32 & AL_SYSTEM,
-
-  SCHEDULE_CREATED                  = 0x40 & AL_SYSTEM,
-  SCHEDULE_DELETED                  = 0x41 & AL_SYSTEM,
-  SCHEDULE_UPDATED                  = 0x42 & AL_SYSTEM,
-
-  DOOR_CREATED                      = 0x50 & AL_SYSTEM,
-  DOOR_UPDATED                      = 0x51 & AL_SYSTEM,
-  DOOR_DELETED                      = 0x52 & AL_SYSTEM,
-  /**
-   * This event is linked to door. It is generated
-   * by the Schedule CRUD manager. It's used to let a door
-   * know that it may have been removed from a mapping.
-   *
-   * Fixme: Currently this event is triggered for every door in a mapping
-   * everytime a schedule is updated.
-   */
-  MAPPING_MAY_HAVE_CHANGED          = 0x53 & AL_SYSTEM,
-
-  ACCESS_POINT_CREATED              = 0x60 & AL_SYSTEM,
-  ACCESS_POINT_UPDATED              = 0x61 & AL_SYSTEM,
-  ACCESS_POINT_DELETED              = 0x62 & AL_SYSTEM,
-
-  ZONE_CREATED                      = 0x70 & AL_SYSTEM,
-  ZONE_UPDATED                      = 0x71 & AL_SYSTEM,
-  ZONE_DELETED                      = 0x72 & AL_SYSTEM,
-
-  UPDATE_CREATED                    = 0x80 & AL_SYSTEM,
-  UPDATE_ACKED                      = 0x81 & AL_SYSTEM,
-  UPDATE_CANCELLED                  = 0x81 & AL_SYSTEM,
-
-  DOOR_OPENED                       = 0x10 & AL_USER,
-  DOOR_OPENED_MANUALLY              = 0x11 & AL_USER,
-  DOOR_FORCED                       = 0x12 & AL_USER,
-  DOOR_FORCED_END                   = 0x13 & AL_USER,
-
-  AUTH_GRANTED                      = 0x20 & AL_USER,
-  AUTH_DENIED                       = 0x21 & AL_USER,
-
-  LAST__                            = 0xffff
+  // 0..63 reserved to keep masks within 64-bit numeric serialization
+
+  // 0..15 System/Admin
+  WSAPI_CALL                        = 0,
+  USER_CREATED                      = 1,
+  USER_DELETED                      = 2,
+  USER_EDITED                       = 3,
+  USER_PASSWORD_CHANGED             = 4,
+  USER_PASSWORD_CHANGE_FAILURE      = 5,
+
+  // 16..23 Groups
+  GROUP_CREATED                     = 16,
+  GROUP_UPDATED                     = 17,
+  GROUP_DELETED                     = 18,
+  GROUP_MEMBERSHIP_JOINED           = 19,
+  GROUP_MEMBERSHIP_LEFT             = 20,
+
+  // 24..27 Credentials
+  CREDENTIAL_CREATED                = 24,
+  CREDENTIAL_UPDATED                = 25,
+  CREDENTIAL_DELETED                = 26,
+
+  // 28..30 Schedules
+  SCHEDULE_CREATED                  = 28,
+  SCHEDULE_UPDATED                  = 29,
+  SCHEDULE_DELETED                  = 30,
+
+  // 31..35 Doors
+  DOOR_CREATED                      = 31,
+  DOOR_UPDATED                      = 32,
+  DOOR_DELETED                      = 33,
+  MAPPING_MAY_HAVE_CHANGED          = 34,
+
+  // 36..38 Access points
+  ACCESS_POINT_CREATED              = 36,
+  ACCESS_POINT_UPDATED              = 37,
+  ACCESS_POINT_DELETED              = 38,
+
+  // 39..41 Zones
+  ZONE_CREATED                      = 39,
+  ZONE_UPDATED                      = 40,
+  ZONE_DELETED                      = 41,
+
+  // 42..44 Updates
+  UPDATE_CREATED                    = 42,
+  UPDATE_ACKED                      = 43,
+  UPDATE_CANCELLED                  = 44,
+
+  // 45..48 Door usage
+  DOOR_OPENED                       = 45,
+  DOOR_OPENED_MANUALLY              = 46,
+  DOOR_FORCED                       = 47,
+  DOOR_FORCED_END                   = 48,
+
+  // 49..50 Auth outcomes
+  AUTH_GRANTED                      = 49,
+  AUTH_DENIED                       = 50,
+
+  LAST__                            = 64
 };
 
 using EventMask = FlagSet<EventType>;

src/core/auth/AuthTarget.cpp

@@ -49,6 +49,11 @@ void AuthTarget::add_always_close_sched(Leosac::Tools::IScheduleCPtr const &sche
     always_close_.push_back(sched);
 }
 
+void AuthTarget::clear_schedules() {
+    always_open_.clear();
+    always_close_.clear();
+}
+
 Leosac::Hardware::FGPIO *AuthTarget::gpio() const
 {
     return gpio_.get();

src/core/auth/AuthTarget.hpp

@@ -57,6 +57,11 @@ class AuthTarget
     */
     bool is_always_closed(const std::chrono::system_clock::time_point &tp) const;
 
+    /**
+    * Clear schedules (helper for refreshing schedules)
+    */
+    void clear_schedules();
+
     /*
     * Reset the door the its expected default state at the current time.
     */

src/core/kernel.cpp

@@ -371,6 +371,7 @@ void Kernel::configure_logger()
     bool use_database            = false;
     std::string syslog_min_level = "WARNING";
     std::shared_ptr<spdlog::logger> console;
+    std::string console_level = "DEBUG";
 
     // Drop existing logger, if any. (This is for the case of a "in process" restart)
     spdlog::drop("syslog");
@@ -382,6 +383,7 @@ void Kernel::configure_logger()
         use_syslog       = log_cfg_node->get<bool>("enable_syslog", true);
         use_database     = log_cfg_node->get<bool>("enable_database", false);
         syslog_min_level = log_cfg_node->get<std::string>("min_syslog", "WARNING");
+        console_level = log_cfg_node->get<std::string>("console_level", "DEBUG");
     }
     if (use_syslog)
     {
@@ -399,7 +401,9 @@ void Kernel::configure_logger()
     else
         console = spdlog::create(
             "console", {std::make_shared<spdlog::sinks::stdout_sink_mt>()});
-    console->set_level(spdlog::level::debug);
+
+    console->set_level(static_cast<spdlog::level::level_enum>(
+                    LogHelper::log_level_from_string(console_level)));
 }
 
 const ModuleManager &Kernel::module_manager() const

src/modules/auth/auth-db/AuthDBFwd.hpp

@@ -19,13 +19,17 @@
 
 #pragma once
 
+#include <memory>
+
 namespace Leosac
 {
 namespace Module
 {
 namespace Auth
 {
+class AuthDBInstance;
+using AuthDBInstancePtr = std::shared_ptr<AuthDBInstance>;
 using AuthDBInstanceId = unsigned long long;
 }
 }
-}
+}