Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rework shared/idmap #369

Merged
merged 50 commits into from
Jan 8, 2024
Merged

Rework shared/idmap #369

merged 50 commits into from
Jan 8, 2024

Conversation

stgraber
Copy link
Member

@stgraber stgraber commented Jan 6, 2024 •
edited
Loading

This re-organizes and modernizes the shared/idmap package to the point of mostly having it fully rewritten. The main changes are:

  • Moved everything to one of three types:
    • Range
    • Entry
    • Set
  • Re-organized filesystem structure to match the various types
  • Made the majority of the code (and test) work on all platforms
  • De-coupled and simplified the set loaders:
    • NewSetFromJSON
    • NewSetFromIncusIDMap
    • NewSetFromCurrentProcess
    • NewSetFromSystem
  • Changes to default Set contents
    • Made all sets return all entries regardless of size by default
    • Introduced FilterPOSIX to filter out any entry smaller than 65536 uid/gid
  • Changes to Shift/Unshift functions
    • Removed all existing Shift/Unshift functions
    • Replaced by a set of two functions
      • ShiftPath
      • UnshiftPath
    • Both functions take a path and skipper function which can be set to nil if not useful
    • The skipper function now receives the newuid and newgid and can return filepath.SkipDir/filepath.SkipAll as an error, or any other error to skip (nil to proceed)
  • Added a Split function to Set which allows finding a subset of a given size
  • Added an Includes function to Set which makes it easy to see if a set is a superset of another

@stgraber
Makefile: Don't complain about shellcheck version
73bc004 
Signed-off-by: Stéphane Graber <[email protected]>
@stgraber
golangci: Disable confusing-results
7f3d010 
Signed-off-by: Stéphane Graber <[email protected]>
@stgraber
shared/idmap: Remove Extend
9ffd28f 
Signed-off-by: Stéphane Graber <[email protected]>
@stgraber
shared/idmap: Return all idmaps in DefaultIdmapSet
09034de 
Signed-off-by: Stéphane Graber <[email protected]>
@stgraber
shared/idmap: Split idrange
2d93ce7 
Signed-off-by: Stéphane Graber <[email protected]>
@stgraber
shared/idmap: Split idmapset
3668316 
Signed-off-by: Stéphane Graber <[email protected]>
@stgraber
shared/idmap: Split idmap
f1cf0a1 
Signed-off-by: Stéphane Graber <[email protected]>
@stgraber
shared/idmap: Split ByHostid
c7155bc 
Signed-off-by: Stéphane Graber <[email protected]>
@stgraber
shared/idmap: Export non-Linux specific logic
fdb6e0c 
Signed-off-by: Stéphane Graber <[email protected]>
@stgraber
shared/idmap: Cleanup IdmapSet
483cbce 
Signed-off-by: Stéphane Graber <[email protected]>
@stgraber
shared/idmap: Rename IdRange to IDRange
f32c4d1 
Signed-off-by: Stéphane Graber <[email protected]>
@stgraber
shared/idmap: Cleanup IdmapEntry
ada2133 
Signed-off-by: Stéphane Graber <[email protected]>
@stgraber
shared/idmap: Rename is_between to isBetween
22f739a 
Signed-off-by: Stéphane Graber <[email protected]>
@stgraber
shared/idmap: Rename ByHostID and make it use IdmapSet
22b853b 
Signed-off-by: Stéphane Graber <[email protected]>
@stgraber
shared/idmap: Update idmapset for modern standard
4f4b587 
Signed-off-by: Stéphane Graber <[email protected]>
@stgraber
shared/idmap: Rename the files
a789aab 
Signed-off-by: Stéphane Graber <[email protected]>
@stgraber
shared/idmap: Move ByHostID back into set
7de61f6 
Signed-off-by: Stéphane Graber <[email protected]>
@stgraber
shared/idmap: Rename IdmapEntry to Entry
2c63b5d 
Signed-off-by: Stéphane Graber <[email protected]>
@stgraber
shared/idmap: Rename IDRange to Range
dca913f 
Signed-off-by: Stéphane Graber <[email protected]>
@stgraber
shared/idmap: Rename IdmapSet to Set
3a31d3c 
Signed-off-by: Stéphane Graber <[email protected]>
@stgraber
shared/idmap: Fix import shadowing
7474e99 
Signed-off-by: Stéphane Graber <[email protected]>
@stgraber
shared/idmap: Rename VFS3Fscaps to VFS3FSCaps
37440ad 
Signed-off-by: Stéphane Graber <[email protected]>
@stgraber
shared/idmap: Add/tweak export function descriptions
980c52a 
Signed-off-by: Stéphane Graber <[email protected]>
@stgraber
shared/idmap: Properly capitalize
ea60fcf 
This properly capitalizes:
 - UID
 - GID
 - ID
 - NS
 - LXC
 - MapRange

Signed-off-by: Stéphane Graber <[email protected]>
@stgraber
shared/idmap: Rename UIDShift to Shift
3abf0fc 
Signed-off-by: Stéphane Graber <[email protected]>
@stgraber
shared/idmap: Update kernelDefaultMap to return multiple maps
87466d5 
Signed-off-by: Stéphane Graber <[email protected]>
@stgraber
shared/idmap: Update comments
a32463e 
Signed-off-by: Stéphane Graber <[email protected]>
@stgraber stgraber marked this pull request as draft January 6, 2024 00:12
@stgraber
shared/idmap: Replace JSONMarshal with ToJSON
588c00f 
Signed-off-by: Stéphane Graber <[email protected]>
@stgraber
shared/idmap: Introduce set_sort
8634fe3 
Signed-off-by: Stéphane Graber <[email protected]>
@stgraber
shared/idmap: Always use pointer receiver
6fbded0 
Signed-off-by: Stéphane Graber <[email protected]>
@stgraber
shared/idmap: Move remaining loaders to set_load
5771941 
Signed-off-by: Stéphane Graber <[email protected]>
@stgraber
shared/idmap: Run tests on all platforms
854fcdd 
Signed-off-by: Stéphane Graber <[email protected]>
@stgraber
shared/idmap: Introduce DefaultFullKernelSet
ad6c420 
Signed-off-by: Stéphane Graber <[email protected]>
@stgraber
shared/idmap: Introduce NewSetFromCurrentProcess
b400fee 
Signed-off-by: Stéphane Graber <[email protected]>
@stgraber
shared/idmap: Remove GetSet
99bf5f1 
Signed-off-by: Stéphane Graber <[email protected]>
@stgraber
shared/idmap: Introduce NewSetFromSystem
add6ebf 
Signed-off-by: Stéphane Graber <[email protected]>
@stgraber
shared/idmap: Remove kernelDefaultMap
0196e21 
Signed-off-by: Stéphane Graber <[email protected]>
@stgraber
shared/idmap: Add Clone to Entry
8a50a08 
Signed-off-by: Stéphane Graber <[email protected]>
@stgraber
shared/idmap: Add Split to Set
c83b433 
Signed-off-by: Stéphane Graber <[email protected]>
@stgraber
shared/idmap: Replace Shift functions with ShiftPath/UnshiftPath
eb11fdc 
This replaces:
 - ShiftRootfs
 - UnshiftRootfs
 - ShiftIntoContainer
 - ShiftFromContainer
 - ShiftFile

WIth just the two:
 - ShiftPath (equivalent of ShiftRootfs)
 - UnshiftPath (equivalent of UnshiftRootfs)

The testmode argument is gone and can instead be replaced by passing in
a simple skipper function that performs the same role.

ShiftFile is removed as it was just an alias to ShiftRoofs (now ShiftPath).

Signed-off-by: Stéphane Graber <[email protected]>
@stgraber
fuidshift: Update for idmap changes
5bd1ece 
Signed-off-by: Stéphane Graber <[email protected]>
@stgraber
incusd: Update for idmap changes
89b6231 
Signed-off-by: Stéphane Graber <[email protected]>
tych0
tych0 approved these changes Jan 8, 2024
View reviewed changes
Copy link
Member

@tych0 tych0 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, this is some of the oldest code in the tree... wild.

@stgraber
shared/idmap: Fix typo in comments
22b1b06 
Signed-off-by: Stéphane Graber <[email protected]>
hallyn
hallyn approved these changes Jan 8, 2024
View reviewed changes
Copy link
Member

@hallyn hallyn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@hallyn hallyn merged commit b1687e6 into lxc:main Jan 8, 2024
24 of 25 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tych0 tych0 tych0 approved these changes

@hallyn hallyn hallyn approved these changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@stgraber @tych0 @hallyn