Backport from Enterprise

[bacula/bacula] / bacula / src / dird / ua_acl.c

diff --git a/bacula/src/dird/ua_acl.c b/bacula/src/dird/ua_acl.c
index cb184a0a88253506bc44f4be814e0bf602230afc..c510df6062da27dca551863ce38f26b9c21d778c 100644 (file)
--- a/bacula/src/dird/ua_acl.c
+++ b/bacula/src/dird/ua_acl.c
@@ -1,56 +1,72 @@
 /*
- *
- *   Bacula Director -- User Agent Access Control List (ACL) handling
- *
- *     Kern Sibbald, January MMIV  
- *
- *   Version  $Id$
- */
+   Bacula® - The Network Backup Solution
 
-/*
-   Copyright (C) 2004 Kern Sibbald and John Walker
+   Copyright (C) 2004-2008 Free Software Foundation Europe e.V.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
+   The main author of Bacula is Kern Sibbald, with contributions from
+   many others, a complete list can be found in the file AUTHORS.
+   This program is Free Software; you can redistribute it and/or
+   modify it under the terms of version three of the GNU Affero General Public
+   License as published by the Free Software Foundation and included
+   in the file LICENSE.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    General Public License for more details.
 
-   You should have received a copy of the GNU General Public
-   License along with this program; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
+   You should have received a copy of the GNU Affero General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
 
+   Bacula® is a registered trademark of Kern Sibbald.
+   The licensor of Bacula is the Free Software Foundation Europe
+   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+   Switzerland, email:ftf@fsfeurope.org.
+*/
+/*
+ *
+ *   Bacula Director -- User Agent Access Control List (ACL) handling
+ *
+ *     Kern Sibbald, January MMIV
+ *
+ *   Version  $Id$
  */
 
 #include "bacula.h"
 #include "dird.h"
 
-/*  
- * Check if access is permitted to item in acl   
+/*
+ * Check if access is permitted to item in acl
  */
-bool acl_access_ok(UAContext *ua, int acl, char *item)
+bool acl_access_ok(UAContext *ua, int acl, const char *item)
 {
    return acl_access_ok(ua, acl, item, strlen(item));
 }
 
 
-bool acl_access_ok(UAContext *ua, int acl, char *item, int len)
+/* This version expects the length of the item which we must check. */
+bool acl_access_ok(UAContext *ua, int acl, const char *item, int len)
 {
+   /* The resource name contains nasty characters */
+   if (acl != Where_ACL && !is_name_valid(item, NULL)) {
+      Dmsg1(1400, "Access denied for item=%s\n", item);
+      return false;
+   }
 
    /* If no console resource => default console and all is permitted */
-   if (!ua->cons) {
-      Dmsg0(400, "Root cons access OK.\n");
-      return true;                   /* No cons resource -> root console OK for everything */
+   if (!ua || !ua->cons) {
+      Dmsg0(1400, "Root cons access OK.\n");
+      return true;                    /* No cons resource -> root console OK for everything */
    }
 
    alist *list = ua->cons->ACL_lists[acl];
-   if (!list) {
-      return false;                  /* List empty, reject everything */
+   if (!list) {                       /* empty list */
+      if (len == 0 && acl == Where_ACL) {
+         return true;                 /* Empty list for Where => empty where */
+      }
+      return false;                   /* List empty, reject everything */
    }
 
    /* Special case *all* gives full access */
@@ -60,9 +76,9 @@ bool acl_access_ok(UAContext *ua, int acl, char *item, int len)
 
    /* Search list for item */
    for (int i=0; i<list->size(); i++) {
-      if (strncasecmp(item, (char *)list->get(i), len) == 0) {
-         Dmsg3(400, "Found %s in %d %s\n", item, acl, (char *)list->get(i));
-        return true;
+      if (strcasecmp(item, (char *)list->get(i)) == 0) {
+         Dmsg3(1400, "ACL found %s in %d %s\n", item, acl, (char *)list->get(i));
+         return true;
       }
    }
    return false;