Changeset 2748 for package_branches/invirt-web

Timestamp:

Dec 21, 2009, 1:10:18 AM (15 years ago)

Author:

broder

Message:

Allow passing a different command for each ajaxterm invocation

File:

• package_branches/invirt-web/ajaxterm-rebased/code/ajaxterm.py (modified) (3 diffs)

package_branches/invirt-web/ajaxterm-rebased/code/ajaxterm.py

@@ -368 +368 @@
 
 class Multiplex:
-        def __init__(self,cmd=None):
+        def __init__(self):
                 signal.signal(signal.SIGCHLD, signal.SIG_IGN)
-                self.cmd=cmd
                 self.proc={}
                 self.lock=threading.RLock()
@@ -380 +379 @@
                         setattr(self,name,SynchronizedMethod(self.lock,orig))
                 self.thread.start()
-        def create(self,w=80,h=25):
+        def create(self,cmd,w=80,h=25):
                 pid,fd=pty.fork()
                 if pid==0:
@@ -392 +391 @@
                                 except OSError:
                                         pass
-                        if self.cmd:
-                                cmd=['/bin/sh','-c',self.cmd]
-                        elif os.getuid()==0:
-                                cmd=['/bin/login']
-                        else:
-                                sys.stdout.write("Login: ")
-                                login=sys.stdin.readline().strip()
-                                if re.match('^[0-9A-Za-z-_. ]+$',login):
-                                        cmd=['ssh']
-                                        cmd+=['-oPreferredAuthentications=keyboard-interactive,password']
-                                        cmd+=['-oNoHostAuthenticationForLocalhost=yes']
-                                        cmd+=['-oLogLevel=FATAL']
-                                        cmd+=['-F/dev/null','-l',login,'localhost']
-                                else:
-                                        os._exit(0)
                         env={}
                         env["COLUMNS"]=str(w)