X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=server%2Froutes%2Fusers.js;h=7898ac8a8ee4b6a45c4ccfa84dd09af1d39164e6;hb=0234201fb338fc239d6f613c677fa932c7c3697c;hp=163dc30132977dcf1f5c43b533cc5e0a9acd33cc;hpb=f21cd6d9c23da37d729f20ea4c08e56b1a7b10a1;p=vchess.git

diff --git a/server/routes/users.js b/server/routes/users.js
index 163dc301..7898ac8a 100644
--- a/server/routes/users.js
+++ b/server/routes/users.js
@@ -1,139 +1,153 @@
-// AJAX methods to get, create, update or delete a user
+let router = require("express").Router();
+const UserModel = require('../models/User');
+const sendEmail = require('../utils/mailer');
+const genToken = require("../utils/tokenGenerator");
+const access = require("../utils/access");
+const params = require("../config/parameters");
 
-var router = require("express").Router();
-var UserModel = require('../models/User');
-var sendEmail = require('../utils/mailer');
-var genToken = require("../utils/tokenGenerator");
-var access = require("../utils/access");
-var params = require("../config/parameters");
+router.post('/register', access.unlogged, access.ajax, (req,res) => {
+  const name = req.body.name;
+  const email = req.body.email;
+  const notify = !!req.body.notify;
+  if (UserModel.checkNameEmail({name: name, email: email})) {
+    UserModel.create(name, email, notify, (err, ret) => {
+      if (!!err) {
+        const msg = err.code == "SQLITE_CONSTRAINT"
+          ? "User name or email already in use"
+          : "User creation failed. Try again";
+        res.json({errmsg: msg});
+      } else {
+        const user = {
+          id: ret.id,
+          name: name,
+          email: email,
+        };
+        setAndSendLoginToken("Welcome to " + params.siteURL, user, res);
+        res.json({});
+      }
+    });
+  }
+});
 
+// NOTE: this method is safe because the sessionToken must be guessed
 router.get("/whoami", access.ajax, (req,res) => {
   const callback = (user) => {
-    return res.json({
+    res.json({
       name: user.name,
       email: user.email,
       id: user.id,
       notify: user.notify,
+      newsRead: user.newsRead
     });
   };
-  const anonymous = {name:"", email:"", id:0, notify:false};
-	if (!req.cookies.token)
-    return callback(anonymous);
-  UserModel.getOne("sessionToken", req.cookies.token, function(err, user) {
-    if (!!err || !user)
-      callback(anonymous);
-    else
-      callback(user);
-  });
+  const anonymous = {
+    name: "",
+    email: "",
+    id: 0,
+    notify: false,
+    newsRead: 0
+  };
+  if (!req.cookies.token) callback(anonymous);
+  else if (req.cookies.token.match(/^[a-z0-9]+$/)) {
+    UserModel.getOne("sessionToken", req.cookies.token, (err, user) => {
+      callback(user || anonymous);
+    });
+  }
 });
 
+// NOTE: this method is safe because only IDs and names are returned
 router.get("/users", access.ajax, (req,res) => {
   const ids = req.query["ids"];
-  UserModel.getByIds(ids, (err,users) => {
-    if (!!err)
-      return res.json({errmsg: err.toString()});
-    return res.json({users:users});
-  });
+  // NOTE: slightly too permissive RegExp
+  if (ids.match(/^([0-9]+,?)+$/)) {
+    UserModel.getByIds(ids, (err,users) => {
+      res.json({users:users});
+    });
+  }
 });
 
-// to: object user (to who we send an email)
-function setAndSendLoginToken(subject, to, res)
-{
-	// Set login token and send welcome(back) email with auth link
-	const token = genToken(params.token.length);
-	UserModel.setLoginToken(token, to.id, err => {
-		if (!!err)
-			return res.json({errmsg: err.toString()});
-		const body =
-			"Hello " + to.name + "!\\n" +
-			"Access your account here: " +
-			params.siteURL + "/#/authenticate/" + token + "\\n" +
-			"Token will expire in " + params.token.expire/(1000*60) + " minutes."
-		sendEmail(params.mail.noreply, to.email, subject, body, err => {
-			res.json(err || {});
-		});
-	});
-}
+router.put('/update', access.logged, access.ajax, (req,res) => {
+  const name = req.body.name;
+  const email = req.body.email;
+  if (UserModel.checkNameEmail({name: name, email: email})) {
+    const user = {
+      id: req.userId,
+      name: name,
+      email: email,
+      notify: !!req.body.notify,
+    };
+    UserModel.updateSettings(user);
+    res.json({});
+  }
+});
 
-router.post('/register', access.unlogged, access.ajax, (req,res) => {
-	const name = req.body.name;
-	const email = req.body.email;
-	const notify = !!req.body.notify;
-	const error = UserModel.checkNameEmail({name: name, email: email});
-	if (!!error)
-		return res.json({errmsg: error});
-	UserModel.create(name, email, notify, (err,uid) => {
-		if (!!err)
-			return res.json({errmsg: err.toString()});
-		const user = {
-			id: uid["rowid"],
-			name: name,
-			email: email,
-		};
-		setAndSendLoginToken("Welcome to " + params.siteURL, user, res);
-	});
+// Special route to update newsRead timestamp:
+router.put('/newsread', access.logged, access.ajax, (req,res) => {
+  UserModel.setNewsRead(req.userId);
+  res.json({});
 });
 
+// Authentication-related methods:
+
+// to: object user (to who we send an email)
+function setAndSendLoginToken(subject, to, res) {
+  // Set login token and send welcome(back) email with auth link
+  const token = genToken(params.token.length);
+  UserModel.setLoginToken(token, to.id);
+  const body =
+    "Hello " + to.name + " !" + `
+` +
+    "Access your account here: " +
+    params.siteURL + "/#/authenticate/" + token + `
+` +
+    "Token will expire in " + params.token.expire/(1000*60) + " minutes."
+  sendEmail(params.mail.noreply, to.email, subject, body);
+}
+
 router.get('/sendtoken', access.unlogged, access.ajax, (req,res) => {
-	const nameOrEmail = decodeURIComponent(req.query.nameOrEmail);
-	const type = (nameOrEmail.indexOf('@') >= 0 ? "email" : "name");
-	const error = UserModel.checkNameEmail({[type]: nameOrEmail});
-	if (!!error)
-		return res.json({errmsg: error});
-	UserModel.getOne(type, nameOrEmail, (err,user) => {
-		access.checkRequest(res, err, user, "Unknown user", () => {
-			setAndSendLoginToken("Token for " + params.siteURL, user, res);
-		});
-	});
+  const nameOrEmail = decodeURIComponent(req.query.nameOrEmail);
+  const type = (nameOrEmail.indexOf('@') >= 0 ? "email" : "name");
+  if (UserModel.checkNameEmail({[type]: nameOrEmail})) {
+    UserModel.getOne(type, nameOrEmail, (err,user) => {
+      access.checkRequest(res, err, user, "Unknown user", () => {
+        setAndSendLoginToken("Token for " + params.siteURL, user, res);
+        res.json({});
+      });
+    });
+  }
 });
 
 router.get('/authenticate', access.unlogged, access.ajax, (req,res) => {
+  if (!req.query.token.match(/^[a-z0-9]+$/))
+    return res.json({errmsg: "Bad token"});
   UserModel.getOne("loginToken", req.query.token, (err,user) => {
-		access.checkRequest(res, err, user, "Invalid token", () => {
+    access.checkRequest(res, err, user, "Invalid token", () => {
       // If token older than params.tokenExpire, do nothing
-			if (Date.now() > user.loginTime + params.token.expire)
-				return res.json({errmsg: "Token expired"});
-			// Generate session token (if not exists) + destroy login token
-			UserModel.trySetSessionToken(user.id, (err,token) => {
-				if (!!err)
-					return res.json({errmsg: err.toString()});
-				// Set cookie
-        res.cookie("token", token, {
-					httpOnly: true,
-					secure: !!params.siteURL.match(/^https/),
-					maxAge: params.cookieExpire,
-				});
-				res.json({
-          id: user.id,
-          name: user.name,
-          email: user.email,
-          notify: user.notify,
+      if (Date.now() > user.loginTime + params.token.expire)
+        res.json({errmsg: "Token expired"});
+      else {
+        // Generate session token (if not exists) + destroy login token
+        UserModel.trySetSessionToken(user.id, (token) => {
+          res.cookie("token", token, {
+            httpOnly: true,
+            secure: !!params.siteURL.match(/^https/),
+            maxAge: params.cookieExpire,
+          });
+          res.json({
+            id: user.id,
+            name: user.name,
+            email: user.email,
+            notify: user.notify,
+          });
         });
-			});
-		});
-	});
-});
-
-router.put('/update', access.logged, access.ajax, (req,res) => {
-	const name = req.body.name;
-	const email = req.body.email;
-	const error = UserModel.checkNameEmail({name: name, email: email});
-	if (!!error)
-		return res.json({errmsg: error});
-	const user = {
-		id: req.userId,
-		name: name,
-		email: email,
-		notify: !!req.body.notify,
-	};
-	UserModel.updateSettings(user, err => {
-		res.json(err ? {errmsg: err.toString()} : {});
-	});
+      }
+    });
+  });
 });
 
 router.get('/logout', access.logged, access.ajax, (req,res) => {
-	res.clearCookie("token");
-	res.json({});
+  res.clearCookie("token");
+  res.json({});
 });
 
 module.exports = router;