Merge pull request #1801 from 3scale/patch-fix/apiap/routing-rule-sta…

…rts-with Fix APIAP routing policy rule
3scale · Mar 31, 2020 · 4673ee3 · 4673ee3
2 parents 0c20591 + 0e775bb
commit 4673ee3
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/app/models/config_path.rb b/app/models/config_path.rb
@@ -10,9 +10,9 @@ def initialize(value)
   end
 
   def to_regex
-    return '/.*' if empty?
+    return '^(/.*)' if empty?
 
-    "#{path}/.*|#{path}/?"
+    "^(#{path}/.*|#{path}/?)"
   end
 
   def empty?

diff --git a/test/unit/backend_api_logic/routing_policy_test.rb b/test/unit/backend_api_logic/routing_policy_test.rb
@@ -25,8 +25,8 @@ class RoutingPolicyTest < ActiveSupport::TestCase
       backend_api1 = backend_apis.first
       backend_api2 = backend_apis.last
       injected_rules = [
-        { url: backend_api2.private_endpoint, owner_id: backend_api2.id, owner_type: 'BackendApi', condition: { operations: [match: :path, op: :matches, value: '/foo/.*|/foo/?'] }, replace_path: "{{uri | remove_first: '/foo'}}" },
-        { url: backend_api1.private_endpoint, owner_id: backend_api1.id, owner_type: 'BackendApi', condition: { operations: [match: :path, op: :matches, value: '/.*'] } }
+        { url: backend_api2.private_endpoint, owner_id: backend_api2.id, owner_type: 'BackendApi', condition: { operations: [match: :path, op: :matches, value: '^(/foo/.*|/foo/?)'] }, replace_path: "{{uri | remove_first: '/foo'}}" },
+        { url: backend_api1.private_endpoint, owner_id: backend_api1.id, owner_type: 'BackendApi', condition: { operations: [match: :path, op: :matches, value: '^(/.*)'] } }
       ]
       apicast_policy = { name: 'apicast', 'version': 'builtin', 'configuration': {} }
       injected_policy = {
@@ -52,8 +52,8 @@ class RoutingPolicyTest < ActiveSupport::TestCase
       backend_api1 = backend_apis.first
       backend_api2 = backend_apis.last
       injected_rules = [
-        { url: backend_api2.private_endpoint, owner_id: backend_api2.id, owner_type: 'BackendApi', condition: { operations: [match: :path, op: :matches, value: '/foo/.*|/foo/?'] }, replace_path: "{{uri | remove_first: '/foo'}}" },
-        { url: backend_api1.private_endpoint, owner_id: backend_api1.id, owner_type: 'BackendApi', condition: { operations: [match: :path, op: :matches, value: '/.*'] } },
+        { url: backend_api2.private_endpoint, owner_id: backend_api2.id, owner_type: 'BackendApi', condition: { operations: [match: :path, op: :matches, value: '^(/foo/.*|/foo/?)'] }, replace_path: "{{uri | remove_first: '/foo'}}" },
+        { url: backend_api1.private_endpoint, owner_id: backend_api1.id, owner_type: 'BackendApi', condition: { operations: [match: :path, op: :matches, value: '^(/.*)'] } },
         routing_rule
       ]
       injected_routing_policy = {

diff --git a/test/unit/config_path_test.rb b/test/unit/config_path_test.rb
@@ -17,11 +17,11 @@ class ConfigPathTest < ActiveSupport::TestCase
     refute ConfigPath.new('/somepath').empty?
   end
 
-  test '#to_regex returns "/.*" if path is not informed' do
-    assert_equal '/.*', ConfigPath.new('/').to_regex
+  test '#to_regex returns "^(/.*)" if path is not informed' do
+    assert_equal '^(/.*)', ConfigPath.new('/').to_regex
   end
 
   test '#to_regex returns the regex for the path if it is informed' do
-    assert_equal '/some/path/.*|/some/path/?', ConfigPath.new('/some/path').to_regex
+    assert_equal '^(/some/path/.*|/some/path/?)', ConfigPath.new('/some/path').to_regex
   end
 end
diff --git a/test/unit/proxy_test.rb b/test/unit/proxy_test.rb
@@ -92,9 +92,9 @@ def test_policy_chain_with_backend_apis
         {"name"=>"routing", "version"=>"builtin", "enabled"=>true,
           "configuration"=>{
             "rules"=>[
-              {"url"=>"https://private-2.example.com:443", "owner_id"=>backend_api2.id, "owner_type" => "BackendApi", "condition"=>{"operations"=>[{"match"=>"path", "op"=>"matches", "value"=>"/foo/bar/.*|/foo/bar/?"}]}, 'replace_path'=>"{{uri | remove_first: '/foo/bar'}}"},
-              {"url"=>"https://private-1.example.com:443", "owner_id"=>backend_api1.id, "owner_type" => "BackendApi", "condition"=>{"operations"=>[{"match"=>"path", "op"=>"matches", "value"=>"/foo/.*|/foo/?"}]}, 'replace_path'=>"{{uri | remove_first: '/foo'}}"},
-              {"url"=>"https://echo-api.3scale.net:443", "owner_id"=>backend_api0.id, "owner_type" => "BackendApi", "condition"=>{"operations"=>[{"match"=>"path", "op"=>"matches", "value"=>"/.*"}]}}
+              {"url"=>"https://private-2.example.com:443", "owner_id"=>backend_api2.id, "owner_type" => "BackendApi", "condition"=>{"operations"=>[{"match"=>"path", "op"=>"matches", "value"=>"^(/foo/bar/.*|/foo/bar/?)"}]}, 'replace_path'=>"{{uri | remove_first: '/foo/bar'}}"},
+              {"url"=>"https://private-1.example.com:443", "owner_id"=>backend_api1.id, "owner_type" => "BackendApi", "condition"=>{"operations"=>[{"match"=>"path", "op"=>"matches", "value"=>"^(/foo/.*|/foo/?)"}]}, 'replace_path'=>"{{uri | remove_first: '/foo'}}"},
+              {"url"=>"https://echo-api.3scale.net:443", "owner_id"=>backend_api0.id, "owner_type" => "BackendApi", "condition"=>{"operations"=>[{"match"=>"path", "op"=>"matches", "value"=>"^(/.*)"}]}}
             ]
           }
         },