Handle the case where the endpoint port was wrong

1. Handle the case where the endpoint port was wrong - for example: - S3 port with IAM action - IAM port with S3 action Signed-off-by: shirady <[email protected]> (cherry picked from commit 5d071d4)
noobaa · Aug 19, 2024 · 11fb2d4 · 11fb2d4
1 parent b22ebac
commit 11fb2d4
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 21 deletions.
diff --git a/src/endpoint/iam/iam_rest.js b/src/endpoint/iam/iam_rest.js
@@ -98,6 +98,11 @@ async function handle_request(req, res) {
     await http_utils.read_and_parse_body(req, options);
 
     const op_name = parse_op_name(req, req.body.action);
+    const op = IAM_OPS[op_name];
+    if (!op || !op.handler) {
+        dbg.error('IAM (NotImplemented)', op_name, req.method, req.originalUrl);
+        throw new IamError(IamError.NotImplemented);
+    }
     req.op_name = op_name;
 
     http_utils.authorize_session_token(req, headers_options);
@@ -106,12 +111,6 @@ async function handle_request(req, res) {
 
     dbg.log1('IAM REQUEST', req.method, req.originalUrl, 'op', op_name, 'request_id', req.request_id, req.headers);
 
-    const op = IAM_OPS[op_name];
-    if (!op || !op.handler) {
-        dbg.error('IAM TODO (NotImplemented)', op_name, req.method, req.originalUrl);
-        throw new IamError(IamError.NotImplemented);
-    }
-
     const reply = await op.handler(req, res);
     add_response_metadata_if_not_exists(reply, req.request_id); // unique to IAM
     http_utils.send_reply(req, res, reply, {
@@ -171,9 +170,9 @@ function handle_error(req, res, err) {
 // we only support request with specific type
 function verify_op_request_body_type(req) {
     const headers = req.headers['content-type'];
-    if (!headers.includes(http_utils.CONTENT_TYPE_APP_FORM_URLENCODED)) {
-        dbg.error(`verify_op_request_body_type: should have header ${http_utils.CONTENT_TYPE_APP_FORM_URLENCODED}` +
-            `in request, ${headers}`);
+    if (headers === undefined || !headers.includes(http_utils.CONTENT_TYPE_APP_FORM_URLENCODED)) {
+        dbg.error(`verify_op_request_body_type: should have header ${http_utils.CONTENT_TYPE_APP_FORM_URLENCODED} ` +
+            `in request, currently the headers are: ${headers}`);
         // GAP - need to make sure which error we need to throw
         throw new IamError(IamError.InvalidParameterValue);
     }

diff --git a/src/endpoint/s3/s3_rest.js b/src/endpoint/s3/s3_rest.js
@@ -114,6 +114,11 @@ async function handle_request(req, res) {
     }
 
     const op_name = parse_op_name(req);
+    const op = s3_ops[op_name];
+    if (!op || !op.handler) {
+        dbg.error('S3 NotImplemented', op_name, req.method, req.originalUrl);
+        throw new S3Error(S3Error.NotImplemented);
+    }
     req.op_name = op_name;
 
     http_utils.authorize_session_token(req, headers_options);
@@ -140,12 +145,6 @@ async function handle_request(req, res) {
         }
     }
 
-    const op = s3_ops[op_name];
-    if (!op || !op.handler) {
-        dbg.error('S3 TODO (NotImplemented)', op_name, req.method, req.originalUrl);
-        throw new S3Error(S3Error.NotImplemented);
-    }
-
     const options = {
         body: op.body,
         reply: op.reply,

diff --git a/src/endpoint/sts/sts_rest.js b/src/endpoint/sts/sts_rest.js
@@ -83,6 +83,11 @@ async function handle_request(req, res) {
     await http_utils.read_and_parse_body(req, options);
 
     const op_name = parse_op_name(req, req.body.action);
+    const op = STS_OPS[op_name];
+    if (!op || !op.handler) {
+        dbg.error('STS NotImplemented', op_name, req.method, req.originalUrl);
+        throw new StsError(StsError.NotImplemented);
+    }
     req.op_name = op_name;
 
     http_utils.authorize_session_token(req, headers_options);
@@ -91,12 +96,6 @@ async function handle_request(req, res) {
 
     dbg.log1('STS REQUEST', req.method, req.originalUrl, 'op', op_name, 'request_id', req.request_id, req.headers);
 
-    const op = STS_OPS[op_name];
-    if (!op || !op.handler) {
-        dbg.error('STS TODO (NotImplemented)', op_name, req.method, req.originalUrl);
-        throw new StsError(StsError.NotImplemented);
-    }
-
     const reply = await op.handler(req, res);
     http_utils.send_reply(req, res, reply, {
         ...options,