From e72aa854ebf55e527ced7d39fd40a1c5cc1322f7 Mon Sep 17 00:00:00 2001
From: Zach Goldman <zach_goldman@rapid7.com>
Date: Thu, 19 Oct 2023 07:07:45 -0500
Subject: [PATCH] mbetter incorporate constants

---
 lib/msf/ui/console/command_dispatcher/core.rb | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/msf/ui/console/command_dispatcher/core.rb b/lib/msf/ui/console/command_dispatcher/core.rb
index 38aadd208607c..a1719565a5725 100644
--- a/lib/msf/ui/console/command_dispatcher/core.rb
+++ b/lib/msf/ui/console/command_dispatcher/core.rb
@@ -45,7 +45,7 @@ class Core
     ["-s", "--script"]               => [ true,  "Run a script or module on the session given with -i, or all", "<script>"       ],
     ["-u", "--upgrade"]              => [ true,  "Upgrade a shell to a meterpreter session on many platforms", "<id>"            ],
     ["-t", "--timeout"]              => [ true,  "Set a response timeout (default: 15)", "<seconds>"                             ],
-    ["-S", "--search"]               => [ true,  "Row search filter. (ex: last_checkin:less_than:10s, session_id:5)", "<filter>"    ],
+    ["-S", "--search"]               => [ true,  "Row search filter. (ex: last_checkin:less_than:10s, session_id:5, session_type:meterpreter)", "<filter>"],
     ["-x", "--list-extended"]        => [ false, "Show extended information in the session table"                                ],
     ["-n", "--name"]                 => [ true,  "Name or rename a session by ID", "<id> <name>"                                 ])
 
@@ -121,15 +121,15 @@ class Core
   GREATER_THAN = 'greater_than'
 
   VALID_SESSION_SEARCH_PARAMS =
-    %w[
-      last_checkin
-      session_id
-      session_type
+    [
+      LAST_CHECKIN,
+      SESSION_ID,
+      SESSION_TYPE
     ]
   VALID_OPERATORS =
-    %w[
-      less_than
-      greater_than
+    [
+      LESS_THAN,
+      GREATER_THAN
     ]
 
   private_constant :VALID_SESSION_SEARCH_PARAMS
@@ -1978,16 +1978,16 @@ def evaluate_search_criteria(session, search_term)
 
     case field
     when LAST_CHECKIN
-      checkin_time = session.last_checkin
+      last_checkin_time = session.last_checkin
       offset = parse_duration(value)
       return nil unless offset
 
-      threshold_time = Time.now - parse_duration(value)
+      threshold_time = Time.now - offset
       case operator
       when GREATER_THAN
-        return checkin_time < threshold_time
+        return threshold_time > last_checkin_time
       when LESS_THAN
-        return checkin_time > threshold_time
+        return threshold_time < last_checkin_time
       end
     when SESSION_ID
       return session.sid.to_s == operator