fix(rate-limit): fix read/write rate separation

OADA · Apr 5, 2023 · 8c3caa2 · 8c3caa2
1 parent 9467c06
commit 8c3caa2
Show file tree

Hide file tree

Showing 17 changed files with 20 additions and 19 deletions.
diff --git a/oada/libs/lib-arangodb/package.json b/oada/libs/lib-arangodb/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oada/lib-arangodb",
-  "version": "3.9.0",
+  "version": "3.9.1",
   "description": "All OADA Arango interface code in one place.",
   "main": "dist/index.js",
   "type": "module",

diff --git a/oada/libs/lib-config/package.json b/oada/libs/lib-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oada/lib-config",
-  "version": "3.9.0",
+  "version": "3.9.1",
   "description": "Confing wrapper",
   "main": "dist/index.js",
   "type": "module",

diff --git a/oada/libs/lib-kafka/package.json b/oada/libs/lib-kafka/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oada/lib-kafka",
-  "version": "3.9.0",
+  "version": "3.9.1",
   "description": "OADA Kafka library",
   "main": "./dist/index.js",
   "type": "module",

diff --git a/oada/libs/lib-prom/package.json b/oada/libs/lib-prom/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oada/lib-prom",
-  "version": "3.9.0",
+  "version": "3.9.1",
   "description": "OADA Prometheus library",
   "main": "./dist/index.js",
   "type": "module",

diff --git a/oada/libs/pino-debug/package.json b/oada/libs/pino-debug/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oada/pino-debug",
-  "version": "3.9.0",
+  "version": "3.9.1",
   "description": "OADA pino-debug wrapper",
   "main": "dist/index.js",
   "engines": {

diff --git a/oada/services/auth/package.json b/oada/services/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oada/auth",
-  "version": "3.9.0",
+  "version": "3.9.1",
   "description": "Reference implementation of OADA Authentication and Authorization server.",
   "bin": {
     "token": "./dist/token.js"

diff --git a/oada/services/http-handler/package.json b/oada/services/http-handler/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oada/http-handler",
-  "version": "3.9.0",
+  "version": "3.9.1",
   "type": "module",
   "description": "",
   "main": "dist/server.js",

diff --git a/oada/services/http-handler/src/server.ts b/oada/services/http-handler/src/server.ts
@@ -181,12 +181,13 @@ const { enabled, maxRequests, timeWindow, redis, useDraftSpec } =
 if (enabled) {
   const options: RateLimitPluginOptions = {
     async keyGenerator(request) {
-      const mode =
-        request.method in ['PUT', 'POST', 'DELETE'] ? 'write' : 'read';
+      const mode = ['PUT', 'POST', 'DELETE'].includes(request.method)
+        ? 'write'
+        : 'read';
       return `${request.ip}-${mode}`;
     },
     async max(request) {
-      return request.method in ['PUT', 'POST', 'DELETE']
+      return ['PUT', 'POST', 'DELETE'].includes(request.method)
         ? maxRequests.write
         : maxRequests.read;
     },

diff --git a/oada/services/permissions-handler/package.json b/oada/services/permissions-handler/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@oada/permissions-handler",
   "description": "",
-  "version": "3.9.0",
+  "version": "3.9.1",
   "type": "module",
   "author": "",
   "license": "Apache-2.0",

diff --git a/oada/services/rev-graph-update/package.json b/oada/services/rev-graph-update/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oada/rev-graph-update",
-  "version": "3.9.0",
+  "version": "3.9.1",
   "type": "module",
   "description": "",
   "author": "",

diff --git a/oada/services/shares/package.json b/oada/services/shares/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oada/shares",
-  "version": "3.9.0",
+  "version": "3.9.1",
   "type": "module",
   "description": "",
   "author": "",

diff --git a/oada/services/startup/package.json b/oada/services/startup/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oada/startup",
-  "version": "3.9.0",
+  "version": "3.9.1",
   "type": "module",
   "description": "Handles startup of services for docker in OADA docker implementation.",
   "main": "dist/index.js",

diff --git a/oada/services/sync-handler/package.json b/oada/services/sync-handler/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oada/sync-handler",
-  "version": "3.9.0",
+  "version": "3.9.1",
   "type": "module",
   "description": "",
   "main": "dist/server.js",

diff --git a/oada/services/users/package.json b/oada/services/users/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oada/users",
-  "version": "3.9.0",
+  "version": "3.9.1",
   "type": "module",
   "description": "",
   "author": "Alex Layton <[email protected]>",

diff --git a/oada/services/webhooks/package.json b/oada/services/webhooks/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oada/webhooks",
-  "version": "3.9.0",
+  "version": "3.9.1",
   "type": "module",
   "description": "",
   "main": "dist/server.js",

diff --git a/oada/services/well-known/package.json b/oada/services/well-known/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oada/well-known",
-  "version": "3.9.0",
+  "version": "3.9.1",
   "type": "module",
   "description": "Microservice for serving well-known at an OADA cloud.  Plays nicely with oada-ref-auth-js.",
   "repository": {

diff --git a/oada/services/write-handler/package.json b/oada/services/write-handler/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oada/write-handler",
-  "version": "3.9.0",
+  "version": "3.9.1",
   "type": "module",
   "description": "",
   "engines": {