feat: Handle privilege escalation gracefully even without PolicyKit (#599)
* feat: Handle privilege escalation gracefully even without PolicyKit * build: upgrade tslint => 5.9.1 * build: add uhk-agent/package-lock.json * feat: add error animation * fix: display agent icon when user use ALT + TAB
This commit is contained in:
committed by
László Monda
parent
6e1f0ded9e
commit
6ccf005750
@@ -1,4 +1,39 @@
|
||||
<span class="privilege-checker-wrapper">
|
||||
<uhk-message header="Cannot talk to your UHK" subtitle="Your UHK has been detected, but its permissions are not set up yet, so Agent can't talk to it."></uhk-message>
|
||||
<button class="btn btn-default btn-lg btn-primary" (click)="setUpPermissions()"> Set up permissions </button>
|
||||
</span>
|
||||
<div class="privilege-checker-wrapper">
|
||||
<uhk-message header="Cannot talk to your UHK"
|
||||
subtitle="Your UHK has been detected, but its permissions are not set up yet, so Agent can't talk to it."></uhk-message>
|
||||
|
||||
<button class="btn btn-default btn-lg btn-primary"
|
||||
(click)="setUpPermissions()"> Set up permissions
|
||||
</button>
|
||||
|
||||
<div class="mt-10">
|
||||
<a class="link-inline"
|
||||
*ngIf="state.showWhatWillThisDo"
|
||||
(click)="whatWillThisDo()">What will this do?
|
||||
</a>
|
||||
|
||||
<div>
|
||||
<p class="privilege-error"
|
||||
#privilegeError
|
||||
*ngIf="state.permissionSetupFailed">
|
||||
Agent wasn't able to set up permissions via PolicyKit. This is most likely because the
|
||||
<code>polkit</code> package is not installed on your system.
|
||||
</p>
|
||||
|
||||
<div *ngIf="state.showWhatWillThisDoContent">
|
||||
Agent uses the following script to set up permissions. You can run it manually as root, then
|
||||
<a class="link-inline"
|
||||
(click)="retry()">retry</a>.
|
||||
<div class="copy-container">
|
||||
<span class="fa fa-2x fa-copy"
|
||||
ngxClipboard
|
||||
[cbContent]="command"
|
||||
title="Copy to clipboard"
|
||||
data-toggle="tooltip"
|
||||
data-placement="top"></span>
|
||||
<pre><code>{{ command }}</code></pre>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -9,3 +9,19 @@
|
||||
uhk-message {
|
||||
max-width: 50%;
|
||||
}
|
||||
|
||||
.privilege-error {
|
||||
animation: error-fade-in 2s;
|
||||
}
|
||||
|
||||
@keyframes error-fade-in {
|
||||
0% {
|
||||
color: white;
|
||||
background-color: red;
|
||||
}
|
||||
|
||||
100% {
|
||||
color: inherit;
|
||||
background-color: inherit;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,26 +1,61 @@
|
||||
import { Component } from '@angular/core';
|
||||
import { Router } from '@angular/router';
|
||||
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';
|
||||
import { Store } from '@ngrx/store';
|
||||
import 'rxjs/add/observable/of';
|
||||
import 'rxjs/add/observable/throw';
|
||||
import 'rxjs/add/operator/distinctUntilChanged';
|
||||
import 'rxjs/add/operator/ignoreElements';
|
||||
import 'rxjs/add/operator/takeWhile';
|
||||
import { Subscription } from 'rxjs/Subscription';
|
||||
|
||||
import { AppState } from '../../store/index';
|
||||
import { AppState, getPrivilegePageState } from '../../store';
|
||||
import { SetPrivilegeOnLinuxAction } from '../../store/actions/device';
|
||||
import { LoadAppStartInfoAction, PrivilegeWhatWillThisDoAction } from '../../store/actions/app';
|
||||
import { PrivilagePageSate } from '../../models/privilage-page-sate';
|
||||
|
||||
@Component({
|
||||
selector: 'privilege-checker',
|
||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||
templateUrl: './privilege-checker.component.html',
|
||||
styleUrls: ['./privilege-checker.component.scss']
|
||||
})
|
||||
export class PrivilegeCheckerComponent {
|
||||
|
||||
constructor(protected store: Store<AppState>) {
|
||||
export class PrivilegeCheckerComponent implements OnInit, OnDestroy {
|
||||
|
||||
state: PrivilagePageSate;
|
||||
|
||||
command = `cat <<EOF >/etc/udev/rules.d/50-uhk60.rules
|
||||
# Ultimate Hacking Keyboard rules
|
||||
# These are the udev rules for accessing the USB interfaces of the UHK as non-root users.
|
||||
# Copy this file to /etc/udev/rules.d and physically reconnect the UHK afterwards.
|
||||
SUBSYSTEMS=="usb", ATTRS{idVendor}=="1d50", ATTRS{idProduct}=="612[0-7]", MODE:="0666"
|
||||
EOF
|
||||
udevadm trigger
|
||||
udevadm settle`;
|
||||
|
||||
private stateSubscription: Subscription;
|
||||
|
||||
constructor(private store: Store<AppState>,
|
||||
private cdRef: ChangeDetectorRef) {
|
||||
}
|
||||
|
||||
ngOnInit(): void {
|
||||
this.stateSubscription = this.store.select(getPrivilegePageState)
|
||||
.subscribe(state => {
|
||||
this.state = state;
|
||||
this.cdRef.markForCheck();
|
||||
});
|
||||
}
|
||||
|
||||
ngOnDestroy(): void {
|
||||
if (this.stateSubscription) {
|
||||
this.stateSubscription.unsubscribe();
|
||||
}
|
||||
}
|
||||
|
||||
setUpPermissions(): void {
|
||||
this.store.dispatch(new SetPrivilegeOnLinuxAction());
|
||||
}
|
||||
|
||||
whatWillThisDo(): void {
|
||||
this.store.dispatch(new PrivilegeWhatWillThisDoAction());
|
||||
}
|
||||
|
||||
retry(): void {
|
||||
this.store.dispatch(new LoadAppStartInfoAction());
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user