sstatesig: Add ACL and XATTR data to outhash
RFC 1/1 sstatesig: Add ACL and XATTR data to outhash
Records the ACL and (some) extended attributes in the outhash
---
NOTE: This requires ACL and XATTR support from bitbake
meta/lib/oe/sstatesig.py | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)
meta/lib/oe/sstatesig.py +34 -0
@@ -478,6 +478,8 @@ def OEOuthashBasic(path, sigfile, task, d): import grp import re import fnmatch + import bb.xattr + import bb.acl def update_hash(s): s = s.encode('utf-8')
@@ -640,6 +642,38 @@ def OEOuthashBasic(path, sigfile, task, d): update_hash("\n") + def add_acl(path, typ, name): + acl = bb.acl.ACL.from_path(path, typ) + entries = list(acl.entries()) + if entries: + update_hash(name) + update_hash(":\n") + entries.sort(key=lambda x: (x.tag, x.qualifier, x.mode)) + for e in entries: + update_hash(str(e)) + update_hash("\n") + + def filter_xattr(k): + if k == "system.posix_acl_access": + return False + if k == "system.posix_acl_default": + return False + return True + + # libacl always follows symlinks, so skip them + if not stat.S_ISLNK(s.st_mode): + add_acl(path, bb.acl.ACL_TYPE_ACCESS, "ACL") + if stat.S_ISDIR(s.st_mode): + add_acl(path, bb.acl.ACL_TYPE_DEFAULT, "Default ACL") + + attrs = bb.xattr.get_all_xattr(path, follow=False) + # Ignore ACLs; those are covered above + attrs = {k: v for k, v in attrs.items() if filter_xattr(k)} + if attrs: + update_hash("XATTR:\n") + for k, v in attrs: + update_hash("%s: %s\n" % (k, v)) + # Process this directory and all its child files if include_root or root != ".": process(root)
Signature · 1 line
2.33.0
RFC v2 1/1 sstatesig: Add ACL and XATTR data to outhash
Records the ACL and (some) extended attributes in the outhash
---
NOTE: This requires ACL and XATTR support from bitbake
V2: Filter ACLs to not duplicate the stat mode (since that also does extra filtering)
meta/lib/oe/sstatesig.py | 42 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+)
meta/lib/oe/sstatesig.py +42 -0
@@ -478,6 +478,8 @@ def OEOuthashBasic(path, sigfile, task, d): import grp import re import fnmatch + import bb.xattr + import bb.acl def update_hash(s): s = s.encode('utf-8')
@@ -640,6 +642,46 @@ def OEOuthashBasic(path, sigfile, task, d): update_hash("\n") + def filter_acl(entry): + # Skip owner user, owner group, and other tags. These are + # covered by the stat permissions above + if entry.tag in (bb.acl.ACL_USER_OBJ, bb.acl.ACL_GROUP_OBJ, bb.acl.ACL_OTHER): + return False + return True + + def add_acl(path, typ, name): + acl = bb.acl.ACL.from_path(path, typ) + entries = [e for e in acl.entries() if filter_acl(e)] + if entries: + update_hash(name) + update_hash(":\n") + entries.sort(key=lambda x: (x.tag, x.qualifier, x.mode)) + for e in entries: + update_hash(str(e)) + update_hash("\n") + + def filter_xattr(name): + # ACLs are handled above + if name == "system.posix_acl_access": + return False + if name == "system.posix_acl_default": + return False + return True + + # libacl always follows symlinks, so skip them + if not stat.S_ISLNK(s.st_mode): + add_acl(path, bb.acl.ACL_TYPE_ACCESS, "ACL") + if stat.S_ISDIR(s.st_mode): + add_acl(path, bb.acl.ACL_TYPE_DEFAULT, "Default ACL") + + attrs = bb.xattr.get_all_xattr(path, follow=False) + # Ignore ACLs; those are covered above + attrs = {k: v for k, v in attrs.items() if filter_xattr(k)} + if attrs: + update_hash("XATTR:\n") + for k, v in attrs: + update_hash("%s: %s\n" % (k, v)) + # Process this directory and all its child files if include_root or root != ".": process(root)
Signature · 1 line
2.33.0
Quoted 8 lines · Joshua Watt
Records the ACL and (some) extended attributes in the outhash
Signed-off-by Joshua Watt <[email protected]>---
NOTE: This requires ACL and XATTR support from bitbakeV2: Filter ACLs to not duplicate the stat mode (since that also does extra filtering)
I put this into testing as I was curious:
https://autobuilder.yoctoproject.org/typhoon/#/builders/154/builds/374/steps/12/logs/stdio
and more. I've not looked into what went wrong.
Cheers,
Richard
Quoted 4 lines · Richard Purdie
Quoted 2 lines · Joshua Watt
Records the ACL and (some) extended attributes in the outhash
Quoted 8 lines
Quoted 6 lines
Signed-off-by Joshua Watt <[email protected]>---
NOTE: This requires ACL and XATTR support from bitbakeV2: Filter ACLs to not duplicate the stat mode (since that also does extra filtering)
I put this into testing as I was curious:
oops, sorry. That's a pretty simple fix; I'll send a V3 in a bit
Quoted 8 lines
https://autobuilder.yoctoproject.org/typhoon/#/builders/154/builds/374/steps/12/logs/stdio
and more. I've not looked into what went wrong.
Cheers,
Richard
PATCH v3 1/1 sstatesig: Add ACL and XATTR data to outhash
In reply to Joshua WattRecords the ACL and (some) extended attributes in the outhash
---
NOTE: This requires ACL and XATTR support from bitbake
V2: Filter ACLs to not duplicate the stat mode (since that also does extra filtering)
V3: Fix missing .items() when iterating XATTRS
meta/lib/oe/sstatesig.py | 42 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+)
meta/lib/oe/sstatesig.py +42 -0
@@ -478,6 +478,8 @@ def OEOuthashBasic(path, sigfile, task, d): import grp import re import fnmatch + import bb.xattr + import bb.acl def update_hash(s): s = s.encode('utf-8')
@@ -640,6 +642,46 @@ def OEOuthashBasic(path, sigfile, task, d): update_hash("\n") + def filter_acl(entry): + # Skip owner user, owner group, and other tags. These are + # covered by the stat permissions above + if entry.tag in (bb.acl.ACL_USER_OBJ, bb.acl.ACL_GROUP_OBJ, bb.acl.ACL_OTHER): + return False + return True + + def add_acl(path, typ, name): + acl = bb.acl.ACL.from_path(path, typ) + entries = [e for e in acl.entries() if filter_acl(e)] + if entries: + update_hash(name) + update_hash(":\n") + entries.sort(key=lambda x: (x.tag, x.qualifier, x.mode)) + for e in entries: + update_hash(str(e)) + update_hash("\n") + + def filter_xattr(name): + # ACLs are handled above + if name == "system.posix_acl_access": + return False + if name == "system.posix_acl_default": + return False + return True + + # libacl always follows symlinks, so skip them + if not stat.S_ISLNK(s.st_mode): + add_acl(path, bb.acl.ACL_TYPE_ACCESS, "ACL") + if stat.S_ISDIR(s.st_mode): + add_acl(path, bb.acl.ACL_TYPE_DEFAULT, "Default ACL") + + attrs = bb.xattr.get_all_xattr(path, follow=False) + # Ignore ACLs; those are covered above + attrs = {k: v for k, v in attrs.items() if filter_xattr(k)} + if attrs: + update_hash("XATTR:\n") + for k, v in attrs.items(): + update_hash("%s: %s\n" % (k, v)) + # Process this directory and all its child files if include_root or root != ".": process(root)
Signature · 1 line
2.33.0
W dniu 18.08.2023 o 18:29, Joshua Watt via lists.openembedded.org pisze:
Quoted 2 lines
Records the ACL and (some) extended attributes in the outhash
Quoted 81 lines
Signed-off-by Joshua Watt <[email protected]>---
NOTE: This requires ACL and XATTR support from bitbakeV2: Filter ACLs to not duplicate the stat mode (since that also does extra filtering)
V3: Fix missing .items() when iterating XATTRS
meta/lib/oe/sstatesig.py | 42 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+)meta/lib/oe/sstatesig.py +42
-1@@ -478,6 +478,8 @@ def OEOuthashBasic(path, sigfile, task, d): import grp import re import fnmatch + import bb.xattr + import bb.acl def update_hash(s): s = s.encode('utf-8')@@ -640,6 +642,46 @@ def OEOuthashBasic(path, sigfile, task, d): update_hash("\n") + def filter_acl(entry): + # Skip owner user, owner group, and other tags. These are + # covered by the stat permissions above + if entry.tag in (bb.acl.ACL_USER_OBJ, bb.acl.ACL_GROUP_OBJ, bb.acl.ACL_OTHER): + return False + return True + + def add_acl(path, typ, name): + acl = bb.acl.ACL.from_path(path, typ) + entries = [e for e in acl.entries() if filter_acl(e)] + if entries: + update_hash(name) + update_hash(":\n") + entries.sort(key=lambda x: (x.tag, x.qualifier, x.mode)) + for e in entries: + update_hash(str(e)) + update_hash("\n") + + def filter_xattr(name): + # ACLs are handled above + if name == "system.posix_acl_access": + return False + if name == "system.posix_acl_default": + return False + return True + + # libacl always follows symlinks, so skip them + if not stat.S_ISLNK(s.st_mode): + add_acl(path, bb.acl.ACL_TYPE_ACCESS, "ACL") + if stat.S_ISDIR(s.st_mode): + add_acl(path, bb.acl.ACL_TYPE_DEFAULT, "Default ACL") + + attrs = bb.xattr.get_all_xattr(path, follow=False) + # Ignore ACLs; those are covered above + attrs = {k: v for k, v in attrs.items() if filter_xattr(k)} + if attrs: + update_hash("XATTR:\n") + for k, v in attrs.items(): + update_hash("%s: %s\n" % (k, v)) + # Process this directory and all its child files if include_root or root != ".": process(root) -=-=-=-=-=-=-=-=-=-=-=-Links: You receive all messages sent to this group.
View/Reply Online (#186379): https://lists.openembedded.org/g/openembedded-core/message/186379
Mute This Topic: https://lists.openembedded.org/mt/100823926/7527613
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-