From 4004449aa833a2a445fcdb2a9c80f4a014de0b89 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Tue, 10 Jul 2018 16:38:43 -0400 Subject: [PATCH] padlock importer. move relationships to arrays --- src/importers/baseImporter.ts | 8 +- src/importers/bitwardenCsvImporter.ts | 6 +- src/importers/keepassxCsvImporter.ts | 2 +- src/importers/lastpassCsvImporter.ts | 2 +- src/importers/padlockCsvImporter.ts | 135 ++++++++++++++++++++++++ src/importers/safeInCloudXmlImporter.ts | 2 +- src/models/domain/importResult.ts | 4 +- 7 files changed, 148 insertions(+), 11 deletions(-) create mode 100644 src/importers/padlockCsvImporter.ts diff --git a/src/importers/baseImporter.ts b/src/importers/baseImporter.ts index 19b43104ded..8bdadfe7cf6 100644 --- a/src/importers/baseImporter.ts +++ b/src/importers/baseImporter.ts @@ -10,6 +10,8 @@ import { Utils } from '../misc/utils'; export abstract class BaseImporter { organization = false; + protected newLineRegex = /(?:\r\n|\r|\n)/; + protected passwordFieldNames = [ 'password', 'pass word', 'passphrase', 'pass phrase', 'pass', 'code', 'code word', 'codeword', @@ -145,7 +147,7 @@ export abstract class BaseImporter { } protected splitNewLine(str: string): string[] { - return str.split(/(?:\r\n|\r|\n)/); + return str.split(this.newLineRegex); } // ref https://stackoverflow.com/a/5911300 @@ -207,13 +209,13 @@ export abstract class BaseImporter { } protected moveFoldersToCollections(result: ImportResult) { - result.folderRelationships.forEach((value, key) => result.collectionRelationships.set(key, value)); + result.folderRelationships.forEach((r) => result.collectionRelationships.push(r)); result.collections = result.folders.map((f) => { const collection = new CollectionView(); collection.name = f.name; return collection; }); - result.folderRelationships = new Map(); + result.folderRelationships = []; result.folders = []; } diff --git a/src/importers/bitwardenCsvImporter.ts b/src/importers/bitwardenCsvImporter.ts index 29d83e70cb8..76ea7aa08bb 100644 --- a/src/importers/bitwardenCsvImporter.ts +++ b/src/importers/bitwardenCsvImporter.ts @@ -44,11 +44,11 @@ export class BitwardenCsvImporter extends BaseImporter implements Importer { result.collections.push(collection); } - result.collectionRelationships.set(result.ciphers.length, collectionIndex); + result.collectionRelationships.push([result.ciphers.length, collectionIndex]); }); } else if (!this.organization) { let folderIndex = result.folders.length; - const hasFolder = !this.organization && !this.isNullOrWhitespace(value.folder); + const hasFolder = !this.isNullOrWhitespace(value.folder); let addFolder = hasFolder; if (hasFolder) { @@ -68,7 +68,7 @@ export class BitwardenCsvImporter extends BaseImporter implements Importer { } if (hasFolder) { - result.folderRelationships.set(result.ciphers.length, folderIndex); + result.folderRelationships.push([result.ciphers.length, folderIndex]); } } diff --git a/src/importers/keepassxCsvImporter.ts b/src/importers/keepassxCsvImporter.ts index cec7fa4e68b..141e6e1771b 100644 --- a/src/importers/keepassxCsvImporter.ts +++ b/src/importers/keepassxCsvImporter.ts @@ -47,7 +47,7 @@ export class KeePassXCsvImporter extends BaseImporter implements Importer { result.folders.push(f); } if (hasFolder) { - result.folderRelationships.set(result.ciphers.length, folderIndex); + result.folderRelationships.push([result.ciphers.length, folderIndex]); } const cipher = new CipherView(); diff --git a/src/importers/lastpassCsvImporter.ts b/src/importers/lastpassCsvImporter.ts index fd9d9f1b94c..cdaa0629aa9 100644 --- a/src/importers/lastpassCsvImporter.ts +++ b/src/importers/lastpassCsvImporter.ts @@ -76,7 +76,7 @@ export class LastPassCsvImporter extends BaseImporter implements Importer { result.folders.push(f); } if (hasFolder) { - result.folderRelationships.set(cipherIndex, folderIndex); + result.folderRelationships.push([cipherIndex, folderIndex]); } }); diff --git a/src/importers/padlockCsvImporter.ts b/src/importers/padlockCsvImporter.ts new file mode 100644 index 00000000000..dea2fdc99e8 --- /dev/null +++ b/src/importers/padlockCsvImporter.ts @@ -0,0 +1,135 @@ +import { BaseImporter } from './baseImporter'; +import { Importer } from './importer'; + +import { ImportResult } from '../models/domain/importResult'; + +import { CipherView } from '../models/view/cipherView'; +import { CollectionView } from '../models/view/collectionView'; +import { FieldView } from '../models/view/fieldView'; +import { FolderView } from '../models/view/folderView'; +import { LoginView } from '../models/view/loginView'; + +import { CipherType } from '../enums/cipherType'; +import { FieldType } from '../enums/fieldType'; + +export class PadlockCsvImporter extends BaseImporter implements Importer { + parse(data: string): ImportResult { + const result = new ImportResult(); + const results = this.parseCsv(data, false); + if (results == null) { + result.success = false; + return result; + } + + let headers: string[] = null; + results.forEach((value) => { + if (headers == null) { + headers = value.map((v: string) => v); + return; + } + + if (value.length < 2 || value.length !== headers.length) { + return; + } + + if (!this.isNullOrWhitespace(value[1])) { + if (this.organization) { + const tags = (value[1] as string).split(','); + tags.forEach((tag) => { + tag = tag.trim(); + let addCollection = true; + let collectionIndex = result.collections.length; + + for (let i = 0; i < result.collections.length; i++) { + if (result.collections[i].name === tag) { + addCollection = false; + collectionIndex = i; + break; + } + } + + if (addCollection) { + const collection = new CollectionView(); + collection.name = tag; + result.collections.push(collection); + } + + result.collectionRelationships.push([result.ciphers.length, collectionIndex]); + }); + } else { + const tags = (value[1] as string).split(','); + let folderIndex = result.folders.length; + const hasFolder = tags.length > 0 && !this.isNullOrWhitespace(tags[0].trim()); + let addFolder = hasFolder; + const tag = tags[0].trim(); + + if (hasFolder) { + for (let i = 0; i < result.folders.length; i++) { + if (result.folders[i].name === tag) { + addFolder = false; + folderIndex = i; + break; + } + } + } + + if (addFolder) { + const f = new FolderView(); + f.name = tag; + result.folders.push(f); + } + if (hasFolder) { + result.folderRelationships.push([result.ciphers.length, folderIndex]); + } + } + } + + const cipher = new CipherView(); + cipher.type = CipherType.Login; + cipher.favorite = false; + cipher.notes = ''; + cipher.fields = []; + cipher.name = this.getValueOrDefault(value[0], '--'); + cipher.login = new LoginView(); + + for (let i = 2; i < value.length; i++) { + const header = headers[i].trim().toLowerCase(); + if (this.isNullOrWhitespace(value[i]) || this.isNullOrWhitespace(header)) { + continue; + } + + if (this.usernameFieldNames.indexOf(header) > -1) { + cipher.login.username = value[i]; + } else if (this.passwordFieldNames.indexOf(header) > -1) { + cipher.login.password = value[i]; + } else if (this.uriFieldNames.indexOf(header) > -1) { + cipher.login.uris = this.makeUriArray(value[i]); + } else { + if (value[i].length > 200 || value[i].search(this.newLineRegex) > -1) { + cipher.notes += (headers[i] + ': ' + value[i] + '\n'); + } else { + const field = new FieldView(); + field.type = FieldType.Text; + field.name = headers[i]; + field.value = value[i]; + cipher.fields.push(field); + } + } + } + + if (this.isNullOrWhitespace(cipher.notes)) { + cipher.notes = null; + } else { + cipher.notes = cipher.notes.trim(); + } + if (cipher.fields.length === 0) { + cipher.fields = null; + } + + result.ciphers.push(cipher); + }); + + result.success = true; + return result; + } +} diff --git a/src/importers/safeInCloudXmlImporter.ts b/src/importers/safeInCloudXmlImporter.ts index 43c82857546..1edaf8139fe 100644 --- a/src/importers/safeInCloudXmlImporter.ts +++ b/src/importers/safeInCloudXmlImporter.ts @@ -51,7 +51,7 @@ export class SafeInCloudXmlImporter extends BaseImporter implements Importer { if (labelIdEl != null) { const labelId = labelIdEl.textContent; if (!this.isNullOrWhitespace(labelId) && foldersMap.has(labelId)) { - result.folderRelationships.set(result.ciphers.length, foldersMap.get(labelId)); + result.folderRelationships.push([result.ciphers.length, foldersMap.get(labelId)]); } } diff --git a/src/models/domain/importResult.ts b/src/models/domain/importResult.ts index 152d08462e0..ab53fb1412e 100644 --- a/src/models/domain/importResult.ts +++ b/src/models/domain/importResult.ts @@ -7,7 +7,7 @@ export class ImportResult { errorMessage: string; ciphers: CipherView[] = []; folders: FolderView[] = []; - folderRelationships: Map = new Map(); + folderRelationships: Array<[number, number]> = []; collections: CollectionView[] = []; - collectionRelationships: Map = new Map(); + collectionRelationships: Array<[number, number]> = []; }