X-Git-Url: https://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2Faclq.c;h=0d09c5c1b4c22c440b8f1e2976888e411904011d;hb=60f8c02626369db69769474307a95caf61ec3d81;hp=5cdcea91f31e5487ef30d5108f74692c1b3204f8;hpb=f6383fa078b90292b5bf372d0baba4b434959b4e;p=apply-default-acl.git

diff --git a/src/aclq.c b/src/aclq.c
index 5cdcea9..0d09c5c 100644
--- a/src/aclq.c
+++ b/src/aclq.c
@@ -73,10 +73,12 @@ bool is_directory(const char* path) {
 }
 
 
-int has_default_tag_acl(const char* path, acl_tag_t tag_type) {
+int has_type_tag_acl(const char* path,
+		     acl_type_t type,
+		     acl_tag_t desired_tag) {
   /* Returns one if the given path has a default ACL for the supplied
      tag, zero if it doesn't, and -1 on error. */
-  acl_t defacl = acl_get_file(path, ACL_TYPE_DEFAULT);
+  acl_t defacl = acl_get_file(path, type);
 
   if (defacl == (acl_t)NULL) {
     return 0;
@@ -94,7 +96,7 @@ int has_default_tag_acl(const char* path, acl_tag_t tag_type) {
        return -1;
     }
     else {
-      if (tag == tag_type) {
+      if (tag == desired_tag) {
 	return 1;
       }
     }
@@ -110,24 +112,13 @@ int has_default_tag_acl(const char* path, acl_tag_t tag_type) {
   return 0;
 }
 
-
-int has_minimal_default_acl(const char* path) {
-  /* An ACL is minimal if and only if it has no mask. Return 1 if it's
-     minimal, zero if it isn't, and -1 on errors. */
-  int has_dm = has_default_tag_acl(path, ACL_MASK);
-
-  if (has_dm == 0) {
-    return 1;
-  }
-  else if (has_dm == 1) {
-    return 0;
-  }
-  else {
-    perror("has_minimal_default_acl");
-    return -1;
-  }
+int has_default_tag_acl(const char* path, acl_tag_t desired_tag) {
+  return has_type_tag_acl(path, ACL_TYPE_DEFAULT, desired_tag);
 }
 
+int has_access_tag_acl(const char* path, acl_tag_t desired_tag) {
+  return has_type_tag_acl(path, ACL_TYPE_ACCESS, desired_tag);
+}
 
 int has_default_user_obj_acl(const char* path) {
   return has_default_tag_acl(path, ACL_USER_OBJ);
@@ -141,61 +132,116 @@ int has_default_other_acl(const char* path) {
   return has_default_tag_acl(path, ACL_OTHER);
 }
 
+int has_default_mask_acl(const char* path) {
+  return has_default_tag_acl(path, ACL_MASK);
+}
 
-int get_default_tag_permset(const char* path,
-			    acl_tag_t tag_type,
-			    acl_permset_t* output_perms) {
-  /* Returns one if successful, zero when the ACL doesn't exist, and
+
+int get_type_tag_entry(const char* path,
+		       acl_type_t type,
+		       acl_tag_t desired_tag,
+		       acl_entry_t* entry) {
+    /* Returns one if successful, zero when the ACL doesn't exist, and
      -1 on unexpected errors. */
-  acl_t defacl = acl_get_file(path, ACL_TYPE_DEFAULT);
+  acl_t acl = acl_get_file(path, type);
 
-  if (defacl == (acl_t)NULL) {
+  if (acl == (acl_t)NULL) {
     /* Follow the acl_foo convention of -1 == error. */
-    errno = EINVAL;
     return 0;
   }
 
-  acl_entry_t entry;
-  int result = acl_get_entry(defacl, ACL_FIRST_ENTRY, &entry);
+  int result = acl_get_entry(acl, ACL_FIRST_ENTRY, entry);
 
   while (result == 1) {
     acl_tag_t tag = ACL_UNDEFINED_TAG;
-    int tag_result = acl_get_tag_type(entry, &tag);
+    int tag_result = acl_get_tag_type(*entry, &tag);
 
     if (tag_result == -1) {
-       perror("get_default_tag_permset (acl_get_tag_type)");
+       perror("get_type_tag_entry (acl_get_tag_type)");
        return -1;
     }
-    else {
-      if (tag == tag_type) {
-	/* We found the right tag, now get the permset. */
-	int ps_result = acl_get_permset(entry, output_perms);
-	if (ps_result == -1) {
-	  perror("get_default_tag_permset (acl_get_permset)");
-	}
-
-	if (ps_result == 0) {
-	  return 1;
-	}
-	else {
-	  return 0;
-	}
-      }
+
+    if (tag == desired_tag) {
+      /* We found the right tag, so return successfully. */
+      return 1;
     }
 
-    result = acl_get_entry(defacl, ACL_NEXT_ENTRY, &entry);
+    result = acl_get_entry(acl, ACL_NEXT_ENTRY, entry);
   }
 
   /* This catches both the initial acl_get_entry and the ones at the
      end of the loop. */
   if (result == -1) {
-    perror("get_default_tag_permset (acl_get_entry)");
+    perror("get_type_tag_entry (acl_get_entry)");
     return -1;
   }
 
   return 0;
 }
 
+int get_default_tag_entry(const char* path,
+			  acl_tag_t desired_tag,
+			  acl_entry_t* entry) {
+  return get_type_tag_entry(path, ACL_TYPE_DEFAULT, desired_tag, entry);
+}
+
+int get_access_tag_entry(const char* path,
+			  acl_tag_t desired_tag,
+			  acl_entry_t* entry) {
+  return get_type_tag_entry(path, ACL_TYPE_ACCESS, desired_tag, entry);
+}
+
+
+
+int get_type_tag_permset(const char* path,
+			 acl_type_t type,
+			 acl_tag_t desired_tag,
+			 acl_permset_t* output_perms) {
+  /* Returns one if successful, zero when the ACL doesn't exist, and
+     -1 on unexpected errors. */
+  acl_t defacl = acl_get_file(path, type);
+
+  if (defacl == (acl_t)NULL) {
+    /* Follow the acl_foo convention of -1 == error. */
+    return 0;
+  }
+
+  acl_entry_t entry;
+  int result = get_type_tag_entry(path, type, desired_tag, &entry);
+
+  if (result == 1) {
+    /* We found the right tag, now get the permset. */
+    int ps_result = acl_get_permset(entry, output_perms);
+    if (ps_result == -1) {
+      perror("get_type_tag_permset (acl_get_permset)");
+    }
+
+    if (ps_result == 0) {
+      return 1;
+    }
+    else {
+      return 0;
+    }
+  }
+  else {
+    return result;
+  }
+}
+
+int get_default_tag_permset(const char* path,
+			    acl_tag_t desired_tag,
+			    acl_permset_t* output_perms) {
+  return get_type_tag_permset(path,
+			      ACL_TYPE_DEFAULT,
+			      desired_tag,
+			      output_perms);
+}
+
+int get_access_tag_permset(const char* path,
+			   acl_tag_t desired_tag,
+			   acl_permset_t* output_perms) {
+  return get_type_tag_permset(path, ACL_TYPE_ACCESS, desired_tag, output_perms);
+}
 
 int has_default_tag_perm(const char* path,
 			  acl_tag_t tag,
@@ -224,6 +270,80 @@ int has_default_tag_perm(const char* path,
   return p_result;
 }
 
+int remove_access_tag_perm(const char* path,
+			   acl_tag_t desired_tag,
+			   acl_perm_t perm) {
+  /* Attempt to remove perm from tag. Returns one if successful, zero
+     if there was nothing to do, and -1 on errors. */
+  acl_t acl = acl_get_file(path, ACL_TYPE_ACCESS);
+  if (acl == (acl_t)NULL) {
+    /* Error. */
+    return -1;
+  }
+
+  acl_permset_t permset;
+  bool ps_result = get_access_tag_permset(path, desired_tag, &permset);
+
+  if (ps_result != 1) {
+    /* Failure or error. */
+    return ps_result;
+  }
+
+  int d_result = acl_delete_perm(permset, perm);
+  if (d_result == -1) {
+    perror("remove_access_tag_perm (acl_delete_perm)");
+    return -1;
+  }
+
+  /* We've only removed perm from the permset; now we have to replace
+     the permset. */
+  acl_entry_t entry;
+  int result = acl_get_entry(acl, ACL_FIRST_ENTRY, &entry);
+
+  while (result == 1) {
+    acl_tag_t tag = ACL_UNDEFINED_TAG;
+    int tag_result = acl_get_tag_type(entry, &tag);
+
+    if (tag_result == -1) {
+       perror("remove_access_tag_perm (acl_get_tag_type)");
+       return -1;
+    }
+
+    if (tag == desired_tag) {
+      /* We found the right tag. Update the permset. */
+      int s_result = acl_set_permset(entry, permset);
+      if (s_result == -1) {
+	perror("remove_access_tag_perm (acl_set_permset)");
+	return -1;
+      }
+
+      int sf_result = acl_set_file(path, ACL_TYPE_ACCESS, acl);
+      if (sf_result == -1) {
+	perror("remove_access_tag_perm (acl_set_file)");
+	return -1;
+      }
+
+      return 1;
+    }
+
+    result = acl_get_entry(acl, ACL_NEXT_ENTRY, &entry);
+  }
+
+  /* This catches both the initial acl_get_entry and the ones at the
+     end of the loop. */
+  if (result == -1) {
+    perror("remove_access_tag_perm (acl_get_entry)");
+    return -1;
+  }
+
+  return 0;
+}
+
+int remove_access_group_obj_execute(const char* path) {
+  return remove_access_tag_perm(path, ACL_GROUP_OBJ, ACL_EXECUTE);
+}
+
+
 int has_default_user_obj_read(const char* path) {
   return has_default_tag_perm(path, ACL_USER_OBJ, ACL_READ);
 }
@@ -303,93 +423,139 @@ int reapply_default_acl(const char* path) {
      to it, and then later reapply the result via chmod. */
   mode_t path_mode = get_mode(path);
 
+  if (has_default_mask_acl(parent)) {
+    /* The parent has an extended ACL. Extended ACLs use the mask
+       entry. */
 
-  /* If parent has a default user ACL, apply it to path via chmod. */
-  if (has_default_user_obj_read(parent)) {
-    path_mode |= S_IRUSR;
-  }
+    /* For the group bits, we'll use the ACL's mask instead of the group
+       object bits. If the default ACL had a group entry, it should
+       already have propagated (but might be masked). */
+    if (has_default_mask_read(parent)) {
+      path_mode |= S_IRGRP;
+    }
+    else {
+      path_mode &= ~S_IRGRP;
+    }
 
-  if (has_default_user_obj_write(parent)) {
-    path_mode |= S_IWUSR;
-  }
+    if (has_default_mask_write(parent)) {
+      path_mode |= S_IWGRP;
+    }
+    else {
+      path_mode &= ~S_IWGRP;
+    }
 
-  /* However, we don't want to set the execute bit on via the ACL
-     unless it was on originally. Furthermore, if the ACL denies
-     execute, we want to honor that. */
-  if (has_default_user_obj_acl(parent)) {
-    if (!has_default_user_obj_execute(parent)) {
-      /* It has a user ACL, but no user execute is granted. */
-      path_mode &= ~S_IXUSR;
+    if (!mode_has_perm(path_mode, S_IXGRP)) {
+      /* The group ACL entry should already have been inherited from the
+	 default ACL. If the source was not group executable, we want to
+	 modify the destination so that it is not group executable
+	 either. In the presence of ACLs, the group permissions come not
+	 from the mode bits, but from the group:: ACL entry. So, to do
+	 this, we remove the group::x entry. */
+      remove_access_group_obj_execute(path);
     }
-  }
 
+    /* We need to determine whether or not to mask the execute
+       bit. This applies not only to the user/group/other entries, but
+       also to all other named entries. If the original file wasn't
+       executable, then the result probably should not be. To
+       determine whether or not "it was executable", we rely on the
+       user execute bits. Obviously this should be done before we
+       twiddle that bit. */
+    if (has_default_mask_execute(parent)) {
+      if (mode_has_perm(path_mode, S_IXUSR)) {
+	/* This just adds the group execute bit, and doesn't actually
+	     grant group execute permissions. */
+	path_mode |= S_IXGRP;
+      }
+    }
+    else {
+      path_mode &= ~S_IXGRP;
+    }
 
-  /* Do the same thing with the other perms/ACL. */
-  if (has_default_other_read(parent)) {
-    path_mode |= S_IROTH;
   }
+  else {
+    /* It's a minimal ACL. We'll repeat for the group bits what we
+       already did for the owner/other bits. */
+    if (has_default_group_obj_acl(parent)) {
+      if (has_default_group_obj_read(parent)) {
+	path_mode |= S_IRGRP;
+      }
+      else {
+	path_mode &= ~S_IRGRP;
+      }
 
-  if (has_default_other_write(parent)) {
-    path_mode |= S_IWOTH;
-  }
 
-  if (has_default_other_acl(parent)) {
-    if (!has_default_other_execute(parent)) {
-      /* It has an other ACL, but no other execute is granted. */
-      path_mode &= ~S_IXOTH;
+      if (has_default_group_obj_write(parent)) {
+	path_mode |= S_IWGRP;
+      }
+      else {
+	path_mode &= ~S_IWGRP;
+      }
+
+      /* We don't want to set the execute bit on via the ACL unless it
+	 was on originally. */
+      if (!has_default_group_obj_execute(parent)) {
+	path_mode &= ~S_IXGRP;
+      }
     }
   }
 
-  if (has_minimal_default_acl(parent)) {
-    /* With a minimal ACL, we'll repeat for the group bits what we
-       already did for the owner/other bits. */
-    if (has_default_group_obj_read(parent)) {
-      path_mode |= S_IRGRP;
+
+  /* If parent has a default user ACL, apply it. */
+  if (has_default_user_obj_acl(parent)) {
+
+    if (has_default_user_obj_read(parent)) {
+      /* Add user read. */
+      path_mode |= S_IRUSR;
+    }
+    else {
+      /* Remove user read. */
+      path_mode &= ~S_IRUSR;
     }
 
-    if (has_default_group_obj_write(parent)) {
-      path_mode |= S_IWGRP;
+
+    if (has_default_user_obj_write(parent)) {
+      /* Add user write. */
+      path_mode |= S_IWUSR;
+    }
+    else {
+      /* Remove user write. */
+      path_mode &= ~S_IWUSR;
     }
 
-    if (has_default_group_obj_acl(parent)) {
-      if (!has_default_group_obj_execute(parent)) {
-	/* It has a group ACL, but no group execute is granted. */
-	path_mode &= ~S_IXGRP;
-      }
+
+    /* We don't want to set the execute bit on via the ACL unless it
+       was on originally. */
+    if (!has_default_user_obj_execute(parent)) {
+      /* Remove user execute. */
+      path_mode &= ~S_IXUSR;
     }
   }
-  else {
-    /* The parent has an extended ACL. Extended ACLs use the mask
-       entry. */
 
-    /* For the group bits, we'll use the ACL's mask instead of the group
-       object bits. If the default ACL had a group entry, it should
-       already have propagated (but might be masked). */
-    if (has_default_mask_read(parent)) {
-      path_mode |= S_IRGRP;
-    }
 
-    if (has_default_mask_write(parent)) {
-      path_mode |= S_IWGRP;
+  /* Do the same thing with the other perms/ACL. */
+  if (has_default_other_acl(parent)) {
+
+    if (has_default_other_read(parent)) {
+      path_mode |= S_IROTH;
+    }
+    else {
+      path_mode &= ~S_IROTH;
     }
 
-    /* Honor the mask execute unconditionally. */
-    if (has_default_mask_execute(parent)) {
-      /* This just adds the group execute bit, and doesn't actually
-	 grant group execute permissions. */
-      path_mode |= S_IXGRP;
+
+    if (has_default_other_write(parent)) {
+      path_mode |= S_IWOTH;
+    }
+    else {
+      path_mode &= ~S_IWOTH;
     }
 
-    if (!mode_has_perm(path_mode, S_IXGRP)) {
-      /* The group ACL entry should already have been inherited from the
-	 default ACL. If the source was not group executable, we want to
-	 modify the destination so that it is not group executable
-	 either. In the presence of ACLs, the group permissions come not
-	 from the mode bits, but from the group:: ACL entry. So, to do
-	 this, we remove the group::x entry. */
-      if (has_default_group_obj_execute(path)) {
-	/*	remove_default_group_obj_execute(path);*/
-      }
+
+    /* We don't want to set the execute bit on via the ACL unless it
+       was on originally. */
+    if (!has_default_other_execute(parent)) {
+      path_mode &= ~S_IXOTH;
     }
   }
 
@@ -409,7 +575,6 @@ int main(int argc, char* argv[]) {
    bool result = reapply_default_acl(target);
 
    if (result) {
-     printf("Success.\n");
      return EXIT_SUCCESS;
    }
    else {