X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=server%2Froutes%2Fusers.js;h=947111342d9b54bf19d09be4b7ee1acfb3e077f3;hp=ab139eb612705a663f721fb22b410285359e9f50;hb=aa6d9b33f70c9baccac98ab41c72d2bd787eac83;hpb=fe4c7e67075416c48aafe9e307bef5afea7937bc

diff --git a/server/routes/users.js b/server/routes/users.js
index ab139eb6..94711134 100644
--- a/server/routes/users.js
+++ b/server/routes/users.js
@@ -1,136 +1,166 @@
-// 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");
+const sanitizeHtml_pkg = require('sanitize-html');
+const { exec } = require("child_process");
+
+const allowedTags = [
+  'h3', 'h4', 'h5', 'h6', 'blockquote', 'p', 'a', 'ul', 'ol', 'li', 'b',
+  'i', 'strong', 'em', 'strike', 'code', 'hr', 'br', 'div', 'table',
+  'thead', 'caption', 'tbody', 'tr', 'th', 'td', 'pre'
+];
+function sanitizeHtml(text) {
+  return sanitizeHtml_pkg(text, { allowedTags: allowedTags });
+}
+
+router.get("/userbio", access.ajax, (req,res) => {
+  const uid = req.query["id"];
+  if (!!(uid.toString().match(/^[0-9]+$/))) {
+    UserModel.getBio(uid, (err, bio) => {
+      res.json(bio);
+    });
+  }
+});
+
+router.put('/userbio', access.logged, access.ajax, (req,res) => {
+  const bio = sanitizeHtml(req.body.bio);
+  UserModel.setBio(req.userId, bio);
+  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;
+  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.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,
+      notify: user.notify
     });
   };
-  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
+  };
+  if (!req.cookies.token) callback(anonymous);
+  else if (req.cookies.token.match(/^[a-z0-9]+$/)) {
+    UserModel.getOne(
+      "sessionToken", req.cookies.token, "name, email, id, notify",
+      (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});
-  });
-});
-
-// 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 || {});
+  // NOTE: slightly too permissive RegExp
+  if (!!ids && !!ids.match(/^([0-9]+,?)+$/)) {
+    UserModel.getByIds(ids, (err, users) => {
+      res.json({ users: users });
     });
-  });
-}
+  }
+});
 
-router.post('/register', access.unlogged, access.ajax, (req,res) => {
+router.put('/update', access.logged, 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()});
+  if (UserModel.checkNameEmail({ name: name, email: email })) {
     const user = {
-      id: uid["rowid"],
+      id: req.userId,
       name: name,
       email: email,
+      notify: !!req.body.notify,
     };
-    setAndSendLoginToken("Welcome to " + params.siteURL, user, res);
-  });
+    UserModel.updateSettings(user);
+    res.json({});
+  }
 });
 
+// Authentication-related methods:
+
+// to: object user (to who we send an email)
+function setAndSendLoginToken(subject, to) {
+  // 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);
+  if (UserModel.checkNameEmail({ [type]: nameOrEmail })) {
+    UserModel.getOne(type, nameOrEmail, "id, name, email", (err, user) => {
+      access.checkRequest(res, err, user, "Unknown user", () => {
+        setAndSendLoginToken("Token for " + params.siteURL, user);
+        res.json({});
+      });
     });
-  });
+  }
 });
 
 router.get('/authenticate', access.unlogged, access.ajax, (req,res) => {
-  UserModel.getOne("loginToken", req.query.token, (err,user) => {
-    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 (!req.query.token.match(/^[a-z0-9]+$/))
+    return res.json({ errmsg: "Bad token" });
+  UserModel.getOne(
+    "loginToken", req.query.token, "id, name, email, notify",
+    (err,user) => {
+      access.checkRequest(res, err, user, "Invalid token", () => {
+        // If token older than params.tokenExpire, do nothing
+        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(user);
+          });
+        }
       });
-    });
-  });
-});
-
-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) => {