From 36fa6ec0227a6c2397c2059259b9b2a2a0983c1a Mon Sep 17 00:00:00 2001
From: gumi <git@gumi.ca>
Date: Fri, 27 Mar 2020 22:46:37 -0400
Subject: use sequelize setters for ip addresses

---
 src/routers/vault/middlewares/evol/account.js   | 6 +++---
 src/routers/vault/middlewares/identity.js       | 2 +-
 src/routers/vault/middlewares/legacy/account.js | 4 ++--
 src/routers/vault/middlewares/session.js        | 8 ++++----
 src/routers/vault/models/vault/account_log.js   | 3 +++
 src/routers/vault/models/vault/identity_log.js  | 3 +++
 src/routers/vault/models/vault/login_log.js     | 3 +++
 src/routers/vault/models/vault/migration_log.js | 3 +++
 src/routers/vault/utils/claim.js                | 2 +-
 9 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/routers/vault/middlewares/evol/account.js b/src/routers/vault/middlewares/evol/account.js
index d7fe2e2..a889462 100644
--- a/src/routers/vault/middlewares/evol/account.js
+++ b/src/routers/vault/middlewares/evol/account.js
@@ -63,7 +63,7 @@ const new_account = async (req, res, next) => {
         accountType: "EVOL",
         actionType: "CREATE",
         accountId: evol_acc.accountId,
-        ip: req.app.locals.sequelize.vault.fn("INET6_ATON", req.ip),
+        ip: req.ip,
     });
 
     // immediately claim it
@@ -153,7 +153,7 @@ const update_account = async (req, res, next) => {
             actionType: "UPDATE",
             details: "username",
             accountId: account.accountId,
-            ip: req.app.locals.sequelize.vault.fn("INET6_ATON", req.ip),
+            ip: req.ip,
         });
     } else {
         update_fields = {
@@ -166,7 +166,7 @@ const update_account = async (req, res, next) => {
             actionType: "UPDATE",
             details: "password",
             accountId: account.accountId,
-            ip: req.app.locals.sequelize.vault.fn("INET6_ATON", req.ip),
+            ip: req.ip,
         });
     }
 
diff --git a/src/routers/vault/middlewares/identity.js b/src/routers/vault/middlewares/identity.js
index 3cae9e5..6f77134 100644
--- a/src/routers/vault/middlewares/identity.js
+++ b/src/routers/vault/middlewares/identity.js
@@ -81,7 +81,7 @@ const add_identity = async (req, res, next) => {
             userId: ident.vault,
             identityId: newIdent.id,
             action: "ADD",
-            ip: req.app.locals.sequelize.vault.fn("INET6_ATON", req.ip),
+            ip: req.ip,
         });
 
         await Claim.claim_accounts(req, ident.email, ident.vault);
diff --git a/src/routers/vault/middlewares/legacy/account.js b/src/routers/vault/middlewares/legacy/account.js
index 199ace3..50874ed 100644
--- a/src/routers/vault/middlewares/legacy/account.js
+++ b/src/routers/vault/middlewares/legacy/account.js
@@ -119,7 +119,7 @@ const claim_by_password = async (req, res, next) => {
         accountType: "LEGACY",
         actionType: "LINK",
         accountId: legacy.accountId,
-        ip: req.app.locals.sequelize.vault.fn("INET6_ATON", req.ip),
+        ip: req.ip,
     });
 
     // now we must update the session cache:
@@ -229,7 +229,7 @@ const migrate = async (req, res, next) => {
         vaultId: session.vault,
         legacyId: legacy.accountId,
         accountId: evol_acc.accountId,
-        ip: req.app.locals.sequelize.vault.fn("INET6_ATON", req.ip),
+        ip: req.ip,
     });
 
     // immediately claim it
diff --git a/src/routers/vault/middlewares/session.js b/src/routers/vault/middlewares/session.js
index c9b7e13..454a235 100644
--- a/src/routers/vault/middlewares/session.js
+++ b/src/routers/vault/middlewares/session.js
@@ -33,7 +33,7 @@ const delete_session = async (req, res) => {
     req.app.locals.vault.login_log.create({
         userId: session.vault,
         action: "LOGOUT",
-        ip: req.app.locals.sequelize.vault.fn("INET6_ATON", req.ip),
+        ip: req.ip,
     });
 
     req.app.locals.session.delete(token);
@@ -129,7 +129,7 @@ const auth_session = async (req, res) => {
         req.app.locals.vault.login_log.create({
             userId: user.id,
             action: "CREATE",
-            ip: req.app.locals.sequelize.vault.fn("INET6_ATON", req.ip),
+            ip: req.ip,
         });
 
         /** @type {Identity} */
@@ -142,7 +142,7 @@ const auth_session = async (req, res) => {
             userId: user.id,
             identityId: ident.id,
             action: "ADD",
-            ip: req.app.locals.sequelize.vault.fn("INET6_ATON", req.ip),
+            ip: req.ip,
         });
 
         user.primaryIdentity = ident.id;
@@ -194,7 +194,7 @@ const auth_session = async (req, res) => {
     req.app.locals.vault.login_log.create({
         userId: session.vault,
         action: "LOGIN",
-        ip: req.app.locals.sequelize.vault.fn("INET6_ATON", req.ip),
+        ip: req.ip,
     });
 
     if (session.identity !== session.primaryIdentity) {
diff --git a/src/routers/vault/models/vault/account_log.js b/src/routers/vault/models/vault/account_log.js
index 1f8b05b..20867b0 100644
--- a/src/routers/vault/models/vault/account_log.js
+++ b/src/routers/vault/models/vault/account_log.js
@@ -32,6 +32,9 @@ module.exports = {
         ip: {
             type: "VARBINARY(16)",
             allowNull: false,
+            set (raw) {
+                this.setDataValue("ip", Sequelize.fn("INET6_ATON", raw));
+            },
         },
         date: {
             type: Sequelize.DATE,
diff --git a/src/routers/vault/models/vault/identity_log.js b/src/routers/vault/models/vault/identity_log.js
index 4e881f1..47bb7df 100644
--- a/src/routers/vault/models/vault/identity_log.js
+++ b/src/routers/vault/models/vault/identity_log.js
@@ -24,6 +24,9 @@ module.exports = {
         ip: {
             type: "VARBINARY(16)",
             allowNull: false,
+            set (raw) {
+                this.setDataValue("ip", Sequelize.fn("INET6_ATON", raw));
+            },
         },
         date: {
             type: Sequelize.DATE,
diff --git a/src/routers/vault/models/vault/login_log.js b/src/routers/vault/models/vault/login_log.js
index 5f42469..b123ede 100644
--- a/src/routers/vault/models/vault/login_log.js
+++ b/src/routers/vault/models/vault/login_log.js
@@ -25,6 +25,9 @@ module.exports = {
         ip: {
             type: "VARBINARY(16)",
             allowNull: false,
+            set (raw) {
+                this.setDataValue("ip", Sequelize.fn("INET6_ATON", raw));
+            },
         },
         date: {
             type: Sequelize.DATE,
diff --git a/src/routers/vault/models/vault/migration_log.js b/src/routers/vault/models/vault/migration_log.js
index 5b2e651..0d30aeb 100644
--- a/src/routers/vault/models/vault/migration_log.js
+++ b/src/routers/vault/models/vault/migration_log.js
@@ -18,6 +18,9 @@ module.exports = {
         ip: {
             type: "VARBINARY(16)",
             allowNull: false,
+            set (raw) {
+                this.setDataValue("ip", Sequelize.fn("INET6_ATON", raw));
+            },
         },
         date: {
             type: Sequelize.DATE,
diff --git a/src/routers/vault/utils/claim.js b/src/routers/vault/utils/claim.js
index 148767f..dda9001 100644
--- a/src/routers/vault/utils/claim.js
+++ b/src/routers/vault/utils/claim.js
@@ -47,7 +47,7 @@ const claim_accounts = async (req, email, vault_id, session = null) => {
             accountType: "LEGACY",
             actionType: "LINK",
             accountId: acc.accountId,
-            ip: req.app.locals.sequelize.vault.fn("INET6_ATON", req.ip),
+            ip: req.ip,
         });
 
         if (session !== null) {
-- 
cgit v1.2.3-60-g2f50