A platform for community discussion. Free, open, simple.
FIX: Preserve URI delimiters in ICS URL properties, removing TEXT escaping (#42107)
Bannon Tannerf5203dfcca8c
diff --git a/app/views/users/bookmarks.ics.erb b/app/views/users/bookmarks.ics.erbindex 53862fe5478..471fbba1f6b 100644--- a/app/views/users/bookmarks.ics.erb+++ b/app/views/users/bookmarks.ics.erb@@ -10,7 +10,7 @@ DTSTART:<%= bookmark.reminder_at_ics_start %>DTEND:<%= bookmark.reminder_at_ics_end %>SUMMARY:<%= IcalEncoder.encode(bookmark.name.presence || bookmark.title) %>DESCRIPTION:<%= IcalEncoder.encode(bookmark.bookmarkable_url) %>-URL:<%= IcalEncoder.encode(bookmark.bookmarkable_url) %>+URL:<%= IcalEncoder.encode_uri(bookmark.bookmarkable_url) %>END:VEVENT<% end %>END:VCALENDARdiff --git a/lib/ical_encoder.rb b/lib/ical_encoder.rbindex eab87e346c4..96498d9ff11 100644--- a/lib/ical_encoder.rb+++ b/lib/ical_encoder.rb@@ -17,4 +17,16 @@ module IcalEncoder.gsub("\n", "\\n").html_safeend++ # Encodes a URI for iCalendar URL properties (RFC 5545 §3.8.4.6).+ # URL values are URIs per RFC 3986, so comma and semicolon (valid sub-delimiters)+ # must not be TEXT-escaped. Entities are decoded first, then CR/LF stripped —+ # order matters: stripping CR/LF after decoding neutralizes entity-encoded+ # newlines (e.g. ` `) that would otherwise inject additional ICS+ # properties on the following line.+ def self.encode_uri(uri)+ return "" if uri.blank?++ CGI.unescapeHTML(uri.to_s).delete("\r\n").html_safe+ endenddiff --git a/plugins/discourse-calendar/app/views/discourse_post_event/events/index.ics.erb b/plugins/discourse-calendar/app/views/discourse_post_event/events/index.ics.erbindex c0bccb11a84..32ce3f72024 100644--- a/plugins/discourse-calendar/app/views/discourse_post_event/events/index.ics.erb+++ b/plugins/discourse-calendar/app/views/discourse_post_event/events/index.ics.erb@@ -22,7 +22,7 @@ SUMMARY:<%= IcalEncoder.encode(event.name.presence || event.post.topic.title) %><%- if event.location.present? -%>LOCATION:<%= IcalEncoder.encode(event.location) %><%- end -%>DESCRIPTION:<%= IcalEncoder.encode([(event.description.presence || event.post.excerpt), event.post.full_url].compact.join("\n")) %>-URL:<%= IcalEncoder.encode(event.url.presence || event.post.topic.url(event.post.post_number)) %>+URL:<%= IcalEncoder.encode_uri(event.url.presence || event.post.topic.url(event.post.post_number)) %>END:VEVENT<%- end -%>END:VCALENDARdiff --git a/plugins/discourse-calendar/spec/requests/events_controller_spec.rb b/plugins/discourse-calendar/spec/requests/events_controller_spec.rbindex 1efd4d2cb14..9b4b13a25f4 100644--- a/plugins/discourse-calendar/spec/requests/events_controller_spec.rb+++ b/plugins/discourse-calendar/spec/requests/events_controller_spec.rb@@ -131,6 +131,40 @@ module DiscoursePostEventexpect(body).to include("URL:https://example.com/event-info")end+ it "preserves URI delimiters in URL fields while escaping text fields" do+ event =+ Fabricate(+ :event,+ original_starts_at: 1.day.from_now,+ name: "Conference, day; one",+ location: "Room A, floor 2; west",+ description: "Agenda, demos; questions",+ url: "https://example.com/events?tags=one,two;sort=asc&name=tom",+ )++ get "/discourse-post-event/events.ics"++ expect(response.status).to eq(200)+ expect(response.body).to include("SUMMARY:Conference\\, day\\; one")+ expect(response.body).to include("LOCATION:Room A\\, floor 2\\; west")+ expect(response.body).to include("DESCRIPTION:Agenda\\, demos\\; questions")+ expect(response.body).to include("URL:#{event.url}")+ end++ it "strips CR/LF from URL fields so a stored URL cannot inject ICS properties" do+ Fabricate(+ :event,+ original_starts_at: 1.day.from_now,+ url: "https://example.com/\r\nX-INJECTED:evil\r\n",+ )++ get "/discourse-post-event/events.ics"++ expect(response.status).to eq(200)+ expect(response.body).to include("URL:https://example.com/X-INJECTED:evil")+ expect(response.body).not_to match(/^X-INJECTED:evil$/)+ end+it "should not HTML-encode ampersands in ics format" doFabricate(:event,diff --git a/spec/lib/ical_encoder_spec.rb b/spec/lib/ical_encoder_spec.rbindex 138664a39a0..c8c5d095d83 100644--- a/spec/lib/ical_encoder_spec.rb+++ b/spec/lib/ical_encoder_spec.rb@@ -61,4 +61,18 @@ RSpec.describe IcalEncoder doexpect(result).to include("& special chars")endend++ describe ".encode_uri" do+ it "preserves URI delimiters and removes newlines" do+ result =+ described_class.encode_uri(+ "https://example.com/events?tags=one,two;sort=asc&name=Tom\r\nATTACH:https://bad.example",+ )++ expect(result).to eq(+ "https://example.com/events?tags=one,two;sort=asc&name=TomATTACH:https://bad.example",+ )+ expect(result).to be_html_safe+ end+ endenddiff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rbindex 8abfb58d255..4034b3bb5d6 100644--- a/spec/requests/users_controller_spec.rb+++ b/spec/requests/users_controller_spec.rb@@ -7755,6 +7755,20 @@ RSpec.describe UsersController doexpect(body).to include("SUMMARY:Tom & Jerry")end+ it "preserves URI delimiters in .ics feed URL fields" do+ bookmark2.bookmarkable.update_column(:slug, "bookmark,url;with-delimiters")+ bookmark2.update!(name: "Reminder, with; delimiters", reminder_at: 1.day.from_now)++ sign_in(user1)+ get "/u/#{user1.username}/bookmarks.ics"++ expect(response.status).to eq(200)+ bookmarkable_url = bookmark2.bookmarkable.url+ expect(response.body).to include("SUMMARY:Reminder\\, with\\; delimiters")+ expect(response.body).to include("DESCRIPTION:#{IcalEncoder.encode(bookmarkable_url)}")+ expect(response.body).to include("URL:#{bookmarkable_url}")+ end+it "does not show another user's bookmarks" dosign_in(Fabricate(:user))get "/u/#{bookmark3.user.username}/bookmarks.json"