Fix/session binding validation

AuthToken.column_names

@@ -0,0 +1,27 @@
+# AuthToken Column Documentation
+# This file documents the new columns added to auth_tokens table for security enhancements
+
+# Original columns:
+# id: primary key
+# auth_token_expiry: datetime when token expires
+# user_id: user who owns this token
+# authentication_token: the actual token string
+# token_type: type of token (general, api, etc.)
+# session_ip: original IP address that created this token
+# session_user_agent: original User-Agent that created this token
+
+# New columns for session binding:
+# last_seen_ip: most recent IP address that used this token
+# last_seen_ua: most recent User-Agent that used this token
+# ip_history: JSON array of all IPs that have used this token
+# suspicious_activity_detected_at: timestamp when first suspicious change was detected
+
+# New columns for session fixation/hijacking prevention:
+# invalidation_requested_at: timestamp when logout was requested
+# last_activity_at: timestamp of most recent activity with this token
+
+# Security implementation notes:
+# - When validating tokens, check invalidation_requested_at to prevent session fixation
+# - Use ip_history to track and limit the number of different IPs that can use a token
+# - suspicious_activity_detected_at starts a grace period for user to reauthenticate
+# - The combined approach provides flexible session binding while preventing session stealing across users

app/helpers/authentication_helpers.rb

@@ -1,4 +1,5 @@
 require 'onelogin/ruby-saml'
+require 'json'
 
 #
 # The AuthenticationHelpers include functions to check if the user
@@ -9,11 +10,44 @@
 module AuthenticationHelpers
   module_function
 
+  # Configuration getters for security settings
+  def security_config
+    Doubtfire::Application.config.session_security || {
+      binding_enabled: true,
+      ip_binding_strictness: :flexible,
+      max_allowed_ip_changes: 3,
+      suspicious_change_timeout: 5.minutes,
+      token_max_lifetime: 8.hours,
+      auth_enforcement_window: 15.seconds
+    }
+  end
+
+  #
+  # Helper method to handle ip_history JSON serialization (for MariaDB)
+  #
+  def ip_history_array(token)
+    return [] if token.ip_history.nil?
+    token.ip_history.present? ? JSON.parse(token.ip_history) : []
+  rescue JSON::ParserError
+    logger.error("Error parsing IP history for token #{token.id}")
+    []
+  end
+
+  #
+  # Helper method to update ip_history with JSON serialization
+  #
+  def update_ip_history(token, current_ip)
+    history = ip_history_array(token)
+    history << current_ip unless history.include?(current_ip)
+    token.update(ip_history: history.to_json)
+  end
+
   #
   # Checks if the requested user is authenticated.
   # Reads details from the params fetched from the caller context.
   #
   def authenticated?(token_type = :general)
+    Rails.logger.info "AUTH DEBUG: Method called for #{headers['Username'] || headers['username']} with token_type #{token_type}"
     auth_param = headers['auth-token'] || headers['Auth-Token'] || params['authToken'] || headers['Auth_Token'] || headers['auth_token'] || params['auth_token'] || params['Auth_Token']
     user_param = headers['username'] || headers['Username'] || params['username']
 
@@ -28,7 +62,55 @@ def authenticated?(token_type = :general)
 
     # Check user by token
     if user.present? && token.present?
+      # Verify the token hasn't been marked for invalidation (logout in progress)
+      if token.invalidation_requested_at.present?
+        elapsed_time = Time.zone.now - token.invalidation_requested_at
+        config = security_config
+        if elapsed_time > config[:auth_enforcement_window]
+          # The token was marked for invalidation more than AUTH_ENFORCEMENT_WINDOW ago
+          # This means a logout was triggered but the request might have been dropped
+          logger.warn("Blocked attempted use of token that was marked for invalidation #{elapsed_time.round(2)} seconds ago")
+          token.destroy!
+          error!({ error: 'Session has been terminated. Please log in again.' }, 401)
+        end
+      end
+
+      # Verify the token hasn't exceeded its maximum lifetime
+      config = security_config
+      if token.created_at.present? && token.created_at + config[:token_max_lifetime] < Time.zone.now
+        logger.info("Token exceeded maximum lifetime for #{user.username} from #{request.ip}")
+        token.destroy!
+        error!({ error: 'Session has exceeded maximum allowed duration. Please log in again.' }, 419)
+      end
+
       if token.auth_token_expiry > Time.zone.now
+        if token.auth_token_expiry < 5.minutes.from_now
+          # Refresh the token expiry time
+          token.update(auth_token_expiry: 1.hour.from_now)
+          logger.info("Token refreshed for #{user.username}")
+        end
+        logger.info "DEBUG: Entered token expiry check for #{user.username}"
+
+        current_ip = request.ip
+        current_ua = request.user_agent
+
+        logger.info "DEBUG: Current IP: #{current_ip}, Current UA: #{current_ua}"
+        logger.info "DEBUG: Token IP: #{token.session_ip}, Token UA: #{token.session_user_agent}"
+
+        # Handle session binding based on configured security level
+        config = security_config
+        if config[:binding_enabled]
+          session_binding_result = verify_session_binding(token, user, current_ip, current_ua)
+          return false unless session_binding_result
+        else
+          # If binding is disabled, just update the last seen values
+          token.update(
+            last_seen_ip: current_ip,
+            last_seen_ua: current_ua,
+            last_activity_at: Time.zone.now
+          )
+        end
+
         logger.info("Authenticated #{user.username} from #{request.ip}")
         return true
       end
@@ -48,6 +130,128 @@ def authenticated?(token_type = :general)
     end
   end
 
+  #
+  # Verifies session binding based on configured security levels
+  # Returns true if session is valid, false otherwise
+  #
+  def verify_session_binding(token, user, current_ip, current_ua)
+    config = security_config
+
+    # Initialize token binding data if not present
+    if token.session_ip.nil? && token.session_user_agent.nil?
+      # For new sessions, set the initial binding data
+      token.update(
+        session_ip: current_ip,
+        session_user_agent: current_ua,
+        last_seen_ip: current_ip,
+        last_seen_ua: current_ua,
+        ip_history: [current_ip].to_json,
+        last_activity_at: Time.zone.now,
+        suspicious_activity_detected_at: nil
+      )
+      logger.info("New session bound for #{user.username} from #{current_ip}")
+      return true
+    end
+
+    # Check if there are any suspicious changes
+    ip_changed = token.session_ip != current_ip
+    ua_changed = token.session_user_agent != current_ua
+
+    # Update most recent IP/UA and activity timestamp
+    token.update(
+      last_seen_ip: current_ip,
+      last_seen_ua: current_ua,
+      last_activity_at: Time.zone.now
+    )
+
+    # No changes detected, everything is normal
+    return true unless ip_changed || ua_changed
+
+    # If strict IP binding is enabled and IP changed, handle accordingly
+    if ip_changed && config[:ip_binding_strictness] == :strict
+      logger.warn("Session hijacking attempt detected for #{user.username} from #{current_ip} - strict mode")
+      token.destroy!
+      error!({ error: 'Security alert: Your session has been invalidated due to a location change. Please log in again.' }, 403)
+      return false
+    end
+
+    # If flexible binding is enabled, check if this is the first suspicious change
+    if config[:ip_binding_strictness] == :flexible
+      # Track IP history for analysis
+      ip_history = ip_history_array(token)
+
+      # Add IP to history if not already present
+      ip_history << current_ip unless ip_history.include?(current_ip)
+      token.update(ip_history: ip_history.to_json)
+
+      # If too many IPs are associated with this token, it's suspicious
+      if ip_history.length > config[:max_allowed_ip_changes]
+        logger.warn("Too many IP changes for #{user.username}, current IP: #{current_ip}")
+        token.destroy!
+        error!({ error: 'Security alert: Unusual account activity detected. Please log in again.' }, 403)
+        return false
+      end
+
+      # If this is the first suspicious change, mark it
+      if token.suspicious_activity_detected_at.nil?
+        token.update(suspicious_activity_detected_at: Time.zone.now)
+        logger.info("Suspicious change detected for #{user.username} from #{current_ip}, monitoring for #{config[:suspicious_change_timeout]}")
+        return true
+      end
+
+      # If suspicious change was detected recently, check timeout
+      if token.suspicious_activity_detected_at + config[:suspicious_change_timeout] < Time.zone.now
+        # Grace period expired, require re-authentication
+        logger.warn("Grace period expired for #{user.username} after suspicious changes")
+        token.destroy!
+        error!({ error: 'For your security, please log in again to verify your identity.' }, 403)
+        return false
+      end
+
+      # Within grace period, allow access but log it
+      logger.info("Allowing access during grace period for #{user.username} from #{current_ip}")
+      return true
+    end
+    # IP binding disabled or passing all other checks
+    true
+  end
+  #
+  # Securely invalidates a user session/token
+  # This method should be called at the beginning of the logout process
+  #
+
+  def invalidate_session(user, token_text = nil)
+    if user.nil?
+      logger.warn("Attempted to invalidate session for nil user")
+      return
+    end
+
+    # Find the specific token or all tokens for the user
+    tokens = if token_text.present?
+               [user.token_for_text?(token_text)]
+             else
+               user.auth_tokens
+             end
+    config = security_config
+    tokens.compact.each do |token|
+      # Mark token for invalidation first (will be enforced by authenticated? method)
+      token.update(invalidation_requested_at: Time.zone.now)
+
+      # Then destroy it after a short delay
+      # In production, this should be handled by a background job
+      Thread.new do
+        sleep(config[:auth_enforcement_window] * 1.5) # Wait slightly longer than the enforcement window
+        token.destroy! if token.persisted?
+      rescue StandardError => e
+        logger.error("Error in background token destruction: #{e.message}")
+      ensure
+        ActiveRecord::Base.connection_pool.release_connection
+      end
+    end
+
+    logger.info("Session invalidation initiated for #{user.username}")
+  end
+
   #
   # Get the current user either from warden or from the header
   #
@@ -131,4 +335,10 @@ def ldap_auth?
   def db_auth?
     Doubtfire::Application.config.auth_method == :database
   end
+  # Explicitly declare these functions as module functions
+  module_function :security_config
+  module_function :ip_history_array
+  module_function :update_ip_history
+  module_function :verify_session_binding
+  module_function :invalidate_session
 end

app/models/auth_token.rb

@@ -33,6 +33,11 @@ def self.destroy_old_tokens
     AuthToken.where("auth_token_expiry < :now", now: Time.zone.now).destroy_all
   end
 
+  # Destroy all tokens marked for invalidation
+  def self.destroy_invalidated_tokens
+    AuthToken.where("invalidation_requested_at IS NOT NULL").destroy_all
+  end
+
   #
   # Extends an existing auth_token if needed
   #
@@ -59,6 +64,39 @@ def extend_token(remember, expiry_time = Time.zone.now + 2.hours, save = true)
     end
   end
 
+  # Record session binding information for a new token
+  def initialize_session_binding(ip, user_agent)
+    update(
+      session_ip: ip,
+      session_user_agent: user_agent,
+      last_seen_ip: ip,
+      last_seen_ua: user_agent,
+      ip_history: [ip].to_json,
+      last_activity_at: Time.zone.now
+    )
+  end
+
+  # Return the IP history as an array
+  def ip_history_array
+    return [] if ip_history.nil?
+    ip_history.present? ? JSON.parse(ip_history) : []
+  rescue JSON::ParserError
+    Rails.logger.error("Error parsing IP history for token #{id}")
+    []
+  end
+
+  # Add a new IP to the history if it's not already there
+  def add_ip_to_history(ip)
+    history = ip_history_array
+    history << ip unless history.include?(ip)
+    update(ip_history: history.to_json)
+  end
+
+  # Mark this token for invalidation (will be enforced on next request)
+  def invalidate
+    update(invalidation_requested_at: Time.zone.now)
+  end
+
   def ensure_token_unique_for_user
     if user.token_for_text?(authentication_token, nil)
       errors.add(:authentication_token, 'already exists for the selected user')

config/initializers/reload_authentication.rb

@@ -0,0 +1,4 @@
+Rails.application.reloader.to_prepare do
+  load Rails.root.join("app/helpers/authentication_helpers.rb")
+  Rails.logger.info "Reloaded AuthenticationHelpers at #{Time.zone.now}"
+end

config/initializers/session_security.rb

@@ -0,0 +1,12 @@
+# Be sure to restart your server when you modify this file.
+
+# Configuration for authentication session security
+Doubtfire::Application.config.session_security = {
+  binding_enabled: true,               # Enable/disable session binding completely
+  ip_binding_strictness: :flexible,    # :strict, :flexible, or :disabled
+  max_allowed_ip_changes: 3,           # Maximum number of different IPs allowed per token
+  suspicious_change_timeout: 5.minutes, # Period to allow suspicious changes before requiring re-auth
+  token_max_lifetime: 8.hours,         # Maximum lifetime of a token, regardless of activity
+  auth_enforcement_window: 15.seconds  # Time window to check for forced session persistence
+}
+Rails.logger.info "Loading session security config at #{Time.zone.now}"

db/migrate/20240920052508_convert_task_def_filenames.rb

@@ -1,15 +1,16 @@
 class ConvertTaskDefFilenames < ActiveRecord::Migration[7.1]
-
-  # Check filenames in the upload requirements for each task definition
-  # and replace any invalid characters using sanitize filename
   def change
+    unless column_exists?(:task_definitions, :new_column_name)
+      add_column :task_definitions, :new_column_name, :string
+    end
+
     TaskDefinition.find_in_batches do |group|
       group.each do |task_def|
         next if task_def.valid?
 
         upload_req = task_def.upload_requirements
-
         change = false
+
         upload_req.each do |req|
           unless req['name'].match?(/^[a-zA-Z0-9_\- \.]+$/)
             req['name'] = FileHelper.sanitized_filename(req['name'])
@@ -30,3 +31,10 @@ def change
     end
   end
 end
+
+class AddAuthTokenType < ActiveRecord::Migration[7.1]
+  def change
+    add_column :auth_tokens, :token_type, :integer, null: false, default: 0
+    add_index :auth_tokens, :token_type
+  end
+end