Merge pull request #373 from Dorian/bugs/more-invalid-rules

Bugs: Fix more invalid rules

Author: seejohnrun

lib/ice_cube/parsers/ical_parser.rb

@@ -31,6 +31,7 @@ def self.rule_from_ical(ical)
 
       ical.split(';').each do |rule|
         (name, value) = rule.split('=')
+        raise ArgumentError, "Invalid iCal rule component" if value.nil?
         value.strip!
         case name
         when 'FREQ'

lib/ice_cube/rule.rb

@@ -73,26 +73,42 @@ class << self
       # Convert from a hash and create a rule
       def from_hash(original_hash)
         hash = IceCube::FlexibleHash.new original_hash
-        return nil unless match = hash[:rule_type].match(/\:\:(.+?)Rule/)
+
+        unless hash[:rule_type] && match = hash[:rule_type].match(/\:\:(.+?)Rule/)
+          raise ArgumentError, 'Invalid rule type'
+        end
 
         interval_type = match[1].downcase.to_sym
-        raise ArgumentError, "Invalid rule frequency type: #{match[1]}" unless INTERVAL_TYPES.include?(interval_type)
+
+        unless INTERVAL_TYPES.include?(interval_type)
+          raise ArgumentError, "Invalid rule frequency type: #{match[1]}"
+        end
 
         rule = IceCube::Rule.send(interval_type, hash[:interval] || 1)
-        rule.interval(hash[:interval] || 1, TimeUtil.wday_to_sym(hash[:week_start] || 0)) if match[1] == "Weekly"
+
+        if match[1] == "Weekly"
+          rule.interval(hash[:interval] || 1, TimeUtil.wday_to_sym(hash[:week_start] || 0))
+        end
+
         rule.until(TimeUtil.deserialize_time(hash[:until])) if hash[:until]
         rule.count(hash[:count]) if hash[:count]
+
         hash[:validations] && hash[:validations].each do |name, args|
           apply_validation(rule, name, args)
         end
+
         rule
       end
 
       private
 
       def apply_validation(rule, name, args)
         name = name.to_sym
-        raise ArgumentError, "Invalid rule validation type: #{name}" unless ValidatedRule::VALIDATION_ORDER.include?(name)
+
+        unless ValidatedRule::VALIDATION_ORDER.include?(name)
+          raise ArgumentError, "Invalid rule validation type: #{name}"
+        end
+
         args.is_a?(Array) ? rule.send(name, *args) : rule.send(name, args)
       end
 

spec/examples/from_ical_spec.rb

@@ -399,6 +399,36 @@ def sorted_ical(ical)
         let(:ical_str) { 'RRULE::' }
         it_behaves_like 'an invalid ical string'
       end
+
+      describe 'invalid rules' do
+        let(:ical_str) { 'RRULE::A' }
+        it_behaves_like 'an invalid ical string'
+      end
+
+      describe 'incomplete rule' do
+        let(:ical_str) { 'RRULE:FREQ' }
+        it_behaves_like 'an invalid ical string'
+      end
+
+      describe 'invalid rule with invalid sensitive key' do
+        let(:ical_str) { 'RRULE:FREQ=WEKLY;WKST=SU' }
+        it_behaves_like 'an invalid ical string'
+      end
+
+      describe 'invalid rule with invalid value' do
+        let(:ical_str) { 'RRULE:FREQ=WEEKLY;BYDAY=MO,WE,FR;WKST=SE' }
+        it_behaves_like 'an invalid ical string'
+      end
+
+      describe 'invalid rule with invalid key' do
+        let(:ical_str) { 'RRULE:FREQ=WEEKLY;BDAY=MO,WE,FR;WKST=SU' }
+        it_behaves_like 'an invalid ical string'
+      end
+
+      describe 'invalid rule with attempt to execute code' do
+        let(:ical_str) { 'RRULE:FREQ=to_yaml' }
+        it_behaves_like 'an invalid ical string'
+      end
     end
   end