Skip to content

Commit af56bb5

Browse files
authored
fix(backend): add anon data for logs (#3875)
1 parent 4316688 commit af56bb5

19 files changed

+385
-26
lines changed

.kontinuous/env/dev/templates/backend.sealed-secret.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
DOMIFA_MAIL_SMTP_TIPIMAIL_USER: >-
1616
AgC50XdpTvnpy7XLhDt6AqJDtpV5iKhg4pRnrQ3upidyOAyD4nLIxIExsuUCbAssC+SYg90qYtQWJ08cN6LeukOz2xOE8WDyzxOqK/B/XW9n2GnT66T8xaniuKfqkmKqFHolaxUCl6byYWjZlVwz8IbHb93CkwbVEAMe/3ZndDHzFikkvJJIA78NtFtAcOv/vuA/aR1qD/PfSCssxonfjqLmExhNCEKyKZrAOTuu91jzbOU3LqzOS0XAl2aPqyjqQzpAKnHINvJbaqbPLEqgS8nFenKjSTFjdHQVrHW8KL+mNHkw7Vcfn0yu3Az0QZxz/qoUWr85F6hz5f0B9s2nSYMvEORDh9hOahfQ432TnApbcuD9oKAK9k8OZD4uxVHtEhH/0NWYEXJf3eds7HICfiKDW3OuFq/FxzEHvJEeX2k9EyL5qhedDXdKM55/wAyWmM2wCx3Uvj4NxZrzajFy6Ssrq2YpsfDE4XWYkvzaMMXfzRCYEE1XWty+BdFlibwfPSMj2RoTKu2RxN6frIksbWDLNwGiRg+CW+FDQszszZO0WEBTvMLQ5/s/foselRxR3Z+T5qbd3w+WvtBJSQ/+JZZJ/VnzwJDvg3WdBD7EDGxjkgGsRp8B/KE2aaYpW3Rp5n6439zTHSMDVJFoqtaYK16ZsPIP51mZU5UHlpzy7d4is72YCRKu8ahq8iDXfB12V8HfNskGYX4H0tei4AFgqLWK36RA3Agc617KCTDDnLvb4Q==
1717
DOMIFA_MAIL_SMTP_TIPIMAIL_PASSWORD: >-
18-
AgCqXU9dzG+RCr7AhZHXrph+s0Ij1H50uzBplnn2qk5o3WjrTjiB0tpgtPUH+uPqgC4oSOrHeWVssNgx+Aw8u4FeASBu+dYpq+UV8F7B4pK1Km6a0seBcAL819BIeiAMZWS5P2PpwLeXElW5GGhS/LBOKgE4C9KAU6RPV1GMi8ySHOexhHzYOu4MHevlNV7gnzdbTmeI8M5NwKw5UyJkWqEZ+A1KAdBduDTDhX5mzivgivXe6nsm/XbXPic/XLjYsROMfVyyLEbskeqV6cTOH7xMvPX4i5ee50keO95nUQdhZt4ldh+gIbe7wTIkaC9paflSqRjMMIb5kCvDuOhHjOIEwAYWXBkNZWjzr+ymAgoj9LZWgJm+i3B9XZOxvcxYbiwK8jlYjapYUoz2AT+ExdKAkSukusfW2qe2ZHsZdHYklZzzw8jXLbt0LrAt/QKaaWbEWIFk76iD+bpbiUP3t205jDU/9MSihBLa/uLiOG8Z93ZwNQ5fUkW1Nj6kZjmZAiwYTS7OXIOWAvwj4jfFNaeRq2s8mj4IYiGap9eax3UEC2bDUYLFWHOsGofG2Hypc8wfLurkUGgWXmrJq9v83P+6u9vTNlHvhIHz010SGaSKctFihWyuoQFVfHFG9gMWKnV3qHu0g3GlwbrturjYlKQf9dQSYqUedzl3Lh+DHlVcmpE+BpkSdnTE7dmtlEkfeASMmtQ5Z+3Z9TsJaf0B5y5no9mcYMm2vtGKY2WgR3pW4w==
18+
AgB5GN2ae1OSDuiVndPqR9mWeyGXWRPiXBUr6/X9i7X4yvdHVk2WObtbPNW00MXwnzIAaC88a5SbWwwR2ciVlLNa926zCu8wECMlbCTnLTLqwZhPFCsk4D3vYFN2XdK3eXZ1Hdd2bLTFX1kQCz1jDS8/o+2x8+ceTXpKQwCVLO1VsDG49mctpDppp3CG4AxUY9BNg+S1DeuDiVVgLQFzWU/p4DfbQ7VgnQtEqskH30Nq9eJH0Cm6/cGNKat4OD9stdz4Vt8G6H3x2rlBmuLgCcJXX9t8jMc4lAYdW+VLIFTYPBRfH3xZ24T97ckGEolEs0jr5KnOXUEqf1DSByAqgXUebNIbgOEkGxMjVGQExPqE8uOIUy+JBQ3susE/nnFOSBglh0KAim3UYdvRmmdQyr6Z8MNrk5uuYRUsO6q0+EwV+5zEg1vXaMOLgiPw8q5jI/TznFc+PgTtFCUPxLwEnlFL9PWtL8VpwX0pXUDpP4ppcvDvQtw7SLA2ojgMaEWO05yWUDFiYUp+hNs+oG4kFBBPYE8VxNQNhq6L9JUtluHot6M+ySM2AZAX4ikZqB4XY7LLAcuQIN7fjHOgSoKRLNof+DIAFQQaDpU0L6mym6wzl/b9rjd+dfbu4es5Gyq58Q27J2Si1h3gpCf5vjg3b7YFqw5eukBH46pA2eV4vPDu8bhXbfUOJ/Z5djnAdmjzszIT+anXjUKvZaCh51WrJa0t8oXwt085GT2X/4rVzhi3CQ==
1919
DOMIFA_ERROR_REPORT_EMAILS: >-
2020
AgDGA3da8Ua+HCrJ48PpgF0GDSPtoNB42ninGpwCKlANgje0DsW4qjaQ2RHltt9ZFcPF07j/oLkXPGm1JwMlAodH38dDc39HjG8M1SIUQuG2+rS7AqlVqUtCYz/POhor+WOf+ZPI2Cy5ucREEGmZwHvjWm30KsckWYVTS4o9WOKaX11Xd0uqnvr4ADSbtKJp+wGiirwZPRMPFhYBrJIFYs1BwdQmxG3Ha++licqw9d3iPWgOeGJUCE1yQ9Jvfnvqa3hiGADEfM85UEv8yc3/VQAULXNo/hdjhu4evazmGsqLes+ondQIi0wKMIfPOFbruihYAIt7lAzxcSrrKC9yDr16b1Uv8wHpTu7dxrf6hMUePacJf9cihrAJEZuYe/YduLKE9YFPsC7tRfv/IJhGmRYZDGEDX+vDlgN+w4jMFJbarhOK+op3PXym1yzApzWng+UI8OEoCUjUWgqVKbQRy3uQivonCG1q6ytfNXcJviaTNwrZu8E65C/Xy5BmntNCe1JdFJv1QB8kolGPBovYQf1wdFLmZJ/z5dAs/qdnOhySp/Rp35shcEmor/3poCP2OqaNjjuiuOxJWOhaXY84YVnx5xhDB74qg/PU9n1xjACNqdsuJoWFVF0GSMwBJn3BLBfV/8OayS53vcUb1cQ/y/p0C03NEQMf/gHgVEu4KdWxBYfW6VhTrAN5myiXhu3j0CCAI4PhF31ADd5TRdJJ5wOWrZgXq2bJbU3MPy8ND2hoVHXTJZCRCNAgE+S4obwKfZ8Fl0AI7qclSKfYfA==
2121
DOMIFA_TIPIMAIL_FROM_EMAIL: >-

.talismanrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ fileignoreconfig:
22
- filename: .anonymizer/yarn.lock
33
checksum: adf574ab2b9fc5e21891b802504438b9f7738c8854047dbc7ca628cd3994ef5f
44
- filename: .kontinuous/env/dev/templates/backend.sealed-secret.yaml
5-
checksum: 029065f19d0c37b4e2de8dc5c29b7badc5823be28c63885470d2c363108eb5d2
5+
checksum: eb02b7f4930980a6ad41118a3cae40e682d3322d1a3eba9b19b17da72e321136
66
- filename: .kontinuous/env/preprod/templates/backend.sealed-secret.yaml
77
checksum: 08602bd330f851a3a7a62707623f154cf4e33d43c96087b85531fee32dad342e
88
- filename: _docs/dev/0.run-local-env.md
21 Bytes
Binary file not shown.

packages/backend/src/_common/model/app-log/LogAction.type.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
export type LogAction =
2+
| "USAGERS_DELETE"
3+
| "USAGERS_PHONE_UPDATE"
4+
| "USAGERS_PHONE_DELETE"
5+
| "USAGERS_EMAIL_UPDATE"
6+
| "USAGERS_EMAIL_DELETE"
27
// Docs
38
| "USAGERS_DOCS_UPLOAD"
49
| "USAGERS_DOCS_DOWNLOAD"
@@ -48,7 +53,6 @@ export type LogAction =
4853
| "ADMIN_PASSWORD_RESET"
4954
// deprecated
5055
| "SUPPRIMER_PIECE_JOINTE"
51-
| "SUPPRIMER_DOMICILIE"
5256
| "RESET_PASSWORD_PORTAIL"
5357
| "DOWNLOAD_PASSWORD_PORTAIL"
5458
| "DELETE_NOTE"

packages/backend/src/_migrations/1755523274895-auto-migration.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,6 @@ export class AutoMigration1755523274895 implements MigrationInterface {
66
public async up(queryRunner: QueryRunner): Promise<void> {
77
console.log("🚀 Starting password type migration");
88

9-
// Ajout de la colonne passwordType
10-
await queryRunner.query(`
11-
ALTER TABLE "user_usager"
12-
ADD COLUMN "passwordType" text
13-
`);
14-
159
// Initial stats
1610
const initialStats = await queryRunner.query(`
1711
SELECT
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import { MigrationInterface, QueryRunner } from "typeorm";
2+
3+
export class ManualMigration1756117243337 implements MigrationInterface {
4+
public async up(queryRunner: QueryRunner): Promise<void> {
5+
await queryRunner.query(`
6+
UPDATE app_log
7+
SET action = 'USAGER_DELETE'
8+
WHERE action = 'SUPPRIMER_DOMICILIE'
9+
`);
10+
}
11+
12+
public async down(queryRunner: QueryRunner): Promise<void> {
13+
await queryRunner.query(`
14+
UPDATE app_log
15+
SET action = 'SUPPRIMER_DOMICILIE'
16+
WHERE action = 'USAGER_DELETE'
17+
`);
18+
}
19+
}

packages/backend/src/config/domifaConfig.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import {
1010
DOMIFA_ENV_IDS,
1111
} from "./model";
1212
import { configParser } from "./services/configParser.service";
13-
import SMTPTransport = require("nodemailer/lib/smtp-transport");
1413
import { join } from "path";
14+
import SMTPTransport from "nodemailer/lib/smtp-transport";
1515

1616
let _domifaConfig: DomifaConfig;
1717

packages/backend/src/modules/mails/services/_core/smtpSender.service.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { HttpException, HttpStatus } from "@nestjs/common";
22
import { createTransport, SendMailOptions } from "nodemailer";
33

44
import { mailRecipientsFilter } from "./mailRecipientsFilter.service";
5-
import Mail = require("nodemailer/lib/mailer");
5+
66
import { domifaConfig } from "../../../../config";
77
import {
88
MessageEmailContent,
@@ -12,6 +12,7 @@ import {
1212
MessageEmailRecipient,
1313
} from "../../../../database";
1414
import { appLogger } from "../../../../util";
15+
import Mail from "nodemailer/lib/mailer";
1516

1617
// create reusable transporter object using SMTP transport
1718

@@ -96,6 +97,7 @@ async function sendEmail(
9697
};
9798
return sendDetails;
9899
} catch (err) {
100+
console.log({ err });
99101
appLogger.warn(`[smtpSender] Error sending smtp message: : ${err}`, {
100102
sentry: true,
101103
});

packages/backend/src/open-telemetry.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1+
import "@opentelemetry/api";
12
import {
23
SentrySpanProcessor,
34
SentryPropagator,
45
} from "@sentry/opentelemetry-node";
56

6-
import * as opentelemetry from "@opentelemetry/sdk-node";
7-
import "@opentelemetry/api";
8-
97
// Warning: don't use @opentelemetry/auto-instrumentations-node as it uses far too much memory at the start of the process
108
import { HttpInstrumentation } from "@opentelemetry/instrumentation-http";
119
import { ExpressInstrumentation } from "@opentelemetry/instrumentation-express";
@@ -19,6 +17,7 @@ import { domifaConfig } from "./config";
1917
import { appLogger } from "./util";
2018
import { format } from "date-fns";
2119
import { captureMessage, init } from "@sentry/node";
20+
import { NodeSDK } from "@opentelemetry/sdk-node";
2221

2322
if (domifaConfig().dev.sentry.enabled) {
2423
init({
@@ -29,7 +28,7 @@ if (domifaConfig().dev.sentry.enabled) {
2928
profilesSampleRate: 1,
3029
});
3130

32-
const sdk = new opentelemetry.NodeSDK({
31+
const sdk = new NodeSDK({
3332
traceExporter: new OTLPTraceExporter(),
3433
instrumentations: [
3534
new HttpInstrumentation(),

packages/backend/src/usagers/controllers/tests/usagers.controller.spec.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ import { UsagersService, UsagerOptionsHistoryService } from "../../services";
1717
import { UsagerHistoryStateService } from "../../services/usagerHistoryState.service";
1818
import { FileManagerService } from "../../../util/file-manager/file-manager.service";
1919
import { Usager } from "@domifa/common";
20+
import { UsagersLogsService } from "../../services/usagers-logs.service";
21+
import { AppLogsModule } from "../../../modules/app-logs/app-logs.module";
2022

2123
const ENDPOINT = "/usagers";
2224

@@ -37,13 +39,19 @@ describe("Usagers Controller", () => {
3739
context = await AppTestHelper.bootstrapTestApp(
3840
{
3941
controllers: [UsagersController],
40-
imports: [UsagersModule, UsersModule, InteractionsModule],
42+
imports: [
43+
UsagersModule,
44+
UsersModule,
45+
InteractionsModule,
46+
AppLogsModule,
47+
],
4148
providers: [
4249
UsagersService,
4350
UsagerOptionsHistoryService,
4451
AppLogsService,
4552
UsagerHistoryStateService,
4653
FileManagerService,
54+
UsagersLogsService,
4755
],
4856
},
4957
{ initApp: true }

0 commit comments

Comments
 (0)