improvements

Author: mike-north

.eslintrc

@@ -11,5 +11,8 @@
     "ecmaFeatures": {
       "experimentalObjectRestSpread": true
     }
+  },
+  "rules": {
+    "no-console": "off"
   }
 }

db/development.sqlite

@@ -8,19 +8,25 @@
   "dependencies": {
     "bcrypt": "^1.0.3",
     "body-parser": "~1.17.1",
+    "chalk": "^2.1.0",
+    "commander": "^2.11.0",
     "connect-flash": "^0.1.1",
     "connect-sqlite3": "^0.9.10",
     "cookie-parser": "~1.4.3",
     "cookie-session": "^1.3.1",
     "cors": "^2.8.4",
     "debug": "~2.6.3",
+    "dist-exiftool": "^10.53.0",
     "ejs": "~2.5.6",
     "ejs-mate": "^2.3.0",
     "express": "~4.15.2",
     "express-session": "^1.15.5",
     "faker": "^4.1.0",
+    "helmet": "^3.8.1",
+    "helmet-csp": "^2.5.1",
     "lodash": "^4.17.4",
     "morgan": "~1.8.1",
+    "node-exiftool": "2.2.0",
     "nodemon": "^1.11.0",
     "sequelize": "^4.7.5",
     "serve-favicon": "~2.4.2",

examples/squirrel.html

@@ -0,0 +1,36 @@
+const chalk = require('chalk');
+const program = require('commander');
+const packageJson = require('../package.json');
+
+const exiftool = require('node-exiftool')
+const exiftoolBin = require('dist-exiftool')
+const ep = new exiftool.ExiftoolProcess(exiftoolBin);
+
+program
+  .version(packageJson.version)
+  .arguments('<image>', 'read exif comment data from an image')
+  .action(function (image) {
+    if (!image) {
+      console.error(chalk.bgRed.white('No image specified'));
+      program.help();
+      process.exit(1);
+    } else {
+      extractExifData(image);
+    }
+  })
+  .parse(process.argv);
+
+function extractExifData(image) {
+  ep
+  .open()
+  // .then((pid) => console.log('Started exiftool process %s', pid))
+  .then(() => ep.readMetadata(image, ['comment']))
+  .then((allExif) => {
+    let [ { Comment: comment } ] = allExif.data;
+    console.log(comment);
+  }, (err) => {
+    console.error(err);
+  })
+  .then(() => ep.close());
+  // .then(() => console.log('Process has closed'));
+}

examples/squirrel.jpg

@@ -0,0 +1,49 @@
+const chalk = require('chalk');
+const program = require('commander');
+const packageJson = require('../package.json');
+const fs = require('fs');
+const exiftool = require('node-exiftool')
+const exiftoolBin = require('dist-exiftool')
+const ep = new exiftool.ExiftoolProcess(exiftoolBin);
+
+program
+  .version(packageJson.version)
+  .arguments('<image> <datafile>', 'read exif comment data from an image')
+  .action(function (image, datafile) {
+    let newMetaData = fs.readFileSync(datafile).toString();
+    writeExifData(image, newMetaData);
+  })
+  .parse(process.argv);
+
+
+
+  function writeExifData(image, comment) {
+  ep
+  .open()
+  // .then((pid) => console.log('Started exiftool process %s', pid))
+  .then(() => ep.readMetadata(image, ['comment']))
+  .then((allExif) => {
+    let [ { Comment: comment } ] = allExif.data || {};
+    console.log(chalk.yellow('------------- EXISTING DATA -------------'));
+    console.log(comment);
+  }, (err) => {
+    console.error(err);
+    process.exit(1);
+  })
+  .then(() => ep.writeMetadata(image, {
+    all: '',
+    comment
+  }, ['overwrite_original']))
+  .then(() => ep.readMetadata(image, ['comment']))
+  .then((allExif) => {
+    let [ { Comment: comment } ] = allExif.data || {};
+    console.log(chalk.yellow('------------- UPDATED DATA -------------'));
+    console.log(comment);
+  }, (err) => {
+    console.error(err);
+    process.exit(1);
+  })
+  .then(() => ep.close())
+  .catch(console.error)
+
+}

package.json

@@ -0,0 +1,10 @@
+const program = require('commander');
+const packageJson = require('../package.json');
+
+program
+  .version(packageJson.version)
+  .command('read <image>', 'read exif comment data from an image')
+  .command('write <image> <datafile>', 'update exif comment data in an image')
+  .parse(process.argv);
+
+

public/images/squirrel.html

@@ -46,7 +46,12 @@ app.use(session({
   saveUninitialized: true,
   resave: 'true',
   secret: 'secret'
-}))
+}));
+
+app.use(function(req, res, next) {
+  res.setHeader('X-Frame-Options', 'DENY');
+  next();
+});
 
 app.use(flashMiddleware);
 app.use(express.static(path.join(__dirname, '..', 'public')));

scripts/exif-read.js

@@ -35,10 +35,9 @@ router.get('/', function(req, res/*, next*/) {
   });
 });
 
-router.post('/', function(req, res) {
+router.all('/perform', function(req, res) {
   bounceOutIfLoggedOut(req, res, () => {
-          
-    let { accountFrom, accountTo, amount } = req.body;
+    let { accountFrom, accountTo, amount } = Object.assign(Object.assign({}, req.body), req.query);
     amount = parseFloat(amount);
     if (!accountFrom || !accountTo) {
       errorAndReload(req, res, 'Must specify accounts to transfer from and to');

scripts/exif-write.js

@@ -8,6 +8,13 @@ router.get('/:username', function(req, res, next) {
   bounceOutIfLoggedOut(req, res, () => {
     Db.query("SELECT id, username, createdAt FROM users WHERE username = '" + username + "';").spread((results) => {
       res.render('user', {title: 'User', user: results[0] });
+    })
+    .catch(() => {
+      req.session.sessionFlash = {
+        type: 'danger',
+        message: `No user found: ${username}`
+      }
+      res.redirect('/accounts');
     });
   });
 });

scripts/exif.js

@@ -15,7 +15,7 @@ function logout(req) {
 
 function bounceOutIfLoggedOut(req, res, callback, fallbackPath = '/') {
   if (isAuthenticated(req)) {
-    callback();
+    return callback();
   } else {
     req.session.sessionFlash = {
       type: 'danger',

server/index.js

@@ -9,4 +9,4 @@
   <body>
     <%- body -%>
   </body>
-</html>
+</html>

server/routes/transfers.js

@@ -6,7 +6,7 @@
   <div class="mui--appbar-height"></div>
   <% if (sessionFlash) { %>
     <div class='mui-panel alert alert-<%= sessionFlash.type %>'>
-      <%= sessionFlash.message %>
+      <%- sessionFlash.message %>
     </div>
   <% } %>
   <div class="mui-container"> 

server/routes/user.js

@@ -11,7 +11,7 @@
   </ul>
   <div class="mui-tabs__pane mui--is-active">
     <div class="spacer-t-20"></div>
-    <form class="mui-form" action='/transfers' method='post'>
+    <form class="mui-form" action='/transfers/perform' method='post'>
       <legend>Begin a Funds Transfer</legend>
       <div class="spacer-t-20"></div>
       <div class="mui-textfield">

server/utils/auth.js

@@ -0,0 +1,3 @@
+	SELECT * FROM courses
+	WHERE owner = 'bholt'
+	AND name = 'Complete Intro to React, v47' OR 'a'='a';