icalendar 2.10.3 → 2.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '091658a5c785f876d990794ef88444d4ea39e047aaf533ca3e93bfc8549c2495'
-  data.tar.gz: 1292b5e139aae74264694245d9a722bc42e501abe6620b341b12d4922ac3cac8
+  metadata.gz: ad06e861392ab70f0e800ac4f2a6b81f019aaf3548a35e513f02bcc975968b86
+  data.tar.gz: 16562bdeae817fc8afd4e0b6de7090a42c0b095cb56640d5b9183cfb3a07bb74
 SHA512:
-  metadata.gz: 698656b8f89e982eb58c80cce76c4a8512df6ebdbcc37779eeeb2c57daaf3f180fe0226c3a8bdb66155438e2f71afa6df76b537d8a4cb528646211c850a1e70d
-  data.tar.gz: acd49ceb561f8f5a61be057c3ea00b938a6907a4af9826afd27fe2f484e256d1ff97869d5777ac58e79e55834ed97cc7c56136fb38d6b54f500959dc054c8d22
+  metadata.gz: 927cd1536b413039b75f4c2a100ca169bb17897c10754b4806762d341aaa4b7800fc93e7bc81566681a678a853fefc0d54fad5fdd0316c10f0245f91864d2faf
+  data.tar.gz: 5d9c09347062a5dd73ad23cd75905c5508b8a72ce0447241ee282fa6bbcc7d259e4a26309fc90af718f14f14b18ca78403bc849898b42147c5368ae6edb21d13

data/.github/workflows/main.yml

@@ -21,6 +21,7 @@ jobs:
           - 3.1
           - 3.2
           - 3.3
+          - 3.4
 
     steps:
     - uses: actions/checkout@v4

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 ## Unreleased
 
+## 2.12.2 - 2026-03-21
+- Fix a potential property injection issue through escaping control characters in URI values - Wes Ring
+
+## 2.12.1 - 2025-10-19
+- Fix a problem with invalid ics generation for calendars with custom properties that include a `tzid` parameter.
+
+## 2.12.0 - 2025-09-26
+- Support timezone lookup by Windows names - Ronak Gothi
+
+## 2.11.2 - 2025-06-21
+- Deal with more bad value parameter values by falling back to the property default type
+
+## 2.11.1 - 2025-06-06
+ - Gracefully deal with malformed ics files that use spaces in the value parameter instead of hyphens
+
+## 2.11.0 - 2025-04-12
+ - Require gems for ruby 3.4 that used to be in stdlib - Go Sueyoshi
+ - Refactor how timezone offsets are calculated - Pat Allan
+    - 'tzid' param is always returned as an array when accessing `ical_params` directly, rather than matching whatever the input parsed. ICS output remains unchanged
+
 ## 2.10.3 - 2024-09-21
  - Override Icalendar::Value.== so that value objects can be compared to each other.
  - Correctly load activesupport before activesupport/time

data/icalendar.gemspec

@@ -31,7 +31,9 @@ ActiveSupport is required for TimeWithZone support, but not required for general
 
   s.required_ruby_version = '>= 2.4.0'
 
+  s.add_dependency 'base64'
   s.add_dependency 'ice_cube', '~> 0.16'
+  s.add_dependency 'logger'
   s.add_dependency 'ostruct'
 
   s.add_development_dependency 'rake', '~> 13.0'

data/lib/icalendar/downcased_hash.rb

@@ -3,32 +3,65 @@
 require 'delegate'
 
 module Icalendar
-  class DowncasedHash < ::SimpleDelegator
+  class DowncasedHash
 
     def initialize(base)
-      super Hash.new
+      @obj = Hash.new
       base.each do |key, value|
         self[key] = value
       end
     end
 
     def []=(key, value)
-      __getobj__[key.to_s.downcase] = value
+      obj[key.to_s.downcase] = value
     end
 
     def [](key)
-      __getobj__[key.to_s.downcase]
+      obj[key.to_s.downcase]
     end
 
     def has_key?(key)
-      __getobj__.has_key? key.to_s.downcase
+      obj.has_key? key.to_s.downcase
     end
     alias_method :include?, :has_key?
     alias_method :member?, :has_key?
 
     def delete(key, &block)
-      __getobj__.delete key.to_s.downcase, &block
+      obj.delete key.to_s.downcase, &block
     end
+
+    def merge(*other_hashes)
+      Icalendar::DowncasedHash.new(obj).merge!(*other_hashes)
+    end
+
+    def merge!(*other_hashes)
+      other_hashes.each do |hash|
+        hash.each do |key, value|
+          self[key] = value
+        end
+      end
+      self
+    end
+
+    def empty?
+      obj.empty?
+    end
+
+    def each(&block)
+      obj.each &block
+    end
+
+    def map(&block)
+      obj.map &block
+    end
+
+    def ==(other)
+      obj == Icalendar::DowncasedHash(other).obj
+    end
+
+    protected
+
+    attr_reader :obj
   end
 
   def self.DowncasedHash(base)

data/lib/icalendar/offset/active_support_exact.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Icalendar
+  class Offset
+    class ActiveSupportExact < Icalendar::Offset
+      def valid?
+        support_classes_defined? && tz
+      end
+
+      def normalized_value
+        Icalendar.logger.debug("Plan a - parsing #{value}/#{tzid} as ActiveSupport::TimeWithZone")
+        # plan a - use ActiveSupport::TimeWithZone
+        Icalendar::Values::Helpers::ActiveSupportTimeWithZoneAdapter.new(nil, tz, value)
+      end
+
+      private
+
+      def tz
+        @tz ||= ActiveSupport::TimeZone[tzid]
+      end
+    end
+  end
+end

data/lib/icalendar/offset/active_support_partial.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Icalendar
+  class Offset
+    class ActiveSupportPartial < Offset
+      def valid?
+        support_classes_defined? && tz
+      end
+
+      def normalized_value
+        # plan c - try to find an ActiveSupport::TimeWithZone based on the first word of the tzid
+        Icalendar.logger.debug("Plan c - parsing #{value}/#{tz.tzinfo.name} as ActiveSupport::TimeWithZone")
+        Icalendar::Values::Helpers::ActiveSupportTimeWithZoneAdapter.new(nil, tz, value)
+      end
+
+      def normalized_tzid
+        [tz.tzinfo.name]
+      end
+
+      private
+
+      def tz
+        @tz ||= ActiveSupport::TimeZone[tzid.split.first]
+      end
+    end
+  end
+end

data/lib/icalendar/offset/null.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Icalendar
+  class Offset
+    class Null < Offset
+      def valid?
+        true
+      end
+
+      def normalized_value
+        # plan d - just ignore the tzid
+        Icalendar.logger.info("Ignoring timezone #{tzid} for time #{value}")
+        nil
+      end
+    end
+  end
+end

data/lib/icalendar/offset/time_zone_store.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Icalendar
+  class Offset
+    class TimeZoneStore < Offset
+      def valid?
+        timezone_store && tz_info
+      end
+
+      def normalized_value
+        # plan b - use definition from provided `VTIMEZONE`
+        offset = tz_info.offset_for_local(value).to_s
+
+        Icalendar.logger.debug("Plan b - parsing #{value} with offset: #{offset}")
+        if value.respond_to?(:change)
+          value.change offset: offset
+        else
+          ::Time.new value.year, value.month, value.day, value.hour, value.min, value.sec, offset
+        end
+      end
+
+      private
+
+      def tz_info
+        @tz_info ||= timezone_store.retrieve(tzid)
+      end
+    end
+  end
+end

data/lib/icalendar/offset/windows_to_iana.rb

@@ -0,0 +1,144 @@
+# frozen_string_literal: true
+
+# This module contains mappings from Windows timezone identifiers to Olson timezone identifiers.
+#
+# The data is taken from the unicode consortium [0], the proposal and rationale
+# for this mapping is also available at the unicode consortium [1].
+#
+# [0] https://www.unicode.org/cldr/cldr-aux/charts/29/supplemental/zone_tzid.html
+# [1] https://cldr.unicode.org/development/development-process/design-proposals/extended-windows-olson-zid-mapping
+
+module Icalendar
+  class Offset
+    class WindowsToIana < Offset
+      WINDOWS_TO_IANA = {
+        'AUS Central Standard Time' => 'Australia/Darwin',
+        'AUS Eastern Standard Time' => 'Australia/Sydney',
+        'Afghanistan Standard Time' => 'Asia/Kabul',
+        'Alaskan Standard Time' => 'America/Anchorage',
+        'Arab Standard Time' => 'Asia/Riyadh',
+        'Arabian Standard Time' => 'Asia/Dubai',
+        'Arabic Standard Time' => 'Asia/Baghdad',
+        'Argentina Standard Time' => 'America/Argentina/Buenos_Aires',
+        'Atlantic Standard Time' => 'America/Halifax',
+        'Azerbaijan Standard Time' => 'Asia/Baku',
+        'Azores Standard Time' => 'Atlantic/Azores',
+        'Bahia Standard Time' => 'America/Bahia',
+        'Bangladesh Standard Time' => 'Asia/Dhaka',
+        'Belarus Standard Time' => 'Europe/Minsk',
+        'Canada Central Standard Time' => 'America/Regina',
+        'Cape Verde Standard Time' => 'Atlantic/Cape_Verde',
+        'Caucasus Standard Time' => 'Asia/Yerevan',
+        'Cen. Australia Standard Time' => 'Australia/Adelaide',
+        'Central America Standard Time' => 'America/Guatemala',
+        'Central Asia Standard Time' => 'Asia/Almaty',
+        'Central Brazilian Standard Time' => 'America/Cuiaba',
+        'Central Europe Standard Time' => 'Europe/Budapest',
+        'Central European Standard Time' => 'Europe/Warsaw',
+        'Central Pacific Standard Time' => 'Pacific/Guadalcanal',
+        'Central Standard Time' => 'America/Chicago',
+        'Central Standard Time (Mexico)' => 'America/Mexico_City',
+        'China Standard Time' => 'Asia/Shanghai',
+        'Dateline Standard Time' => 'Etc/GMT+12',
+        'E. Africa Standard Time' => 'Africa/Nairobi',
+        'E. Australia Standard Time' => 'Australia/Brisbane',
+        'E. Europe Standard Time' => 'Europe/Chisinau',
+        'E. South America Standard Time' => 'America/Sao_Paulo',
+        'Eastern Standard Time' => 'America/New_York',
+        'Eastern Standard Time (Mexico)' => 'America/Cancun',
+        'Egypt Standard Time' => 'Africa/Cairo',
+        'Ekaterinburg Standard Time' => 'Asia/Yekaterinburg',
+        'FLE Standard Time' => 'Europe/Kyiv',
+        'Fiji Standard Time' => 'Pacific/Fiji',
+        'GMT Standard Time' => 'Europe/London',
+        'GTB Standard Time' => 'Europe/Bucharest',
+        'Georgian Standard Time' => 'Asia/Tbilisi',
+        'Greenland Standard Time' => 'America/Nuuk',
+        'Greenwich Standard Time' => 'Atlantic/Reykjavik',
+        'Hawaiian Standard Time' => 'Pacific/Honolulu',
+        'India Standard Time' => 'Asia/Kolkata',
+        'Iran Standard Time' => 'Asia/Tehran',
+        'Israel Standard Time' => 'Asia/Jerusalem',
+        'Jordan Standard Time' => 'Asia/Amman',
+        'Kaliningrad Standard Time' => 'Europe/Kaliningrad',
+        'Korea Standard Time' => 'Asia/Seoul',
+        'Libya Standard Time' => 'Africa/Tripoli',
+        'Line Islands Standard Time' => 'Pacific/Kiritimati',
+        'Magadan Standard Time' => 'Asia/Magadan',
+        'Mauritius Standard Time' => 'Indian/Mauritius',
+        'Middle East Standard Time' => 'Asia/Beirut',
+        'Montevideo Standard Time' => 'America/Montevideo',
+        'Morocco Standard Time' => 'Africa/Casablanca',
+        'Mountain Standard Time' => 'America/Denver',
+        'Mountain Standard Time (Mexico)' => 'America/Chihuahua',
+        'Myanmar Standard Time' => 'Asia/Yangon',
+        'N. Central Asia Standard Time' => 'Asia/Novosibirsk',
+        'Namibia Standard Time' => 'Africa/Windhoek',
+        'Nepal Standard Time' => 'Asia/Kathmandu',
+        'New Zealand Standard Time' => 'Pacific/Auckland',
+        'Newfoundland Standard Time' => 'America/St_Johns',
+        'North Asia East Standard Time' => 'Asia/Irkutsk',
+        'North Asia Standard Time' => 'Asia/Krasnoyarsk',
+        'North Korea Standard Time' => 'Asia/Pyongyang',
+        'Pacific SA Standard Time' => 'America/Santiago',
+        'Pacific Standard Time' => 'America/Los_Angeles',
+        'Pakistan Standard Time' => 'Asia/Karachi',
+        'Paraguay Standard Time' => 'America/Asuncion',
+        'Romance Standard Time' => 'Europe/Paris',
+        'Russia Time Zone 10' => 'Asia/Srednekolymsk',
+        'Russia Time Zone 11' => 'Asia/Kamchatka',
+        'Russia Time Zone 3' => 'Europe/Samara',
+        'Russian Standard Time' => 'Europe/Moscow',
+        'SA Eastern Standard Time' => 'America/Cayenne',
+        'SA Pacific Standard Time' => 'America/Bogota',
+        'SA Western Standard Time' => 'America/La_Paz',
+        'SE Asia Standard Time' => 'Asia/Bangkok',
+        'Samoa Standard Time' => 'Pacific/Apia',
+        'Singapore Standard Time' => 'Asia/Singapore',
+        'South Africa Standard Time' => 'Africa/Johannesburg',
+        'Sri Lanka Standard Time' => 'Asia/Colombo',
+        'Syria Standard Time' => 'Asia/Damascus',
+        'Taipei Standard Time' => 'Asia/Taipei',
+        'Tasmania Standard Time' => 'Australia/Hobart',
+        'Tokyo Standard Time' => 'Asia/Tokyo',
+        'Tonga Standard Time' => 'Pacific/Tongatapu',
+        'Turkey Standard Time' => 'Europe/Istanbul',
+        'US Eastern Standard Time' => 'America/Indiana/Indianapolis',
+        'US Mountain Standard Time' => 'America/Phoenix',
+        'UTC' => 'Etc/GMT',
+        'UTC+12' => 'Etc/GMT-12',
+        'UTC-02' => 'Etc/GMT+2',
+        'UTC-11' => 'Etc/GMT+11',
+        'Ulaanbaatar Standard Time' => 'Asia/Ulaanbaatar',
+        'Venezuela Standard Time' => 'America/Caracas',
+        'Vladivostok Standard Time' => 'Asia/Vladivostok',
+        'W. Australia Standard Time' => 'Australia/Perth',
+        'W. Central Africa Standard Time' => 'Africa/Lagos',
+        'W. Europe Standard Time' => 'Europe/Berlin',
+        'West Asia Standard Time' => 'Asia/Tashkent',
+        'West Pacific Standard Time' => 'Pacific/Port_Moresby',
+        'Yakutsk Standard Time' => 'Asia/Yakutsk'
+      }.freeze
+
+      def valid?
+        support_classes_defined? && tz
+      end
+
+      def normalized_value
+        Icalendar.logger.debug("Plan a - parsing #{value}/#{tzid} as ActiveSupport::TimeWithZone")
+        # plan a - use ActiveSupport::TimeWithZone
+        Icalendar::Values::Helpers::ActiveSupportTimeWithZoneAdapter.new(nil, tz, value)
+      end
+
+      def normalized_tzid
+        [WINDOWS_TO_IANA[tzid]].compact
+      end
+
+      private
+
+      def tz
+        @tz ||= ActiveSupport::TimeZone[normalized_tzid.first || '']
+      end
+    end
+  end
+end

data/lib/icalendar/offset.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Icalendar
+  class Offset
+    def self.build(value, params, timezone_store)
+      return nil if params.nil? || params['tzid'].nil?
+
+      tzid = Array(params['tzid']).first
+
+      [
+        Icalendar::Offset::ActiveSupportExact,
+        Icalendar::Offset::TimeZoneStore,
+        Icalendar::Offset::WindowsToIana,
+        Icalendar::Offset::ActiveSupportPartial,
+        Icalendar::Offset::Null
+      ].lazy.map { |klass| klass.new(tzid, value, timezone_store) }.detect(&:valid?)
+    end
+
+    def initialize(tzid, value, timezone_store)
+      @tzid = tzid
+      @value = value
+      @timezone_store = timezone_store
+    end
+
+    def normalized_tzid
+      Array(tzid)
+    end
+
+    private
+
+    attr_reader :tzid, :value, :timezone_store
+
+    def support_classes_defined?
+      defined?(ActiveSupport::TimeZone) &&
+        defined?(Icalendar::Values::Helpers::ActiveSupportTimeWithZoneAdapter)
+    end
+  end
+end
+
+require_relative 'offset/active_support_exact'
+require_relative 'offset/active_support_partial'
+require_relative 'offset/null'
+require_relative 'offset/time_zone_store'
+require_relative 'offset/windows_to_iana'

data/lib/icalendar/parser.rb

@@ -87,9 +87,10 @@ module Icalendar
         Icalendar::Values::Helpers::Array.new fields[:value].split(WRAP_PROPERTY_VALUE_SPLIT_REGEX),
                                      klass,
                                      fields[:params],
-                                     delimiter: delimiter
+                                     delimiter: delimiter,
+                                     timezone_store: timezone_store
       else
-        klass.new fields[:value], fields[:params]
+        klass.new fields[:value], fields[:params], timezone_store: timezone_store
       end
     rescue Icalendar::Values::DateTime::FormatError => fe
       raise fe if strict?
@@ -105,7 +106,7 @@ module Icalendar
         ((multi_property && value =~ WRAP_IN_ARRAY_REGEX_1) || value =~ WRAP_IN_ARRAY_REGEX_2)
     end
 
-    GET_WRAPPER_CLASS_GSUB_REGEX = /(?:\A|-)(.)/.freeze
+    GET_WRAPPER_CLASS_GSUB_REGEX = /(?:\A|-|\s+)(.)/.freeze
 
     def get_wrapper_class(component, fields)
       klass = component.class.default_property_types[fields[:name]]
@@ -113,7 +114,12 @@ module Icalendar
         klass_name = fields[:params].delete('value').first
         unless klass_name.upcase == klass.value_type
           klass_name = "Icalendar::Values::#{klass_name.downcase.gsub(GET_WRAPPER_CLASS_GSUB_REGEX) { |m| m[-1].upcase }}"
-          klass = Object.const_get klass_name if Object.const_defined?(klass_name)
+          begin
+            klass = Object.const_get klass_name if Object.const_defined?(klass_name)
+          rescue NameError => e
+            Icalendar.logger.error "NameError trying to find value type for #{component.name} | #{fields[:name]}: #{e.message}"
+            raise e if strict?
+          end
         end
       end
       klass
@@ -210,9 +216,6 @@ module Icalendar
           if param_value.size > 0
             param_value = param_value.gsub(PVALUE_GSUB_REGEX, '')
             params[param_name] << param_value
-            if param_name == 'tzid'
-              params['x-tz-store'] = timezone_store
-            end
           end
         end
       end

data/lib/icalendar/value.rb

@@ -8,10 +8,11 @@ module Icalendar
 
   class Value < ::SimpleDelegator
 
-    attr_accessor :ical_params
+    attr_accessor :ical_params, :context
 
-    def initialize(value, params = {})
+    def initialize(value, params = {}, context = {})
       @ical_params = Icalendar::DowncasedHash(params)
+      @context = Icalendar::DowncasedHash(context)
       super value
     end
 

data/lib/icalendar/values/boolean.rb

@@ -5,8 +5,8 @@ module Icalendar
 
     class Boolean < Value
 
-      def initialize(value, params = {})
-        super value.to_s.downcase == 'true', params
+      def initialize(value, *args)
+        super value.to_s.downcase == 'true', *args
       end
 
       def value_ical
@@ -16,4 +16,4 @@ module Icalendar
     end
 
   end
-end
+end

data/lib/icalendar/values/date.rb

@@ -8,9 +8,8 @@ module Icalendar
     class Date < Value
       FORMAT = '%Y%m%d'
 
-      def initialize(value, params = {})
+      def initialize(value, params = {}, *args)
         params.delete 'tzid'
-        params.delete 'x-tz-store'
         if value.is_a? String
           begin
             parsed_date = ::Date.strptime(value, FORMAT)
@@ -18,9 +17,9 @@ module Icalendar
             raise FormatError.new("Failed to parse \"#{value}\" - #{e.message}")
           end
 
-          super parsed_date, params
+          super parsed_date, params, *args
         elsif value.respond_to? :to_date
-          super value.to_date, params
+          super value.to_date, params, *args
         else
           super
         end

data/lib/icalendar/values/date_time.rb

@@ -11,7 +11,7 @@ module Icalendar
 
       FORMAT = '%Y%m%dT%H%M%S'
 
-      def initialize(value, params = {})
+      def initialize(value, params = {}, *args)
         if value.is_a? String
           params['tzid'] = 'UTC' if value.end_with? 'Z'
 
@@ -21,9 +21,9 @@ module Icalendar
             raise FormatError.new("Failed to parse \"#{value}\" - #{e.message}")
           end
 
-          super parsed_date, params
+          super parsed_date, params, *args
         elsif value.respond_to? :to_datetime
-          super value.to_datetime, params
+          super value.to_datetime, params, *args
         else
           super
         end

data/lib/icalendar/values/duration.rb

@@ -7,11 +7,11 @@ module Icalendar
 
     class Duration < Value
 
-      def initialize(value, params = {})
+      def initialize(value, *args)
         if value.is_a? Icalendar::Values::Duration
-          super value.value, params
+          super value.value, *args
         else
-          super OpenStruct.new(parse_fields value), params
+          super OpenStruct.new(parse_fields value), *args
         end
       end
 

data/lib/icalendar/values/float.rb

@@ -5,8 +5,8 @@ module Icalendar
 
     class Float < Value
 
-      def initialize(value, params = {})
-        super value.to_f, params
+      def initialize(value, *args)
+        super value.to_f, *args
       end
 
       def value_ical
@@ -16,4 +16,4 @@ module Icalendar
     end
 
   end
-end
+end

data/lib/icalendar/values/helpers/array.rb

@@ -8,22 +8,23 @@ module Icalendar
 
         attr_reader :value_delimiter
 
-        def initialize(value, klass, params = {}, options = {})
-          @value_delimiter = options[:delimiter] || ','
+        def initialize(value, klass, params = {}, context = {})
+          context = Icalendar::DowncasedHash(context)
+          @value_delimiter = context['delimiter'] || ','
           mapped = if value.is_a? ::Array
                     value.map do |v|
                       if v.is_a? Icalendar::Values::Helpers::Array
-                        Icalendar::Values::Helpers::Array.new v.value, klass, v.ical_params, delimiter: v.value_delimiter
+                        Icalendar::Values::Helpers::Array.new v.value, klass, v.ical_params, context.merge(delimiter: v.value_delimiter)
                       elsif v.is_a? ::Array
-                        Icalendar::Values::Helpers::Array.new v, klass, params, delimiter: value_delimiter
+                        Icalendar::Values::Helpers::Array.new v, klass, params, context.merge(delimiter: value_delimiter)
                       elsif v.is_a? Icalendar::Value
                         v
                       else
-                        klass.new v, params
+                        klass.new v, params, context
                       end
                     end
                   else
-                    [klass.new(value, params)]
+                    [klass.new(value, params, context)]
                   end
           super mapped
         end

data/lib/icalendar/values/helpers/time_with_zone.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "icalendar/offset"
+
 begin
   require 'active_support'
   require 'active_support/time'
@@ -17,11 +19,20 @@ module Icalendar
       module TimeWithZone
         attr_reader :tz_utc, :timezone_store
 
-        def initialize(value, params = {})
+        def initialize(value, params = {}, context = {})
           params = Icalendar::DowncasedHash(params)
+          context = Icalendar::DowncasedHash(context)
           @tz_utc = params['tzid'] == 'UTC'
-          @timezone_store = params.delete 'x-tz-store'
-          super (offset_value(value, params) || value), params
+          @timezone_store = context['timezone_store']
+
+          offset = Icalendar::Offset.build(value, params, timezone_store)
+
+          unless offset.nil?
+            @offset_value = offset.normalized_value
+            params['tzid'] = offset.normalized_tzid
+          end
+
+          super (@offset_value || value), params, context
         end
 
         def __getobj__
@@ -29,9 +40,9 @@ module Icalendar
           if set_offset?
             orig_value
           else
-            offset = offset_value(orig_value, ical_params)
-            __setobj__(offset) unless offset.nil?
-            offset || orig_value
+            new_value = Icalendar::Offset.build(orig_value, ical_params, timezone_store)&.normalized_value
+            __setobj__(new_value) unless new_value.nil?
+            new_value || orig_value
           end
         end
 
@@ -42,36 +53,6 @@ module Icalendar
 
         private
 
-        def offset_value(value, params)
-          @offset_value = unless params.nil? || params['tzid'].nil?
-            tzid = params['tzid'].is_a?(::Array) ? params['tzid'].first : params['tzid']
-            support_classes_defined = defined?(ActiveSupport::TimeZone) && defined?(ActiveSupportTimeWithZoneAdapter)
-            if support_classes_defined && (tz = ActiveSupport::TimeZone[tzid])
-              Icalendar.logger.debug("Plan a - parsing #{value}/#{tzid} as ActiveSupport::TimeWithZone")
-              # plan a - use ActiveSupport::TimeWithZone
-              ActiveSupportTimeWithZoneAdapter.new(nil, tz, value)
-            elsif !timezone_store.nil? && !(x_tz_info = timezone_store.retrieve(tzid)).nil?
-              # plan b - use definition from provided `VTIMEZONE`
-              offset = x_tz_info.offset_for_local(value).to_s
-              Icalendar.logger.debug("Plan b - parsing #{value} with offset: #{offset}")
-              if value.respond_to?(:change)
-                value.change offset: offset
-              else
-                ::Time.new value.year, value.month, value.day, value.hour, value.min, value.sec, offset
-              end
-            elsif support_classes_defined && (tz = ActiveSupport::TimeZone[tzid.split.first])
-              # plan c - try to find an ActiveSupport::TimeWithZone based on the first word of the tzid
-              Icalendar.logger.debug("Plan c - parsing #{value}/#{tz.tzinfo.name} as ActiveSupport::TimeWithZone")
-              params['tzid'] = [tz.tzinfo.name]
-              ActiveSupportTimeWithZoneAdapter.new(nil, tz, value)
-            else
-              # plan d - just ignore the tzid
-              Icalendar.logger.info("Ignoring timezone #{tzid} for time #{value}")
-              nil
-            end
-          end
-        end
-
         def set_offset?
           !!@offset_value
         end

data/lib/icalendar/values/integer.rb

@@ -5,8 +5,8 @@ module Icalendar
 
     class Integer < Value
 
-      def initialize(value, params = {})
-        super value.to_i, params
+      def initialize(value, *args)
+        super value.to_i, *args
       end
 
       def value_ical
@@ -16,4 +16,4 @@ module Icalendar
     end
 
   end
-end
+end

data/lib/icalendar/values/period.rb

@@ -7,7 +7,7 @@ module Icalendar
 
       PERIOD_LAST_PART_REGEX = /\A[+-]?P.+\z/.freeze
 
-      def initialize(value, params = {})
+      def initialize(value, *args)
         parts = value.split '/'
         period_start = Icalendar::Values::DateTime.new parts.first
         if parts.last =~ PERIOD_LAST_PART_REGEX
@@ -15,7 +15,7 @@ module Icalendar
         else
           period_end = Icalendar::Values::DateTime.new parts.last
         end
-        super [period_start, period_end], params
+        super [period_start, period_end], *args
       end
 
       def value_ical
@@ -47,4 +47,4 @@ module Icalendar
       end
     end
   end
-end
+end

data/lib/icalendar/values/recur.rb

@@ -12,11 +12,11 @@ module Icalendar
       MONTHDAY = '[+-]?\d{1,2}'
       YEARDAY = '[+-]?\d{1,3}'
 
-      def initialize(value, params = {})
+      def initialize(value, *args)
         if value.is_a? Icalendar::Values::Recur
-          super value.value, params
+          super value.value, *args
         else
-          super OpenStruct.new(parse_fields value), params
+          super OpenStruct.new(parse_fields value), *args
         end
       end
 

data/lib/icalendar/values/text.rb

@@ -3,12 +3,12 @@
 module Icalendar
   module Values
     class Text < Value
-      def initialize(value, params = {})
+      def initialize(value, *args)
         value = value.gsub('\n', "\n")
         value.gsub!('\,', ',')
         value.gsub!('\;', ';')
         value.gsub!('\\\\') { '\\' }
-        super value, params
+        super value, *args
       end
 
       VALUE_ICAL_CARRIAGE_RETURN_GSUB_REGEX = /\r?\n/.freeze

data/lib/icalendar/values/time.rb

@@ -11,12 +11,12 @@ module Icalendar
 
       FORMAT = '%H%M%S'
 
-      def initialize(value, params = {})
+      def initialize(value, params = {}, *args)
         if value.is_a? String
           params['tzid'] = 'UTC' if value.end_with? 'Z'
-          super ::DateTime.strptime(value, FORMAT).to_time, params
+          super ::DateTime.strptime(value, FORMAT).to_time, params, *args
         elsif value.respond_to? :to_time
-          super value.to_time, params
+          super value.to_time, params, *args
         else
           super
         end
@@ -33,4 +33,4 @@ module Icalendar
     end
 
   end
-end
+end

data/lib/icalendar/values/uri.rb

@@ -6,14 +6,15 @@ module Icalendar
   module Values
 
     class Uri < Value
+      CONTROL_BYTES_REGEX = /[\x00-\x1F\x7F]/.freeze
 
-      def initialize(value, params = {})
+      def initialize(value, *args)
         parsed = URI.parse(value) rescue value
-        super parsed, params
+        super parsed, *args
       end
 
       def value_ical
-        value.to_s
+        value.to_s.gsub(CONTROL_BYTES_REGEX) { |char| "%%%02X" % char.ord }
       end
     end
 

data/lib/icalendar/values/utc_offset.rb

@@ -5,13 +5,13 @@ require 'ostruct'
 module Icalendar
   module Values
     class UtcOffset < Value
-      def initialize(value, params = {})
+      def initialize(value, *args)
         if value.is_a? Icalendar::Values::UtcOffset
           value = value.value
         else
           value = OpenStruct.new parse_fields(value)
         end
-        super value, params
+        super value, *args
       end
 
       def behind?

data/lib/icalendar/version.rb

@@ -2,6 +2,6 @@
 
 module Icalendar
 
-  VERSION = '2.10.3'
+  VERSION = '2.12.2'
 
 end

data/spec/fixtures/single_event_bad_location.ics

@@ -0,0 +1,23 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:bsprodidfortestabc123
+CALSCALE:GREGORIAN
+BEGIN:VEVENT
+DTSTAMP:20050118T211523Z
+UID:bsuidfortestabc123
+DTSTART;TZID=US-Mountain:20050120T170000
+DTEND;TZID=US-Mountain:20050120T184500
+CLASS:PRIVATE
+GEO:37.386013;-122.0829322
+ORGANIZER;CN="Joe Bob: Magician":mailto:joebob@random.net
+LOCATION;VALUE=1000 MAIN ST EXAMPLE, STATE 12345:1000 Main St Example\, State 12345
+PRIORITY:2
+SUMMARY:This is a really long summary to test the method of unfolding lines
+ \, so I'm just going to make it a whole bunch of lines. With a twist: a "
+ ö" takes up multiple bytes\, and should be wrapped to the next line.
+ATTACH:http://bush.sucks.org/impeach/him.rhtml
+ATTACH:http://corporations-dominate.existence.net/why.rhtml
+RDATE;TZID=US-Mountain:20050121T170000,20050122T170000
+X-TEST-COMPONENT;QTEST="Hello, World":Shouldn't double double quotes
+END:VEVENT
+END:VCALENDAR

data/spec/fixtures/two_time_events.ics

@@ -38,7 +38,7 @@ SEQUENCE:13
 BEGIN:VALARM
 X-WR-ALARMUID:6F54CD66-F2A9-491D-8892-7E3209F6A2E4
 UID:6F54CD66-F2A9-491D-8892-7E3209F6A2E4
-TRIGGER;VALUE=DATE-TIME:19760401T005545Z
+TRIGGER;VALUE=DATE TIME:19760401T005545Z
 ACTION:NONE
 END:VALARM
 END:VEVENT

data/spec/fixtures/tz_store_param_bug.ics

@@ -0,0 +1,30 @@
+BEGIN:VCALENDAR
+METHOD:COUNTER
+PRODID:Microsoft Exchange Server 2010
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Pacific Standard Time
+BEGIN:STANDARD
+DTSTART:16010101T020000
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=11
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:16010101T020000
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=2SU;BYMONTH=3
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+DTSTART;TZID=Pacific Standard Time:20251008T103000
+DTEND;TZID=Pacific Standard Time:20251008T113000
+X-MS-OLK-ORIGINALSTART;TZID=Pacific Standard Time:20251008T110000
+X-MS-OLK-ORIGINALEND;TZID=Pacific Standard Time:20251008T120000
+UID:1sqt3u5rn2fprt7g7u75obcgav@google.com
+SEQUENCE:0
+DTSTAMP:20251007T184328Z
+COMMENT;LANGUAGE=en-US:\n
+END:VEVENT
+END:VCALENDAR

data/spec/parser_spec.rb

@@ -116,4 +116,28 @@ describe Icalendar::Parser do
       expect(event.dtstart).to be_kind_of Icalendar::Values::Date
     end
   end
+
+  describe 'completely bad location value' do
+    let(:fn) { 'single_event_bad_location.ics' }
+
+    it 'falls back to string type for location' do
+      event = subject.parse.first.events.first
+      expect(event.location).to be_kind_of Icalendar::Values::Text
+      expect(event.location.value).to eq "1000 Main St Example, State 12345"
+    end
+  end
+
+  describe 'custom properties with tzid' do
+    let(:fn) { 'tz_store_param_bug.ics' }
+
+    it 'parses without error' do
+      expect(subject.parse.first).to be_a Icalendar::Calendar
+    end
+
+    it 'can be output to ics and re-parsed without error' do
+      cal = subject.parse.first
+      new_cal = Icalendar::Parser.new(cal.to_ical, false).parse.first
+      expect(new_cal).to be_a Icalendar::Calendar
+    end
+  end
 end

data/spec/values/date_time_spec.rb

@@ -17,7 +17,7 @@ describe Icalendar::Values::DateTime do
         expect(subject.value_ical).to eq value
       end
 
-      context 'local time' do
+      context 'tzid in IANA format' do
         let(:value) { '20140209T160652' }
         let(:params) { {'tzid' => 'America/Denver'} }
 
@@ -28,14 +28,15 @@ describe Icalendar::Values::DateTime do
         end
       end
 
-      context 'nonstandard format tzid local time' do
+      context 'tzid with partial match' do
         let(:value) { '20230901T230404' }
-        let(:params) { {'tzid' => 'Singapore Standard Time'} }
+        let(:params) { { 'tzid' => 'Singapore Time' } }
 
         it 'parses the value as local time' do
           expect(subject.value.hour).to eq 23
-          expect(subject.value.utc_offset).to eq 28800
+          expect(subject.value.utc_offset).to eq 28_800
           expect(subject.value.utc.hour).to eq 15
+          expect(subject.value.utc.minute).to eq 04
         end
 
         it 'updates the tzid' do
@@ -43,8 +44,24 @@ describe Icalendar::Values::DateTime do
           expect(subject.ical_params['tzid']).to eq ['Asia/Singapore']
         end
       end
-    end
 
+      context 'tzid in windows format' do
+        let(:value) { '20230901T230404' }
+        let(:params) { { 'tzid' => 'India Standard Time' } }
+
+        it 'parses the value as local time' do
+          expect(subject.value.hour).to eq 23
+          expect(subject.value.utc_offset).to eq 19_800
+          expect(subject.value.utc.hour).to eq 17
+          expect(subject.value.utc.minute).to eq 34
+        end
+
+        it 'updates the tzid' do
+          # use an array because that's how output from the parser will end up
+          expect(subject.ical_params['tzid']).to eq ['Asia/Kolkata']
+        end
+      end
+    end
   else
 
     context 'without ActiveSupport' do
@@ -63,10 +80,8 @@ describe Icalendar::Values::DateTime do
         end
       end
     end
-
   end
 
-
   context 'common tests' do
     it 'does not add any tzid parameter to output' do
       expect(subject.to_ical described_class).to eq ":#{value}"

data/spec/values/uri_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+describe Icalendar::Values::Uri do
+  describe '#value_ical' do
+    it 'percent-encodes CRLF to prevent content-line injection' do
+      value = described_class.new("https://a.example/ok\r\nATTENDEE:mailto:evil@example.com")
+
+      expect(value.value_ical).to eq('https://a.example/ok%0D%0AATTENDEE:mailto:evil@example.com')
+    end
+
+    it 'percent-encodes the full ASCII control range' do
+      raw = "https://example.com/a\tb\f#{0.chr}#{127.chr}"
+      value = described_class.new(raw)
+
+      expect(value.value_ical).to eq('https://example.com/a%09b%0C%00%7F')
+    end
+
+    it 'leaves valid printable URI characters unchanged' do
+      raw = 'https://example.com/a-path?q=one%20two&x=@tag#frag'
+      value = described_class.new(raw)
+
+      expect(value.value_ical).to eq(raw)
+    end
+  end
+
+  describe '#to_ical' do
+    it 'serializes injected CRLF on the same content line' do
+      value = described_class.new("https://a.example/ok\r\nATTENDEE:mailto:evil@example.com")
+
+      expect(value.to_ical(Icalendar::Values::Text)).to eq(
+        ';VALUE=URI:https://a.example/ok%0D%0AATTENDEE:mailto:evil@example.com'
+      )
+    end
+  end
+end
+
+describe Icalendar::Values::CalAddress do
+  it 'inherits URI control-byte encoding' do
+    value = described_class.new("mailto:user@example.com\r\nORGANIZER:mailto:evil@example.com")
+
+    expect(value.value_ical).to eq('mailto:user@example.com%0D%0AORGANIZER:mailto:evil@example.com')
+  end
+end

metadata

@@ -1,15 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: icalendar
 version: !ruby/object:Gem::Version
-  version: 2.10.3
+  version: 2.12.2
 platform: ruby
 authors:
 - Ryan Ahearn
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-21 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ice_cube
   requirement: !ruby/object:Gem::Requirement
@@ -24,6 +37,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.16'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ostruct
   requirement: !ruby/object:Gem::Requirement
@@ -195,6 +222,12 @@ files:
 - lib/icalendar/journal.rb
 - lib/icalendar/logger.rb
 - lib/icalendar/marshable.rb
+- lib/icalendar/offset.rb
+- lib/icalendar/offset/active_support_exact.rb
+- lib/icalendar/offset/active_support_partial.rb
+- lib/icalendar/offset/null.rb
+- lib/icalendar/offset/time_zone_store.rb
+- lib/icalendar/offset/windows_to_iana.rb
 - lib/icalendar/parser.rb
 - lib/icalendar/timezone.rb
 - lib/icalendar/timezone_store.rb
@@ -234,6 +267,7 @@ files:
 - spec/fixtures/single_event.ics
 - spec/fixtures/single_event_bad_dtstart.ics
 - spec/fixtures/single_event_bad_line.ics
+- spec/fixtures/single_event_bad_location.ics
 - spec/fixtures/single_event_bad_organizer.ics
 - spec/fixtures/single_event_organizer_parsed.ics
 - spec/fixtures/timezone.ics
@@ -241,6 +275,7 @@ files:
 - spec/fixtures/two_day_events.ics
 - spec/fixtures/two_events.ics
 - spec/fixtures/two_time_events.ics
+- spec/fixtures/tz_store_param_bug.ics
 - spec/fixtures/tzid_search.ics
 - spec/freebusy_spec.rb
 - spec/journal_spec.rb
@@ -257,6 +292,7 @@ files:
 - spec/values/period_spec.rb
 - spec/values/recur_spec.rb
 - spec/values/text_spec.rb
+- spec/values/uri_spec.rb
 - spec/values/utc_offset_spec.rb
 homepage: https://github.com/icalendar/icalendar
 licenses:
@@ -283,8 +319,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: A ruby implementation of the iCalendar specification (RFC-5545).
 test_files:
@@ -302,6 +337,7 @@ test_files:
 - spec/fixtures/single_event.ics
 - spec/fixtures/single_event_bad_dtstart.ics
 - spec/fixtures/single_event_bad_line.ics
+- spec/fixtures/single_event_bad_location.ics
 - spec/fixtures/single_event_bad_organizer.ics
 - spec/fixtures/single_event_organizer_parsed.ics
 - spec/fixtures/timezone.ics
@@ -309,6 +345,7 @@ test_files:
 - spec/fixtures/two_day_events.ics
 - spec/fixtures/two_events.ics
 - spec/fixtures/two_time_events.ics
+- spec/fixtures/tz_store_param_bug.ics
 - spec/fixtures/tzid_search.ics
 - spec/freebusy_spec.rb
 - spec/journal_spec.rb
@@ -325,4 +362,5 @@ test_files:
 - spec/values/period_spec.rb
 - spec/values/recur_spec.rb
 - spec/values/text_spec.rb
+- spec/values/uri_spec.rb
 - spec/values/utc_offset_spec.rb