diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1339611..3430811 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,15 +37,12 @@ images_build: extends: .build_docker_images variables: UNITTEST_IMAGE_TAG: unittest-tsg-diagnose:latest - WPR_IMAGE_TAG: wpr-tsg-diagnose:latest BADSSL_IMAGE_TAG: badssl-tsg-diagnose:latest DNS_IMAGES_TAGE: dns-server-diagnose:latest script: - mkdir -p images - docker build -t $UNITTEST_IMAGE_TAG -f ./unittest_python/Dockerfile ./unittest_python/ - docker save $UNITTEST_IMAGE_TAG > images/unittest.tar - - docker build -t $WPR_IMAGE_TAG -f ./wpr_golang/Dockerfile ./wpr_golang/ - - docker save $WPR_IMAGE_TAG > images/wpr.tar - docker build -t $BADSSL_IMAGE_TAG -f ./badssl.com/Dockerfile ./badssl.com/ - docker save $BADSSL_IMAGE_TAG > images/badssl.tar - docker build -t $DNS_IMAGES_TAGE -f ./dnsmasq/Dockerfile ./dnsmasq diff --git a/README.md b/README.md index ebe89ab..02c6eeb 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ -此项目是自动功能验证测试用例的实现，实现了包括拦截策略为bypass，intercept，redirect，block，replace，hijack，block，instert的情况下的测试用例 - -主要包括以下目录： -1、badssl.com 模拟https中证书可能出现的情况 -2、docker-compose 存放docker-compose.yml文件的目录 -3、unittest_python 是存放执行测试用例的python文件和生成相关docker镜像的dockerfile文件 -4、wpr_golang 是存放web page replay 的执行文件和生成相关镜像的dockerfile文件 - - - - +此项目是自动功能验证测试用例的实现，实现了包括拦截策略为bypass，intercept，redirect，block，replace，hijack，block，instert的情况下的测试用例 + +主要包括以下目录： +1、badssl.com 模拟https中证书可能出现的情况 +2、docker-compose 存放docker-compose.yml文件的目录 +3、unittest_python 是存放执行测试用例的python文件和生成相关docker镜像的dockerfile文件 +#4、wpr_golang 是存放web page replay 的执行文件和生成相关镜像的dockerfile文件 + + + + diff --git a/cmake/Package.cmake b/cmake/Package.cmake index aef4ae8..a18f395 100644 --- a/cmake/Package.cmake +++ b/cmake/Package.cmake @@ -23,7 +23,6 @@ set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PostunInstall install(FILES docker-compose/docker-compose.yml DESTINATION ./compose) install(FILES unittest_python/unittest/etc/tsg-diagnose.config DESTINATION ./etc) -install(FILES wpr_golang/wpr/wpr_cert.pem DESTINATION ./etc) install(FILES docker-compose/tsg-diagnose.service DESTINATION /usr/lib/systemd/system) install(FILES dnsmasq/config/dnsmasq.conf DESTINATION /opt/tsg/tsg-diagnose/etc/) install(DIRECTORY images/ DESTINATION ./images) diff --git a/cmake/PostInstall.in b/cmake/PostInstall.in index 6fb746d..b6e9162 100644 --- a/cmake/PostInstall.in +++ b/cmake/PostInstall.in @@ -2,10 +2,8 @@ if [ $1 == 2 ]; then systemctl stop tsg-diagnose docker rmi -f badssl-tsg-diagnose docker rmi -f unittest-tsg-diagnose - docker rmi -f wpr-tsg-diagnose docker rmi -f dns-server-diagnose fi docker load < /opt/tsg/tsg-diagnose/images/badssl.tar docker load < /opt/tsg/tsg-diagnose/images/unittest.tar -docker load < /opt/tsg/tsg-diagnose/images/wpr.tar docker load < /opt/tsg/tsg-diagnose/images/dns.tar diff --git a/cmake/PostunInstall.in b/cmake/PostunInstall.in index 3251a06..1542fd7 100644 --- a/cmake/PostunInstall.in +++ b/cmake/PostunInstall.in @@ -1,6 +1,5 @@ if [ $1 == 0 ]; then docker rmi -f badssl-tsg-diagnose docker rmi -f unittest-tsg-diagnose - docker rmi -f wpr-tsg-diagnose docker rmi -f dns-server-diagnose fi diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index 9fd751f..aa36455 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -24,27 +24,6 @@ services: && nginx && tail -f /dev/null" - wpr_server: - image: "wpr-tsg-diagnose:latest" - container_name: "wpr_tsg-diagnose" - tty: true - privileged: true - networks: - vlan_ssl_net: - ipv4_address: 192.0.2.131 - ipv6_address: fd00:a1bf:2c3d:ef5a:1e2f:3d4c:56ab:1011 - bridge_net: - ipv4_address: 192.51.100.3 - volumes: - - /etc/localtime:/etc/localtime:ro - command: - - /bin/sh - - -c - - | - ifconfig eth0 hw ether 02:42:C0:A8:FD:83 - arp -i eth0 -s 192.0.2.3 02:42:C0:A8:FD:03 - /root/wpr/wpr replay --http_port=80 --https_port=443 --host=0.0.0.0 --quiet_mode /root/wpr/archive.wprgo & - tail -f /dev/null dns_server: image: "dns-server-diagnose:latest" @@ -74,7 +53,6 @@ services: container_name: "unittest_tsg-diagnose" depends_on: - badssl_server - - wpr_server - dns_server tty: true privileged: true @@ -94,7 +72,6 @@ services: - -c - | /root/unittest/wait-for 192.51.100.2:443 -t 60 -- echo "badssl is up" - /root/unittest/wait-for 192.51.100.3:443 -t 60 -- echo "wpr is up" ifconfig eth0 hw ether 02:42:C0:A8:FD:03 arp -i eth0 -s 192.0.2.130 02:42:c0:a8:fd:82 arp -i eth0 -s 192.0.2.131 02:42:C0:A8:FD:83 diff --git a/wpr_golang/Dockerfile b/wpr_golang/Dockerfile deleted file mode 100644 index 17d25c6..0000000 --- a/wpr_golang/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -# Start golang:alpine3.10 to build python:wpr-alpine -FROM golang:alpine3.10 - -ADD wpr /root/wpr - -WORKDIR /root/wpr - -CMD tail -f /dev/null diff --git a/wpr_golang/README.md b/wpr_golang/README.md deleted file mode 100644 index 6c0f905..0000000 --- a/wpr_golang/README.md +++ /dev/null @@ -1,3 +0,0 @@ -此文件目录存放web page replay程序 相关的程序和配置文件 - -在本目录下执行docker build -t golang:wpr-alpine .生成镜像 diff --git a/wpr_golang/wpr/archive.wprgo b/wpr_golang/wpr/archive.wprgo deleted file mode 100644 index 5f5593a..0000000 Binary files a/wpr_golang/wpr/archive.wprgo and /dev/null differ diff --git a/wpr_golang/wpr/deterministic.js b/wpr_golang/wpr/deterministic.js deleted file mode 100644 index 53236c0..0000000 --- a/wpr_golang/wpr/deterministic.js +++ /dev/null @@ -1,70 +0,0 @@ -// Copyright 2017 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -'use strict'; - -(function () { - var random_count = 0; - var random_count_threshold = 25; - var random_seed = 0.462; - Math.random = function() { - random_count++; - if (random_count > random_count_threshold){ - random_seed += 0.1; - random_count = 1; - } - return (random_seed % 1); - }; - if (typeof(crypto) == 'object' && - typeof(crypto.getRandomValues) == 'function') { - crypto.getRandomValues = function(arr) { - var scale = Math.pow(256, arr.BYTES_PER_ELEMENT); - for (var i = 0; i < arr.length; i++) { - arr[i] = Math.floor(Math.random() * scale); - } - return arr; - }; - } -})(); -(function () { - var date_count = 0; - var date_count_threshold = 25; - var orig_date = Date; - // Time since epoch in milliseconds. This is replaced by script injector with - // the date when the recording is done. - var time_seed = {{WPR_TIME_SEED_TIMESTAMP}}; - Date = function() { - if (this instanceof Date) { - date_count++; - if (date_count > date_count_threshold){ - time_seed += 50; - date_count = 1; - } - switch (arguments.length) { - case 0: return new orig_date(time_seed); - case 1: return new orig_date(arguments[0]); - default: return new orig_date(arguments[0], arguments[1], - arguments.length >= 3 ? arguments[2] : 1, - arguments.length >= 4 ? arguments[3] : 0, - arguments.length >= 5 ? arguments[4] : 0, - arguments.length >= 6 ? arguments[5] : 0, - arguments.length >= 7 ? arguments[6] : 0); - } - } - return new Date().toString(); - }; - Date.__proto__ = orig_date; - Date.prototype = orig_date.prototype; - Date.prototype.constructor = Date; - orig_date.now = function() { - return new Date().getTime(); - }; - orig_date.prototype.getTimezoneOffset = function() { - var dst2010Start = 1268560800000; - var dst2010End = 1289120400000; - if (this.getTime() >= dst2010Start && this.getTime() < dst2010End) - return 420; - return 480; - }; -})(); diff --git a/wpr_golang/wpr/wpr b/wpr_golang/wpr/wpr deleted file mode 100755 index d965f49..0000000 Binary files a/wpr_golang/wpr/wpr and /dev/null differ diff --git a/wpr_golang/wpr/wpr_cert.pem b/wpr_golang/wpr/wpr_cert.pem deleted file mode 100644 index 51065c9..0000000 --- a/wpr_golang/wpr/wpr_cert.pem +++ /dev/null @@ -1,13 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIB8jCCAVugAwIBAgIJAP3GpXchIMWHMA0GCSqGSIb3DQEBCwUAMBExDzANBgNV -BAsMBkdFRURHRTAgFw0yMDAzMDkxNjEyNTlaGA8yMDUwMDMwMjE2MTI1OVowETEP -MA0GA1UECwwGR0VFREdFMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCraZpH -Fca2Iu+9E9HzKbEi2Akdk4RrUJxkQjB2Tr7fGxwPDXqdGvSoXDdgnSA0I0bbNqMs -drgiCWimjnGiWfY0sssKg7plNTQ4i7Zz7P9Isyf6TuxvB09CzdhH2FQ3lLRTb8pv -BA0E28CCYiZhtX1/3RlDSvxaRKOM3yEt0q+FRQIDAQABo1AwTjAdBgNVHQ4EFgQU -NqrpSlpCuMBJlCLZEE/D5ZpBy8swHwYDVR0jBBgwFoAUNqrpSlpCuMBJlCLZEE/D -5ZpBy8swDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOBgQBsybFxUAjzhJ5H -VbSLhyillxtAJ3vEKtLrMVnAgRUEwamyu1JQGndF9kh8RapSmHhmuZM9iTc+NsNb -DKGKmEOY0vQMw83xE7EGYj4Nhww9UMyGglmTLbd3yB+uJA97beNVduU2mifDHGmN -4buMiPl3AozGRl9p5UCzZM5XxMMw1A== ------END CERTIFICATE----- diff --git a/wpr_golang/wpr/wpr_key.pem b/wpr_golang/wpr/wpr_key.pem deleted file mode 100644 index dbf56e6..0000000 --- a/wpr_golang/wpr/wpr_key.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXAIBAAKBgQCraZpHFca2Iu+9E9HzKbEi2Akdk4RrUJxkQjB2Tr7fGxwPDXqd -GvSoXDdgnSA0I0bbNqMsdrgiCWimjnGiWfY0sssKg7plNTQ4i7Zz7P9Isyf6Tuxv -B09CzdhH2FQ3lLRTb8pvBA0E28CCYiZhtX1/3RlDSvxaRKOM3yEt0q+FRQIDAQAB -AoGAJWgwUN8BtHG/W8XdhXFNxMrcgmXU+g5ncsG3Dbp1kP67itVoMqzVQ4CMXTss -8fPY3LH5vhRSbqsa+W4QglubjNzPNY9xYSrfNjdlUDaxfmYdjyeIBc08ce6jSqEm -PUOs1IQ/jVOeQO/pxoSh8atHyApKpa6Opy2FIH/mIYtJB4ECQQDj080ms7vl+0bj -S4EIVj3y9oFOcBCZ9rBqLZzA5tKYiNO/iXgtQRQ00I/jap95AVBnQZUOF/B5Z3W2 -vrWRwqBRAkEAwJvoy0VMjJx7Zvw6mU7qd4WKz3Sl7m72Ehgem4vsfItLQllZ39yB -UEpeR3OCtOM6RTcDq0FRIAmc/hgyRtJstQJAbvQejEOqNbXrbxS9cX72ypXMoZOo -MiNXBU7TcYq4c3rnjPd5JKj2G0abXMj3g2nla3QgEG4OOkHtrSMxsBwWEQJATGRJ -4307zDUwOHtnnnCPTBJaKMfiG/xEeo64bQcFJ6xzkAAyRjiFzVuBoyMsPyQ0c0lL -mjvQuj012A2uuyowVQJBAK8m+XfI6COkSsSUh+cLeCwiIuLxaDgYJbh3F8Ind2Gt -3wOYDVDWH0ebwMFUfH7mmYO75AHbfC2uTPQpHV/IglU= ------END RSA PRIVATE KEY-----