Changeset 2764 for package_branches/invirt-web/ajaxterm-rebased/code

Timestamp:

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

Author:

broder

Message:

Ensure Kerberos tickets get passed to the ssh that ajaxterm spawns

Location:

package_branches/invirt-web/ajaxterm-rebased/code

Files:

• ajaxterm.py (modified) (1 diff)
• main.py (modified) (3 diffs)

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

@@ -389 +389 @@
                         env["TERM"]="linux"
                         env["PATH"]=os.environ['PATH']
+                        if 'KRB5CCNAME' in os.environ:
+                                env["KRB5CCNAME"]=os.environ['KRB5CCNAME']
                         os.execvpe(cmd[0],cmd,env)
                 else:

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

@@ -39 +39 @@
 from invirt.config import structs as config
 from invirt.common import InvalidInput, CodeError
+import invirt.remctl
 
 from view import View, revertStandardError
@@ -421 +422 @@
                 else:
                     print >>sys.stderr, "spawning new session for terminal to ",machine_id
+                    invirt.remctl.checkKinit(principal='daemon/'+config.web.hostname)
                     term = self.atmulti.create(
                         ["ssh", "-e","none", "-l", machine.name, config.console.hostname]
@@ -437 +439 @@
                     return dump
                 else:
-                    print "Removing session for", machine_id
+                    print "Removing session for", machine_id,"because we received",repr(dump)
                     del self.atsessions[machine_id]
                     return '<?xml version="1.0"?><idem></idem>'