From f96646214b473cea71d7b59f1d3eae39169106fe Mon Sep 17 00:00:00 2001 From: Yifei Kong Date: Sun, 24 Dec 2023 23:10:32 +0800 Subject: [PATCH] Fix tests errors --- .github/workflows/build-and-test-docker.yml | 14 +++++++------- .github/workflows/publish-docker-image.yml | 9 +++++---- .gitignore | 4 ++++ chrome/curl_chrome119 | 4 ++-- chrome/patches/curl-impersonate.patch | 4 ++-- tests/signatures/chrome_119.0.6045.199_macOS.yaml | 3 +-- tests/targets.yaml | 4 ++-- 7 files changed, 23 insertions(+), 19 deletions(-) create mode 100644 .gitignore diff --git a/.github/workflows/build-and-test-docker.yml b/.github/workflows/build-and-test-docker.yml index 23d21ce5..04c09435 100644 --- a/.github/workflows/build-and-test-docker.yml +++ b/.github/workflows/build-and-test-docker.yml @@ -1,12 +1,12 @@ name: Docker images -# on: -# push: -# branches: -# - main -# pull_request: -# branches: -# - main +on: + push: + branches: + - skip_for_now + pull_request: + branches: + - main jobs: build-docker-and-test: diff --git a/.github/workflows/publish-docker-image.yml b/.github/workflows/publish-docker-image.yml index 4c7296fb..b99d8df6 100644 --- a/.github/workflows/publish-docker-image.yml +++ b/.github/workflows/publish-docker-image.yml @@ -2,10 +2,11 @@ # Docker hub. name: Publish Docker image -# on: -# push: -# tags: -# - 'v*' +on: + push: + tags: + # - 'v*' + - skip_for_now jobs: push-docker-image: diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..f1866318 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +build/ +**/__pycache__ +config.log +config.status diff --git a/chrome/curl_chrome119 b/chrome/curl_chrome119 index 07709356..1629adc7 100755 --- a/chrome/curl_chrome119 +++ b/chrome/curl_chrome119 @@ -10,9 +10,9 @@ dir=${0%/*} --ciphers TLS_AES_128_GCM_SHA256,TLS_AES_256_GCM_SHA384,TLS_CHACHA20_POLY1305_SHA256,ECDHE-ECDSA-AES128-GCM-SHA256,ECDHE-RSA-AES128-GCM-SHA256,ECDHE-ECDSA-AES256-GCM-SHA384,ECDHE-RSA-AES256-GCM-SHA384,ECDHE-ECDSA-CHACHA20-POLY1305,ECDHE-RSA-CHACHA20-POLY1305,ECDHE-RSA-AES128-SHA,ECDHE-RSA-AES256-SHA,AES128-GCM-SHA256,AES256-GCM-SHA384,AES128-SHA,AES256-SHA \ -H 'sec-ch-ua: "Google Chrome";v="119", "Not;A=Brand";v="8", "Chromium";v="119"' \ -H 'sec-ch-ua-mobile: ?0' \ - -H 'sec-ch-ua-platform: "Windows"' \ + -H 'sec-ch-ua-platform: "macOS"' \ -H 'Upgrade-Insecure-Requests: 1' \ - -H 'User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36' \ + -H 'User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36' \ -H 'Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7' \ -H 'Sec-Fetch-Site: none' \ -H 'Sec-Fetch-Mode: navigate' \ diff --git a/chrome/patches/curl-impersonate.patch b/chrome/patches/curl-impersonate.patch index b5d7c58f..84b55f1c 100644 --- a/chrome/patches/curl-impersonate.patch +++ b/chrome/patches/curl-impersonate.patch @@ -1163,7 +1163,7 @@ index 562c05c99..b99c085d5 100644 * Store nghttp2 version info in this buffer. diff --git a/lib/impersonate.c b/lib/impersonate.c new file mode 100644 -index 000000000..9e951de55 +index 000000000..164f3b8a4 --- /dev/null +++ b/lib/impersonate.c @@ -0,0 +1,568 @@ @@ -1488,7 +1488,7 @@ index 000000000..9e951de55 + .http_headers = { + "sec-ch-ua: \"Google Chrome\";v=\"119\", \"Chromium\";v=\"119\", \"Not?A_Brand\";v=\"24\"", + "sec-ch-ua-mobile: ?0", -+ "sec-ch-ua-platform: \"Windows\"", ++ "sec-ch-ua-platform: \"macOS\"", + "Upgrade-Insecure-Requests: 1", + "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36", + "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7", diff --git a/tests/signatures/chrome_119.0.6045.199_macOS.yaml b/tests/signatures/chrome_119.0.6045.199_macOS.yaml index d45774f1..05351d52 100644 --- a/tests/signatures/chrome_119.0.6045.199_macOS.yaml +++ b/tests/signatures/chrome_119.0.6045.199_macOS.yaml @@ -27,8 +27,7 @@ signature: - 'sec-ch-ua-mobile: ?0' - 'sec-ch-ua-platform: "macOS"' - 'upgrade-insecure-requests: 1' - - 'user-agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 - (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36' + - 'user-agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36' - 'accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7' - 'sec-fetch-site: none' - 'sec-fetch-mode: navigate' diff --git a/tests/targets.yaml b/tests/targets.yaml index ffdcb968..8857168b 100644 --- a/tests/targets.yaml +++ b/tests/targets.yaml @@ -38,7 +38,7 @@ - - curl_chrome99_android - null - null - - chrome_99.0.4844.73_android12-pixel6 + - chrome_99.0.4844.73_android12 - - curl_edge99 - null - null @@ -126,7 +126,7 @@ - - minicurl - CURL_IMPERSONATE: chrome99_android - libcurl-impersonate-chrome - - chrome_99.0.4844.73_android12-pixel6 + - chrome_99.0.4844.73_android12 - - minicurl - CURL_IMPERSONATE: edge99 - libcurl-impersonate-chrome