fortifier 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d30eeb99b0b1213c68918b193b5b91259d956b97
-  data.tar.gz: 8f0d4e3b7a3446b5019da07a79242b12e0fee5b5
+  metadata.gz: bf5ec2e45377ccc4101c75b9e29cc27068ab1dd8
+  data.tar.gz: 807af011ad7d4ddbafe9258413aa893470cbd831
 SHA512:
-  metadata.gz: 73aaa91c7f54242d385e0616f1d230d27284f822e1c2206699ea15b7790498a6566e6d9446f9ebe20be820aed1724932c1dc9b71d76ef084779ffa2cc8e96c41
-  data.tar.gz: ddcb67cb26ae7007b574f581b096637d3ce3fab2408008793c49637cdee4c5272c464c8a4ac87d7d301b3ac61fe541b11787345879d47aa1f2044fc5333a325d
+  metadata.gz: 8deb81f7f8cf4f05d2efe8f821740c291966121206fab7d639a2757cd19dbf41419ca1c5af38213b4e962b0b9b41834c33cc3e352866eac81a7b0abdf6c144c2
+  data.tar.gz: b906bf178f8a2791b67ffbf6273f14438f6072bde32109e896a7a4795df06a315eb185ea18c5834683573469471bd305688020a8aa30f7c186484d408df58176

data/app/models/fortifier/auth_steps/initialize_auth_attempt.rb

@@ -3,8 +3,8 @@ module Fortifier
 		class InitializeAuthAttempt
 			def self.invoke(params)
         secret = params[:secret]
-        auth_user = AuthUser.where(login: params[:login]).first
-				auth_success = secret.blank? || auth_user.blank? ? false : auth_user.authenticated?(secret)
+        auth_user = AuthUser.where(login: params[:login]).where(deleted: 0).first
+				auth_success = (secret.blank? || auth_user.blank? || auth_user.deleted? ) ? false : auth_user.authenticated?(secret)
     		auth_log = Fortifier::AuthLog.create(auth_user: auth_user,
                                        		     user_agent: params[:user_agent],
                                        		     remote_addr: params[:remote_addr],

data/app/models/fortifier/auth_user.rb

@@ -90,50 +90,47 @@ module Fortifier
 
     def secrets_match?(secret_string)
       current_secret_model = current_secret_non_token
-    	return false if current_secret_model.blank?
+      return false if current_secret_model.blank?
 
-    	auth_result = current_secret_model.matches?(secret_string)
-    	current_secret_model.update_encryption_method(secret_string) if (auth_result && current_secret_model.enc_type == "SHA")
+      auth_result = current_secret_model.matches?(secret_string)
+      current_secret_model.update_encryption_method(secret_string) if (auth_result && current_secret_model.enc_type == "SHA")
 
-    	return auth_result
+      return auth_result
     end
 
     def authenticated?(secret_string)
       # TODO: (DK) do not increase consecutive_failed_logins if user is attempting a pw change
       # move consecutive_failed_logins updates to a different method so this method
       # doesn't do multiple things (code smell)
-      # TODO: (DK) remove if self
-      if self
-        if self.secrets_match?(secret_string)
-          self.update_column(:consecutive_failed_logins, 0)
-          true
-        else
-          self.update_column(:consecutive_failed_logins, self.consecutive_failed_logins + 1)
-          false
-        end
+      if self.secrets_match?(secret_string)
+        self.update_column(:consecutive_failed_logins, 0) unless self.blocked?
+        true
+      else
+        self.update_column(:consecutive_failed_logins, self.consecutive_failed_logins + 1)
+        false
       end
     end
 
     def self.authenticate_batch_sso(account_uuid, token)
       return nil if token.blank?
       AuthUser.
-        joins(:secrets).
-        where("find_in_set(? , account_uuids_csv)
+          joins(:secrets).
+          where("find_in_set(? , account_uuids_csv)
           AND (expired IS NULL OR expired = false)
           AND enc_type = '#{Secret::SSO_TOKEN}'
           AND secret_value = ?", account_uuid, token).
-        first
+          first
     end
 
     def self.authenticate_on_demand_sso(account_uuid, token)
       return nil if token.blank?
       AuthUser.
-        joins(:secrets).
-        where("find_in_set(? , account_uuids_csv)
+          joins(:secrets).
+          where("find_in_set(? , account_uuids_csv)
           AND (expired IS NULL OR expired = false)
           AND enc_type = '#{Secret::SSO_TOKEN}'
           AND secret_value = ?", account_uuid, token).
-        first
+          first
     end
 
     def blocked?
@@ -166,13 +163,15 @@ module Fortifier
     def public_attribute_hash
       auth_log = self.auth_logs.last
       {
-        uuid: self.uuid,
-        email: self.email,
-        login: self.login,
-        name: self.name,
-        note: self.note,
-        disabled: self.disabled?,
-        last_auth_log: ({user_agent: auth_log.user_agent, status: auth_log.status, created_at: auth_log.created_at.to_time} if auth_log)
+          uuid: self.uuid,
+          email: self.email,
+          login: self.login,
+          name: self.name,
+          note: self.note,
+          disabled: self.disabled?,
+          deleted:  self.deleted?,
+          blocked:  self.blocked?,
+          last_auth_log: ({user_agent: auth_log.user_agent, status: auth_log.status, created_at: auth_log.created_at.to_time} if auth_log)
       }
     end
 
@@ -196,14 +195,15 @@ module Fortifier
       app_uuids_query = "app_uuids_csv = '#{app_uuid}'"
       account_uuids_query = account_uuid ? " AND account_uuids_csv = '#{account_uuid}'" : ""
       search_keywords_query = search_keywords ? " AND FIND_IN_SET ('#{search_keywords}', search_keywords_csv)" : ''
-      aggregate_query = app_uuids_query + account_uuids_query + search_keywords_query
+      undeleted_auth_user_clause = " AND deleted = 0 "
+      aggregate_query = app_uuids_query + account_uuids_query + search_keywords_query + undeleted_auth_user_clause
 
       # b/c there's no 'enabled' field on auth user and abaqis allows this sorting (providigm/users in abaqis)
       if sort_col=='enabled'
         Fortifier::AuthUser.where(aggregate_query)
-                            .where(user_search_query)
-                            .order("app_uuids_csv #{sort_dir}, account_uuids_csv #{sort_dir}")
-                            .paginate(:page=>page, :per_page=>per_page)
+            .where(user_search_query)
+            .order("app_uuids_csv #{sort_dir}, account_uuids_csv #{sort_dir}")
+            .paginate(:page=>page, :per_page=>per_page)
       elsif sort_col=='last_login_at'
         # In other words, pull all users associated with the app in question (if available),
         # joined with their most recent AuthLog,
@@ -217,14 +217,14 @@ module Fortifier
                                             AS last_seen
                                           ON fau.id = last_seen.auth_user_id
                                           #{'WHERE ' + aggregate_query}
-                                          #{'AND ' + user_search_query if user_search_query.present?}
+                                        #{'AND ' + user_search_query if user_search_query.present?}
                                           ORDER BY last_login_at #{sort_dir}")
-                            .paginate(:page=>page, :per_page=>per_page)
+            .paginate(:page=>page, :per_page=>per_page)
       else
         Fortifier::AuthUser.where(aggregate_query)
-                             .where(user_search_query)
-                             .order("#{sort_col} #{sort_dir}")
-                             .paginate(:page=>page, :per_page=>per_page)
+            .where(user_search_query)
+            .order("#{sort_col} #{sort_dir}")
+            .paginate(:page=>page, :per_page=>per_page)
       end
     end
 
@@ -243,8 +243,8 @@ module Fortifier
 
     def unique?(type, value)
       case type
-      when :login then active_relation = AuthUser.where("login = ?", value)
-      when :email then active_relation = AuthUser.where("email = ?", value)
+        when :login then active_relation = AuthUser.where("login = ? and deleted = 0", value)
+        when :email then active_relation = AuthUser.where("email = ? and deleted = 0", value)
       end
 
       matching_auth_users = active_relation.to_a # converted to an array so the AuthUser isn't deleted from the db

data/app/models/fortifier/auth_user_api.rb

@@ -151,10 +151,13 @@ module Fortifier
       auth_user = Fortifier::AuthUser.where("uuid = ?", params[:uuid]).first
       return {status: false, errors: [:auth_user_not_found]} if auth_user.blank?
 
-      auth_user.login = params[:login] if params[:login]
-      auth_user.email = params[:email] if params[:email]
-      auth_user.name  = params[:name]  if params[:name]
-      auth_user.note  = params[:note]  if params[:note]
+      auth_user.login           = params[:login] if params[:login]
+      auth_user.email           = params[:email] if params[:email]
+      auth_user.name            = params[:name]  if params[:name]
+      auth_user.note            = params[:note]  if params[:note]
+      auth_user.app_uuids       = params[:app_uuids]
+      auth_user.account_uuids   = params[:account_uuids]
+      auth_user.search_keywords = params[:search_keywords]
       sso_user        = params[:sso_user]
 
       if params[:password] || sso_user
@@ -163,15 +166,16 @@ module Fortifier
         enc_type            = sso_user ? Secret::SSO_TOKEN : nil
       end
 
-      if secret && secret_confirmation
+      if secret.present? && secret_confirmation.present?
         new_secret = Secret.new(secret: secret,
                                  secret_confirmation: secret_confirmation)
       end
 
       valid_auth_user = auth_user.valid?
       valid_secret = new_secret ? new_secret.valid? : true
-      
+
       if valid_auth_user && valid_secret
+        auth_user.consecutive_failed_logins = 0
         auth_user.save
         auth_user.secrets << new_secret if new_secret
         { uuid: auth_user.uuid, 
@@ -275,20 +279,34 @@ module Fortifier
       auth_user = AuthUser.where(uuid: params[:uuid]).first
       return {status: false, errors: [:auth_user_not_found]} if auth_user.blank?
 
-      auth_user.app_uuids - app_uuids
-      auth_user.account_uuids - account_uuids
-      auth_user.search_keywords - search_keywords
+      auth_user.app_uuids       -= app_uuids
+      auth_user.account_uuids   -= account_uuids
+      auth_user.search_keywords -= search_keywords
       result = auth_user.save
 
       result ? {status: true} : {status: false, errors: (result.errors.full_messages if result)}
     end
+
+    def delete(params)
+      return {status: false, errors: [:uuid_not_provided]} if params[:uuid].blank?
+
+      auth_user = AuthUser.where(uuid: params[:uuid]).first
+      return {status: false, errors: [:auth_user_not_found]} if auth_user.blank?
+
+      auth_user.deleted = 1
+
+      result = auth_user.save
+
+      result ? {status: true} : {status: false, errors: (result.errors.full_messages if result)}
+
+    end
       
     def find_auth_user(field, param)
       field = field.to_s || ''
 
       case field 
       when 'uuid'           then auth_user = AuthUser.where("uuid = ?", param).first
-      when 'login', 'email' then auth_user = AuthUser.where("login = ? OR email = ?", param, param).first
+      when 'login', 'email' then auth_user = AuthUser.where("deleted = 0 and (login = ? OR email = ?)", param, param).first
       when 'token'          then auth_user = AuthUser.joins(:secrets).where("secret_value = ? AND (expired IS NULL OR expired = false)", param).first
       end
 

data/db/migrate/20150310194416_add_deleted_to_auth_users.rb

@@ -0,0 +1,5 @@
+class AddDeletedToAuthUsers < ActiveRecord::Migration
+  def change
+    add_column :fortifier_auth_users, :deleted, :integer, :default => 0, :after => :search_keywords_csv
+  end
+end

data/lib/fortifier/version.rb

@@ -1,3 +1,3 @@
 module Fortifier
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fortifier
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Derek Koloditch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-09 00:00:00.000000000 Z
+date: 2015-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -144,6 +144,7 @@ files:
 - config/routes.rb
 - db/migrate/20140401194012_create_fortifier_tables.rb
 - db/migrate/20140415210139_add_auth_user_search_keywords_field.rb
+- db/migrate/20150310194416_add_deleted_to_auth_users.rb
 - db/migration_scripts/20140403_temp_whitelist_migration.rb
 - lib/fortifier.rb
 - lib/fortifier/engine.rb