Fix for redundant-load-balance. Closes #945

In normal operations, modcall_child / modcall_recurse processes
the current node, and all of its children.  For redundant-load-balance,
we want to loop BACK from the end of the list to the start, AND
stop when we reach the first one we found again.

This means we have to tell the functions "process ONE node only",
and do all "next" operations ourselves.

diff --git a/src/main/modcall.c b/src/main/modcall.c
index 16f993e..e4bb937 100644 (file)
--- a/src/main/modcall.c
+++ b/src/main/modcall.c
@@ -380,14 +380,14 @@ typedef struct modcall_stack_entry_t {
 
 
 static bool modcall_recurse(REQUEST *request, rlm_components_t component, int depth,
-                           modcall_stack_entry_t *entry);
+                           modcall_stack_entry_t *entry, bool do_children);
 
 /*
  *     Call a child of a block.
  */
 static void modcall_child(REQUEST *request, rlm_components_t component, int depth,
                          modcall_stack_entry_t *entry, modcallable *c,
-                         rlm_rcode_t *result)
+                         rlm_rcode_t *result, bool do_children)
 {
        modcall_stack_entry_t *next;
 
@@ -406,7 +406,7 @@ static void modcall_child(REQUEST *request, rlm_components_t component, int dept
        next->unwind = 0;
 
        if (!modcall_recurse(request, component,
-                            depth, next)) {
+                            depth, next, do_children)) {
                *result = RLM_MODULE_FAIL;
                 return;
        }
@@ -428,7 +428,7 @@ static void modcall_child(REQUEST *request, rlm_components_t component, int dept
  *     Interpret the various types of blocks.
  */
 static bool modcall_recurse(REQUEST *request, rlm_components_t component, int depth,
-                           modcall_stack_entry_t *entry)
+                           modcall_stack_entry_t *entry, bool do_children)
 {
        bool if_taken, was_if;
        modcallable *c;
@@ -682,7 +682,7 @@ redo:
                        next->priority = 0;
                        next->unwind = 0;
 
-                       if (!modcall_recurse(request, component, depth + 1, next)) {
+                       if (!modcall_recurse(request, component, depth + 1, next, true)) {
                                break;
                        }
 
@@ -777,7 +777,7 @@ redo:
                MOD_LOG_OPEN_BRACE;
                modcall_child(request, component,
                              depth + 1, entry, g->children,
-                             &result);
+                             &result, true);
                MOD_LOG_CLOSE_BRACE;
                goto calculate_result;
        } /* MOD_GROUP */
@@ -912,7 +912,7 @@ redo:
 
        do_null_case:
                talloc_free(data.ptr);
-               modcall_child(request, component, depth + 1, entry, found, &result);
+               modcall_child(request, component, depth + 1, entry, found, &result, true);
                MOD_LOG_CLOSE_BRACE;
                goto calculate_result;
        } /* MOD_SWITCH */
@@ -944,7 +944,7 @@ redo:
                if (c->type == MOD_LOAD_BALANCE) {
                        modcall_child(request, component,
                                      depth + 1, entry, found,
-                                     &result);
+                                     &result, false);
 
                } else {
                        this = found;
@@ -952,7 +952,7 @@ redo:
                        do {
                                modcall_child(request, component,
                                              depth + 1, entry, this,
-                                             &result);
+                                             &result, false);
                                if (this->actions[result] == MOD_ACTION_RETURN) {
                                        priority = -1;
                                        break;
@@ -1084,9 +1084,11 @@ calculate_result:
        }
 
 next_sibling:
-       entry->c = entry->c->next;
+       if (do_children) {
+               entry->c = entry->c->next;
 
-       if (entry->c) goto redo;
+               if (entry->c) goto redo;
+       }
 
 finish:
        /*
@@ -1119,7 +1121,7 @@ int modcall(rlm_components_t component, modcallable *c, REQUEST *request)
        /*
         *      Call the main handler.
         */
-       if (!modcall_recurse(request, component, 0, &stack[0])) {
+       if (!modcall_recurse(request, component, 0, &stack[0], true)) {
                return RLM_MODULE_FAIL;
        }
 

diff --git a/src/tests/keywords/redundant-redundant b/src/tests/keywords/redundant-redundant
new file mode 100644 (file)
index 0000000..294f53e
--- /dev/null
+++ b/src/tests/keywords/redundant-redundant
@@ -0,0 +1,73 @@
+# PRE: update if foreach redundant redundant-load-balance
+#
+#  Nested redundant blocks.
+#
+#
+update request {
+       Tmp-Integer-2 := 0
+       Tmp-Integer-3 := 0
+       Tmp-Integer-4 := 0
+       Tmp-Integer-5 := 0
+}
+
+redundant {
+       redundant-load-balance {
+               group {
+                       update request {
+                               Tmp-Integer-2 := "%{expr:&Tmp-Integer-2 + 1}"
+                       }
+                       fail
+               }
+               group {
+                       update request {
+                               Tmp-Integer-3 := "%{expr:&Tmp-Integer-3 + 1}"
+                       }
+                       fail
+               }
+               group {
+                       update request {
+                               Tmp-Integer-4 := "%{expr:&Tmp-Integer-4 + 1}"
+                       }
+                       fail
+               }
+               group {
+                       update request {
+                               Tmp-Integer-5 := "%{expr:&Tmp-Integer-5 + 1}"
+                       }
+                       fail
+               }
+       }
+       ok
+}
+
+if (&Tmp-Integer-2 != 1) {
+       update reply {
+               Filter-Id += 'Fail 3a'
+       }
+       return
+}
+
+if (&Tmp-Integer-3 != 1) {
+       update reply {
+               Filter-Id += 'Fail 3b'
+       }
+       return
+}
+
+if (&Tmp-Integer-4 != 1) {
+       update reply {
+               Filter-Id += 'Fail 3c'
+       }
+       return
+}
+
+if (&Tmp-Integer-5 != 1) {
+       update reply {
+               Filter-Id += 'Fail 3d'
+       }
+       return
+}
+
+update reply {
+       Filter-Id := "filter"
+}
\ No newline at end of file