diff --git a/.gitignore b/.gitignore index 1e9f974..6a689fc 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ /node_modules /config.json /mails.txt -/out \ No newline at end of file +/out +/dist \ No newline at end of file diff --git a/README.md b/README.md index df0317e..9fe5253 100644 --- a/README.md +++ b/README.md @@ -103,16 +103,16 @@ ts-node .\index.ts --privkey private.key --decrypt --safe .\out\credentials.json z.B. `ts-node .\index.ts --privkey private.key --pubkey public.key --genkey` ==> Codes Erzeugen und versenden -`ts-node .\index.ts --config --pubkey --send --safe .\out\credentials.json --mails -html ` +`ts-node .\index.ts --config --pubkey --send --safe credentials.json --mails -html ` Achtung: Es wird im Safe geprüft, ob Mailadressen bereits "bedient" wurden. Sollte dies der Fall sein, werden keine Mails an diese Adresse gesendet. Dies lässt sich mit dem Schalter `--force` umgehen. -z.B. `ts-node .\index.ts --config config.json --pubkey public.key --send --safe .\out\credentials.json --mails mail.txt -html template.html` +z.B. `ts-node .\index.ts --config config.json --pubkey public.key --send --safe credentials.json --mails mail.txt -html template.html` ==> Safe entschlüsseln -`ts-node .\index.ts --privkey --decrypt --safe .\out\credentials.json` +`ts-node .\index.ts --privkey --decrypt --safe credentials.json` -z.B. `ts-node .\index.ts --privkey private.key --decrypt --safe .\out\credentials.json` +z.B. `ts-node .\index.ts --privkey private.key --decrypt --safe credentials.json` ### Erweiterte Schalter diff --git a/bin/opentoken-linux b/bin/opentoken-linux index 4b5152d..3511f41 100755 Binary files a/bin/opentoken-linux and b/bin/opentoken-linux differ diff --git a/bin/opentoken-macos b/bin/opentoken-macos index 67c48ae..d97ccba 100755 Binary files a/bin/opentoken-macos and b/bin/opentoken-macos differ diff --git a/bin/opentoken-win.exe b/bin/opentoken-win.exe index 0e42bdf..c1128f7 100644 Binary files a/bin/opentoken-win.exe and b/bin/opentoken-win.exe differ diff --git a/index.ts b/index.ts index ad02af9..9780ec7 100644 --- a/index.ts +++ b/index.ts @@ -54,6 +54,7 @@ if (!html && action == 1){ throw new Error("Mail-Template not specified") } if (action == 1){ let dataSafe: SecureVault = new SecureVault(pubKey,privKey); + dataSafe.writeTransaction(`Started ...`); // load config const confRaw = fs.readFileSync(configPath, 'utf8') let config:any = {} @@ -89,8 +90,11 @@ if (action == 1){ dataSafe.pushStorage('usedMails',el.mails) dataSafe.saveData(safeFile); } - - }).catch(err => console.error("error", err)) + dataSafe.writeTransaction(`Process exited successfully`); + }).catch(err => { + dataSafe.writeTransaction(`Process exited with error ${err}`); + console.error("error", err) + }) }else if(action == 2){ let dataSafe: SecureVault = new SecureVault(pubKey,privKey); dataSafe.loadData(safeFile); diff --git a/outcredentials.json b/outcredentials.json new file mode 100644 index 0000000..866cda1 --- /dev/null +++ b/outcredentials.json @@ -0,0 +1 @@ +{"version":"v1.2","vault":[{"u":"b9e41c30-858a-4372-8cbf-829e7d247746","d":"eb30084cc2c455ad1615842bddbaca6b0801bc98d8e524610a6dc48ad40c7929eb948f52789c5b985780ea3c5c33341c78a52002b19a540047b3b6918e37b1f2","k":"DbmzPM9CJjp/sW2H6Le66Ju4r2uQ+8NE+ztlzPvgkBk1hOa0ZEAl9mgGsPpKuN2i4jhps0BUUqE6THdvqCa5acFbWB4XJrEd/bgH1h1KMk6+U9lckepr3fr5PKCw7D+U7sSCh+xM6+4/3XL43a5/sTgrP7WuTflGmEZ88RrDT9igHma1ER919LZOBrEgPaKV4fw44IkEQZcay10ZqjvrRsM0g3+fEURz78wY7r9616ABhLfnLoFTmBIKHtWwO6HN24eS97MXEU/nIRGvlqmrH7WuzO+TTTm0m/IhBP2486mbvmAoV653A/sO5EywHtyDa3fO11M7q2qoTSBKwfFLIxEKJK9qbIFJVMZHJ+ihZljpe6aFgofEiTpM2jZHx9WT7OEp3ZCRfWsiD8rsrV1IHgHQcJnI/YeMqM83ybJtaUY4XWe2+7ZFGsSh0g73z2eQXTbJhvcUa7auOS6pEsa6l49Ye6AdPUaX6wES+YU1V2GiZg6QiHMT2+hbK5bEbeGYg6P8vtRXOmKbjmDd0NI+G9wgz40GwrifmgqURi/UGtLNX6xDM0fpc4N7ypK22pIvZycnZJTsHtO6ayXgp1lEbIQP8UNIGXIhZ/6iWEy/+dzg20eRpMk/xSow/d0VxLwypldtu8f5swP1AYeUF+IJE4OkP64AlgNQuHqfn0OwHyY=","iv":"2e85d66e8a944371907673860215a7aa"},{"u":"fd385dac-854d-4df4-ab8f-9470ffc39f86","d":"96b0de2ce736f239d4f533aee518653fd1b4a02eb57d36f9a9a6562ebebdda2e79e80c0f48e0cdeee6968e4ec0449f4962854070fdf57e85f783484a7391d8ab","k":"6LXSzUmzMIl0aoiihO6XhNUCVzrkCrGOdJN/f94ymsZAluPKHYeYnxT91OaxArOI92iAmOCSbbo1VtPkcMdh9jjFezqj4wGV0poGrc+1OKfj7ygE0XZKWA+LfhCejFHj4/xHemk4dM/cXtVJOjWLvWiAvv8eN35aicvw3DNSjf4wLMYMwQmKz6WOl0Dfd7Vix07HyDGUQ9RNCjl9sAZ/JXQIMO6uaW5mCgZWcXNo1MlGIIAE3gLAeLjl36J2N8/PTsPQrp4pDsWIABNkmCqmzc+dQzrBp1NuXwvoLqSpdIMeutmvHZvK5Izrf7TSXcczLfqHBLJUzoDLZHbvo1yG4xDQ54MLEUW51KngDHbvZgLNRhsI+sBs3x6lU0paTm8bhxEUtEd+q8z7A9+bLH9i+Zj6HijZSumPDHIZxwo6B5XsoC9cIG5DW75MbomDhtVBgEGB9Ceg18wyRf9IaKjOvsAKB9TtAwLkwnq1hrBhmhk5dnutUu5ALNhP2QyHC/VzxMCE0whiYxcJqJF7sP5ZBwQ9Ogyz+uCKsoiUYTLKKnR3kB4BzQWO1jA6Z24hveSnt6WUpI/cZgyK3d4Q80BHBM5Uq9NFWmHVEYhMzyI8rz6xkCU3O3ItmDwmMKMlrjKNy6UFnqFltUVN8BoqQSRQldeYnby77I8CvPwaZIEtWws=","iv":"ce645280911a982826f8ee85e9bdc3dd"},{"u":"cb08e958-80b7-466a-9036-941dc3c57004","d":"2a8d688290a3daed9aed02193ec22b49cf7484c897bb331e59270cd8913b508a80f941fa0023315c2754c4c6866655308a0188864c741bcd4a5288fa2c2e427437e31421e7c19b81c212ca7886bcf1da","k":"X31vp76VThvwSTJmz6tyQoCbnC872vRNNFVgYosN9N1YURHUTspj2WIS+wIlFrISubsc8/9bJoPHvM16rNisrG/+qeax6OZMnF+1LCXOzn5UeGHI6X1vlvtz6SZAzAnW+eskBGHvwOQfNJjd0Mqqqu66CiP5kssAJH1tQijQlzHpYs7Fg3LcgAroyAjbr5tkWUPry27+xrlZiKsEoHcMb510MiqPVG1t1bvcN9lsN5uB1cFcdO4qk6EEGPjxMdaWyFVKYy2ztlzgF3mQLR2Alp78L+tZob9t4WnHQNctg+qOdxNzM6haRN5PiYYwpVnq51H2vq+NZygR8QJlz3DCOFg1EFtB3BgiyTfcH94LCXA5Euic/ndz4yBwb2na5NYpQCO6QdRNgy17c7xBRjUIUDxoA9LRlg1xz7z6K9nvb049Z5htk59PtpgfmNpsHNeeQUNRQKsIWj19djorZEIQFr8LmZP5bnJ+4FVTayjHYun4lZD3Td5wCiRykxurnxIHTjE+Sfav1bSC5HSIAt0Voo8MLWCiaXA7eZTY8GOaoVXf6e9wVzrL2D5cNoDvyyA1u9AkGTsp/TNXe2JOyyAod0nOL2AU5vYPJ6pTxVExn/iVw5xfZcCPic5L/eN7FrLuwXcpfC7QFI/o2tKG7CV9HfIlOnL5Vaz7JVwiRvWQ8uc=","iv":"3748759e81a192c18270e5cc6dd99bbb"},{"u":"460cb370-98c7-4c98-90c8-e82ea99a6d86","d":"a9a0104251c0c8806d4d6c362806745e2883229f73b73298ce1c97c48cd44b116f717902de4eb9a3ce318e963186893fbddda1f4cef58039b2dd51628d4b9a72","k":"Tderqbkno7kZ+Y8GVDh70NckKrwU0iyzojczaIzvN1oDXRJj/MEqYNJfrGZASxnTjjX2ZBcQkx7elG9gpylRpt1TnZsq5fYkCAKDy2Il84CT+8UcGcXm92w/qH/GOxBOVlSs34Y4irFoIvySrhuGPXql6846b/+Q24TkER/kufEi1B/Wios9QzEdpx8/n3JqObF72Tzh2Db7bbIPk1DzlxGuRzCQwdsBTSzk+SGqvYM8oDCU4vBOuHYxFIqiDkfRU9i6lk4JJ2ja/8M+j2zHBtU9UiRS6ez/V46B3W8j8A3GqL1THQoX+k3msiA3yAemNz8ho3cF8v3pkpwjGyCxvfXC2/VVtQBE12YFqtjN5LzMwHyoj5N16wXYQrHJ/KkLS5bPhUbVXtHRdZ0QHRnWs2uLzDWebXrmwMVre2C6fekzJxM5fJGEbUTcgwlMCPqZ1U2ilisjGpa3CagulgrhICCHfn/2MNHzvD89s6q0mnzCfKFwHPLoLLSDQxNyplQWt0j5en2QBwAO/orpph8lZYQUmEFT4nK2Cstter0oHhZVZNQ1yD4q2BKaN0kUr6Kv3fCwQpNB8nMbQzd8CMRz/yfg+5jUACHIUgBxR6xKB0yKeG3xk3bI1Awv4KFEZPlXXsNohCPQgNMJswH18vs8/BvwmeFrDSKAOSikOuD3hHw=","iv":"a7a16ee4a8ae0e8a615d55816b9176ac"}],"storage":[{"u":"892f881b-a2e7-4561-9313-0baee1873c3a","d":"WyJaVkZRIiwiSUpOSSIsIjIyWTgiLCI3Rkc4Il0=","t":"usedTokens"},{"u":"38818994-db55-4f97-8a91-85f4365b5a9c","d":"W3sibWFpbCI6InRlc3QzQGRlbm5pc2d1bmlhLmRlIiwibmFtZSI6IlV3ZSJ9LHsibWFpbCI6InRlc3QyQGRlbm5pc2d1bmlhLmRlIiwibmFtZSI6IkthcmwifSx7Im1haWwiOiJ0ZXN0MUBkZW5uaXNndW5pYS5kZSIsIm5hbWUiOiJEZW5uaXMxIn0seyJtYWlsIjoidGVzdDI5QGRlbm5pc2d1bmlhLmRlIiwibmFtZSI6IkRlbm5pczEwIn1d","t":"usedMails"}]} \ No newline at end of file diff --git a/src/generate.ts b/src/generate.ts index 0304c97..14452d4 100644 --- a/src/generate.ts +++ b/src/generate.ts @@ -21,7 +21,7 @@ export interface genReturn{ export function generateToken(config: any,dataSafe: SecureVault): Promise{ return new Promise((resolve,error) => { - parseMails(config).then(res => { + parseMails(config, dataSafe).then(res => { generateCodes(resolve,error,res,config,dataSafe); }) }); @@ -91,6 +91,7 @@ async function sendMails(resolve: (value?: genReturn) => void,error: (reason?: a if (config.force){dataSafe.clearVault();} for(let i = 0; i < mailArray.length; i++){ // send mail + dataSafe.writeTransaction(`process: ${mailArray[i].mail}`); if (!config.dryrun){ dataSafe.pushData({ name: mailArray[i].name, @@ -98,7 +99,7 @@ async function sendMails(resolve: (value?: genReturn) => void,error: (reason?: a code: codeArray[i] }) } - await send(mailArray[i].name, mailArray[i].mail, codeArray[i],template,mailserver,config); + await send(mailArray[i].name, mailArray[i].mail, codeArray[i],template,mailserver,config,dataSafe); position ++; pbar.update(position); } @@ -114,7 +115,7 @@ async function sendMails(resolve: (value?: genReturn) => void,error: (reason?: a } -async function send(name: string, mail: string, code: string,template: HandlebarsTemplateDelegate,mailserver: Mail,config: any){ +async function send(name: string, mail: string, code: string,template: HandlebarsTemplateDelegate,mailserver: Mail,config: any,dataSafe: SecureVault){ if (config.dryrun){ await delay(100); console.log(`\n\x1b[36m -> dryrun: would send to ${mail}\x1b[0m`); @@ -133,8 +134,10 @@ async function send(name: string, mail: string, code: string,template: Handlebar }; try { await mailserver.sendMail(mailOptions); + dataSafe.writeTransaction(` -> mail sent`); } catch (error) { console.log(`Error sendign mail to ${mail} : ${error}`) + dataSafe.writeTransaction(` -> mail failed : ${error}`); } } } diff --git a/src/mailParser.ts b/src/mailParser.ts index 93640ca..fe32a56 100644 --- a/src/mailParser.ts +++ b/src/mailParser.ts @@ -1,13 +1,12 @@ -import { rejects } from "assert"; import * as fs from 'fs' -import { Console } from "console"; +import { SecureVault } from "./vault"; export interface MLItem{ mail: string; name: string; } -export function parseMails(config: any) { +export function parseMails(config: any, dataSafe: SecureVault) { return new Promise((resolve,reject) => { let mailArray: MLItem[] = []; let currSection: string = "global"; @@ -37,6 +36,7 @@ export function parseMails(config: any) { const ix = line.indexOf(";") if (ix !== -1){ // check if already exist + dataSafe.writeTransaction(`reading mail ${line.substr(0,ix)} from category ${currSection}`); if (config.force || config.usedMails.filter((el: MLItem) => el.mail == line.substr(0,ix)).length == 0){ mailArray.push({ mail: line.substr(0,ix), @@ -44,6 +44,7 @@ export function parseMails(config: any) { }) curCounter ++; }else{ + dataSafe.writeTransaction(` -> already exists. Skipping`); console.error(`Skipping ${line.substr(0,ix)}: Already sent`) } }else{ diff --git a/src/vault.ts b/src/vault.ts index 671a5ef..1c329db 100644 --- a/src/vault.ts +++ b/src/vault.ts @@ -59,15 +59,22 @@ export class SecureVault { } var asym_encrypted = crypto.publicEncrypt(this.safe.publicKey, buffer); const u = uuid.v4() - this.safe.items.push({ + + const item = { u, d: encrypted.toString('hex'), k: asym_encrypted.toString("base64"), iv: iv.toString('hex') - }) + } + this.writeTransaction("push: " + JSON.stringify(item)) + this.safe.items.push(item) return u; } + writeTransaction(payload: string){ + fs.appendFileSync('vault.log', `${payload}\n`); + } + async saveData(path: string): Promise{ fs.writeFileSync(path, JSON.stringify({ version: vaultVersion,