From 8fc3ffe64e2337be8fc28ae74c830537326728a2 Mon Sep 17 00:00:00 2001
From: Jonas Hermsmeier <jhermsmeier@gmail.com>
Date: Thu, 16 Nov 2017 18:18:07 +0100
Subject: [PATCH] Fix socket path joins

A `config.socketRoot` without a trailing slash could lead to
EACCESS errors due to the path not existing.
---
 dao/client.js        |  7 ++++---
 entities/Defaults.js |  2 +-
 services/IPC.js      | 35 ++++++++++++++++++-----------------
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/dao/client.js b/dao/client.js
index 41ce504..3aadec9 100644
--- a/dao/client.js
+++ b/dao/client.js
@@ -5,6 +5,7 @@ const net = require('net'),
     EventParser = require('../entities/EventParser.js'),
     Message = require('js-message'),
     fs = require('fs'),
+    path = require('path'),
     Queue = require('js-queue');
 
 let Events = require('event-pubsub/es5');
@@ -82,9 +83,9 @@ function connect(){
         options.path=client.path;
 
         if (process.platform ==='win32' && !client.path.startsWith('\\\\.\\pipe\\')){
-            options.path = options.path.replace(/^\//, '');
-            options.path = options.path.replace(/\//g, '-');
-            options.path= `\\\\.\\pipe\\${options.path}`;
+            options.path = options.path.replace(/^[\/\\]/, '');
+            options.path = options.path.replace(/[\/\\]/g, '-');
+            options.path = path.join('\\\\.\\pipe\\', options.path);
         }
 
         client.socket = net.connect(options);
diff --git a/entities/Defaults.js b/entities/Defaults.js
index c180eb2..22b0fcc 100644
--- a/entities/Defaults.js
+++ b/entities/Defaults.js
@@ -22,7 +22,7 @@ class Defaults{
     constructor(){
 
         this.appspace='app.';
-        this.socketRoot='/tmp/';
+        this.socketRoot=os.tmpdir();
         this.id=os.hostname();
 
         this.encoding='utf8';
diff --git a/services/IPC.js b/services/IPC.js
index 3a6edc7..598e8bb 100644
--- a/services/IPC.js
+++ b/services/IPC.js
@@ -3,7 +3,8 @@
 const Defaults = require('../entities/Defaults.js'),
     Client = require('../dao/client.js'),
     Server = require('../dao/socketServer.js'),
-    util = require('util');
+    util = require('util'),
+    path = require('path');
 
 class IPC{
     constructor(){
@@ -102,18 +103,18 @@ function disconnect(id){
     delete this.of[id];
 }
 
-function serve(path,callback){
-    if(typeof path=='function'){
-        callback=path;
-        path=false;
+function serve(socketPath,callback){
+    if(typeof socketPath=='function'){
+        callback=socketPath;
+        socketPath=false;
     }
-    if(!path){
+    if(!socketPath){
+        socketPath=path.join(this.config.socketRoot, this.config.appspace + this.config.id);
         this.log(
             'Server path not specified, so defaulting to',
             'ipc.config.socketRoot + ipc.config.appspace + ipc.config.id',
-            this.config.socketRoot+this.config.appspace+this.config.id
+            socketPath
         );
-        path=this.config.socketRoot+this.config.appspace+this.config.id;
     }
 
     if(!callback){
@@ -121,7 +122,7 @@ function serve(path,callback){
     }
 
     this.server=new Server(
-        path,
+        socketPath,
         this.config,
         log
     );
@@ -213,10 +214,10 @@ function serveNet(host,port,UDPType,callback){
     );
 }
 
-function connect(id,path,callback){
-    if(typeof path == 'function'){
-        callback=path;
-        path=false;
+function connect(id,socketPath,callback){
+    if(typeof socketPath == 'function'){
+        callback=socketPath;
+        socketPath=false;
     }
 
     if(!callback){
@@ -231,13 +232,13 @@ function connect(id,path,callback){
         return;
     }
 
-    if(!path){
+    if(!socketPath){
+        socketPath=path.join(this.config.socketRoot, this.config.appspace + id);
         this.log(
             'Service path not specified, so defaulting to',
             'ipc.config.socketRoot + ipc.config.appspace + id',
-            (this.config.socketRoot+this.config.appspace+id).data
+            socketPath
         );
-        path=this.config.socketRoot+this.config.appspace+id;
     }
 
     if(this.of[id]){
@@ -255,7 +256,7 @@ function connect(id,path,callback){
 
     this.of[id] = new Client(this.config,this.log);
     this.of[id].id = id;
-    this.of[id].path = path;
+    this.of[id].path = socketPath;
 
     this.of[id].connect();