Fixed testing, implemented validateLab (#97)

* 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

Author: cemersoz

collections/labs.ts

@@ -3,6 +3,8 @@ import { Meteor } from 'meteor/meteor';
 
 import { Roles } from './users.ts';
 
+declare var validateLab : any;
+import validateLab = require('../server/imports/lab/checkLab');
 export const labs : any = new Mongo.Collection('labs');
 
 /**
@@ -93,10 +95,30 @@ labs.allow({
   if(Meteor.isServer){
     Meteor.startup(function(){
       var LabValidator = function(userid, doc, fieldNames?, modifier?, options?){
-        if (typeof fieldNames === "undefined" || fieldNames.includes('tasks') || fieldNames.includes('file')){
+        if (typeof fieldNames === "undefined"){
+		console.log("inserting");
+          if(!(doc.course_id && doc.file && //check for lab fields
+             (Meteor.isServer || Roles.isInstructorFor(doc.course_id,userid))&& //check for instructor authorization
+             validateLab(doc.file))){ //check for labfile errors
+	    return false;
+	  }
+	  
           //TODO @CEM: Validate Lab
           //TODO @CEM: Generate tasks array
         }
+	else if(fieldNames.includes('tasks') && !fieldNames.includes('file')){
+          return false;
+	}
+	else if(fieldNames.includes('file')){
+	  if(!((Meteor.isServer || Roles.isInstructorFor(doc.course_id,userid)) && //check for instructor authorization
+		  validateLab(modifier.$set.file))){  //check for labfile errors
+	    return false;
+	  }
+	  else{
+	      if(modifier) {modifier.$set.updated = Date.now(); }
+	      doc.updated = Date.now();
+	  }
+	}
       }
       labs.before.update(LabValidator);
       labs.before.insert(LabValidator);

server/imports/lab/checkLab.d.ts

@@ -0,0 +1,3 @@
+declare module "validateLab" {
+  export function validateLab(str: string): boolean
+}

server/imports/lab/checkLab.js

@@ -0,0 +1,14 @@
+"use strict";
+module.exports = function(str){
+
+  if(!str) { return false; }
+    var tux = eval(str);
+    //var s = tuxlab;
+    var tuxOrig = require('./tuxlab.js');
+    return ((typeof tux != "undefined") && 
+            (typeof tux.setup === 'function') &&  //check for instructor field types
+            (typeof tux.tasks === 'function') &&
+            (tux.init.toString() === tuxOrig.init.toString()) &&  //check for unchanged
+            (tux.newTask.toString() === tuxOrig.newTask.toString()));
+    
+}

server/imports/lab/methods.ts

@@ -1,9 +1,10 @@
 declare var Collections : any;
 Meteor.methods({
   'prepareLab': function(courseId : String,labId : Number){
-    var course = Collections.courses.findOne({_id: courseId}).fetch();
+     console.log("here");
+	  //  var course = Collections.courses.findOne({_id: courseId}).fetch();
     //var t = require('../api/labExec.js');
-    return course.labs.find((l) => { return l._id == labId; });
+   // return course.labs.find((l) => { return l._id == labId; });
   }
 });
 

server/imports/lab/tuxlab.js

@@ -0,0 +1,40 @@
+var tuxlab = function(){}
+
+tuxlab.prototype.init = function(){
+  var slf = this;
+  var ts = {  prnt: slf,
+              next: null,
+              nextTask: function(tsk){
+                this.next = tsk;
+                this.prnt.taskList.push(tsk);
+                return tsk;
+              }
+            }
+  this.currentTask = ts;
+  return ts;
+}
+
+tuxlab.prototype.currentTask = null;
+tuxlab.prototype.taskList = [];
+tuxlab.prototype.setup;
+tuxlab.prototype.tasks;
+tuxlab.prototype.newTask = function(ttl, mdown,sFn, vFn, opt){
+  var slf = this;
+  var ts = {  prnt: slf,
+              setupFn: sFn,
+              verifyFn: vFn,
+	      opts: opt,
+	      markdown: mdown,
+	      title: ttl,
+	      next: null,
+	      completed: false,
+	      nextTask: function(tsk){
+	        this.next = tsk;
+	        this.prnt.taskList.push(tsk);
+	        return tsk;
+	      },
+	      isLast: function(){ return this.next === null; }
+	    }
+  return ts;
+}
+module.exports = new tuxlab();

tests/example_data/badlabfile1.js

@@ -0,0 +1,33 @@
+var tuxlab = require('./tuxlab.js');
+
+tuxlab.setup = 5;
+tuxlab.tasks = function(env){
+  var s1 = function(){
+    env.start()
+      .then(env.createVm({dockerodeCreateOptions: {name: "derek"}}))
+      .then(env.shell("labVm","cd ~./home/usr/derek"))
+      .then(function(sOut){ console.log("succ: "+sOut); },
+        function(sOut,sErr,sDock){ throw sOut+sErr+sDock; });
+  }
+  var v1 = function(){
+    env.shell("labVm","pwd")
+      .then(function(sOut){ if(sOut === "/usr/home/derek") return true; else return false; });
+  }
+  var s2 = function(){}
+  var v2 = function(){}
+  var s3 = function(){}
+  var v3 = function(){}
+  var s4 = function(){}
+  var v4 = function(){}
+  var task1 = tuxlab.newTask('TASK1','MD1',s1,v1)
+  var task2 = tuxlab.newTask('TASK2','MD2',s2,v2)
+  var task3 = tuxlab.newTask('TASK3','MD3',s3,v3)
+  var task4 = tuxlab.newTask('TASK4','MD4',s4,v4)
+  return tuxlab.init()
+           .nextTask(task1)
+           .nextTask(task2)
+           .nextTask(task3)
+           .nextTask(task4);
+}
+module.exports = tuxlab;
+//export tuxlab

tests/example_data/labfile1.js

@@ -37,4 +37,5 @@ tuxlab.tasks = function(env){
            .nextTask(task3)
            .nextTask(task4);
 }
+//export modified tuxlab
 module.exports = tuxlab;

tests/tuxlab.db.js

@@ -52,17 +52,20 @@ describe('Database Schema', function(){
 
     return server.promise(function(resolve, reject, labfile, course_id){
       var example_lab = {
+        _id : "574467bc11091623418a429d",
         course_id : course_id,
         lab_name: "Getting Started with Git",
         file: labfile,
         tasks: [
           {
             _id: 1,
+	    updated: 1467995862937,
             name: "Git Clone",
             md: "##################"
           },
           {
             _id: 2,
+	    updated: 1467995862937,
             name: "Git Pull",
             md: "##################"
           }
@@ -85,13 +88,13 @@ describe('Database Schema', function(){
   // Validate that Records Exists
   it('should be accepted by database', function(){
     return server.execute(function(course_id, lab_id){
-      var course = Collections.courses.findOne(course_id).fetch();
+      var course = Collections.courses.findOne(course_id);
 
           // Check Lab Injection
           expect(course).to.have.property('labs');
           expect(course.labs).to.include(lab_id);
 
-      var lab = Collections.findOne(lab_id).fetch();
+      var lab = Collections.labs.findOne(lab_id);
 
           // Confirm LabFile verifications were run