Idea-Studios/libgit2
2
0
Fork 0
mirror of https://github.com/libgit2/libgit2.git synced 2026-06-22 06:26:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add build flag for disable http transport

Browse Source
This commit is contained in:
Nikolay Govorov
2026-05-03 12:41:49 +01:00
parent 5332759cff
commit dac34eeecd
13 changed files with 102 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@@ -29,6 +29,7 @@ option(BUILD_FUZZERS "Build the fuzz targets"
# Feature enablement and backend selection
set(USE_THREADS "" CACHE STRING "Use threads for parallel processing when possible. One of ON, OFF, or a specific provider: pthreads or win32. (Defaults to ON.)")
set(USE_SSH "" CACHE STRING "Enables SSH support and optionally selects provider. One of ON, OFF, or a specific provider: libssh2 or exec. (Defaults to OFF.)")
set(USE_HTTP "" CACHE STRING "Enable HTTP transport support (covers both http:// and https:// remotes). One of ON or OFF. When OFF, HTTPS is also disabled. (Defaults to ON.)")
set(USE_HTTPS "" CACHE STRING "Enable HTTPS support and optionally selects the provider. One of ON, OFF, or a specific provider: OpenSSL, OpenSSL-FIPS, OpenSSL-Dynamic, mbedTLS, SecureTransport, Schannel, or WinHTTP. (Defaults to ON.)")
set(USE_SHA1 "" CACHE STRING "Selects SHA1 provider. One of builtin, HTTPS, or a specific provider. (Defaults to builtin.)")
set(USE_SHA256 "" CACHE STRING "Selects SHA256 provider. One of Builtin, HTTPS, or a specific provider. (Defaults to HTTPS.)")

32
cmake/SelectHTTP.cmake Normal file
View File

@@ -0,0 +1,32 @@
include(SanitizeInput)
if(USE_HTTP STREQUAL "")
set(USE_HTTP ON)
endif()
sanitizeinput(USE_HTTP)
if(USE_HTTP STREQUAL ON)
set(GIT_HTTP 1)
add_feature_info(HTTP ON "HTTP transport support")
elseif(USE_HTTP STREQUAL OFF)
# Several features only have meaning over HTTP: HTTPS, NTLM and
# Negotiate auth. If the user did not request them explicitly, silently
# disable them to keep configurations consistent. If they were requested
# explicitly, error out: they cannot be built without the HTTP transport.
foreach(_dep USE_HTTPS USE_AUTH_NTLM USE_AUTH_NEGOTIATE)
if(${_dep} STREQUAL "")
set(${_dep} OFF)
else()
set(_dep_check "${${_dep}}")
sanitizeinput(_dep_check)
if(_dep_check)
message(FATAL_ERROR "${_dep}=${${_dep}} requires USE_HTTP=ON; this feature depends on the HTTP transport")
endif()
endif()
endforeach()
add_feature_info(HTTP OFF "HTTP transport support is disabled")
else()
message(FATAL_ERROR "unknown HTTP option: ${USE_HTTP}")
endif()

5
include/git2/common.h
View File

@@ -173,7 +173,10 @@ typedef enum {
GIT_FEATURE_SHA1 = (1 << 10),
/** SHA256 object support */
GIT_FEATURE_SHA256 = (1 << 11)
GIT_FEATURE_SHA256 = (1 << 11),
/** HTTP remotes */
GIT_FEATURE_HTTP = (1 << 12)
} git_feature_t;
/**

2
src/CMakeLists.txt
View File

@@ -38,6 +38,7 @@ add_feature_info("Debug open" GIT_DEBUG_STRICT_OPEN "strict path validation in o
include(SelectThreads)
include(SelectNsec)
include(SelectHTTP)
include(SelectHTTPSBackend)
include(SelectHashes)
include(SelectHTTPParser)
@@ -168,3 +169,4 @@ set(LIBGIT2_DEPENDENCY_INCLUDES ${LIBGIT2_DEPENDENCY_INCLUDES} PARENT_SCOPE)
set(LIBGIT2_DEPENDENCY_OBJECTS ${LIBGIT2_DEPENDENCY_OBJECTS} PARENT_SCOPE)
set(LIBGIT2_SYSTEM_INCLUDES ${LIBGIT2_SYSTEM_INCLUDES} PARENT_SCOPE)
set(LIBGIT2_SYSTEM_LIBS ${LIBGIT2_SYSTEM_LIBS} PARENT_SCOPE)
set(GIT_HTTP ${GIT_HTTP} PARENT_SCOPE)

7
src/libgit2/libgit2.c
View File

@@ -84,6 +84,9 @@ int git_libgit2_features(void)
#ifdef GIT_THREADS
| GIT_FEATURE_THREADS
#endif
#ifdef GIT_HTTP
| GIT_FEATURE_HTTP
#endif
#ifdef GIT_HTTPS
| GIT_FEATURE_HTTPS
#endif
@@ -125,6 +128,10 @@ const char *git_libgit2_feature_backend(git_feature_t feature)
#endif
break;
case GIT_FEATURE_HTTP:
/* HTTP has no backend selection; presence is reported via git_libgit2_features() */
break;
case GIT_FEATURE_HTTPS:
#if defined(GIT_HTTPS_OPENSSL)
return "openssl";

7
src/libgit2/transport.c
View File

@@ -20,9 +20,12 @@ typedef struct transport_definition {
void *param;
} transport_definition;
static git_smart_subtransport_definition http_subtransport_definition = { git_smart_subtransport_http, 1, NULL };
static git_smart_subtransport_definition git_subtransport_definition = { git_smart_subtransport_git, 0, NULL };
#ifdef GIT_HTTP
static git_smart_subtransport_definition http_subtransport_definition = { git_smart_subtransport_http, 1, NULL };
#endif
#ifdef GIT_SSH
static git_smart_subtransport_definition ssh_subtransport_definition = { git_smart_subtransport_ssh, 0, NULL };
#endif
@@ -31,8 +34,10 @@ static transport_definition local_transport_definition = { "file://", git_transp
static transport_definition transports[] = {
{ "git://", git_transport_smart, &git_subtransport_definition },
#ifdef GIT_HTTP
{ "http://", git_transport_smart, &http_subtransport_definition },
{ "https://", git_transport_smart, &http_subtransport_definition },
#endif
{ "file://", git_transport_local, NULL },
#ifdef GIT_SSH

24
src/libgit2/transports/http.c
View File

@@ -6,14 +6,16 @@
*/
#include "common.h"
#include "http.h"
#ifndef GIT_HTTPS_WINHTTP
bool git_http__expect_continue = false;
#if defined(GIT_HTTP) && !defined(GIT_HTTPS_WINHTTP)
#include "net.h"
#include "remote.h"
#include "smart.h"
#include "auth.h"
#include "http.h"
#include "auth_negotiate.h"
#include "auth_ntlm.h"
#include "trace.h"
@@ -22,8 +24,6 @@
#include "httpclient.h"
#include "git2/sys/credential.h"
bool git_http__expect_continue = false;
typedef enum {
HTTP_STATE_NONE = 0,
HTTP_STATE_SENDING_REQUEST,
@@ -762,4 +762,18 @@ int git_smart_subtransport_http(git_smart_subtransport **out, git_transport *own
return 0;
}
#endif /* !GIT_HTTPS_WINHTTP */
#elif !defined(GIT_HTTP)
#include "git2/sys/transport.h"
int git_smart_subtransport_http(git_smart_subtransport **out, git_transport *owner, void *param)
{
GIT_UNUSED(out);
GIT_UNUSED(owner);
GIT_UNUSED(param);
git_error_set(GIT_ERROR_INVALID, "cannot create HTTP transport; library was built without HTTP support");
return -1;
}
#endif /* GIT_HTTP && !GIT_HTTPS_WINHTTP */

5
src/libgit2/transports/httpclient.c
View File

@@ -6,6 +6,9 @@
*/
#include "common.h"
#ifdef GIT_HTTP
#include "git2.h"
#include "vector.h"
@@ -1631,3 +1634,5 @@ void git_http_client_free(git_http_client *client)
git_str_dispose(&client->read_buf);
git__free(client);
}
#endif /* GIT_HTTP */

4
src/libgit2/transports/httpparser.c
View File

@@ -9,6 +9,8 @@
#include <string.h>
#ifdef GIT_HTTP
#if defined(GIT_HTTPPARSER_HTTPPARSER)
#include "http_parser.h"
@@ -126,3 +128,5 @@ size_t git_http_parser_execute(
#else
# error unknown http-parser
#endif
#endif /* GIT_HTTP */

2
src/libgit2/transports/winhttp.c
View File

@@ -63,8 +63,6 @@
# define DWORD_MAX 0xffffffff
#endif
bool git_http__expect_continue = false;
static const char *prefix_https = "https://";
static const char *upload_pack_service = "upload-pack";
static const char *upload_pack_ls_service_url = "/info/refs?service=git-upload-pack";

2
src/util/git2_features.h.in
View File

@@ -53,6 +53,8 @@
#cmakedefine GIT_SSH_LIBSSH2 1
#cmakedefine GIT_SSH_LIBSSH2_MEMORY_CREDENTIALS 1
#cmakedefine GIT_HTTP 1
#cmakedefine GIT_HTTPS 1
#cmakedefine GIT_HTTPS_OPENSSL 1
#cmakedefine GIT_HTTPS_OPENSSL_DYNAMIC 1

14
tests/libgit2/CMakeLists.txt
View File

@@ -73,12 +73,16 @@ endif()
include(AddClarTest)
add_clar_test(libgit2_tests offline -v -xonline)
add_clar_test(libgit2_tests invasive -v -sfilter::stream::bigfile -sodb::largefiles -siterator::workdir::filesystem_gunk -srepo::init -srepo::init::at_filesystem_root -sonline::clone::connect_timeout_default)
add_clar_test(libgit2_tests online -v -sonline -xonline::customcert)
add_clar_test(libgit2_tests online_customcert -v -sonline::customcert)
add_clar_test(libgit2_tests gitdaemon -v -sonline::push)
add_clar_test(libgit2_tests gitdaemon_namespace -v -sonline::clone::namespace)
add_clar_test(libgit2_tests gitdaemon_sha256 -v -sonline::clone::sha256)
add_clar_test(libgit2_tests ssh -v -sonline::push -sonline::clone::ssh_cert -sonline::clone::ssh_with_paths -sonline::clone::path_whitespace_ssh -sonline::clone::ssh_auth_methods)
add_clar_test(libgit2_tests proxy -v -sonline::clone::proxy)
add_clar_test(libgit2_tests auth_clone -v -sonline::clone::cred)
add_clar_test(libgit2_tests auth_clone_and_push -v -sonline::clone::push -sonline::push)
# HTTP-dependent online tests; only meaningful when the library is built with HTTP support.
if(GIT_HTTP)
add_clar_test(libgit2_tests online -v -sonline -xonline::customcert)
add_clar_test(libgit2_tests online_customcert -v -sonline::customcert)
add_clar_test(libgit2_tests proxy -v -sonline::clone::proxy)
add_clar_test(libgit2_tests auth_clone -v -sonline::clone::cred)
add_clar_test(libgit2_tests auth_clone_and_push -v -sonline::clone::push -sonline::push)
endif()

11
tests/libgit2/core/features.c
View File

@@ -10,6 +10,12 @@ void test_core_features__basic(void)
cl_assert((caps & GIT_FEATURE_THREADS) == 0);
#endif
#ifdef GIT_HTTP
cl_assert((caps & GIT_FEATURE_HTTP) != 0);
#else
cl_assert((caps & GIT_FEATURE_HTTP) == 0);
#endif
#ifdef GIT_HTTPS
cl_assert((caps & GIT_FEATURE_HTTPS) != 0);
#endif
@@ -53,6 +59,7 @@ void test_core_features__basic(void)
* added that the backends test (below) is updated as well.
*/
cl_assert((caps & ~(GIT_FEATURE_THREADS |
GIT_FEATURE_HTTP |
GIT_FEATURE_HTTPS |
GIT_FEATURE_SSH |
GIT_FEATURE_NSEC |
@@ -70,6 +77,7 @@ void test_core_features__basic(void)
void test_core_features__backends(void)
{
const char *threads = git_libgit2_feature_backend(GIT_FEATURE_THREADS);
const char *http = git_libgit2_feature_backend(GIT_FEATURE_HTTP);
const char *https = git_libgit2_feature_backend(GIT_FEATURE_HTTPS);
const char *ssh = git_libgit2_feature_backend(GIT_FEATURE_SSH);
const char *nsec = git_libgit2_feature_backend(GIT_FEATURE_NSEC);
@@ -92,6 +100,9 @@ void test_core_features__backends(void)
cl_assert(threads == NULL);
#endif
/* HTTP has no backend selection */
cl_assert(http == NULL);
#if defined(GIT_HTTPS_OPENSSL)
cl_assert_equal_s("openssl", https);
#elif defined(GIT_HTTPS_OPENSSL_DYNAMIC)