wiki-security-sessionless 0.0.1 → 0.0.3

package/generate-keys.js

@@ -1,3 +1,3 @@
-const sessionless = require('sessionless-node');
-
-sessionless.generateKeys(() => {}, () => {}).then(console.log).catch(console.error);
+const sessionless = require('sessionless-node');
+
+sessionless.generateKeys(() => {}, () => {}).then(console.log).catch(console.error);

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "wiki-security-sessionless",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "description": "A sessionless security module for the federated wiki",
+  "repository": "https://github.com/zach-planet-nine/wiki-security-sessionless",
   "keywords": [
     "federated",
     "wiki"

package/server/sessionless.js

@@ -43,17 +43,7 @@ module.exports = (log, loga, argv) => {
   };
 
   security.isAuthorized = async (req) => {
-    if(req.session.key) {
-       const keys = await sessionless.getKeys();
-       const signature = await sessionless.sign(req.path);
-       try {
-         const isVerified = sessionless.verifySignature(signature, req.path, keys.pubKey);
-         return isVerified;
-       } catch(err) {
-         return false;
-       }
-    }
-    return false;
+    return req.sessionless && req.sessionless.isVerified;
   }
 
   security.login = async (req, res) => {
@@ -67,11 +57,11 @@ module.exports = (log, loga, argv) => {
 	const keys = await sessionless.generateKeys(saveKeys, getKeys);
 
 	req.session.key = keys.privateKey;
+
 	return res.redirect('/view/welcome-visitors');
       } 
     } catch(err) {}
     
-    
     res.status(403);
     return res.send('unauthorized');
   };
@@ -82,6 +72,34 @@ module.exports = (log, loga, argv) => {
   };
 
   security.defineRoutes = (app, cors, updateOwner) => {
+    app.use(async (req, res, next) => {
+      req.sessionless = req.sessionless || {};
+
+      if(req.session && req.session.key) {
+        try {
+          const keys = await sessionless.getKeys();
+          keys.privateKey = req.session.key;
+          sessionless.getKeys = () => keys;
+        } catch(err) {
+          req.session.reset();
+          req.sessionless.isVerified = false;
+          return next();
+        }
+
+        try {
+          const signature = await sessionless.sign(req.path);
+
+          const isVerified = sessionless.verifySignature(signature, req.path, keys.pubKey);
+          req.sessionless.isVerified = isVerified;
+        } catch(err) {
+          req.sessionless.isVerified = false;
+        }
+      } else {
+        req.sessionless.isVerified = false;
+      }
+
+      next();
+    });
     app.get('/login', cors, security.login);
     app.get('/logout', cors, security.logout);
   };