Skip to content

Commit a4d760a

Browse files
dschomdschom
authored
Merge pull request #19953 from mozilla/feat(auth-server)-add-new-headers
feat(auth-server): add new headers
2 parents fccbab1 + 6dd5e8c commit a4d760a

9 files changed

Lines changed: 108 additions & 0 deletions

File tree

‎packages/fxa-auth-server/lib/log.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,8 @@ Lug.prototype.summary = function (request, response) {
149149
path: request.path,
150150
lang: request.app.acceptLanguage,
151151
agent: request.headers['user-agent'],
152+
sigsciRequestId: request.headers['x-sigsci-requestid'],
153+
clientJa4: request.headers['client-ja4'],
152154
remoteAddressChain: request.app.remoteAddressChain,
153155
accountRecreated: request.app.accountRecreated,
154156
t: Date.now() - request.info.received,

‎packages/fxa-auth-server/lib/metrics/events.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,8 @@ module.exports = (log, config, glean) => {
202202
event,
203203
region: location && location.state,
204204
userAgent: request.headers['user-agent'],
205+
sigsciRequestId: request.headers['x-sigsci-requestid'],
206+
clientJa4: request.headers['client-ja4'],
205207
},
206208
data
207209
);
@@ -225,6 +227,8 @@ module.exports = (log, config, glean) => {
225227
locale: request.app && request.app.locale,
226228
region: location && location.state,
227229
userAgent: request.headers['user-agent'],
230+
sigsciRequestId: request.headers['x-sigsci-requestid'],
231+
clientJa4: request.headers['client-ja4'],
228232
})
229233
.then((data) => {
230234
if (data.flow_id) {

‎packages/fxa-auth-server/test/local/devices.js‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,8 @@ describe('lib/devices:', () => {
385385
region: 'California',
386386
service: undefined,
387387
userAgent: 'test user-agent',
388+
sigsciRequestId: 'test-sigsci-id',
389+
clientJa4: 'test-ja4',
388390
uid: credentials.uid,
389391
device_id: deviceId,
390392
is_placeholder: false,
@@ -572,6 +574,8 @@ describe('lib/devices:', () => {
572574
region: 'California',
573575
service: undefined,
574576
userAgent: 'test user-agent',
577+
sigsciRequestId: 'test-sigsci-id',
578+
clientJa4: 'test-ja4',
575579
uid: credentials.uid,
576580
device_id: deviceId,
577581
is_placeholder: false,
@@ -660,6 +664,8 @@ describe('lib/devices:', () => {
660664
region: 'California',
661665
service: undefined,
662666
userAgent: 'test user-agent',
667+
sigsciRequestId: 'test-sigsci-id',
668+
clientJa4: 'test-ja4',
663669
uid: credentials.uid,
664670
device_id: deviceId,
665671
is_placeholder: false,
@@ -834,6 +840,8 @@ describe('lib/devices:', () => {
834840
region: 'California',
835841
service: undefined,
836842
userAgent: 'test user-agent',
843+
sigsciRequestId: 'test-sigsci-id',
844+
clientJa4: 'test-ja4',
837845
uid: credentials.uid,
838846
device_id: deviceId,
839847
is_placeholder: false,
@@ -927,6 +935,8 @@ describe('lib/devices:', () => {
927935
region: 'California',
928936
service: undefined,
929937
userAgent: 'test user-agent',
938+
sigsciRequestId: 'test-sigsci-id',
939+
clientJa4: 'test-ja4',
930940
uid: request.auth.credentials.uid,
931941
device_id: deviceId,
932942
},

‎packages/fxa-auth-server/test/local/metrics/events.js‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,8 @@ describe('metrics/events', () => {
122122
const request = mocks.mockRequest({
123123
headers: {
124124
'user-agent': 'foo',
125+
'x-sigsci-requestid': 'test-sigsci-id',
126+
'client-ja4': 'test-ja4',
125127
},
126128
metricsContext,
127129
query: {
@@ -148,6 +150,8 @@ describe('metrics/events', () => {
148150
userAgent: 'foo',
149151
service: 'bar',
150152
uid: 'baz',
153+
sigsciRequestId: 'test-sigsci-id',
154+
clientJa4: 'test-ja4',
151155
},
152156
'argument was event data'
153157
);
@@ -208,6 +212,8 @@ describe('metrics/events', () => {
208212
region: 'California',
209213
userAgent: 'test user-agent',
210214
service: 'bar',
215+
sigsciRequestId: 'test-sigsci-id',
216+
clientJa4: 'test-ja4',
211217
},
212218
'argument was event data'
213219
);
@@ -252,6 +258,8 @@ describe('metrics/events', () => {
252258
region: 'California',
253259
service: undefined,
254260
userAgent: 'test user-agent',
261+
sigsciRequestId: 'test-sigsci-id',
262+
clientJa4: 'test-ja4',
255263
},
256264
'argument was event data'
257265
);
@@ -367,6 +375,8 @@ describe('metrics/events', () => {
367375
utm_medium: 'utm medium',
368376
utm_source: 'utm source',
369377
utm_term: 'utm term',
378+
sigsciRequestId: 'test-sigsci-id',
379+
clientJa4: 'test-ja4',
370380
},
371381
'argument was event data'
372382
);
@@ -416,6 +426,8 @@ describe('metrics/events', () => {
416426
headers: {
417427
dnt: '1',
418428
'user-agent': 'foo',
429+
'x-sigsci-requestid': 'test-sigsci-id',
430+
'client-ja4': 'test-ja4',
419431
},
420432
payload: {
421433
metricsContext: {
@@ -455,6 +467,8 @@ describe('metrics/events', () => {
455467
region: 'Dorset',
456468
time,
457469
userAgent: 'foo',
470+
sigsciRequestId: 'test-sigsci-id',
471+
clientJa4: 'test-ja4',
458472
},
459473
'argument was event data'
460474
);
@@ -489,6 +503,8 @@ describe('metrics/events', () => {
489503
headers: {
490504
dnt: '1',
491505
'user-agent': 'test user-agent',
506+
'x-sigsci-requestid': 'test-sigsci-id',
507+
'client-ja4': 'test-ja4',
492508
},
493509
metricsContext,
494510
payload: {
@@ -530,6 +546,8 @@ describe('metrics/events', () => {
530546
time,
531547
uid: 'deadbeef',
532548
userAgent: 'test user-agent',
549+
sigsciRequestId: 'test-sigsci-id',
550+
clientJa4: 'test-ja4',
533551
},
534552
'argument was event data'
535553
);
@@ -564,6 +582,8 @@ describe('metrics/events', () => {
564582
headers: {
565583
dnt: '1',
566584
'user-agent': 'test user-agent',
585+
'x-sigsci-requestid': 'test-sigsci-id',
586+
'client-ja4': 'test-ja4',
567587
},
568588
metricsContext,
569589
payload: {
@@ -605,6 +625,8 @@ describe('metrics/events', () => {
605625
time,
606626
uid: 'deadbeef',
607627
userAgent: 'test user-agent',
628+
sigsciRequestId: 'test-sigsci-id',
629+
clientJa4: 'test-ja4',
608630
},
609631
'argument was event data'
610632
);
@@ -639,6 +661,8 @@ describe('metrics/events', () => {
639661
headers: {
640662
dnt: '1',
641663
'user-agent': 'test user-agent',
664+
'x-sigsci-requestid': 'test-sigsci-id',
665+
'client-ja4': 'test-ja4',
642666
},
643667
metricsContext,
644668
payload: {
@@ -679,6 +703,8 @@ describe('metrics/events', () => {
679703
region: 'California',
680704
time,
681705
userAgent: 'test user-agent',
706+
sigsciRequestId: 'test-sigsci-id',
707+
clientJa4: 'test-ja4',
682708
},
683709
'argument was event data'
684710
);
@@ -713,6 +739,8 @@ describe('metrics/events', () => {
713739
headers: {
714740
dnt: '1',
715741
'user-agent': 'test user-agent',
742+
'x-sigsci-requestid': 'test-sigsci-id',
743+
'client-ja4': 'test-ja4',
716744
},
717745
locale: 'fr',
718746
metricsContext,
@@ -754,6 +782,8 @@ describe('metrics/events', () => {
754782
time,
755783
uid: 'qux',
756784
userAgent: 'test user-agent',
785+
sigsciRequestId: 'test-sigsci-id',
786+
clientJa4: 'test-ja4',
757787
},
758788
'argument was event data first time'
759789
);
@@ -772,6 +802,8 @@ describe('metrics/events', () => {
772802
time,
773803
uid: 'qux',
774804
userAgent: 'test user-agent',
805+
sigsciRequestId: 'test-sigsci-id',
806+
clientJa4: 'test-ja4',
775807
},
776808
'argument was complete event data second time'
777809
);
@@ -927,6 +959,8 @@ describe('metrics/events', () => {
927959
headers: {
928960
dnt: '1',
929961
'user-agent': 'test user-agent',
962+
'x-sigsci-requestid': 'test-sigsci-id',
963+
'client-ja4': 'test-ja4',
930964
},
931965
metricsContext,
932966
payload: {
@@ -956,6 +990,8 @@ describe('metrics/events', () => {
956990
userAgent: 'test user-agent',
957991
service: undefined,
958992
uid: 'baz',
993+
sigsciRequestId: 'test-sigsci-id',
994+
clientJa4: 'test-ja4',
959995
},
960996
'activity event data was correct'
961997
);
@@ -986,6 +1022,8 @@ describe('metrics/events', () => {
9861022
region: 'California',
9871023
uid: 'baz',
9881024
userAgent: 'test user-agent',
1025+
sigsciRequestId: 'test-sigsci-id',
1026+
clientJa4: 'test-ja4',
9891027
},
9901028
'flow event data was correct'
9911029
);
@@ -1255,6 +1293,8 @@ describe('metrics/events', () => {
12551293
headers: {
12561294
dnt: '1',
12571295
'user-agent': 'test user-agent',
1296+
'x-sigsci-requestid': 'test-sigsci-id',
1297+
'client-ja4': 'test-ja4',
12581298
},
12591299
metricsContext,
12601300
path: '/v1/account/create',
@@ -1302,6 +1342,8 @@ describe('metrics/events', () => {
13021342
region: 'California',
13031343
time,
13041344
userAgent: 'test user-agent',
1345+
sigsciRequestId: 'test-sigsci-id',
1346+
clientJa4: 'test-ja4',
13051347
},
13061348
'argument was route summary event data'
13071349
);
@@ -1326,6 +1368,8 @@ describe('metrics/events', () => {
13261368
region: 'California',
13271369
time,
13281370
userAgent: 'test user-agent',
1371+
sigsciRequestId: 'test-sigsci-id',
1372+
clientJa4: 'test-ja4',
13291373
},
13301374
'argument was performance event data'
13311375
);
@@ -1355,6 +1399,8 @@ describe('metrics/events', () => {
13551399
headers: {
13561400
dnt: '1',
13571401
'user-agent': 'test user-agent',
1402+
'x-sigsci-requestid': 'test-sigsci-id',
1403+
'client-ja4': 'test-ja4',
13581404
},
13591405
metricsContext,
13601406
path: '/v1/account/login',
@@ -1393,6 +1439,8 @@ describe('metrics/events', () => {
13931439
region: 'California',
13941440
time,
13951441
userAgent: 'test user-agent',
1442+
sigsciRequestId: 'test-sigsci-id',
1443+
clientJa4: 'test-ja4',
13961444
},
13971445
'argument was event data'
13981446
);
@@ -1422,6 +1470,8 @@ describe('metrics/events', () => {
14221470
headers: {
14231471
dnt: '1',
14241472
'user-agent': 'test user-agent',
1473+
'x-sigsci-requestid': 'test-sigsci-id',
1474+
'client-ja4': 'test-ja4',
14251475
},
14261476
metricsContext,
14271477
path: '/v1/recovery_email/resend_code',
@@ -1460,6 +1510,8 @@ describe('metrics/events', () => {
14601510
region: 'California',
14611511
time,
14621512
userAgent: 'test user-agent',
1513+
sigsciRequestId: 'test-sigsci-id',
1514+
clientJa4: 'test-ja4',
14631515
},
14641516
'argument was event data'
14651517
);
@@ -1489,6 +1541,8 @@ describe('metrics/events', () => {
14891541
headers: {
14901542
dnt: '1',
14911543
'user-agent': 'test user-agent',
1544+
'x-sigsci-requestid': 'test-sigsci-id',
1545+
'client-ja4': 'test-ja4',
14921546
},
14931547
metricsContext,
14941548
path: '/v1/recovery_email/resend_code',
@@ -1537,6 +1591,8 @@ describe('metrics/events', () => {
15371591
headers: {
15381592
dnt: '1',
15391593
'user-agent': 'test user-agent',
1594+
'x-sigsci-requestid': 'test-sigsci-id',
1595+
'client-ja4': 'test-ja4',
15401596
},
15411597
metricsContext,
15421598
path: '/v1/account/destroy',
@@ -1575,6 +1631,8 @@ describe('metrics/events', () => {
15751631
region: 'California',
15761632
time,
15771633
userAgent: 'test user-agent',
1634+
sigsciRequestId: 'test-sigsci-id',
1635+
clientJa4: 'test-ja4',
15781636
},
15791637
'argument was event data'
15801638
);

0 commit comments

Comments
 (0)