Skip to content

Commit 1e921b6

Browse files
adg-flareLukaAvbreht
authored andcommitted
fix(7f6e476e-M-24): Web2json: remove REQUEST-scoped User-Agent forwarding; keep outbound headers from requestBody only
1 parent ccfc974 commit 1e921b6

3 files changed

Lines changed: 1 addition & 20 deletions

File tree

src/services/web2-json-verifier.service.ts

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
1-
import {
2-
HttpException,
3-
HttpStatus,
4-
Inject,
5-
Injectable,
6-
Logger,
7-
} from '@nestjs/common';
1+
import { HttpException, HttpStatus, Injectable, Logger } from '@nestjs/common';
82
import { ConfigService } from '@nestjs/config';
93
import {
104
AttestationResponseDTO_Web2Json_Response,
@@ -20,8 +14,6 @@ import { verifyWeb2Json } from '../verification/web-2-json/web2-json-verificatio
2014
import { BaseVerifierService } from './common/verifier-base.service';
2115
import { Web2JsonConfig } from 'src/config/interfaces/web2-json';
2216
import { IConfig } from 'src/config/interfaces/common';
23-
import { REQUEST } from '@nestjs/core';
24-
import { Request } from 'express';
2517
import { ProcessPoolService } from '../verification/web-2-json/process-pool.service';
2618
import {
2719
BackpressureException,
@@ -41,7 +33,6 @@ export class Web2JsonVerifierService extends BaseVerifierService<
4133
constructor(
4234
protected configService: ConfigService<IConfig>,
4335
private readonly processPool: ProcessPoolService,
44-
@Inject(REQUEST) private readonly req: Request,
4536
) {
4637
super(configService, 'Web2Json', VerifierType.Web2);
4738
this.web2JsonConfig = this.configService.get('web2JsonConfig');
@@ -85,16 +76,13 @@ export class Web2JsonVerifierService extends BaseVerifierService<
8576
throw new BackpressureException();
8677
}
8778

88-
// store user-agent if available
89-
const userAgent: string = this.req.headers['user-agent'] || undefined;
9079
const sourceConfig = this.web2JsonConfig.sources.find(
9180
(s) => encodeAttestationName(s.sourceId) === fixedRequest.sourceId,
9281
);
9382
const result = await verifyWeb2Json(
9483
fixedRequest,
9584
this.web2JsonConfig.securityParams,
9685
sourceConfig,
97-
userAgent,
9886
this.processPool,
9987
);
10088
this.logger.debug(

src/verification/web-2-json/validate-request.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ export async function parseAndValidateRequest(
3636
request: Web2Json_Request,
3737
securityParams: Web2JsonSecurityParams,
3838
source: Web2JsonSource,
39-
userAgent: string,
4039
) {
4140
const requestBody = request.requestBody;
4241
let parsedUrl: URL;
@@ -56,10 +55,6 @@ export async function parseAndValidateRequest(
5655
securityParams.maxHeaders,
5756
AttestationResponseStatus.INVALID_HEADERS,
5857
) ?? {};
59-
// forward user-agent
60-
if (userAgent) {
61-
sourceHeaders['User-Agent'] = userAgent;
62-
}
6358
// validate query params
6459
const sourceQueryParams =
6560
parseJsonWithDepthAndKeysValidation(

src/verification/web-2-json/web2-json-verifications.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,13 @@ export async function verifyWeb2Json(
4444
request: Web2Json_Request,
4545
securityParams: Web2JsonSecurityParams,
4646
source: Web2JsonSource,
47-
userAgent: string | undefined,
4847
workerPool: ProcessPoolService,
4948
): Promise<VerificationResponse<Web2Json_Response>> {
5049
try {
5150
const parsedRequest = await parseAndValidateRequest(
5251
request,
5352
securityParams,
5453
source,
55-
userAgent,
5654
);
5755

5856
const sourceResponse = await executeRequest(

0 commit comments

Comments
 (0)