Added new modules to help prevent Cross Site Request Forgery

[sdnc/oam.git] / admportal / server / router / routes / vnf.js

diff --git a/admportal/server/router/routes/vnf.js b/admportal/server/router/routes/vnf.js
index be004fe..99bb3a7 100644 (file)
--- a/admportal/server/router/routes/vnf.js
+++ b/admportal/server/router/routes/vnf.js
@@ -21,12 +21,15 @@ var finalJson={};
 var platform;\r
 var req, res;\r
 var preloadVersion;  // 1607, 1610, etc...\r
+var proc_error=false;\r
+var filename;\r
 \r
 puts = helpers.puts;\r
 putd = helpers.putd;\r
 \r
 vnf.go = function(lreq,lres,cb,dir){\r
   puts("Processing VNF workbook");\r
+       proc_error=false;\r
   req = lreq;\r
   res = lres;\r
   callback = cb;\r
@@ -51,7 +54,8 @@ function doGeneral() {
     helpers.readCsv(indir, newFileName, gotGeneral);\r
   }\r
   else {\r
-    callback(csvFilename + ' file is missing from upload.');\r
+    puts('General.csv file is missing from upload.');\r
+               proc_error=true;\r
   }\r
 }\r
 \r
@@ -59,6 +63,7 @@ function gotGeneral(err, jsonObj) {
   if (err) {\r
     puts("\nError!");\r
     putd(err);\r
+               proc_error=true;\r
     callback('General.csv file is missing from upload.');\r
     return;\r
   }\r
@@ -79,14 +84,17 @@ function doAvailZones() {
     helpers.readCsv(indir, newFileName, gotAvailZones);\r
   }\r
   else {\r
+               proc_error=true;\r
     callback(csvFilename + ' file is missing from upload.');\r
   }\r
+       return;\r
 }\r
 \r
 function gotAvailZones(err, jsonObj) {\r
   if (err) {\r
     puts("\nError!");\r
     putd(err);\r
+               proc_error=true;\r
     callback('Availability-zones.csv file is missing from upload.');\r
     return;\r
   }\r
@@ -110,14 +118,17 @@ function doNetworks() {
     helpers.readCsv(indir, newFileName, gotNetworks);\r
   }\r
   else {\r
+               proc_error=true;\r
     callback(csvFilename + ' file is missing from upload.');\r
   }\r
+       return;\r
 }\r
 \r
 function gotNetworks(err, jsonObj) {\r
   if (err) {\r
     puts("\nError!");\r
     putd(err);\r
+               proc_error=true;\r
     callback('Networks.csv file is missing from upload.');\r
     return;\r
   }\r
@@ -142,14 +153,17 @@ function doVMs() {
     helpers.readCsv(indir, newFileName, gotVMs);\r
   }\r
   else {\r
+               proc_error=true;\r
     callback(csvFilename + ' file is missing from upload.');\r
   }\r
+       return;\r
 }\r
 \r
 function gotVMs(err, jsonObj) {\r
   if (err) {\r
     puts("\nError!");\r
     putd(err);\r
+               proc_error=true;\r
     callback('VMs.csv file is missing from upload.');\r
     return;\r
   }\r
@@ -174,14 +188,17 @@ function doVMnetworks() {
     helpers.readCsv(indir, newFileName, gotVMnetworks);\r
   }\r
   else {\r
+               proc_error=true;\r
     callback(csvFilename + ' file is missing from upload.');\r
   }\r
+       return;\r
 }\r
 \r
 function gotVMnetworks(err, jsonObj) {\r
   if (err) {\r
     puts("\nError!");\r
     putd(err);\r
+               proc_error=true;\r
     callback('VM-networks.csv file is missing from upload.');\r
     return;\r
   }\r
@@ -206,14 +223,17 @@ function doVMnetworkIPs() {
     helpers.readCsv(indir, newFileName, gotVMnetworkIPs);\r
   }\r
   else {\r
+               proc_error=true;\r
     callback(csvFilename + ' file is missing from upload.');\r
   }\r
+       return;\r
 }\r
 \r
 function gotVMnetworkIPs(err, jsonObj) {\r
   if (err) {\r
     puts("\nError!");\r
     putd(err);\r
+               proc_error=true;\r
     callback('VM-network-IPs.csv file is missing from upload.');\r
     return;\r
   }\r
@@ -238,14 +258,17 @@ function doVMnetworkMACs() {
     helpers.readCsv(indir, newFileName, gotVMnetworkMACs);\r
   }\r
   else {\r
+               proc_error=true;\r
     callback(csvFilename + ' file is missing from upload.');\r
   }\r
+       return;\r
 }\r
 \r
 function gotVMnetworkMACs(err, jsonObj) {\r
   if (err) {\r
     puts("\nError!");\r
     putd(err);\r
+               proc_error=true;\r
     callback('VM-network-MACs.csv file is missing from upload.');\r
     return;\r
   }\r
@@ -270,14 +293,17 @@ function doTagValues() {
     helpers.readCsv(indir, newFileName, gotTagValues);\r
   }\r
   else {\r
+               proc_error=true;\r
     callback(csvFilename + ' file is missing from upload.');\r
   }\r
+       return;\r
 }\r
 \r
 function gotTagValues(err, jsonObj) {\r
   if (err) {\r
     puts("\nError!");\r
     putd(err);\r
+               proc_error=true;\r
     callback('Tag-values.csv file is missing from upload.');\r
     return;\r
   }\r
@@ -315,6 +341,21 @@ function processJson() {
   processVMs();\r
   processTagValues();\r
   assembleJson();\r
+  outputJson();\r
+\r
+       puts('proc_error=');\r
+  putd(proc_error);\r
+  if ( proc_error ){\r
+    puts('callback with failure');\r
+    callback('Error was encountered processing upload.');\r
+    return;\r
+  }\r
+  else\r
+  {\r
+    puts('callback with success');\r
+    callback(null,  finalJson, filename);\r
+    return;\r
+  }\r
 }\r
 \r
 // ASSEMBLE AND OUTPUT RESULTS\r
@@ -350,7 +391,7 @@ function assembleJson() {
 \r
   finalJson = {"input": vnfInput};\r
 \r
-  outputJson();\r
+  //outputJson();\r
 }\r
 \r
 function outputJson() {\r
@@ -359,7 +400,7 @@ function outputJson() {
   puts(JSON.stringify(finalJson,null,2));\r
   puts("\n");\r
   puts("\n");\r
-  var unixTime, fullpath_filename, filename;\r
+  var unixTime, fullpath_filename;\r
   unixTime = moment().unix();\r
   if (platform=='portal') {\r
     fullpath_filename = process.cwd() + "/uploads/" + unixTime + ".vnf_worksheet.json";\r
@@ -368,8 +409,8 @@ function outputJson() {
     fullpath_filename = "./output.json."+unixTime;\r
     filename = "output.json." + unixTime;\r
   }\r
-  helpers.writeOutput(req, fullpath_filename, JSON.stringify(finalJson,null,2), callback);\r
-  callback(null,  finalJson, filename);\r
+  //helpers.writeOutput(req, fullpath_filename, JSON.stringify(finalJson,null,2), callback);\r
+  //callback(null,  finalJson, filename);\r
 }\r
 \r
 \r