From b2712e35b948d7ab37cf6ef46bcdfea678506444 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 24 May 2001 21:58:39 +0000 Subject: 2000-05-24 Fernando Ruiz Casas * monitor/mon-prmisc.c: Correct print line. * shell/Makefile.am: Added new file telnetd.c. * shell/telnetd.c, shell/telnetd.h, shell/pty.c: New files. * shell/shell.c, shell/cmds.c, shell/shell.h: Numerous improvments: - The shell_init has a new parameter 'forever' because in /dev/console you need that this process runs forever but in tcp/ip not. (respawn?) - A new task for every session opened trought tcp/ip telnet client. (the chargen,daytime and more are possible of implementation but I ask me if they are necesary) - Exit from the session delete the task and when the client fails too. - More cmds have been implemented. (very reduced version of these) umask, chmod, id, whoami, rm, cat, ... - A reduced line edit has been implemented. Ctrl-C abort the input, Ctrl-d in the first position gives EOF (logout). '\b' and DEL makes the rubout operation. I think that readline() for every session spents a lot of resources. --- cpukit/libmisc/ChangeLog | 21 ++++ cpukit/libmisc/monitor/mon-prmisc.c | 4 +- cpukit/libmisc/shell/Makefile.am | 6 +- cpukit/libmisc/shell/README | 8 +- cpukit/libmisc/shell/cmds.c | 123 ++++++++++++++++-- cpukit/libmisc/shell/shell.c | 242 +++++++++++++++++++++++++++--------- cpukit/libmisc/shell/shell.h | 42 ++++++- 7 files changed, 368 insertions(+), 78 deletions(-) (limited to 'cpukit') diff --git a/cpukit/libmisc/ChangeLog b/cpukit/libmisc/ChangeLog index 6815f6cdfa..670f2b0ccd 100644 --- a/cpukit/libmisc/ChangeLog +++ b/cpukit/libmisc/ChangeLog @@ -1,3 +1,24 @@ +2000-05-24 Fernando Ruiz Casas + + * monitor/mon-prmisc.c: Correct print line. + * shell/Makefile.am: Added new file telnetd.c. + * shell/telnetd.c, shell/telnetd.h, shell/pty.c: New files. + * shell/shell.c, shell/cmds.c, shell/shell.h: Numerous improvments: + - The shell_init has a new parameter 'forever' because in + /dev/console you need that this process runs forever but in + tcp/ip not. (respawn?) + - A new task for every session opened trought tcp/ip telnet client. + (the chargen,daytime and more are possible of implementation but + I ask me if they are necesary) + - Exit from the session delete the task and when the client fails too. + - More cmds have been implemented. (very reduced version of these) + umask, chmod, id, whoami, rm, cat, ... + - A reduced line edit has been implemented. + Ctrl-C abort the input, + Ctrl-d in the first position gives EOF (logout). + '\b' and DEL makes the rubout operation. + I think that readline() for every session spents a lot of resources. + 2001-04-28 Ralf Corsepius * shell/cmds.c, shell/shell.c: Remove fileno-hacks. diff --git a/cpukit/libmisc/monitor/mon-prmisc.c b/cpukit/libmisc/monitor/mon-prmisc.c index ce9aa9a554..5081b16584 100644 --- a/cpukit/libmisc/monitor/mon-prmisc.c +++ b/cpukit/libmisc/monitor/mon-prmisc.c @@ -108,8 +108,8 @@ rtems_monitor_dump_name(rtems_name name) for (i=0; i #include #include +#include +#include #include #include #include @@ -257,6 +259,10 @@ int main_ls(int argc, char *argv[]) DIR *dirp; struct dirent *dp; struct stat stat_buf; + struct passwd * pwd; + struct group * grp; + char * user; + char * group; char sbuf[256]; char nbuf[1024]; int n,size; @@ -279,7 +285,11 @@ int main_ls(int argc, char *argv[]) if (stat(nbuf, &stat_buf) == 0) { /* AWFUL buts works...*/ strftime(sbuf,sizeof(sbuf)-1,"%b %d %H:%M",gmtime(&stat_buf.st_atime)); - printf("%c%c%c%c%c%c%c%c%c%c %3d rtems rtems %11d %s %s%c\n", + pwd=getpwuid(stat_buf.st_uid); + user=pwd?pwd->pw_name:"nouser"; + grp=getgrgid(stat_buf.st_gid); + group=grp?grp->gr_name:"nogrp"; + printf("%c%c%c%c%c%c%c%c%c%c %3d %6.6s %6.6s %11d %s %s%c\n", (S_ISLNK(stat_buf.st_mode)?('l'): (S_ISDIR(stat_buf.st_mode)?('d'):('-'))), (stat_buf.st_mode & S_IRUSR)?('r'):('-'), @@ -292,6 +302,7 @@ int main_ls(int argc, char *argv[]) (stat_buf.st_mode & S_IWOTH)?('w'):('-'), (stat_buf.st_mode & S_IXOTH)?('x'):('-'), (int)stat_buf.st_nlink, + user,group, (int)stat_buf.st_size, sbuf, dp->d_name, @@ -352,6 +363,28 @@ int main_chroot(int argc,char * argv[]) { return 0; } /*-----------------------------------------------------------*/ +int main_cat (int argc, char *argv[]) +{ + int n; + n=1; + while (nexit_shell=TRUE; + return 0; +} +/*-----------------------------------------------------------*/ +int main_tty (int argc,char *argv[]) +{ + printf("%s\n",ttyname(fileno(stdin))); + return 0; +} +/*-----------------------------------------------------------*/ +int main_whoami(int argc,char *argv[]) +{ + struct passwd * pwd; + pwd=getpwuid(getuid()); + printf("%s\n",pwd?pwd->pw_name:"nobody"); + return 0; +} +/*-----------------------------------------------------------*/ +int main_id (int argc,char *argv[]) +{ + struct passwd * pwd; + struct group * grp; + pwd=getpwuid(getuid()); + grp=getgrgid(getgid()); + printf("uid=%d(%s),gid=%d(%s),", + getuid(),pwd?pwd->pw_name:"", + getgid(),grp?grp->gr_name:""); + pwd=getpwuid(geteuid()); + grp=getgrgid(getegid()); + printf("euid=%d(%s),egid=%d(%s)\n", + geteuid(),pwd?pwd->pw_name:"", + getegid(),grp?grp->gr_name:""); + return 0; +} +/*-----------------------------------------------------------*/ +int main_umask(int argc,char *argv[]) +{ + mode_t msk=umask(0); + if (argc == 2) msk=str2int(argv[1]); + umask(msk); + msk=umask(0); + printf("0%o\n",msk); + umask(msk); + return 0; +} +/*-----------------------------------------------------------*/ +int main_chmod(int argc,char *argv[]) +{ + int n; + mode_t mode; + if (argc > 2){ + mode=str2int(argv[1])&0777; + n=2; + while (ncommand)) /*Exclude EXIT (alias quit)*/ + shell_add_cmd(command->command,"monitor", + command->usage ,main_monitor); + command=command->next; + }; /* dir[ectories] topic */ shell_add_cmd ("ls" ,"dir","ls [dir] # list files in the directory" ,main_ls ); shell_add_cmd ("chdir" ,"dir","chdir [dir] # change the current directory",main_chdir); @@ -449,14 +551,24 @@ void register_cmds(void) { shell_add_cmd ("mkdir" ,"dir","mkdir dir # make a directory" ,main_mkdir); shell_add_cmd ("pwd" ,"dir","pwd # print work directory" ,main_pwd ); shell_add_cmd ("chroot","dir","chroot [dir] # change the root directory" ,main_chroot); + shell_add_cmd ("cat" ,"dir","cat n1 [n2 [n3...]]# show the ascii contents",main_cat ); + shell_add_cmd ("rm" ,"dir","rm n1 [n2 [n3...]]# remove files" ,main_rm ); + shell_add_cmd ("chmod" ,"dir","chmod 0777 n1 n2... #change filemode" ,main_chmod); shell_alias_cmd("ls" ,"dir"); shell_alias_cmd("chdir" ,"cd"); /* misc. topic */ + shell_add_cmd ("logoff","misc","logoff from the system" ,main_logoff); + shell_alias_cmd("logoff","exit"); shell_add_cmd ("date" ,"misc","date [[MMDDYY]hhmm[ss]]" ,main_date); shell_add_cmd ("reset","misc","reset the BSP" ,main_reset); shell_add_cmd ("alias","misc","alias old new" ,main_alias); + shell_add_cmd ("tty" ,"misc","show ttyname" ,main_tty ); + shell_add_cmd ("whoami","misc","show current user" ,main_whoami); + shell_add_cmd ("id" ,"misc","show uid,gid,euid,egid" ,main_id ); + shell_add_cmd ("umask" ,"misc","umask [new_umask]" ,main_umask ); + /* memory topic */ shell_add_cmd ("mdump","mem" ,"mdump [adr [size]]" ,main_mdump); @@ -467,12 +579,5 @@ void register_cmds(void) { #ifdef MALLOC_STATS /* /rtems/s/src/lib/libc/malloc.c */ shell_add_cmd ("malloc","mem","mem show memory malloc'ed" ,main_mem); #endif - /* monitor topic */ - command=rtems_monitor_commands; - while (command) { - shell_add_cmd(command->command,"monitor", - command->usage ,main_monitor); - command=command->next; - }; } /*-----------------------------------------------------------*/ diff --git a/cpukit/libmisc/shell/shell.c b/cpukit/libmisc/shell/shell.c index d79fd9d321..2efd1831e0 100644 --- a/cpukit/libmisc/shell/shell.c +++ b/cpukit/libmisc/shell/shell.c @@ -12,6 +12,9 @@ * * $Id$ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include @@ -19,6 +22,8 @@ #include #include #include +#include +#include #include #include @@ -26,8 +31,8 @@ #include #include #include +#include -#include /* ----------------------------------------------- * * This is a stupidity but is cute. * ----------------------------------------------- */ @@ -275,13 +280,21 @@ int shell_help(int argc,char * argv[]) { int shell_scanline(char * line,int size,FILE * in,FILE * out) { int c,col; col=0; + tcdrain(fileno(out)); for (;;) { line[col]=0; c=fgetc(in); switch (c) { + case 0x04:/*Control-d*/ + if (col) break; case EOF :return 0; + case '\n':break; + case '\f':if (out) fputc('\f',out); + case 0x03:/*Control-C*/ + line[0]=0; case '\r':if (out) fputc('\n',out); return 1; + case 127: case '\b':if (col) { if (out) { fputc('\b',out); @@ -301,7 +314,8 @@ int shell_scanline(char * line,int size,FILE * in,FILE * out) { if (out) fputc('\a',out); }; } else { - if (out) fputc('\a',out); + if (out) + if (c=='\a') fputc('\a',out); }; break; }; @@ -317,6 +331,101 @@ shell_env_t global_shell_env , extern char **environ; +void cat_file(FILE * out,char * name) { + FILE * fd; + int c; + if (out) { + fd=fopen(name,"r"); + if (fd) { + while ((c=fgetc(fd))!=EOF) fputc(c,out); + fclose(fd); + }; + }; +} + +int shell_login(FILE * in,FILE * out) { + FILE * fd; + int c; + time_t t; + int times; + char name[128]; + char pass[128]; + struct passwd * passwd; + setuid(0); + setgid(0); + rtems_current_user_env->euid= + rtems_current_user_env->egid=0; + if (out) { + if((current_shell_env->devname[5]!='p')|| + (current_shell_env->devname[6]!='t')|| + (current_shell_env->devname[7]!='y')) { + cat_file(out,"/etc/issue"); + } else { + fd=fopen("/etc/issue.net","r"); + if (fd) { + while ((c=fgetc(fd))!=EOF) { + if (c=='%') { + switch(c=fgetc(fd)) { + case 't':fprintf(out,"%s",current_shell_env->devname); + break; + case 'h':fprintf(out,"0"); + break; + case 'D':fprintf(out," "); + break; + case 'd':time(&t); + fprintf(out,"%s",ctime(&t)); + break; + case 's':fprintf(out,"RTEMS"); + break; + case 'm':fprintf(out,"(" CPU_NAME "/" CPU_MODEL_NAME ")"); + break; + case 'r':fprintf(out,_RTEMS_version); + break; + case 'v':fprintf(out,"%s\n%s",_RTEMS_version,_Copyright_Notice); + break; + case '%':fprintf(out,"%%"); + break; + default :fprintf(out,"%%%c",c); + break; + }; + } else { + fputc(c,out); + }; + }; + fclose(fd); + } + }; + }; + times=0; + for (;;) { + times++; + if (times>3) break; + if (out) fprintf(out,"\nlogin: "); + if (!shell_scanline(name,sizeof(name),in,out )) break; + if (out) fprintf(out,"Password: "); + if (!shell_scanline(pass,sizeof(pass),in,NULL)) break; + if (out) fprintf(out,"\n"); + if ((passwd=getpwnam(name))) { + setuid(passwd->pw_uid); + setgid(passwd->pw_gid); + rtems_current_user_env->euid= + rtems_current_user_env->egid=0; + chown(current_shell_env->devname,passwd->pw_uid,0); + rtems_current_user_env->euid=passwd->pw_uid; + rtems_current_user_env->egid=passwd->pw_gid; + if (!strcmp(passwd->pw_passwd,"*")) { + /* /etc/shadow */ + return 0; + } else { + /* crypt() */ + return 0; + }; + }; + if (out) fprintf(out,"Login incorrect\n"); + }; + return -1; +} + rtems_task shell_shell(rtems_task_argument task_argument) { shell_env_t * shell_env =(shell_env_t*) task_argument; @@ -326,36 +435,38 @@ rtems_task shell_shell(rtems_task_argument task_argument) { struct termios term; char * devname; - char * curdir; + char curdir[256]; char cmd[256]; char last_cmd[256]; /* to repeat 'r' */ int argc; char * argv[128]; - sc=rtems_libio_set_private_env(); + sc=rtems_task_variable_add(RTEMS_SELF,(void*)¤t_shell_env,free); if (sc!=RTEMS_SUCCESSFUL) { - rtems_error(sc,"rtems_libio_set_private_env():"); - printk("rtems_libio_set_private_env():%d",sc); + rtems_error(sc,"rtems_task_variable_add(current_shell_env):"); rtems_task_delete(RTEMS_SELF); }; - sc=rtems_task_variable_add(RTEMS_SELF,(void*)¤t_shell_env,free); + current_shell_env=shell_env; + + sc=rtems_libio_set_private_env(); if (sc!=RTEMS_SUCCESSFUL) { - rtems_error(sc,"rtems_task_variable_add():"); - printk("rtems_task_variable_add():%d",sc); + rtems_error(sc,"rtems_libio_set_private_env():"); rtems_task_delete(RTEMS_SELF); }; - current_shell_env=shell_env; /* Set the task var */ devname=shell_env->devname; + setuid(0); + setgid(0); + rtems_current_user_env->euid= + rtems_current_user_env->egid=0; stdin =fopen(devname,"r+"); if (!stdin) { fprintf(stderr,"shell:unable to open stdin.%s:%s\n",devname,strerror(errno)); - printk("shell:unable to open stdin.(%s)",strerror(errno)); rtems_task_delete(RTEMS_SELF); }; setvbuf(stdin,NULL,_IONBF,0); /* Not buffered*/ @@ -363,7 +474,7 @@ rtems_task shell_shell(rtems_task_argument task_argument) { if (tcgetattr (fileno(stdin), &term)>=0) { term.c_iflag &= ~(IGNBRK|BRKINT|PARMRK|ISTRIP|INLCR|IGNCR|ICRNL|IXON); term.c_oflag &= ~OPOST; - term.c_oflag |= (OPOST|ONLCR); + term.c_oflag |= (OPOST|ONLCR); /* But with cr+nl on output */ term.c_lflag &= ~(ECHO|ECHONL|ICANON|ISIG|IEXTEN); term.c_cflag = CLOCAL | CREAD |(shell_env->tcflag); term.c_cc[VMIN] = 1; @@ -385,46 +496,53 @@ rtems_task shell_shell(rtems_task_argument task_argument) { */ }; shell_add_cmd(NULL,NULL,NULL,NULL); /* init the chain list*/ - strcpy(cmd,""); - printf("\n" - "RTEMS-SHELL:%s. "__DATE__". 'help' to list commands.\n",devname); - curdir=malloc(1024); - chdir("/"); - for (;;) { - /* Prompt section */ - /* XXX: show_prompt user adjustable */ - getcwd(curdir,1024); - printf("%s [%s] # ",devname,curdir); - /* getcmd section */ - if (!shell_scanline(cmd,sizeof(cmd),stdin,stdout)) { - printf("shell:unable scanline(%s)\n",devname); - break; - }; - /* evaluate cmd section */ - if (!strcmp(cmd,"r")) { /* repeat last command, forced, not automatic */ - strcpy(cmd,last_cmd); - } else - if (strcmp(cmd,"")) { /* only for get a new prompt */ - strcpy(last_cmd,cmd); - }; - /* exec cmd section */ - /* TODO: - * To avoid user crash catch the signals. - * Open a new stdio files with posibility of redirection * - * Run in a new shell task background. (unix &) - * Resuming. A little bash. - */ - if (shell_make_args(cmd,&argc,argv)) { - if ((shell_cmd=shell_lookup_cmd(argv[0]))!=NULL) { - current_shell_env->errorlevel=shell_cmd->command(argc,argv); - } else { - printf("shell:%s command not found\n",argv[0]); - current_shell_env->errorlevel=-1; + do { + if (!shell_login(stdin,stdout)) { + cat_file(stdout,"/etc/motd"); + strcpy(last_cmd,""); + strcpy(cmd,""); + printf("\n" + "RTEMS SHELL (Version 1.0-FRC):%s. "__DATE__". 'help' to list commands.\n",devname); + chdir("/"); + shell_env->exit_shell=FALSE; + for (;;) { + /* Prompt section */ + /* XXX: show_prompt user adjustable */ + getcwd(curdir,sizeof(curdir)); + printf("%s [%s] %c ",shell_env->taskname,curdir,geteuid()?'$':'#'); + /* getcmd section */ + if (!shell_scanline(cmd,sizeof(cmd),stdin,stdout)) break; /*EOF*/ + /* evaluate cmd section */ + if (!strcmp(cmd,"r")) { /* repeat last command, forced, not automatic */ + strcpy(cmd,last_cmd); + } else + if (strcmp(cmd,"")) { /* only for get a new prompt */ + strcpy(last_cmd,cmd); + }; + /* exec cmd section */ + /* TODO: + * To avoid user crash catch the signals. + * Open a new stdio files with posibility of redirection * + * Run in a new shell task background. (unix &) + * Resuming. A little bash. + */ + if (shell_make_args(cmd,&argc,argv)) { + if ((shell_cmd=shell_lookup_cmd(argv[0]))!=NULL) { + shell_env->errorlevel=shell_cmd->command(argc,argv); + } else { + printf("shell:%s command not found\n",argv[0]); + shell_env->errorlevel=-1; + }; }; + /* end exec cmd section */ + if (shell_env->exit_shell) break; }; - /* end exec cmd section */ + printf("\nGoodbye from RTEMS SHELL :-(\n"); }; - free(curdir); + } while (shell_env->forever); + fclose(stdin ); + fclose(stdout); + fclose(stderr); rtems_task_delete(RTEMS_SELF); } /* ----------------------------------------------- */ @@ -432,14 +550,15 @@ rtems_status_code shell_init (char * task_name, rtems_unsigned32 task_stacksize, rtems_task_priority task_priority, char * devname, - tcflag_t tcflag) { + tcflag_t tcflag, + int forever) { rtems_id task_id; rtems_status_code sc; shell_env_t * shell_env; sc=rtems_task_create(new_rtems_name(task_name), task_priority, task_stacksize?task_stacksize:RTEMS_MINIMUM_STACK_SIZE, - (RTEMS_DEFAULT_MODES&~RTEMS_ASR_MASK)|RTEMS_ASR, + RTEMS_DEFAULT_MODES, RTEMS_DEFAULT_ATTRIBUTES, &task_id); if (sc!=RTEMS_SUCCESSFUL) { @@ -454,16 +573,19 @@ rtems_status_code shell_init (char * task_name, return sc; }; if (global_shell_env.magic!=new_rtems_name("SENV")) { - global_shell_env.magic =new_rtems_name("SENV"); - global_shell_env.devname ="/dev/console"; - global_shell_env.taskname="GLOBAL"; - global_shell_env.tcflag =0; + global_shell_env.magic =new_rtems_name("SENV"); + global_shell_env.devname ="/dev/console"; + global_shell_env.taskname ="GLOBAL"; + global_shell_env.tcflag =0; + global_shell_env.exit_shell=0; + global_shell_env.forever =TRUE; }; - shell_env->magic =global_shell_env.magic; - shell_env->devname =devname; - shell_env->taskname=task_name; - shell_env->tcflag =tcflag; + shell_env->magic =global_shell_env.magic; + shell_env->devname =devname; + shell_env->taskname =task_name; + shell_env->tcflag =tcflag; + shell_env->exit_shell=FALSE; + shell_env->forever =forever; return rtems_task_start(task_id,shell_shell,(rtems_task_argument) shell_env); } /* ----------------------------------------------- */ - diff --git a/cpukit/libmisc/shell/shell.h b/cpukit/libmisc/shell/shell.h index 89c70506c4..3b9522f10a 100644 --- a/cpukit/libmisc/shell/shell.h +++ b/cpukit/libmisc/shell/shell.h @@ -45,21 +45,61 @@ typedef struct { char * taskname; tcflag_t tcflag; /* user extensions */ + int exit_shell; /* logout */ + int forever ; /* repeat login */ int errorlevel; int mdump_adr; } shell_env_t; int shell_scanline(char * line,int size,FILE * in,FILE * out) ; +void cat_file(FILE * out,char *name); rtems_status_code shell_init(char * task_name , rtems_unsigned32 task_stacksize,/*0 default*/ rtems_task_priority task_priority , char * devname , - tcflag_t tcflag ); + tcflag_t tcflag , + int forever ); extern shell_env_t global_shell_env, * current_shell_env; /*--------*/ +/* pty.c */ +/*--------*/ + +char * get_pty(int socket); + + +rtems_device_driver pty_initialize( + rtems_device_major_number major, + rtems_device_minor_number minor, + void *arg); +rtems_device_driver pty_open( + rtems_device_major_number major, + rtems_device_minor_number minor, + void * arg); +rtems_device_driver pty_close( + rtems_device_major_number major, + rtems_device_minor_number minor, + void * arg); +rtems_device_driver pty_read( + rtems_device_major_number major, + rtems_device_minor_number minor, + void * arg); +rtems_device_driver pty_write( + rtems_device_major_number major, + rtems_device_minor_number minor, + void * arg); +rtems_device_driver pty_control( + rtems_device_major_number major, + rtems_device_minor_number minor, + void * arg); + + +#define PTY_DRIVER_TABLE_ENTRY \ + { pty_initialize , pty_open , pty_close , \ + pty_read , pty_write , pty_control } +/*--------*/ /* cmds.c */ /*--------*/ int str2int(char * s); -- cgit v1.2.3