Compare commits

...
9 changed files with 77 additions and 10 deletions
+31
View File
@@ -4,6 +4,8 @@ charts:
values: values:
- ../maestro/values.yaml - ../maestro/values.yaml
set: set:
- name: app_name
value: maestro
- name: maestro.duc_url - name: maestro.duc_url
value: duc.dadosfera.ai value: duc.dadosfera.ai
- name: hostname - name: hostname
@@ -20,3 +22,32 @@ charts:
value: c0afdcce-c5be-40d0-9d1d-2d271121f14a value: c0afdcce-c5be-40d0-9d1d-2d271121f14a
- name: replicaCount - name: replicaCount
value: 2 value: 2
- name: unimed
chart: ../maestro
values:
- ../maestro/values.yaml
set:
- name: app_name
value: maestro-unimed
- name: maestro.duc_url
value: duc.dadosfera.ai
- name: hostname
value: maestro.dadosfera.ai
- name: maestro.pi_factory_url
value: pi-factory.dadosfera.ai
- name: maestro.in_factory_url
value: in-factory.dadosfera.ai
- name: maestro.tr_factory_url
value: in-factory.dadosfera.ai
- name: maestro.open_customer_id
value: b3e3dfe5-b992-4586-a73c-c0b0c00f615d
- name: maestro.open_group_id
value: c0afdcce-c5be-40d0-9d1d-2d271121f14a
# Customer id
- name: maestro.dedicated_proxy
value: dea2c27f-0973-4588-a2e0-9e31b64c7ffd
- name: replicaCount
value: 1
- name: restricted-ip
value: "177.52.172.0/24"
+2
View File
@@ -48,3 +48,5 @@ charts:
value: 14d52fd4-d83d-4cdd-be34-bf11cc28b3bd value: 14d52fd4-d83d-4cdd-be34-bf11cc28b3bd
- name: replicaCount - name: replicaCount
value: 1 value: 1
- name: maestro.restricted_ip
value: "57.151.113.140/30"
+2
View File
@@ -100,6 +100,8 @@ spec:
value: {{ .Values.maestro.open_customer_id }} value: {{ .Values.maestro.open_customer_id }}
- name: OPEN_GROUP_ID - name: OPEN_GROUP_ID
value: {{ .Values.maestro.open_group_id }} value: {{ .Values.maestro.open_group_id }}
- name: DEDICATED_PROXY
value: {{ .Values.maestro.dedicated_proxy }}
- name: JWT_PRIVATE_KEY - name: JWT_PRIVATE_KEY
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
+4
View File
@@ -11,7 +11,11 @@ metadata:
generation: 1 generation: 1
labels: labels:
app: {{ .Values.app_name }} app: {{ .Values.app_name }}
{{- if .Values.maestro.dedicated_proxy}}
name: open-data-{{ .Values.app_name }}
{{- else }}
name: open-data name: open-data
{{- end }}
namespace: applications namespace: applications
spec: spec:
ingressClassName: nginx ingressClassName: nginx
+6
View File
@@ -3,9 +3,15 @@ kind: Ingress
metadata: metadata:
annotations: annotations:
nginx.ingress.kubernetes.io/proxy-body-size: "0" nginx.ingress.kubernetes.io/proxy-body-size: "0"
nginx.ingress.kubernetes.io/proxy-read-timeout: "300"
nginx.ingress.kubernetes.io/proxy-connect-timeout: "300"
nginx.ingress.kubernetes.io/proxy-send-timeout: "300"
nginx.ingress.kubernetes.io/server-snippet: | nginx.ingress.kubernetes.io/server-snippet: |
underscores_in_headers on; underscores_in_headers on;
ignore_invalid_headers on; ignore_invalid_headers on;
{{- if .Values.maestro.restricted_ip}}
nginx.ingress.kubernetes.io/whitelist-source-range: {{ .Values.maestro.restricted_ip }}
{{- end }}
generation: 1 generation: 1
labels: labels:
+1
View File
@@ -44,6 +44,7 @@ maestro:
open_customer_id: f239718a-a271-4ef9-ae7e-02a2f0f3aa6e open_customer_id: f239718a-a271-4ef9-ae7e-02a2f0f3aa6e
open_group_id: 401573bb-334f-44b2-b30e-88d4cea31ae9 open_group_id: 401573bb-334f-44b2-b30e-88d4cea31ae9
dedicated_proxy: "" dedicated_proxy: ""
restricted_ip: ""
autoscaling: autoscaling:
enabled: false enabled: false
minReplicas: 1 minReplicas: 1
@@ -4,6 +4,7 @@ import {
OnApplicationBootstrap, OnApplicationBootstrap,
ExecutionContext, ExecutionContext,
Inject, Inject,
ForbiddenException,
} from '@nestjs/common'; } from '@nestjs/common';
import { Reflector } from '@nestjs/core'; import { Reflector } from '@nestjs/core';
import assert from 'assert'; import assert from 'assert';
@@ -113,6 +114,18 @@ export class AuthenticationGuard
return false; return false;
} }
// Bloquear outros customer de usar o maestor dedicado
const DEDICATED_PROXY = process.env.DEDICATED_PROXY || '';
if (DEDICATED_PROXY !== '' && DEDICATED_PROXY !== accessTokenPayload.customer_id) {
throw new ErrorBuilder(ErrorCodes.AUTH.FORBIDDEN);
}
// Bloquear o customer de acesso o maestro publico
// const hasNetworkPolicyModule = accessTokenPayload.customer_modules.includes('network-policy');
// if (hasNetworkPolicyModule && DEDICATED_PROXY === '') {
// throw new ForbiddenException();
// }
request.accessTokenPayload = accessTokenPayload; request.accessTokenPayload = accessTokenPayload;
request.user = { request.user = {
user_id: accessTokenPayload.user_id, user_id: accessTokenPayload.user_id,
+15 -7
View File
@@ -54,14 +54,22 @@ export class AuthClientService implements OnModuleInit {
return lastValueFrom(this.authService.AuthSnowflakeSignIn(input)); return lastValueFrom(this.authService.AuthSnowflakeSignIn(input));
} }
checkDedicatedProxy(customerId: string) { checkDedicatedProxy({
customer
}: AuthSignInResponse) {
const DEDICATED_PROXY = process.env.DEDICATED_PROXY || ''; const DEDICATED_PROXY = process.env.DEDICATED_PROXY || '';
this.logger.info('SignIn - Setting customer ID for dedicated proxy: ' + DEDICATED_PROXY); this.logger.info('SignIn - Setting customer ID for dedicated proxy: ' + DEDICATED_PROXY);
if (DEDICATED_PROXY !== '') { this.logger.info('Customer ID: ' + customer.id);
this.logger.info('Customer ID: ' + customerId);
if (DEDICATED_PROXY !== customerId) { if (DEDICATED_PROXY !== '' && DEDICATED_PROXY !== customer.id) {
throw new ForbiddenException(); throw new ForbiddenException();
} }
// Bloquear o customer de acesso o maestro publico
this.logger.info('Check if customer have network policy: ' + customer.modules);
const hasNetworkPolicyModule = customer.modules.includes('network-policy');
if (hasNetworkPolicyModule && DEDICATED_PROXY === '') {
throw new ForbiddenException();
} }
} }
@@ -85,7 +93,7 @@ export class AuthClientService implements OnModuleInit {
} }
if (result.customer) { if (result.customer) {
this.checkDedicatedProxy(result.customer.id); this.checkDedicatedProxy(result);
} }
return result return result
+2 -2
View File
@@ -22,7 +22,7 @@ export class PDFParser<T> implements Parser<T> {
const html = await this.htmlParser.parse(data); const html = await this.htmlParser.parse(data);
await page.setContent(html, { await page.setContent(html, {
waitUntil: 'networkidle0', waitUntil: 'networkidle0',
timeout: 30000, timeout: 90000,
}); });
// Configurações adicionais para garantir um PDF válido // Configurações adicionais para garantir um PDF válido
@@ -43,7 +43,7 @@ export class PDFParser<T> implements Parser<T> {
pageRanges: '', pageRanges: '',
tagged: true, tagged: true,
outline: false, outline: false,
timeout: 30000, timeout: 90000,
}); });
await browser.close(); await browser.close();