uid: add /etc/shadow and check_password function

Implement UID Infrastructure: autenticação real (completed).

Added /etc/shadow file with basic entries (root:root, daemon:*, nobody:*).
Updated Makefile to include /etc/shadow in initrd.
Added check_password() function in pwd_grp.c to verify passwords against /etc/shadow.
Added check_password() declaration in pwd.h.
Password verification uses plaintext comparison for now (TODO: add SHA256/crypt).
Locked accounts (passwd starts with '*' or '!') are rejected.

Test: make test-battery PASS (157/157)

diff --git a/Makefile b/Makefile
index 1e360af29ac18db9659f2270254f1d7d350b17db..cabf5453b7b7b59e6d1fe8be195eaf20862c461c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -265,14 +265,15 @@ USER_BIN_NAMES := $(filter-out init,$(USER_CMD_NAMES))
 FSTAB := rootfs/etc/fstab
 RCS   := rootfs/etc/init.d/rcS
 PASSWD := rootfs/etc/passwd
+SHADOW := rootfs/etc/shadow
 INITRD_FILES := $(FULLTEST_ELF):sbin/fulltest \
     $(USER_BUILD)/cmds/init/init.elf:sbin/init \
     $(foreach cmd,$(USER_BIN_NAMES),$(USER_BUILD)/cmds/$(cmd)/$(cmd).elf:bin/$(cmd)) \
     $(LDSO_ELF):lib/ld.so $(ULIBC_SO):lib/libc.so \
     $(PIE_SO):lib/libpietest.so $(PIE_ELF):bin/pie_test \
-    $(FSTAB):etc/fstab $(RCS):etc/init.d/rcS $(PASSWD):etc/passwd
+    $(FSTAB):etc/fstab $(RCS):etc/init.d/rcS $(PASSWD):etc/passwd $(SHADOW):etc/shadow
 
-INITRD_DEPS := $(MKINITRD) $(FULLTEST_ELF) $(USER_CMD_ELFS) $(LDSO_ELF) $(ULIBC_SO) $(PIE_SO) $(PIE_ELF) $(FSTAB) $(RCS) $(PASSWD)
+INITRD_DEPS := $(MKINITRD) $(FULLTEST_ELF) $(USER_CMD_ELFS) $(LDSO_ELF) $(ULIBC_SO) $(PIE_SO) $(PIE_ELF) $(FSTAB) $(RCS) $(PASSWD) $(SHADOW)
 
 # doom (build via 'make doom', included in initrd if present)
 doom: $(DOOM_SENTINEL) $(ULIBC_LIB) $(ULIBC_SO)

diff --git a/rootfs/etc/shadow b/rootfs/etc/shadow
new file mode 100644 (file)
index 0000000..830ad00
--- /dev/null
+++ b/rootfs/etc/shadow
@@ -0,0 +1,3 @@
+root:root:0:0:99999:7:::
+daemon:*:0:0:99999:7:::
+nobody:*:0:0:99999:7:::

diff --git a/user/ulibc/include/pwd.h b/user/ulibc/include/pwd.h
index dc0c64c444417dbe9a1d2b72fc1f7a9a024f30ec..1b9a62842d354b425b97665599c1889b0743b008 100644 (file)
--- a/user/ulibc/include/pwd.h
+++ b/user/ulibc/include/pwd.h
@@ -28,4 +28,7 @@ void           setpwent(void);
 void           endpwent(void);
 struct passwd* getpwent(void);
 
+/* Password verification against /etc/shadow */
+int check_password(const char* username, const char* password);
+
 #endif

diff --git a/user/ulibc/src/pwd_grp.c b/user/ulibc/src/pwd_grp.c
index 9bd5679b99f973e6236e5397f55696be1ba02eca..a41b084a62bdd08af0e661ba3004c577de123149 100644 (file)
--- a/user/ulibc/src/pwd_grp.c
+++ b/user/ulibc/src/pwd_grp.c
@@ -15,7 +15,8 @@
 #include <stddef.h>
 
 /* /etc/passwd and /etc/group parsing with static fallback.
- * Format: name:passwd:uid:gid:gecos:dir:shell */
+ * Format: name:passwd:uid:gid:gecos:dir:shell
+ * /etc/shadow format: name:passwd:lastchg:min:max:warn:inactive:expire */
 
 static struct passwd _root = {
     .pw_name   = "root",
@@ -207,3 +208,38 @@ struct group* getgrent(void) {
     if (_gr_idx == 0) { _gr_idx++; return &_root_grp; }
     return (struct group*)0;
 }
+
+/* Simple password verification against /etc/shadow (plaintext for now) */
+int check_password(const char* username, const char* password) {
+    if (!username || !password) return -1;
+
+    FILE* fp = fopen("/etc/shadow", "r");
+    if (!fp) return -1;
+
+    char line[256];
+    while (fgets(line, (int)sizeof(line), fp)) {
+        /* Parse shadow line: name:passwd:lastchg:min:max:warn:inactive:expire */
+        char* saveptr = NULL;
+        char* name = strtok_r(line, ":\n", &saveptr);
+        if (!name) continue;
+
+        if (strcmp(name, username) == 0) {
+            char* passwd = strtok_r(NULL, ":\n", &saveptr);
+            if (!passwd) { fclose(fp); return -1; }
+
+            /* '*' or '!' means locked account */
+            if (passwd[0] == '*' || passwd[0] == '!') {
+                fclose(fp);
+                return -1;
+            }
+
+            /* Simple plaintext comparison (TODO: add SHA256/crypt) */
+            int match = (strcmp(passwd, password) == 0);
+            fclose(fp);
+            return match ? 0 : -1;
+        }
+    }
+
+    fclose(fp);
+    return -1;  /* User not found */
+}