Match all github.com subdomains

Author: josh

lib/html/pipeline/camo_filter.rb

@@ -31,7 +31,7 @@ def call
           end
 
           next if uri.hostname.nil?
-          next if uri.hostname.match(/^(\w+\.)?github(app)?\.com$/)
+          next if uri.hostname.match(/(^|\.)github(app)?\.com$/)
 
           element['src'] = asset_proxy_url(uri.to_s)
         end

test/html/pipeline/camo_filter_test.rb

@@ -30,12 +30,30 @@ def test_doesnt_rewrite_dotcom_subdomain_image_urls
       CamoFilter.call(orig, @options).to_s
   end
 
+  def test_doesnt_rewrite_dotcom_subsubdomain_image_urls
+    orig = %(<p><img src="https://f.assets.github.com/img.png"></p>)
+    assert_equal "<p><img src=\"https://f.assets.github.com/img.png\"></p>",
+      CamoFilter.call(orig, @options).to_s
+  end
+
+  def test_camouflaging_github_prefixed_image_urls
+    orig = %(<p><img src="https://notgithub.com/img.png"></p>)
+    assert_includes 'img src="' + @asset_proxy_url,
+      CamoFilter.call(orig, @options).to_s
+  end
+
   def test_doesnt_rewrite_dotcom_app_image_urls
     orig = %(<p><img src="https://githubapp.com/img.png"></p>)
     assert_equal "<p><img src=\"https://githubapp.com/img.png\"></p>",
       CamoFilter.call(orig, @options).to_s
   end
 
+  def test_rewrite_dotcom_app_image_urls
+    orig = %(<p><img src="https://githubapp.com/img.png"></p>)
+    assert_equal "<p><img src=\"https://githubapp.com/img.png\"></p>",
+      CamoFilter.call(orig, @options).to_s
+  end
+
   def test_doesnt_rewrite_absolute_image_urls
     orig = %(<p><img src="/img.png"></p>)
     assert_equal "<p><img src=\"/img.png\"></p>",
@@ -48,7 +66,6 @@ def test_doesnt_rewrite_relative_image_urls
       CamoFilter.call(orig, @options).to_s
   end
 
-
   def test_camouflaging_https_image_urls
     orig = %(<p><img src="https://foo.com/img.png"></p>)
     assert_includes 'img src="' + @asset_proxy_url,