dan/node-x11
1
0
Fork 0
mirror of https://github.com/danbulant/node-x11 synced 2026-07-05 11:10:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

reformat code

Browse source
This commit is contained in:
Andrey Sidorov 2015-03-16 13:43:42 +11:00
parent 5645841b80
commit 7a3a1d43a2
1 changed files with 68 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
lib/auth.js
View file

@ -5,8 +5,7 @@ var Buffer = require('buffer').Buffer;
// add 'unpack' method for buffer // add 'unpack' method for buffer
require('./unpackbuffer').addUnpack(Buffer); require('./unpackbuffer').addUnpack(Buffer);
function parseXauth( buf ) function parseXauth(buf) {
{
var offset = 0; var offset = 0;
var auth = []; var auth = [];
var cookieProperties = ['address', 'display', 'authName', 'authData']; var cookieProperties = ['address', 'display', 'authName', 'authData'];
@ -18,20 +17,19 @@ function parseXauth( buf )
offset += length; offset += length;
} }
while (offset < buf.length) while (offset < buf.length) {
{
var cookie = {}; var cookie = {};
var typeToName = { var typeToName = {
256: 'Local', 256 : 'Local',
65535: 'Wild', 65535: 'Wild',
254: 'Netname', 254 : 'Netname',
253: 'Krb5Principal', 253 : 'Krb5Principal',
252: 'LocalHost', 252 : 'LocalHost',
0: 'Internet', 0 : 'Internet',
1: 'DECnet', 1 : 'DECnet',
2: 'Chaos', 2 : 'Chaos',
5: 'ServerInterpreted', 5 : 'ServerInterpreted',
6: 'InternetV6' 6 : 'InternetV6'
}; };
cookie.type = buf.unpack('n')[0]; cookie.type = buf.unpack('n')[0];
if (!typeToName[cookie.type]) { if (!typeToName[cookie.type]) {
@ -45,12 +43,10 @@ function parseXauth( buf )
return auth; return auth;
} }
module.exports = function( display, host, cb ) module.exports = function(display, host, cb) {
{
var XAuthorityFile = process.env.XAUTHORITY; var XAuthorityFile = process.env.XAUTHORITY;
if (!XAuthorityFile) if (!XAuthorityFile) {
{ if (process.platform.match(/^win/)) {
if ( process.platform.match(/^win/) ) {
// http://www.straightrunning.com/XmingNotes/trouble.php // http://www.straightrunning.com/XmingNotes/trouble.php
// //
// The Xming magic cookie program, xauth (user-based), uses an // The Xming magic cookie program, xauth (user-based), uses an
@ -63,29 +59,25 @@ module.exports = function( display, host, cb )
} }
} }
fs.readFile(XAuthorityFile, function (err, data) { fs.readFile(XAuthorityFile, function(err, data) {
if (err) if (err) {
{ if (err.code == 'ENOENT') {
if (err.code == 'ENOENT') cb('', '');
{
cb('','');
return; return;
} }
throw err; throw err;
} }
var auth = parseXauth(data); var auth = parseXauth(data);
for (var cookieNum in auth) for (var cookieNum in auth) {
{
var cookie = auth[cookieNum]; var cookie = auth[cookieNum];
if (cookie.display == display && cookie.address == host) if (cookie.display == display && cookie.address == host) {
{ cb(cookie.authName, cookie.authData);
cb( cookie.authName, cookie.authData );
return; return;
} }
} }
// throw 'No auth cookie matching display=' + display + ' and host=' + host; // throw 'No auth cookie matching display=' + display + ' and host=' + host;
cb( '', '' ); cb('', '');
}); });
}; };