replace PackedUserHash with simple PackedUser
passing hashes is OK
This commit is contained in:
Motiejus Jakštys
parent
c78a2c0def
commit
1751f6c996
@ -251,13 +251,13 @@ pub fn usersSection(
|
|||||||
const userOffset = try math.cast(u32, blob.items.len);
|
const userOffset = try math.cast(u32, blob.items.len);
|
||||||
std.debug.assert(userOffset & 7 == 0);
|
std.debug.assert(userOffset & 7 == 0);
|
||||||
idx2offset[i] = userOffset;
|
idx2offset[i] = userOffset;
|
||||||
try userImport.PackedUserHash.packTo(
|
try userImport.PackedUser.packTo(
|
||||||
&blob,
|
&blob,
|
||||||
user,
|
user,
|
||||||
gids.idx2offset[i],
|
gids.idx2offset[i],
|
||||||
shells.indices,
|
shells.indices,
|
||||||
);
|
);
|
||||||
try pad.arrayList(&blob, userImport.PackedUserHash.alignment_bits);
|
try pad.arrayList(&blob, userImport.PackedUser.alignment_bits);
|
||||||
}
|
}
|
||||||
return UsersSection{
|
return UsersSection{
|
||||||
.idx2offset = idx2offset,
|
.idx2offset = idx2offset,
|
||||||
|
|||||||
395
src/user.zig
395
src/user.zig
@ -10,6 +10,7 @@ const mem = std.mem;
|
|||||||
const math = std.math;
|
const math = std.math;
|
||||||
const Allocator = mem.Allocator;
|
const Allocator = mem.Allocator;
|
||||||
const ArrayList = std.ArrayList;
|
const ArrayList = std.ArrayList;
|
||||||
|
const StringHashMap = std.StringHashMap;
|
||||||
|
|
||||||
// Idx2ShellProto is a function prototype that, given a shell's index (in
|
// Idx2ShellProto is a function prototype that, given a shell's index (in
|
||||||
// global shell section), will return a shell string. Matches ShellReader.get.
|
// global shell section), will return a shell string. Matches ShellReader.get.
|
||||||
@ -78,231 +79,221 @@ pub fn Shell2Index(T: type) type {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
pub const PackedUserHash = packedUser(std.StringHashMap(u6));
|
pub const PackedUser = struct {
|
||||||
|
const Self = @This();
|
||||||
|
|
||||||
fn packedUser(comptime ShellIndexType: type) type {
|
pub const alignment_bits = 3;
|
||||||
return struct {
|
|
||||||
const Self = @This();
|
|
||||||
|
|
||||||
pub const alignment_bits = 3;
|
const Inner = packed struct {
|
||||||
|
uid: u32,
|
||||||
|
gid: u32,
|
||||||
|
padding: u2 = 0,
|
||||||
|
shell_len_or_idx: u6,
|
||||||
|
shell_here: bool,
|
||||||
|
name_is_a_suffix: bool,
|
||||||
|
home_len: u6,
|
||||||
|
name_len: u5,
|
||||||
|
gecos_len: u11,
|
||||||
|
|
||||||
const Inner = packed struct {
|
fn homeLen(self: *const Inner) usize {
|
||||||
uid: u32,
|
return @as(u32, self.home_len) + 1;
|
||||||
gid: u32,
|
|
||||||
padding: u2 = 0,
|
|
||||||
shell_len_or_idx: u6,
|
|
||||||
shell_here: bool,
|
|
||||||
name_is_a_suffix: bool,
|
|
||||||
home_len: u6,
|
|
||||||
name_len: u5,
|
|
||||||
gecos_len: u11,
|
|
||||||
|
|
||||||
fn homeLen(self: *const Inner) usize {
|
|
||||||
return @as(u32, self.home_len) + 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
fn nameStart(self: *const Inner) usize {
|
|
||||||
const name_len = self.nameLen();
|
|
||||||
if (self.name_is_a_suffix) {
|
|
||||||
return self.homeLen() - name_len;
|
|
||||||
} else return self.homeLen();
|
|
||||||
}
|
|
||||||
|
|
||||||
fn nameLen(self: *const Inner) usize {
|
|
||||||
return @as(u32, self.name_len) + 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
fn gecosStart(self: *const Inner) usize {
|
|
||||||
if (self.name_is_a_suffix) {
|
|
||||||
return self.homeLen();
|
|
||||||
} else return self.homeLen() + self.nameLen();
|
|
||||||
}
|
|
||||||
|
|
||||||
fn gecosLen(self: *const Inner) usize {
|
|
||||||
return self.gecos_len;
|
|
||||||
}
|
|
||||||
|
|
||||||
fn maybeShellStart(self: *const Inner) usize {
|
|
||||||
assert(self.shell_here);
|
|
||||||
return self.gecosStart() + self.gecosLen();
|
|
||||||
}
|
|
||||||
|
|
||||||
fn shellLen(self: *const Inner) usize {
|
|
||||||
return @as(u32, self.shell_len_or_idx) + 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
// stringLength returns the length of the blob storing string values.
|
|
||||||
fn stringLength(self: *const Inner) usize {
|
|
||||||
var result: usize = self.homeLen() + self.gecosLen();
|
|
||||||
if (!self.name_is_a_suffix)
|
|
||||||
result += self.nameLen();
|
|
||||||
if (self.shell_here)
|
|
||||||
result += self.shellLen();
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
// PackedUser does not allocate; it re-interprets the "bytes" blob
|
|
||||||
// field. Both of those fields are pointers to "our representation" of
|
|
||||||
// that field.
|
|
||||||
inner: *const Inner,
|
|
||||||
bytes: []const u8,
|
|
||||||
additional_gids_offset: u64,
|
|
||||||
|
|
||||||
pub const Entry = struct {
|
|
||||||
user: Self,
|
|
||||||
next: ?[]const u8,
|
|
||||||
};
|
|
||||||
|
|
||||||
// TODO(motiejus) provide a way to return an entry without decoding the
|
|
||||||
// additional_gids_offset:
|
|
||||||
// - will not return the 'next' slice.
|
|
||||||
// - cannot throw an Overflow error.
|
|
||||||
pub fn fromBytes(bytes: []const u8) error{Overflow}!Entry {
|
|
||||||
const inner = mem.bytesAsValue(Inner, bytes[0..@sizeOf(Inner)]);
|
|
||||||
const start_blob = @sizeOf(Inner);
|
|
||||||
const end_strings = start_blob + inner.stringLength();
|
|
||||||
const gids_offset = try compress.uvarint(bytes[end_strings..]);
|
|
||||||
const end_blob = end_strings + gids_offset.bytes_read;
|
|
||||||
|
|
||||||
const nextStart = pad.roundUp(usize, alignment_bits, end_blob);
|
|
||||||
var next: ?[]const u8 = null;
|
|
||||||
if (nextStart < bytes.len)
|
|
||||||
next = bytes[nextStart..];
|
|
||||||
|
|
||||||
return Entry{
|
|
||||||
.user = Self{
|
|
||||||
.inner = inner,
|
|
||||||
.bytes = bytes[start_blob..end_blob],
|
|
||||||
.additional_gids_offset = gids_offset.value,
|
|
||||||
},
|
|
||||||
.next = next,
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub const Iterator = struct {
|
fn nameStart(self: *const Inner) usize {
|
||||||
section: ?[]const u8,
|
const name_len = self.nameLen();
|
||||||
shellIndex: Idx2ShellProto,
|
if (self.name_is_a_suffix) {
|
||||||
|
return self.homeLen() - name_len;
|
||||||
pub fn next(it: *Iterator) error{Overflow}!?Self {
|
} else return self.homeLen();
|
||||||
if (it.section) |section| {
|
|
||||||
const entry = try Self.fromBytes(section);
|
|
||||||
it.section = entry.next;
|
|
||||||
return entry.user;
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
pub fn iterator(section: []const u8, idxFn: Idx2ShellProto) Iterator {
|
|
||||||
return Iterator{ .section = section, .shellIndex = idxFn };
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// packTo packs the User record and copies it to the given byte slice.
|
fn nameLen(self: *const Inner) usize {
|
||||||
// The slice must have at least maxRecordSize() bytes available. The
|
return @as(u32, self.name_len) + 1;
|
||||||
// slice is passed as a pointer, so it can be mutated.
|
|
||||||
pub fn packTo(
|
|
||||||
arr: *ArrayList(u8),
|
|
||||||
user: User,
|
|
||||||
additional_gids_offset: u64,
|
|
||||||
idxFn: ShellIndexType,
|
|
||||||
) error{ InvalidRecord, OutOfMemory }!void {
|
|
||||||
std.debug.assert(arr.items.len & 7 == 0);
|
|
||||||
// function arguments are consts. We need to mutate the underlying
|
|
||||||
// slice, so passing it via pointer instead.
|
|
||||||
const home_len = try validate.downCast(u6, user.home.len - 1);
|
|
||||||
const name_len = try validate.downCast(u5, user.name.len - 1);
|
|
||||||
const shell_len = try validate.downCast(u6, user.shell.len - 1);
|
|
||||||
const gecos_len = try validate.downCast(u8, user.gecos.len);
|
|
||||||
|
|
||||||
try validate.utf8(user.home);
|
|
||||||
try validate.utf8(user.name);
|
|
||||||
try validate.utf8(user.shell);
|
|
||||||
try validate.utf8(user.gecos);
|
|
||||||
|
|
||||||
const inner = Inner{
|
|
||||||
.uid = user.uid,
|
|
||||||
.gid = user.gid,
|
|
||||||
.shell_here = idxFn.get(user.shell) == null,
|
|
||||||
.shell_len_or_idx = idxFn.get(user.shell) orelse shell_len,
|
|
||||||
.home_len = home_len,
|
|
||||||
.name_is_a_suffix = mem.endsWith(u8, user.home, user.name),
|
|
||||||
.name_len = name_len,
|
|
||||||
.gecos_len = gecos_len,
|
|
||||||
};
|
|
||||||
const innerBytes = mem.asBytes(&inner);
|
|
||||||
|
|
||||||
try arr.*.appendSlice(innerBytes[0..@sizeOf(Inner)]);
|
|
||||||
try arr.*.appendSlice(user.home);
|
|
||||||
|
|
||||||
if (!inner.name_is_a_suffix)
|
|
||||||
try arr.*.appendSlice(user.name);
|
|
||||||
try arr.*.appendSlice(user.gecos);
|
|
||||||
if (inner.shell_here)
|
|
||||||
try arr.*.appendSlice(user.shell);
|
|
||||||
try compress.appendUvarint(arr, additional_gids_offset);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn uid(self: Self) u32 {
|
fn gecosStart(self: *const Inner) usize {
|
||||||
return self.inner.uid;
|
if (self.name_is_a_suffix) {
|
||||||
|
return self.homeLen();
|
||||||
|
} else return self.homeLen() + self.nameLen();
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn gid(self: Self) u32 {
|
fn gecosLen(self: *const Inner) usize {
|
||||||
return self.inner.gid;
|
return self.gecos_len;
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn additionalGidsOffset(self: Self) u64 {
|
fn maybeShellStart(self: *const Inner) usize {
|
||||||
return self.additional_gids_offset;
|
assert(self.shell_here);
|
||||||
|
return self.gecosStart() + self.gecosLen();
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn home(self: Self) []const u8 {
|
fn shellLen(self: *const Inner) usize {
|
||||||
return self.bytes[0..self.inner.homeLen()];
|
return @as(u32, self.shell_len_or_idx) + 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn name(self: Self) []const u8 {
|
// stringLength returns the length of the blob storing string values.
|
||||||
const name_pos = self.inner.nameStart();
|
fn stringLength(self: *const Inner) usize {
|
||||||
const name_len = self.inner.nameLen();
|
var result: usize = self.homeLen() + self.gecosLen();
|
||||||
return self.bytes[name_pos .. name_pos + name_len];
|
if (!self.name_is_a_suffix)
|
||||||
}
|
result += self.nameLen();
|
||||||
|
if (self.shell_here)
|
||||||
pub fn gecos(self: Self) []const u8 {
|
result += self.shellLen();
|
||||||
const gecos_pos = self.inner.gecosStart();
|
return result;
|
||||||
const gecos_len = self.inner.gecosLen();
|
|
||||||
return self.bytes[gecos_pos .. gecos_pos + gecos_len];
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn shell(self: Self, idxFn: Idx2ShellProto) []const u8 {
|
|
||||||
if (self.inner.shell_here) {
|
|
||||||
const shell_pos = self.inner.maybeShellStart();
|
|
||||||
const shell_len = self.inner.shellLen();
|
|
||||||
return self.bytes[shell_pos .. shell_pos + shell_len];
|
|
||||||
}
|
|
||||||
return idxFn(self.inner.shell_len_or_idx);
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
|
||||||
|
// PackedUser does not allocate; it re-interprets the "bytes" blob
|
||||||
|
// field. Both of those fields are pointers to "our representation" of
|
||||||
|
// that field.
|
||||||
|
inner: *const Inner,
|
||||||
|
bytes: []const u8,
|
||||||
|
additional_gids_offset: u64,
|
||||||
|
|
||||||
|
pub const Entry = struct {
|
||||||
|
user: Self,
|
||||||
|
next: ?[]const u8,
|
||||||
|
};
|
||||||
|
|
||||||
|
// TODO(motiejus) provide a way to return an entry without decoding the
|
||||||
|
// additional_gids_offset:
|
||||||
|
// - will not return the 'next' slice.
|
||||||
|
// - cannot throw an Overflow error.
|
||||||
|
pub fn fromBytes(bytes: []const u8) error{Overflow}!Entry {
|
||||||
|
const inner = mem.bytesAsValue(Inner, bytes[0..@sizeOf(Inner)]);
|
||||||
|
const start_blob = @sizeOf(Inner);
|
||||||
|
const end_strings = start_blob + inner.stringLength();
|
||||||
|
const gids_offset = try compress.uvarint(bytes[end_strings..]);
|
||||||
|
const end_blob = end_strings + gids_offset.bytes_read;
|
||||||
|
|
||||||
|
const nextStart = pad.roundUp(usize, alignment_bits, end_blob);
|
||||||
|
var next: ?[]const u8 = null;
|
||||||
|
if (nextStart < bytes.len)
|
||||||
|
next = bytes[nextStart..];
|
||||||
|
|
||||||
|
return Entry{
|
||||||
|
.user = Self{
|
||||||
|
.inner = inner,
|
||||||
|
.bytes = bytes[start_blob..end_blob],
|
||||||
|
.additional_gids_offset = gids_offset.value,
|
||||||
|
},
|
||||||
|
.next = next,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
pub const Iterator = struct {
|
||||||
|
section: ?[]const u8,
|
||||||
|
shellIndex: Idx2ShellProto,
|
||||||
|
|
||||||
|
pub fn next(it: *Iterator) error{Overflow}!?Self {
|
||||||
|
if (it.section) |section| {
|
||||||
|
const entry = try Self.fromBytes(section);
|
||||||
|
it.section = entry.next;
|
||||||
|
return entry.user;
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
pub fn iterator(section: []const u8, idxFn: Idx2ShellProto) Iterator {
|
||||||
|
return Iterator{ .section = section, .shellIndex = idxFn };
|
||||||
|
}
|
||||||
|
|
||||||
|
// packTo packs the User record and copies it to the given byte slice.
|
||||||
|
// The slice must have at least maxRecordSize() bytes available. The
|
||||||
|
// slice is passed as a pointer, so it can be mutated.
|
||||||
|
pub fn packTo(
|
||||||
|
arr: *ArrayList(u8),
|
||||||
|
user: User,
|
||||||
|
additional_gids_offset: u64,
|
||||||
|
idxFn: StringHashMap(u6),
|
||||||
|
) error{ InvalidRecord, OutOfMemory }!void {
|
||||||
|
std.debug.assert(arr.items.len & 7 == 0);
|
||||||
|
// function arguments are consts. We need to mutate the underlying
|
||||||
|
// slice, so passing it via pointer instead.
|
||||||
|
const home_len = try validate.downCast(u6, user.home.len - 1);
|
||||||
|
const name_len = try validate.downCast(u5, user.name.len - 1);
|
||||||
|
const shell_len = try validate.downCast(u6, user.shell.len - 1);
|
||||||
|
const gecos_len = try validate.downCast(u8, user.gecos.len);
|
||||||
|
|
||||||
|
try validate.utf8(user.home);
|
||||||
|
try validate.utf8(user.name);
|
||||||
|
try validate.utf8(user.shell);
|
||||||
|
try validate.utf8(user.gecos);
|
||||||
|
|
||||||
|
const inner = Inner{
|
||||||
|
.uid = user.uid,
|
||||||
|
.gid = user.gid,
|
||||||
|
.shell_here = idxFn.get(user.shell) == null,
|
||||||
|
.shell_len_or_idx = idxFn.get(user.shell) orelse shell_len,
|
||||||
|
.home_len = home_len,
|
||||||
|
.name_is_a_suffix = mem.endsWith(u8, user.home, user.name),
|
||||||
|
.name_len = name_len,
|
||||||
|
.gecos_len = gecos_len,
|
||||||
|
};
|
||||||
|
const innerBytes = mem.asBytes(&inner);
|
||||||
|
|
||||||
|
try arr.*.appendSlice(innerBytes[0..@sizeOf(Inner)]);
|
||||||
|
try arr.*.appendSlice(user.home);
|
||||||
|
|
||||||
|
if (!inner.name_is_a_suffix)
|
||||||
|
try arr.*.appendSlice(user.name);
|
||||||
|
try arr.*.appendSlice(user.gecos);
|
||||||
|
if (inner.shell_here)
|
||||||
|
try arr.*.appendSlice(user.shell);
|
||||||
|
try compress.appendUvarint(arr, additional_gids_offset);
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn uid(self: Self) u32 {
|
||||||
|
return self.inner.uid;
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn gid(self: Self) u32 {
|
||||||
|
return self.inner.gid;
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn additionalGidsOffset(self: Self) u64 {
|
||||||
|
return self.additional_gids_offset;
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn home(self: Self) []const u8 {
|
||||||
|
return self.bytes[0..self.inner.homeLen()];
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn name(self: Self) []const u8 {
|
||||||
|
const name_pos = self.inner.nameStart();
|
||||||
|
const name_len = self.inner.nameLen();
|
||||||
|
return self.bytes[name_pos .. name_pos + name_len];
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn gecos(self: Self) []const u8 {
|
||||||
|
const gecos_pos = self.inner.gecosStart();
|
||||||
|
const gecos_len = self.inner.gecosLen();
|
||||||
|
return self.bytes[gecos_pos .. gecos_pos + gecos_len];
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn shell(self: Self, idxFn: Idx2ShellProto) []const u8 {
|
||||||
|
if (self.inner.shell_here) {
|
||||||
|
const shell_pos = self.inner.maybeShellStart();
|
||||||
|
const shell_len = self.inner.shellLen();
|
||||||
|
return self.bytes[shell_pos .. shell_pos + shell_len];
|
||||||
|
}
|
||||||
|
return idxFn(self.inner.shell_len_or_idx);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
const testing = std.testing;
|
const testing = std.testing;
|
||||||
|
|
||||||
test "PackedUser internal and external alignment" {
|
test "PackedUser internal and external alignment" {
|
||||||
try testing.expectEqual(
|
try testing.expectEqual(
|
||||||
@sizeOf(PackedUserHash.Inner) * 8,
|
@sizeOf(PackedUser.Inner) * 8,
|
||||||
@bitSizeOf(PackedUserHash.Inner),
|
@bitSizeOf(PackedUser.Inner),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
const TestShellIndex = struct {
|
fn testShellIndex(allocator: Allocator) StringHashMap(u6) {
|
||||||
pub fn get(_: *const TestShellIndex, shell: []const u8) ?u6 {
|
var result = StringHashMap(u6).init(allocator);
|
||||||
if (mem.eql(u8, shell, "/bin/bash")) {
|
result.put("/bin/bash", 0) catch unreachable;
|
||||||
return 0;
|
result.put("/bin/zsh", 1) catch unreachable;
|
||||||
} else if (mem.eql(u8, shell, "/bin/zsh")) {
|
return result;
|
||||||
return 1;
|
}
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const PackedUserTest = packedUser(TestShellIndex);
|
|
||||||
|
|
||||||
fn testShell(index: u6) []const u8 {
|
fn testShell(index: u6) []const u8 {
|
||||||
return switch (index) {
|
return switch (index) {
|
||||||
@ -345,13 +336,15 @@ test "construct PackedUser section" {
|
|||||||
.home = "/",
|
.home = "/",
|
||||||
.shell = "/",
|
.shell = "/",
|
||||||
} };
|
} };
|
||||||
|
var shellIndex = testShellIndex(testing.allocator);
|
||||||
|
defer shellIndex.deinit();
|
||||||
for (users) |user| {
|
for (users) |user| {
|
||||||
try PackedUserTest.packTo(&buf, user, math.maxInt(u64), TestShellIndex{});
|
try PackedUser.packTo(&buf, user, math.maxInt(u64), shellIndex);
|
||||||
try pad.arrayList(&buf, PackedUserHash.alignment_bits);
|
try pad.arrayList(&buf, PackedUser.alignment_bits);
|
||||||
}
|
}
|
||||||
|
|
||||||
var i: u29 = 0;
|
var i: u29 = 0;
|
||||||
var it1 = PackedUserTest.iterator(buf.items, testShell);
|
var it1 = PackedUser.iterator(buf.items, testShell);
|
||||||
while (try it1.next()) |user| : (i += 1) {
|
while (try it1.next()) |user| : (i += 1) {
|
||||||
try testing.expectEqual(users[i].uid, user.uid());
|
try testing.expectEqual(users[i].uid, user.uid());
|
||||||
try testing.expectEqual(users[i].gid, user.gid());
|
try testing.expectEqual(users[i].gid, user.gid());
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user