Add OS to User-Agent

This commit is contained in:
Evan Hahn 2020-11-12 17:29:54 -06:00 committed by GitHub
parent 20a0a78ef5
commit 814b9874d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 52 additions and 1 deletions

View File

@ -0,0 +1,37 @@
// Copyright 2020 Signal Messenger, LLC
// SPDX-License-Identifier: AGPL-3.0-only
import { assert } from 'chai';
import * as sinon from 'sinon';
import { getUserAgent } from '../../util/getUserAgent';
describe('getUserAgent', () => {
beforeEach(function beforeEach() {
this.sandbox = sinon.createSandbox();
});
afterEach(function afterEach() {
this.sandbox.restore();
});
it('returns the right User-Agent on Windows', function test() {
this.sandbox.stub(process, 'platform').get(() => 'win32');
assert.strictEqual(getUserAgent('1.2.3'), 'Signal-Desktop/1.2.3 Windows');
});
it('returns the right User-Agent on macOS', function test() {
this.sandbox.stub(process, 'platform').get(() => 'darwin');
assert.strictEqual(getUserAgent('1.2.3'), 'Signal-Desktop/1.2.3 macOS');
});
it('returns the right User-Agent on Linux', function test() {
this.sandbox.stub(process, 'platform').get(() => 'linux');
assert.strictEqual(getUserAgent('1.2.3'), 'Signal-Desktop/1.2.3 Linux');
});
it('omits the platform on unsupported platforms', function test() {
this.sandbox.stub(process, 'platform').get(() => 'freebsd');
assert.strictEqual(getUserAgent('1.2.3'), 'Signal-Desktop/1.2.3');
});
});

View File

@ -1,6 +1,20 @@
// Copyright 2020 Signal Messenger, LLC
// SPDX-License-Identifier: AGPL-3.0-only
import { getOwn } from './getOwn';
const PLATFORM_STRINGS: { [platform: string]: string } = {
win32: 'Windows',
darwin: 'macOS',
linux: 'Linux',
};
export function getUserAgent(appVersion: string): string {
return `Signal-Desktop/${appVersion}`;
// `process.platform` could be missing if someone figures out how to compile Signal on
// an unsupported OS and forgets to update this file. We'd rather send nothing than
// crash.
const platformString = getOwn(PLATFORM_STRINGS, process.platform);
const platformStringWithSpace = platformString ? ` ${platformString}` : '';
return `Signal-Desktop/${appVersion}${platformStringWithSpace}`;
}