From 8df6ff3728d505eb6aa1677fa7aac88ce6ec346f Mon Sep 17 00:00:00 2001 From: Yves Date: Wed, 12 Mar 2025 15:14:58 +0100 Subject: [PATCH 1/2] Enable server certs verification by default --- src/http_server.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/http_server.cpp b/src/http_server.cpp index 954365c..667a78c 100644 --- a/src/http_server.cpp +++ b/src/http_server.cpp @@ -247,13 +247,7 @@ void HttpServer::HandleGet(const httplib::Request &req, httplib::Client client(remote_url); client.set_keep_alive(true); - // Provide a way to turn on or off server certificate verification, at least - // for now, because it requires httplib to correctly get the root certficates - // on each platform, which doesn't appear to always work. Currently, default - // to no verification, until we understand when it breaks things. - if (IsEnvEnabled("ui_enable_server_certificate_verification")) { - client.enable_server_certificate_verification(true); - } else { + if (IsEnvEnabled("ui_disable_server_certificate_verification")) { client.enable_server_certificate_verification(false); } From 47ef655be03414cffd7221bb91195dccab8d812f Mon Sep 17 00:00:00 2001 From: Hiroaki Yutani Date: Wed, 12 Mar 2025 23:51:03 +0900 Subject: [PATCH 2/2] ci: Enable windows_amd64_mingw --- .github/workflows/MainDistributionPipeline.yml | 8 ++++---- extension-ci-tools | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/MainDistributionPipeline.yml b/.github/workflows/MainDistributionPipeline.yml index 21e578b..18faf1b 100644 --- a/.github/workflows/MainDistributionPipeline.yml +++ b/.github/workflows/MainDistributionPipeline.yml @@ -18,7 +18,7 @@ jobs: with: ci_tools_version: main duckdb_version: main - exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools;windows_amd64_mingw' + exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads' extension_name: ui duckdb-next-patch-build: @@ -27,7 +27,7 @@ jobs: with: ci_tools_version: v1.2.1 duckdb_version: v1.2-histrionicus - exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools;windows_amd64_mingw' + exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads' extension_name: ui duckdb-stable-build: @@ -36,7 +36,7 @@ jobs: with: ci_tools_version: v1.2.1 duckdb_version: v1.2.1 - exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools;windows_amd64_mingw' + exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads' extension_name: ui duckdb-stable-deploy: @@ -49,5 +49,5 @@ jobs: extension_name: ui duckdb_version: v1.2.1 ci_tools_version: v1.2.1 - exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools;windows_amd64_mingw' + exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads' deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }} \ No newline at end of file diff --git a/extension-ci-tools b/extension-ci-tools index 58970c5..00e6af0 160000 --- a/extension-ci-tools +++ b/extension-ci-tools @@ -1 +1 @@ -Subproject commit 58970c538d35919db875096460c05806056f4de0 +Subproject commit 00e6af068429bf776a54f67cb1cd1ff5370a8dd7