Merge pull request #267 from dadosfera/fix/private-route

FIX: add ip range and domain list to route /open-data

docsfera.json

@@ -5489,14 +5489,6 @@
               "schema": {
                 "type": "string"
               }
-            },
-            {
-              "name": "origin",
-              "required": true,
-              "in": "header",
-              "schema": {
-                "type": "string"
-              }
             }
           ],
           "responses": {
@@ -5651,6 +5643,9 @@
             "name": {
               "type": "string"
             },
+            "displayName": {
+              "type": "string"
+            },
             "tier": {
               "type": "string"
             },
@@ -5671,6 +5666,7 @@
             "modules",
             "id",
             "name",
+            "displayName",
             "tier",
             "scheduleLimit",
             "links",

maestro/templates/ingress-private.yaml

@@ -2,7 +2,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   annotations:
-    nginx.ingress.kubernetes.io/whitelist-source-range: "69.49.241.121/32" # hostgator ip 
+    nginx.ingress.kubernetes.io/whitelist-source-range: "69.49.241.124/32" # hostgator ip 
     nginx.ingress.kubernetes.io/proxy-body-size: "0"
     nginx.ingress.kubernetes.io/server-snippet: |
       underscores_in_headers on;
@@ -11,7 +11,7 @@ metadata:
   generation: 1
   labels:
     app: maestro
-  name: open-data
+  name: maestro
   namespace: applications
 spec:
   ingressClassName: nginx

package-lock.json

@@ -12,7 +12,7 @@
         "@aws-sdk/client-secrets-manager": "^3.414.0",
         "@dadosfera/dadosfera-logs": "^1.0.0-beta.4",
         "@dadosfera/protospack": "2.5.3",
-        "@dadosfera/protospack-v2": "3.37.0-beta.7",
+        "@dadosfera/protospack-v2": "^3.37.0-beta.10 ",
         "@grpc/grpc-js": "^1.9.3",
         "@grpc/proto-loader": "^0.7.9",
         "@nestjs/cli": "^9.5.0",
@@ -1298,9 +1298,9 @@
       }
     },
     "node_modules/@dadosfera/protospack-v2": {
-      "version": "3.37.0-beta.7",
-      "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.37.0-beta.7.tgz",
-      "integrity": "sha512-XGaDw6mICM1/qI0ZfQZaWpRHmAaOi3ufIUmrpfsTiW40oeWGW+DLLAsmbACgt34j4cpJ5Yt0AURsXagtmUgBmw==",
+      "version": "3.37.0-beta.10",
+      "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.37.0-beta.10.tgz",
+      "integrity": "sha512-nKSu9VpOPFSTeX0yN4aEY0HjvGxgbLPYXl217NHgLm+a/+i01USDaxjwIOqP5hhDvhnMNaiCq5awiQTYbhF/7A==",
       "license": "ISC",
       "dependencies": {
         "@grpc/grpc-js": "^1.9.3",

package.json

@@ -30,7 +30,7 @@
     "@aws-sdk/client-secrets-manager": "^3.414.0",
     "@dadosfera/dadosfera-logs": "^1.0.0-beta.4",
     "@dadosfera/protospack": "2.5.3",
-    "@dadosfera/protospack-v2": "3.37.0-beta.7",
+    "@dadosfera/protospack-v2": "^3.37.0-beta.10 ",
     "@grpc/grpc-js": "^1.9.3",
     "@grpc/proto-loader": "^0.7.9",
     "@nestjs/cli": "^9.5.0",

src/modules/auth/dtos/login.ts

@@ -72,6 +72,8 @@ export class AuthCustomer {
   @ApiProperty()
   name: string;
   @ApiProperty()
+  displayName: string;
+  @ApiProperty()
   tier: string;
   @ApiProperty()
   scheduleLimit: string;

src/modules/open-data/open-data.controller.ts

@@ -1,5 +1,5 @@
 import DadosferaLogger from '@dadosfera/dadosfera-logs';
-import { Body, Controller, ForbiddenException, Header, Headers, HttpCode, HttpException, Inject, Param, Post, Query, Req, Res, UseFilters, UseGuards, UseInterceptors } from '@nestjs/common';
+import { Body, Controller, ForbiddenException, Header, HttpCode, HttpException, Inject, Param, Post, Query, Req, UseFilters, UseGuards, UseInterceptors } from '@nestjs/common';
 import { ApiCreatedResponse, ApiHeaders, ApiOkResponse, ApiTags } from '@nestjs/swagger';
 import { ApiInternalOnlyController } from 'src/decorators/swagger.decorator';
 import { GrpcToHttpExceptionFilter } from 'src/error/grpc-to-http-exception.filter';
@@ -40,14 +40,14 @@ export class OpenDataController {
     language: string,
     @Req()
     request: Request,
-    @Headers('origin')
-    origin: string
   ) {
-    this.logger.info('createUser for open data' + JSON.stringify(request.headers));
+    this.logger.info('createUser for open data');
 
+    this.logger.info('user-agent', request.headers);
+
+    const origin = request.headers['origin'];
     const corslist = ["https://devsbm.dadosfera.io", "https://sharingoceandata.com"];
     if (!corslist.includes(origin)) {
-      this.logger.info('block request by cors list: '+ origin);
       throw new ForbiddenException();
     }