disabled yubikey on win32

This commit is contained in:
antelle 2020-05-05 17:57:01 +02:00
parent 2fff34dc61
commit 58296dd896
No known key found for this signature in database
GPG Key ID: 094A2F2D6136A4EE
4 changed files with 10 additions and 5 deletions

View File

@ -3,13 +3,12 @@ import { Events } from 'framework/events';
import { Logger } from 'util/logger';
import { Launcher } from 'comp/launcher';
import { AppSettingsModel } from 'models/app-settings-model';
import { YubiKeyVendorId } from 'const/hardware';
const logger = new Logger('usb-listener');
// https://support.yubico.com/support/solutions/articles/15000028104-yubikey-usb-id-values
const YubiKeyVendorId = 0x1050;
const UsbListener = {
supported: Launcher && !(process.platform === 'win32' && !process.arch.includes('64')),
attachedYubiKeys: 0,
init() {

View File

@ -0,0 +1,4 @@
// https://support.yubico.com/support/solutions/articles/15000028104-yubikey-usb-id-values
const YubiKeyVendorId = 0x1050;
export { YubiKeyVendorId };

View File

@ -3,6 +3,7 @@ import { AppSettingsModel } from 'models/app-settings-model';
import { YubiKeyOtpModel } from 'models/external/yubikey-otp-model';
import template from 'templates/settings/settings-devices.hbs';
import { Links } from 'const/links';
import { UsbListener } from '../../comp/app/usb-listener';
class SettingsDevicesView extends View {
template = template;
@ -28,7 +29,8 @@ class SettingsDevicesView extends View {
this.toolCheckPromise = undefined;
}
super.render({
enableUsb: AppSettingsModel.enableUsb,
supported: UsbListener.supported,
enableUsb: UsbListener.supported && AppSettingsModel.enableUsb,
ykmanStatus: YubiKeyOtpModel.ykmanStatus,
yubiKeyShowIcon: AppSettingsModel.yubiKeyShowIcon,
yubiKeyAutoOpen: AppSettingsModel.yubiKeyAutoOpen,

View File

@ -2,7 +2,7 @@
<h1><i class="fa fa-usb settings__head-icon"></i> {{res 'setDevicesTitle'}}</h1>
<div>
<input type="checkbox" class="settings__input input-base settings__devices-enable-usb" id="settings__devices-enable-usb"
{{#if enableUsb}}checked{{/if}} />
{{#if enableUsb}}checked{{/if}} {{#unless supported}}disabled{{/unless}} />
<label for="settings__devices-enable-usb">{{res 'setDevicesEnableUsb'}}</label>
</div>