Move sessionStorageModule into main storageModule

Fixes #586

 - add get/saveSessions to main storage module
 - handle storage modules without those functions
 - store .session file in userDir

red/api/auth/index.js

@@ -34,11 +34,11 @@ var server = oauth2orize.createServer();
 
 server.exchange(oauth2orize.exchange.password(strategies.passwordTokenExchange));
 
-function init(_settings) {
+function init(_settings,storage) {
     settings = _settings;
     if (settings.adminAuth) {
         Users.init(settings.adminAuth);
-        Tokens.init(settings)
+        Tokens.init(storage);
     }
 }
 

red/api/auth/tokens.js

@@ -15,7 +15,6 @@
  **/
 
 var when = require("when");
-var Sessions;
 
 function generateToken(length) {
     var c = "ABCDEFGHIJKLMNOPQRSTUZWXYZabcdefghijklmnopqrstuvwxyz1234567890";
@@ -27,30 +26,18 @@ function generateToken(length) {
 }
 
 
-var sessionModule;
-
-function moduleSelector(aSettings) {
-    var toReturn;
-    if (aSettings.sessionStorageModule) {
-        if (typeof aSettings.sessionStorageModule === "string") {
-            // TODO: allow storage modules to be specified by absolute path
-            toReturn = require("./"+aSettings.sessionStorageModule);
-        } else {
-            toReturn = aSettings.sessionStorageModule;
-        }
-    } else {
-        toReturn = require("./localfilesystem");
-    }
-    return toReturn;
-}
+var storage;
+var sessions = {};
 
 module.exports = {
-    init: function(settings) {
-        sessionModule = moduleSelector(settings);
-        sessionModule.init(settings);
+    init: function(_storage) {
+        storage = _storage;
+        return storage.getSessions().then(function(_sessions) {
+             sessions = _sessions||{};   
+        });
     },
     get: function(token) {
-        return sessionModule.get(token);
+        return when.resolve(sessions[token]);
     },
     create: function(user,client,scope) {
         var accessToken = generateToken(128);
@@ -60,14 +47,16 @@ module.exports = {
             scope:scope,
             accessToken: accessToken,
         };
-        return sessionModule.create(accessToken,session).then(function() {
+        sessions[accessToken] = session;
+        return storage.saveSessions(sessions).then(function() {
             return {
                 accessToken: accessToken,
             }
         });
     },
     revoke: function(token) {
-        return sessionModule.delete(token);
+        delete sessions[token];
+        return storage.saveSessions(sessions);
     }
 }
 

red/api/auth/tokens/localfilesystem.js

@@ -1,72 +0,0 @@
-/**
- * Copyright 2015 IBM Corp.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
-
-var fs = require('fs');
-var when = require('when');
-var nodeFn = require('when/node/function');
-var fspath = require("path");
-
-var settings;
-var sessionsFile;
-
-var sessions = {};
-
-/** 
- * Write content to a file using UTF8 encoding.
- * This forces a fsync before completing to ensure
- * the write hits disk.
- */
-function writeFile(path,content) {
-    return when.promise(function(resolve,reject) {
-        var stream = fs.createWriteStream(path);
-        stream.on('open',function(fd) {
-            stream.end(content,'utf8',function() {
-                fs.fsync(fd,resolve);
-            });
-        });
-        stream.on('error',function(err) {
-            reject(err);
-        });
-    });
-}
-
-var api = module.exports = {
-    init: function(_settings) {
-        settings = _settings;
-        var userDir = settings.userDir || process.env.NODE_RED_HOME;
-        sessionsFile = fspath.join(userDir,".sessions.json");
-        
-        try {
-            sessions = JSON.parse(fs.readFileSync(sessionsFile,'utf8'));
-        } catch(err) {
-            sessions = {};
-        }
-        
-        return when.resolve();
-    },
-    
-    get: function(token) {
-        return when.resolve(sessions[token]);
-    },
-    create: function(token,session) {
-        sessions[token] = session;
-        return writeFile(sessionsFile,JSON.stringify(sessions));
-    },
-    delete: function(token) {
-        delete sessions[token];
-        return writeFile(sessionsFile,JSON.stringify(sessions));
-    }
-}

red/api/index.js

@@ -36,9 +36,9 @@ var errorHandler = function(err,req,res,next) {
     res.send(400,err.toString());
 };
 
-function init(adminApp) {
+function init(adminApp,storage) {
     
-    auth.init(settings);
+    auth.init(settings,storage);
     
     // Editor
     if (!settings.disableEditor) {

red/server.js

@@ -41,17 +41,16 @@ function init(_server,_settings) {
 
     nodeApp = express();
     app = express();
-
-    if (settings.httpAdminRoot !== false) {
-        require("./api").init(app);
-    }
 }
 
 function start() {
-    var defer = when.defer();
-
-    storage.init(settings).then(function() {
-        settings.load(storage).then(function() {
+    return storage.init(settings)
+        .then(settings.load(storage))
+        .then(function() {
+            if (settings.httpAdminRoot !== false) {
+                require("./api").init(app,storage);
+            }
+            
             if (log.metric()) {
                 runtimeMetricInterval = setInterval(function() {
                     reportMetrics();
@@ -105,19 +104,12 @@ function start() {
                         redNodes.cleanModuleList();
                     }
                 }
-                defer.resolve();
-
                 redNodes.loadFlows();
             }).otherwise(function(err) {
                 console.log(err);
             });
             comms.start();
-        });
-    }).otherwise(function(err) {
-        defer.reject(err);
     });
-
-    return defer.promise;
 }
 
 

red/storage/index.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013, 2014 IBM Corp.
+ * Copyright 2013, 2015 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,7 +44,7 @@ var storageModuleInterface = {
             try {
                 storageModule = moduleSelector(settings);
                 settingsAvailable = storageModule.hasOwnProperty("getSettings") && storageModule.hasOwnProperty("saveSettings");
-                sessionsAvailable = storageModule.hasOwnProperty("getUserSessions") && storageModule.hasOwnProperty("saveUserSessions");
+                sessionsAvailable = storageModule.hasOwnProperty("getSessions") && storageModule.hasOwnProperty("saveSessions");
             } catch (e) {
                 return when.reject(e);
             }
@@ -76,6 +76,20 @@ var storageModuleInterface = {
                 return when.resolve();
             }
         },
+        getSessions: function() {
+            if (sessionsAvailable) {
+                return storageModule.getSessions();
+            } else {
+                return when.resolve(null);
+            }
+        },
+        saveSessions: function(sessions) {
+            if (sessionsAvailable) {
+                return storageModule.saveSessions(sessions);
+            } else {
+                return when.resolve();
+            }
+        },
         
         /* Library Functions */
         getAllFlows: function() {

red/storage/localfilesystem.js

@@ -32,6 +32,7 @@ var flowsFileBackup;
 var credentialsFile;
 var credentialsFileBackup;
 var oldCredentialsFile;
+var sessionsFile;
 var libDir;
 var libFlowsDir;
 var globalSettingsFile;
@@ -191,6 +192,8 @@ var localfilesystem = {
         
         flowsFileBackup = fspath.join(ffDir,"."+ffName+".backup");
 
+        sessionsFile = fspath.join(settings.userDir,".sessions.json");
+
         libDir = fspath.join(settings.userDir,"lib");
         libFlowsDir = fspath.join(libDir,"flows");
         
@@ -288,6 +291,26 @@ var localfilesystem = {
     saveSettings: function(settings) {
         return writeFile(globalSettingsFile,JSON.stringify(settings,null,1));
     },
+    getSessions: function() {
+        if (fs.existsSync(sessionsFile)) {
+            return nodeFn.call(fs.readFile,sessionsFile,'utf8').then(function(data) {
+                if (data) {
+                    try {
+                        return JSON.parse(data);
+                    } catch(err) {
+                        log.info("Corrupted sessions file - resetting");
+                        return {};
+                    }
+                } else {
+                    return {};
+                }
+            });
+        }
+        return when.resolve({});
+    },
+    saveSessions: function(sessions) {
+        return writeFile(sessionsFile,JSON.stringify(sessions));
+    },
     
     getAllFlows: function() {
         return listFiles(libFlowsDir);