@@ -49,14 +49,14 @@ def ghost_feed_token
4949 . create_with_validation (
5050 username : 'ghost' ,
5151 url : feed_url ,
52- strategy : 'ssrf_filter ' ,
52+ strategy : 'faraday ' ,
5353 secret_key : ENV . fetch ( 'HTML2RSS_SECRET_KEY' )
5454 )
5555 . encode
5656 end
5757
5858 def valid_feed_token
59- Html2rss ::Web ::Auth . generate_feed_token ( 'admin' , feed_url , strategy : 'ssrf_filter ' )
59+ Html2rss ::Web ::Auth . generate_feed_token ( 'admin' , feed_url , strategy : 'faraday ' )
6060 end
6161
6262 def json_feed_response_for ( token )
@@ -285,7 +285,7 @@ def json_feed_headers_tuple
285285 end
286286
287287 it 'renders feed for a valid token' , :aggregate_failures do
288- token = Html2rss ::Web ::Auth . generate_feed_token ( 'admin' , feed_url , strategy : 'ssrf_filter ' )
288+ token = Html2rss ::Web ::Auth . generate_feed_token ( 'admin' , feed_url , strategy : 'faraday ' )
289289
290290 allow ( Html2rss ::Web ::Feeds ::Service ) . to receive ( :call ) . and_return ( feed_result )
291291 allow ( Html2rss ::Web ::Feeds ::RssRenderer ) . to receive ( :call ) . and_return ( '<rss version="2.0"></rss>' )
@@ -305,7 +305,7 @@ def json_feed_headers_tuple
305305 end
306306
307307 it 'prefers xml when Accept quality outranks json' , :aggregate_failures do
308- token = Html2rss ::Web ::Auth . generate_feed_token ( 'admin' , feed_url , strategy : 'ssrf_filter ' )
308+ token = Html2rss ::Web ::Auth . generate_feed_token ( 'admin' , feed_url , strategy : 'faraday ' )
309309
310310 allow ( Html2rss ::Web ::Feeds ::Service ) . to receive ( :call ) . and_return ( feed_result )
311311 allow ( Html2rss ::Web ::Feeds ::RssRenderer ) . to receive ( :call ) . and_return ( '<rss version="2.0"></rss>' )
@@ -317,7 +317,7 @@ def json_feed_headers_tuple
317317 end
318318
319319 it 'ignores query param strategy overrides' , :aggregate_failures , openapi : false do
320- token = Html2rss ::Web ::Auth . generate_feed_token ( 'admin' , feed_url , strategy : 'ssrf_filter ' )
320+ token = Html2rss ::Web ::Auth . generate_feed_token ( 'admin' , feed_url , strategy : 'faraday ' )
321321
322322 allow ( Html2rss ::Web ::Feeds ::Service ) . to receive ( :call ) . and_return ( feed_result )
323323 allow ( Html2rss ::Web ::Feeds ::RssRenderer ) . to receive ( :call ) . and_return ( '<rss version="2.0"></rss>' )
@@ -346,7 +346,7 @@ def json_feed_headers_tuple
346346
347347 it 'returns forbidden when auto source is disabled' , :aggregate_failures do
348348 unique_url = "#{ feed_url } /disabled"
349- token = Html2rss ::Web ::Auth . generate_feed_token ( 'admin' , unique_url , strategy : 'ssrf_filter ' )
349+ token = Html2rss ::Web ::Auth . generate_feed_token ( 'admin' , unique_url , strategy : 'faraday ' )
350350
351351 ClimateControl . modify ( AUTO_SOURCE_ENABLED : 'false' ) do
352352 get "/api/v1/feeds/#{ token } " , { } , { 'HTTP_ACCEPT' => 'application/xml' }
@@ -359,7 +359,7 @@ def json_feed_headers_tuple
359359
360360 it 'returns JSON Feed-shaped forbidden errors when requested through Accept' , :aggregate_failures do
361361 unique_url = "#{ feed_url } /disabled-json"
362- token = Html2rss ::Web ::Auth . generate_feed_token ( 'admin' , unique_url , strategy : 'ssrf_filter ' )
362+ token = Html2rss ::Web ::Auth . generate_feed_token ( 'admin' , unique_url , strategy : 'faraday ' )
363363
364364 ClimateControl . modify ( AUTO_SOURCE_ENABLED : 'false' ) do
365365 get "/api/v1/feeds/#{ token } " , { } , { 'HTTP_ACCEPT' => 'application/feed+json' }
@@ -372,7 +372,7 @@ def json_feed_headers_tuple
372372
373373 it 'returns non-cacheable xml feed errors when service generation fails' , :aggregate_failures do
374374 unique_url = "#{ feed_url } /service-error-xml"
375- token = Html2rss ::Web ::Auth . generate_feed_token ( 'admin' , unique_url , strategy : 'ssrf_filter ' )
375+ token = Html2rss ::Web ::Auth . generate_feed_token ( 'admin' , unique_url , strategy : 'faraday ' )
376376
377377 allow ( Html2rss ::Web ::Feeds ::Service ) . to receive ( :call ) . and_return ( service_error_result )
378378
@@ -386,7 +386,7 @@ def json_feed_headers_tuple
386386
387387 it 'returns non-cacheable json feed errors when service generation fails' , :aggregate_failures do
388388 unique_url = "#{ feed_url } /service-error-json"
389- token = Html2rss ::Web ::Auth . generate_feed_token ( 'admin' , unique_url , strategy : 'ssrf_filter ' )
389+ token = Html2rss ::Web ::Auth . generate_feed_token ( 'admin' , unique_url , strategy : 'faraday ' )
390390
391391 status , content_type , cache_control , title = json_feed_service_error_tuple ( token )
392392
@@ -404,7 +404,7 @@ def json_feed_headers_tuple
404404 let ( :request_params ) do
405405 {
406406 url : feed_url ,
407- strategy : 'ssrf_filter '
407+ strategy : 'faraday '
408408 }
409409 end
410410
0 commit comments