Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 54 additions & 0 deletions packages/fingerprint-generator/src/fingerprint-generator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,13 @@ export class FingerprintGenerator extends HeaderGenerator {

if (!fingerprint.screen) continue; // fix? sometimes, fingerprints are generated 90% empty/null. This is just a workaround.

fingerprint.screen = this.normalizeScreenFingerprint(
fingerprint.screen,
);

if (!this.isPlausibleScreenFingerprint(fingerprint.screen))
continue; // fix? sometimes, fingerprints are generated 90% empty/null. This is just a workaround.

// Manually add the set of accepted languages required by the input
const acceptLanguageHeaderValue =
'Accept-Language' in headers
Expand Down Expand Up @@ -352,4 +359,51 @@ export class FingerprintGenerator extends HeaderGenerator {
fonts,
} as Fingerprint;
}

private normalizeScreenFingerprint(
screen: ScreenFingerprint,
): ScreenFingerprint {
const outerWidth = screen.outerWidth || screen.width;
const outerHeight = screen.outerHeight || screen.height;
const innerWidth =
screen.innerWidth || Math.min(screen.width, outerWidth);
const innerHeight =
screen.innerHeight || Math.min(screen.availHeight, outerHeight);

return {
...screen,
outerWidth,
outerHeight,
innerWidth,
innerHeight,
clientWidth: screen.clientWidth || innerWidth,
clientHeight: screen.clientHeight || innerHeight,
};
}

private isPlausibleScreenFingerprint(screen: Partial<ScreenFingerprint>) {
const positiveViewportFields = [
screen.clientWidth,
screen.clientHeight,
screen.innerWidth,
screen.innerHeight,
screen.outerWidth,
screen.outerHeight,
];

if (
positiveViewportFields.some(
(value) => typeof value !== 'number' || value <= 0,
)
) {
return false;
}

return (
screen.clientWidth! <= screen.innerWidth! &&
screen.clientHeight! <= screen.innerHeight! &&
screen.innerWidth! <= screen.outerWidth! &&
screen.innerHeight! <= screen.outerHeight!
);
}
}
67 changes: 67 additions & 0 deletions test/fingerprint-generator/generation.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,73 @@ describe('Generation tests', () => {
expect(field).toBeDefined();
}
});

test('rejects generated fingerprints with impossible viewport dimensions', () => {
const {
fingerprint: { screen },
} = fingerprintGenerator.getFingerprint({
browsers: [{ name: 'chrome', minVersion: 100, maxVersion: 100 }],
devices: ['desktop'],
operatingSystems: ['macos'],
});
const isPlausibleScreenFingerprint = (
fingerprintGenerator as any
).isPlausibleScreenFingerprint.bind(fingerprintGenerator);

expect(isPlausibleScreenFingerprint(screen)).toBe(true);
expect(
isPlausibleScreenFingerprint({
...screen,
clientWidth: 0,
}),
).toBe(false);
expect(
isPlausibleScreenFingerprint({
...screen,
innerHeight: 0,
}),
).toBe(false);
expect(
isPlausibleScreenFingerprint({
...screen,
clientWidth: screen.innerWidth + 1,
}),
).toBe(false);
expect(
isPlausibleScreenFingerprint({
...screen,
innerHeight: screen.outerHeight + 1,
}),
).toBe(false);
});

test('normalizes zero viewport dimensions from generated screen data', () => {
const {
fingerprint: { screen },
} = fingerprintGenerator.getFingerprint({
browsers: [{ name: 'chrome', minVersion: 100, maxVersion: 100 }],
devices: ['desktop'],
operatingSystems: ['macos'],
});
const normalizeScreenFingerprint = (
fingerprintGenerator as any
).normalizeScreenFingerprint.bind(fingerprintGenerator);

const normalizedScreen = normalizeScreenFingerprint({
...screen,
clientWidth: 0,
clientHeight: 0,
innerWidth: 0,
innerHeight: 0,
});

expect(normalizedScreen.innerWidth).toBeGreaterThan(0);
expect(normalizedScreen.innerHeight).toBeGreaterThan(0);
expect(normalizedScreen.clientWidth).toBe(normalizedScreen.innerWidth);
expect(normalizedScreen.clientHeight).toBe(
normalizedScreen.innerHeight,
);
});
});

describe('Generate fingerprints with basic constraints', () => {
Expand Down
Loading