hairtrigger 0.1.1 → 0.1.2

data/README.rdoc

@@ -55,7 +55,7 @@ include:
 * before(*events): Shorthand for timing(:before).events(*events).
 * after(*events): Shorthand for timing(:after).events(*events).
 * where(conditions): Optional, limits when the trigger will fire.
-* security(user): Permissions/role to check when calling trigger, defaults to :invoker. PostgreSQL supports :definer, MySQL supports :definer and arbitrary users (syntax: 'user'@'host').
+* security(user): Permissions/role to check when calling trigger. PostgreSQL supports :invoker (default) and :definer, MySQL supports :definer (default) and arbitrary users (syntax: 'user'@'host').
 * timing(timing): Required (but may be satisified by before/after). Possible values are :before/:after.
 * events(*events): Required (but may be satisified by before/after). MySQL/SQLite only support one action.
 * all: Noop, useful for trigger groups (see below).
@@ -108,7 +108,7 @@ you want to support.
 
 * HairTrigger does not check config.active_record.timestamped_migrations, it
   always assumes it is true. As a workaround, you can rename the migration.
-* As is the case with ActiveRecord::Base#update_all or any direct SQL you do,
+* As is the case with ActiveRecord::Base.update_all or any direct SQL you do,
   be careful to reload updated objects from the database. For example, the
   following code will display the wrong count since we aren't reloading the
   account:

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/hair_trigger/builder.rb

@@ -68,9 +68,14 @@ module HairTrigger
     end
 
     def security(user)
-      return if user == :invoker # default behavior
-      raise_or_warn "sqlite doesn't support trigger security clauses", :sqlite
-      raise_or_warn "postgresql doesn't support arbitrary users for security clauses", :postgresql unless user == :definer
+      # sqlite default is n/a, mysql default is :definer, postgres default is :invoker
+      raise_or_warn "sqlite doesn't support trigger security", :sqlite
+      raise_or_warn "postgresql doesn't support arbitrary users for trigger security", :postgresql unless [:definer, :invoker].include?(user)
+      if user == :invoker
+        raise_or_warn "mysql doesn't support invoker trigger security", :mysql
+      elsif user != :definer && !(user.to_s =~ /\A'[^']+'@'[^']+'\z/) && !(user.to_s.downcase =~ /\Acurrent_user(\(\))?\z/)
+        raise_or_warn "mysql trigger security should be :definer, CURRENT_USER, or a valid mysql user (e.g. 'user'@'host')", :mysql
+      end
       options[:security] = user
     end
 
@@ -274,24 +279,21 @@ END;
     end
 
     def generate_trigger_postgresql
+      security = options[:security] if options[:security] && options[:security] != :invoker
       <<-SQL
 CREATE FUNCTION #{prepared_name}()
 RETURNS TRIGGER AS $$
 BEGIN
 #{normalize(prepared_actions, 1).rstrip}
 END;
-$$ LANGUAGE plpgsql#{options[:security] ? " SECURITY #{options[:security].to_s.upcase}" : ""};
+$$ LANGUAGE plpgsql#{security ? " SECURITY #{security.to_s.upcase}" : ""};
 CREATE TRIGGER #{prepared_name} #{options[:timing]} #{options[:events].join(" OR ")} ON #{options[:table]}
 FOR EACH #{options[:for_each]}#{prepared_where ? " WHEN (" + prepared_where + ')': ''} EXECUTE PROCEDURE #{prepared_name}();
       SQL
     end
 
     def generate_trigger_mysql
-      security = options[:security]
-      if security == :definer
-        config = @adapter.instance_variable_get(:@config)
-        security = "'#{config[:username]}'@'#{config[:host]}'"
-      end
+      security = options[:security] if options[:security] && options[:security] != :definer
       sql = <<-SQL
 CREATE #{security ? "DEFINER = #{security} " : ""}TRIGGER #{prepared_name} #{options[:timing]} #{options[:events].first} ON #{options[:table]}
 FOR EACH #{options[:for_each]}

data/spec/builder_spec.rb

@@ -4,10 +4,9 @@ require File.expand_path(File.dirname(__FILE__) + '/../lib/hair_trigger/builder.
 HairTrigger::Builder.show_warnings = false
 
 class MockAdapter
-  attr_reader :adapter_name, :config
-  def initialize(type, user = nil, host = nil)
+  attr_reader :adapter_name
+  def initialize(type)
     @adapter_name = type
-    @config = {:username => user, :host => host}
   end
 end
 
@@ -18,14 +17,14 @@ end
 describe "builder" do
   context "chaining" do
     it "should use the last redundant chained call" do
-      @adapter = MockAdapter.new("mysql", "user", "host")
+      @adapter = MockAdapter.new("mysql")
       builder.where(:foo).where(:bar).options[:where].should be(:bar)
     end
   end
 
   context "mysql" do
     before(:each) do
-      @adapter = MockAdapter.new("mysql", "user", "host")
+      @adapter = MockAdapter.new("mysql")
     end
 
     it "should create a single trigger for a group" do
@@ -49,9 +48,18 @@ describe "builder" do
 
     it "should accept security" do
       builder.on(:foos).after(:update).security(:definer){ "FOO" }.generate.
+        grep(/DEFINER/).size.should eql(0) # default, so we don't include it
+      builder.on(:foos).after(:update).security("CURRENT_USER"){ "FOO" }.generate.
+        grep(/DEFINER = CURRENT_USER/).size.should eql(1)
+      builder.on(:foos).after(:update).security("'user'@'host'"){ "FOO" }.generate.
         grep(/DEFINER = 'user'@'host'/).size.should eql(1)
     end
 
+    it "should reject :invoker security" do
+      lambda { builder.on(:foos).after(:update).security(:invoker){ "FOO" } }.
+        should raise_error
+    end
+
     it "should reject multiple timings" do
       lambda { builder.on(:foos).after(:update, :delete){ "FOO" } }.
         should raise_error
@@ -83,10 +91,17 @@ describe "builder" do
     end
 
     it "should accept security" do
+      builder.on(:foos).after(:update).security(:invoker){ "FOO" }.generate.
+        grep(/SECURITY/).size.should eql(0) # default, so we don't include it
       builder.on(:foos).after(:update).security(:definer){ "FOO" }.generate.
         grep(/SECURITY DEFINER/).size.should eql(1)
     end
 
+    it "should reject arbitrary user security" do
+      lambda { builder.on(:foos).after(:update).security("'user'@'host'"){ "FOO" } }.
+        should raise_error
+    end
+
     it "should accept multiple timings" do
       builder.on(:foos).after(:update, :delete){ "FOO" }.generate.
         grep(/UPDATE OR DELETE/).size.should eql(1)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hairtrigger
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Jon Jensen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-22 00:00:00 -06:00
+date: 2011-03-23 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency