Enable building #WITHOUT_PROXY

[freeradius.git] / src / modules / rlm_attr_filter / rlm_attr_filter.c

diff --git a/src/modules/rlm_attr_filter/rlm_attr_filter.c b/src/modules/rlm_attr_filter/rlm_attr_filter.c
index f45ca0b..cb8f61c 100644 (file)
--- a/src/modules/rlm_attr_filter/rlm_attr_filter.c
+++ b/src/modules/rlm_attr_filter/rlm_attr_filter.c
@@ -71,27 +71,6 @@ static void check_pair(VALUE_PAIR *check_item, VALUE_PAIR *reply_item,
        return;
 }
 
-/*
- *     Copy the specified attribute to the specified list
- */
-static int mypairappend(VALUE_PAIR *item, VALUE_PAIR **to)
-{
-       VALUE_PAIR *tmp;
-       tmp = paircreate(item->attribute, item->type);
-       if (!tmp) {
-               radlog(L_ERR|L_CONS, "no memory");
-               return -1;
-       }
-       
-       /*
-        *      Copy EVERYTHING.
-        */
-       memcpy(tmp, item, sizeof(*tmp));
-       tmp->next = NULL;
-       *to = tmp;
-
-       return 0;
-}
 
 static int getattrsfile(const char *filename, PAIR_LIST **pair_list)
 {
@@ -123,7 +102,7 @@ static int getattrsfile(const char *filename, PAIR_LIST **pair_list)
                     * and we ignore Fall-Through,
                     * then bitch about it, giving a good warning message.
                     */
-                   if (!(vp->attribute & ~0xffff) &&
+                    if ((vp->vendor == 0) &&
                         (vp->attribute > 0xff) &&
                         (vp->attribute > 1000)) {
                        log_debug("[%s]:%d WARNING! Check item \"%s\"\n"
@@ -187,23 +166,28 @@ static int attr_filter_instantiate(CONF_SECTION *conf, void **instance)
  *     Common attr_filter checks
  */
 static int attr_filter_common(void *instance, REQUEST *request,
-                             VALUE_PAIR **input)
+                             RADIUS_PACKET *packet)
 {
        struct attr_filter_instance *inst = instance;
        VALUE_PAIR      *vp;
-       VALUE_PAIR      *output = NULL;
+       VALUE_PAIR      *output;
        VALUE_PAIR      **output_tail;
        VALUE_PAIR      *check_item;
        PAIR_LIST       *pl;
        int             found = 0;
        int             pass, fail = 0;
        char            *keyname = NULL;
+       VALUE_PAIR      **input;
        char            buffer[256];
 
+       if (!packet) return RLM_MODULE_NOOP;
+
+       input = &(packet->vps);
+
        if (!inst->key) {
                VALUE_PAIR      *namepair;
 
-               namepair = pairfind(request->packet->vps, PW_REALM);
+               namepair = pairfind(request->packet->vps, PW_REALM, 0);
                if (!namepair) {
                        return (RLM_MODULE_NOOP);
                }
@@ -219,6 +203,7 @@ static int attr_filter_common(void *instance, REQUEST *request,
                keyname = buffer;
        }
 
+       output = NULL;
        output_tail = &output;
 
        /*
@@ -244,7 +229,8 @@ static int attr_filter_common(void *instance, REQUEST *request,
                for (check_item = pl->check;
                     check_item != NULL;
                     check_item = check_item->next) {
-                       if (check_item->attribute == PW_FALL_THROUGH) {
+                       if ((check_item->attribute == PW_FALL_THROUGH) &&
+                           (check_item->vp_integer == 1)) {
                                fall_through = 1;
                                continue;
                        }
@@ -254,11 +240,13 @@ static int attr_filter_common(void *instance, REQUEST *request,
                         *    the output list without checking it.
                         */
                        if (check_item->operator == T_OP_SET ) {
-                               if (mypairappend(check_item, output_tail) < 0) {
+                               vp = paircopyvp(check_item);
+                               if (!vp) {
                                        pairfree(&output);
                                        return RLM_MODULE_FAIL;
                                }
-                               output_tail = &((*output_tail)->next);
+                               *output_tail = vp;
+                               output_tail = &(vp->next);
                        }
                }
 
@@ -273,7 +261,7 @@ static int attr_filter_common(void *instance, REQUEST *request,
                for (vp = *input; vp != NULL; vp = vp->next ) {
                        /* reset the pass,fail vars for each reply item */
                        pass = fail = 0;
-                       
+
                        /*
                         *      reset the check_item pointer to
                         *      beginning of the list
@@ -287,7 +275,7 @@ static int attr_filter_common(void *instance, REQUEST *request,
                                 *      is always true.
                                 */
                                if ((check_item->attribute == PW_VENDOR_SPECIFIC) &&
-                                   (VENDOR(vp->attribute) != 0) &&
+                                   (vp->vendor != 0) &&
                                    (check_item->operator == T_OP_CMP_TRUE)) {
                                        pass++;
                                        continue;
@@ -298,17 +286,18 @@ static int attr_filter_common(void *instance, REQUEST *request,
                                                   &pass, &fail);
                                }
                        }
-                       
+
                        /* only move attribute if it passed all rules */
                        if (fail == 0 && pass > 0) {
-                               if (mypairappend(vp, output_tail) < 0) {
+                               *output_tail = paircopyvp(vp);
+                               if (!*output_tail) {
                                        pairfree(&output);
                                        return RLM_MODULE_FAIL;
                                }
                                output_tail = &((*output_tail)->next);
                        }
                }
-               
+
                /* If we shouldn't fall through, break */
                if (!fall_through)
                        break;
@@ -325,27 +314,49 @@ static int attr_filter_common(void *instance, REQUEST *request,
        pairfree(input);
        *input = output;
 
+       if (request->packet->code == PW_AUTHENTICATION_REQUEST) {
+               request->username = pairfind(request->packet->vps,
+                                            PW_STRIPPED_USER_NAME, 0);
+               if (!request->username) 
+                       request->username = pairfind(request->packet->vps,
+                                                    PW_USER_NAME, 0);
+               request->password = pairfind(request->packet->vps,
+                                            PW_USER_PASSWORD, 0);
+       }
+
        return RLM_MODULE_UPDATED;
 }
 
+static int attr_filter_preacct(void *instance, REQUEST *request)
+{
+       return attr_filter_common(instance, request, request->packet);
+}
+
 static int attr_filter_accounting(void *instance, REQUEST *request)
 {
-       return attr_filter_common(instance, request, &request->packet->vps);
+       return attr_filter_common(instance, request, request->reply);
 }
 
+#ifdef WITH_PROXY
 static int attr_filter_preproxy(void *instance, REQUEST *request)
 {
-       return attr_filter_common(instance, request, &request->proxy->vps);
+       return attr_filter_common(instance, request, request->proxy);
 }
 
 static int attr_filter_postproxy(void *instance, REQUEST *request)
 {
-       return attr_filter_common(instance, request, &request->proxy_reply->vps);
+       return attr_filter_common(instance, request, request->proxy_reply);
 }
+#endif
 
 static int attr_filter_postauth(void *instance, REQUEST *request)
 {
-       return attr_filter_common(instance, request, &request->reply->vps);
+       return attr_filter_common(instance, request, request->reply);
+}
+
+static int attr_filter_authorize(void *instance, REQUEST *request)
+{
+       return attr_filter_common(instance, request, request->packet);
 }
 
 
@@ -353,17 +364,21 @@ static int attr_filter_postauth(void *instance, REQUEST *request)
 module_t rlm_attr_filter = {
        RLM_MODULE_INIT,
        "attr_filter",
-       0,                              /* type: reserved */
+       RLM_TYPE_CHECK_CONFIG_SAFE | RLM_TYPE_HUP_SAFE,         /* type */
        attr_filter_instantiate,        /* instantiation */
        attr_filter_detach,             /* detach */
        {
                NULL,                   /* authentication */
-               NULL,                   /* authorization */
-               NULL,                   /* preaccounting */
+               attr_filter_authorize,  /* authorization */
+               attr_filter_preacct,    /* pre-acct */
                attr_filter_accounting, /* accounting */
                NULL,                   /* checksimul */
+#ifdef WITH_PROXY
                attr_filter_preproxy,   /* pre-proxy */
                attr_filter_postproxy,  /* post-proxy */
+#else
+               NULL, NULL,
+#endif
                attr_filter_postauth    /* post-auth */
        },
 };