TERMINAL WERCKS (#145)

* issue 32 fixed

* removed swp

* fixed nconf issues

* issue 82, 84 fixes

* fixed #82

* isse #77

* fixed tests

* fixed files

* fixed tests master

* fixed comment

* moved validator

* removed duplicate file

* fixed tests, removed duplicate underscore, publish

* changes

* fixed methods.ts import

* fixed issues w methods

* fixes

* minor fixes

* A

* api changes

* fixed api

* comments

* minor changes

* minor fixes

* api changes (#126)

* issue 32 fixed

* removed swp

* fixed nconf issues

* issue 82, 84 fixes

* fixed #82

* isse #77

* fixed tests

* fixed files

* fixed tests master

* fixed comment

* moved validator

* removed duplicate file

* fixed tests, removed duplicate underscore, publish

* changes

* fixed methods.ts import

* fixed issues w methods

* fixes

* minor fixes

* A

* api changes

* fixed api

* comments

* minor changes

* minor fixes

* method implementations

* before merge

* removed testing change

* fixed typo

* fixed prepareLab

* removed test methods

* fix prepareLab

* methods changes

* removed swap file

* fixed merge

* fixes

* prepareLab WORKS

* further fixes

* merge

* all works

* deleted debug line

* fixed minor excess code

* minor indentation fix

Author: cemersoz

client/imports/ui/pages/lab/taskview.html

@@ -18,6 +18,6 @@
 
   <!--Terminal View-->
   <div class="tuxlab-taskview-terminal">
-		<terminal [username]='username' [password]='password' [host]='host' domain='domain' ></terminal>
+		<terminal ></terminal>
   </div>
 </div>

client/imports/ui/pages/lab/taskview.ts

@@ -1,18 +1,20 @@
 // Meteor Imports
-  	import { Meteor } from 'meteor/meteor';
-  	import { Mongo }  from 'meteor/mongo';
-  	import 'reflect-metadata';
-  	import 'zone.js/dist/zone';
+  import { Meteor } from 'meteor/meteor';
+  import { Mongo }  from 'meteor/mongo';
+  import 'reflect-metadata';
+  import 'zone.js/dist/zone';
 
 // Angular Imports
-  	import { Component, ViewEncapsulation, provide } from '@angular/core';
-  	import { bootstrap } from 'angular2-meteor-auto-bootstrap';
+  import { ViewChild, Component, ViewEncapsulation, provide } from '@angular/core';
+  import { bootstrap } from 'angular2-meteor-auto-bootstrap';
 
 // Angular Material Imports
-	import { MeteorComponent } from 'angular2-meteor';
+  import { MeteorComponent } from 'angular2-meteor';
   import { OVERLAY_PROVIDERS } from '@angular2-material/core/overlay/overlay';
   import { MATERIAL_PROVIDERS, MATERIAL_DIRECTIVES } from 'ng2-material';
 
+  import { InjectUser } from 'angular2-meteor-accounts-ui';
+
 // Terminal and Markdown Imports
   import { Terminal } from "../../components/wetty/terminal.ts";
   import { MarkdownView } from "../../components/markdown/markdown.ts";
@@ -22,8 +24,8 @@
 
 // Meteor method imports
   import "../../../lab/methods.ts"
-
 // Define TaskView Component
+
 @Component({
   selector: 'tuxlab-taskview',
   templateUrl: '/client/imports/ui/pages/lab/taskview.html',
@@ -38,15 +40,31 @@
   encapsulation: ViewEncapsulation.None
 })
 
+@InjectUser('user')
 export default class TaskView extends MeteorComponent {
+  user: Meteor.User;
+  public auth : any;
+
+  @ViewChild(Terminal) term : Terminal;
+  
   labMarkdown = "# Lab 1 Tasks \n ### Task 1 \n Implement **bash** *on your own* ***without*** any help. \n ### Task 2 \n Install *Arch Linux*. \n ### Task 3 \n Type ```sudo rm -rf /*``` into your terminal";
+
   constructor() {
     super();
-    // Create Icon Font
+  }
 
+  ngAfterViewInit(){  
+    var slf = this;
     Meteor.call('prepareLab',"1","1", function(err,res){
+      slf.labMarkdown = "#Sander \n ##are you sure this will work?";
+      console.log(slf.labMarkdown);
+      slf.auth = {
+        username: Meteor.user().profile.nickname,
+        password: res.sshInfo.pass,
+        domain: "10.100.1.11"
+      };
+      slf.term.openTerminal(slf.auth);
       console.log("fired",err,res);
-      //TODO: @Cem res: {host,pass} initialize terminal
     });
   }
 }

private/settings.env.json

@@ -1,10 +1,13 @@
-{ 
+{
+  "key_private" : "/etc/ssl/local/host.key",
+  "key_public" : "/etc/ssl/local/host.key.pub",
+  "key_ca" : "",
   "swarm_node_ip" : "10.100.1.10",
   "swarm_node_port" : "4000",
   "etcd_node_ip" : "10.100.1.10",
   "etcd_node_port" : "2379",
     "etcd_user" : "meteor",
-  "etcd_pass" : "e6da3f8b45546a76fb6e3e30e3542c65",
+  "etcd_pass" : "fff86d549374f03f4ba82bfe170b5018",
     "default_image" : "alpine",
   "mongo_log_url" : "ds025792.mlab.com:25792/tuxlab",
   "mongo_log_collection" : "logs"

server/imports/api/lab.env.js

@@ -111,7 +111,7 @@ env.prototype.init = function(opts){
   //declare final options
   var crtOptsf = {
     'Image': img,
-    'Cmd': ['/bin/sh'], 
+    'Cmd': ['./entry.sh'], 
     'name': this.labVm,
     'Hostname': '',
     'User': '',
@@ -134,11 +134,11 @@ env.prototype.init = function(opts){
 
     //Check whether environment has been initialized correctly
     if(!slf.usr){
-      TuxLog.log('debug','no env user initialized');
+      TuxLog.log('warn','no env user initialized');
       reject("Internal Error");
     }
     if(slf.vmList.labVm){
-      TuxLog.log('labfile_error','trying to init env twice');
+      TuxLog.log('warn','trying to init env twice');
       reject("Internal error");
     }
 
@@ -152,6 +152,7 @@ env.prototype.init = function(opts){
 
 	  //containerId to be stored in helix
 	  else {
+            console.log("successfully created container");
 	    var containerId = container.id.substring(0,7);
 	    container.start(strOptsf,function(err,data){
 
@@ -161,56 +162,54 @@ env.prototype.init = function(opts){
 	      }
 	      else {
             var etcd_redrouter = {
-        			docker: containerId,
-        			port: 22,
-        			username: "root",
-        			allowed_auth: ["password"]
-			      }
-
-            		//etcd directory for helix record
-            		var dir = slf.root_dom.split('.');
-            		dir.reverse().push(slf.usr,'A');
-            		slf.helixKey = dir.join('/');
-            		slf.redRouterKey = '/redrouter/ssh::'+slf.usr;
-
-            	        //set etcd record for redrouter
-            		etcd.set(slf.redRouterKey,etcd_redrouter,function(err,res){
-            		  if(err){
-                                TuxLog.log('debug', 'error creating redrotuer etcd record: '+err);
-            		    reject("Internal error");
-            		  }
-                          else{
-            		  //set etcd record for helixdns
-            		  slf.docker.getContainer(containerId).inspect(function(err,container){
-            		    if(err){
-            		      TuxLog.log('warn', 'docker cannot find the container it just created: '+err);
-            		      reject("Internal error");
-            		      //TODO: get the actual information that we actually want. Perhaps change this entirely
-            		    }
-            		    else{
-
-            		      //set etcd record for helix
-            		      etcd.set(slf.helixKey,container.NetworkSettings,function(err,res){
-            		        if(err){
-            			  TuxLog.log('warn','error creating helix etcd record: '+err);
-            		          reject("Internal error");
-            		        }
-            			else{
-            		          slf.vmList.labVm = slf.labVm;
-            		          resolve();
-                                }
-                             });
-                           }
-                         });
-                       }
+              docker_container: containerId,
+              port: 22,
+              username: "root",
+              allowed_auth: ["password"]
+	    }
+    	    //etcd directory for helix record
+            var dir = slf.root_dom.split('.');
+            dir.reverse().push(slf.usr,'A');
+            slf.helixKey = dir.join('/');
+            slf.redRouterKey = '/redrouter/SSH::'+slf.usr;
+
+            //set etcd record for redrouter
+            etcd.set(slf.redRouterKey,JSON.stringify(etcd_redrouter),function(err,res){
+              if(err){
+                TuxLog.log('debug', 'error creating redrotuer etcd record: '+err);
+                reject("Internal error");
+              }
+              else{
+                //set etcd record for helixdns
+                slf.docker.getContainer(containerId).inspect(function(err,container){
+                  if(err){
+                    TuxLog.log('warn', 'docker cannot find the container it just created: '+err);
+                    reject("Internal error");
+                    //TODO: get the actual information that we actually want. Perhaps change this entirely
+                  }
+                  else{
+                    //set etcd record for helix
+            	    etcd.set(slf.helixKey,container.NetworkSettings,function(err,res){
+            	      if(err){
+            	        TuxLog.log('warn','error creating helix etcd record: '+err);
+            	          reject("Internal error");
+            	      }
+            	      else{
+            	        slf.vmList.labVm = slf.labVm;
+            	        resolve();
+                      }
+                    });
+                  }
                 });
               }
             });
           }
         });
       }
     });
-  });
+  }
+});
+});
 }
 
 /* creates a new container with an image from the options provided,

server/imports/api/lab.session.js

@@ -13,7 +13,7 @@ session.prototype.init = function(user,labId,callback){
   this.env.setUser(user);
 
   // Get Metadata from Database
-  var lab_data = Collections.labs.findOne({_id: labId}, {fields: {'file' : 0}});
+  var lab_data = Collections.labs.findOne({_id: labId}, {fields: {'labfile' : 0}});
   if(!lab_data || lab_data.length < 0){
     callback(new Error("Lab Not Found.", null));
   }
@@ -44,72 +44,87 @@ session.prototype.init = function(user,labId,callback){
           }
         });
 
-
-	SessionCache.add(user,labId,slf,function(err){
+       
+	slf.start(function(err){
 	  if(err){
 	    callback(err,null);
 	  }
 	  else{
-	    slf.start(function(error){
-	      if(err){
-	        callback(err,null);
-	      }
-	      else{
-                console.log("moving to env.getPass");
-	        slf.env.getPass(callback);
-	      }
-	    });
+            console.log("moving to env.getPass");
+	    slf.env.getPass(function(err,res){
+              if(err){
+                callback(err,null);
+              }
+              else{
+                slf.lab.pass = res;
+                callback(null,{taskNo: slf.lab.taskNo,sshPass: res});
+              }
+            });
 	  }
 	});
-
-      }
+      }     
       else{
         // Get LabFile from Cache
         var Lab = value;
         Lab.taskNo = 0;
         slf.lab = Lab;
-        SessionCache.add(user,labId,slf,function(err){
-	  if(err){
-	    callback(err,null);
-	  }
-	  else{
+        slf.start(function(err){
+          if(err){
+            callback(err,null);
+          }
+          else{
             console.log("moving to env.getPass");
-	    slf.env.getPass(callback);
-	  }
+	    slf.env.getPass(function(err,res){
+              if(err){
+                callback(err,null);
+              }
+              else{
+                //slf.lab.pass = res;
+                callback(null,{taskNo: slf.lab.taskNo,sshPass: res});
+              }
+            });
+          }
 	});
       }
     });
   }
 }
-
 /* start: runs setup and moves task header to first task
  * runs callback(err) on err if there is an error,
  * (null) no error
  */
 session.prototype.start = function(callback){
   var slf = this;
-  console.log(this.lab);
   this.lab.taskNo = 1;
   this.lab.setup(this.env)
-    .then(function(){ slf.lab.tasks(this.env); 
-      console.log("done w setup");
-    },function(err){
-      TuxLog.log("warn","error during labfile_setup: "+err);
-      callback("Internal Service Error")
-    })
-    .then(function(){
-      if(!this.lab.currentTask.next){
-      TuxLog.log('labfile_error','labfile tasks not properly chained at start');
-      callback("Internal Service error");
+    .then(function(){ 
+       // slf.lab.tasks(this.env);
+        callback(null);
+      },
+      function(err){
+        TuxLog.log("warn","error during labfile_setup: "+err);
+        callback("Internal Service Error")
       }
-      else{
-        this.lab.currentTask = this.lab.currentTask.next;
-        this.lab.currentTask.sFn().then(function(){ callback(null); });
-      }
-    }, function(){
-      TuxLog.log("warn","error setting up task1");
-      callback("Internal Service Error");
-    });
+    )
+    
+    .then(function(){
+        if(!this.lab.currentTask.next){
+          TuxLog.log('warn','labfile tasks not properly chained at start');
+          callback("Internal Service error");
+        }
+        else{
+          this.lab.currentTask = this.lab.currentTask.next;
+          console.log("no"+slf.lab.taskNo);
+          this.lab.currentTask.sFn().then(function(){console.log("no"+slf.lab.taskNo)}).then(function(){ 
+            console.log("no"+slf.lab.taskNo);
+            console.log("start");
+            callback(null); });
+        }
+      }, 
+      function(){
+        TuxLog.log("warn","error setting up task1");
+        callback("Internal Service Error");
+      });
 }
 
 /* next: verifies that task is completed

server/imports/lab/cache.js

@@ -69,7 +69,7 @@ var NodeCache = require('node-cache');
     session - session object to be stored
     callback(success) - returns boolean if success
   */
-  SessionCache.add = function(userid, labid, session, callback){
+  SessionCache.add = function(userid, labid, session){
     async.series([
       function(cb){
         SessionCache._NodeCache.set(userid+'#'+labid, session, function(err, success){
@@ -97,10 +97,8 @@ var NodeCache = require('node-cache');
     ], function(err){
       if(err){
         TuxLog.log('warn',err);
-        callback(null);
       }
       else{
-        callback(err);
       }
     });
   }