You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by GitBox <gi...@apache.org> on 2020/10/09 10:29:16 UTC
[GitHub] [apisix] idbeta opened a new pull request #2368: WIP: add uri fuzzing test
idbeta opened a new pull request #2368:
URL: https://github.com/apache/apisix/pull/2368
### What this PR does / why we need it:
<!--- Why is this change required? What problem does it solve? -->
<!--- If it fixes an open issue, please link to the issue here. -->
### Pre-submission checklist:
* [x] Did you explain what problem does this PR solve? Or what new features have been added?
* [] Have you added corresponding test cases?
* [ ] Have you modified the corresponding document?
* [ ] Is this PR backward compatible?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] moonming commented on pull request #2368: WIP: add uri fuzzing test
Posted by GitBox <gi...@apache.org>.
moonming commented on pull request #2368:
URL: https://github.com/apache/apisix/pull/2368#issuecomment-707453182
> @idbeta You can link to the issues found in this PR here.
>
>
>
> Prove that this PR is very useful.
Can test nginx find those issue too? Why we need a new testing method?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] membphis edited a comment on pull request #2368: add uri fuzzing test
Posted by GitBox <gi...@apache.org>.
membphis edited a comment on pull request #2368:
URL: https://github.com/apache/apisix/pull/2368#issuecomment-715353037
@idbeta please update those status

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] idbeta commented on a change in pull request #2368: add uri fuzzing test
Posted by GitBox <gi...@apache.org>.
idbeta commented on a change in pull request #2368:
URL: https://github.com/apache/apisix/pull/2368#discussion_r511691936
##########
File path: t/specialtest/cases/test_fuzziing_uri_of_route.py
##########
@@ -0,0 +1,142 @@
+#
+# 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.
+#
+
+# !/usr/bin/env python
+# -*- coding: utf-8 -*-
+import os
+import time
+import subprocess
+import random
+import urllib
+import re
+import requests
+import psutil
+import grequests
+
+
+def get_pid_byname():
+ name = "apisix"
+ cmd = "ps -ef | grep %s/conf | grep master | grep -v grep| awk '{print $2}'" % name
+ p = subprocess.Popen(cmd, stderr=subprocess.PIPE,
+ stdout=subprocess.PIPE, shell=True)
+ p.wait()
+ return p.stdout.read().strip()
+
+
+def get_workerres(pid):
+ parent = psutil.Process(pid)
+ children = parent.children(recursive=True)
+ for p in children:
+ cp = psutil.Process(p.pid)
+ print(p.pid, cp.cpu_percent(interval=1.0), cp.memory_percent())
+
+
+def cur_file_dir():
+ return os.path.split(os.path.realpath(__file__))[0]
+
+
+def requesttest(url, times):
+ start = time.time()
+ tasks = []
+ r = []
+ while time.time() - start <= times:
+ tasks.append(grequests.get(url))
+ res = grequests.map(tasks, size=50)
+ r.extend([i.status_code for i in res])
+ return r
+
+
+def setup_module():
+ global headers, apisixhost, apisixpid, apisixpath
+ apisixpid = int(get_pid_byname())
+ apisixpath = psutil.Process(apisixpid).cwd()
+ os.chdir(apisixpath)
+
+ subprocess.call("./bin/apisix stop", shell=True, stdout=subprocess.PIPE)
Review comment:
The etcd was run when the environment is initialized, so I don't want to restart it here.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] membphis commented on pull request #2368: add uri fuzzing test
Posted by GitBox <gi...@apache.org>.
membphis commented on pull request #2368:
URL: https://github.com/apache/apisix/pull/2368#issuecomment-710066589
> 2\. and it is also very simple for python to monitor the resource occupation of the specified components, and long-term testing is easy for it too.
do we have implemented this feature in this test case?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] idbeta commented on a change in pull request #2368: add uri fuzzing test
Posted by GitBox <gi...@apache.org>.
idbeta commented on a change in pull request #2368:
URL: https://github.com/apache/apisix/pull/2368#discussion_r511692360
##########
File path: t/specialtest/cases/test_fuzziing_uri_of_route.py
##########
@@ -0,0 +1,142 @@
+#
+# 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.
+#
+
+# !/usr/bin/env python
+# -*- coding: utf-8 -*-
+import os
+import time
+import subprocess
+import random
+import urllib
+import re
+import requests
+import psutil
+import grequests
+
+
+def get_pid_byname():
+ name = "apisix"
+ cmd = "ps -ef | grep %s/conf | grep master | grep -v grep| awk '{print $2}'" % name
+ p = subprocess.Popen(cmd, stderr=subprocess.PIPE,
+ stdout=subprocess.PIPE, shell=True)
+ p.wait()
+ return p.stdout.read().strip()
+
+
+def get_workerres(pid):
+ parent = psutil.Process(pid)
+ children = parent.children(recursive=True)
+ for p in children:
+ cp = psutil.Process(p.pid)
+ print(p.pid, cp.cpu_percent(interval=1.0), cp.memory_percent())
+
+
+def cur_file_dir():
+ return os.path.split(os.path.realpath(__file__))[0]
+
+
+def requesttest(url, times):
+ start = time.time()
+ tasks = []
+ r = []
+ while time.time() - start <= times:
+ tasks.append(grequests.get(url))
+ res = grequests.map(tasks, size=50)
+ r.extend([i.status_code for i in res])
+ return r
+
+
+def setup_module():
+ global headers, apisixhost, apisixpid, apisixpath
+ apisixpid = int(get_pid_byname())
+ apisixpath = psutil.Process(apisixpid).cwd()
+ os.chdir(apisixpath)
+
+ subprocess.call("./bin/apisix stop", shell=True, stdout=subprocess.PIPE)
+ time.sleep(1)
+
+ subprocess.Popen("> logs/error.log", shell=True, stdout=subprocess.PIPE)
+ subprocess.call("etcd &", shell=True, stdout=subprocess.PIPE)
+ time.sleep(5)
+
+ subprocess.call("./bin/apisix start", shell=True, stdout=subprocess.PIPE)
+ time.sleep(1)
+
+ apisixpid = int(get_pid_byname())
+ print("=============APISIX's pid:", apisixpid)
+ apisixhost = "http://127.0.0.1:9080"
+ headers = {"X-API-KEY": "edd1c9f034335f136f87ad84b625c8f1"}
+ confpath = "./t/specialtest/cases/nginx.conf"
+ try:
+ os.makedirs("./t/specialtest/cases/logs")
+ except Exception as e:
+ pass
+ p = subprocess.Popen(['openresty', '-p', apisixpath, '-c', confpath],
+ stderr=subprocess.PIPE, stdout=subprocess.PIPE,
+ shell=False)
+ p.wait()
+
+
+def teardown_module():
+ pass
+
+
+def test_fuzzing_uri_of_route():
+ print("====APISIX's resource occupation(before test):")
+ get_workerres(apisixpid)
+ # use environment variables "FUZZING_URI"
+ # you can setting the numbers of test uris
+ fuzzing_uri_nums = 1000 if not os.getenv('FUZZING_URI')\
+ else os.getenv('FUZZING_URI')
+ # not spupport * :
+ orgin_char = '''ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
+ 0123456789/-_~!();@&=+$,?#'.[]'''
+ for i in range(int(fuzzing_uri_nums)):
+ length = random.randint(1, 4080)
+ tmpuri = "".join(random.sample(list(orgin_char) *
+ (length//len(orgin_char) + 1), length))
+ tmpuri = re.sub(r"/(\.+)/", "", tmpuri)
+ tmpuri = re.sub(r"/+", "/", tmpuri)
+ uri = "/hello%s" % tmpuri
+ assert len("/hello%s" % uri) <= 4096
+ cfgdata = {
+ "uri": uri,
+ "upstream": {
+ "type": "roundrobin",
+ "nodes": {
+ "127.0.0.1:9666": 1
+ }
+ }
+ }
+
+ r = requests.put("%s/apisix/admin/routes/1" % apisixhost,
+ json=cfgdata, headers=headers)
+ assert str(r.status_code).startswith("2")
+ time.sleep(0.2)
+ # verify route
+ uri = urllib.quote(uri)
+ r = requests.get("%s%s" % (apisixhost, uri))
+ if r.status_code != 200 or "Hello, World!" not in r.content:
+ print(uri, r.status_code, r.content)
+ raise AssertionError('assertError')
+
+ print("====APISIX's resource occupation\
Review comment:
Sure, done.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] membphis commented on pull request #2368: WIP: add uri fuzzing test
Posted by GitBox <gi...@apache.org>.
membphis commented on pull request #2368:
URL: https://github.com/apache/apisix/pull/2368#issuecomment-707435806
@idbeta You can link to the issues found in this PR here.
Prove that this PR is very useful.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] membphis commented on pull request #2368: WIP: add uri fuzzing test
Posted by GitBox <gi...@apache.org>.
membphis commented on pull request #2368:
URL: https://github.com/apache/apisix/pull/2368#issuecomment-706495616
@idbeta code style: https://github.com/apache/apisix/pull/2368/checks?check_run_id=1234621149#step:6:124
You need to write a summary first. Why we need this PR?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] idbeta commented on a change in pull request #2368: add uri fuzzing test
Posted by GitBox <gi...@apache.org>.
idbeta commented on a change in pull request #2368:
URL: https://github.com/apache/apisix/pull/2368#discussion_r510723805
##########
File path: .travis/linux_specialtest_runner.sh
##########
@@ -0,0 +1,120 @@
+#!/usr/bin/env bash
+#
+# 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.
+#
+
+set -ex
+
+export_or_prefix() {
+ export OPENRESTY_PREFIX="/usr/local/openresty-debug"
+}
+
+create_lua_deps() {
+ echo "Create lua deps cache"
+
+ make deps
+ luarocks install luacov-coveralls --tree=deps --local > build.log 2>&1 || (cat build.log && exit 1)
+
+ sudo rm -rf build-cache/deps
+ sudo cp -r deps build-cache/
+ sudo cp rockspec/apisix-master-0.rockspec build-cache/
+}
+
+before_install() {
+ echo "Before install"
+}
+
+do_install() {
+ export_or_prefix
+
+ wget -qO - https://openresty.org/package/pubkey.gpg | sudo apt-key add -
+ sudo apt-get -y update --fix-missing
+ sudo apt-get -y install software-properties-common
+ sudo add-apt-repository -y "deb http://openresty.org/package/ubuntu $(lsb_release -sc) main"
+
+ sudo apt-get update
+ sudo apt-get install openresty-debug lua5.1 liblua5.1-0-dev
+
+ wget https://github.com/luarocks/luarocks/archive/v2.4.4.tar.gz
+ tar -xf v2.4.4.tar.gz
+ cd luarocks-2.4.4
+ ./configure --prefix=/usr > build.log 2>&1 || (cat build.log && exit 1)
+ make build > build.log 2>&1 || (cat build.log && exit 1)
+ sudo make install > build.log 2>&1 || (cat build.log && exit 1)
+ cd ..
+ rm -rf luarocks-2.4.4
+
+ sudo luarocks install luacheck > build.log 2>&1 || (cat build.log && exit 1)
+
+ ./utils/install-etcd.sh
+
+ if [ ! -f "build-cache/apisix-master-0.rockspec" ]; then
+ create_lua_deps
+
+ else
+ src=`md5sum rockspec/apisix-master-0.rockspec | awk '{print $1}'`
+ src_cp=`md5sum build-cache/apisix-master-0.rockspec | awk '{print $1}'`
+ if [ "$src" = "$src_cp" ]; then
+ echo "Use lua deps cache"
+ sudo cp -r build-cache/deps ./
+ else
+ create_lua_deps
+ fi
+ fi
+}
+
+script() {
+ export_or_prefix
+ export PATH=$OPENRESTY_PREFIX/nginx/sbin:$OPENRESTY_PREFIX/luajit/bin:$OPENRESTY_PREFIX/bin:$PATH
+ openresty -V
+ sudo service etcd stop
+ mkdir -p ~/etcd-data
+ etcd --listen-client-urls 'http://0.0.0.0:2379' --advertise-client-urls='http://0.0.0.0:2379' --data-dir ~/etcd-data > /dev/null 2>&1 &
+ etcdctl version
+ sleep 5
+
+ ./bin/apisix start
+
+ #start again --> fial
+ res=`./bin/apisix start`
+ if [ "$res" != "APISIX is running..." ]; then
+ echo "failed: APISIX runs repeatedly"
+ exit 1
+ fi
+
+ cd t/specialtest/
+ sudo python runtest.py
+ pytest --force-flaky --max-runs=3 --no-flaky-report -v -s "cases"
+
+}
+
+
+case_opt=$1
+shift
+
+case ${case_opt} in
+before_install)
+ before_install "$@"
+ ;;
+do_install)
+ do_install "$@"
+ ;;
+script)
+ script "$@"
+ ;;
+
+
+esac
Review comment:
yes, esac indicates the end of the case code block.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] idbeta commented on pull request #2368: WIP: add uri fuzzing test
Posted by GitBox <gi...@apache.org>.
idbeta commented on pull request #2368:
URL: https://github.com/apache/apisix/pull/2368#issuecomment-707491225
As I mentioned in the summary above, using python as a new testing method is a supplement to the current test method. It can do some special operations, which are more difficult to implement in the current test method.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] moonming commented on pull request #2368: add uri fuzzing test
Posted by GitBox <gi...@apache.org>.
moonming commented on pull request #2368:
URL: https://github.com/apache/apisix/pull/2368#issuecomment-712529828
@idbeta any update?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] membphis commented on a change in pull request #2368: add uri fuzzing test
Posted by GitBox <gi...@apache.org>.
membphis commented on a change in pull request #2368:
URL: https://github.com/apache/apisix/pull/2368#discussion_r510897373
##########
File path: .travis/linux_specialtest_runner.sh
##########
@@ -0,0 +1,120 @@
+#!/usr/bin/env bash
+#
+# 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.
+#
+
+set -ex
+
+export_or_prefix() {
+ export OPENRESTY_PREFIX="/usr/local/openresty-debug"
+}
+
+create_lua_deps() {
+ echo "Create lua deps cache"
+
+ make deps
+ luarocks install luacov-coveralls --tree=deps --local > build.log 2>&1 || (cat build.log && exit 1)
+
+ sudo rm -rf build-cache/deps
+ sudo cp -r deps build-cache/
+ sudo cp rockspec/apisix-master-0.rockspec build-cache/
+}
+
+before_install() {
+ echo "Before install"
+}
+
+do_install() {
+ export_or_prefix
+
+ wget -qO - https://openresty.org/package/pubkey.gpg | sudo apt-key add -
+ sudo apt-get -y update --fix-missing
+ sudo apt-get -y install software-properties-common
+ sudo add-apt-repository -y "deb http://openresty.org/package/ubuntu $(lsb_release -sc) main"
+
+ sudo apt-get update
+ sudo apt-get install openresty-debug lua5.1 liblua5.1-0-dev
+
+ wget https://github.com/luarocks/luarocks/archive/v2.4.4.tar.gz
+ tar -xf v2.4.4.tar.gz
+ cd luarocks-2.4.4
+ ./configure --prefix=/usr > build.log 2>&1 || (cat build.log && exit 1)
+ make build > build.log 2>&1 || (cat build.log && exit 1)
+ sudo make install > build.log 2>&1 || (cat build.log && exit 1)
+ cd ..
+ rm -rf luarocks-2.4.4
+
+ sudo luarocks install luacheck > build.log 2>&1 || (cat build.log && exit 1)
+
+ ./utils/install-etcd.sh
+
+ if [ ! -f "build-cache/apisix-master-0.rockspec" ]; then
+ create_lua_deps
+
+ else
+ src=`md5sum rockspec/apisix-master-0.rockspec | awk '{print $1}'`
+ src_cp=`md5sum build-cache/apisix-master-0.rockspec | awk '{print $1}'`
+ if [ "$src" = "$src_cp" ]; then
+ echo "Use lua deps cache"
+ sudo cp -r build-cache/deps ./
+ else
+ create_lua_deps
+ fi
+ fi
+}
+
+script() {
+ export_or_prefix
+ export PATH=$OPENRESTY_PREFIX/nginx/sbin:$OPENRESTY_PREFIX/luajit/bin:$OPENRESTY_PREFIX/bin:$PATH
+ openresty -V
+ sudo service etcd stop
+ mkdir -p ~/etcd-data
+ etcd --listen-client-urls 'http://0.0.0.0:2379' --advertise-client-urls='http://0.0.0.0:2379' --data-dir ~/etcd-data > /dev/null 2>&1 &
+ etcdctl version
+ sleep 5
+
+ ./bin/apisix start
+
+ #start again --> fial
+ res=`./bin/apisix start`
+ if [ "$res" != "APISIX is running..." ]; then
+ echo "failed: APISIX runs repeatedly"
+ exit 1
+ fi
+
+ cd t/specialtest/
+ sudo python runtest.py
+ pytest --force-flaky --max-runs=3 --no-flaky-report -v -s "cases"
+
+}
+
+
+case_opt=$1
+shift
+
+case ${case_opt} in
+before_install)
+ before_install "$@"
+ ;;
+do_install)
+ do_install "$@"
+ ;;
+script)
+ script "$@"
+ ;;
+
+
+esac
Review comment:
got it, thx
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] membphis commented on a change in pull request #2368: add uri fuzzing test
Posted by GitBox <gi...@apache.org>.
membphis commented on a change in pull request #2368:
URL: https://github.com/apache/apisix/pull/2368#discussion_r505621566
##########
File path: .travis/linux_specialtest_runner.sh
##########
@@ -34,22 +34,23 @@ create_lua_deps() {
}
before_install() {
- sudo cpanm --notest Test::Nginx >build.log 2>&1 || (cat build.log && exit 1)
- docker pull redis:3.0-alpine
- docker run --rm -itd -p 6379:6379 --name apisix_redis redis:3.0-alpine
- docker run --rm -itd -e HTTP_PORT=8888 -e HTTPS_PORT=9999 -p 8888:8888 -p 9999:9999 mendhak/http-https-echo
- # Runs Keycloak version 10.0.2 with inbuilt policies for unit tests
- docker run --rm -itd -e KEYCLOAK_USER=admin -e KEYCLOAK_PASSWORD=123456 -p 8090:8080 -p 8443:8443 sshniro/keycloak-apisix
- # spin up kafka cluster for tests (1 zookeper and 1 kafka instance)
- docker pull bitnami/zookeeper:3.6.0
- docker pull bitnami/kafka:latest
- docker network create kafka-net --driver bridge
- docker run --name zookeeper-server -d -p 2181:2181 --network kafka-net -e ALLOW_ANONYMOUS_LOGIN=yes bitnami/zookeeper:3.6.0
- docker run --name kafka-server1 -d --network kafka-net -e ALLOW_PLAINTEXT_LISTENER=yes -e KAFKA_CFG_ZOOKEEPER_CONNECT=zookeeper-server:2181 -e KAFKA_CFG_ADVERTISED_LISTENERS=PLAINTEXT://127.0.0.1:9092 -p 9092:9092 -e KAFKA_CFG_AUTO_CREATE_TOPICS_ENABLE=true bitnami/kafka:latest
- docker pull bitinit/eureka
- docker run --name eureka -d -p 8761:8761 --env ENVIRONMENT=apisix --env spring.application.name=apisix-eureka --env server.port=8761 --env eureka.instance.ip-address=127.0.0.1 --env eureka.client.registerWithEureka=true --env eureka.client.fetchRegistry=false --env eureka.client.serviceUrl.defaultZone=http://127.0.0.1:8761/eureka/ bitinit/eureka
- sleep 5
- docker exec -i kafka-server1 /opt/bitnami/kafka/bin/kafka-topics.sh --create --zookeeper zookeeper-server:2181 --replication-factor 1 --partitions 1 --topic test2
+ echo "Before install"
+ # sudo cpanm --notest Test::Nginx >build.log 2>&1 || (cat build.log && exit 1)
Review comment:
if we do not need them, we should delete them directly.
##########
File path: .travis/linux_specialtest_runner.sh
##########
@@ -93,34 +94,34 @@ do_install() {
# sudo apt-get install tree -y
# tree deps
- git clone https://github.com/iresty/test-nginx.git test-nginx
- make utils
-
- git clone https://github.com/apache/openwhisk-utilities.git .travis/openwhisk-utilities
- cp .travis/ASF* .travis/openwhisk-utilities/scancode/
-
- ls -l ./
- if [ ! -f "build-cache/grpc_server_example" ]; then
- wget https://github.com/iresty/grpc_server_example/releases/download/20200901/grpc_server_example-amd64.tar.gz
- tar -xvf grpc_server_example-amd64.tar.gz
- mv grpc_server_example build-cache/
- fi
-
- if [ ! -f "build-cache/proto/helloworld.proto" ]; then
- if [ ! -f "grpc_server_example/main.go" ]; then
- git clone https://github.com/iresty/grpc_server_example.git grpc_server_example
- fi
-
- cd grpc_server_example/
- mv proto/ ../build-cache/
- cd ..
- fi
-
- if [ ! -f "build-cache/grpcurl" ]; then
- wget https://github.com/api7/grpcurl/releases/download/20200314/grpcurl-amd64.tar.gz
- tar -xvf grpcurl-amd64.tar.gz
- mv grpcurl build-cache/
- fi
+ # git clone https://github.com/iresty/test-nginx.git test-nginx
Review comment:
dittoo
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] idbeta commented on a change in pull request #2368: add uri fuzzing test
Posted by GitBox <gi...@apache.org>.
idbeta commented on a change in pull request #2368:
URL: https://github.com/apache/apisix/pull/2368#discussion_r511691936
##########
File path: t/specialtest/cases/test_fuzziing_uri_of_route.py
##########
@@ -0,0 +1,142 @@
+#
+# 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.
+#
+
+# !/usr/bin/env python
+# -*- coding: utf-8 -*-
+import os
+import time
+import subprocess
+import random
+import urllib
+import re
+import requests
+import psutil
+import grequests
+
+
+def get_pid_byname():
+ name = "apisix"
+ cmd = "ps -ef | grep %s/conf | grep master | grep -v grep| awk '{print $2}'" % name
+ p = subprocess.Popen(cmd, stderr=subprocess.PIPE,
+ stdout=subprocess.PIPE, shell=True)
+ p.wait()
+ return p.stdout.read().strip()
+
+
+def get_workerres(pid):
+ parent = psutil.Process(pid)
+ children = parent.children(recursive=True)
+ for p in children:
+ cp = psutil.Process(p.pid)
+ print(p.pid, cp.cpu_percent(interval=1.0), cp.memory_percent())
+
+
+def cur_file_dir():
+ return os.path.split(os.path.realpath(__file__))[0]
+
+
+def requesttest(url, times):
+ start = time.time()
+ tasks = []
+ r = []
+ while time.time() - start <= times:
+ tasks.append(grequests.get(url))
+ res = grequests.map(tasks, size=50)
+ r.extend([i.status_code for i in res])
+ return r
+
+
+def setup_module():
+ global headers, apisixhost, apisixpid, apisixpath
+ apisixpid = int(get_pid_byname())
+ apisixpath = psutil.Process(apisixpid).cwd()
+ os.chdir(apisixpath)
+
+ subprocess.call("./bin/apisix stop", shell=True, stdout=subprocess.PIPE)
Review comment:
It's easier to understand
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] moonming commented on pull request #2368: add uri fuzzing test
Posted by GitBox <gi...@apache.org>.
moonming commented on pull request #2368:
URL: https://github.com/apache/apisix/pull/2368#issuecomment-707806607
> @idbeta You can link to the issues found in this PR here.
>
> Prove that this PR is very useful.
@idbeta
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] moonming commented on a change in pull request #2368: add uri fuzzing test
Posted by GitBox <gi...@apache.org>.
moonming commented on a change in pull request #2368:
URL: https://github.com/apache/apisix/pull/2368#discussion_r510950704
##########
File path: .github/workflows/build.yml
##########
@@ -12,7 +12,7 @@ jobs:
fail-fast: false
matrix:
platform: [ubuntu-18.04]
- os_name: [linux_openresty, linux_tengine, linux_apisix_master_luarocks, linux_apisix_current_luarocks, linux_openresty_mtls]
+ os_name: [linux_openresty, linux_tengine, linux_apisix_master_luarocks, linux_apisix_current_luarocks, linux_openresty_mtls, linux_specialtest]
Review comment:
what do you means of `specialtest`?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] idbeta commented on a change in pull request #2368: add uri fuzzing test
Posted by GitBox <gi...@apache.org>.
idbeta commented on a change in pull request #2368:
URL: https://github.com/apache/apisix/pull/2368#discussion_r511692983
##########
File path: t/specialtest/cases/test_fuzziing_uri_of_route.py
##########
@@ -0,0 +1,142 @@
+#
+# 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.
+#
+
+# !/usr/bin/env python
+# -*- coding: utf-8 -*-
+import os
+import time
+import subprocess
+import random
+import urllib
+import re
+import requests
+import psutil
+import grequests
+
+
+def get_pid_byname():
+ name = "apisix"
+ cmd = "ps -ef | grep %s/conf | grep master | grep -v grep| awk '{print $2}'" % name
+ p = subprocess.Popen(cmd, stderr=subprocess.PIPE,
+ stdout=subprocess.PIPE, shell=True)
+ p.wait()
+ return p.stdout.read().strip()
+
+
+def get_workerres(pid):
+ parent = psutil.Process(pid)
+ children = parent.children(recursive=True)
+ for p in children:
+ cp = psutil.Process(p.pid)
+ print(p.pid, cp.cpu_percent(interval=1.0), cp.memory_percent())
+
+
+def cur_file_dir():
+ return os.path.split(os.path.realpath(__file__))[0]
+
+
+def requesttest(url, times):
+ start = time.time()
+ tasks = []
+ r = []
+ while time.time() - start <= times:
+ tasks.append(grequests.get(url))
+ res = grequests.map(tasks, size=50)
+ r.extend([i.status_code for i in res])
+ return r
+
+
+def setup_module():
+ global headers, apisixhost, apisixpid, apisixpath
+ apisixpid = int(get_pid_byname())
+ apisixpath = psutil.Process(apisixpid).cwd()
+ os.chdir(apisixpath)
+
+ subprocess.call("./bin/apisix stop", shell=True, stdout=subprocess.PIPE)
+ time.sleep(1)
+
+ subprocess.Popen("> logs/error.log", shell=True, stdout=subprocess.PIPE)
+ subprocess.call("etcd &", shell=True, stdout=subprocess.PIPE)
+ time.sleep(5)
+
+ subprocess.call("./bin/apisix start", shell=True, stdout=subprocess.PIPE)
+ time.sleep(1)
+
+ apisixpid = int(get_pid_byname())
+ print("=============APISIX's pid:", apisixpid)
+ apisixhost = "http://127.0.0.1:9080"
+ headers = {"X-API-KEY": "edd1c9f034335f136f87ad84b625c8f1"}
+ confpath = "./t/specialtest/cases/nginx.conf"
+ try:
+ os.makedirs("./t/specialtest/cases/logs")
+ except Exception as e:
+ pass
+ p = subprocess.Popen(['openresty', '-p', apisixpath, '-c', confpath],
+ stderr=subprocess.PIPE, stdout=subprocess.PIPE,
+ shell=False)
+ p.wait()
+
+
+def teardown_module():
+ pass
+
+
+def test_fuzzing_uri_of_route():
+ print("====APISIX's resource occupation(before test):")
+ get_workerres(apisixpid)
+ # use environment variables "FUZZING_URI"
+ # you can setting the numbers of test uris
+ fuzzing_uri_nums = 1000 if not os.getenv('FUZZING_URI')\
+ else os.getenv('FUZZING_URI')
+ # not spupport * :
+ orgin_char = '''ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
+ 0123456789/-_~!();@&=+$,?#'.[]'''
+ for i in range(int(fuzzing_uri_nums)):
+ length = random.randint(1, 4080)
+ tmpuri = "".join(random.sample(list(orgin_char) *
+ (length//len(orgin_char) + 1), length))
+ tmpuri = re.sub(r"/(\.+)/", "", tmpuri)
+ tmpuri = re.sub(r"/+", "/", tmpuri)
+ uri = "/hello%s" % tmpuri
Review comment:
Prefix no need here, let me modify it.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] idbeta edited a comment on pull request #2368: WIP: add uri fuzzing test
Posted by GitBox <gi...@apache.org>.
idbeta edited a comment on pull request #2368:
URL: https://github.com/apache/apisix/pull/2368#issuecomment-706501275
> @idbeta code style: https://github.com/apache/apisix/pull/2368/checks?check_run_id=1234621149#step:6:124
>
> You need to write a summary first. Why we need this PR?
ok, I added a summary, please take a look at it
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] moonming commented on a change in pull request #2368: add uri fuzzing test
Posted by GitBox <gi...@apache.org>.
moonming commented on a change in pull request #2368:
URL: https://github.com/apache/apisix/pull/2368#discussion_r504389385
##########
File path: t/specialtest/cases/test_fuzziing_uri_of_route.py
##########
@@ -0,0 +1,124 @@
+#
+# 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.
+#
+
Review comment:
Please use the code style detection tool of python PEP8 first, and keep only the code you need, and then I will review it
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] moonming commented on a change in pull request #2368: add uri fuzzing test
Posted by GitBox <gi...@apache.org>.
moonming commented on a change in pull request #2368:
URL: https://github.com/apache/apisix/pull/2368#discussion_r510952208
##########
File path: t/specialtest/runtest.py
##########
@@ -0,0 +1,57 @@
+#
+# 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.
+#
+
+# !/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import random
+import subprocess
+import shutil
+import time
+import datetime
+import sys
+import os
+import json
+import re
+import base64
+from sys import version_info
+
+
+def cur_file_dir():
+ return os.path.split(os.path.realpath(__file__))[0]
+
+
+def env_prepare(casedirpath):
+ updatepip = "curl https://bootstrap.pypa.io/get-pip.py | python"
+ if version_info.major == 2:
Review comment:
Why should it be compatible with python2.0?
##########
File path: t/specialtest/cases/test_fuzziing_uri_of_route.py
##########
@@ -0,0 +1,142 @@
+#
+# 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.
+#
+
+# !/usr/bin/env python
+# -*- coding: utf-8 -*-
+import os
+import time
+import subprocess
+import random
+import urllib
+import re
+import requests
+import psutil
+import grequests
+
+
+def get_pid_byname():
+ name = "apisix"
+ cmd = "ps -ef | grep %s/conf | grep master | grep -v grep| awk '{print $2}'" % name
+ p = subprocess.Popen(cmd, stderr=subprocess.PIPE,
+ stdout=subprocess.PIPE, shell=True)
+ p.wait()
+ return p.stdout.read().strip()
+
+
+def get_workerres(pid):
+ parent = psutil.Process(pid)
+ children = parent.children(recursive=True)
+ for p in children:
+ cp = psutil.Process(p.pid)
+ print(p.pid, cp.cpu_percent(interval=1.0), cp.memory_percent())
+
+
+def cur_file_dir():
+ return os.path.split(os.path.realpath(__file__))[0]
+
+
+def requesttest(url, times):
+ start = time.time()
+ tasks = []
+ r = []
+ while time.time() - start <= times:
+ tasks.append(grequests.get(url))
+ res = grequests.map(tasks, size=50)
+ r.extend([i.status_code for i in res])
+ return r
+
+
+def setup_module():
+ global headers, apisixhost, apisixpid, apisixpath
+ apisixpid = int(get_pid_byname())
+ apisixpath = psutil.Process(apisixpid).cwd()
+ os.chdir(apisixpath)
+
+ subprocess.call("./bin/apisix stop", shell=True, stdout=subprocess.PIPE)
+ time.sleep(1)
+
+ subprocess.Popen("> logs/error.log", shell=True, stdout=subprocess.PIPE)
+ subprocess.call("etcd &", shell=True, stdout=subprocess.PIPE)
+ time.sleep(5)
+
+ subprocess.call("./bin/apisix start", shell=True, stdout=subprocess.PIPE)
+ time.sleep(1)
+
+ apisixpid = int(get_pid_byname())
+ print("=============APISIX's pid:", apisixpid)
+ apisixhost = "http://127.0.0.1:9080"
+ headers = {"X-API-KEY": "edd1c9f034335f136f87ad84b625c8f1"}
+ confpath = "./t/specialtest/cases/nginx.conf"
+ try:
+ os.makedirs("./t/specialtest/cases/logs")
+ except Exception as e:
+ pass
+ p = subprocess.Popen(['openresty', '-p', apisixpath, '-c', confpath],
Review comment:
Isn't Apache APISIX already running? Why start another apisix?
##########
File path: t/specialtest/runtest.py
##########
@@ -0,0 +1,57 @@
+#
+# 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.
+#
+
+# !/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import random
+import subprocess
+import shutil
+import time
+import datetime
+import sys
+import os
+import json
+import re
+import base64
+from sys import version_info
+
+
+def cur_file_dir():
+ return os.path.split(os.path.realpath(__file__))[0]
+
+
+def env_prepare(casedirpath):
+ updatepip = "curl https://bootstrap.pypa.io/get-pip.py | python"
+ if version_info.major == 2:
+ requirements = "python -m pip install -r %s/requirements.txt" %\
+ cur_file_dir()
+ else:
+ requirements = "python3 -m pip install -r %s/requirements.txt" %\
+ cur_file_dir()
+ r_exc_case_cmd = subprocess.Popen(updatepip, stderr=subprocess.PIPE,
+ shell=True)
+ r_exc_case_cmd.wait()
+ err = r_exc_case_cmd.stderr.read()
+
+ r_exc_case_cmd = subprocess.Popen(requirements, stderr=subprocess.PIPE,
+ shell=True)
+ r_exc_case_cmd.wait()
+ err = r_exc_case_cmd.stderr.read()
+
+casepath = cur_file_dir()+"/cases"
+env_prepare(casepath)
Review comment:
Where to run the test case?
##########
File path: t/specialtest/cases/test_fuzziing_uri_of_route.py
##########
@@ -0,0 +1,142 @@
+#
+# 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.
+#
+
+# !/usr/bin/env python
+# -*- coding: utf-8 -*-
+import os
+import time
+import subprocess
+import random
+import urllib
+import re
+import requests
+import psutil
+import grequests
+
+
+def get_pid_byname():
+ name = "apisix"
+ cmd = "ps -ef | grep %s/conf | grep master | grep -v grep| awk '{print $2}'" % name
+ p = subprocess.Popen(cmd, stderr=subprocess.PIPE,
+ stdout=subprocess.PIPE, shell=True)
+ p.wait()
+ return p.stdout.read().strip()
+
+
+def get_workerres(pid):
+ parent = psutil.Process(pid)
+ children = parent.children(recursive=True)
+ for p in children:
+ cp = psutil.Process(p.pid)
+ print(p.pid, cp.cpu_percent(interval=1.0), cp.memory_percent())
+
+
+def cur_file_dir():
+ return os.path.split(os.path.realpath(__file__))[0]
+
+
+def requesttest(url, times):
+ start = time.time()
+ tasks = []
+ r = []
+ while time.time() - start <= times:
+ tasks.append(grequests.get(url))
+ res = grequests.map(tasks, size=50)
+ r.extend([i.status_code for i in res])
+ return r
+
+
+def setup_module():
+ global headers, apisixhost, apisixpid, apisixpath
+ apisixpid = int(get_pid_byname())
+ apisixpath = psutil.Process(apisixpid).cwd()
+ os.chdir(apisixpath)
+
+ subprocess.call("./bin/apisix stop", shell=True, stdout=subprocess.PIPE)
+ time.sleep(1)
+
+ subprocess.Popen("> logs/error.log", shell=True, stdout=subprocess.PIPE)
+ subprocess.call("etcd &", shell=True, stdout=subprocess.PIPE)
+ time.sleep(5)
+
+ subprocess.call("./bin/apisix start", shell=True, stdout=subprocess.PIPE)
+ time.sleep(1)
+
+ apisixpid = int(get_pid_byname())
+ print("=============APISIX's pid:", apisixpid)
+ apisixhost = "http://127.0.0.1:9080"
+ headers = {"X-API-KEY": "edd1c9f034335f136f87ad84b625c8f1"}
+ confpath = "./t/specialtest/cases/nginx.conf"
+ try:
+ os.makedirs("./t/specialtest/cases/logs")
+ except Exception as e:
+ pass
+ p = subprocess.Popen(['openresty', '-p', apisixpath, '-c', confpath],
+ stderr=subprocess.PIPE, stdout=subprocess.PIPE,
+ shell=False)
+ p.wait()
+
+
+def teardown_module():
+ pass
+
+
+def test_fuzzing_uri_of_route():
+ print("====APISIX's resource occupation(before test):")
+ get_workerres(apisixpid)
+ # use environment variables "FUZZING_URI"
+ # you can setting the numbers of test uris
+ fuzzing_uri_nums = 1000 if not os.getenv('FUZZING_URI')\
+ else os.getenv('FUZZING_URI')
+ # not spupport * :
+ orgin_char = '''ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
+ 0123456789/-_~!();@&=+$,?#'.[]'''
+ for i in range(int(fuzzing_uri_nums)):
+ length = random.randint(1, 4080)
+ tmpuri = "".join(random.sample(list(orgin_char) *
+ (length//len(orgin_char) + 1), length))
+ tmpuri = re.sub(r"/(\.+)/", "", tmpuri)
+ tmpuri = re.sub(r"/+", "/", tmpuri)
+ uri = "/hello%s" % tmpuri
Review comment:
why use `hello` as prefix?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] idbeta commented on pull request #2368: add uri fuzzing test
Posted by GitBox <gi...@apache.org>.
idbeta commented on pull request #2368:
URL: https://github.com/apache/apisix/pull/2368#issuecomment-712621569
This PR only contained URI fuzzing test, but I add some code about monitor the resource occupation
`def get_workerres(pid):
... ...`
As for long-term testing, I will submit it in another pr in the future.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] membphis edited a comment on pull request #2368: add uri fuzzing test
Posted by GitBox <gi...@apache.org>.
membphis edited a comment on pull request #2368:
URL: https://github.com/apache/apisix/pull/2368#issuecomment-710066589
> 2\. and it is also very simple for python to monitor the resource occupation of the specified components, and long-term testing is easy for it too.
do we have implemented this feature in this test case?
if we not, I think we can use Lua to implement the fuzzy test. The Lua can do the same thing.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] idbeta commented on pull request #2368: add uri fuzzing test
Posted by GitBox <gi...@apache.org>.
idbeta commented on pull request #2368:
URL: https://github.com/apache/apisix/pull/2368#issuecomment-708141214
OK, I already add issues related to this PR to the summary.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] idbeta commented on a change in pull request #2368: add uri fuzzing test
Posted by GitBox <gi...@apache.org>.
idbeta commented on a change in pull request #2368:
URL: https://github.com/apache/apisix/pull/2368#discussion_r511690559
##########
File path: t/specialtest/runtest.py
##########
@@ -0,0 +1,57 @@
+#
+# 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.
+#
+
+# !/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import random
+import subprocess
+import shutil
+import time
+import datetime
+import sys
+import os
+import json
+import re
+import base64
+from sys import version_info
+
+
+def cur_file_dir():
+ return os.path.split(os.path.realpath(__file__))[0]
+
+
+def env_prepare(casedirpath):
+ updatepip = "curl https://bootstrap.pypa.io/get-pip.py | python"
+ if version_info.major == 2:
Review comment:
The python version of the CI environment is 2.0, but I think it is better to be compatible with 3.0.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] membphis commented on a change in pull request #2368: add uri fuzzing test
Posted by GitBox <gi...@apache.org>.
membphis commented on a change in pull request #2368:
URL: https://github.com/apache/apisix/pull/2368#discussion_r510898494
##########
File path: t/specialtest/cases/test_fuzziing_uri_of_route.py
##########
@@ -0,0 +1,142 @@
+#
+# 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.
+#
+
+# !/usr/bin/env python
+# -*- coding: utf-8 -*-
+import os
+import time
+import subprocess
+import random
+import urllib
+import re
+import requests
+import psutil
+import grequests
+
+
+def get_pid_byname():
+ name = "apisix"
+ cmd = "ps -ef | grep %s/conf | grep master | grep -v grep| awk '{print $2}'" % name
+ p = subprocess.Popen(cmd, stderr=subprocess.PIPE,
+ stdout=subprocess.PIPE, shell=True)
+ p.wait()
+ return p.stdout.read().strip()
+
+
+def get_workerres(pid):
+ parent = psutil.Process(pid)
+ children = parent.children(recursive=True)
+ for p in children:
+ cp = psutil.Process(p.pid)
+ print(p.pid, cp.cpu_percent(interval=1.0), cp.memory_percent())
+
+
+def cur_file_dir():
+ return os.path.split(os.path.realpath(__file__))[0]
+
+
+def requesttest(url, times):
+ start = time.time()
+ tasks = []
+ r = []
+ while time.time() - start <= times:
+ tasks.append(grequests.get(url))
+ res = grequests.map(tasks, size=50)
+ r.extend([i.status_code for i in res])
+ return r
+
+
+def setup_module():
+ global headers, apisixhost, apisixpid, apisixpath
+ apisixpid = int(get_pid_byname())
+ apisixpath = psutil.Process(apisixpid).cwd()
+ os.chdir(apisixpath)
+
+ subprocess.call("./bin/apisix stop", shell=True, stdout=subprocess.PIPE)
Review comment:
I think this one should be right, please confirm.
```
subprocess.call("./bin/apisix stop", shell=True, stdout=subprocess.PIPE)
time.sleep(1)
subprocess.Popen("> logs/error.log", shell=True, stdout=subprocess.PIPE)
subprocess.call("etcd &", shell=True, stdout=subprocess.PIPE)
##########
File path: t/specialtest/cases/test_fuzziing_uri_of_route.py
##########
@@ -0,0 +1,142 @@
+#
+# 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.
+#
+
+# !/usr/bin/env python
+# -*- coding: utf-8 -*-
+import os
+import time
+import subprocess
+import random
+import urllib
+import re
+import requests
+import psutil
+import grequests
+
+
+def get_pid_byname():
+ name = "apisix"
+ cmd = "ps -ef | grep %s/conf | grep master | grep -v grep| awk '{print $2}'" % name
+ p = subprocess.Popen(cmd, stderr=subprocess.PIPE,
+ stdout=subprocess.PIPE, shell=True)
+ p.wait()
+ return p.stdout.read().strip()
+
+
+def get_workerres(pid):
+ parent = psutil.Process(pid)
+ children = parent.children(recursive=True)
+ for p in children:
+ cp = psutil.Process(p.pid)
+ print(p.pid, cp.cpu_percent(interval=1.0), cp.memory_percent())
+
+
+def cur_file_dir():
+ return os.path.split(os.path.realpath(__file__))[0]
+
+
+def requesttest(url, times):
+ start = time.time()
+ tasks = []
+ r = []
+ while time.time() - start <= times:
+ tasks.append(grequests.get(url))
+ res = grequests.map(tasks, size=50)
+ r.extend([i.status_code for i in res])
+ return r
+
+
+def setup_module():
+ global headers, apisixhost, apisixpid, apisixpath
+ apisixpid = int(get_pid_byname())
+ apisixpath = psutil.Process(apisixpid).cwd()
+ os.chdir(apisixpath)
+
+ subprocess.call("./bin/apisix stop", shell=True, stdout=subprocess.PIPE)
+ time.sleep(1)
+
+ subprocess.Popen("> logs/error.log", shell=True, stdout=subprocess.PIPE)
+ subprocess.call("etcd &", shell=True, stdout=subprocess.PIPE)
+ time.sleep(5)
+
+ subprocess.call("./bin/apisix start", shell=True, stdout=subprocess.PIPE)
+ time.sleep(1)
+
+ apisixpid = int(get_pid_byname())
+ print("=============APISIX's pid:", apisixpid)
+ apisixhost = "http://127.0.0.1:9080"
+ headers = {"X-API-KEY": "edd1c9f034335f136f87ad84b625c8f1"}
+ confpath = "./t/specialtest/cases/nginx.conf"
+ try:
+ os.makedirs("./t/specialtest/cases/logs")
+ except Exception as e:
+ pass
+ p = subprocess.Popen(['openresty', '-p', apisixpath, '-c', confpath],
+ stderr=subprocess.PIPE, stdout=subprocess.PIPE,
+ shell=False)
+ p.wait()
+
+
+def teardown_module():
+ pass
+
+
+def test_fuzzing_uri_of_route():
+ print("====APISIX's resource occupation(before test):")
+ get_workerres(apisixpid)
+ # use environment variables "FUZZING_URI"
+ # you can setting the numbers of test uris
+ fuzzing_uri_nums = 1000 if not os.getenv('FUZZING_URI')\
+ else os.getenv('FUZZING_URI')
+ # not spupport * :
+ orgin_char = '''ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
+ 0123456789/-_~!();@&=+$,?#'.[]'''
+ for i in range(int(fuzzing_uri_nums)):
+ length = random.randint(1, 4080)
+ tmpuri = "".join(random.sample(list(orgin_char) *
+ (length//len(orgin_char) + 1), length))
+ tmpuri = re.sub(r"/(\.+)/", "", tmpuri)
+ tmpuri = re.sub(r"/+", "/", tmpuri)
+ uri = "/hello%s" % tmpuri
+ assert len("/hello%s" % uri) <= 4096
+ cfgdata = {
+ "uri": uri,
+ "upstream": {
+ "type": "roundrobin",
+ "nodes": {
+ "127.0.0.1:9666": 1
+ }
+ }
+ }
+
+ r = requests.put("%s/apisix/admin/routes/1" % apisixhost,
+ json=cfgdata, headers=headers)
+ assert str(r.status_code).startswith("2")
+ time.sleep(0.2)
+ # verify route
+ uri = urllib.quote(uri)
+ r = requests.get("%s%s" % (apisixhost, uri))
+ if r.status_code != 200 or "Hello, World!" not in r.content:
+ print(uri, r.status_code, r.content)
+ raise AssertionError('assertError')
+
+ print("====APISIX's resource occupation\
Review comment:
can we put them in one line?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] idbeta commented on a change in pull request #2368: add uri fuzzing test
Posted by GitBox <gi...@apache.org>.
idbeta commented on a change in pull request #2368:
URL: https://github.com/apache/apisix/pull/2368#discussion_r504420860
##########
File path: t/specialtest/cases/test_fuzziing_uri_of_route.py
##########
@@ -0,0 +1,124 @@
+#
+# 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.
+#
+
Review comment:
I have resubmitted the code according to your opinion
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] idbeta commented on a change in pull request #2368: add uri fuzzing test
Posted by GitBox <gi...@apache.org>.
idbeta commented on a change in pull request #2368:
URL: https://github.com/apache/apisix/pull/2368#discussion_r511691117
##########
File path: .github/workflows/build.yml
##########
@@ -12,7 +12,7 @@ jobs:
fail-fast: false
matrix:
platform: [ubuntu-18.04]
- os_name: [linux_openresty, linux_tengine, linux_apisix_master_luarocks, linux_apisix_current_luarocks, linux_openresty_mtls]
+ os_name: [linux_openresty, linux_tengine, linux_apisix_master_luarocks, linux_apisix_current_luarocks, linux_openresty_mtls, linux_specialtest]
Review comment:
I think this is a neutral term, which is convenient for adding other special cases in the future, such as long-term test, etcd link number monitoring test, etc.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] membphis commented on a change in pull request #2368: add uri fuzzing test
Posted by GitBox <gi...@apache.org>.
membphis commented on a change in pull request #2368:
URL: https://github.com/apache/apisix/pull/2368#discussion_r510698277
##########
File path: .travis/linux_specialtest_runner.sh
##########
@@ -0,0 +1,120 @@
+#!/usr/bin/env bash
+#
+# 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.
+#
+
+set -ex
+
+export_or_prefix() {
+ export OPENRESTY_PREFIX="/usr/local/openresty-debug"
+}
+
+create_lua_deps() {
+ echo "Create lua deps cache"
+
+ make deps
+ luarocks install luacov-coveralls --tree=deps --local > build.log 2>&1 || (cat build.log && exit 1)
+
+ sudo rm -rf build-cache/deps
+ sudo cp -r deps build-cache/
+ sudo cp rockspec/apisix-master-0.rockspec build-cache/
+}
+
+before_install() {
+ echo "Before install"
+}
+
+do_install() {
+ export_or_prefix
+
+ wget -qO - https://openresty.org/package/pubkey.gpg | sudo apt-key add -
+ sudo apt-get -y update --fix-missing
+ sudo apt-get -y install software-properties-common
+ sudo add-apt-repository -y "deb http://openresty.org/package/ubuntu $(lsb_release -sc) main"
+
+ sudo apt-get update
+ sudo apt-get install openresty-debug lua5.1 liblua5.1-0-dev
+
+ wget https://github.com/luarocks/luarocks/archive/v2.4.4.tar.gz
+ tar -xf v2.4.4.tar.gz
+ cd luarocks-2.4.4
+ ./configure --prefix=/usr > build.log 2>&1 || (cat build.log && exit 1)
+ make build > build.log 2>&1 || (cat build.log && exit 1)
+ sudo make install > build.log 2>&1 || (cat build.log && exit 1)
+ cd ..
+ rm -rf luarocks-2.4.4
+
+ sudo luarocks install luacheck > build.log 2>&1 || (cat build.log && exit 1)
+
+ ./utils/install-etcd.sh
+
+ if [ ! -f "build-cache/apisix-master-0.rockspec" ]; then
+ create_lua_deps
+
+ else
+ src=`md5sum rockspec/apisix-master-0.rockspec | awk '{print $1}'`
+ src_cp=`md5sum build-cache/apisix-master-0.rockspec | awk '{print $1}'`
+ if [ "$src" = "$src_cp" ]; then
+ echo "Use lua deps cache"
+ sudo cp -r build-cache/deps ./
+ else
+ create_lua_deps
+ fi
+ fi
+}
+
+script() {
+ export_or_prefix
+ export PATH=$OPENRESTY_PREFIX/nginx/sbin:$OPENRESTY_PREFIX/luajit/bin:$OPENRESTY_PREFIX/bin:$PATH
+ openresty -V
+ sudo service etcd stop
+ mkdir -p ~/etcd-data
+ etcd --listen-client-urls 'http://0.0.0.0:2379' --advertise-client-urls='http://0.0.0.0:2379' --data-dir ~/etcd-data > /dev/null 2>&1 &
+ etcdctl version
+ sleep 5
+
+ ./bin/apisix start
+
+ #start again --> fial
+ res=`./bin/apisix start`
+ if [ "$res" != "APISIX is running..." ]; then
+ echo "failed: APISIX runs repeatedly"
+ exit 1
+ fi
+
+ cd t/specialtest/
+ sudo python runtest.py
+ pytest --force-flaky --max-runs=3 --no-flaky-report -v -s "cases"
+
Review comment:
remove this blank line
##########
File path: .travis/linux_specialtest_runner.sh
##########
@@ -0,0 +1,120 @@
+#!/usr/bin/env bash
+#
+# 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.
+#
+
+set -ex
+
+export_or_prefix() {
+ export OPENRESTY_PREFIX="/usr/local/openresty-debug"
+}
+
+create_lua_deps() {
+ echo "Create lua deps cache"
+
+ make deps
+ luarocks install luacov-coveralls --tree=deps --local > build.log 2>&1 || (cat build.log && exit 1)
+
+ sudo rm -rf build-cache/deps
+ sudo cp -r deps build-cache/
+ sudo cp rockspec/apisix-master-0.rockspec build-cache/
+}
+
+before_install() {
+ echo "Before install"
+}
+
+do_install() {
+ export_or_prefix
+
+ wget -qO - https://openresty.org/package/pubkey.gpg | sudo apt-key add -
+ sudo apt-get -y update --fix-missing
+ sudo apt-get -y install software-properties-common
+ sudo add-apt-repository -y "deb http://openresty.org/package/ubuntu $(lsb_release -sc) main"
+
+ sudo apt-get update
+ sudo apt-get install openresty-debug lua5.1 liblua5.1-0-dev
+
+ wget https://github.com/luarocks/luarocks/archive/v2.4.4.tar.gz
+ tar -xf v2.4.4.tar.gz
+ cd luarocks-2.4.4
+ ./configure --prefix=/usr > build.log 2>&1 || (cat build.log && exit 1)
+ make build > build.log 2>&1 || (cat build.log && exit 1)
+ sudo make install > build.log 2>&1 || (cat build.log && exit 1)
+ cd ..
+ rm -rf luarocks-2.4.4
+
+ sudo luarocks install luacheck > build.log 2>&1 || (cat build.log && exit 1)
+
+ ./utils/install-etcd.sh
+
+ if [ ! -f "build-cache/apisix-master-0.rockspec" ]; then
+ create_lua_deps
+
+ else
+ src=`md5sum rockspec/apisix-master-0.rockspec | awk '{print $1}'`
+ src_cp=`md5sum build-cache/apisix-master-0.rockspec | awk '{print $1}'`
+ if [ "$src" = "$src_cp" ]; then
+ echo "Use lua deps cache"
+ sudo cp -r build-cache/deps ./
+ else
+ create_lua_deps
+ fi
+ fi
+}
+
+script() {
+ export_or_prefix
+ export PATH=$OPENRESTY_PREFIX/nginx/sbin:$OPENRESTY_PREFIX/luajit/bin:$OPENRESTY_PREFIX/bin:$PATH
+ openresty -V
+ sudo service etcd stop
+ mkdir -p ~/etcd-data
+ etcd --listen-client-urls 'http://0.0.0.0:2379' --advertise-client-urls='http://0.0.0.0:2379' --data-dir ~/etcd-data > /dev/null 2>&1 &
+ etcdctl version
+ sleep 5
+
+ ./bin/apisix start
+
+ #start again --> fial
+ res=`./bin/apisix start`
+ if [ "$res" != "APISIX is running..." ]; then
+ echo "failed: APISIX runs repeatedly"
+ exit 1
+ fi
+
+ cd t/specialtest/
+ sudo python runtest.py
+ pytest --force-flaky --max-runs=3 --no-flaky-report -v -s "cases"
+
+}
+
+
+case_opt=$1
+shift
+
+case ${case_opt} in
+before_install)
+ before_install "$@"
+ ;;
+do_install)
+ do_install "$@"
+ ;;
+script)
+ script "$@"
+ ;;
+
+
+esac
Review comment:
is it useful?
##########
File path: t/specialtest/cases/test_fuzziing_uri_of_route.py
##########
@@ -0,0 +1,143 @@
+#
+# 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.
+#
+
+# !/usr/bin/env python
+# -*- coding: utf-8 -*-
+import sys
+import os
+import time
+import json
+import subprocess
+import signal
+import random
+import string
+import urllib
+import re
+import requests
+import psutil
+import grequests
+
+
+def get_pid_byname():
+ name = "apisix"
+ cmd = "ps -ef | grep %s/conf | grep master | grep -v grep| awk \
Review comment:
I think the max length can be 100 characters, it is acceptable.
##########
File path: t/specialtest/runtest.py
##########
@@ -0,0 +1,67 @@
+#
+# 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.
+#
+
+# !/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import random
+import subprocess
+import shutil
+import time
+import datetime
+import sys
+import os
+import json
+import re
+import base64
+from sys import version_info
+
+
+def cur_file_dir():
+ return os.path.split(os.path.realpath(__file__))[0]
+
+
+def env_prepare(casedirpath):
+ updatepip = "curl https://bootstrap.pypa.io/get-pip.py | python"
+ if version_info.major == 2:
+ requirements = "python -m pip install -r %s/requirements.txt" %\
+ cur_file_dir()
+ else:
+ requirements = "python3 -m pip install -r %s/requirements.txt" %\
+ cur_file_dir()
+ r_exc_case_cmd = subprocess.Popen(updatepip, stderr=subprocess.PIPE,
+ shell=True)
+ r_exc_case_cmd.wait()
+ err = r_exc_case_cmd.stderr.read()
+
+ r_exc_case_cmd = subprocess.Popen(requirements, stderr=subprocess.PIPE,
+ shell=True)
+ r_exc_case_cmd.wait()
+ err = r_exc_case_cmd.stderr.read()
+
+ # exc_case_cmd3='pytest --force-flaky --max-runs=3
Review comment:
we can remove those useless code
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] idbeta commented on a change in pull request #2368: add uri fuzzing test
Posted by GitBox <gi...@apache.org>.
idbeta commented on a change in pull request #2368:
URL: https://github.com/apache/apisix/pull/2368#discussion_r511685397
##########
File path: t/specialtest/cases/test_fuzziing_uri_of_route.py
##########
@@ -0,0 +1,142 @@
+#
+# 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.
+#
+
+# !/usr/bin/env python
+# -*- coding: utf-8 -*-
+import os
+import time
+import subprocess
+import random
+import urllib
+import re
+import requests
+import psutil
+import grequests
+
+
+def get_pid_byname():
+ name = "apisix"
+ cmd = "ps -ef | grep %s/conf | grep master | grep -v grep| awk '{print $2}'" % name
+ p = subprocess.Popen(cmd, stderr=subprocess.PIPE,
+ stdout=subprocess.PIPE, shell=True)
+ p.wait()
+ return p.stdout.read().strip()
+
+
+def get_workerres(pid):
+ parent = psutil.Process(pid)
+ children = parent.children(recursive=True)
+ for p in children:
+ cp = psutil.Process(p.pid)
+ print(p.pid, cp.cpu_percent(interval=1.0), cp.memory_percent())
+
+
+def cur_file_dir():
+ return os.path.split(os.path.realpath(__file__))[0]
+
+
+def requesttest(url, times):
+ start = time.time()
+ tasks = []
+ r = []
+ while time.time() - start <= times:
+ tasks.append(grequests.get(url))
+ res = grequests.map(tasks, size=50)
+ r.extend([i.status_code for i in res])
+ return r
+
+
+def setup_module():
+ global headers, apisixhost, apisixpid, apisixpath
+ apisixpid = int(get_pid_byname())
+ apisixpath = psutil.Process(apisixpid).cwd()
+ os.chdir(apisixpath)
+
+ subprocess.call("./bin/apisix stop", shell=True, stdout=subprocess.PIPE)
+ time.sleep(1)
+
+ subprocess.Popen("> logs/error.log", shell=True, stdout=subprocess.PIPE)
+ subprocess.call("etcd &", shell=True, stdout=subprocess.PIPE)
+ time.sleep(5)
+
+ subprocess.call("./bin/apisix start", shell=True, stdout=subprocess.PIPE)
+ time.sleep(1)
+
+ apisixpid = int(get_pid_byname())
+ print("=============APISIX's pid:", apisixpid)
+ apisixhost = "http://127.0.0.1:9080"
+ headers = {"X-API-KEY": "edd1c9f034335f136f87ad84b625c8f1"}
+ confpath = "./t/specialtest/cases/nginx.conf"
+ try:
+ os.makedirs("./t/specialtest/cases/logs")
+ except Exception as e:
+ pass
+ p = subprocess.Popen(['openresty', '-p', apisixpath, '-c', confpath],
Review comment:
It is used as test upstream.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] idbeta commented on a change in pull request #2368: add uri fuzzing test
Posted by GitBox <gi...@apache.org>.
idbeta commented on a change in pull request #2368:
URL: https://github.com/apache/apisix/pull/2368#discussion_r510732455
##########
File path: t/specialtest/runtest.py
##########
@@ -0,0 +1,67 @@
+#
+# 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.
+#
+
+# !/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import random
+import subprocess
+import shutil
+import time
+import datetime
+import sys
+import os
+import json
+import re
+import base64
+from sys import version_info
+
+
+def cur_file_dir():
+ return os.path.split(os.path.realpath(__file__))[0]
+
+
+def env_prepare(casedirpath):
+ updatepip = "curl https://bootstrap.pypa.io/get-pip.py | python"
+ if version_info.major == 2:
+ requirements = "python -m pip install -r %s/requirements.txt" %\
+ cur_file_dir()
+ else:
+ requirements = "python3 -m pip install -r %s/requirements.txt" %\
+ cur_file_dir()
+ r_exc_case_cmd = subprocess.Popen(updatepip, stderr=subprocess.PIPE,
+ shell=True)
+ r_exc_case_cmd.wait()
+ err = r_exc_case_cmd.stderr.read()
+
+ r_exc_case_cmd = subprocess.Popen(requirements, stderr=subprocess.PIPE,
+ shell=True)
+ r_exc_case_cmd.wait()
+ err = r_exc_case_cmd.stderr.read()
+
+ # exc_case_cmd3='pytest --force-flaky --max-runs=3
Review comment:
yes, you are right.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] membphis commented on pull request #2368: add uri fuzzing test
Posted by GitBox <gi...@apache.org>.
membphis commented on pull request #2368:
URL: https://github.com/apache/apisix/pull/2368#issuecomment-715353037
@idbeta
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] idbeta commented on a change in pull request #2368: add uri fuzzing test
Posted by GitBox <gi...@apache.org>.
idbeta commented on a change in pull request #2368:
URL: https://github.com/apache/apisix/pull/2368#discussion_r510733063
##########
File path: t/specialtest/cases/test_fuzziing_uri_of_route.py
##########
@@ -0,0 +1,143 @@
+#
+# 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.
+#
+
+# !/usr/bin/env python
+# -*- coding: utf-8 -*-
+import sys
+import os
+import time
+import json
+import subprocess
+import signal
+import random
+import string
+import urllib
+import re
+import requests
+import psutil
+import grequests
+
+
+def get_pid_byname():
+ name = "apisix"
+ cmd = "ps -ef | grep %s/conf | grep master | grep -v grep| awk \
Review comment:
en, I agree with you, @moonming also take a look at it.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] moonming closed pull request #2368: add uri fuzzing test
Posted by GitBox <gi...@apache.org>.
moonming closed pull request #2368:
URL: https://github.com/apache/apisix/pull/2368
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] membphis commented on pull request #2368: add uri fuzzing test
Posted by GitBox <gi...@apache.org>.
membphis commented on pull request #2368:
URL: https://github.com/apache/apisix/pull/2368#issuecomment-715098590
> As for long-term testing, I will submit it in another pr in the future.
can you write an issue about this plan first?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] idbeta commented on pull request #2368: WIP: add uri fuzzing test
Posted by GitBox <gi...@apache.org>.
idbeta commented on pull request #2368:
URL: https://github.com/apache/apisix/pull/2368#issuecomment-706501275
> @idbeta code style: https://github.com/apache/apisix/pull/2368/checks?check_run_id=1234621149#step:6:124
>
> You need to write a summary first. Why we need this PR?
i alredy add a summary
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] idbeta commented on a change in pull request #2368: add uri fuzzing test
Posted by GitBox <gi...@apache.org>.
idbeta commented on a change in pull request #2368:
URL: https://github.com/apache/apisix/pull/2368#discussion_r510734617
##########
File path: .travis/linux_specialtest_runner.sh
##########
@@ -0,0 +1,120 @@
+#!/usr/bin/env bash
+#
+# 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.
+#
+
+set -ex
+
+export_or_prefix() {
+ export OPENRESTY_PREFIX="/usr/local/openresty-debug"
+}
+
+create_lua_deps() {
+ echo "Create lua deps cache"
+
+ make deps
+ luarocks install luacov-coveralls --tree=deps --local > build.log 2>&1 || (cat build.log && exit 1)
+
+ sudo rm -rf build-cache/deps
+ sudo cp -r deps build-cache/
+ sudo cp rockspec/apisix-master-0.rockspec build-cache/
+}
+
+before_install() {
+ echo "Before install"
+}
+
+do_install() {
+ export_or_prefix
+
+ wget -qO - https://openresty.org/package/pubkey.gpg | sudo apt-key add -
+ sudo apt-get -y update --fix-missing
+ sudo apt-get -y install software-properties-common
+ sudo add-apt-repository -y "deb http://openresty.org/package/ubuntu $(lsb_release -sc) main"
+
+ sudo apt-get update
+ sudo apt-get install openresty-debug lua5.1 liblua5.1-0-dev
+
+ wget https://github.com/luarocks/luarocks/archive/v2.4.4.tar.gz
+ tar -xf v2.4.4.tar.gz
+ cd luarocks-2.4.4
+ ./configure --prefix=/usr > build.log 2>&1 || (cat build.log && exit 1)
+ make build > build.log 2>&1 || (cat build.log && exit 1)
+ sudo make install > build.log 2>&1 || (cat build.log && exit 1)
+ cd ..
+ rm -rf luarocks-2.4.4
+
+ sudo luarocks install luacheck > build.log 2>&1 || (cat build.log && exit 1)
+
+ ./utils/install-etcd.sh
+
+ if [ ! -f "build-cache/apisix-master-0.rockspec" ]; then
+ create_lua_deps
+
+ else
+ src=`md5sum rockspec/apisix-master-0.rockspec | awk '{print $1}'`
+ src_cp=`md5sum build-cache/apisix-master-0.rockspec | awk '{print $1}'`
+ if [ "$src" = "$src_cp" ]; then
+ echo "Use lua deps cache"
+ sudo cp -r build-cache/deps ./
+ else
+ create_lua_deps
+ fi
+ fi
+}
+
+script() {
+ export_or_prefix
+ export PATH=$OPENRESTY_PREFIX/nginx/sbin:$OPENRESTY_PREFIX/luajit/bin:$OPENRESTY_PREFIX/bin:$PATH
+ openresty -V
+ sudo service etcd stop
+ mkdir -p ~/etcd-data
+ etcd --listen-client-urls 'http://0.0.0.0:2379' --advertise-client-urls='http://0.0.0.0:2379' --data-dir ~/etcd-data > /dev/null 2>&1 &
+ etcdctl version
+ sleep 5
+
+ ./bin/apisix start
+
+ #start again --> fial
+ res=`./bin/apisix start`
+ if [ "$res" != "APISIX is running..." ]; then
+ echo "failed: APISIX runs repeatedly"
+ exit 1
+ fi
+
+ cd t/specialtest/
+ sudo python runtest.py
+ pytest --force-flaky --max-runs=3 --no-flaky-report -v -s "cases"
+
Review comment:
ok, already remove it.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] membphis commented on a change in pull request #2368: add uri fuzzing test
Posted by GitBox <gi...@apache.org>.
membphis commented on a change in pull request #2368:
URL: https://github.com/apache/apisix/pull/2368#discussion_r503905280
##########
File path: .travis/linux_specialtest_runner.sh
##########
@@ -0,0 +1,167 @@
+#!/usr/bin/env bash
+#
+# 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.
+#
+
+set -ex
+
+export_or_prefix() {
+ export OPENRESTY_PREFIX="/usr/local/openresty-debug"
+}
+
+create_lua_deps() {
+ echo "Create lua deps cache"
+
+ make deps
+ luarocks install luacov-coveralls --tree=deps --local > build.log 2>&1 || (cat build.log && exit 1)
+
+ sudo rm -rf build-cache/deps
+ sudo cp -r deps build-cache/
+ sudo cp rockspec/apisix-master-0.rockspec build-cache/
+}
+
+before_install() {
+ sudo cpanm --notest Test::Nginx >build.log 2>&1 || (cat build.log && exit 1)
Review comment:
I think we need to remove those useless install steps for this test case.
Please submit the smallest available version.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] idbeta commented on a change in pull request #2368: add uri fuzzing test
Posted by GitBox <gi...@apache.org>.
idbeta commented on a change in pull request #2368:
URL: https://github.com/apache/apisix/pull/2368#discussion_r511689945
##########
File path: t/specialtest/runtest.py
##########
@@ -0,0 +1,57 @@
+#
+# 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.
+#
+
+# !/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import random
+import subprocess
+import shutil
+import time
+import datetime
+import sys
+import os
+import json
+import re
+import base64
+from sys import version_info
+
+
+def cur_file_dir():
+ return os.path.split(os.path.realpath(__file__))[0]
+
+
+def env_prepare(casedirpath):
+ updatepip = "curl https://bootstrap.pypa.io/get-pip.py | python"
+ if version_info.major == 2:
+ requirements = "python -m pip install -r %s/requirements.txt" %\
+ cur_file_dir()
+ else:
+ requirements = "python3 -m pip install -r %s/requirements.txt" %\
+ cur_file_dir()
+ r_exc_case_cmd = subprocess.Popen(updatepip, stderr=subprocess.PIPE,
+ shell=True)
+ r_exc_case_cmd.wait()
+ err = r_exc_case_cmd.stderr.read()
+
+ r_exc_case_cmd = subprocess.Popen(requirements, stderr=subprocess.PIPE,
+ shell=True)
+ r_exc_case_cmd.wait()
+ err = r_exc_case_cmd.stderr.read()
+
+casepath = cur_file_dir()+"/cases"
+env_prepare(casepath)
Review comment:
It is run by the shell code linux_specialtest_runner.sh
`pytest --force-flaky --max-runs=3 --no-flaky-report -v -s "cases"`
At first I executed the cases in python, and then I found that if the case raised error, the alarm would not be reported in ci.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org