coolaj86/telebit.js
1
2
Fork 1
Code Issues 48 Pull Requests 3 Releases Activity

MAJOR: Updates for Authenticated Web UI and CLI #30

Open
coolaj86 wants to merge 77 commits from next into master
pull from: next
merge into: coolaj86:master
Conversation 0 Commits 77 Files Changed 28 +71 -41
1 changed files with 71 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b81ff7550b - Show all commits

112
lib/admin/js/app.js
View File

@ -3,6 +3,7 @@
var Vue = window.Vue; var Vue = window.Vue;
var Telebit = window.TELEBIT; var Telebit = window.TELEBIT;
var Keypairs = window.Keypairs;
var api = {}; var api = {};
/* /*
@ -462,52 +463,81 @@ new Vue({
, methods: appMethods , methods: appMethods
}); });
function run(key) {
// 1. Get ACME directory
// 2. Fetch ACME account
// 3. Test if account has access
// 4. Show command line auth instructions to auth
// 5. Sign requests / use JWT
// 6. Enforce token required for config, status, etc
// 7. Move admin interface to standard ports (admin.foo-bar-123.telebit.xyz)
api.config().then(function (config) {
telebitState.config = config;
if (config.greenlock) {
appData.init.acmeServer = config.greenlock.server;
}
if (config.relay) {
appData.init.relay = config.relay;
}
if (config.email) {
appData.init.email = config.email;
}
if (config.agreeTos) {
appData.init.letos = config.agreeTos;
appData.init.teletos = config.agreeTos;
}
if (config._otp) {
appData.init.otp = config._otp;
}
api.config().then(function (config) { telebitState.pollUrl = config._pollUrl || localStorage.getItem('poll_url');
telebitState.config = config;
if (config.greenlock) {
appData.init.acmeServer = config.greenlock.server;
}
if (config.relay) {
appData.init.relay = config.relay;
}
if (config.email) {
appData.init.email = config.email;
}
if (config.agreeTos) {
appData.init.letos = config.agreeTos;
appData.init.teletos = config.agreeTos;
}
if (config._otp) {
appData.init.otp = config._otp;
}
telebitState.pollUrl = config._pollUrl || localStorage.getItem('poll_url'); if ((!config.token && !config._otp) || !config.relay || !config.email || !config.agreeTos) {
changeState('setup');
setState();
return;
}
if (!config.token && config._otp) {
changeState('otp');
setState();
// this will skip ahead as necessary
return Telebit.authorize(telebitState, showOtp).then(function () {
return changeState('status');
});
}
if ((!config.token && !config._otp) || !config.relay || !config.email || !config.agreeTos) { // TODO handle default state
changeState('setup'); changeState('status');
setState(); }).catch(function (err) {
return; appData.views.flash.error = err.message || JSON.stringify(err, null, 2);
} });
if (!config.token && config._otp) { }
changeState('otp');
setState();
// this will skip ahead as necessary
return Telebit.authorize(telebitState, showOtp).then(function () {
return changeState('status');
});
}
// TODO handle default state
changeState('status'); // TODO protect key with passphrase (or QR code?)
}).catch(function (err) { function getKey() {
appData.views.flash.error = err.message || JSON.stringify(err, null, 2); var key;
}); try {
key = JSON.parse(localStorage.getItem('key'));
} catch(e) {
// ignore
}
if (key && key.kid && key.d) {
return Promise.resolve(key);
}
return Keypairs.generate().then(function (pair) {
key = pair.private;
localStorage.setItem('key', JSON.stringify(key));
return key;
});
}
window.api = api; window.api = api;
getKey().then(function (key) {
setTimeout(function () { run(key);
document.body.hidden = false; setTimeout(function () {
}, 50); document.body.hidden = false;
}, 50);
});
}()); }());