Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-22 11:45:59 +01:00
Code Issues Projects Releases Wiki Activity

finish autofill from view, other misc cleanup (#1368)

Browse Source 
* finish autofill from view, other misc cleanup

* compare hostnames for authResult
This commit is contained in:
Kyle Spearrin 2020-08-24 10:17:15 -04:00 committed by GitHub
parent d4d5ccc4a4
commit b7c2c76230
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 150 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/_locales/en/messages.json
View File

@ -1303,10 +1303,10 @@
"autoFillAndSave": {
"message": "Auto-fill and Save"
},
"savedUri": {
"message": "Auto-filled and Saved Item"
"autoFillSuccessAndSavedUri": {
"message": "Auto-filled Item and Saved URI"
},
"autoFillSuccess": {
"message": "Auto-filled Item"
}
}
}

4
src/background/main.background.ts
View File

@ -219,8 +219,8 @@ export default class MainBackground {
// Background
this.runtimeBackground = new RuntimeBackground(this, this.autofillService, this.cipherService,
this.platformUtilsService as BrowserPlatformUtilsService, this.storageService, this.i18nService,
this.analytics, this.notificationsService, this.systemService, this.vaultTimeoutService, this.syncService,
this.authService, this.stateService, this.environmentService, this.popupUtilsService);
this.analytics, this.notificationsService, this.systemService, this.vaultTimeoutService,
this.environmentService);
this.commandsBackground = new CommandsBackground(this, this.passwordGenerationService,
this.platformUtilsService, this.analytics, this.vaultTimeoutService);

35
src/background/runtime.background.ts
View File

@ -38,8 +38,7 @@ export default class RuntimeBackground {
private storageService: StorageService, private i18nService: I18nService,
private analytics: Analytics, private notificationsService: NotificationsService,
private systemService: SystemService, private vaultTimeoutService: VaultTimeoutService,
private syncService: SyncService, private authService: AuthService, private stateService: StateService,
private environmentService: EnvironmentService, private popupUtilsService : PopupUtilsService) {
private environmentService: EnvironmentService) {
this.isSafari = this.platformUtilsService.isSafari();
this.runtime = this.isSafari ? {} : chrome.runtime;
@ -165,25 +164,21 @@ export default class RuntimeBackground {
}
break;
case 'authResult':
var vaultUrl = this.environmentService.webVaultUrl;
if(!vaultUrl) {
vaultUrl = 'https://vault.bitwarden.com';
}
let vaultUrl = this.environmentService.webVaultUrl;
if (vaultUrl == null) {
vaultUrl = 'https://vault.bitwarden.com';
}
if(!msg.referrer) {
return;
}
if(!vaultUrl.includes(msg.referrer)) {
return;
}
try {
chrome.tabs.create({
url: 'popup/index.html?uilocation=popout#/sso?code=' + msg.code + '&state=' + msg.state
});
}
catch { }
if (msg.referrer == null || Utils.getHostname(vaultUrl) !== msg.referrer) {
return;
}
try {
chrome.tabs.create({
url: 'popup/index.html?uilocation=popout#/sso?code=' + msg.code + '&state=' + msg.state
});
}
catch { }
break;
default:
break;

6
src/background/tabs.background.ts
View File

@ -14,6 +14,8 @@ export default class TabsBackground {
this.tabs.onActivated.addListener(async (activeInfo: any) => {
await this.main.refreshBadgeAndMenu();
this.main.messagingService.send('tabActivated');
this.main.messagingService.send('tabChanged');
});
this.tabs.onReplaced.addListener(async (addedTabId: any, removedTabId: any) => {
@ -23,6 +25,8 @@ export default class TabsBackground {
this.main.onReplacedRan = true;
await this.main.checkNotificationQueue();
await this.main.refreshBadgeAndMenu();
this.main.messagingService.send('tabReplaced');
this.main.messagingService.send('tabChanged');
});
this.tabs.onUpdated.addListener(async (tabId: any, changeInfo: any, tab: any) => {
@ -32,6 +36,8 @@ export default class TabsBackground {
this.main.onUpdatedRan = true;
await this.main.checkNotificationQueue();
await this.main.refreshBadgeAndMenu();
this.main.messagingService.send('tabUpdated');
this.main.messagingService.send('tabChanged');
});
}
}

2
src/background/windows.background.ts
View File

@ -18,6 +18,8 @@ export default class WindowsBackground {
}
await this.main.refreshBadgeAndMenu();
this.main.messagingService.send('windowFocused');
this.main.messagingService.send('windowChanged');
});
}
}

8
src/browser/browserApi.ts
View File

@ -215,11 +215,9 @@ export class BrowserApi {
}
static reloadOpenWindows() {
if(!BrowserApi.isSafariApi)
{
var sidebarName : string = 'sidebar';
var sidebarWindows = chrome.extension.getViews({ type: sidebarName });
if(sidebarWindows && sidebarWindows.length > 0) {
if (!BrowserApi.isSafariApi) {
const sidebarWindows = chrome.extension.getViews({ type: 'sidebar' });
if (sidebarWindows && sidebarWindows.length > 0) {
sidebarWindows[0].location.reload();
}
}

10
src/content/sso.ts
View File

@ -1,13 +1,13 @@
window.addEventListener("message", function(event) {
if (event.source != window)
window.addEventListener('message', (event) => {
if (event.source !== window)
return;
if (event.data.command && (event.data.command == "authResult")) {
if (event.data.command && (event.data.command === 'authResult')) {
chrome.runtime.sendMessage({
command: event.data.command,
code: event.data.code,
state: event.data.state,
referrer: event.source.location.hostname
referrer: event.source.location.hostname,
});
}
}, false)
}, false)

67
src/popup/accounts/home.component.ts
View File

@ -13,43 +13,40 @@ import { Utils } from 'jslib/misc/utils';
selector: 'app-home',
templateUrl: 'home.component.html',
})
export class HomeComponent {
constructor(
protected platformUtilsService: PlatformUtilsService,
private passwordGenerationService : PasswordGenerationService,
private cryptoFunctionService: CryptoFunctionService,
private environmentService: EnvironmentService,
private storageService : StorageService) { }
export class HomeComponent {
constructor(protected platformUtilsService: PlatformUtilsService,
private passwordGenerationService: PasswordGenerationService, private storageService: StorageService,
private cryptoFunctionService: CryptoFunctionService, private environmentService: EnvironmentService) { }
async launchSsoBrowser() {
// Generate necessary sso params
const passwordOptions: any = {
type: 'password',
length: 64,
uppercase: true,
lowercase: true,
numbers: true,
special: false,
};
async launchSsoBrowser() {
// Generate necessary sso params
const passwordOptions: any = {
type: 'password',
length: 64,
uppercase: true,
lowercase: true,
numbers: true,
special: false,
};
const state = (await this.passwordGenerationService.generatePassword(passwordOptions)) + ':clientId=browser';
let codeVerifier = await this.passwordGenerationService.generatePassword(passwordOptions);
const codeVerifierHash = await this.cryptoFunctionService.hash(codeVerifier, 'sha256');
const codeChallenge = Utils.fromBufferToUrlB64(codeVerifierHash);
await this.storageService.save(ConstantsService.ssoCodeVerifierKey, codeVerifier);
await this.storageService.save(ConstantsService.ssoStateKey, state);
const state = (await this.passwordGenerationService.generatePassword(passwordOptions)) + ':clientId=browser';
const codeVerifier = await this.passwordGenerationService.generatePassword(passwordOptions);
const codeVerifierHash = await this.cryptoFunctionService.hash(codeVerifier, 'sha256');
const codeChallenge = Utils.fromBufferToUrlB64(codeVerifierHash);
let url = this.environmentService.getWebVaultUrl();
if (url == null) {
url = 'https://vault.bitwarden.com';
}
await this.storageService.save(ConstantsService.ssoCodeVerifierKey, codeVerifier);
await this.storageService.save(ConstantsService.ssoStateKey, state);
const redirectUri = url + '/sso-connector.html';
// Launch browser
this.platformUtilsService.launchUri(url + '/#/sso?clientId=browser' +
'&redirectUri=' + encodeURIComponent(redirectUri) +
'&state=' + state + '&codeChallenge=' + codeChallenge);
}
let url = this.environmentService.getWebVaultUrl();
if (url == null) {
url = 'https://vault.bitwarden.com';
}
const redirectUri = url + '/sso-connector.html';
// Launch browser
this.platformUtilsService.launchUri(url + '/#/sso?clientId=browser' +
'&redirectUri=' + encodeURIComponent(redirectUri) +
'&state=' + state + '&codeChallenge=' + codeChallenge);
}
}

4
src/popup/accounts/login.component.ts
View File

@ -22,8 +22,8 @@ export class LoginComponent extends BaseLoginComponent {
protected platformUtilsService: PlatformUtilsService, protected i18nService: I18nService,
protected stateService: StateService, protected environmentService: EnvironmentService,
protected passwordGenerationService: PasswordGenerationService,
protected cryptoFunctionService: CryptoFunctionService,
storageService: StorageService, syncService : SyncService) {
protected cryptoFunctionService: CryptoFunctionService, storageService: StorageService,
syncService: SyncService) {
super(authService, router, platformUtilsService, i18nService, stateService, environmentService, passwordGenerationService, cryptoFunctionService, storageService);
super.onSuccessfulLogin = () => {
return syncService.fullSync(true);

16
src/popup/accounts/sso.component.ts
View File

@ -29,23 +29,23 @@ export class SsoComponent extends BaseSsoComponent {
storageService: StorageService, stateService: StateService,
platformUtilsService: PlatformUtilsService, apiService: ApiService,
cryptoFunctionService: CryptoFunctionService, passwordGenerationService: PasswordGenerationService,
syncService: SyncService, private environmentService: EnvironmentService ) {
syncService: SyncService, private environmentService: EnvironmentService) {
super(authService, router, i18nService, route, storageService, stateService, platformUtilsService,
apiService, cryptoFunctionService, passwordGenerationService);
let url = this.environmentService.getWebVaultUrl();
if (url == null) {
url = 'https://vault.bitwarden.com';
}
this.redirectUri = url + '/sso-connector.html';
this.clientId = 'browser';
super.onSuccessfulLogin = () => {
BrowserApi.reloadOpenWindows();
const thisWindow = window.open('', '_self');
thisWindow.close();
return syncService.fullSync(true);
BrowserApi.reloadOpenWindows();
const thisWindow = window.open('', '_self');
thisWindow.close();
return syncService.fullSync(true);
};
}
}

14
src/popup/vault/view.component.html
View File

@ -17,7 +17,7 @@
<div class="box-content">
<div class="box-content-row">
<span class="row-label">{{'name' | i18n}}</span>
<input type="text" [value]="cipher.name" readonly aria-readonly="true"/>
<input type="text" [value]="cipher.name" readonly aria-readonly="true" />
</div>
<!-- Login -->
<div *ngIf="cipher.login">
@ -60,8 +60,7 @@
[ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
</a>
<a class="row-btn" href="#" appStopClick appA11yTitle="{{'copyPassword' | i18n}}"
(click)="copy(cipher.login.password, 'password', 'Password')"
*ngIf="cipher.viewPassword">
(click)="copy(cipher.login.password, 'password', 'Password')" *ngIf="cipher.viewPassword">
<i class="fa fa-lg fa-clone" aria-hidden="true"></i>
</a>
</div>
@ -238,7 +237,8 @@
</div>
<div class="action-buttons">
<a class="row-btn" href="#" appStopClick appA11yTitle="{{'toggleVisibility' | i18n}}"
*ngIf="field.type === fieldType.Hidden && cipher.viewPassword" (click)="toggleFieldValue(field)">
*ngIf="field.type === fieldType.Hidden && cipher.viewPassword"
(click)="toggleFieldValue(field)">
<i class="fa fa-lg" aria-hidden="true"
[ngClass]="{'fa-eye': !field.showValue, 'fa-eye-slash': field.showValue}"></i>
</a>
@ -268,7 +268,7 @@
</div>
<div class="box list">
<div class="box-content single-line">
<a class="box-content-row" href="#" appStopClick appBlurClick (click)="fillCipher()"
<a class="box-content-row" href="#" appStopClick appBlurClick (click)="fillCipher()"
*ngIf="!cipher.isDeleted && !inPopout">
<div class="row-main text-primary">
<div class="icon text-primary" aria-hidden="true">
@ -277,7 +277,7 @@
<span>{{'autoFill' | i18n}}</span>
</div>
</a>
<a class="box-content-row" href="#" appStopClick appBlurClick (click)="fillCipherAndSave()"
<a class="box-content-row" href="#" appStopClick appBlurClick (click)="fillCipherAndSave()"
*ngIf="!cipher.isDeleted && !inPopout">
<div class="row-main text-primary">
<div class="icon text-primary" aria-hidden="true">
@ -286,7 +286,7 @@
<span>{{'autoFillAndSave' | i18n}}</span>
</div>
</a>
<a class="box-content-row" href="#" appStopClick appBlurClick (click)="clone()"
<a class="box-content-row" href="#" appStopClick appBlurClick (click)="clone()"
*ngIf="!cipher.organizationId && !cipher.isDeleted">
<div class="row-main text-primary">
<div class="icon text-primary" aria-hidden="true">

118
src/popup/vault/view.component.ts
View File

@ -38,7 +38,9 @@ const BroadcasterSubscriptionId = 'ChildViewComponent';
export class ViewComponent extends BaseViewComponent {
showAttachments = true;
pageDetails: any[] = [];
inPopout: boolean = false;
tab: any;
loadPageDetailsTimeout: number;
inPopout = false;
constructor(cipherService: CipherService, totpService: TotpService,
tokenService: TokenService, i18nService: I18nService,
@ -68,6 +70,7 @@ export class ViewComponent extends BaseViewComponent {
queryParamsSub.unsubscribe();
}
});
super.ngOnInit();
this.broadcasterService.subscribe(BroadcasterSubscriptionId, (message: any) => {
@ -82,6 +85,13 @@ export class ViewComponent extends BaseViewComponent {
});
}
break;
case 'tabChanged':
case 'windowChanged':
if (this.loadPageDetailsTimeout != null) {
window.clearTimeout(this.loadPageDetailsTimeout);
}
this.loadPageDetailsTimeout = window.setTimeout(() => this.loadPageDetails(), 500);
break;
default:
break;
}
@ -90,8 +100,13 @@ export class ViewComponent extends BaseViewComponent {
}
ngOnDestroy() {
this.broadcasterService.unsubscribe(BroadcasterSubscriptionId);
super.ngOnDestroy();
this.broadcasterService.unsubscribe(BroadcasterSubscriptionId);
}
async load() {
await super.load();
await this.loadPageDetails();
}
edit() {
@ -116,43 +131,40 @@ export class ViewComponent extends BaseViewComponent {
}
async fillCipher() {
const didAutofill: boolean = await this.doAutofill();
const didAutofill = await this.doAutofill();
if (didAutofill) {
this.platformUtilsService.showToast('success', null,
this.i18nService.t('autoFillSuccess'));
}
}
}
async fillCipherAndSave() {
const didAutofill: boolean = await this.doAutofill();
const didAutofill = await this.doAutofill();
if (didAutofill) {
const tab = await BrowserApi.getTabFromCurrentWindow();
if (!tab) {
if (this.tab == null) {
throw new Error('No tab found.');
}
if (this.cipher.login.uris == null) {
this.cipher.login.uris = [];
} else {
if (this.cipher.login.uris.some((uri) => uri.uri === tab.url)) {
if (this.cipher.login.uris.some((uri) => uri.uri === this.tab.url)) {
this.platformUtilsService.showToast('success', null,
this.i18nService.t('savedURI'));
this.i18nService.t('autoFillSuccessAndSavedUri'));
return;
}
}
const loginUri: LoginUriView = new LoginUriView();
loginUri.uri = tab.url;
const loginUri = new LoginUriView();
loginUri.uri = this.tab.url;
this.cipher.login.uris.push(loginUri);
try {
const cipher: Cipher = await this.cipherService.encrypt(this.cipher);
await this.cipherService.saveWithServer(cipher);
this.cipher.id = cipher.id;
this.platformUtilsService.showToast('success', null,
this.i18nService.t('savedURI'));
this.i18nService.t('autoFillSuccessAndSavedUri'));
this.messagingService.send('editedCipher');
} catch {
this.platformUtilsService.showToast('error', null,
@ -161,45 +173,6 @@ export class ViewComponent extends BaseViewComponent {
}
}
async doAutofill() {
if (this.pageDetails == null || this.pageDetails.length === 0) {
this.platformUtilsService.showToast('error', null,
this.i18nService.t('autofillError'));
return false;
}
try {
this.totpCode = await this.autofillService.doAutoFill({
cipher: this.cipher,
pageDetails: this.pageDetails,
doc: window.document,
});
if (this.totpCode != null) {
this.platformUtilsService.copyToClipboard(this.totpCode, { window: window });
}
} catch {
this.platformUtilsService.showToast('error', null,
this.i18nService.t('autofillError'));
this.changeDetectorRef.detectChanges();
return false;
}
return true;
}
async load() {
await super.load();
const tab = await BrowserApi.getTabFromCurrentWindow();
this.pageDetails = [];
BrowserApi.tabSendMessage(tab, {
command: 'collectPageDetails',
tab: tab,
sender: BroadcasterSubscriptionId,
});
}
async restore() {
if (!this.cipher.isDeleted) {
return false;
@ -222,4 +195,43 @@ export class ViewComponent extends BaseViewComponent {
close() {
this.location.back();
}
private async loadPageDetails() {
this.pageDetails = [];
this.tab = await BrowserApi.getTabFromCurrentWindow();
if (this.tab == null) {
return;
}
BrowserApi.tabSendMessage(this.tab, {
command: 'collectPageDetails',
tab: this.tab,
sender: BroadcasterSubscriptionId,
});
}
private async doAutofill() {
if (this.pageDetails == null || this.pageDetails.length === 0) {
this.platformUtilsService.showToast('error', null,
this.i18nService.t('autofillError'));
return false;
}
try {
this.totpCode = await this.autofillService.doAutoFill({
cipher: this.cipher,
pageDetails: this.pageDetails,
doc: window.document,
});
if (this.totpCode != null) {
this.platformUtilsService.copyToClipboard(this.totpCode, { window: window });
}
} catch {
this.platformUtilsService.showToast('error', null,
this.i18nService.t('autofillError'));
this.changeDetectorRef.detectChanges();
return false;
}
return true;
}
}