From deaa8ded34773954aed88f78897cdd820708feaf Mon Sep 17 00:00:00 2001 From: slynn1324 Date: Mon, 1 Feb 2021 16:15:01 -0600 Subject: [PATCH] added settings page and enabled disabling registration and admin user management --- README.md | 1 + client/components/about.js | 40 +++- client/components/navbar.js | 15 +- package-lock.json | 17 ++ package.json | 1 + server/auth.js | 33 ++- server/dao.js | 101 +++++++- server/server.js | 126 +++++++++- templates/{login.html => login.eta} | 4 +- templates/{register.html => register.eta} | 2 +- templates/settings.eta | 267 ++++++++++++++++++++++ utils/change-password.js | 48 ++++ utils/image-test.js | 16 ++ utils/rotate-key.js | 3 + 14 files changed, 658 insertions(+), 16 deletions(-) rename templates/{login.html => login.eta} (97%) rename templates/{register.html => register.eta} (99%) create mode 100644 templates/settings.eta create mode 100644 utils/change-password.js create mode 100644 utils/image-test.js create mode 100644 utils/rotate-key.js diff --git a/README.md b/README.md index cc06db9..6338dbb 100644 --- a/README.md +++ b/README.md @@ -95,6 +95,7 @@ There is trivial security on the web pages to allow for multiple user support. - download icon > [Download by Yoyo from the Noun Project](https://thenounproject.com/term/download/2120379/) - share icon > [Share by Тимур Минвалеев from the Noun Project](https://thenounproject.com/term/share/1058858/) - done icon > [done by Viktor Ostrovsky from the Noun Project](https://thenounproject.com/term/done/587164/) +- settings icon > [setting by LUTFI GANI AL ACHMAD from the Noun Project](https://thenounproject.com/term/settings/3291880/) ## server diff --git a/client/components/about.js b/client/components/about.js index 1e2cf17..c6b3fe2 100644 --- a/client/components/about.js +++ b/client/components/about.js @@ -3,18 +3,51 @@ app.addSetter('aboutModal.open', (data) => { }); app.addSetter('aboutModal.close', (data) => { + data.apiKey = null; + data.showApiKey = false; data.aboutModal.active = false; }); +app.addSetter('about.showApiKey', async (data, apiKey) => { + data.apiKey = apiKey; + data.showApiKey = true; +}); + +async function showApiKey(){ + let result = await fetch("/api/apikey"); + let json = await result.json(); + let apiKey = json.apiKey; + store.do('about.showApiKey', encodeURIComponent(apiKey)); +} + app.addComponent('aboutModal', (store) => { return new Reef("#aboutModal", { store: store, template: (data) => { + + let apiKeyElement = ""; + if ( data.showApiKey ){ + apiKeyElement = /*html*/` +
+

api key for ${data.user.name}:

+ +

+
+ `; + } + return /*html*/`
-

tinypin

+
+
+

tinypin

+
+
+ show api key +
+
github.com/slynn1324/tinypin
@@ -22,6 +55,9 @@ app.addComponent('aboutModal', (store) => { return new Reef("#aboutModal", {
 
+ + ${apiKeyElement} +

credits

client @@ -57,6 +93,8 @@ app.addComponent('aboutModal', (store) => { return new Reef("#aboutModal", {  share icon » Share by Тимур Минвалеев from the Noun Project
 done icon » done by Viktor Ostrovsky from the Noun Project +
+  settings icon » setting by LUTFI GANI AL ACHMAD from the Noun Project

diff --git a/client/components/navbar.js b/client/components/navbar.js index 7821560..db262ab 100644 --- a/client/components/navbar.js +++ b/client/components/navbar.js @@ -19,13 +19,14 @@ app.addComponent('navbar', (store) => { return new Reef("#navbar", { store: store, template: (data) => { - let boardName = ""; + let hiddenBoardImage = ''; if ( data.board && data.board.hidden ){ hiddenBoardImage = '(hidden)'; } + let boardName = ""; if ( data.board ){ boardName = /*html*/` @@ -64,9 +65,15 @@ app.addComponent('navbar', (store) => { return new Reef("#navbar", { `; } - - + let settingsItem = ""; + if (data.user.admin == "y"){ + settingsItem = ` + + settings + + `; + } return /*html*/`
- diff --git a/templates/register.html b/templates/register.eta similarity index 99% rename from templates/register.html rename to templates/register.eta index 3397ca7..7d8b29e 100644 --- a/templates/register.html +++ b/templates/register.eta @@ -1,4 +1,4 @@ - + tinypin diff --git a/templates/settings.eta b/templates/settings.eta new file mode 100644 index 0000000..09e8aaa --- /dev/null +++ b/templates/settings.eta @@ -0,0 +1,267 @@ + + + + tinypin > settings + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+

Settings

+
+
+ +
+
+ +
+ +
+
+
+ +
+
+
+
+ +
+ +
+ +
+
+
+ +
+
+

Users

+
+ +
+ + + + + + + + + + + + + + + <% for ( let i = 0; i < it.users.length; ++i ){ let user = it.users[i]; %> + + + + + + + + + + + + <% } %> + +
idusernameadmincreatedboardspins 
<%= user.id %><%= user.username %> + <% if (it.userId != user.id) { %> +
+ +
+ <% } else { %> + <%= user.admin %> + <% } %> + 		<%= user.createDate %><%= user.boardCount %><%= user.pinCount %> + <% if (it.userId != user.id) { %> + Delete User + <% } %> +
+ +
+
+ Create User +
+
+ +
+
+
+
+
+ + + +
+ + +
+ + + + + + + \ No newline at end of file diff --git a/utils/change-password.js b/utils/change-password.js new file mode 100644 index 0000000..0084f20 --- /dev/null +++ b/utils/change-password.js @@ -0,0 +1,48 @@ +const crypto = require('crypto'); +const readline = require("readline"); +const writable = require('stream').Writable; + +const rl = readline.createInterface({ + input: process.stdin, + output: process.stdout, + terminal: true +}); + +rl.stdoutMuted = true; +rl.query = "password: "; +rl._writeToOutput = function _writeToOutput(stringToWrite) { + if ( stringToWrite == rl.query ){ + rl.output.write(stringToWrite); + } + // if (rl.stdoutMuted) + // // rl.output.write(""); + // // rl.output.write("\x1B[2K\x1B[200D"+rl.query+"["+((rl.line.length%2==1)?"=-":"-=")+"]"); + // else + // rl.output.write(stringToWrite); +}; + +async function deriveKey(salt, pw){ + return new Promise( (resolve, reject) => { + crypto.scrypt(pw, salt, 64, (err, key) => { + resolve(key.toString('hex')); + }); + }); +} + +function createSalt(){ + return crypto.randomBytes(16).toString('hex'); +} + +// let username = req.body.username; +// let salt = createSalt(); +// let key = await deriveKey(salt, req.body.password); + + +rl.question(rl.query, async (password) => { + rl.close(); + console.log(password); + let salt = createSalt(); + let key = await deriveKey(salt, password); + console.log("salt: " + salt); + console.log("key: " + key); +}); diff --git a/utils/image-test.js b/utils/image-test.js new file mode 100644 index 0000000..0e5d423 --- /dev/null +++ b/utils/image-test.js @@ -0,0 +1,16 @@ +const sharp = require("sharp"); + +async function run(){ +let original = await sharp("/Users/slynn1324/Desktop/IMG_5166.HEIC"); + +console.log(await original.metadata()); + +let jpg = await original.toFormat("jpg").toBuffer(); + +jpg = await sharp(jpg); + +console.log(await jpg.metadata() ); + +} + +run(); \ No newline at end of file diff --git a/utils/rotate-key.js b/utils/rotate-key.js new file mode 100644 index 0000000..18d79d2 --- /dev/null +++ b/utils/rotate-key.js @@ -0,0 +1,3 @@ +const crypto = require('crypto'); + +console.log("cookieKey: " + crypto.randomBytes(32).toString('hex')); \ No newline at end of file