Merge pull request #289 from Sanketika-Obsrv/rbac-update

#OBS-l339: druid proxy and rbac update
Sanketika-Obsrv · Dec 2, 2024 · 244a9f1 · 244a9f1
2 parents 38b311d + a6fea9b
commit 244a9f1
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/api-service/src/middlewares/RBAC_middleware.ts b/api-service/src/middlewares/RBAC_middleware.ts
@@ -77,7 +77,7 @@ const checkAccess = (decoded: any, action: string, req: Request, res: Response)
 
 const basicToken = (token: string, req: Request, res: Response, next: NextFunction) => {
   try {
-    const decoded = jwt.verify(token, config.user_token_public_key);
+    const decoded = jwt.verify(token, config.user_token_public_key, { algorithms: ['RS256'] });
 
     if (!decoded || !_.isObject(decoded)) {
       return errorHandler(401, "Token verification failed or invalid token", req, res);
@@ -125,8 +125,8 @@ export default {
         (req as any).userID = "SYSTEM";
         return next();
       }
-
-      const token = req.get("x-user-token");
+      const authHeader = req.headers['authorization'];
+      const token = authHeader && authHeader.split(' ')[1];
       if (!token) {
         return errorHandler(401, "No token provided", req, res);
       }

diff --git a/api-service/src/routes/DruidProxyRouter.ts b/api-service/src/routes/DruidProxyRouter.ts
@@ -20,4 +20,5 @@ druidProxyRouter.post(/\/druid\/v2(.*)/, setDataToRequestObject("query.wrapper.n
 druidProxyRouter.get(/\/druid\/v2(.*)/, setDataToRequestObject("query.wrapper.native.get"), onRequest({ entity: Entity.DruidProxy }), wrapperService.forwardNativeGet);
 druidProxyRouter.delete("/druid/v2/:queryId", setDataToRequestObject("query.wrapper.native.delete"), onRequest({ entity: Entity.DruidProxy }), wrapperService.forwardNativeDel)
 druidProxyRouter.get("/status", setDataToRequestObject("query.wrapper.status"), onRequest({ entity: Entity.DruidProxy }), wrapperService.nativeStatus)
-druidProxyRouter.get("/health", setDataToRequestObject("api.health"), onRequest({ entity: Entity.DruidProxy }), healthService.checkDruidHealth)
+druidProxyRouter.get("/health", setDataToRequestObject("api.health"), onRequest({ entity: Entity.DruidProxy }), healthService.checkDruidHealth)
+druidProxyRouter.get(/\/druid\/coordinator(.*)/, setDataToRequestObject("query.wrapper.native.get"), onRequest({entity: Entity.DruidProxy}), wrapperService.forwardNativeGetDatasource)
diff --git a/api-service/src/services/WrapperService.ts b/api-service/src/services/WrapperService.ts
@@ -85,6 +85,22 @@ class WrapperService {
         } catch (error: any) { this.errorHandler.handleError(req, res, next, error, false); }
     };
 
+    public forwardNativeGetDatasource = async (
+        req: Request,
+        res: Response,
+        next: NextFunction
+    ) => {
+        try {
+            const headers = req?.headers;
+            const url = req?.url;
+            const result = await axios.get(
+                `${config.query_api.druid.host}:${config.query_api.druid.port}${url}`,
+                { headers }
+            );
+            ResponseHandler.flatResponse(req, res, result);
+        } catch (error: any) { this.errorHandler.handleError(req, res, next, error, false); }
+    };
+
     public nativeStatus = async (
         req: Request,
         res: Response,