Merge pull request #1 from puppetlabs/minimal

Minimal

Author: Josh Samuelson

.gitignore

@@ -0,0 +1,16 @@
+lib-cov
+*.seed
+*.log
+*.csv
+*.dat
+*.out
+*.pid
+*.gz
+
+tmp
+pids
+logs
+results
+
+npm-debug.log
+node_modules/*

Dockerfile

@@ -0,0 +1,37 @@
+module.exports = function (grunt) {
+
+    require('load-grunt-tasks')(grunt);
+
+    var config = {
+        mkdir: {
+            tmp: {
+                options: {
+                    create: ['tmp']
+                }
+            }
+        },
+        gitclone: {
+            hterm: {
+                options: {
+                    cwd: './tmp',
+                    repository: 'https://chromium.googlesource.com/apps/libapps'
+                }
+            }
+        },
+        shell: {
+            build_hterm: {
+                command: 'LIBDOT_SEARCH_PATH=$(pwd) ./libdot/bin/concat.sh -i ./hterm/concat/hterm_all.concat -o ../../public/wetty/hterm_all.js',
+                options: {
+                    execOptions: {
+                        cwd: './tmp/libapps'
+                    }
+                }
+            }
+        },
+        clean: ['./tmp']
+    };
+
+    grunt.initConfig(config);
+
+    grunt.registerTask('update-hterm', ['mkdir:tmp', 'gitclone:hterm', 'shell:build_hterm', 'clean']);
+};

Gruntfile.js

@@ -80,11 +80,6 @@ Else if you are running `app.js` as a regular user you have to use:
 
 **Note that if your Nginx is configured for HTTPS you should run wetty without SSL.**
 
-Issues
-------
-
-Does not work on Firefox as hterm was written for ChromeOS. So works well on Chrome.
-
 Dockerized Version
 ------------------
 
@@ -94,8 +89,23 @@ whatever you want!
 Just do:
 
 ```
-docker run --name term -p 3000 -dt nathanleclaire/wetty
+    docker run --name term -p 3000 -dt nathanleclaire/wetty
 ```
 
 Visit the appropriate URL in your browser (`[localhost|$(boot2docker ip)]:PORT`).  
 The username is `term` and the password is `term`.
+
+Run wetty as a service daemon
+-----------------------------
+
+Install wetty globally with -g option:
+
+```bash
+    $ sudo npm install wetty -g
+    $ sudo cp /usr/local/lib/node_modules/wetty/bin/wetty.conf /etc/init
+    $ sudo start wetty
+```
+
+This will start wetty on port 3000. If you want to change the port or redirect stdout/stderr you should change the last line in `wetty.conf` file, something like this:
+
+    exec sudo -u root wetty -p 80 >> /var/log/wetty.log 2>&1

README.md

@@ -1,152 +1,75 @@
 var express = require('express');
 var http = require('http');
-var https = require('https');
 var path = require('path');
-var ws = require('websocket').server;
+var server = require('socket.io');
 var pty = require('pty.js');
-var fs = require('fs');
-var waitpid = require('waitpid');
 
 var opts = require('optimist')
     .options({
-        sslkey: {
-            demand: false,
-            description: 'path to SSL key'
-        },
-        sslcert: {
-            demand: false,
-            description: 'path to SSL certificate'
-        },
-        sshhost: {
-            demand: false,
-            description: 'ssh server host'
-        },
-        sshport: {
-            demand: false,
-            description: 'ssh server port'
-        },
-        sshuser: {
-            demand: false,
-            description: 'ssh user'
-        },
-        sshauth: {
-            demand: false,
-            description: 'defaults to "password", you can use "publickey,password" instead'
-        },
         port: {
             demand: true,
             alias: 'p',
             description: 'wetty listen port'
         },
+        command: {
+            demand: false,
+            alias: 'c',
+            description: 'command to run in shell, defaults to /bin/login'
+        },
     }).boolean('allow_discovery').argv;
 
-var runhttps = false;
-var sshport = 22;
-var sshhost = 'localhost';
-var sshauth = 'password';
-var globalsshuser = '';
-
-if (opts.sshport) {
-    sshport = opts.sshport;
-}
-
-if (opts.sshhost) {
-    sshhost = opts.sshhost;
-}
-
-if (opts.sshauth) {
-	sshauth = opts.sshauth
-}
-
-if (opts.sshuser) {
-    globalsshuser = opts.sshuser;
-}
+var command = '/bin/login';
 
-if (opts.sslkey && opts.sslcert) {
-    runhttps = true;
-    opts['ssl'] = {};
-    opts.ssl['key'] = fs.readFileSync(path.resolve(opts.sslkey));
-    opts.ssl['cert'] = fs.readFileSync(path.resolve(opts.sslcert));
+if (opts.command) {
+  command = opts.command;
 }
 
 process.on('uncaughtException', function(e) {
     console.error('Error: ' + e);
 });
 
-var httpserv;
 
 var app = express();
-app.get('/wetty/ssh/:user', function(req, res) {
-    res.sendfile(__dirname + '/public/wetty/index.html');
+app.get('/course/:course', function(req, res) {
+  var course = req.params.course;
+  res.sendfile(__dirname + '/public/index.html');
 });
 app.use('/', express.static(path.join(__dirname, 'public')));
 
-if (runhttps) {
-    httpserv = https.createServer(opts.ssl, app).listen(opts.port, function() {
-        console.log('https on port ' + opts.port);
-    });
-} else {
-    httpserv = http.createServer(app).listen(opts.port, function() {
-        console.log('http on port ' + opts.port);
-    });
-}
-
-var wss = new ws({
-    httpServer: httpserv
+var httpserv = http.createServer(app).listen(opts.port, function() {
+    console.log('http on port ' + opts.port);
 });
 
-wss.on('request', function(request) {
-    var term;
-    var sshuser = '';
-    var conn = request.accept('wetty', request.origin);
-    console.log((new Date()) + ' Connection accepted.');
-    if (request.resource.match('^/wetty/ssh/')) {
-        sshuser = request.resource;
-        sshuser = sshuser.replace('/wetty/ssh/', '');
-    }
-    if (sshuser) {
-        sshuser = sshuser + '@';
-    } else if (globalsshuser) {
-        sshuser = globalsshuser + '@';
+var io = server(httpserv);
+io.on('connection', function(socket){
+    var request = socket.request;
+    var course = 'default';
+    if (match = request.headers.referer.match('/course/.+$')) {
+      course =  match[0].replace('/course/', '');
     }
-    conn.on('message', function(msg) {
-        var data = JSON.parse(msg.utf8Data);
-        if (!term) {
-            if (process.getuid() == 0) {
-                term = pty.spawn('/bin/login', [], {
-                    name: 'xterm-256color',
-                    cols: 80,
-                    rows: 30
-                });
-            } else {
-                term = pty.spawn('ssh', [sshuser + sshhost, '-p', sshport, '-o', 'PreferredAuthentications=' + sshauth], {
-                    name: 'xterm-256color',
-                    cols: 80,
-                    rows: 30
-                });
-            }
-            console.log((new Date()) + " PID=" + term.pid + " STARTED on behalf of user=" + sshuser)
-            term.on('data', function(data) {
-                conn.send(JSON.stringify({
-                    data: data
-                }));
-            });
-            term.on('exit', function(code) {
-                console.log((new Date()) + " PID=" + term.pid + " ENDED")
-            })
-        }
-        if (!data)
-            return;
-        if (data.rowcol) {
-            term.resize(data.col, data.row);
-        } else if (data.data) {
-            term.write(data.data);
-        }
+    console.log((new Date()) + ' Connection accepted.');
+
+    var term;
+    term = pty.spawn(command, [course], {
+        name: 'xterm-256color',
+        cols: 80,
+        rows: 30
     });
-    conn.on('error', function() {
-        term.end();
+
+    console.log((new Date()) + " PID=" + term.pid + " STARTED")
+    term.on('data', function(data) {
+        socket.emit('output', data);
     });
-    conn.on('close', function() {
+    term.on('exit', function(code) {
+        console.log((new Date()) + " PID=" + term.pid + " ENDED")
+    });
+    socket.on('resize', function(data) {
+        term.resize(data.col, data.row);
+    });
+    socket.on('input', function(data) {
+        term.write(data);
+    });
+    socket.on('disconnect', function() {
         term.end();
-    })
+    });
 })

app.js

@@ -0,0 +1,13 @@
+# Upstart script
+# /etc/init/wetty.conf
+
+description "Web TTY"
+author      "Wetty"
+
+start on started mountall
+stop on shutdown
+
+respawn
+respawn limit 20 5
+
+exec sudo -u root wetty -p 3000

bin/wetty.conf

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+
+require("../app");

bin/wetty.js

@@ -1,24 +1,34 @@
 {
-  "name": "wetty",
-  "version": "0.0.8",
-  "dependencies": {
-    "express": "3.5.1",
-    "websocket": "",
-    "pty.js": "git+https://github.com/terryschen/pty.js",
-    "optimist": "",
-    "waitpid": ""
-  },
-  "description": "Wetty = Web + tty. Terminal access in browser over http/https ",
-  "main": "app.js",
-  "devDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/krishnasrinivas/wetty.git"
-  },
-  "author": "Krishna Srinivas <[email protected]> (https://github.com/krishnasrinivas)",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/krishnasrinivas/wetty/issues"
-  },
-  "homepage": "https://github.com/krishnasrinivas/wetty"
+    "name": "wetty",
+    "version": "0.2.0",
+    "dependencies": {
+        "express": "3.5.1",
+        "socket.io": "^1.3.7",
+        "pty.js": "^0.3.0",
+        "optimist": "^0.6"
+    },
+    "devDependencies": {
+        "load-grunt-tasks": "^3.0",
+        "grunt": "^0.4",
+        "grunt-shell": "^1.1",
+        "grunt-mkdir": "^0.1",
+        "grunt-git": "^0.3",
+        "grunt-contrib-clean": "^0.6"
+    },
+    "description": "Wetty = Web + tty. Terminal access in browser over http/https ",
+    "main": "app.js",
+    "repository": {
+        "type": "git",
+        "url": "git://github.com/krishnasrinivas/wetty.git"
+    },
+    "author": "Krishna Srinivas <[email protected]> (https://github.com/krishnasrinivas)",
+    "license": "MIT",
+    "bugs": {
+        "url": "https://github.com/krishnasrinivas/wetty/issues"
+    },
+    "homepage": "https://github.com/krishnasrinivas/wetty",
+    "preferGlobal": "true",
+    "bin": {
+        "wetty": "./bin/wetty.js"
+    }
 }