X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=filters.c;h=48506d57cfb1294c4b8858c77909d95a858f0bf2;hp=e5497c2e353ffc02e21ce60b23138a3018d14581;hb=26d64610efca62736a59acbd95e759f56a16dcdd;hpb=9412ec32b9c306ace8d22bbd90b872296792e8eb

diff --git a/filters.c b/filters.c
index e5497c2e..48506d57 100644
--- a/filters.c
+++ b/filters.c
@@ -1,4 +1,4 @@
-const char filters_rcs[] = "$Id: filters.c,v 1.10 2001/05/29 09:50:24 jongfoster Exp $";
+const char filters_rcs[] = "$Id: filters.c,v 1.13 2001/05/31 21:21:30 jongfoster Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/filters.c,v $
@@ -6,7 +6,7 @@ const char filters_rcs[] = "$Id: filters.c,v 1.10 2001/05/29 09:50:24 jongfoster
  * Purpose     :  Declares functions to parse/crunch headers and pages.
  *                Functions declared include:
  *                   `acl_addr', `add_stats', `block_acl', `block_imageurl',
- *                   `block_url', `url_permissions', `domaincmp', `dsplit',
+ *                   `block_url', `url_actions', `domaincmp', `dsplit',
  *                   `filter_popups', `forward_url', 'redirect_url',
  *                   `ij_untrusted_url', `intercept_url', `re_process_buffer',
  *                   `show_proxy_args', 'ijb_send_banner', and `trust_url'
@@ -38,6 +38,20 @@ const char filters_rcs[] = "$Id: filters.c,v 1.10 2001/05/29 09:50:24 jongfoster
  *
  * Revisions   :
  *    $Log: filters.c,v $
+ *    Revision 1.13  2001/05/31 21:21:30  jongfoster
+ *    Permissionsfile / actions file changes:
+ *    - Changed "permission" to "action" throughout
+ *    - changes to file format to allow string parameters
+ *    - Moved helper functions to actions.c
+ *
+ *    Revision 1.12  2001/05/31 17:35:20  oes
+ *
+ *     - Enhanced domain part globbing with infix and prefix asterisk
+ *       matching and optional unanchored operation
+ *
+ *    Revision 1.11  2001/05/29 11:53:23  oes
+ *    "See why" link added to "blocked" page
+ *
  *    Revision 1.10  2001/05/29 09:50:24  jongfoster
  *    Unified blocklist/imagelist/permissionslist.
  *    File format is still under discussion, but the internal changes
@@ -185,6 +199,7 @@ const char filters_rcs[] = "$Id: filters.c,v 1.10 2001/05/29 09:50:24 jongfoster
 #include "errlog.h"
 #include "jbsockets.h"
 #include "miscutil.h"
+#include "actions.h"
 
 #ifdef _WIN32
 #include "win32.h"
@@ -414,7 +429,7 @@ char *block_url(struct http_request *http, struct client_state *csp)
    int n;
    int factor = 2;
 
-   if ((csp->permissions & PERMIT_BLOCK) == 0)
+   if ((csp->action->flags & ACTION_BLOCK) == 0)
    {
       return(NULL);
    }
@@ -475,7 +490,7 @@ int block_imageurl(struct http_request *http, struct client_state *csp)
    }
 #endif
 
-   return ((csp->permissions & PERMIT_IMAGE) != 0);
+   return ((csp->action->flags & ACTION_IMAGE) != 0);
 }
 #endif /* def IMAGE_BLOCKING */
 
@@ -903,28 +918,58 @@ char *redirect_url(struct http_request *http, struct client_state *csp)
 
 /*********************************************************************
  *
- * Function    :  url_permissions
+ * Function    :  url_actions
  *
- * Description :  Gets the permissions for this URL.
+ * Description :  Gets the actions for this URL.
  *
  * Parameters  :
  *          1  :  http = http_request request for blocked URLs
  *          2  :  csp = Current client state (buffers, headers, etc...)
  *
- * Returns     :  permissions bitmask specifiying what this URL can do.
- *                If not on list, will be default_permissions.
+ * Returns     :  N/A
  *
  *********************************************************************/
-int url_permissions(struct http_request *http, struct client_state *csp)
+void url_actions(struct http_request *http, 
+                 struct client_state *csp)
 {
    struct file_list *fl;
-   struct permissions_spec *b;
+   struct url_actions *b;
+
+   init_current_action(csp->action);
+
+   if (((fl = csp->actions_list) == NULL) || ((b = fl->f) == NULL))
+   {
+      return;
+   }
+
+   apply_url_actions(csp->action, http, b);
+}
+
+
+/*********************************************************************
+ *
+ * Function    :  apply_url_actions
+ *
+ * Description :  Applies a list of URL actions.
+ *
+ * Parameters  :
+ *          1  :  action = Destination.
+ *          2  :  http = Current URL
+ *          3  :  b = list of URL actions to apply
+ *
+ * Returns     :  N/A
+ *
+ *********************************************************************/
+void apply_url_actions(struct current_action_spec *action, 
+                       struct http_request *http, 
+                       struct url_actions *b)
+{
    struct url_spec url[1];
-   int permissions = csp->config->default_permissions;
 
-   if (((fl = csp->permissions_list) == NULL) || ((b = fl->f) == NULL))
+   if (b == NULL)
    {
-      return(permissions);
+      /* Should never happen */
+      return;
    }
 
    *url = dsplit(http->host);
@@ -932,7 +977,7 @@ int url_permissions(struct http_request *http, struct client_state *csp)
    /* if splitting the domain fails, punt */
    if (url->dbuf == NULL)
    {
-      return(permissions);
+      return;
    }
 
    for (b = b->next; NULL != b; b = b->next)
@@ -949,8 +994,7 @@ int url_permissions(struct http_request *http, struct client_state *csp)
 #endif
             )
             {
-               permissions &= b->mask;
-               permissions |= b->add;
+               merge_current_action(action, b->action);
             }
          }
       }
@@ -958,8 +1002,6 @@ int url_permissions(struct http_request *http, struct client_state *csp)
 
    freez(url->dbuf);
    freez(url->dvec);
-   return(permissions);
-
 }
 
 
@@ -1045,13 +1087,14 @@ struct url_spec dsplit(char *domain)
 
    memset(ret, '\0', sizeof(*ret));
 
-   if ((p = strrchr(domain, '.')))
+   if (domain[strlen(domain) - 1] == '.')
    {
-      if (*(++p) == '\0')
-      {
-         ret->toplevel = 1;
-      }
-   }
+	  ret->unanchored |= ANCHOR_RIGHT;
+	}
+	if (domain[0] == '.')
+   {
+	  ret->unanchored |= ANCHOR_LEFT;
+	}
 
    ret->dbuf = strdup(domain);
 
@@ -1075,6 +1118,7 @@ struct url_spec dsplit(char *domain)
       memcpy(ret->dvec, v, size);
    }
 
+
    return(*ret);
 
 }
@@ -1084,11 +1128,11 @@ struct url_spec dsplit(char *domain)
  *
  * Function    :  domaincmp
  *
- * Description :  Compare domain names.
- *                domaincmp("a.b.c" , "a.b.c")  => 0 (MATCH)
- *                domaincmp("a*.b.c", "a.b.c")  => 0 (MATCH)
- *                domaincmp("b.c"   , "a.b.c")  => 0 (MATCH)
- *                domaincmp(""      , "a.b.c")  => 0 (MATCH)
+ * Description :  Domain-wise Compare fqdn's. Governed by the bimap in
+ *                pattern->unachored, the comparison is un-, left-,
+ *                right-anchored, or both.
+ *                The individual domain names are compared with
+ *                trivialmatch().
  *
  * Parameters  :
  *          1  :  pattern = a domain that may contain a '*' as a wildcard.
@@ -1104,27 +1148,29 @@ int domaincmp(struct url_spec *pattern, struct url_spec *fqdn)
    char  *p,   *f;   /* chars    */
 
    pv = pattern->dvec;
-   pn = pattern->dcnt;
-
    fv = fqdn->dvec;
-   fn = fqdn->dcnt;
+   fn = pn = 0;
 
-   while ((pn > 0) && (fn > 0))
+   while (fn < fqdn->dcnt && pn < pattern->dcnt)
    {
-      p = pv[--pn];
-      f = fv[--fn];
+      p = pv[pn];
+      f = fv[fn];
 
-      while (*p && *f && (*p == tolower(*f)))
+      if (simplematch(p, f))
       {
-         p++, f++;
+		  if(pn || !(pattern->unanchored & ANCHOR_LEFT))
+         {
+            return 1;
+         }
       }
-
-      if ((*p != tolower(*f)) && (*p != '*')) return(1);
+      else
+      {
+         pn++;
+      }
+      fn++;
    }
 
-   if (pn > 0) return(1);
-
-   return(0);
+   return ((pn < pattern->dcnt) || ((fn < fqdn->dcnt) && !(pattern->unanchored & ANCHOR_RIGHT)));
 
 }
 
@@ -1167,10 +1213,10 @@ char *show_proxy_args(struct http_request *http, struct client_state *csp)
    switch (which_file)
    {
    case 'p':
-      if (csp->permissions_list)
+      if (csp->actions_list)
       {
-         filename = csp->permissions_list->filename;
-         file_description = "Permissions List";
+         filename = csp->actions_list->filename;
+         file_description = "Actions List";
       }
       break;
    case 'f':
@@ -1298,10 +1344,10 @@ char *show_proxy_args(struct http_request *http, struct client_state *csp)
       "<p>(Click a filename to view it)</p>\n"
       "<ul>\n");
 
-   if (csp->permissions_list)
+   if (csp->actions_list)
    {
-      s = strsav(s, "<li>Permissions List: <a href=\"show-proxy-args?permit\"><code>");
-      s = strsav(s, csp->permissions_list->filename);
+      s = strsav(s, "<li>Actions List: <a href=\"show-proxy-args?permit\"><code>");
+      s = strsav(s, csp->actions_list->filename);
       s = strsav(s, "</code></a></li>\n");
    }
 
@@ -1423,50 +1469,6 @@ static const char C_URL_INFO_FORM[] =
    "</html>\n";
 
 
-/*********************************************************************
- *
- * Function    :  permissions_to_text
- *
- * Description :  Converts a permissionsfil entry from numeric form
- *                ("mask" and "add") to text.
- *
- * Parameters  :
- *          1  :  mask = As from struct permissions_spec
- *          2  :  add  = As from struct permissions_spec
- *
- * Returns     :  A string.  Caller must free it.
- *
- *********************************************************************/
-char * permissions_to_text(unsigned mask, unsigned add)
-{
-   char * result = strdup("");
-
-   /* sanity - prevents "-feature +feature" */
-   mask |= add;
-
-#define PERMISSION_TO_TEXT(__bit, __name)   \
-   if (!(mask & __bit))                     \
-   {                                        \
-      result = strsav(result, " -" __name); \
-   }                                        \
-   else if (add & __bit)                    \
-   {                                        \
-      result = strsav(result, " +" __name); \
-   }
-
-   PERMISSION_TO_TEXT(PERMIT_COOKIE_SET, "cookies-set");
-   PERMISSION_TO_TEXT(PERMIT_COOKIE_READ, "cookies-read");
-   PERMISSION_TO_TEXT(PERMIT_RE_FILTER, "filter");
-   PERMISSION_TO_TEXT(PERMIT_POPUPS, "popup");
-   PERMISSION_TO_TEXT(PERMIT_REFERER, "referer");
-   PERMISSION_TO_TEXT(PERMIT_FAST_REDIRECTS, "fast-redirects");
-   PERMISSION_TO_TEXT(PERMIT_BLOCK, "block");
-   PERMISSION_TO_TEXT(PERMIT_IMAGE, "image");
-
-   return result;
-}
-
-
  /*********************************************************************
  *
  * Function    :  ijb_show_url_info
@@ -1501,14 +1503,16 @@ char *ijb_show_url_info(struct http_request *http, struct client_state *csp)
       char * s;
       int port = 80;
       struct file_list *fl;
-      struct permissions_spec *b;
+      struct url_actions *b;
       struct url_spec url[1];
-      int permissions = csp->config->default_permissions;
+      struct current_action_spec action[1];
+
+      init_current_action(action);
 
       result = (char *)malloc(sizeof(C_URL_INFO_HEADER) + 2 * strlen(host));
       sprintf(result, C_URL_INFO_HEADER, host, host);
 
-      s = permissions_to_text(permissions, permissions);
+      s = current_action_to_text(action);
       result = strsav(result, "<h3>Defaults:</h3>\n<p><b>{");
       result = strsav(result, s);
       result = strsav(result, " }</b></p>\n<h3>Patterns affecting the URL:</h3>\n<p>\n");
@@ -1531,7 +1535,7 @@ char *ijb_show_url_info(struct http_request *http, struct client_state *csp)
          port = atoi(s);
       }
 
-      if (((fl = csp->permissions_list) == NULL) || ((b = fl->f) == NULL))
+      if (((fl = csp->actions_list) == NULL) || ((b = fl->f) == NULL))
       {
          freez(host);
          freez(path);
@@ -1564,15 +1568,15 @@ char *ijb_show_url_info(struct http_request *http, struct client_state *csp)
 #endif
                )
                {
-                  s = permissions_to_text(b->mask, b->add);
+                  s = actions_to_text(b->action);
                   result = strsav(result, "<b>{");
                   result = strsav(result, s);
                   result = strsav(result, " }</b><br>\n<code>");
                   result = strsav(result, b->url->spec);
                   result = strsav(result, "</code><br>\n<br>\n");
                   freez(s);
-                  permissions &= b->mask;
-                  permissions |= b->add;
+
+                  merge_current_action(action, b->action);
                }
             }
          }
@@ -1584,12 +1588,14 @@ char *ijb_show_url_info(struct http_request *http, struct client_state *csp)
       freez(host);
       freez(path);
 
-      s = permissions_to_text(permissions, permissions);
+      s = current_action_to_text(action);
       result = strsav(result, "</p>\n<h2>Final Results:</h2>\n<p><b>{");
       result = strsav(result, s);
       result = strsav(result, " }</b><br>\n<br>\n");
       freez(s);
 
+      free_current_action(action);
+
       result = strsav(result, C_URL_INFO_FOOTER);
       return result;
    }