Update the check for office ip (#117)

* Update the check for office ip

* update readme and changelog

Author: lissmeister

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 2.19.0 (2024-10-02)
+### Features
+* feat(sendgrid): ✨ Update checking of correct ip before accessing the Sendgrid api
 
 ## 2.18.0 (2024-04-11)
 ### Features

index.js

@@ -27,7 +27,7 @@ import { checkLisaVersion } from "./lib/versions.js"
 import { generateVaultPass } from "./tasks/trellis.js"
 
 export const program = new Command()
-export const LISA_VERSION = "2.18.0"
+export const LISA_VERSION = "2.19.0"
 
 resetConf()
 checkNodeVersion()

lib/triggerfish.js

@@ -1,15 +1,17 @@
+import ip from "ip"
 import fetch from "node-fetch"
 
 import { writeError, writeStep } from "./write.js"
 
+const { cidrSubnet } = ip
 export async function isTriggerfishOfficeIp() {
   writeStep(
     "Checking if you are in the Triggerfish office (or using the VPN)...",
   )
-
+  const cidr = "155.4.226.178/28"
   const ipCorrect = await fetch("https://icanhazip.com/")
     .then((response) => response.text())
-    .then((ip) => ip.trim() === "158.174.69.114")
+    .then((ip) => cidrSubnet(cidr).contains(ip.trim()))
 
   if (!ipCorrect) {
     writeError(

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@triggerfishab/lisa-cli",
-  "version": "2.18.0",
+  "version": "2.19.0",
   "description": "CLI commands to generate a new project based on Lisa",
   "main": "./index.js",
   "bin": {
@@ -25,6 +25,7 @@
     "commander": "^11.0.0",
     "conf": "^11.0.0",
     "generate-password": "^1.6.1",
+    "ip": "^2.0.1",
     "js-yaml": "^4.1.0",
     "node-fetch": "3",
     "oauth-1.0a": "^2.2.6",

yarn.lock

@@ -2435,6 +2435,11 @@ internal-slot@^1.0.5:
     has "^1.0.3"
     side-channel "^1.0.4"
 
+ip@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.1.tgz#e8f3595d33a3ea66490204234b77636965307105"
+  integrity sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==
+
 is-array-buffer@^3.0.1, is-array-buffer@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.2.tgz#f2653ced8412081638ecb0ebbd0c41c6e0aecbbe"