mirror of
https://github.com/bitwarden/browser.git
synced 2024-11-30 13:03:53 +01:00
safeincloud xml importer, org import support
This commit is contained in:
parent
1b7ace0495
commit
a7e7dcc1fe
@ -171,5 +171,5 @@ export abstract class ApiService {
|
|||||||
getEventsOrganization: (id: string, start: string, end: string,
|
getEventsOrganization: (id: string, start: string, end: string,
|
||||||
token: string) => Promise<ListResponse<EventResponse>>;
|
token: string) => Promise<ListResponse<EventResponse>>;
|
||||||
getEventsOrganizationUser: (organizationId: string, id: string,
|
getEventsOrganizationUser: (organizationId: string, id: string,
|
||||||
start: string, end: string, token: string) => Promise<ListResponse<EventResponse>>
|
start: string, end: string, token: string) => Promise<ListResponse<EventResponse>>;
|
||||||
}
|
}
|
||||||
|
@ -10,10 +10,6 @@ import { CipherType } from '../enums/cipherType';
|
|||||||
|
|
||||||
export class AviraCsvImporter extends BaseImporter implements Importer {
|
export class AviraCsvImporter extends BaseImporter implements Importer {
|
||||||
parse(data: string): ImportResult {
|
parse(data: string): ImportResult {
|
||||||
if (this.organization) {
|
|
||||||
throw new Error('Organization import not supported.');
|
|
||||||
}
|
|
||||||
|
|
||||||
const result = new ImportResult();
|
const result = new ImportResult();
|
||||||
const results = this.parseCsv(data, true);
|
const results = this.parseCsv(data, true);
|
||||||
if (results == null) {
|
if (results == null) {
|
||||||
|
@ -53,6 +53,12 @@ export abstract class BaseImporter {
|
|||||||
'ort', 'adresse',
|
'ort', 'adresse',
|
||||||
];
|
];
|
||||||
|
|
||||||
|
protected parseXml(data: string): Document {
|
||||||
|
const parser = new DOMParser();
|
||||||
|
const doc = parser.parseFromString(data, 'application/xml');
|
||||||
|
return doc != null && doc.querySelector('parsererror') == null ? doc : null;
|
||||||
|
}
|
||||||
|
|
||||||
protected parseCsv(data: string, header: boolean): any[] {
|
protected parseCsv(data: string, header: boolean): any[] {
|
||||||
const result = papa.parse(data, {
|
const result = papa.parse(data, {
|
||||||
header: header,
|
header: header,
|
||||||
@ -210,4 +216,13 @@ export abstract class BaseImporter {
|
|||||||
result.folderRelationships = new Map<number, number>();
|
result.folderRelationships = new Map<number, number>();
|
||||||
result.folders = [];
|
result.folders = [];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected querySelectorDirectChild(parentEl: Element, query: string) {
|
||||||
|
const els = this.querySelectorAllDirectChild(parentEl, query);
|
||||||
|
return els.length === 0 ? null : els[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
protected querySelectorAllDirectChild(parentEl: Element, query: string) {
|
||||||
|
return Array.from(parentEl.querySelectorAll(query)).filter((el) => el.parentNode === parentEl);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -10,10 +10,6 @@ import { CipherType } from '../enums/cipherType';
|
|||||||
|
|
||||||
export class BlurCsvImporter extends BaseImporter implements Importer {
|
export class BlurCsvImporter extends BaseImporter implements Importer {
|
||||||
parse(data: string): ImportResult {
|
parse(data: string): ImportResult {
|
||||||
if (this.organization) {
|
|
||||||
throw new Error('Organization import not supported.');
|
|
||||||
}
|
|
||||||
|
|
||||||
const result = new ImportResult();
|
const result = new ImportResult();
|
||||||
const results = this.parseCsv(data, true);
|
const results = this.parseCsv(data, true);
|
||||||
if (results == null) {
|
if (results == null) {
|
||||||
|
@ -11,10 +11,6 @@ import { CipherType } from '../enums/cipherType';
|
|||||||
|
|
||||||
export class KeePassXCsvImporter extends BaseImporter implements Importer {
|
export class KeePassXCsvImporter extends BaseImporter implements Importer {
|
||||||
parse(data: string): ImportResult {
|
parse(data: string): ImportResult {
|
||||||
if (this.organization) {
|
|
||||||
throw new Error('Organization import not supported.');
|
|
||||||
}
|
|
||||||
|
|
||||||
const result = new ImportResult();
|
const result = new ImportResult();
|
||||||
const results = this.parseCsv(data, true);
|
const results = this.parseCsv(data, true);
|
||||||
if (results == null) {
|
if (results == null) {
|
||||||
@ -66,6 +62,10 @@ export class KeePassXCsvImporter extends BaseImporter implements Importer {
|
|||||||
result.ciphers.push(cipher);
|
result.ciphers.push(cipher);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if (this.organization) {
|
||||||
|
this.moveFoldersToCollections(result);
|
||||||
|
}
|
||||||
|
|
||||||
result.success = true;
|
result.success = true;
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
121
src/importers/safeInCloudXmlImporter.ts
Normal file
121
src/importers/safeInCloudXmlImporter.ts
Normal file
@ -0,0 +1,121 @@
|
|||||||
|
import { BaseImporter } from './baseImporter';
|
||||||
|
import { Importer } from './importer';
|
||||||
|
|
||||||
|
import { ImportResult } from '../models/domain/importResult';
|
||||||
|
|
||||||
|
import { CipherView } from '../models/view/cipherView';
|
||||||
|
import { FieldView } from '../models/view/fieldView';
|
||||||
|
import { FolderView } from '../models/view/folderView';
|
||||||
|
import { LoginView } from '../models/view/loginView';
|
||||||
|
import { SecureNoteView } from '../models/view/secureNoteView';
|
||||||
|
|
||||||
|
import { CipherType } from '../enums/cipherType';
|
||||||
|
import { FieldType } from '../enums/fieldType';
|
||||||
|
import { SecureNoteType } from '../enums/secureNoteType';
|
||||||
|
|
||||||
|
export class SafeInCloudXmlImporter extends BaseImporter implements Importer {
|
||||||
|
parse(data: string): ImportResult {
|
||||||
|
const result = new ImportResult();
|
||||||
|
const doc = this.parseXml(data);
|
||||||
|
if (doc == null) {
|
||||||
|
result.success = false;
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
const db = doc.querySelector('database');
|
||||||
|
if (db == null) {
|
||||||
|
result.errorMessage = 'Missing `database` node.';
|
||||||
|
result.success = false;
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
const foldersMap = new Map<string, number>();
|
||||||
|
|
||||||
|
Array.from(doc.querySelectorAll('database > label')).forEach((labelEl) => {
|
||||||
|
const name = labelEl.getAttribute('name');
|
||||||
|
const id = labelEl.getAttribute('id');
|
||||||
|
if (!this.isNullOrWhitespace(name) && !this.isNullOrWhitespace(id)) {
|
||||||
|
foldersMap.set(id, result.folders.length);
|
||||||
|
const folder = new FolderView();
|
||||||
|
folder.name = name;
|
||||||
|
result.folders.push(folder);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
Array.from(doc.querySelectorAll('database > card')).forEach((cardEl) => {
|
||||||
|
if (cardEl.getAttribute('template') === 'true') {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const labelIdEl = this.querySelectorDirectChild(cardEl, 'label_id');
|
||||||
|
if (labelIdEl != null) {
|
||||||
|
const labelId = labelIdEl.textContent;
|
||||||
|
if (!this.isNullOrWhitespace(labelId) && foldersMap.has(labelId)) {
|
||||||
|
result.folderRelationships.set(result.ciphers.length, foldersMap.get(labelId));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const cipher = new CipherView();
|
||||||
|
cipher.favorite = false;
|
||||||
|
cipher.notes = '';
|
||||||
|
cipher.name = this.getValueOrDefault(cardEl.getAttribute('title'), '--');
|
||||||
|
cipher.fields = null;
|
||||||
|
|
||||||
|
const cardType = cardEl.getAttribute('type');
|
||||||
|
if (cardType === 'note') {
|
||||||
|
cipher.type = CipherType.SecureNote;
|
||||||
|
cipher.secureNote = new SecureNoteView();
|
||||||
|
cipher.secureNote.type = SecureNoteType.Generic;
|
||||||
|
} else {
|
||||||
|
cipher.type = CipherType.Login;
|
||||||
|
cipher.login = new LoginView();
|
||||||
|
Array.from(this.querySelectorAllDirectChild(cardEl, 'field')).forEach((fieldEl) => {
|
||||||
|
const text = fieldEl.textContent;
|
||||||
|
if (this.isNullOrWhitespace(text)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const name = fieldEl.getAttribute('name');
|
||||||
|
const fieldType = this.getValueOrDefault(fieldEl.getAttribute('type'), '').toLowerCase();
|
||||||
|
if (fieldType === 'login') {
|
||||||
|
cipher.login.username = text;
|
||||||
|
} else if (fieldType === 'password') {
|
||||||
|
cipher.login.password = text;
|
||||||
|
} else if (fieldType === 'notes') {
|
||||||
|
cipher.notes += (text + '\n');
|
||||||
|
} else if (fieldType === 'weblogin' || fieldType === 'website') {
|
||||||
|
cipher.login.uris = this.makeUriArray(text);
|
||||||
|
} else if (text.length > 200) {
|
||||||
|
cipher.notes += (name + ': ' + text + '\n');
|
||||||
|
} else {
|
||||||
|
if (cipher.fields == null) {
|
||||||
|
cipher.fields = [];
|
||||||
|
}
|
||||||
|
const field = new FieldView();
|
||||||
|
field.name = name;
|
||||||
|
field.value = text;
|
||||||
|
field.type = FieldType.Text;
|
||||||
|
cipher.fields.push(field);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
Array.from(this.querySelectorAllDirectChild(cardEl, 'notes')).forEach((notesEl) => {
|
||||||
|
cipher.notes += (notesEl.textContent + '\n');
|
||||||
|
});
|
||||||
|
|
||||||
|
cipher.notes = cipher.notes.trim();
|
||||||
|
if (cipher.notes === '') {
|
||||||
|
cipher.notes = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
result.ciphers.push(cipher);
|
||||||
|
});
|
||||||
|
|
||||||
|
if (this.organization) {
|
||||||
|
this.moveFoldersToCollections(result);
|
||||||
|
}
|
||||||
|
|
||||||
|
result.success = true;
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user