@fonoster/authz 0.8.18 → 0.8.19

package/dist/makeCheckMethodAuthorized.js

@@ -1,6 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeCheckMethodAuthorized = makeCheckMethodAuthorized;
+/*
+ * Copyright (C) 2024 by Fonoster Inc (https://fonoster.com)
+ * http://github.com/fonoster/fonoster
+ *
+ * This file is part of Fonoster
+ *
+ * Licensed under the MIT License (the "License");
+ * you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *    https://opensource.org/licenses/MIT
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+const common_1 = require("@fonoster/common");
 const logger_1 = require("@fonoster/logger");
 const grpc_js_1 = require("@grpc/grpc-js");
 const AuthzClient_1 = require("./client/AuthzClient");
@@ -36,21 +55,25 @@ function makeCheckMethodAuthorized(authzServer, methods) {
         }
         logger.silly("checking if method is authorized", { method });
         const accessKeyId = (0, identity_1.getAccessKeyIdFromCall)(call);
-        authz
-            .checkMethodAuthorized({
-            accessKeyId,
-            method
-        })
-            .then(() => {
-            call.sendMessage({ authorized: true }, () => { });
-        })
-            .catch((error) => {
-            logger.verbose("method is not authorized", { method, accessKeyId });
-            call.sendStatus({
-                code: grpc_js_1.status.PERMISSION_DENIED,
-                details: `Method ${method} is not authorized for accessKeyId ${accessKeyId}`
-            });
+        return new grpc_js_1.ServerInterceptingCall(call, {
+            start: async (next) => {
+                try {
+                    await authz.checkMethodAuthorized({
+                        accessKeyId,
+                        method
+                    });
+                    logger.verbose("method authorized by external service", { method, accessKeyId });
+                    next();
+                }
+                catch (error) {
+                    logger.verbose("method unauthorized by external service", { method, accessKeyId });
+                    (0, common_1.createInterceptingCall)({
+                        call,
+                        code: grpc_js_1.status.PERMISSION_DENIED,
+                        details: `Method '${method}' unauthorized by external service - accessKeyId ${accessKeyId}`
+                    });
+                }
+            }
         });
-        return call;
     };
 }

package/dist/server/AuthzServer.js

@@ -75,8 +75,7 @@ class AuthzServer {
             const server = new grpc.Server();
             server.addService(serviceDefinition_1.serviceDefinition, {
                 checkSessionAuthorized: async (call, callback) => {
-                    logger.verbose("checkSessionAuthorized called");
-                    logger.verbose(JSON.stringify(call.request));
+                    logger.verbose("checkSessionAuthorized called", call.request);
                     try {
                         const isAuthorized = await handler.checkSessionAuthorized(call.request);
                         if (isAuthorized) {
@@ -98,8 +97,7 @@ class AuthzServer {
                     }
                 },
                 checkMethodAuthorized: async (call, callback) => {
-                    logger.verbose("checkMethodAuthorized called");
-                    logger.verbose(JSON.stringify(call.request));
+                    logger.verbose("checkMethodAuthorized called", call.request);
                     try {
                         const isAuthorized = await handler.checkMethodAuthorized(call.request);
                         if (isAuthorized) {
@@ -121,8 +119,7 @@ class AuthzServer {
                     }
                 },
                 addBillingMeterEvent: async (call, callback) => {
-                    logger.verbose("addBillingMeterEvent called");
-                    logger.verbose(JSON.stringify(call.request));
+                    logger.verbose("addBillingMeterEvent called", call.request);
                     try {
                         const request = {
                             accessKeyId: call.request.accessKeyId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fonoster/authz",
-  "version": "0.8.18",
+  "version": "0.8.19",
   "description": "Authorization module for Fonoster",
   "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/fonoster#readme",
@@ -40,5 +40,5 @@
   "bugs": {
     "url": "https://github.com/fonoster/fonoster/issues"
   },
-  "gitHead": "83c6089aa8d7d5b9adaf425a80f18925d6a77978"
+  "gitHead": "3e9b9905b215acd90511512bce1dd42f9897f2a6"
 }