Archives/ly
2
0
Fork 0
mirror of https://github.com/fairyglade/ly synced 2024-11-13 13:10:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Try to fix some more bugs

Browse Source 
Signed-off-by: AnErrupTion <anerruption@disroot.org>
This commit is contained in:
AnErrupTion 2023-12-31 16:44:30 +01:00
parent 74556479db
commit 55ef58ad7e
No known key found for this signature in database
GPG Key ID: 3E85EB44F610AD7F
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/auth.zig
View File

@ -35,14 +35,27 @@ pub fn authenticate(
try setXdgEnv(allocator, tty_str, uid_str, current_environment.xdg_name);
// Open the PAM session
var credentials = [_][]const u8{ login.text.items, password.text.items };
const login_text_z = try allocator.dupeZ(u8, login.text.items);
defer allocator.free(login_text_z);
const password_text_z = try allocator.dupeZ(u8, password.text.items);
defer allocator.free(password_text_z);
var credentials: [*c][*c]const u8 = undefined;
credentials[0] = login_text_z.ptr;
credentials[1] = password_text_z.ptr;
credentials[2] = 0;
const conv = interop.pam.pam_conv{
.conv = loginConv,
.appdata_ptr = @ptrCast(&credentials),
};
var handle: ?*interop.pam.pam_handle = undefined;
var status = interop.pam.pam_start(service_name.ptr, null, &conv, &handle);
const service_name_z = try allocator.dupeZ(u8, service_name);
defer allocator.free(service_name_z);
var status = interop.pam.pam_start(service_name_z.ptr, null, &conv, &handle);
defer status = interop.pam.pam_end(handle, status);
if (status != interop.pam.PAM_SUCCESS) return pamDiagnose(status);
@ -64,9 +77,6 @@ pub fn authenticate(
password.clear();
// Get password structure from username
const login_text_z = try allocator.dupeZ(u8, login.text.items);
defer allocator.free(login_text_z);
const maybe_pwd = interop.getpwnam(login_text_z.ptr);
interop.endpwent();
@ -198,12 +208,12 @@ fn setXdgEnv(allocator: Allocator, tty_str: [:0]u8, uid_str: [:0]u8, desktop_nam
const desktop_name_z = try allocator.dupeZ(u8, desktop_name);
defer allocator.free(desktop_name_z);
_ = interop.setenv("XDG_RUNTIME_DIR", uid_str, 0);
_ = interop.setenv("XDG_RUNTIME_DIR", uid_str.ptr, 0);
_ = interop.setenv("XDG_SESSION_CLASS", "user", 0);
_ = interop.setenv("XDG_SESSION_ID", "1", 0);
_ = interop.setenv("XDG_SESSION_DESKTOP", desktop_name_z, 0);
_ = interop.setenv("XDG_SESSION_DESKTOP", desktop_name_z.ptr, 0);
_ = interop.setenv("XDG_SEAT", "seat0", 0);
_ = interop.setenv("XDG_VTNR", tty_str, 0);
_ = interop.setenv("XDG_VTNR", tty_str.ptr, 0);
}
fn loginConv(

5
src/main.zig
View File

@ -138,16 +138,13 @@ pub fn main() !void {
const reader = file.reader();
const username_length = try reader.readIntLittle(u64);
const username_buffer = try reader.readAllAlloc(allocator, username_length);
const username_buffer = try allocator.alloc(u8, username_length);
defer allocator.free(username_buffer);
_ = try reader.read(username_buffer);
const current_desktop = try reader.readIntLittle(u64);
const load_buffer = try reader.readAllAlloc(allocator, config.ly.max_login_len + 5);
defer allocator.free(load_buffer);
if (username_buffer.len > 0) {
try login.text.appendSlice(username_buffer);
login.end = username_buffer.len;