@routr/simpleauth 2.0.8-alpha.2 → 2.0.8-alpha.20

package/dist/runner.js

@@ -3,7 +3,7 @@
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _a;
+var _a, _b, _c, _d, _e;
 Object.defineProperty(exports, "__esModule", { value: true });
 /*
  * Copyright (C) 2022 by Fonoster Inc (https://fonoster.com)
@@ -29,15 +29,17 @@ const service_1 = __importDefault(require("./service"));
 const common_1 = require("@routr/common");
 const logger_1 = require("@fonoster/logger");
 const logger = (0, logger_1.getLogger)({ service: "simpleauth", filePath: __filename });
-common_1.Assertions.assertEnvsAreSet(["PATH_TO_AUTH"]);
-const whiteList = process.env.WHITELIST ? process.env.WHITELIST.split(",") : [];
+common_1.Assertions.assertEnvsAreSet(["PATH_TO_AUTH", "METHODS"]);
+const whiteList = (_b = (_a = process.env.WHITELIST) === null || _a === void 0 ? void 0 : _a.split(",")) !== null && _b !== void 0 ? _b : [];
+const methods = (_d = (_c = process.env.METHODS) === null || _c === void 0 ? void 0 : _c.split(",")) !== null && _d !== void 0 ? _d : [];
 try {
     // eslint-disable-next-line @typescript-eslint/no-var-requires
     const users = require(process.env.PATH_TO_AUTH);
     (0, service_1.default)({
-        bindAddr: (_a = process.env.BIND_ADDR) !== null && _a !== void 0 ? _a : "0.0.0.0:51903",
+        bindAddr: (_e = process.env.BIND_ADDR) !== null && _e !== void 0 ? _e : "0.0.0.0:51903",
         users,
-        whiteList
+        whiteList,
+        methods
     });
 }
 catch (e) {

package/dist/service.d.ts

@@ -13,4 +13,5 @@ export default function simpleAuthMiddleware(config: {
     bindAddr: string;
     users: User[];
     whiteList: string[];
+    methods: string[];
 }): void;

package/dist/service.js

@@ -23,9 +23,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * limitations under the License.
  */
 const api_1 = __importDefault(require("@opentelemetry/api"));
-const common_1 = require("@routr/common");
-const utils_1 = require("./utils");
 const processor_1 = __importDefault(require("@routr/processor"));
+const common_1 = require("@routr/common");
 const logger_1 = require("@fonoster/logger");
 const logger = (0, logger_1.getLogger)({ service: "simpledata", filePath: __filename });
 /**
@@ -38,7 +37,7 @@ const logger = (0, logger_1.getLogger)({ service: "simpledata", filePath: __file
  * @param {string[]} config.whiteList - list of path that required no authentication
  */
 function simpleAuthMiddleware(config) {
-    const { bindAddr, users, whiteList } = config;
+    const { bindAddr, users, whiteList, methods } = config;
     new processor_1.default({ bindAddr, name: "simpleauth" }).listen((req, res) => {
         const tracer = api_1.default.trace.getTracer("routr-tracer");
         const currentSpan = api_1.default.trace.getSpan(api_1.default.context.active());
@@ -46,7 +45,7 @@ function simpleAuthMiddleware(config) {
         logger.silly(JSON.stringify(req, null, " "));
         const span = tracer.startSpan("server.js:sayHello()", { kind: 1 });
         // Q: Should we extend the list to other message types?
-        if (![common_1.CommonTypes.Method.INVITE, common_1.CommonTypes.Method.MESSAGE, common_1.CommonTypes.Method.REGISTER].includes(req.method)) {
+        if (!methods.includes(req.method)) {
             return res.send(req);
         }
         if (whiteList.includes(req.message.from.address.uri.user)) {
@@ -59,17 +58,17 @@ function simpleAuthMiddleware(config) {
             const auth = Object.assign({}, req.message.authorization);
             auth.method = req.method;
             // Calculate response and compare with the one send by the endpoint
-            const calcRes = (0, common_1.calculateAuthResponse)(auth, (0, utils_1.getCredentials)(auth.username, users));
+            const calcRes = common_1.Auth.calculateAuthResponse(auth, common_1.Auth.getCredentials(auth.username, users));
             if (calcRes !== auth.response) {
                 span.addEvent(`user ${req.message.from.address.uri.user} unauthorized to complete request`);
                 span.end();
-                return res.send((0, utils_1.createUnauthorizedResponse)(auth.realm));
+                return res.send(common_1.Auth.createUnauthorizedResponse(req.message.requestUri.host));
             }
         }
         else {
             span.addEvent(`authorization header not found for user ${req.message.from.address.uri.user}`);
             span.end();
-            return res.send((0, utils_1.createUnauthorizedResponse)(req.message.requestUri.host));
+            return res.send(common_1.Auth.createUnauthorizedResponse(req.message.requestUri.host));
         }
         // Forward request to next middleware
         span.addEvent(`user ${req.message.from.address.uri.user} authorized`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@routr/simpleauth",
-  "version": "2.0.8-alpha.2",
+  "version": "2.0.8-alpha.20",
   "description": "This middleware delegates authentication to an external service",
   "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/routr#readme",
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@fonoster/logger": "0.3.18",
-    "@grpc/grpc-js": "^1.5.9",
+    "@grpc/grpc-js": "^1.8.4",
     "@opentelemetry/api": "^1.0.4",
     "@opentelemetry/exporter-jaeger": "^1.0.4",
     "@opentelemetry/instrumentation": "^0.27.0",
@@ -29,8 +29,8 @@
     "@opentelemetry/sdk-trace-base": "^1.0.4",
     "@opentelemetry/sdk-trace-node": "^1.0.4",
     "@opentelemetry/semantic-conventions": "^1.0.4",
-    "@routr/common": "^2.0.8-alpha.2",
-    "@routr/processor": "^2.0.8-alpha.2",
+    "@routr/common": "^2.0.8-alpha.20",
+    "@routr/processor": "^2.0.8-alpha.20",
     "google-protobuf": "^3.9.2"
   },
   "files": [
@@ -46,5 +46,5 @@
   "bugs": {
     "url": "https://github.com/fonoster/routr/issues"
   },
-  "gitHead": "28ab976b0ef8b5cd34e278ea6fda13c518d7d052"
+  "gitHead": "a22ee8342d03f5dfe46fddba89ffe3e6d0d5deb6"
 }

package/dist/utils.d.ts

@@ -1,19 +0,0 @@
-import { User } from "./types";
-export declare const getCredentials: (username: string, users: User[]) => User;
-export declare const createUnauthorizedResponse: (realm: string, params?: {
-    qop: string;
-    algorithm: string;
-}) => {
-    message: {
-        responseType: number;
-        wwwAuthenticate: {
-            scheme: string;
-            realm: string;
-            qop: string;
-            opaque: string;
-            stale: boolean;
-            nonce: string;
-            algorithm: string;
-        };
-    };
-};

package/dist/utils.js

@@ -1,42 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createUnauthorizedResponse = exports.getCredentials = void 0;
-/*
- * Copyright (C) 2022 by Fonoster Inc (https://fonoster.com)
- * http://github.com/fonoster/routr
- *
- * This file is part of Routr
- *
- * 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("@routr/common");
-const getCredentials = (username, users) => users.find((user) => user.username === username);
-exports.getCredentials = getCredentials;
-const createUnauthorizedResponse = (realm, params = { qop: "auth", algorithm: "MD5" }) => {
-    return {
-        message: {
-            // UNAUTHORIZED CODE
-            responseType: 17,
-            wwwAuthenticate: {
-                scheme: "Digest",
-                realm: realm,
-                qop: params.qop,
-                opaque: "",
-                stale: false,
-                nonce: (0, common_1.generateNonce)(),
-                algorithm: params.algorithm
-            }
-        }
-    };
-};
-exports.createUnauthorizedResponse = createUnauthorizedResponse;