feat: validate the subordinate and check reference when deleting and adding…

apisix/admin/init.lua

@@ -15,6 +15,7 @@
 -- limitations under the License.
 --
 local require = require
+local filter = require("apisix.router").filter
 local core = require("apisix.core")
 local route = require("apisix.utils.router")
 local plugin = require("apisix.plugin")
@@ -351,6 +352,11 @@ function _M.init_worker()
         return
     end
 
+    if local_conf.apisix.stream_proxy then
+        local router_stream = require("apisix.stream.router.ip_port")
+        router_stream.stream_init_worker(filter)
+    end
+
     router = route.new(uri_route)
     events = require("resty.worker.events")
 

apisix/admin/stream_routes.lua

@@ -14,17 +14,41 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 --
+local require = require
 local core = require("apisix.core")
 local utils = require("apisix.admin.utils")
+local iterate_values = require("apisix.core.config_util").iterate_values
 local stream_route_checker = require("apisix.stream.router.ip_port").stream_route_checker
+local routes = require("apisix.stream.router.ip_port").routes
 local tostring = tostring
+local table = table
 
 
 local _M = {
     version = 0.1,
     need_v3_filter = true,
 }
 
+local function check_router_refer(items, id)
+    local warn_message = nil
+    local refer_list =  core.tablepool.fetch("refer_list", #items, 0)
+    for _, item in iterate_values(items) do
+        if item.value == nil then
+            goto CONTINUE
+        end
+        local route = item.value
+        if route.protocol and route.protocol.superior_id and route.protocol.superior_id == id then
+            table.insert(refer_list, item["key"])
+        end
+        ::CONTINUE::
+    end
+    if #refer_list > 0  then
+        warn_message = "/stream_routes/" .. id .. " is referred by "
+                        .. table.concat(refer_list,",")
+    end
+    core.tablepool.release("refer_list", refer_list)
+    return warn_message
+end
 
 local function check_conf(id, conf, need_id)
     if not conf then
@@ -142,6 +166,14 @@ function _M.delete(id)
         return 400, {error_msg = "missing stream route id"}
     end
 
+    local items, _ = routes()
+    if items ~= nil then
+        local warn_message = check_router_refer(items, id)
+        if warn_message ~= nil then
+            return 400, warn_message
+        end
+    end
+
     local key = "/stream_routes/" .. id
     -- core.log.info("key: ", key)
     local res, err = core.etcd.delete(key)

t/admin/stream-routes.t

@@ -607,3 +607,51 @@ GET /t
 {"error_msg":"unknown protocol [xxx]"}
 passed
 {"error_msg":"property \"faults\" validation failed: wrong type: expected array, got string"}
+--- no_error_log
+[error]
+
+
+
+=== TEST 17:  put reference route +  delete
+--- extra_yaml_config
+xrpc:
+  protocols:
+    - name: pingpong
+--- config
+    location /t {
+        content_by_lua_block {
+            local t = require("lib.test_admin").test
+            local code, body = t('/apisix/admin/stream_routes/12',
+                ngx.HTTP_PUT,
+                [[{
+                    "remote_addr": "127.0.0.1",
+                    "desc": "test-refer",
+                    "upstream": {
+                        "nodes": {
+                            "127.0.0.1:8080": 1
+                        },
+                        "type": "roundrobin"
+                    },
+                    "protocol": {
+                        "name": "pingpong",
+                        "superior_id": "1"
+                    }
+                }]]
+                )
+            if code > 300 then
+                ngx.status = code
+                ngx.print(body)
+                return
+            end
+            ngx.sleep(2)
+
+            local code2, message = t('/apisix/admin/stream_routes/1', ngx.HTTP_DELETE)
+            ngx.say("[delete] code: ", code2, " message: ", message)
+        }
+    }
+--- request
+GET /t
+--- response_body
+[delete] code: 400 message: /stream_routes/1 is referred by /apisix/stream_routes/12
+--- no_error_log
+[error]