From da29ea6973fc22849c16546f5f28621c890cf61d Mon Sep 17 00:00:00 2001 From: lsv Date: Wed, 17 Jun 2026 16:07:16 +0500 Subject: [PATCH] Add option to disable certificate verification for the gitlab site. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Добавлена настройка "sslverify" в файл gitlab.json по умолчанию true. При установке в false сайт указаный в "url" не проверяется. Настройка добавлена для решения проблем с ошибками SSL certificate verification failed: certificate signer not trusted. --- CMakeLists.txt | 9 +-------- ctl/ctlGitPanel.cpp | 6 ++++++ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e8d3a18..ad304f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,14 +4,7 @@ project(pgAdmin3 VERSION 1.26.0) include_directories(. include) set(PRECOMP_FILE precomp.h) if(NOT CROSS_COMPILE) - include_directories(include/libssh2) - find_package(CURL) - if(NOT CURL_FOUND) - add_compile_definitions(NO_WXJSON_GIT) - else() - include_directories(${CURL_INCLUDE_DIR}) - link_libraries(${CURL_LIBRARIES}) - endif() + include_directories(include/libssh2) find_package(LibXslt REQUIRED) if(NOT LIBXSLT_FOUND) message(SEND_ERROR "Failed to find LibXslt") diff --git a/ctl/ctlGitPanel.cpp b/ctl/ctlGitPanel.cpp index 4162134..02f0044 100644 --- a/ctl/ctlGitPanel.cpp +++ b/ctl/ctlGitPanel.cpp @@ -351,6 +351,9 @@ wxMemoryBuffer ctlGitPanel::execRequestBinary(wxString url) { } wxString pt; cfg["private_token"].AsString(pt); + bool sslverify=true; + cfg["sslverify"].AsBool(sslverify); + if (!sslverify) request.DisablePeerVerify(); request.SetHeader("PRIVATE-TOKEN", pt); wxString rez; wxMemoryOutputStream output; @@ -427,6 +430,9 @@ wxJSONValue ctlGitPanel::execRequest(wxString url, wxJSONValue args,wxString cmd } wxString pt; cfg["private_token"].AsString(pt); + bool sslverify=true; + cfg["sslverify"].AsBool(sslverify); + if (!sslverify) request.DisablePeerVerify(); request.SetHeader("PRIVATE-TOKEN", pt); if (cmd != "GET") request.SetMethod(cmd); if (!args.IsNull()) {