From a82f157b2e7f3f9731051953e5977cf97da74bbe Mon Sep 17 00:00:00 2001 From: AJ ONeal Date: Mon, 11 Jun 2018 12:56:16 -0600 Subject: [PATCH] telebit remote, telebit daemon --- bin/telebit.js | 771 +---------------- bin/telebitd.js | 772 ++++++++++++++++++ .../LaunchDaemons/cloud.telebit.remote.plist | 2 +- .../dist/etc/systemd/system/telebit.service | 2 +- usr/share/install_helper.sh | 27 +- 5 files changed, 793 insertions(+), 781 deletions(-) mode change 100755 => 100644 bin/telebit.js create mode 100755 bin/telebitd.js diff --git a/bin/telebit.js b/bin/telebit.js old mode 100755 new mode 100644 index e45f3b3..2805be6 --- a/bin/telebit.js +++ b/bin/telebit.js @@ -1,772 +1,3 @@ -#!/usr/bin/env node -(function () { 'use strict'; -var pkg = require('../package.json'); - -var url = require('url'); -var path = require('path'); -var http = require('http'); -var YAML = require('js-yaml'); -var state = { servernames: {}, ports: {} }; - -var argv = process.argv.slice(2); - -var confIndex = argv.indexOf('--config'); -var confpath; -var confargs; -if (-1 === confIndex) { - confIndex = argv.indexOf('-c'); -} -if (-1 !== confIndex) { - confargs = argv.splice(confIndex, 2); - confpath = confargs[1]; -} - -function help() { - console.info(''); - console.info('Telebit Remote v' + pkg.version); - console.info(''); - console.info('Daemon Usage:'); - console.info(''); - console.info('\tsudo telebit daemon --config '); - console.info('\tex: sudo telebit daemon --config /opt/telebit/etc/telebit.yml'); - console.info(''); - console.info('Remote Usage:'); - console.info(''); - console.info('\ttelebit [--config ] '); - console.info(''); - console.info('Examples:'); - console.info(''); - console.info('\ttelebit status # whether enabled or disabled'); - console.info('\ttelebit enable # disallow incoming connections'); - console.info('\ttelebit disable # allow incoming connections'); - console.info(''); - console.info('\ttelebit list # list rules for servernames and ports'); - console.info(''); - console.info('\ttelebit http none # remove all https handlers'); - console.info('\ttelebit http 3000 # forward all https traffic to port 3000'); - console.info('\ttelebit http /module/path # load a node module to handle all https traffic'); - console.info(''); - console.info('\ttelebit http none example.com # remove https handler from example.com'); - console.info('\ttelebit http 3001 example.com # forward https traffic for example.com to port 3001'); - console.info('\ttelebit http /module/path example.com # forward https traffic for example.com to port 3001'); - console.info(''); - console.info('\ttelebit tcp none # remove all tcp handlers'); - console.info('\ttelebit tcp 5050 # forward all tcp to port 5050'); - console.info('\ttelebit tcp /module/path # handle all tcp with a node module'); - console.info(''); - console.info('\ttelebit tcp none 6565 # remove tcp handler from external port 6565'); - console.info('\ttelebit tcp 5050 6565 # forward external port 6565 to local 5050'); - console.info('\ttelebit tcp /module/path 6565 # handle external port 6565 with a node module'); - console.info(''); - console.info('Config:'); - console.info(''); - console.info('\tSee https://git.coolaj86.com/coolaj86/telebit.js'); - console.info(''); - console.info(''); - process.exit(0); -} - -var verstr = '' + pkg.name + ' v' + pkg.version; -if (-1 === confIndex) { - confpath = path.join(require('os').homedir(), '.config/telebit/telebit.yml'); - verstr += ' (--config "' + confpath + '")'; -} -console.info(verstr + '\n'); - -if (-1 !== argv.indexOf('-h') || -1 !== argv.indexOf('--help')) { - help(); -} -if (!confpath || /^--/.test(confpath)) { - help(); -} -var defaultSockname = '/opt/telebit/var/telebit.sock'; -var tokenfile = 'access_token.txt'; -var tokenpath = path.join(path.dirname(confpath), tokenfile); -var token; -try { - token = require('fs').readFileSync(tokenpath, 'ascii').trim(); -} catch(e) { - // ignore -} -var controlServer; -require('fs').readFile(confpath, 'utf8', function (err, text) { - var config; - - var recase = require('recase').create({}); - var camelCopy = recase.camelCopy.bind(recase); - var snakeCopy = recase.snakeCopy.bind(recase); - - if (err) { - console.error("\nCouldn't load config:\n\n\t" + err.message + "\n"); - process.exit(1); - return; - } - - try { - config = JSON.parse(text); - } catch(e1) { - try { - config = YAML.safeLoad(text); - } catch(e2) { - console.error(e1.message); - console.error(e2.message); - process.exit(1); - return; - } - } - - state._confpath = confpath; - state.config = camelCopy(config); - if (state.config.token && token) { - console.warn(); - console.warn("Found two tokens:"); - console.warn(); - console.warn("\t1. " + tokenpath); - console.warn("\n2. " + confpath); - console.warn(); - console.warn("Choosing the first."); - console.warn(); - } - state.token = token; - - if (!state.config.servernames) { - state.config.servernames = {}; - } - if (!state.config.ports) { - state.config.ports = {}; - } - state.servernames = JSON.parse(JSON.stringify(state.config.servernames)); - state.ports = JSON.parse(JSON.stringify(state.config.ports)); - - function putConfig(service, args) { - // console.log('got it', service, args); - var http = require('http'); - var req = http.get({ - socketPath: state.config.sock || defaultSockname - , method: 'POST' - , path: '/rpc/' + service + '?_body=' + JSON.stringify(args) - }, function (resp) { - - function finish() { - if (200 !== resp.statusCode) { - console.warn("'" + service + "' may have failed." - + " Consider peaking at the logs either with 'journalctl -xeu telebit' or /opt/telebit/var/log/error.log"); - console.warn(resp.statusCode, body); - } else { - if (body) { - console.info('Response'); - console.info(body); - } else { - console.info("👌"); - } - } - } - - var body = ''; - if (resp.headers['content-length']) { - resp.on('data', function (chunk) { - body += chunk.toString(); - }); - resp.on('end', function () { - finish(); - }); - } else { - finish(); - } - }); - req.on('error', function (err) { - console.error('Error'); - console.error(err); - return; - }); - } - - var tun; - function serveControls() { - if (!state.config.disable) { - tun = rawTunnel(); - } - controlServer = http.createServer(function (req, res) { - var opts = url.parse(req.url, true); - if (opts.query._body) { - try { - opts.body = JSON.parse(opts.query._body, true); - } catch(e) { - res.statusCode = 500; - res.end('{"error":{"message":"?_body={{bad_format}}"}}'); - return; - } - } - - function listSuccess() { - res.end(YAML.safeDump({ - servernames: state.servernames - , ports: state.ports - , ssh: state.config.sshAuto || 'disabled' - })); - } - - function sshSuccess() { - fs.writeFile(confpath, YAML.safeDump(snakeCopy(state.config)), function (err) { - if (err) { - res.statusCode = 500; - res.end('{"error":{"message":"Could not save config file. Perhaps you\'re not running as root?"}}'); - return; - } - res.end('{"success":true}'); - }); - } - - if (/http/.test(opts.path)) { - if (!opts.body) { - res.statusCode = 422; - res.end('{"error":{"message":"needs more arguments"}}'); - return; - } - if (opts.body[1]) { - if (!state.servernames[opts.body[1]]) { - res.statusCode = 400; - res.end('{"error":{"message":"bad servername \'' + opts.body[1] + '\'"'); - return; - } - state.servernames[opts.body[1]].handler = opts.body[0]; - } else { - Object.keys(state.servernames).forEach(function (key) { - state.servernames[key].handler = opts.body[0]; - }); - } - res.end('{"success":true}'); - return; - } - - if (/tcp/.test(opts.path)) { - if (!opts.body) { - res.statusCode = 422; - res.end('{"error":{"message":"needs more arguments"}}'); - return; - } - - // portnum - if (opts.body[1]) { - if (!state.ports[opts.body[1]]) { - res.statusCode = 400; - res.end('{"error":{"message":"bad port \'' + opts.body[1] + '\'"'); - return; - } - // forward-to port-or-module - state.ports[opts.body[1]].handler = opts.body[0]; - } else { - Object.keys(state.ports).forEach(function (key) { - state.ports[key].handler = opts.body[0]; - }); - } - res.end('{"success":true}'); - return; - } - - if (/save|commit/.test(opts.path)) { - state.config.servernames = state.servernames; - state.config.ports = state.ports; - fs.writeFile(confpath, YAML.safeDump(snakeCopy(state.config)), function (err) { - if (err) { - res.statusCode = 500; - res.end('{"error":{"message":"Could not save config file. Perhaps you\'re not running as root?"}}'); - return; - } - listSuccess(); - }); - return; - } - - if (/ssh/.test(opts.path)) { - var sshAuto; - if (!opts.body) { - res.statusCode = 422; - res.end('{"error":{"message":"needs more arguments"}}'); - return; - } - - sshAuto = opts.body[0]; - if (-1 !== [ 'false', 'none', 'off', 'disable' ].indexOf(sshAuto)) { - state.config.sshAuto = false; - sshSuccess(); - return; - } - if (-1 !== [ 'true', 'auto', 'on', 'enable' ].indexOf(sshAuto)) { - state.config.sshAuto = 22; - sshSuccess(); - return; - } - sshAuto = parseInt(sshAuto, 10); - if (!sshAuto || sshAuto <= 0 || sshAuto > 65535) { - res.statusCode = 400; - res.end('{"error":{"message":"bad ssh_auto option \'' + opts.body[0] + '\'"'); - return; - } - state.config.sshAuto = sshAuto; - sshSuccess(); - return; - } - - if (/enable/.test(opts.path)) { - delete state.config.disable;// = undefined; - if (!tun) { tun = rawTunnel(); } - fs.writeFile(confpath, YAML.safeDump(snakeCopy(state.config)), function (err) { - if (err) { - res.statusCode = 500; - res.end('{"error":{"message":"Could not save config file. Perhaps you\'re not running as root?"}}'); - return; - } - listSuccess(); - }); - return; - } - - if (/disable/.test(opts.path)) { - state.config.disable = true; - if (tun) { tun.end(); tun = null; } - fs.writeFile(confpath, YAML.safeDump(snakeCopy(state.config)), function (err) { - if (err) { - res.statusCode = 500; - res.end('{"error":{"message":"Could not save config file. Perhaps you\'re not running as root?"}}'); - return; - } - res.end('{"success":true}'); - }); - return; - } - - if (/status/.test(opts.path)) { - res.end('{"status":' + (state.config.disable ? 'disabled' : 'enabled') + '}'); - return; - } - - if (/restart/.test(opts.path)) { - tun.end(); - res.end('{"success":true}'); - controlServer.close(function () { - // TODO closeAll other things - process.nextTick(function () { - // system daemon will restart the process - process.exit(22); // use non-success exit code - }); - }); - return; - } - - if (/list/.test(opts.path)) { - listSuccess(); - return; - } - - res.end('{"error":{"message":"unrecognized rpc"}}'); - }); - var pipename = (state.config.sock || defaultSockname); - var fs = require('fs'); - if (fs.existsSync(pipename)) { - fs.unlinkSync(pipename); - } - if (/^win/i.test(require('os').platform())) { - pipename = '\\\\?\\pipe' + pipename.replace(/\//, '\\'); - } - // mask is so that processes owned by other users - // can speak to this process, which is probably root-owned - var oldUmask = process.umask(0x0000); - controlServer.listen({ - path: pipename - , writableAll: true - , readableAll: true - , exclusive: false - }, function () { - process.umask(oldUmask); - }); - } - - // Two styles: - // http 3000 - // http modulename - function makeRpc(key) { - if (key !== argv[0]) { - return false; - } - putConfig(argv[0], argv.slice(1)); - return true; - } - - if ([ 'ssh', 'http', 'tcp' ].some(function (key) { - if (key !== argv[0]) { - return false; - } - if (argv[1]) { - putConfig(argv[0], argv.slice(1)); - return true; - } - help(); - return true; - })) { - return true; - } - - if ([ 'status', 'enable', 'disable', 'restart', 'list', 'save' ].some(makeRpc)) { - return; - } - - if (-1 !== argv.indexOf('daemon')) { - serveControls(); - return; - } - - help(); -}); - -function connectTunnel() { - function sigHandler() { - console.info('Received kill signal. Attempting to exit cleanly...'); - - // We want to handle cleanup properly unless something is broken in our cleanup process - // that prevents us from exitting, in which case we want the user to be able to send - // the signal again and exit the way it normally would. - process.removeListener('SIGINT', sigHandler); - tun.end(); - controlServer.close(); - } - process.on('SIGINT', sigHandler); - state.net = state.net || { - createConnection: function (info, cb) { - // data is the hello packet / first chunk - // info = { data, servername, port, host, remoteFamily, remoteAddress, remotePort } - var net = require('net'); - // socket = { write, push, end, events: [ 'readable', 'data', 'error', 'end' ] }; - var socket = net.createConnection({ port: info.port, host: info.host }, cb); - return socket; - } - }; - - state.greenlock = state.config.greenlock || {}; - state.sortingHat = state.config.sortingHat || path.resolve(__dirname, '..', 'lib/sorting-hat.js'); - - // TODO sortingHat.print(); ? - - if (state.config.email && !state.token) { - console.info(); - console.info('=================================='); - console.info('= HEY! LISTEN! ='); - console.info('=================================='); - console.info('= ='); - console.info('= 1. Open your email ='); - console.info('= 2. Click the magic login link ='); - console.info('= 3. Check back here for deets ='); - console.info('= ='); - console.info('=================================='); - console.info(); - } - // TODO Check undefined vs false for greenlock config - var remote = require('../'); - state.handlers = { - grant: function (grants) { - console.info(""); - console.info("Connect to your device by any of the following means:"); - console.info(""); - grants.forEach(function (arr) { - if ('https' === arr[0]) { - if (!state.servernames[arr[1]]) { - state.servernames[arr[1]] = {}; - } - } else if ('tcp' === arr[0]) { - if (!state.ports[arr[2]]) { - state.ports[arr[2]] = {}; - } - } - - if ('ssh+https' === arr[0]) { - console.info("SSH+HTTPS"); - } else if ('ssh' === arr[0]) { - console.info("SSH"); - } else if ('tcp' === arr[0]) { - console.info("TCP"); - } else if ('https' === arr[0]) { - console.info("HTTPS"); - } - console.info('\t' + arr[0] + '://' + arr[1] + (arr[2] ? (':' + arr[2]) : '')); - if ('ssh+https' === arr[0]) { - console.info("\tex: ssh -o ProxyCommand='openssl s_client -connect %h:%p -quiet' " + arr[1] + " -p 443\n"); - } else if ('ssh' === arr[0]) { - console.info("\tex: ssh " + arr[1] + " -p " + arr[2] + "\n"); - } else if ('tcp' === arr[0]) { - console.info("\tex: netcat " + arr[1] + " " + arr[2] + "\n"); - } else if ('https' === arr[0]) { - console.info("\tex: curl https://" + arr[1] + "\n"); - } - }); - } - , access_token: function (opts) { - console.info("Updating '" + tokenpath + "' with new token:"); - try { - require('fs').writeFileSync(tokenpath, opts.jwt); - } catch (e) { - console.error("Token not saved:"); - console.error(e); - } - } - }; - state.greenlockConfig = { - version: state.greenlock.version || 'draft-11' - , server: state.greenlock.server || 'https://acme-v02.api.letsencrypt.org/directory' - , communityMember: state.greenlock.communityMember || state.config.communityMember - , telemetry: state.greenlock.telemetry || state.config.telemetry - , configDir: state.greenlock.configDir || path.resolve(__dirname, '..', 'etc/acme/') - // TODO, store: require(state.greenlock.store.name || 'le-store-certbot').create(state.greenlock.store.options || {}) - , approveDomains: function (opts, certs, cb) { - // Certs being renewed are listed in certs.altnames - if (certs) { - opts.domains = certs.altnames; - cb(null, { options: opts, certs: certs }); - return; - } - - // by virtue of the fact that it's being tunneled through a - // trusted source that is already checking, we're good - //if (-1 !== state.config.servernames.indexOf(opts.domains[0])) { - opts.email = state.greenlock.email || state.config.email; - opts.agreeTos = state.greenlock.agree || state.config.agreeTos; - cb(null, { options: opts, certs: certs }); - return; - //} - - //cb(new Error("servername not found in allowed list")); - } - }; - state.insecure = state.config.relay_ignore_invalid_certificates; - // { relay, config, servernames, ports, sortingHat, net, insecure, token, handlers, greenlockConfig } - - var tun = remote.connect({ - relay: state.relay - , config: state.config - , sortingHat: state.sortingHat - , net: state.net - , insecure: state.insecure - , token: state.token - , servernames: state.servernames - , ports: state.ports - , handlers: state.handlers - , greenlockConfig: state.greenlockConfig - }); - - return tun; -} - -function rawTunnel() { - state.relay = state.config.relay; - if (!state.relay) { - throw new Error("'" + state._confpath + "' is missing 'relay'"); - } - - /* - if (!(state.config.secret || state.config.token)) { - console.error("You must use --secret or --token with --relay"); - process.exit(1); - return; - } - */ - - var location = url.parse(state.relay); - if (!location.protocol || /\./.test(location.protocol)) { - state.relay = 'wss://' + state.relay; - location = url.parse(state.relay); - } - var aud = location.hostname + (location.port ? ':' + location.port : ''); - state.relay = location.protocol + '//' + aud; - - if (!state.config.token && state.config.secret) { - var jwt = require('jsonwebtoken'); - var tokenData = { - domains: Object.keys(state.config.servernames || {}).filter(function (name) { return /\./.test(name); }) - , aud: aud - , iss: Math.round(Date.now() / 1000) - }; - - state.token = jwt.sign(tokenData, state.config.secret); - } - state.token = state.token || state.config.token; - - // TODO sign token with own private key, including public key and thumbprint - // (much like ACME JOSE account) - - return connectTunnel(); -} - -/* -var domainsMap = {}; -var services = {}; - -function collectDomains(val, memo) { - var vals = val.split(/,/g); - - function parseProxy(location) { - // john.example.com - // http:john.example.com:3000 - // http://john.example.com:3000 - var parts = location.split(':'); - if (1 === parts.length) { - // john.example.com -> :john.example.com:0 - parts[1] = parts[0]; - - parts[0] = ''; - parts[2] = 0; - } - else if (2 === parts.length) { - throw new Error("invalid arguments for --domains, should use the format or ::"); - } - if (!parts[1]) { - throw new Error("invalid arguments for --domains, should use the format or ::"); - } - - parts[0] = parts[0].toLowerCase(); - parts[1] = parts[1].toLowerCase().replace(/(\/\/)?/, ''); - parts[2] = parseInt(parts[2], 10) || 0; - - memo.push({ - protocol: parts[0] - , hostname: parts[1] - , port: parts[2] - }); - } - - vals.map(function (val) { - return parseProxy(val); - }); - - return memo; -} -function collectProxies(val, memo) { - var vals = val.split(/,/g); - - function parseProxy(location) { - // john.example.com - // https:3443 - // http:john.example.com:3000 - // http://john.example.com:3000 - var parts = location.split(':'); - var dual = false; - if (1 === parts.length) { - // john.example.com -> :john.example.com:0 - parts[1] = parts[0]; - - parts[0] = ''; - parts[2] = 0; - - dual = true; - } - else if (2 === parts.length) { - // https:3443 -> https:*:3443 - parts[2] = parts[1]; - - parts[1] = '*'; - } - - parts[0] = parts[0].toLowerCase(); - parts[1] = parts[1].toLowerCase().replace(/(\/\/)?/, '') || '*'; - parts[2] = parseInt(parts[2], 10) || 0; - if (!parts[2]) { - // TODO grab OS list of standard ports? - if (!parts[0] || 'http' === parts[0]) { - parts[2] = 80; - } - else if ('https' === parts[0]) { - parts[2] = 443; - } - else { - throw new Error("port must be specified - ex: tls:*:1337"); - } - } - - memo.push({ - protocol: parts[0] || 'https' - , hostname: parts[1] - , port: parts[2] || 443 - }); - - if (dual) { - memo.push({ - protocol: 'http' - , hostname: parts[1] - , port: 80 - }); - } - } - - vals.map(function (val) { - return parseProxy(val); - }); - - return memo; -} - -var program = require('commander'); -program - .version(pkg.version) - //.command('jsurl ') - .arguments('') - .action(function (url) { - program.url = url; - }) - .option('-k --insecure', 'Allow TLS connections to a Telebit Relay without valid certs (rejectUnauthorized: false)') - .option('--locals ', 'comma separated list of : to which matching incoming http and https should forward (reverse proxy). Ex: https:8443,smtps:8465', collectProxies, [ ]) // --reverse-proxies - .option('--domains ', 'comma separated list of domain names to set to the tunnel (to capture a specific protocol to a specific local port use the format https:example.com:1337 instead). Ex: example.com,example.net', collectDomains, [ ]) - .option('--device [HOSTNAME]', 'Tunnel all domains associated with this device instead of specific domainnames. Use with --locals :. Ex: macbook-pro.local (the output of `hostname`)') - .option('--relay ', 'the domain (or ip address) at which you are running Telebit Relay (the proxy)') // --proxy - .option('--secret ', 'the same secret used by the Telebit Relay (used for JWT authentication)') - .option('--token ', 'a pre-generated token for use with the Telebit Relay (instead of generating one with --secret)') - .option('--agree-tos', 'agree to the Telebit Terms of Service (requires user validation)') - .option('--email ', 'email address (or cloud address) for user validation') - .option('--oauth3-url ', 'Cloud Authentication to use (default: https://oauth3.org)') - .parse(process.argv) - ; - - -program.locals = (program.locals || []).concat(program.domains || []); -program.locals.forEach(function (proxy) { - // Create a map from which we can derive a list of all domains we want forwarded to us. - if (proxy.hostname && proxy.hostname !== '*') { - domainsMap[proxy.hostname] = true; - } - - // Create a map of which port different protocols should be forwarded to, allowing for specific - // domains to go to different ports if need be (though that only works for HTTP and HTTPS). - if (proxy.protocol && proxy.port) { - services[proxy.protocol] = services[proxy.protocol] || {}; - - if (/http/.test(proxy.protocol) && proxy.hostname && proxy.hostname !== '*') { - services[proxy.protocol][proxy.hostname] = proxy.port; - } - else { - if (services[proxy.protocol]['*'] && services[proxy.protocol]['*'] !== proxy.port) { - console.error('cannot forward generic', proxy.protocol, 'traffic to multiple ports'); - process.exit(1); - } - else { - services[proxy.protocol]['*'] = proxy.port; - } - } - } -}); - -if (Object.keys(domainsMap).length === 0) { - console.error('no domains specified'); - process.exit(1); - return; -} - -// Make sure we have generic ports for HTTP and HTTPS -services.https = services.https || {}; -services.https['*'] = services.https['*'] || 8443; - -services.http = services.http || {}; -services.http['*'] = services.http['*'] || services.https['*']; - -program.services = services; -*/ - -}()); +require('./telebitd.js'); diff --git a/bin/telebitd.js b/bin/telebitd.js new file mode 100755 index 0000000..dc2dd06 --- /dev/null +++ b/bin/telebitd.js @@ -0,0 +1,772 @@ +#!/usr/bin/env node +(function () { +'use strict'; + +var pkg = require('../package.json'); + +var url = require('url'); +var path = require('path'); +var http = require('http'); +var YAML = require('js-yaml'); +var state = { servernames: {}, ports: {} }; + +var argv = process.argv.slice(2); + +var confIndex = argv.indexOf('--config'); +var confpath; +var confargs; +if (-1 === confIndex) { + confIndex = argv.indexOf('-c'); +} +if (-1 !== confIndex) { + confargs = argv.splice(confIndex, 2); + confpath = confargs[1]; +} + +function help() { + console.info(''); + console.info('Telebit Remote v' + pkg.version); + console.info(''); + console.info('Daemon Usage:'); + console.info(''); + console.info('\tsudo telebitd --config '); + console.info('\tex: sudo telebitd --config /opt/telebit/etc/telebit.yml'); + console.info(''); + console.info('Remote Usage:'); + console.info(''); + console.info('\ttelebit [--config ] '); + console.info(''); + console.info('Examples:'); + console.info(''); + console.info('\ttelebit status # whether enabled or disabled'); + console.info('\ttelebit enable # disallow incoming connections'); + console.info('\ttelebit disable # allow incoming connections'); + console.info(''); + console.info('\ttelebit list # list rules for servernames and ports'); + console.info(''); + console.info('\ttelebit http none # remove all https handlers'); + console.info('\ttelebit http 3000 # forward all https traffic to port 3000'); + console.info('\ttelebit http /module/path # load a node module to handle all https traffic'); + console.info(''); + console.info('\ttelebit http none example.com # remove https handler from example.com'); + console.info('\ttelebit http 3001 example.com # forward https traffic for example.com to port 3001'); + console.info('\ttelebit http /module/path example.com # forward https traffic for example.com to port 3001'); + console.info(''); + console.info('\ttelebit tcp none # remove all tcp handlers'); + console.info('\ttelebit tcp 5050 # forward all tcp to port 5050'); + console.info('\ttelebit tcp /module/path # handle all tcp with a node module'); + console.info(''); + console.info('\ttelebit tcp none 6565 # remove tcp handler from external port 6565'); + console.info('\ttelebit tcp 5050 6565 # forward external port 6565 to local 5050'); + console.info('\ttelebit tcp /module/path 6565 # handle external port 6565 with a node module'); + console.info(''); + console.info('Config:'); + console.info(''); + console.info('\tSee https://git.coolaj86.com/coolaj86/telebit.js'); + console.info(''); + console.info(''); + process.exit(0); +} + +var verstr = '' + pkg.name + ' v' + pkg.version; +if (-1 === confIndex) { + confpath = path.join(require('os').homedir(), '.config/telebit/telebit.yml'); + verstr += ' (--config "' + confpath + '")'; +} +console.info(verstr + '\n'); + +if (-1 !== argv.indexOf('-h') || -1 !== argv.indexOf('--help')) { + help(); +} +if (!confpath || /^--/.test(confpath)) { + help(); +} +var defaultSockname = '/opt/telebit/var/telebit.sock'; +var tokenfile = 'access_token.txt'; +var tokenpath = path.join(path.dirname(confpath), tokenfile); +var token; +try { + token = require('fs').readFileSync(tokenpath, 'ascii').trim(); +} catch(e) { + // ignore +} +var controlServer; +require('fs').readFile(confpath, 'utf8', function (err, text) { + var config; + + var recase = require('recase').create({}); + var camelCopy = recase.camelCopy.bind(recase); + var snakeCopy = recase.snakeCopy.bind(recase); + + if (err) { + console.error("\nCouldn't load config:\n\n\t" + err.message + "\n"); + process.exit(1); + return; + } + + try { + config = JSON.parse(text); + } catch(e1) { + try { + config = YAML.safeLoad(text); + } catch(e2) { + console.error(e1.message); + console.error(e2.message); + process.exit(1); + return; + } + } + + state._confpath = confpath; + state.config = camelCopy(config); + if (state.config.token && token) { + console.warn(); + console.warn("Found two tokens:"); + console.warn(); + console.warn("\t1. " + tokenpath); + console.warn("\n2. " + confpath); + console.warn(); + console.warn("Choosing the first."); + console.warn(); + } + state.token = token; + + if (!state.config.servernames) { + state.config.servernames = {}; + } + if (!state.config.ports) { + state.config.ports = {}; + } + state.servernames = JSON.parse(JSON.stringify(state.config.servernames)); + state.ports = JSON.parse(JSON.stringify(state.config.ports)); + + function putConfig(service, args) { + // console.log('got it', service, args); + var http = require('http'); + var req = http.get({ + socketPath: state.config.sock || defaultSockname + , method: 'POST' + , path: '/rpc/' + service + '?_body=' + JSON.stringify(args) + }, function (resp) { + + function finish() { + if (200 !== resp.statusCode) { + console.warn("'" + service + "' may have failed." + + " Consider peaking at the logs either with 'journalctl -xeu telebit' or /opt/telebit/var/log/error.log"); + console.warn(resp.statusCode, body); + } else { + if (body) { + console.info('Response'); + console.info(body); + } else { + console.info("👌"); + } + } + } + + var body = ''; + if (resp.headers['content-length']) { + resp.on('data', function (chunk) { + body += chunk.toString(); + }); + resp.on('end', function () { + finish(); + }); + } else { + finish(); + } + }); + req.on('error', function (err) { + console.error('Error'); + console.error(err); + return; + }); + } + + var tun; + function serveControls() { + if (!state.config.disable) { + tun = rawTunnel(); + } + controlServer = http.createServer(function (req, res) { + var opts = url.parse(req.url, true); + if (opts.query._body) { + try { + opts.body = JSON.parse(opts.query._body, true); + } catch(e) { + res.statusCode = 500; + res.end('{"error":{"message":"?_body={{bad_format}}"}}'); + return; + } + } + + function listSuccess() { + res.end(YAML.safeDump({ + servernames: state.servernames + , ports: state.ports + , ssh: state.config.sshAuto || 'disabled' + })); + } + + function sshSuccess() { + fs.writeFile(confpath, YAML.safeDump(snakeCopy(state.config)), function (err) { + if (err) { + res.statusCode = 500; + res.end('{"error":{"message":"Could not save config file. Perhaps you\'re not running as root?"}}'); + return; + } + res.end('{"success":true}'); + }); + } + + if (/http/.test(opts.path)) { + if (!opts.body) { + res.statusCode = 422; + res.end('{"error":{"message":"needs more arguments"}}'); + return; + } + if (opts.body[1]) { + if (!state.servernames[opts.body[1]]) { + res.statusCode = 400; + res.end('{"error":{"message":"bad servername \'' + opts.body[1] + '\'"'); + return; + } + state.servernames[opts.body[1]].handler = opts.body[0]; + } else { + Object.keys(state.servernames).forEach(function (key) { + state.servernames[key].handler = opts.body[0]; + }); + } + res.end('{"success":true}'); + return; + } + + if (/tcp/.test(opts.path)) { + if (!opts.body) { + res.statusCode = 422; + res.end('{"error":{"message":"needs more arguments"}}'); + return; + } + + // portnum + if (opts.body[1]) { + if (!state.ports[opts.body[1]]) { + res.statusCode = 400; + res.end('{"error":{"message":"bad port \'' + opts.body[1] + '\'"'); + return; + } + // forward-to port-or-module + state.ports[opts.body[1]].handler = opts.body[0]; + } else { + Object.keys(state.ports).forEach(function (key) { + state.ports[key].handler = opts.body[0]; + }); + } + res.end('{"success":true}'); + return; + } + + if (/save|commit/.test(opts.path)) { + state.config.servernames = state.servernames; + state.config.ports = state.ports; + fs.writeFile(confpath, YAML.safeDump(snakeCopy(state.config)), function (err) { + if (err) { + res.statusCode = 500; + res.end('{"error":{"message":"Could not save config file. Perhaps you\'re not running as root?"}}'); + return; + } + listSuccess(); + }); + return; + } + + if (/ssh/.test(opts.path)) { + var sshAuto; + if (!opts.body) { + res.statusCode = 422; + res.end('{"error":{"message":"needs more arguments"}}'); + return; + } + + sshAuto = opts.body[0]; + if (-1 !== [ 'false', 'none', 'off', 'disable' ].indexOf(sshAuto)) { + state.config.sshAuto = false; + sshSuccess(); + return; + } + if (-1 !== [ 'true', 'auto', 'on', 'enable' ].indexOf(sshAuto)) { + state.config.sshAuto = 22; + sshSuccess(); + return; + } + sshAuto = parseInt(sshAuto, 10); + if (!sshAuto || sshAuto <= 0 || sshAuto > 65535) { + res.statusCode = 400; + res.end('{"error":{"message":"bad ssh_auto option \'' + opts.body[0] + '\'"'); + return; + } + state.config.sshAuto = sshAuto; + sshSuccess(); + return; + } + + if (/enable/.test(opts.path)) { + delete state.config.disable;// = undefined; + if (!tun) { tun = rawTunnel(); } + fs.writeFile(confpath, YAML.safeDump(snakeCopy(state.config)), function (err) { + if (err) { + res.statusCode = 500; + res.end('{"error":{"message":"Could not save config file. Perhaps you\'re not running as root?"}}'); + return; + } + listSuccess(); + }); + return; + } + + if (/disable/.test(opts.path)) { + state.config.disable = true; + if (tun) { tun.end(); tun = null; } + fs.writeFile(confpath, YAML.safeDump(snakeCopy(state.config)), function (err) { + if (err) { + res.statusCode = 500; + res.end('{"error":{"message":"Could not save config file. Perhaps you\'re not running as root?"}}'); + return; + } + res.end('{"success":true}'); + }); + return; + } + + if (/status/.test(opts.path)) { + res.end('{"status":' + (state.config.disable ? 'disabled' : 'enabled') + '}'); + return; + } + + if (/restart/.test(opts.path)) { + tun.end(); + res.end('{"success":true}'); + controlServer.close(function () { + // TODO closeAll other things + process.nextTick(function () { + // system daemon will restart the process + process.exit(22); // use non-success exit code + }); + }); + return; + } + + if (/list/.test(opts.path)) { + listSuccess(); + return; + } + + res.end('{"error":{"message":"unrecognized rpc"}}'); + }); + var pipename = (state.config.sock || defaultSockname); + var fs = require('fs'); + if (fs.existsSync(pipename)) { + fs.unlinkSync(pipename); + } + if (/^win/i.test(require('os').platform())) { + pipename = '\\\\?\\pipe' + pipename.replace(/\//, '\\'); + } + // mask is so that processes owned by other users + // can speak to this process, which is probably root-owned + var oldUmask = process.umask(0x0000); + controlServer.listen({ + path: pipename + , writableAll: true + , readableAll: true + , exclusive: false + }, function () { + process.umask(oldUmask); + }); + } + + // Two styles: + // http 3000 + // http modulename + function makeRpc(key) { + if (key !== argv[0]) { + return false; + } + putConfig(argv[0], argv.slice(1)); + return true; + } + + if ([ 'ssh', 'http', 'tcp' ].some(function (key) { + if (key !== argv[0]) { + return false; + } + if (argv[1]) { + putConfig(argv[0], argv.slice(1)); + return true; + } + help(); + return true; + })) { + return true; + } + + if ([ 'status', 'enable', 'disable', 'restart', 'list', 'save' ].some(makeRpc)) { + return; + } + + if (-1 !== argv.indexOf('daemon')) { + serveControls(); + return; + } + + help(); +}); + +function connectTunnel() { + function sigHandler() { + console.info('Received kill signal. Attempting to exit cleanly...'); + + // We want to handle cleanup properly unless something is broken in our cleanup process + // that prevents us from exitting, in which case we want the user to be able to send + // the signal again and exit the way it normally would. + process.removeListener('SIGINT', sigHandler); + tun.end(); + controlServer.close(); + } + process.on('SIGINT', sigHandler); + state.net = state.net || { + createConnection: function (info, cb) { + // data is the hello packet / first chunk + // info = { data, servername, port, host, remoteFamily, remoteAddress, remotePort } + var net = require('net'); + // socket = { write, push, end, events: [ 'readable', 'data', 'error', 'end' ] }; + var socket = net.createConnection({ port: info.port, host: info.host }, cb); + return socket; + } + }; + + state.greenlock = state.config.greenlock || {}; + state.sortingHat = state.config.sortingHat || path.resolve(__dirname, '..', 'lib/sorting-hat.js'); + + // TODO sortingHat.print(); ? + + if (state.config.email && !state.token) { + console.info(); + console.info('=================================='); + console.info('= HEY! LISTEN! ='); + console.info('=================================='); + console.info('= ='); + console.info('= 1. Open your email ='); + console.info('= 2. Click the magic login link ='); + console.info('= 3. Check back here for deets ='); + console.info('= ='); + console.info('=================================='); + console.info(); + } + // TODO Check undefined vs false for greenlock config + var remote = require('../'); + state.handlers = { + grant: function (grants) { + console.info(""); + console.info("Connect to your device by any of the following means:"); + console.info(""); + grants.forEach(function (arr) { + if ('https' === arr[0]) { + if (!state.servernames[arr[1]]) { + state.servernames[arr[1]] = {}; + } + } else if ('tcp' === arr[0]) { + if (!state.ports[arr[2]]) { + state.ports[arr[2]] = {}; + } + } + + if ('ssh+https' === arr[0]) { + console.info("SSH+HTTPS"); + } else if ('ssh' === arr[0]) { + console.info("SSH"); + } else if ('tcp' === arr[0]) { + console.info("TCP"); + } else if ('https' === arr[0]) { + console.info("HTTPS"); + } + console.info('\t' + arr[0] + '://' + arr[1] + (arr[2] ? (':' + arr[2]) : '')); + if ('ssh+https' === arr[0]) { + console.info("\tex: ssh -o ProxyCommand='openssl s_client -connect %h:%p -quiet' " + arr[1] + " -p 443\n"); + } else if ('ssh' === arr[0]) { + console.info("\tex: ssh " + arr[1] + " -p " + arr[2] + "\n"); + } else if ('tcp' === arr[0]) { + console.info("\tex: netcat " + arr[1] + " " + arr[2] + "\n"); + } else if ('https' === arr[0]) { + console.info("\tex: curl https://" + arr[1] + "\n"); + } + }); + } + , access_token: function (opts) { + console.info("Updating '" + tokenpath + "' with new token:"); + try { + require('fs').writeFileSync(tokenpath, opts.jwt); + } catch (e) { + console.error("Token not saved:"); + console.error(e); + } + } + }; + state.greenlockConfig = { + version: state.greenlock.version || 'draft-11' + , server: state.greenlock.server || 'https://acme-v02.api.letsencrypt.org/directory' + , communityMember: state.greenlock.communityMember || state.config.communityMember + , telemetry: state.greenlock.telemetry || state.config.telemetry + , configDir: state.greenlock.configDir || path.resolve(__dirname, '..', 'etc/acme/') + // TODO, store: require(state.greenlock.store.name || 'le-store-certbot').create(state.greenlock.store.options || {}) + , approveDomains: function (opts, certs, cb) { + // Certs being renewed are listed in certs.altnames + if (certs) { + opts.domains = certs.altnames; + cb(null, { options: opts, certs: certs }); + return; + } + + // by virtue of the fact that it's being tunneled through a + // trusted source that is already checking, we're good + //if (-1 !== state.config.servernames.indexOf(opts.domains[0])) { + opts.email = state.greenlock.email || state.config.email; + opts.agreeTos = state.greenlock.agree || state.config.agreeTos; + cb(null, { options: opts, certs: certs }); + return; + //} + + //cb(new Error("servername not found in allowed list")); + } + }; + state.insecure = state.config.relay_ignore_invalid_certificates; + // { relay, config, servernames, ports, sortingHat, net, insecure, token, handlers, greenlockConfig } + + var tun = remote.connect({ + relay: state.relay + , config: state.config + , sortingHat: state.sortingHat + , net: state.net + , insecure: state.insecure + , token: state.token + , servernames: state.servernames + , ports: state.ports + , handlers: state.handlers + , greenlockConfig: state.greenlockConfig + }); + + return tun; +} + +function rawTunnel() { + state.relay = state.config.relay; + if (!state.relay) { + throw new Error("'" + state._confpath + "' is missing 'relay'"); + } + + /* + if (!(state.config.secret || state.config.token)) { + console.error("You must use --secret or --token with --relay"); + process.exit(1); + return; + } + */ + + var location = url.parse(state.relay); + if (!location.protocol || /\./.test(location.protocol)) { + state.relay = 'wss://' + state.relay; + location = url.parse(state.relay); + } + var aud = location.hostname + (location.port ? ':' + location.port : ''); + state.relay = location.protocol + '//' + aud; + + if (!state.config.token && state.config.secret) { + var jwt = require('jsonwebtoken'); + var tokenData = { + domains: Object.keys(state.config.servernames || {}).filter(function (name) { return /\./.test(name); }) + , aud: aud + , iss: Math.round(Date.now() / 1000) + }; + + state.token = jwt.sign(tokenData, state.config.secret); + } + state.token = state.token || state.config.token; + + // TODO sign token with own private key, including public key and thumbprint + // (much like ACME JOSE account) + + return connectTunnel(); +} + +/* +var domainsMap = {}; +var services = {}; + +function collectDomains(val, memo) { + var vals = val.split(/,/g); + + function parseProxy(location) { + // john.example.com + // http:john.example.com:3000 + // http://john.example.com:3000 + var parts = location.split(':'); + if (1 === parts.length) { + // john.example.com -> :john.example.com:0 + parts[1] = parts[0]; + + parts[0] = ''; + parts[2] = 0; + } + else if (2 === parts.length) { + throw new Error("invalid arguments for --domains, should use the format or ::"); + } + if (!parts[1]) { + throw new Error("invalid arguments for --domains, should use the format or ::"); + } + + parts[0] = parts[0].toLowerCase(); + parts[1] = parts[1].toLowerCase().replace(/(\/\/)?/, ''); + parts[2] = parseInt(parts[2], 10) || 0; + + memo.push({ + protocol: parts[0] + , hostname: parts[1] + , port: parts[2] + }); + } + + vals.map(function (val) { + return parseProxy(val); + }); + + return memo; +} +function collectProxies(val, memo) { + var vals = val.split(/,/g); + + function parseProxy(location) { + // john.example.com + // https:3443 + // http:john.example.com:3000 + // http://john.example.com:3000 + var parts = location.split(':'); + var dual = false; + if (1 === parts.length) { + // john.example.com -> :john.example.com:0 + parts[1] = parts[0]; + + parts[0] = ''; + parts[2] = 0; + + dual = true; + } + else if (2 === parts.length) { + // https:3443 -> https:*:3443 + parts[2] = parts[1]; + + parts[1] = '*'; + } + + parts[0] = parts[0].toLowerCase(); + parts[1] = parts[1].toLowerCase().replace(/(\/\/)?/, '') || '*'; + parts[2] = parseInt(parts[2], 10) || 0; + if (!parts[2]) { + // TODO grab OS list of standard ports? + if (!parts[0] || 'http' === parts[0]) { + parts[2] = 80; + } + else if ('https' === parts[0]) { + parts[2] = 443; + } + else { + throw new Error("port must be specified - ex: tls:*:1337"); + } + } + + memo.push({ + protocol: parts[0] || 'https' + , hostname: parts[1] + , port: parts[2] || 443 + }); + + if (dual) { + memo.push({ + protocol: 'http' + , hostname: parts[1] + , port: 80 + }); + } + } + + vals.map(function (val) { + return parseProxy(val); + }); + + return memo; +} + +var program = require('commander'); +program + .version(pkg.version) + //.command('jsurl ') + .arguments('') + .action(function (url) { + program.url = url; + }) + .option('-k --insecure', 'Allow TLS connections to a Telebit Relay without valid certs (rejectUnauthorized: false)') + .option('--locals ', 'comma separated list of : to which matching incoming http and https should forward (reverse proxy). Ex: https:8443,smtps:8465', collectProxies, [ ]) // --reverse-proxies + .option('--domains ', 'comma separated list of domain names to set to the tunnel (to capture a specific protocol to a specific local port use the format https:example.com:1337 instead). Ex: example.com,example.net', collectDomains, [ ]) + .option('--device [HOSTNAME]', 'Tunnel all domains associated with this device instead of specific domainnames. Use with --locals :. Ex: macbook-pro.local (the output of `hostname`)') + .option('--relay ', 'the domain (or ip address) at which you are running Telebit Relay (the proxy)') // --proxy + .option('--secret ', 'the same secret used by the Telebit Relay (used for JWT authentication)') + .option('--token ', 'a pre-generated token for use with the Telebit Relay (instead of generating one with --secret)') + .option('--agree-tos', 'agree to the Telebit Terms of Service (requires user validation)') + .option('--email ', 'email address (or cloud address) for user validation') + .option('--oauth3-url ', 'Cloud Authentication to use (default: https://oauth3.org)') + .parse(process.argv) + ; + + +program.locals = (program.locals || []).concat(program.domains || []); +program.locals.forEach(function (proxy) { + // Create a map from which we can derive a list of all domains we want forwarded to us. + if (proxy.hostname && proxy.hostname !== '*') { + domainsMap[proxy.hostname] = true; + } + + // Create a map of which port different protocols should be forwarded to, allowing for specific + // domains to go to different ports if need be (though that only works for HTTP and HTTPS). + if (proxy.protocol && proxy.port) { + services[proxy.protocol] = services[proxy.protocol] || {}; + + if (/http/.test(proxy.protocol) && proxy.hostname && proxy.hostname !== '*') { + services[proxy.protocol][proxy.hostname] = proxy.port; + } + else { + if (services[proxy.protocol]['*'] && services[proxy.protocol]['*'] !== proxy.port) { + console.error('cannot forward generic', proxy.protocol, 'traffic to multiple ports'); + process.exit(1); + } + else { + services[proxy.protocol]['*'] = proxy.port; + } + } + } +}); + +if (Object.keys(domainsMap).length === 0) { + console.error('no domains specified'); + process.exit(1); + return; +} + +// Make sure we have generic ports for HTTP and HTTPS +services.https = services.https || {}; +services.https['*'] = services.https['*'] || 8443; + +services.http = services.http || {}; +services.http['*'] = services.http['*'] || services.https['*']; + +program.services = services; +*/ + +}()); diff --git a/usr/share/dist/Library/LaunchDaemons/cloud.telebit.remote.plist b/usr/share/dist/Library/LaunchDaemons/cloud.telebit.remote.plist index d8cf4fe..d0de60e 100644 --- a/usr/share/dist/Library/LaunchDaemons/cloud.telebit.remote.plist +++ b/usr/share/dist/Library/LaunchDaemons/cloud.telebit.remote.plist @@ -7,7 +7,7 @@ ProgramArguments /opt/telebit/bin/node - /opt/telebit/bin/telebit.js + /opt/telebit/bin/telebitd.js daemon --config /opt/telebit/etc/telebit.yml diff --git a/usr/share/dist/etc/systemd/system/telebit.service b/usr/share/dist/etc/systemd/system/telebit.service index 6694e43..9440d0a 100644 --- a/usr/share/dist/etc/systemd/system/telebit.service +++ b/usr/share/dist/etc/systemd/system/telebit.service @@ -24,7 +24,7 @@ Group=telebit WorkingDirectory=/opt/telebit # custom directory cannot be set and will be the place where this exists, not the working directory -ExecStart=/opt/telebit/bin/node /opt/telebit/bin/telebit.js daemon --config /opt/telebit/etc/telebit.yml +ExecStart=/opt/telebit/bin/node /opt/telebit/bin/telebitd.js daemon --config /opt/telebit/etc/telebit.yml ExecReload=/bin/kill -USR1 $MAINPID # Limit the number of file descriptors and processes; see `man systemd.exec` for more limit settings. diff --git a/usr/share/install_helper.sh b/usr/share/install_helper.sh index 2374120..8856ab4 100644 --- a/usr/share/install_helper.sh +++ b/usr/share/install_helper.sh @@ -31,6 +31,7 @@ set -u ### http_bash exported by get.sh +TELEBIT_VERSION=${TELEBIT_VERSION:-master} my_email=${1:-} my_relay=${2:-} my_servernames=${3:-} @@ -38,6 +39,7 @@ my_secret=${4:-} my_user="telebit" my_app_pkg_name="cloud.telebit.remote" my_app="telebit" +my_daemon="telebitd" my_bin="telebit.js" my_name="Telebit Remote" my_repo="telebit.js" @@ -96,7 +98,6 @@ $sudo_cmd mkdir -p "$TELEBIT_PATH" echo " - installing node.js runtime to '$TELEBIT_PATH'..." http_bash https://git.coolaj86.com/coolaj86/node-installer.sh/raw/branch/master/install.sh --no-dev-deps >/dev/null 2>/dev/null -my_tree="telebit" # my_branch my_node="$TELEBIT_PATH/bin/node" my_npm="$my_node $TELEBIT_PATH/bin/npm" my_tmp="$(mktemp -d)" @@ -115,20 +116,21 @@ $sudo_cmd chown -R $(id -u -n):$(id -g -n) "$TELEBIT_PATH" set +e my_unzip=$(type -p unzip) my_tar=$(type -p tar) +# TODO extract to temporary directory, configure, copy etc, replace if [ -n "$my_unzip" ]; then - rm -f $my_tmp/$my_app-$my_tree.zip + rm -f $my_tmp/$my_app-$TELEBIT_VERSION.zip echo " - installing telebit zip to '$TELEBIT_PATH'..." - http_get https://git.coolaj86.com/coolaj86/$my_repo/archive/$my_tree.zip $my_tmp/$my_app-$my_tree.zip + http_get https://git.coolaj86.com/coolaj86/$my_repo/archive/$TELEBIT_VERSION.zip $my_tmp/$my_app-$TELEBIT_VERSION.zip # -o means overwrite, and there is no option to strip - $my_unzip -o $my_tmp/$my_app-$my_tree.zip -d $TELEBIT_PATH/ > /dev/null 2>&1 + $my_unzip -o $my_tmp/$my_app-$TELEBIT_VERSION.zip -d $TELEBIT_PATH/ > /dev/null 2>&1 $rsync_cmd $TELEBIT_PATH/$my_repo/* $TELEBIT_PATH/ > /dev/null - rm -rf $TELEBIT_PATH/$my_bin + rm -rf $TELEBIT_PATH/$my_repo elif [ -n "$my_tar" ]; then - rm -f $my_tmp/$my_app-$my_tree.tar.gz + rm -f $my_tmp/$my_app-$TELEBIT_VERSION.tar.gz echo " - installing telebit tar.gz to '$TELEBIT_PATH'..." - http_get https://git.coolaj86.com/coolaj86/$my_repo/archive/$my_tree.tar.gz $my_tmp/$my_app-$my_tree.tar.gz - ls -lah $my_tmp/$my_app-$my_tree.tar.gz - $my_tar -xzf $my_tmp/$my_app-$my_tree.tar.gz --strip 1 -C $TELEBIT_PATH/ + http_get https://git.coolaj86.com/coolaj86/$my_repo/archive/$TELEBIT_VERSION.tar.gz $my_tmp/$my_app-$TELEBIT_VERSION.tar.gz + ls -lah $my_tmp/$my_app-$TELEBIT_VERSION.tar.gz + $my_tar -xzf $my_tmp/$my_app-$TELEBIT_VERSION.tar.gz --strip 1 -C $TELEBIT_PATH/ else echo "Neither tar nor unzip found. Abort." exit 13 @@ -143,10 +145,16 @@ popd >/dev/null echo " - configuring telebit..." +# telebit remote echo '#!/bin/bash' > "$TELEBIT_PATH/bin/$my_app" echo "$my_node $TELEBIT_PATH/bin/$my_bin "'"$@"' >> "$TELEBIT_PATH/bin/$my_app" chmod a+x "$TELEBIT_PATH/bin/$my_app" +# telebit daemon +echo '#!/bin/bash' > "$TELEBIT_PATH/bin/$my_daemon" +echo "$my_node $TELEBIT_PATH/bin/$my_daemon.js daemon "'"$@"' >> "$TELEBIT_PATH/bin/$my_daemon" +chmod a+x "$TELEBIT_PATH/bin/$my_daemon" + # Create uninstall script based on the install script variables cat << EOF > $TELEBIT_PATH/bin/${my_app}_uninstall #!/bin/bash @@ -159,6 +167,7 @@ if [ "$(type -p systemctl)" ]; then sudo rm -rf /etc/systemd/system/$my_app.service fi sudo rm -rf $TELEBIT_PATH /usr/local/bin/$my_app +sudo rm -rf $TELEBIT_PATH /usr/local/bin/$my_daemon rm -rf ~/.config/$my_app ~/.local/share/$my_app EOF chmod a+x $TELEBIT_PATH/bin/${my_app}_uninstall