From 81ffe150c2faba9269fee8d85bff53fcbe45e67e Mon Sep 17 00:00:00 2001 From: Jon Penwood Date: Wed, 16 Oct 2024 16:19:20 -0500 Subject: [PATCH 1/2] fix: Removed expandable types --- .github/workflows/run-int-dev-checklist.yml | 2 +- config/config.json | 24 +++++++++++++-------- package-lock.json | 4 ++-- package.json | 4 ++-- 4 files changed, 20 insertions(+), 14 deletions(-) diff --git a/.github/workflows/run-int-dev-checklist.yml b/.github/workflows/run-int-dev-checklist.yml index ffa86d7..80e76bd 100644 --- a/.github/workflows/run-int-dev-checklist.yml +++ b/.github/workflows/run-int-dev-checklist.yml @@ -7,7 +7,7 @@ on: jobs: run-integration-development-checklist: runs-on: ubuntu-latest - container: 'centos:7' + container: 'rockylinux:8' steps: - uses: actions/checkout@v2 diff --git a/config/config.json b/config/config.json index 291d9f9..f5415e6 100644 --- a/config/config.json +++ b/config/config.json @@ -3,7 +3,20 @@ "name": "Redis", "acronym": "RED", "description": "Query Redis servers and return data for configured key patterns.", - "entityTypes": ["*"], + "entityTypes": [ + "IPv4", + "IPv4CIDR", + "IPv6", + "domain", + "url", + "MD5", + "SHA1", + "SHA256", + "email", + "cve", + "MAC", + "string" + ], "defaultColor": "light-gray", "logging": { "level": "info" @@ -17,13 +30,6 @@ "file": "./templates/block.hbs" } }, - "request": { - "cert": "", - "key": "", - "passphrase": "", - "ca": "", - "proxy": "" - }, "options": [ { "key": "host", @@ -107,4 +113,4 @@ "adminOnly": true } ] -} \ No newline at end of file +} diff --git a/package-lock.json b/package-lock.json index 2f5397c..4b1f605 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "Redis", - "version": "3.0.7", + "version": "3.0.8", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -92,4 +92,4 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" } } -} \ No newline at end of file +} diff --git a/package.json b/package.json index 7bfcfdc..046e3fa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Redis", - "version": "3.0.7", + "version": "3.0.8", "main": "./integration.js", "description": "Query Redis keys", "private": true, @@ -9,4 +9,4 @@ "lodash": "^4.17.21", "redis": "4.0.6" } -} \ No newline at end of file +} From 7cdf7e0a150cf2fe427c7e5b3051a6dc3d34a8ff Mon Sep 17 00:00:00 2001 From: Jon Penwood Date: Thu, 17 Oct 2024 12:07:11 -0500 Subject: [PATCH 2/2] fix: Synced config entity types & Updated Deps --- config/config.js | 4 ++-- package-lock.json | 6 +++--- package.json | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config/config.js b/config/config.js index 7f626a7..9b6ad05 100644 --- a/config/config.js +++ b/config/config.js @@ -24,7 +24,7 @@ module.exports = { */ description: 'Query Redis servers and return data for configured key patterns.', logging: { level: 'info' }, - entityTypes: ['*'], + entityTypes: ['IPv4', 'IPv4CIDR', 'IPv6', 'domain', 'url', 'MD5', 'SHA1', 'SHA256', 'email', 'cve', 'MAC', 'string'], defaultColor: 'light-gray', /** * An array of style files (css or less) that will be included for your integration. Any styles specified in @@ -56,7 +56,7 @@ module.exports = { key: '', passphrase: '', ca: '', - proxy: "" + proxy: '' }, /** * Options that are displayed to the user/admin in the Polarity integration user-interface. Should be structured diff --git a/package-lock.json b/package-lock.json index 4b1f605..477e189 100644 --- a/package-lock.json +++ b/package-lock.json @@ -41,9 +41,9 @@ "integrity": "sha512-HGQ8YooJ8Mx7l28tD7XjtB3ImLEjlUxG1wC1PAjxu6hPJqjPshUZxAICzDqDjtIbhDTf48WXXUcx8TQJB1XTKA==" }, "async": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz", - "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==" + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz", + "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==" }, "cluster-key-slot": { "version": "1.1.0", diff --git a/package.json b/package.json index 046e3fa..ca0a991 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "description": "Query Redis keys", "private": true, "dependencies": { - "async": "^3.2.3", + "async": "^3.2.5", "lodash": "^4.17.21", "redis": "4.0.6" }