hector-identity-ee 2.0.0 → 2.1.0

data/lib/hector/ee_identity_adapter.rb

@@ -1,8 +1,7 @@
-require "digest/sha1"
 require "yaml"
 
 begin
-  require "sequel"
+  require "mysql2"
 rescue LoadError => e
   if require "rubygems"
     retry
@@ -11,19 +10,17 @@ rescue LoadError => e
   end
 end
 
-
 module Hector
   class ExpressionEngineIdentityAdapter
-    attr_reader :filename, :config, :db
+    attr_reader :config, :database
     
     def initialize(filename = nil)
-      @filename = filename || Hector.root.join("config/expression_engine.yml")
-      load_config
+      load_config(filename || Hector.root.join("config/expression_engine.yml"))
       load_database
     end
     
     def authenticate(username, password)
-      yield identity(normalize(username)) == hash(password)
+      yield normalize(identity(normalize(username))) == normalize(password)
     end
     
     def remember(username, password)
@@ -36,37 +33,48 @@ module Hector
       false
     end
     
-    def normalize(username)
-      username.strip.downcase
-    end
-    
     protected
-      def load_config
+      def load_config(filename)
         @config = YAML.load_file(filename)
       rescue => e
-        Hector.logger.fatal "Could not load #{filename} (#{e.class.name})"
+        Hector.logger.fatal "#{e.class.name} while loading #{filename}: #{e.message}"
         exit 1
       end
       
       def load_database
-        @db = Sequel.mysql2(config["database"])
+        @database = Mysql2::Client.new(connection_params)
       rescue => e
-        Hector.logger.fatal "Could not connect to ExpressionEngine database: #{e.message} (#{e.class.name})"
+        Hector.logger.fatal "#{e.class.name} while connecting to ExpressionEngine database: #{e.message}"
         exit 1
       end
       
+      def connection_params
+        config["database"].inject({}) do |hash, (key, value)|
+          hash[key.to_sym] = value; hash
+        end
+      end
+      
       def identity(username)
-        query = { :hector_username => username }
-        query[:group_id] = config["groups"] if config["groups"]
-        (table(:members).select(:password).first(query) || {})[:password]
+        sql = "SELECT hector_password FROM #{table(:members)} WHERE hector_username = '#{escape(username)}'"
+        sql << " AND group_id IN (#{config["groups"].join(",")})" if config["groups"]
+        (query(sql).first || {})["hector_password"]
       end
       
       def table(name)
-        db["#{(config["prefix"] || "exp")}_#{name}"]
+        "#{config["prefix"] || "exp"}_#{name}"
+      end
+      
+      def escape(input)
+        database.escape(input)
+      end
+      
+      def query(sql)
+        Hector.logger.debug(sql.inspect)
+        database.query(sql)
       end
       
-      def hash(password)
-        Digest::SHA1.hexdigest(password)
+      def normalize(input)
+        input.strip.downcase
       end
   end
 end

metadata

@@ -1,78 +1,58 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: hector-identity-ee
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 2.1.0
   prerelease: 
-  version: 2.0.0
 platform: ruby
-authors: 
+authors:
 - Ross Paffett
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-07 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: sequel
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 3.26.0
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+date: 2011-08-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: mysql2
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &70292475371600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.3.6
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.7
   type: :runtime
-  version_requirements: *id002
-description: An identity adapter which allows users to log into a Hector IRC server using their ExpressionEngine credentials.
-email: 
+  prerelease: false
+  version_requirements: *70292475371600
+description: An identity adapter which allows users to log into a Hector IRC server
+  using their ExpressionEngine credentials.
+email:
 - ross@rosspaffett.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/hector/ee_identity_adapter.rb
-has_rdoc: true
 homepage: http://github.com/raws/hector-identity-ee
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.7
 signing_key: 
 specification_version: 3
 summary: ExpressionEngine identity adapter for Hector
 test_files: []
-