empayre/fleet
14
0
Fork 0
mirror of https://github.com/empayre/fleet.git synced 2024-11-06 08:55:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removing errors due to chrome.enterprise access in dev mode. (#15460)

Browse Source 
This fixes fleetd-chrome extension -- it now works when loaded in
development mode in Chrome.

The problem was that fleetd-chrome extension is setting status=1 when
query has warnings. Fleet server drops any detail query results with
status=1. So, the fleetd-chrome host was never getting fully initialized
on the server.

- [X] Manual QA for all new/changed functionality
This commit is contained in:
Victor Lyuboslavsky 2023-12-06 10:36:46 -06:00 committed by GitHub
parent feb905bc6c
commit 518dc54029
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
ee/fleetd-chrome/src/tables/system_info.ts
View File

@ -33,12 +33,21 @@ export default class TableSystemInfo extends Table {
// @ts-expect-error @types/chrome doesn't yet have instanceID.
const uuid = (await chrome.instanceID.getID()) as string;
let devMode = false;
if (!chrome.enterprise) {
const { installType } = await chrome.management.getSelf();
devMode = installType === "development";
}
// TODO should it default to UUID or should Fleet handle it somehow?
let hostname = "";
try {
// @ts-expect-error @types/chrome doesn't yet have the deviceAttributes Promise API.
hostname = (await chrome.enterprise.deviceAttributes.getDeviceHostname()) as string;
if (!devMode) {
// @ts-expect-error @types/chrome doesn't yet have the deviceAttributes Promise API.
hostname = (await chrome.enterprise.deviceAttributes.getDeviceHostname()) as string;
} else {
hostname = uuid;
}
} catch (err) {
console.warn("get hostname:", err);
warningsArray.push({
@ -49,8 +58,13 @@ export default class TableSystemInfo extends Table {
let hwSerial = "";
try {
// @ts-expect-error @types/chrome doesn't yet have the deviceAttributes Promise API.
hwSerial = (await chrome.enterprise.deviceAttributes.getDeviceSerialNumber()) as string;
if (!devMode) {
// @ts-expect-error @types/chrome doesn't yet have the deviceAttributes Promise API.
hwSerial = (await chrome.enterprise.deviceAttributes.getDeviceSerialNumber()) as string;
} else {
// We leave it blank. The host will be identified by UUID instead.
hwSerial = "";
}
} catch (err) {
console.warn("get serial number:", err);
warningsArray.push({
@ -62,13 +76,18 @@ export default class TableSystemInfo extends Table {
let hwVendor = "",
hwModel = "";
try {
// This throws "Not allowed" error if
// https://chromeenterprise.google/policies/?policy=EnterpriseHardwarePlatformAPIEnabled is
// not configured to enabled for the device.
// @ts-expect-error @types/chrome doesn't yet have the deviceAttributes Promise API.
const platformInfo = await chrome.enterprise.hardwarePlatform.getHardwarePlatformInfo();
hwVendor = platformInfo.manufacturer;
hwModel = platformInfo.model;
if (!devMode) {
// This throws "Not allowed" error if
// https://chromeenterprise.google/policies/?policy=EnterpriseHardwarePlatformAPIEnabled is
// not configured to enabled for the device.
// @ts-expect-error @types/chrome doesn't yet have the deviceAttributes Promise API.
const platformInfo = await chrome.enterprise.hardwarePlatform.getHardwarePlatformInfo();
hwVendor = platformInfo.manufacturer;
hwModel = platformInfo.model;
} else {
hwVendor = "dev-hardware_vendor";
hwModel = "dev-hardware_model";
}
} catch (err) {
console.warn("get platform info:", err);
warningsArray.push({