libburnia
/
libisofs
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correct group permission bits with -acl off and import of disk file with ACL. 

New API function iso_local_get_perms_wo_acl().
This commit is contained in:
Thomas Schmitt 2009-02-07 21:00:43 +01:00
parent b5fd981482
commit d7f691d6df
4 changed files with 336 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libisofs/builder.c
View File

@ -20,6 +20,12 @@
#include <string.h>
#include <limits.h>
/* ts A90207 */
#ifdef Libisofs_with_aaiP
#include "aaip_0_2.h"
#endif
void iso_node_builder_ref(IsoNodeBuilder *builder)
{
++builder->refcount;
@ -94,6 +100,7 @@ int default_create_node(IsoNodeBuilder *builder, IsoImage *image,
#ifdef Libisofs_with_aaiP
unsigned char *aa_string;
char *a_text = NULL, *d_text = NULL;
#endif /* Libisofs_with_aaiP */
if (builder == NULL || src == NULL || node == NULL) {
@ -176,7 +183,7 @@ int default_create_node(IsoNodeBuilder *builder, IsoImage *image,
}
/* fill fields */
iso_node_set_permissions(new, info.st_mode);
iso_node_set_perms_internal(new, info.st_mode, 1);
iso_node_set_uid(new, info.st_uid);
iso_node_set_gid(new, info.st_gid);
iso_node_set_atime(new, info.st_atime);
@ -184,11 +191,25 @@ int default_create_node(IsoNodeBuilder *builder, IsoImage *image,
iso_node_set_ctime(new, info.st_ctime);
iso_node_set_uid(new, info.st_uid);
*node = new;
#ifdef Libisofs_with_aaiP
/* ts A90115 */
/* ts A90207 */
/* Eventually set S_IRWXG from ACL */
if (image->builder_ignore_acl) {
ret = iso_file_source_get_aa_string(src, &aa_string, 4);
if (aa_string != NULL)
iso_aa_get_acl_text(aa_string, info.st_mode, &a_text, &d_text, 16);
if (a_text != NULL) {
aaip_cleanout_st_mode(a_text, &(info.st_mode), 4 | 16);
iso_node_set_perms_internal(new, info.st_mode, 1);
free(a_text);
a_text = 0;
}
iso_aa_get_acl_text(aa_string, info.st_mode, &a_text, &d_text,
1 << 15); /* free ACL texts */
}
/* ts A90115 */
/* obtain ownership of eventual AA string */
ret = iso_file_source_get_aa_string(src, &aa_string,
1 | (image->builder_ignore_acl << 1) |
@ -201,6 +222,8 @@ int default_create_node(IsoNodeBuilder *builder, IsoImage *image,
#endif /* Libisofs_with_aaiP */
*node = new;
return ISO_SUCCESS;
}

22
libisofs/libisofs.h
View File

@ -4507,6 +4507,28 @@ int iso_local_get_acl_text(char *disk_path, char **text, int flag);
int iso_local_set_acl_text(char *disk_path, char *text, int flag);
/* ts A90207 */
/**
* Obtain permissions of a file in the local filesystem which shall reflect
* ACL entry "group::" in S_IRWXG rather than ACL entry "mask::". This is
* necessary if the permissions of a disk file with ACL shall be copied to
* an object which has no ACL.
* @param disk_path
* Path to the local file which may have an "access" ACL or not.
* @param flag
* Bitfield for control purposes
* bit5= in case of symbolic link: inquire link target
* @param st_mode
* Returns permission bits as of stat(2)
* @return
* 1 success
* -1 failure of lstat() resp. stat() (see errno)
*
* @since 0.6.14
*/
int iso_local_get_perms_wo_acl(char *disk_path, mode_t *st_mode, int flag);
/* ts A90131 */
/**
* Get xattr and non-trivial ACLs of the given file in the local filesystem.

271
libisofs/node.c
View File

@ -277,14 +277,13 @@ const char *iso_node_get_name(const IsoNode *node)
return node->name;
}
/* ta A90128 */
/* ts A90128 */
/**
* See API function iso_node_set_permissions()
*
* @param flag bit0= do not adjust ACL
* @return >0 success , <0 error
*/
static
int iso_node_set_perms_internal(IsoNode *node, mode_t mode, int flag)
{
int ret;
@ -1381,6 +1380,80 @@ int attrs_cleanout_name(char *del_name, size_t *num_attrs, char **names,
}
#ifdef Libisofs_with_aaiP
/* ts A90207 */
/**
* Backend of iso_node_get_attrs() with parameter node replaced by the
* AA string from where to get the attribute list.
* All other parameter specs apply.
*/
static
int iso_aa_get_attrs(unsigned char *aa_string, size_t *num_attrs,
char ***names, size_t **value_lengths, char ***values, int flag)
{
struct aaip_state *aaip= NULL;
unsigned char *rpt;
size_t len, todo, consumed;
int is_done = 0, first_round= 1, ret;
if (flag & (1 << 15))
aaip_get_decoded_attrs(&aaip, num_attrs, names,
value_lengths, values, 1 << 15);
*num_attrs = 0;
*names = NULL;
*value_lengths = NULL;
*values = NULL;
if (flag & (1 << 15))
return 1;
rpt = aa_string;
len = aaip_count_bytes(rpt, 0);
while (!is_done) {
todo = len - (rpt - aa_string);
if (todo > 2048)
todo = 2048;
if (todo == 0) {
/* Out of data while still prompted to submit */
return ISO_AAIP_BAD_AASTRING;
}
/* Allow 1 million bytes of memory consumption, 100,000 attributes */
ret = aaip_decode_attrs(&aaip, (size_t) 1000000, (size_t) 100000,
rpt, todo, &consumed, first_round);
rpt+= consumed;
first_round= 0;
if (ret == 1)
continue;
if (ret == 2)
break;
/* aaip_decode_attrs() reports error */
return ISO_AAIP_BAD_AASTRING;
}
if (rpt - aa_string != len) {
/* aaip_decode_attrs() returns 2 but still bytes are left */
return ISO_AAIP_BAD_AASTRING;
}
ret = aaip_get_decoded_attrs(&aaip, num_attrs, names,
value_lengths, values, 0);
if (ret != 1) {
/* aaip_get_decoded_attrs() failed */
return ISO_AAIP_BAD_AASTRING;
}
if (!(flag & 1)) {
/* Clean out eventual ACL attribute resp. all other xattr */
attrs_cleanout_name("", num_attrs, *names, *value_lengths, *values,
!!(flag & 4));
}
return 1;
}
#endif /* ! Libisofs_with_aaiP */
/* ts A90116 */
int iso_node_get_attrs(IsoNode *node, size_t *num_attrs,
char ***names, size_t **value_lengths, char ***values, int flag)
@ -1388,6 +1461,8 @@ int iso_node_get_attrs(IsoNode *node, size_t *num_attrs,
#ifdef Libisofs_with_aaiP
#ifdef NIX
void *xipt;
struct aaip_state *aaip= NULL;
unsigned char *rpt, *aa_string;
@ -1449,6 +1524,31 @@ int iso_node_get_attrs(IsoNode *node, size_t *num_attrs,
!!(flag & 4));
}
#else /* NIX */
void *xipt;
unsigned char *aa_string = NULL;
int ret;
if (flag & (1 << 15)) {
iso_aa_get_attrs(aa_string, num_attrs, names, value_lengths, values,
1 << 15);
return 1;
}
*num_attrs = 0;
*names = NULL;
*value_lengths = NULL;
*values = NULL;
ret = iso_node_get_xinfo(node, aaip_xinfo_func, &xipt);
if (ret != 1)
return 1;
aa_string = (unsigned char *) xipt;
ret = iso_aa_get_attrs(aa_string, num_attrs, names, value_lengths, values,
flag);
return ret;
#endif /* ! NIX */
#else /* Libisofs_with_aaiP */
@ -1709,6 +1809,79 @@ int iso_decode_acl(unsigned char *v_data, size_t v_len, size_t *consumed,
return ret;
}
/* ts A90207 */
/**
* Backend of iso_node_get_acl_text() with parameter node replaced by the
* attribute list from where to get the ACL and by the associated st_mode
* permission bits. All other parameter specs apply.
*/
static
int iso_attr_get_acl_text(size_t num_attrs, char **names,
size_t *value_lengths, char **values, mode_t st_mode,
char **access_text, char **default_text, int flag)
{
size_t i, consumed, text_fill = 0;
size_t v_len;
unsigned char *v_data;
int ret, from_posix= 0;
if (flag & (1 << 15)) {
if (*access_text != NULL)
free(*access_text);
*access_text = NULL;
if (*default_text != NULL)
free(*default_text);
*default_text = NULL;
return 1;
}
*access_text = *default_text = NULL;
for(i = 0; i < num_attrs; i++) {
if (names[i][0]) /* searching the empty name */
continue;
v_data = (unsigned char *) values[i];
v_len = value_lengths[i];
/* "access" ACL */
ret = iso_decode_acl(v_data, v_len,
&consumed, access_text, &text_fill, 0);
if (ret <= 0)
goto bad_decode;
if (ret == 2) {
v_data += consumed;
v_len -= consumed;
ret = iso_decode_acl(v_data, v_len,
&consumed, default_text, &text_fill, 0);
if (ret == 0)
goto bad_decode;
}
break;
}
if (*access_text == NULL && !(flag & 16)) {
from_posix = 1;
*access_text = calloc(42, 1); /* 42 for aaip_update_acl_st_mode */
}
if (*access_text != NULL) {
aaip_add_acl_st_mode(*access_text, st_mode, 0);
text_fill = strlen(*access_text);
}
if (*access_text == NULL && *default_text == NULL)
ret = 0;
else
ret = 1 + from_posix;
ex:;
return ret;
bad_decode:;
ret = ISO_AAIP_BAD_ACL;
goto ex;
}
#endif /* ! Libisofs_with_aaiP */
@ -1719,6 +1892,8 @@ int iso_node_get_acl_text(IsoNode *node,
#ifdef Libisofs_with_aaiP
#ifdef NIX
size_t num_attrs = 0, *value_lengths = NULL, i, consumed, text_fill = 0;
size_t v_len;
char **names = NULL, **values = NULL;
@ -1781,14 +1956,42 @@ int iso_node_get_acl_text(IsoNode *node,
else
ret = 1 + from_posix;
ex:;
#else /* NIX */
size_t num_attrs = 0, *value_lengths = NULL;
char **names = NULL, **values = NULL;
mode_t st_mode;
int ret;
if (flag & (1 << 15)) {
iso_attr_get_acl_text(num_attrs, names, value_lengths, values, st_mode,
access_text, default_text, 1 << 15);
return 1;
}
ret = iso_node_get_attrs(node, &num_attrs, &names,
&value_lengths, &values, 1);
if (ret < 0)
return ret;
st_mode = iso_node_get_permissions(node);
ret = iso_attr_get_acl_text(num_attrs, names, value_lengths, values,
st_mode, access_text, default_text, flag);
#endif /* ! NIX */
iso_node_get_attrs(node, &num_attrs, &names,
&value_lengths, &values, 1 << 15); /* free memory */
return ret;
#ifdef NIX
bad_decode:;
ret = ISO_AAIP_BAD_ACL;
goto ex;
#endif /* NIX */
#else /* Libisofs_with_aaiP */
*access_text = *default_text = NULL;
@ -1799,6 +2002,37 @@ bad_decode:;
}
#ifdef Libisofs_with_aaiP
/* ts A90207 */
int iso_aa_get_acl_text(unsigned char *aa_string, mode_t st_mode,
char **access_text, char **default_text, int flag)
{
int ret;
size_t num_attrs = 0, *value_lengths = NULL;
char **names = NULL, **values = NULL;
if (flag & (1 << 15)) {
iso_attr_get_acl_text(num_attrs, names, value_lengths, values, st_mode,
access_text, default_text, 1 << 15);
return 1;
}
ret = iso_aa_get_attrs(aa_string, &num_attrs, &names,
&value_lengths, &values, 1);
if (ret < 0)
goto ex;
ret = iso_attr_get_acl_text(num_attrs, names, value_lengths, values,
st_mode, access_text, default_text, flag);
ex:;
iso_aa_get_attrs(aa_string, &num_attrs, &names, &value_lengths, &values,
1 << 15);
return ret;
}
#endif /* Libisofs_with_aaiP */
/* ts A90130 */
int iso_node_set_acl_text(IsoNode *node, char *access_text, char *default_text,
int flag)
@ -2103,7 +2337,7 @@ mode_t iso_node_get_perms_wo_acl(const IsoNode *node)
ret = iso_node_get_acl_text((IsoNode *) node, &a_text, &d_text, 16);
if (ret != 1)
goto ex;
ret = aaip_cleanout_st_mode(a_text, &st_mode, 4 | 16);
aaip_cleanout_st_mode(a_text, &st_mode, 4 | 16);
ex:;
iso_node_get_acl_text((IsoNode *) node, &a_text, &d_text, 1 << 15);
return st_mode;
@ -2117,3 +2351,34 @@ ex:;
}
/* ts A90207 */
int iso_local_get_perms_wo_acl(char *disk_path, mode_t *st_mode, int flag)
{
struct stat stbuf;
int ret;
#ifdef Libisofs_with_aaiP
char *a_text = NULL;
#endif
if (flag & 32)
ret = stat(disk_path, &stbuf);
else
ret = lstat(disk_path, &stbuf);
if (ret == -1)
return -1;
*st_mode = stbuf.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO);
#ifdef Libisofs_with_aaiP
ret = iso_local_get_acl_text(disk_path, &a_text, 16 | (flag & 32));
if (a_text != NULL) {
aaip_cleanout_st_mode(a_text, st_mode, 4 | 16);
iso_local_get_acl_text(disk_path, &a_text, 1 << 15); /* free a_text */
}
#endif /* Libisofs_with_aaiP */
return 1;
}

19
libisofs/node.h
View File

@ -331,4 +331,23 @@ void iso_dir_iter_unregister(IsoDirIter *iter);
void iso_notify_dir_iters(IsoNode *node, int flag);
/* ts A90128 */
/**
* See API function iso_node_set_permissions()
*
* @param flag bit0= do not adjust ACL
* @return >0 success , <0 error
*/
int iso_node_set_perms_internal(IsoNode *node, mode_t mode, int flag);
/* ts A90207 */
/**
* Like iso_node_get_acl_text() with param node replaced by aa_string and
* st_mode from where to obtain the ACLs. All other parameter specs apply.
*/
int iso_aa_get_acl_text(unsigned char *aa_string, mode_t st_mode,
char **access_text, char **default_text, int flag);
#endif /*LIBISO_NODE_H_*/