Fix sessions count

guimard · Dec 15, 2024 · fe2fca4 · fe2fca4
1 parent 49d8831
commit fe2fca4
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 0 deletions.
diff --git a/Changes.md b/Changes.md
@@ -3,6 +3,7 @@
 ## v2.20.1-2
 * Add "Last-Modified" header for OIDC metadata
 * Add hook to modify refresh\_token
+* Fix offline sessions count
 
 ## v2.20.1-1 _(2024-11-19)_
 * Update to 2.20.1

diff --git a/full/Dockerfile b/full/Dockerfile
@@ -26,6 +26,7 @@ RUN \
     echo patch matrix-token-exchange.patch && patch -p1 < matrix-token-exchange.patch && \
     echo patch globalLogout.patch && patch -p1 < globalLogout.patch && \
     echo patch metadata-ttl.patch && patch -p1 < metadata-ttl.patch && \
+    echo patch fix-sessions-count.patch && patch -p1 <fix-sessions-count.patch && \
     rm -f *.patch && \
     LLNG_DEFAULTCONFFILE=/etc/lemonldap-ng/lemonldap-ng.ini \
     perl -MLemonldap::NG::Manager::Build -e 'Lemonldap::NG::Manager::Build->run( \

diff --git a/full/fix-sessions-count.patch b/full/fix-sessions-count.patch
@@ -0,0 +1,19 @@
+--- a/usr/share/perl5/Lemonldap/NG/Manager/Sessions.pm
++++ b/usr/share/perl5/Lemonldap/NG/Manager/Sessions.pm
+@@ -396,6 +396,7 @@ qq{Use of an uninitialized attribute "$group" to group sessions},
+         }
+
+         # Build result
++        $total = 0;
+         $res = [
+             sort {
+                 my @a = ( $a->{value} =~ /^(\d+)(?:\.(\d+))*$/ );
+@@ -407,7 +408,7 @@ qq{Use of an uninitialized attribute "$group" to group sessions},
+                       or $a[3] <=> $b[3] )
+                   : $a->{value} cmp $b->{value}
+               }
+-              map { { value => $_, count => $r->{$_} } } keys %$r
++              map { $total += $r->{$_}; { value => $_, count => $r->{$_} } } keys %$r
+         ];
+     }
+
diff --git a/manager/Dockerfile b/manager/Dockerfile
@@ -33,6 +33,7 @@ RUN \
     echo patch matrix-token-exchange.patch && patch -p1 < matrix-token-exchange.patch && \
     echo patch globalLogout.patch && patch -p1 < globalLogout.patch && \
     echo patch metadata-ttl.patch && patch -p1 < metadata-ttl.patch && \
+    echo patch fix-sessions-count.patch && patch -p1 <fix-sessions-count.patch && \
     rm -f *.patch && \
     LLNG_DEFAULTCONFFILE=/etc/lemonldap-ng/lemonldap-ng.ini \
     perl -MLemonldap::NG::Manager::Build -e 'Lemonldap::NG::Manager::Build->run( \

diff --git a/manager/fix-sessions-count.patch b/manager/fix-sessions-count.patch
@@ -0,0 +1,19 @@
+--- a/usr/share/perl5/Lemonldap/NG/Manager/Sessions.pm
++++ b/usr/share/perl5/Lemonldap/NG/Manager/Sessions.pm
+@@ -396,6 +396,7 @@ qq{Use of an uninitialized attribute "$group" to group sessions},
+         }
+
+         # Build result
++        $total = 0;
+         $res = [
+             sort {
+                 my @a = ( $a->{value} =~ /^(\d+)(?:\.(\d+))*$/ );
+@@ -407,7 +408,7 @@ qq{Use of an uninitialized attribute "$group" to group sessions},
+                       or $a[3] <=> $b[3] )
+                   : $a->{value} cmp $b->{value}
+               }
+-              map { { value => $_, count => $r->{$_} } } keys %$r
++              map { $total += $r->{$_}; { value => $_, count => $r->{$_} } } keys %$r
+         ];
+     }
+