aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Soltys <[email protected]>2020-06-08 16:10:16 -0700
committerAdam Soltys <[email protected]>2020-06-08 16:10:16 -0700
commit58a74b7f762109f9da119bb702060fc55c0b61d1 (patch)
tree74d3cef7da09fdfa8c5ea9016425c9f44bbe77d5
parent7a3a07bc711ea57fd8a84e809e7ecd0d6e64b5c2 (diff)
downloadcoinos-server-58a74b7f762109f9da119bb702060fc55c0b61d1.tar.gz
coinos-server-58a74b7f762109f9da119bb702060fc55c0b61d1.zip
remove challenge wordno-challenge
-rw-r--r--package.json2
-rw-r--r--routes/users.js19
-rw-r--r--yarn.lock41
3 files changed, 1 insertions, 61 deletions
diff --git a/package.json b/package.json
index 9a582d46..7331bbea 100644
--- a/package.json
+++ b/package.json
@@ -35,10 +35,8 @@
"passport-jwt": "^4.0.0",
"passport-local": "1.0.0",
"pino": "^5.17.0",
- "random-words": "^1.1.1",
"request": "~2.88.0",
"sequelize": "^5.21.3",
- "text-to-image": "^2.3.0",
"uuid": "^3.3.2",
"ws": "^7.1.2",
"zeromq": "^5.1.0"
diff --git a/routes/users.js b/routes/users.js
index 76a8bc8d..e0534d6e 100644
--- a/routes/users.js
+++ b/routes/users.js
@@ -2,16 +2,12 @@ const axios = require("axios");
const bcrypt = require("bcrypt");
const jwt = require("jsonwebtoken");
const authenticator = require("otplib").authenticator;
-const textToImage = require("text-to-image");
-const randomWord = require("random-words");
const pick = (O, ...K) => K.reduce((o, k) => ((o[k] = O[k]), o), {});
let faucet = 1000;
const DAY = 24 * 60 * 60 * 1000;
require("../lib/whitelist");
-const challenge = {};
-
const twofa = (req, res, next) => {
let {
user,
@@ -61,14 +57,6 @@ app.get("/users/:username", async (req, res) => {
else res.status(500).send("User not found");
});
-app.get("/challenge", async (req, res) => {
- const ip = req.headers["x-forwarded-for"] || req.connection.remoteAddress;
- challenge[ip] = randomWord();
- l.info("setting up challenge", ip, challenge[ip]);
- const data = await textToImage.generate(challenge[ip]);
- res.send(data);
-});
-
app.post("/register", async (req, res) => {
let err = m => res.status(500).send(m);
let { user } = req.body;
@@ -101,13 +89,6 @@ app.post("/register", async (req, res) => {
let ip = req.headers["x-forwarded-for"] || req.connection.remoteAddress;
- if (!challenge[ip] || user.response !== challenge[ip]) {
- l.info("failed challenge", ip, user.response, challenge[ip]);
- return res.status(500).send("Failed challenge");
- }
-
- delete challenge[ip];
-
let countries = {
CA: "CAD",
US: "USD",
diff --git a/yarn.lock b/yarn.lock
index 9330d519..ed63afda 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -842,15 +842,6 @@ camelcase@^5.0.0, camelcase@^5.3.1:
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
-canvas@^2.6.0:
- version "2.6.1"
- resolved "https://registry.yarnpkg.com/canvas/-/canvas-2.6.1.tgz#0d087dd4d60f5a5a9efa202757270abea8bef89e"
- integrity sha512-S98rKsPcuhfTcYbtF53UIJhcbgIAK533d1kJKMwsMwAIFgfd58MOyxRud3kktlzWiEkFliaJtvyZCBtud/XVEA==
- dependencies:
- nan "^2.14.0"
- node-pre-gyp "^0.11.0"
- simple-get "^3.0.3"
-
cardinal@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/cardinal/-/cardinal-2.1.1.tgz#7cc1055d822d212954d07b085dea251cc7bc5505"
@@ -2918,22 +2909,6 @@ [email protected], node-pre-gyp@^0.14.0:
semver "^5.3.0"
tar "^4.4.2"
-node-pre-gyp@^0.11.0:
- version "0.11.0"
- resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.11.0.tgz#db1f33215272f692cd38f03238e3e9b47c5dd054"
- integrity sha512-TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q==
- dependencies:
- detect-libc "^1.0.2"
- mkdirp "^0.5.1"
- needle "^2.2.1"
- nopt "^4.0.1"
- npm-packlist "^1.1.6"
- npmlog "^4.0.2"
- rc "^1.2.7"
- rimraf "^2.6.1"
- semver "^5.3.0"
- tar "^4"
-
nodemon@^2.0.2:
version "2.0.4"
resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-2.0.4.tgz#55b09319eb488d6394aa9818148c0c2d1c04c416"
@@ -3555,13 +3530,6 @@ random-bytes@~1.0.0:
resolved "https://registry.yarnpkg.com/random-bytes/-/random-bytes-1.0.0.tgz#4f68a1dc0ae58bd3fb95848c30324db75d64360b"
integrity sha1-T2ih3Arli9P7lYSMMDJNt11kNgs=
-random-words@^1.1.1:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/random-words/-/random-words-1.1.1.tgz#62e34be74c7cd5e5f78b537875d30e2eab258ecc"
- integrity sha512-Rdk5EoQePyt9Tz3RjeMELi2BSaCI+jDiOkBr4U+3fyBRiiW3qqEuaegGAUMOZ4yGWlQscFQGqQpdic3mAbNkrw==
- dependencies:
- mocha "^7.1.1"
-
randombytes@^2.0.1:
version "2.1.0"
resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
@@ -4235,7 +4203,7 @@ tar-stream@^2.0.0:
inherits "^2.0.3"
readable-stream "^3.1.1"
-tar@^4, tar@^4.4.2:
+tar@^4.4.2:
version "4.4.13"
resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==
@@ -4253,13 +4221,6 @@ term-size@^2.1.0:
resolved "https://registry.yarnpkg.com/term-size/-/term-size-2.2.0.tgz#1f16adedfe9bdc18800e1776821734086fcc6753"
integrity sha512-a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw==
-text-to-image@^2.3.0:
- version "2.3.0"
- resolved "https://registry.yarnpkg.com/text-to-image/-/text-to-image-2.3.0.tgz#eff268e862310bda199f1d4a188a2667dde74aed"
- integrity sha512-S7p73GB3Dp0ZqiArMaw+HlUWlR4TbVeZXJCN3Zc5pIgXFGR8qHPnzk4Y6rzD+qjokUw8PEFD1AXwwPkVqwc2dw==
- dependencies:
- canvas "^2.6.0"
-
thirty-two@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/thirty-two/-/thirty-two-1.0.2.tgz#4ca2fffc02a51290d2744b9e3f557693ca6b627a"