5apps/manifique
4
0
Fork 0
Code Issues Pull Requests Releases 3 Activity

Ignore inadequate icon sources

Browse Source 
Icons with data URLs as source are throwing exceptions when trying to
parse their type via the file extension. This fix ignores all icons with
data URLs to begin with.
This commit is contained in:
Basti
2020-05-26 11:30:21 +02:00
parent ae5c02b7ed
commit 7c89900c70
3 changed files with 60 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/manifique/web_client.rb
View File

@@ -103,7 +103,7 @@ module Manifique
icon_links.each do |link|
icon = {}
icon["src"] = link.attributes["href"].value rescue nil
next if icon["src"].to_s.empty?
next unless is_adequate_src(icon["src"])
icon["sizes"] = link.attributes["sizes"].value rescue nil
icon["type"] = link.attributes["type"].value rescue get_icon_type(icon["src"])
@metadata.icons.push icon
@@ -117,7 +117,7 @@ module Manifique
icon_links.each do |link|
icon = { "purpose" => "apple-touch-icon" }
icon["src"] = link.attributes["href"].value rescue nil
next if icon["src"].to_s.empty?
next unless is_adequate_src(icon["src"])
icon["sizes"] = link.attributes["sizes"].value rescue nil
icon["type"] = link.attributes["type"].value rescue get_icon_type(icon["src"])
@metadata.icons.push icon
@@ -130,7 +130,7 @@ module Manifique
if mask_icon_link = @html.at_css("link[rel=mask-icon]")
icon = { "purpose" => "mask-icon" }
icon["src"] = mask_icon_link.attributes["href"].value rescue nil
return if icon["src"].to_s.empty?
return unless is_adequate_src(icon["src"])
icon["type"] = link.attributes["type"].value rescue get_icon_type(icon["src"])
icon["color"] = mask_icon_link.attributes["color"].value rescue nil
@metadata.icons.push icon
@@ -138,6 +138,14 @@ module Manifique
end
end
def is_data_url?(src)
!!src.match(/^data:/)
end
def is_adequate_src(src)
!src.nil? && !is_data_url?(src)
end
def get_icon_type(src)
extension = src.match(/\.([a-zA-Z]+)$/)[1]
return "image/#{extension}"
@@ -161,6 +169,5 @@ module Manifique
rescue
false
end
end
end