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 +347 -338
1 changed files with 347 additions and 338 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a6e4bda317 - Show all commits

15
bin/telebitd.js
View File

@ -326,8 +326,15 @@ controllers.ssh = function (req, res, opts) {
state.config.sshAuto = sshAuto; state.config.sshAuto = sshAuto;
sshSuccess(); sshSuccess();
}; };
function serveControlsHelper() {
controlServer = http.createServer(function (req, res) { var serveStatic = require('serve-static')(path.join(__dirname, '../lib/admin/'));
function handleRemoteClient(req, res) {
if (/^\/(rpc|api)\//.test(req.url)) {
return handleApi(req, res);
}
serveStatic(req, res, require('finalhandler')(req, res));
}
function handleApi(req, res) {
var opts = url.parse(req.url, true); var opts = url.parse(req.url, true);
if (false && opts.query._body) { if (false && opts.query._body) {
try { try {
@ -675,7 +682,9 @@ function serveControlsHelper() {
} }
route(); route();
}); });
}); }
function serveControlsHelper() {
controlServer = http.createServer(handleRemoteClient);
if (fs.existsSync(state._ipc.path)) { if (fs.existsSync(state._ipc.path)) {
fs.unlinkSync(state._ipc.path); fs.unlinkSync(state._ipc.path);