Merge branch 'twohustlers' of github.com:okfocus/okcms into twohustlers

6 files changed, 258 insertions, 70 deletions

diff --git a/app/node_modules/okserver/index.js b/app/node_modules/okserver/index.js
index 3428565..a89676f 100644
--- a/app/node_modules/okserver/index.js
+++ b/app/node_modules/okserver/index.js
@@ -52,6 +52,8 @@ function OKServer(options) {
    * other middleware.
    */
 
+  // Disable x-powered-by express header
+  app.disable('x-powered-by')
   // Serve user static files
   app.use(express.static(root));
   // Serve admin interface static files
@@ -59,12 +61,9 @@ function OKServer(options) {
   // Application router
   app.use(router);
   // Add services
-  if (services.s3) {
-    app.use('/_services/s3', services.s3.middleware());
-  }
-  if (services.twitter) {
-    app.use('/_services/twitter', services.twitter.middleware())
-  }
+  Object.keys(services).forEach(function(key){
+    app.use('/_services/' + key, services[key].middleware());
+  })
   // Make sure this lady is last. Checks whether the desired
   // route has a trailing-slash counterpart and redirects there
   app.use(slash());
diff --git a/app/node_modules/okservices/oks3/index.js b/app/node_modules/okservices/oks3/index.js
index 34c5840..cc40b71 100644
--- a/app/node_modules/okservices/oks3/index.js
+++ b/app/node_modules/okservices/oks3/index.js
@@ -1,5 +1,5 @@
-var skipper = require('skipper');
-var skipperS3 = require('skipper-s3')
+var upload = require("./upload")
+var multer = require('multer')
 
 // Hack to prevent this god-forsaken module from crashing our shit
 var d = require('domain').create()
@@ -20,10 +20,6 @@ function OKS3(options) {
   if (!options.s3.audio) options.s3.audio = {}
   if (!options.s3.video) options.s3.video = {}
 
-/*
-  // TODO: maxBytes property doesn't work - if you upload a large file,
-  // it will just hang until you reload the browser, and then CRASH.
-  
   // Make sure maxbytes property is there - it can be a number,
   // or zero/undefined (for no maximum upload size)
   if (options.s3.maxbytes) {
@@ -34,85 +30,104 @@ function OKS3(options) {
     if (! ('maxbytes' in options.s3.audio))
       options.s3.audio.maxbytes = options.s3.maxbytes
   }
-*/
-  if (options.s3.image.preserveFilename)
-    options.s3.image.preserveFilename = preserveFilename
-  if (options.s3.video.preserveFilename)
-    options.s3.video.preserveFilename = preserveFilename
-  if (options.s3.audio.preserveFilename)
-    options.s3.audio.preserveFilename = preserveFilename
+  if (typeof options.s3.image.allowed !== "boolean")
+    options.s3.image.allowed = true
+  if (typeof options.s3.video.allowed !== "boolean")
+    options.s3.video.allowed = false
+  if (typeof options.s3.audio.allowed !== "boolean")
+    options.s3.audio.allowed = false
+
+  upload.init({
+    key: options.s3.key,
+    secret: options.s3.secret,
+    bucket: options.s3.bucket,
+  })
 
   var express = options.express;
 
   var router = express.Router();
 
-  router.use(skipper());
+  var mult = multer()
 
-  // req should have a method `file` on it which is
-  // provided by skipper. Use that to do AWS stuff
-  router.post('/image', function(req, res) {
+  router.post('/image', mult.single('image'), function(req, res) {
     d.run(function () {
-      var skip = req.file('image').upload({
-        adapter: skipperS3,
-        key: options.s3.key,
-        secret: options.s3.secret,
-        bucket: options.s3.bucket,
+
+      if (! options.s3.image.allowed) {
+        return res.status(500).json({ error: "Image uploading not permitted" })
+      }
+
+      upload.put({
+        file: req.file,
+        preserveFilename: options.s3.image.preserveFilename,
         dirname: options.s3.dirname,
-        // maxBytes: options.s3.image.maxbytes,
-        saveAs: options.s3.image.preserveFilename,
-        headers: {
-          'x-amz-acl': 'public-read'
+        types: {
+          'image/gif': 'gif',
+          'image/jpeg': 'jpg',
+          'image/jpg': 'jpg',
+          'image/png': 'png',
+        },
+        unacceptable: function(err){
+          res.json({ error: err })
+        },
+        success: function(url){
+          res.json({ url: url })
         }
-      }, function (err, uploadedFiles) {
-        if (err) return res.status(500).send(err)
-        res.json(uploadedFiles);
-      });
+      })
+
    });
   });
 
-  router.post('/audio', function(req, res) {
+  router.post('/audio', mult.single('audio'), function(req, res) {
     d.run(function () {
-      if (! options.s3.allowAudioUploads) {
-        return res.status(500).json({ error: "audio uploading not permitted" })
+
+      if (! options.s3.image.allowed) {
+        return res.status(500).json({ error: "Audio uploading not permitted" })
       }
-      req.file('audio').upload({
-        adapter: skipperS3,
-        key: options.s3.key,
-        secret: options.s3.secret,
-        bucket: options.s3.bucket,
+
+      upload.put({
+        file: req.file,
+        preserveFilename: options.s3.audio.preserveFilename,
         dirname: options.s3.dirname,
-        // maxBytes: options.s3.audio.maxbytes,
-        saveAs: options.s3.audio.preserveFilename,
-        headers: {
-          'x-amz-acl': 'public-read'
+        types: {
+          'audio/mp3': 'mp3',
+          'audio/mpeg': 'mp3',
+          'audio/wav': 'wav',
+          'audio/flac': 'flac',
+        },
+        unacceptable: function(err){
+          res.json({ error: err })
+        },
+        success: function(url){
+          res.json({ url: url })
         }
-      }, function (err, uploadedFiles) {
-        if (err) res.status(500).send(err)
-        res.json(uploadedFiles);
-      });
+      })
+
     });
   });
 
-  router.post('/video', function(req, res) {
+  router.post('/video', mult.single('video'), function(req, res) {
     d.run(function () {
-      if (! options.s3.allowVideoUploads) {
-        return res.status(500).json({ error: "video uploading not permitted" })
+
+      if (! options.s3.image.allowed) {
+        return res.status(500).json({ error: "Video uploading not permitted" })
       }
-      req.file('video').upload({
-        adapter: skipperS3,
-        key: options.s3.key,
-        secret: options.s3.secret,
-        bucket: options.s3.bucket,
+
+      upload.put({
+        file: req.file,
+        preserveFilename: options.s3.video.preserveFilename,
         dirname: options.s3.dirname,
-        // maxBytes: options.s3.video.maxbytes,
-        saveAs: options.s3.video.preserveFilename,
-        headers: {
-          'x-amz-acl': 'public-read'
+        types: {
+          'video/mp4': 'mp4',
+          'video/webm': 'webm',
+        },
+        unacceptable: function(err){
+          res.json({ error: err })
+        },
+        success: function(url){
+          res.json({ url: url })
         }
-      }, function (err, uploadedFiles) {
-        if (err) res.status(500).send(err)
-        res.json(uploadedFiles);
-      });
+      })
+
     });
   });
   
diff --git a/app/node_modules/okservices/oks3/package.json b/app/node_modules/okservices/oks3/package.json
index 19a2d2a..61da414 100644
--- a/app/node_modules/okservices/oks3/package.json
+++ b/app/node_modules/okservices/oks3/package.json
@@ -9,7 +9,8 @@
   "author": "OKFocus",
   "license": "None",
   "dependencies": {
-    "skipper": "^0.5.9",
-    "skipper-s3": "^0.5.6"
+    "knox": "^0.9.2",
+    "multer": "^1.1.0",
+    "node-uuid": "^1.4.7"
   }
 }
diff --git a/app/node_modules/okservices/oks3/upload.js b/app/node_modules/okservices/oks3/upload.js
new file mode 100644
index 0000000..517d5f7
--- /dev/null
+++ b/app/node_modules/okservices/oks3/upload.js
@@ -0,0 +1,79 @@
+
+var	knox = require('knox')
+var uuid = require('node-uuid')
+
+var s3
+
+var acceptableuploadTypes = {
+	'image/gif': 'gif',
+	'image/jpeg': 'jpg',
+	'image/jpg': 'jpg',
+	'image/png': 'png',
+}
+
+module.exports = {}
+
+module.exports.init = function (opt){
+  s3 = knox.createClient({
+    key: opt.key,
+    secret: opt.secret,
+    bucket: opt.bucket,
+  })
+}
+
+module.exports.put = function (opt) {
+	var filename
+	var err
+	var now = new Date()
+
+	var file = opt.file
+
+  var types = opt.types || acceptableuploadTypes
+	var extension = types[file.mimetype]
+	
+	if (opt.preserveFilename) {
+	  filename = file.originalname
+	}
+	else {
+    filename = uuid.v1() + "." + extension;
+	}
+
+	var remote_path = "/" + opt.dirname + "/" + filename
+
+	if (! extension) {
+		err = "Unacceptable filetype."
+	}
+	else if (opt.maxSize && file.size > opt.maxSize) {
+		err = "File too large. Uploads can be a maximum of " + opt.maxSize + " bytes."
+	}
+
+	if (err) {
+		console.error(">>>", err)
+		opt.unacceptable && opt.unacceptable(err)
+		return
+	}
+
+	opt.acceptable && opt.acceptable(err)
+	
+	// console.log("upload >", remote_path)
+	s3.putBuffer(file.buffer, remote_path, {
+		'Content-Length': file.size,
+		'Content-Type': file.mimetype,
+		'x-amz-acl': 'public-read'
+	}, function(err, s3res) {
+		if (err || s3res.statusCode !== 200) {
+			console.error(err);
+			if (s3res && s3res.resume) {
+				s3res.resume()
+			}
+			return;
+		}
+
+		var file_url = s3res.url || s3res.req.url		
+
+		opt.success && opt.success(file_url)
+	}).on('error', function(err, s3res){
+		console.error(err)
+		s3res && s3res.resume && s3res.resume()
+	})
+}
diff --git a/app/node_modules/okservices/okwebhook/index.js b/app/node_modules/okservices/okwebhook/index.js
new file mode 100644
index 0000000..d04e662
--- /dev/null
+++ b/app/node_modules/okservices/okwebhook/index.js
@@ -0,0 +1,83 @@
+
+/**
+ * Service which will listen for a Github webhook, fired on push.
+ * This service can be used to rebuild / restart the app automatically
+ * when new code is pushed.
+ */
+
+var crypto = require('crypto')
+var exec = require('child_process').exec
+var path = require('path')
+
+function OKWebhook (options) {
+  if (!(this instanceof OKWebhook)) return new OKWebhook(options)
+  options = options || {}
+  if (!options.express)
+    throw new Error('Express not provided to OKWebhook');
+  if (!options.config)
+    throw new Error('Configuration not provided to OKWebhook');
+  if (options.config.active && !options.config.secret)
+    throw new Error('Github secret not provided to OKWebhook');
+  if (options.config.active && !options.config.command)
+    throw new Error('Build command not provided to OKWebhook');
+
+  var express = options.express
+  var router = express.Router()
+  var config = options.config
+  
+  var secret = config.secret
+  var command = config.command
+
+  router.get('/', function (req, res) {
+    res.send('GET not supported')
+  })
+
+  router.post('/', getBody, function (req, res) {
+    if (!config.active)
+      return
+    console.log("OKWebhook received push")
+    var event = req.headers['x-github-event']
+    if (event !== "push") {
+      return res.sendStatus(500)
+    }
+    var sig = req.headers['x-hub-signature'].split('=')[1]
+    var text = req.rawBody
+    var hash = crypto.createHmac('sha1', secret).update(text).digest('hex')
+    if (hash !== sig) {
+      return res.sendStatus(500)
+    }
+    res.sendStatus(200)
+    var cwd = path.dirname(command)
+    exec(command, { cwd: cwd }, function(err, stdout, stderr){
+      // may not fire if process was restarted..
+      console.log(process.env)
+      console.log(stdout)
+    })
+  })
+
+  function getBody (req, res, next) {
+    req.rawBody = ''
+    // req.setEncoding('utf8')
+
+    req.on('data', function(chunk) { 
+      req.rawBody += chunk
+    })
+
+    req.on('end', function() {
+      try {
+        req.body = JSON.parse(req.rawBody)
+      } catch (e) {
+        return res.sendStatus(500)
+      }
+      next()
+    })
+  }
+
+  this._router = router
+}
+
+OKWebhook.prototype.middleware = function () {
+  return this._router
+}
+
+module.exports = OKWebhook
diff --git a/app/node_modules/okservices/okwebhook/package.json b/app/node_modules/okservices/okwebhook/package.json
new file mode 100644
index 0000000..0436f01
--- /dev/null
+++ b/app/node_modules/okservices/okwebhook/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "okwebhook",
+  "version": "1.0.0",
+  "description": "webhook to receive pushes from github",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "okfocus <frontdesk@okfoc.us>",
+  "license": "LNT"
+}