Keep session on restart

javalikescript · javalikescript · commit 55eeda40494d · 2025-05-31T12:03:07.000+02:00
diff --git a/extensions/users/login-redirect.lua b/extensions/users/login-redirect.lua
@@ -5,7 +5,7 @@ local location = '/login.html'
 
 return HttpFilter.byPath(HttpFilter:new(function(_, exchange)
   local session = exchange:getSession()
-  if session and not session.attributes.user then
+  if session and not session.attributes.userName then
     HttpExchange.redirect(exchange, location)
     return false
   end
diff --git a/extensions/users/manifest.json b/extensions/users/manifest.json
@@ -67,6 +67,11 @@
         "title": "Restrict the access to logged users",
         "type": "boolean",
         "default": true
+      },
+      "keepSessions": {
+        "title": "Keep the sessions on restart",
+        "type": "boolean",
+        "default": true
       }
     }
   }
diff --git a/extensions/users/users.lua b/extensions/users/users.lua
@@ -1,7 +1,9 @@
 local extension = ...
 
 local class = require('jls.lang.class')
+local serialization = require('jls.lang.serialization')
 local logger = extension:getLogger()
+local File = require('jls.io.File')
 local HttpExchange = require('jls.net.http.HttpExchange')
 local HttpFilter = require('jls.net.http.HttpFilter')
 local Url = require('jls.net.Url')
@@ -64,6 +66,10 @@ local function refreshUsers(users)
   end
 end
 
+local function getSessionsFile()
+  return File:new(extension:getEngine():getWorkDirectory(), 'sessions.dat')
+end
+
 local sessionFilter
 
 extension:subscribeEvent('startup', function()
@@ -73,10 +79,24 @@ extension:subscribeEvent('startup', function()
     sessionFilter:close()
   end
   sessionFilter = HttpFilter.session(configuration.maxAge, configuration.idleTimeout)
+  if configuration.keepSessions then
+    local sessionsFile = getSessionsFile()
+    if sessionsFile:isFile() then
+      local status, sessions = pcall(serialization.deserialize, sessionsFile:readAll(), '{jls.net.http.HttpSession}')
+      if status then
+        logger:info('restoring %l session(s)', sessions)
+        sessionFilter:addSessions(sessions)
+        sessionFilter:cleanup()
+        sessionsFile:delete()
+      else
+        logger:warn('unable to read sessions due to %s', sessions)
+      end
+    end
+  end
   cleanup()
   refreshUsers(configuration.users)
   function sessionFilter:onCreated(session)
-    session.attributes.user = nil
+    session.attributes.userName = nil
     session.attributes.permission = configuration.defaultPermission or ''
   end
   extension:addContext('/logout', function(exchange)
@@ -95,7 +115,7 @@ extension:subscribeEvent('startup', function()
       local user = userMap[info.name]
       if user and user:checkPassword(encrypt(info.password)) then
         local session = exchange:getSession()
-        session.attributes.user = user
+        session.attributes.userName = info.name
         if user.permission then
           session.attributes.permission = user.permission
         end
@@ -155,5 +175,13 @@ extension:subscribeEvent('refresh', function()
 end)
 
 extension:subscribeEvent('shutdown', function()
+  if extension:getConfiguration().keepSessions then
+    sessionFilter:cleanup()
+    local sessions = sessionFilter:getSessions()
+    if #sessions > 0 then
+      local s = serialization.serialize(sessions)
+      getSessionsFile():write(s)
+    end
+  end
   cleanup()
 end)
diff --git a/extensions/web-base/www/app.html b/extensions/web-base/www/app.html
@@ -450,7 +450,7 @@ <h1>{{ title }}</h1>
       <div>
         <slot name="bar-right"></slot>
         <template v-if="app.getPage('user')">
-          <button v-on:click="app.toPage('user', true)" v-if="app.user && app.user.logged" :title="app.user.name"><i class="fa fa-user"></i></button>
+          <button v-on:click="app.toPage('user')" v-if="app.user && app.user.logged" :title="app.user.name"><i class="fa fa-user"></i></button>
           <button v-on:click="app.toPage('user')" v-else title="Not logged"><i class="fa fa-user-alt-slash"></i></button>
         </template>
       </div>
diff --git a/extensions/web-notes/web-notes.lua b/extensions/web-notes/web-notes.lua
@@ -29,8 +29,8 @@ extension:subscribeEvent('startup', function()
   function handler:findFile(exchange, path)
     local session = exchange:getSession()
     local userDir = sharedNotesDir
-    if session and session.attributes.user then
-      local userName = session.attributes.user.name
+    local userName = session and session.attributes.userName
+    if userName then
       local dirName = Url.encodePercent(userName)
       userDir = File:new(self.rootFile, dirName)
       if userName ~= lastUserName then
diff --git a/lha/restEngine.lua b/lha/restEngine.lua
@@ -457,10 +457,10 @@ return {
   user = function(exchange)
     local session = exchange:getSession()
     if session then
-      local user = session.attributes.user
+      local userName = session.attributes.userName
       return {
-        name = user and user.name,
-        logged = user ~= nil,
+        name = userName,
+        logged = userName ~= nil,
         permission = session.attributes.permission
       }
     end

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,11 @@`
`67`	`67`	`"title": "Restrict the access to logged users",`
`68`	`68`	`"type": "boolean",`
`69`	`69`	`"default": true`
	`70`	`+ },`
	`71`	`+ "keepSessions": {`
	`72`	`+ "title": "Keep the sessions on restart",`
	`73`	`+ "type": "boolean",`
	`74`	`+ "default": true`
`70`	`75`	`}`
`71`	`76`	`}`
`72`	`77`	`}`