Changeset 1354:0dff6a604b0a in freeDiameter for extensions/acl_wl/acl_wl.c

Timestamp:

May 17, 2019, 7:59:19 PM (5 years ago)

Author:

Thomas Klausner <tk@giga.or.at>

Branch:

default

Phase:

public

Message:

acl_wl: add reload support using SIGUSR1

File:

• extensions/acl_wl/acl_wl.c (modified) (5 diffs)

extensions/acl_wl/acl_wl.c

@@ -38 +38 @@
  */
 
+#include <pthread.h>
+#include <signal.h>
+
 #include "acl_wl.h"
+
+static pthread_rwlock_t acl_wl_lock;
+
+#define MODULE_NAME "acl_wl"
+
+static char *acl_wl_config_file;
 
 /* The validator function */
@@ -54 +63 @@
         /* Default to unknown result */
         *auth = 0;
-        
+
+        if (pthread_rwlock_rdlock(&acl_wl_lock) != 0) {
+                fd_log_notice("%s: read-lock failed, skipping handler", MODULE_NAME);
+                return 0;
+        }
+
         /* Now search the peer in our tree */
         CHECK_FCT( aw_tree_lookup(info->pi_diamid, &res) );
+
+        if (pthread_rwlock_unlock(&acl_wl_lock) != 0) {
+                fd_log_notice("%s: read-unlock failed after aw_tree_lookup, exiting", MODULE_NAME);
+                exit(1);
+        }
+
         if (res < 0) {
                 /* The peer is not whitelisted */
@@ -88 +108 @@
 }
 
+static volatile int in_signal_handler = 0;
+
+/* signal handler */
+static void sig_hdlr(void)
+{
+        struct fd_list old_tree;
+
+        if (in_signal_handler) {
+                fd_log_error("%s: already handling a signal, ignoring new one", MODULE_NAME);
+                return;
+        }
+        in_signal_handler = 1;
+
+        if (pthread_rwlock_wrlock(&acl_wl_lock) != 0) {
+                fd_log_error("%s: locking failed, aborting config reload", MODULE_NAME);
+                return;
+        }
+
+        /* save old config in case reload goes wrong */
+        old_tree = tree_root;
+        fd_list_init(&tree_root, NULL);
+
+        if (aw_conf_handle(acl_wl_config_file) != 0) {
+                fd_log_error("%s: error reloading configuration, restoring previous configuration", MODULE_NAME);
+                aw_tree_destroy();
+                tree_root = old_tree;
+        } else {
+                struct fd_list new_tree;
+                new_tree = tree_root;
+                tree_root = old_tree;
+                aw_tree_destroy();
+                tree_root = new_tree;
+        }
+
+        if (pthread_rwlock_unlock(&acl_wl_lock) != 0) {
+                fd_log_error("%s: unlocking failed after config reload, exiting", MODULE_NAME);
+                exit(1);
+        }
+
+        fd_log_notice("%s: reloaded configuration", MODULE_NAME);
+
+        in_signal_handler = 0;
+}
+
+
 /* entry point */
 static int aw_entry(char * conffile)
@@ -93 +158 @@
         TRACE_ENTRY("%p", conffile);
         CHECK_PARAMS(conffile);
-        
+
+        acl_wl_config_file = conffile;
+
+        pthread_rwlock_init(&acl_wl_lock, NULL);
+
+        if (pthread_rwlock_wrlock(&acl_wl_lock) != 0) {
+                fd_log_notice("%s: write-lock failed, aborting", MODULE_NAME);
+                return EDEADLK;
+        }
+
         /* Parse configuration file */
         CHECK_FCT( aw_conf_handle(conffile) );
-        
+
         TRACE_DEBUG(INFO, "Extension ACL_wl initialized with configuration: '%s'", conffile);
         if (TRACE_BOOL(ANNOYING)) {
                 aw_tree_dump();
         }
-        
+
+        if (pthread_rwlock_unlock(&acl_wl_lock) != 0) {
+                fd_log_notice("%s: write-unlock failed, aborting", MODULE_NAME);
+                return EDEADLK;
+        }
+
+        /* Register reload callback */
+        CHECK_FCT(fd_event_trig_regcb(SIGUSR1, MODULE_NAME, sig_hdlr));
+
         /* Register the validator function */
         CHECK_FCT( fd_peer_validate_register ( aw_validate ) );
@@ -115 +197 @@
 }
 
-EXTENSION_ENTRY("acl_wl", aw_entry);
+EXTENSION_ENTRY(MODULE_NAME, aw_entry);