From 6cca073884ef8a97a44507c6f790ef50e9a53f6d Mon Sep 17 00:00:00 2001
From: Christophe Maudoux <chrmdx@gmail.com>
Date: Wed, 22 Aug 2018 15:20:16 +0200
Subject: [PATCH] Cleaning unused code & minor improvements

---
 .../lib/Lemonldap/NG/Manager/2ndFA.pm         | 61 ++++++-------------
 1 file changed, 17 insertions(+), 44 deletions(-)

diff --git a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/2ndFA.pm b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/2ndFA.pm
index c8806a80f..d18df3e88 100644
--- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/2ndFA.pm
+++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/2ndFA.pm
@@ -151,13 +151,9 @@ sub sfa {
     $moduleOptions->{backend} = $mod->{module};
 
     # Select 2FA sessions to display
-    if (   defined $params->{TOTPCheck}
-        or defined $params->{U2FCheck}
-        or defined $params->{UBKCheck} )
-    {
-        $self->{TOTPCheck} = delete $params->{TOTPCheck};
-        $self->{U2FCheck}  = delete $params->{U2FCheck};
-        $self->{UBKCheck}  = delete $params->{UBKCheck};
+    foreach (qw(TOTP U2F UBK)) {
+        $self->{ $_ . 'Check' } = delete $params->{ $_ . 'Check' }
+          if ( defined $params->{ $_ . 'Check' } );
     }
 
     my %filters = map {
@@ -213,21 +209,12 @@ sub sfa {
         ( $filters{$firstFilter} ) );
     foreach my $k ( keys %filters ) {
         $self->logger->debug("Removing unless $k =~ /^$filters{$k}\$/");
-        if ( $filters{$k} =~ m#^([\w:]+)/(\d+)\*?$# ) {
-            my ( $net, $bits ) = ( $1, $2 );
-            foreach my $session ( keys %$res ) {
+        $filters{$k} =~ s/\./\\./g;
+        $filters{$k} =~ s/\*/\.\*/g;
+        foreach my $session ( keys %$res ) {
+            if ( $res->{$session}->{$k} ) {
                 delete $res->{$session}
-                  unless ( net6( $res->{$session}->{$k}, $bits ) eq $net );
-            }
-        }
-        else {
-            $filters{$k} =~ s/\./\\./g;
-            $filters{$k} =~ s/\*/\.\*/g;
-            foreach my $session ( keys %$res ) {
-                if ( $res->{$session}->{$k} ) {
-                    delete $res->{$session}
-                      unless ( $res->{$session}->{$k} =~ /^$filters{$k}$/ );
-                }
+                  unless ( $res->{$session}->{$k} =~ /^$filters{$k}$/ );
             }
         }
     }
@@ -245,30 +232,16 @@ sub sfa {
     # Filter 2FA sessions if needed
     $self->logger->debug("Filtering 2F sessions...");
     my $all = ( keys %$res );
-
-    if ( $self->{U2FCheck} eq '2' ) {
-        foreach my $session ( keys %$res ) {
-            delete $res->{$session}
-              unless ( defined $res->{$session}->{_2fDevices}
-                and $res->{$session}->{_2fDevices} =~ /"type":\s*"U2F"/s );
-        }
-        $self->logger->debug("Removing sessions unless U2F key registered");
-    }
-    if ( $self->{TOTPCheck} eq '2' ) {
-        foreach my $session ( keys %$res ) {
-            delete $res->{$session}
-              unless ( defined $res->{$session}->{_2fDevices}
-                and $res->{$session}->{_2fDevices} =~ /"type":\s*"TOTP"/s );
-        }
-        $self->logger->debug("Removing sessions unless TOTP secret registered");
-    }
-    if ( $self->{UBKCheck} eq '2' ) {
-        foreach my $session ( keys %$res ) {
-            delete $res->{$session}
-              unless ( defined $res->{$session}->{_2fDevices}
-                and $res->{$session}->{_2fDevices} =~ /"type":\s*"UBK"/s );
+    foreach (qw(TOTP U2F UBK)) {
+        if ( $self->{ $_ . 'Check' } eq '2' ) {
+            foreach my $session ( keys %$res ) {
+                delete $res->{$session}
+                  unless ( defined $res->{$session}->{_2fDevices}
+                    and $res->{$session}->{_2fDevices} =~ /"type":\s*"$_"/s );
+            }
+            $self->logger->debug(
+                "Removing sessions unless a $_ device is registered");
         }
-        $self->logger->debug("Removing sessions unless UBK device registered");
     }
 
     my $total = ( keys %$res );