This is an automated email from the ASF dual-hosted git repository.
bcall pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new 319190fec4 Remove matrix parameters from the cookie remap plugin
(#11579)
319190fec4 is described below
commit 319190fec48203c37c733476eae4d09620732d45
Author: Bryan Call <[email protected]>
AuthorDate: Mon Jul 29 13:28:41 2024 -0700
Remove matrix parameters from the cookie remap plugin (#11579)
---
plugins/experimental/cookie_remap/cookie_remap.cc | 4 -
.../cookie_remap/configs/matrixconfig.txt | 24 ---
.../pluginTest/cookie_remap/gold/matrix.gold | 11 --
.../pluginTest/cookie_remap/matrixparams.test.py | 186 ---------------------
4 files changed, 225 deletions(-)
diff --git a/plugins/experimental/cookie_remap/cookie_remap.cc
b/plugins/experimental/cookie_remap/cookie_remap.cc
index 32efa35a22..cac01bb5ea 100644
--- a/plugins/experimental/cookie_remap/cookie_remap.cc
+++ b/plugins/experimental/cookie_remap/cookie_remap.cc
@@ -62,10 +62,6 @@ public:
// we will just
// append them to the path
_d[pre_remap].path_str = _get_url_comp(urlh, TSUrlPathGet);
- auto matrix = _get_url_comp(urlh, TSUrlHttpParamsGet);
- if (!matrix.empty()) {
- _d[pre_remap].path_str.append(";", 1).append(matrix);
- }
}
return _d[pre_remap].path_str;
}
diff --git a/tests/gold_tests/pluginTest/cookie_remap/configs/matrixconfig.txt
b/tests/gold_tests/pluginTest/cookie_remap/configs/matrixconfig.txt
deleted file mode 100644
index 263c957359..0000000000
--- a/tests/gold_tests/pluginTest/cookie_remap/configs/matrixconfig.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-# This is a test configuration
-
-# Do a regex against the url
-
-op:
- operation: regex
- regex: eleventh
- sendto: http://127.0.0.10:$PORT/$path/eleventh;matrix=2?query=true
-
-op:
- operation: regex
- regex: tenth
- sendto: http://127.0.0.10:$PORT/$path/tenth;matrix=2
-
-op:
- operation: regex
- regex: ninth
- sendto: http://127.0.0.10:$PORT/$path/ninth?query=true
-
-op:
- operation: regex
- regex: eighth
- sendto: http://127.0.0.10:$PORT/$path/eighth
-
diff --git a/tests/gold_tests/pluginTest/cookie_remap/gold/matrix.gold
b/tests/gold_tests/pluginTest/cookie_remap/gold/matrix.gold
deleted file mode 100644
index 3989deaa61..0000000000
--- a/tests/gold_tests/pluginTest/cookie_remap/gold/matrix.gold
+++ /dev/null
@@ -1,11 +0,0 @@
-``
-Serving GET /eighth/magic;matrix=1/eighth... Finished
-``
-Serving GET /eighth/magic;matrix=1/eighth?hello=10... Finished
-``
-Serving GET /tenth/magic/tenth;matrix=2... Finished
-``
-Serving GET /tenth/magic/tenth;matrix=2?query=10... Finished
-``
-Serving GET /eleventh/magic;matrix=4/eleventh;matrix=2?query=true... Finished
-``
diff --git a/tests/gold_tests/pluginTest/cookie_remap/matrixparams.test.py
b/tests/gold_tests/pluginTest/cookie_remap/matrixparams.test.py
deleted file mode 100644
index 9f3becdb15..0000000000
--- a/tests/gold_tests/pluginTest/cookie_remap/matrixparams.test.py
+++ /dev/null
@@ -1,186 +0,0 @@
-'''
-'''
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import os
-
-Test.Summary = '''
-
-'''
-Test.SkipUnless(Condition.PluginExists('cookie_remap.so'))
-Test.ContinueOnFail = True
-Test.testName = "cookie_remap: Tests when matrix parameters are present"
-
-# Define default ATS
-ts = Test.MakeATSProcess("ts")
-
-# We just need a server to capture ATS outgoing requests
-# so that we can verify the remap rules
-# That's why I am not adding any canned request/response
-server = Test.MakeOriginServer("server", ip='127.0.0.10')
-
-request_header = {
- "headers": "GET /eighth/magic;matrix=1/eighth HTTP/1.1\r\nHost:
www.example.com\r\n\r\n",
- "timestamp": "1469733493.993",
- "body": ""
-}
-response_header = {"headers": "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\n",
"timestamp": "1469733493.993", "body": ""}
-
-server.addResponse("sessionfile.log", request_header, response_header)
-
-request_header_2 = {
- "headers": "GET /eighth/magic;matrix=1/eighth?hello=10 HTTP/1.1\r\nHost:
www.example.com\r\n\r\n",
- "timestamp": "1469733493.993",
- "body": ""
-}
-response_header_2 = {"headers": "HTTP/1.1 200 OK\r\nConnection:
close\r\n\r\n", "timestamp": "1469733493.993", "body": ""}
-
-server.addResponse("sessionfile.log", request_header_2, response_header_2)
-
-request_header_3 = {
- "headers": "GET /tenth/magic/tenth;matrix=2 HTTP/1.1\r\nHost:
www.example.com\r\n\r\n",
- "timestamp": "1469733493.993",
- "body": ""
-}
-response_header_3 = {"headers": "HTTP/1.1 200 OK\r\nConnection:
close\r\n\r\n", "timestamp": "1469733493.993", "body": ""}
-
-server.addResponse("sessionfile.log", request_header_3, response_header_3)
-
-request_header_4 = {
- "headers": "GET /tenth/magic/tenth;matrix=2?query=10 HTTP/1.1\r\nHost:
www.example.com\r\n\r\n",
- "timestamp": "1469733493.993",
- "body": ""
-}
-response_header_4 = {"headers": "HTTP/1.1 200 OK\r\nConnection:
close\r\n\r\n", "timestamp": "1469733493.993", "body": ""}
-
-server.addResponse("sessionfile.log", request_header_4, response_header_4)
-
-request_header_5 = {
- "headers": "GET /eleventh/magic;matrix=4/eleventh;matrix=2?query=true
HTTP/1.1\r\nHost: www.example.com\r\n\r\n",
- "timestamp": "1469733493.993",
- "body": ""
-}
-response_header_5 = {"headers": "HTTP/1.1 200 OK\r\nConnection:
close\r\n\r\n", "timestamp": "1469733493.993", "body": ""}
-
-server.addResponse("sessionfile.log", request_header_5, response_header_5)
-
-# Setup the remap configuration
-config_path = os.path.join(Test.TestDirectory, "configs/matrixconfig.txt")
-with open(config_path, 'r') as config_file:
- config1 = config_file.read()
-
-ts.Disk.records_config.update(
- {
- 'proxy.config.diags.debug.enabled': 1,
- 'proxy.config.diags.debug.tags': 'cookie_remap.*|http.*|dns.*',
- })
-
-config1 = config1.replace("$PORT", str(server.Variables.Port))
-
-ts.Disk.File(ts.Variables.CONFIGDIR + "/matrixconfig.txt", id="config1")
-ts.Disk.config1.WriteOn(config1)
-
-ts.Disk.remap_config.AddLine(
- 'map http://www.example.com/eighth http://shouldnothit.com/eighth
@plugin=cookie_remap.so @pparam=config/matrixconfig.txt')
-ts.Disk.remap_config.AddLine(
- 'map http://www.example.com/ninth http://shouldnothit.com/ninth
@plugin=cookie_remap.so @pparam=config/matrixconfig.txt')
-ts.Disk.remap_config.AddLine(
- 'map http://www.example.com/tenth http://shouldnothit.com/tenth
@plugin=cookie_remap.so @pparam=config/matrixconfig.txt')
-ts.Disk.remap_config.AddLine(
- 'map http://www.example.com/eleventh http://shouldnothit.com/eleventh
@plugin=cookie_remap.so @pparam=config/matrixconfig.txt')
-
-tr = Test.AddTestRun("path is substituted")
-tr.Processes.Default.Command = '''
-curl \
---proxy 127.0.0.1:{0} \
-"http://www.example.com/eighth/magic;matrix=1"; \
--H "Proxy-Connection: keep-alive" \
---verbose \
-'''.format(ts.Variables.port)
-tr.Processes.Default.ReturnCode = 0
-tr.Processes.Default.StartBefore(server,
ready=When.PortOpen(server.Variables.Port))
-tr.Processes.Default.StartBefore(Test.Processes.ts)
-tr.StillRunningAfter = ts
-tr.StillRunningAfter = server
-
-tr = Test.AddTestRun("path is substituted when matrix \
- and query is present")
-tr.Processes.Default.Command = '''
-curl \
---proxy 127.0.0.1:{0} \
-"http://www.example.com/eighth/magic;matrix=1?hello=10"; \
--H "Proxy-Connection: keep-alive" \
---verbose \
-'''.format(ts.Variables.port)
-tr.Processes.Default.ReturnCode = 0
-tr.StillRunningAfter = ts
-tr.StillRunningAfter = server
-
-tr = Test.AddTestRun("Another $path substitution passing matrix \
- and query and replacing query")
-tr.Processes.Default.Command = '''
-curl \
---proxy 127.0.0.1:{0} \
-"http://www.example.com/ninth/magic;matrix=5?hello=16"; \
--H "Proxy-Connection: keep-alive" \
---verbose \
-'''.format(ts.Variables.port)
-tr.Processes.Default.ReturnCode = 0
-tr.StillRunningAfter = ts
-tr.StillRunningAfter = server
-
-tr = Test.AddTestRun("$path substitution in sendto and \
- inserting matrix parameters in remap")
-tr.Processes.Default.Command = '''
-curl \
---proxy 127.0.0.1:{0} \
-"http://www.example.com/tenth/magic"; \
--H "Proxy-Connection: keep-alive" \
---verbose \
-'''.format(ts.Variables.port)
-tr.Processes.Default.ReturnCode = 0
-tr.StillRunningAfter = ts
-tr.StillRunningAfter = server
-
-tr = Test.AddTestRun("inserting matrix params in remap and \
- passing along query string")
-tr.Processes.Default.Command = '''
-curl \
---proxy 127.0.0.1:{0} \
-"http://www.example.com/tenth/magic?query=10"; \
--H "Proxy-Connection: keep-alive" \
---verbose \
-'''.format(ts.Variables.port)
-tr.Processes.Default.ReturnCode = 0
-tr.StillRunningAfter = ts
-tr.StillRunningAfter = server
-
-tr = Test.AddTestRun("Another test to verify matrix and query \
- params are passed along")
-tr.Processes.Default.Command = '''
-curl \
---proxy 127.0.0.1:{0} \
-"http://www.example.com/eleventh/magic;matrix=4?query=12"; \
--H "Proxy-Connection: keep-alive" \
--H "Proxy-Connection: keep-alive" \
---verbose \
-'''.format(ts.Variables.port)
-tr.Processes.Default.ReturnCode = 0
-tr.StillRunningAfter = ts
-tr.StillRunningAfter = server
-
-server.Streams.All = "gold/matrix.gold"
