Fix directory traversal in Timezone.get when using Ruby data source

tzinfo · Jul 16, 2022 · 9905ca9 · Sole-Journey · Oct 18, 2022 · Sole-Journey
1 parent 07b5941
commit 9905ca9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/lib/tzinfo/ruby_data_source.rb b/lib/tzinfo/ruby_data_source.rb
@@ -38,7 +38,7 @@ def initialize
  # Raises InvalidTimezoneIdentifier if the timezone is not found or the 
  # identifier is invalid.
  def load_timezone_info(identifier)
- raise InvalidTimezoneIdentifier, 'Invalid identifier' if identifier !~ /^[A-Za-z0-9\+\-_]+(\/[A-Za-z0-9\+\-_]+)*$/
+ raise InvalidTimezoneIdentifier, 'Invalid identifier' if identifier !~ /\A[A-Za-z0-9\+\-_]+(\/[A-Za-z0-9\+\-_]+)*\z/
 
  identifier = identifier.gsub(/-/, '__m__').gsub(/\+/, '__p__')
 

diff --git a/test/assets/payload.rb b/test/assets/payload.rb
@@ -0,0 +1 @@
+raise 'This should never be executed'
diff --git a/test/tc_ruby_data_source.rb b/test/tc_ruby_data_source.rb
@@ -51,6 +51,12 @@ def test_load_timezone_info_invalid
  @data_source.load_timezone_info('../Definitions/UTC')
  end
  end
+
+ def test_load_timezone_info_directory_traversal
+ test_data_depth = TZINFO_TEST_DATA_DIR.scan('/').size
+ payload_path = File.join(TESTS_DIR, 'assets', 'payload')
+ assert_raises(InvalidTimezoneIdentifier) { Timezone.get("foo\n#{'/..' * (test_data_depth + 4)}#{payload_path}") }
+ end
 
  def test_load_timezone_info_nil
  assert_raises(InvalidTimezoneIdentifier) do

diff --git a/test/tc_timezone.rb b/test/tc_timezone.rb
@@ -213,7 +213,7 @@ def test_get_not_exist
  end
 
  def test_get_invalid
- assert_raises(InvalidTimezoneIdentifier) { Timezone.get('../Definitions/UTC') }
+ assert_raises(InvalidTimezoneIdentifier) { Timezone.get('../definitions/UTC') }
  end
 
  def test_get_nil