@@ -38,11 +38,26 @@
window.$ = window.jQuery = require('../assets/jquery-3.4.1.min.js');
const { Loader } = require('../js/loader.js');
+ const { Format } = require('../js/format.js');
const { remote } = require('electron');
const pgp = require('openpgp');
let master_password = "";
const loader = new Loader(document.getElementById('content'));
+ const format = new Format("%AzTka312K1%Google|mondei1|passwords_not2134|email_either@example.com|https://accounts.google.com|(2fa_backup)245131,...|(uncompressed)value");
+ format.parse();
+
+ console.log(format.build({
+ decryptionKey: "az35LKuJ$w",
+ title: "Steam",
+ password: "lol_my-password1412%$",
+ custom: [
+ {
+ key: "2fa_secret",
+ value: "R24829"
+ }
+ ]
+ }));
// Slide
$('#master').keypress(async (e) => {
@@ -85,55 +100,7 @@
error.css('bottom', '-500px;')
}, 5000);
- }
-
- async function startWatching() {
- return new Promise((resolve, reject) => {
- Instascan.Camera.getCameras().then(function (cameras) {
- if (cameras.length > 0) {
- scanner.start(cameras[0]);
- navigator.mediaDevices.getUserMedia({video: true}).then((stream) => {
- preview.srcObject = stream;
- resolve(true);
- })
- } else {
- resolve(false);
- }
- }).catch(function (e) {
- showError("No camera found.");
- $('#wait').animate({
- left: '150%'
- }, 200);
- $('#master_prompt').animate({
- left: '0'
- }, 100);
- });
-
- navigator.mediaDevices.getUserMedia({video: true});
- const preview = document.getElementById('preview');
-
- let scanner = new Instascan.Scanner({ video: preview, mirror: false });
-
- scanner.addListener('scan', async (content) => {
- content = "-----BEGIN PGP MESSAGE-----\n\n" + content + "\n-----END PGP MESSAGE-----";
- console.log(content)
- pgp.decrypt({
- message: await pgp.message.readArmored(content),
- passwords: [ master_password ],
- format: 'string'
- }).then((plaintext) => {
- const scanned = $('#scanned');
- scanned.css('top', '85%');
- scanned.css('z-index', '2');
- scanned.addClass("fadeInUp");
- $('#password').text(plaintext.data)
- console.log(plaintext.data);
- }).catch((err) => {
- if (err) showError("Wrong master password");
- })
- });
- })
- }
+ }
function slide_left(from, to, duration = 300) {
$('#' + from).animate({
diff --git a/src/html/welcome.html b/src/html/welcome.html
new file mode 100644
index 0000000..2c7b668
--- /dev/null
+++ b/src/html/welcome.html
@@ -0,0 +1,8 @@
+
+
+
+
Welcome
+
to OffPass, the next level of password storage.
+
Let's start
+
+
\ No newline at end of file
diff --git a/src/js/create.ts b/src/js/create.ts
new file mode 100644
index 0000000..e69de29
diff --git a/src/js/format.js b/src/js/format.js
new file mode 100644
index 0000000..b2fea49
--- /dev/null
+++ b/src/js/format.js
@@ -0,0 +1,81 @@
+"use strict";
+/**
+ * This script is responsible to handle the data stored on QR-Codes.
+ * For detailed information, please take a look at DEVELOPMENT.md in
+ * the projects root directory.
+ */
+exports.__esModule = true;
+var Format = /** @class */ (function () {
+ /**
+ * Format handler
+ * @param text The unparsed text provided on a QR-Code
+ */
+ function Format(text) {
+ // Example: %session_key%§xa|mondei1|passwords_not2134|email_too@example.com|§q|(§a)§gh|(uncompressed)value
+ // Google|mondei1|passwords_not2134|email_either@example.com|https://accounts.google.com|(2fa_backup)245131,...|(uncompressed)value
+ this.text = null;
+ this.format = {
+ title: "",
+ username: "",
+ password: "",
+ email: "",
+ loginURL: null
+ };
+ this.text = text;
+ }
+ Format.prototype.isCompatible = function () {
+ return true;
+ };
+ Format.prototype.decrypt = function () {
+ if (this.isCompatible()) {
+ }
+ };
+ Format.prototype.parse = function () {
+ var parts = this.text.split('|');
+ // Parse static values
+ this.format.title = parts[0];
+ // Check if a decryption key exists at the start
+ if (this.format.title.startsWith('%')) {
+ this.format.decryptionKey = "";
+ // Extract
+ for (var i = 1; i < this.format.title.length; i++) {
+ var char = this.format.title.charAt(i);
+ if (char != '%') {
+ this.format.decryptionKey += char;
+ }
+ else {
+ break;
+ }
+ }
+ // Remove decryption key from first value
+ this.format.title = this.format.title.substr(this.format.decryptionKey.length + 2, this.format.title.length); // + 2 because of the two '%'
+ }
+ this.format.username = parts[1];
+ this.format.password = parts[2];
+ this.format.email = parts[3];
+ this.format.loginURL = new URL(parts[4]);
+ console.log(this.format);
+ };
+ Format.prototype.build = function (data) {
+ if (data == undefined)
+ data = this.format;
+ var raw = "";
+ if (data.decryptionKey != undefined) {
+ raw += "%" + data.decryptionKey + "%";
+ }
+ raw += data.title + "|";
+ raw += data.username + "|";
+ raw += data.password + "|";
+ raw += data.email + "|";
+ raw += data.loginURL + "|";
+ if (data.custom != undefined) {
+ data.custom.forEach(function (element) {
+ raw += "(" + element.key + ")" + element.value + "|";
+ });
+ }
+ raw = raw.substr(0, raw.length - 1); // Remove the last |
+ return raw;
+ };
+ return Format;
+}());
+exports.Format = Format;
diff --git a/src/js/format.ts b/src/js/format.ts
new file mode 100644
index 0000000..ceeab79
--- /dev/null
+++ b/src/js/format.ts
@@ -0,0 +1,105 @@
+/**
+ * This script is responsible to handle the data stored on QR-Codes.
+ * For detailed information, please take a look at DEVELOPMENT.md in
+ * the projects root directory.
+ */
+
+export interface ICustom {
+ key: string;
+ value: string;
+}
+
+export interface IFormat {
+ decryptionKey?: string;
+ title: string;
+ username?: string;
+ password: string;
+ email?: string;
+ loginURL?: URL;
+ custom?: Array
;
+}
+
+export class Format {
+ // Example: %session_key%§xa|mondei1|passwords_not2134|email_too@example.com|§q|(§a)§gh|(uncompressed)value
+ // Google|mondei1|passwords_not2134|email_either@example.com|https://accounts.google.com|(2fa_backup)245131,...|(uncompressed)value
+ text: string = null;
+ format: IFormat = {
+ title: "",
+ username: "",
+ password: "",
+ email: "",
+ loginURL: null
+ };
+
+ /**
+ * Format handler
+ * @param text The unparsed text provided on a QR-Code
+ */
+ constructor(text?: string) {
+ this.text = text;
+ }
+
+ isCompatible(): boolean {
+ return true;
+ }
+
+ decrypt() {
+ if(this.isCompatible()) {
+
+ }
+ }
+
+ parse() {
+ const parts = this.text.split('|');
+
+ // Parse static values
+ this.format.title = parts[0];
+
+ // Check if a decryption key exists at the start
+ if(this.format.title.startsWith('%')) {
+ this.format.decryptionKey = "";
+ // Extract
+ for(let i = 1; i < this.format.title.length; i++) {
+ const char = this.format.title.charAt(i);
+
+ if (char != '%') {
+ this.format.decryptionKey += char;
+ } else {
+ break;
+ }
+ }
+ // Remove decryption key from first value
+ this.format.title = this.format.title.substr(this.format.decryptionKey.length + 2, this.format.title.length) // + 2 because of the two '%'
+ }
+
+ this.format.username = parts[1];
+ this.format.password = parts[2];
+ this.format.email = parts[3];
+ this.format.loginURL = new URL(parts[4]);
+
+ console.log(this.format);
+ }
+
+ build(data?: IFormat): string {
+ if (data == undefined) data = this.format;
+
+ let raw = "";
+ if(data.decryptionKey != undefined) {
+ raw += "%" + data.decryptionKey + "%";
+ }
+ raw += data.title + "|";
+ raw += data.username + "|";
+ raw += data.password + "|";
+ raw += data.email + "|";
+ raw += data.loginURL + "|";
+
+ if (data.custom != undefined) {
+ data.custom.forEach(element => {
+ raw += `(${element.key})${element.value}|`;
+ });
+ }
+ raw = raw.substr(0, raw.length - 1); // Remove the last |
+
+ return raw;
+ }
+}
\ No newline at end of file
diff --git a/src/js/loader.js b/src/js/loader.js
index 3553e83..626ffbc 100644
--- a/src/js/loader.js
+++ b/src/js/loader.js
@@ -61,11 +61,6 @@ var Loader = /** @class */ (function () {
css.setAttribute("href", "../css/" + module_name + ".css");
_this.head.appendChild(css);
var html_path = path_1.resolve("src/html/", module_name + ".html");
- // Load js file
- var js = document.createElement("script");
- js.setAttribute("type", "text/javascript");
- js.setAttribute("src", "../js/" + module_name + ".js");
- _this.head.appendChild(js);
// Load html file
fs_1.readFile(html_path, 'utf8', function (err, data) {
if (err) {
@@ -74,6 +69,11 @@ var Loader = /** @class */ (function () {
}
else {
_this.content.innerHTML += data;
+ // Load js file
+ var js = document.createElement("script");
+ js.setAttribute("type", "text/javascript");
+ js.setAttribute("src", "../js/" + module_name + ".js");
+ _this.head.appendChild(js);
// Push to loaded modules
var mod = { name: module_name, js: js, css: css, html: document.getElementById(module_name) };
_this.modules.push(mod);
@@ -85,22 +85,15 @@ var Loader = /** @class */ (function () {
});
};
Loader.prototype.unload = function (module_name) {
- return __awaiter(this, void 0, void 0, function () {
- return __generator(this, function (_a) {
- this.modules.forEach(function (element) {
- if (element.name == module_name) {
- console.log(element);
- /*
- element.js.parentElement.removeChild(element.js);
- element.css.parentElement.removeChild(element.css);
- element.html.parentElement.removeChild(element.html);*/
- element.html.remove();
- element.css.remove();
- element.js.remove();
- }
- });
- return [2 /*return*/];
- });
+ this.modules.forEach(function (element) {
+ if (element.name == module_name) {
+ console.log(element);
+ element.html.remove();
+ element.css.remove();
+ element.js.remove();
+ return;
+ }
+ console.error("Tried to remove module which is not loaded:", module_name);
});
};
return Loader;
diff --git a/src/js/loader.ts b/src/js/loader.ts
index 18c051c..5669b97 100644
--- a/src/js/loader.ts
+++ b/src/js/loader.ts
@@ -32,12 +32,6 @@ export class Loader {
const html_path: string = res("src/html/", module_name + ".html");
- // Load js file
- const js = document.createElement("script");
- js.setAttribute("type", "text/javascript");
- js.setAttribute("src", "../js/" + module_name + ".js");
- this.head.appendChild(js);
-
// Load html file
readFile(html_path, 'utf8', (err, data) => {
if (err) {
@@ -46,6 +40,12 @@ export class Loader {
}
else {
this.content.innerHTML += data;
+
+ // Load js file
+ const js = document.createElement("script");
+ js.setAttribute("type", "text/javascript");
+ js.setAttribute("src", "../js/" + module_name + ".js");
+ this.head.appendChild(js);
// Push to loaded modules
const mod: IModules = { name: module_name, js: js, css: css, html: document.getElementById(module_name) };
@@ -57,18 +57,17 @@ export class Loader {
});
}
- async unload(module_name) {
+ unload(module_name) {
this.modules.forEach(element => {
if (element.name == module_name) {
console.log(element);
- /*
- element.js.parentElement.removeChild(element.js);
- element.css.parentElement.removeChild(element.css);
- element.html.parentElement.removeChild(element.html);*/
+
element.html.remove();
element.css.remove();
element.js.remove();
+ return;
}
+ console.error("Tried to remove module which is not loaded:", module_name);
});
}
}
\ No newline at end of file
diff --git a/src/js/scanner.js b/src/js/scanner.js
index e69de29..213b347 100644
--- a/src/js/scanner.js
+++ b/src/js/scanner.js
@@ -0,0 +1,47 @@
+async function startWatching() {
+ return new Promise((resolve, reject) => {
+ Instascan.Camera.getCameras().then(function (cameras) {
+ if (cameras.length > 0) {
+ scanner.start(cameras[0]);
+ navigator.mediaDevices.getUserMedia({video: true}).then((stream) => {
+ preview.srcObject = stream;
+ resolve(true);
+ })
+ } else {
+ resolve(false);
+ }
+ }).catch(function (e) {
+ showError("No camera found.");
+ $('#wait').animate({
+ left: '150%'
+ }, 200);
+ $('#master_prompt').animate({
+ left: '0'
+ }, 100);
+ });
+
+ navigator.mediaDevices.getUserMedia({video: true});
+ const preview = document.getElementById('preview');
+
+ let scanner = new Instascan.Scanner({ video: preview, mirror: false });
+
+ scanner.addListener('scan', async (content) => {
+ content = "-----BEGIN PGP MESSAGE-----\n\n" + content + "\n-----END PGP MESSAGE-----";
+ console.log(content)
+ pgp.decrypt({
+ message: await pgp.message.readArmored(content),
+ passwords: [ master_password ],
+ format: 'string'
+ }).then((plaintext) => {
+ const scanned = $('#scanned');
+ scanned.css('top', '85%');
+ scanned.css('z-index', '2');
+ scanned.addClass("fadeInUp");
+ $('#password').text(plaintext.data)
+ console.log(plaintext.data);
+ }).catch((err) => {
+ if (err) showError("Wrong master password");
+ })
+ });
+ })
+}
\ No newline at end of file
diff --git a/src/js/welcome.js b/src/js/welcome.js
new file mode 100644
index 0000000..6ac9896
--- /dev/null
+++ b/src/js/welcome.js
@@ -0,0 +1,8 @@
+const welcome_container = document.getElementById('welcome');
+
+$('#welcome a').click((e) => {
+ $('#master_prompt').css('left', '150%');
+ $('#master_prompt').css('display', 'block');
+ slide_left('welcome', 'master_prompt');
+ $('#master_prompt').css('left', '0');
+});
\ No newline at end of file
diff --git a/tsconfig.json b/tsconfig.json
index 7a73a41..cbf48e3 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,2 +1,6 @@
{
+ "compilerOptions": {
+ "allowSyntheticDefaultImports": true,
+ "module": "commonjs"
+ }
}
\ No newline at end of file