.

Signed-off-by: Gil Desmarais <[email protected]>

Author: gildesmarais

.github/workflows/test_build_push.yml

@@ -29,6 +29,7 @@ jobs:
       - uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
+          cache-version: 1
 
       - run: bundle exec rspec
 

app.rb

@@ -70,6 +70,8 @@ def self.development? = ENV['RACK_ENV'] == 'development'
           require_relative f
         end
       end
+      @show_backtrace = !ENV['CI'].empty? || self.class.development?
+
 
       route do |r|
         r.public

routes/auto_source.rb

@@ -20,7 +20,7 @@ class App
             end
 
             r.on String, method: :get do |encoded_url|
-              strategy = request.params.fetch('strategy', :ssrf_filter).to_sym
+              strategy = request.params['strategy']&.to_sym || :ssrf_filter
               unless Html2rss::RequestService.strategy_registered?(strategy)
                 raise Html2rss::RequestService::UnknownStrategy
               end

spec/fixtures/vcr_cassettes/auto_source-github-h2r-web.yml

@@ -12,6 +12,7 @@ def app = described_class
   let(:request_headers) do
     { 'HTTP_HOST' => 'localhost' }
   end
+  let(:encoded_url) { Base64.urlsafe_encode64('https://github.com/html2rss/html2rss-web/commits/master') }
 
   let(:username) { 'username' }
   let(:password) { 'password' }
@@ -66,14 +67,17 @@ def app = described_class
   describe "GET '/auto_source/:encoded_url'" do
     context 'with provided basic auth' do
       subject(:response) do
-        VCR.use_cassette 'auto_source-h2r-web' do
-          get "/auto_source/#{Base64.urlsafe_encode64('https://github.com/html2rss/html2rss-web')}",
+        VCR.use_cassette('auto_source-github-h2r-web') do
+          get "/auto_source/#{encoded_url}?strategy",
               {},
               request_headers.merge('HTTP_AUTHORIZATION' => basic_authorize(username, password))
         end
       end
 
       it 'responds successfully', :aggregate_failures do
+        puts '*' * 80
+        puts response.body
+        puts '*' * 80
         expect(response).to be_ok
         expect(response.body).to start_with '<?xml version="1.0" encoding="UTF-8"?>'
         expect(response.get_header('cache-control')).to eq 'must-revalidate, private, max-age=0'
@@ -83,9 +87,11 @@ def app = described_class
 
     context 'when strategy is not registered' do
       subject(:response) do
-        get "/auto_source/#{Base64.urlsafe_encode64('https://github.com/html2rss/html2rss-web')}?strategy=nope",
-            {},
-            request_headers.merge('HTTP_AUTHORIZATION' => basic_authorize(username, password))
+        VCR.use_cassette('auto_source-github-h2r-web', match_requests_on: [:path]) do
+          get "/auto_source/#{encoded_url}?strategy=nope",
+              {},
+              request_headers.merge('HTTP_AUTHORIZATION' => basic_authorize(username, password))
+        end
       end
 
       it 'responds with Error', :aggregate_failures do
@@ -111,7 +117,7 @@ def app = described_class
 
     describe "GET '/auto_source/:encoded_url'" do
       it 'responds with 400 Bad Request', :aggregate_failures do
-        get "/auto_source/#{Base64.urlsafe_encode64('https://github.com/html2rss/html2rss-web')}",
+        get "/auto_source/#{encoded_url}",
             {},
             request_headers.merge('HTTP_AUTHORIZATION' => basic_authorize(username, password))