diff --git a/README.md b/README.md index 480a2e3..e1b03fa 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,6 @@ wetty = Web + tty Terminal over http. Wetty is like ajaxterm but much better because it uses ChromeOS' terminal emulator (hterm) which has much better terminal emulation implementation. Also it uses websockets instead of Ajax. -Note: tested only on Chrome (hterm was written for Chrome.) - Install ------- @@ -16,18 +14,38 @@ Install Run on http: ----------- -(run as root as it needs to exec /bin/login) - `node app.js -p 3000` +If you run it as root it will launch /bin/login (where you can specify the username), else it will launch ssh to localhost as the node's user as login username. + Run on https: ------------ If you don't have ssl certificates from CA you can create a self signed certificate using this command: `openssl req -x509 -newkey rsa:2048 -keyout key.pem -out cert.pem -days 30000 -nodes` -And then run as root: +And then run: `node app.js --sslkey key.pem --sslcert cert.pem -p 3000` +Run wetty behind nginx: +---------------------- + +Put the following config in nginx's conf: + + location /wetty { + proxy_pass http://127.0.0.1:3000/wetty; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_read_timeout 43200000; + + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $http_host; + proxy_set_header X-NginX-Proxy true; + } + +In the browser you have to use: 'http://yourserver.com/wetty'. Note that if your nginx is configured for https you should run wetty without ssl. + diff --git a/app.js b/app.js index 38216e1..12510bc 100644 --- a/app.js +++ b/app.js @@ -64,11 +64,19 @@ wss.on('request', function(request) { conn.on('message', function(msg) { var data = JSON.parse(msg.utf8Data); if (!term) { - term = pty.spawn('/bin/login', [], { - name: 'xterm-256color', - cols: 80, - rows: 30 - }); + if (process.getuid() == 0) { + term = pty.spawn('/bin/login', [], { + name: 'xterm-256color', + cols: 80, + rows: 30 + }); + } else { + term = pty.spawn('ssh', ['localhost'], { + name: 'xterm-256color', + cols: 80, + rows: 30 + }); + } term.on('data', function(data) { conn.send(JSON.stringify({ data: data diff --git a/public/index.html b/public/index.html index 7327354..a71d745 100644 --- a/public/index.html +++ b/public/index.html @@ -4,9 +4,9 @@ wtf - - - + + + + + + +
+ + + diff --git a/public/wetty.js b/public/wetty/wetty.js similarity index 96% rename from public/wetty.js rename to public/wetty/wetty.js index e439ec7..87c7165 100644 --- a/public/wetty.js +++ b/public/wetty/wetty.js @@ -30,7 +30,7 @@ Wetty.prototype.onTerminalResize = function(col, row) { })); }; -ws = new WebSocket(((window.location.protocol === 'https:') ? 'wss://' : 'ws://') + window.location.host, 'wetty'); +ws = new WebSocket(((window.location.protocol === 'https:') ? 'wss://' : 'ws://') + window.location.host + '/wetty', 'wetty'); ws.onopen = function() { lib.init(function() { term = new hterm.Terminal();