X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Flogin_src%2Fmain.c;h=e151ff944b9ab053099f74de32031835e42f92b3;hb=c62d9852a19f6a93ac2c5eaffa823d44b2ef256a;hp=54532837d5bbd17a4bb0b081c14357b0dd68c324;hpb=c13663104076a7780d1bbbaf77273416733cbb58;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/login_src/main.c b/Usermode/Applications/login_src/main.c
index 54532837..e151ff94 100644
--- a/Usermode/Applications/login_src/main.c
+++ b/Usermode/Applications/login_src/main.c
@@ -1,7 +1,9 @@
 /*
  * Acess 2 Login
+ * - By John Hodge (thePowersGang)
  */
 #include "header.h"
+#include <acess/devices/pty.h>	// Enable/disable echo
 
 // === CONSTANTS ===
 #define BUFLEN	1024
@@ -14,115 +16,131 @@ char	*GetPassword();
 int main(int argc, char *argv[])
 {
 	char	*sUsername, *sPassword;
-	 int	pid, uid;
+	 int	pid, uid = 0;
 	 int	status = 0;
 	tUserInfo	*uinfo;
-	
-	putchar('\n');
+
+	printf("\x1B[?25h");	// Re-enable the cursor	
+//	printf("\x1B[2J");	// Clear Screen
+
 	for(;;)
 	{
 		// Validate User
-		do {
+		for(;;)
+		{
 			sUsername = GetUsername();
+			if(!sUsername)	continue;
 			sPassword = GetPassword();
-		} while( (uid = ValidateUser(sUsername, sPassword)) == -1 );
-		putchar('\n');
-		
-		// Get user information
+			if(!sPassword)	continue;
+			if( (uid = ValidateUser(sUsername, sPassword)) == -1 )
+			{
+				printf("\nInvalid username or password\n");
+				_SysDebug("Auth failure: '%s':'%s'", sUsername, sPassword);
+				free(sUsername);
+				free(sPassword);
+			}
+			else
+				break;
+		}
+		printf("\n");
+
 		uinfo = GetUserInfo(uid);
-		
-		// Create child process
-		pid = clone(CLONE_VM, 0);
+		struct s_sys_spawninfo	spawninfo;
+		spawninfo.flags = 0;
+		spawninfo.gid = uinfo->GID;
+		spawninfo.uid = uinfo->UID;
+		const char	*child_argv[2] = {"-", 0};
+		const char	**child_envp = NULL;
+		 int	fds[] = {0, 1, 2};
+		pid = _SysSpawn(uinfo->Shell, child_argv, child_envp, 3, fds, &spawninfo);
 		// Error check
 		if(pid == -1) {
 			fprintf(stderr, "Unable to fork the login process!\n");
 			return -1;
 		}
 		
-		// Spawn shell in a child process
-		if(pid == 0)
-		{
-			char	*argv[2] = {uinfo->Shell, 0};
-			char	**envp = NULL;
-			setgid(uinfo->GID);
-			setuid(uid);
-			
-			execve(uinfo->Shell, argv, envp);
-			exit(-1);
-		}
-		
 		// Wait for child to terminate
-		waittid(pid, &status);
+		_SysWaitTID(pid, &status);
 	}
 	
 	return 0;
 }
 
-/**
- * \fn char *GetUsername()
- */
-char *GetUsername()
+char *_GetString(int bEcho)
 {
 	char	ret[BUFLEN];
 	 int	pos = 0;
 	char	ch;
 	
-	// Prompt the user
-	printf("Username: ");
+	struct ptymode	mode;
+	const int	is_pty = (_SysIOCtl(0, DRV_IOCTL_TYPE, NULL) == DRV_TYPE_TERMINAL);
+
+	// Clear PTY echo
+	if( !bEcho && is_pty ) {
+		_SysIOCtl(0, PTY_IOCTL_GETMODE, &mode);
+		mode.InputMode &= ~PTYIMODE_ECHO;
+		_SysIOCtl(0, PTY_IOCTL_SETMODE, &mode);
+	}
 	
 	// Read in text
 	while( (ch = fgetc(stdin)) != -1 && ch != '\n' )
 	{
+		// Handle backspace
 		if(ch == '\b') {
+			if( pos <= 0 )	continue;
 			pos --;
 			ret[pos] = '\0';
 		}
+		// Ctrl-C : Cancel
+		else if( ch == 'c'-'a'+1)
+			pos = 0;
+		// Ctrl-U : Clear
+		else if( ch == 'u'-'a'+1)
+			pos = 0;
+		// Ignore \r
+		else if( ch == '\r' )
+			continue;
 		else
 			ret[pos++] = ch;
 		
-		// Echo out to the screen
-		fputc(ch, stdout);
-		
 		if(pos == BUFLEN-1)	break;
 	}
 	
-	// Finish String
 	ret[pos] = '\0';
+
+	// Re-set echo
+	if( !bEcho && is_pty ) {
+		mode.InputMode |= PTYIMODE_ECHO;
+		_SysIOCtl(0, PTY_IOCTL_SETMODE, &mode);
+	}
 	
-	printf("\n");
 	return strdup(ret);
 }
 
 /**
- * \fn char *GetPassword()
+ * \fn char *GetUsername()
  */
-char *GetPassword()
+char *GetUsername()
 {
-	char	ret[BUFLEN];
+	char	ret[BUFLEN] = {0};
 	 int	pos = 0;
 	char	ch;
 	
 	// Prompt the user
-	printf("Password: ");
-	
-	// Read in text
-	while( (ch = fgetc(stdin)) != -1 && ch != '\n' )
-	{
-		if(ch == '\b') {
-			pos --;
-			ret[pos] = '\0';
-		}
-		else
-			ret[pos++] = ch;
-		
-		// Don't echo out to the screen
-		//fputc(stdout, ch);
-		
-		if(pos == BUFLEN-1)	break;
-	}
+	printf("Username: ");
+	fflush(stdout);
 	
-	ret[pos] = '\0';
+	return _GetString(1);
+}
+
+/**
+ * \fn char *GetPassword()
+ */
+char *GetPassword()
+{
+	// Prompt the user
+	printf("Password: ");
+	fflush(stdout);
 	
-	printf("\n");
-	return strdup(ret);
+	return _GetString(0);
 }