rugged 1.3.1 → 1.6.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +34 -2
- data/ext/rugged/extconf.rb +6 -3
- data/ext/rugged/rugged.c +16 -0
- data/ext/rugged/rugged.h +4 -0
- data/ext/rugged/rugged_blame.c +2 -0
- data/ext/rugged/rugged_blob.c +3 -0
- data/ext/rugged/rugged_commit.c +1 -0
- data/ext/rugged/rugged_config.c +9 -2
- data/ext/rugged/rugged_diff.c +1 -0
- data/ext/rugged/rugged_index.c +2 -0
- data/ext/rugged/rugged_patch.c +1 -0
- data/ext/rugged/rugged_rebase.c +1 -0
- data/ext/rugged/rugged_reference.c +1 -0
- data/ext/rugged/rugged_remote.c +28 -10
- data/ext/rugged/rugged_repo.c +7 -9
- data/ext/rugged/rugged_revwalk.c +5 -1
- data/ext/rugged/rugged_settings.c +5 -0
- data/ext/rugged/rugged_submodule.c +1 -0
- data/ext/rugged/rugged_tag.c +1 -0
- data/ext/rugged/rugged_tree.c +4 -0
- data/lib/rugged/index.rb +1 -1
- data/lib/rugged/tree.rb +5 -1
- data/lib/rugged/version.rb +1 -1
- data/vendor/libgit2/CMakeLists.txt +132 -288
- data/vendor/libgit2/COPYING +106 -19
- data/vendor/libgit2/cmake/AddCFlagIfSupported.cmake +21 -21
- data/vendor/libgit2/cmake/AddClarTest.cmake +7 -0
- data/vendor/libgit2/cmake/DefaultCFlags.cmake +154 -0
- data/vendor/libgit2/cmake/EnableWarnings.cmake +13 -13
- data/vendor/libgit2/cmake/ExperimentalFeatures.cmake +23 -0
- data/vendor/libgit2/cmake/FindCoreFoundation.cmake +13 -13
- data/vendor/libgit2/cmake/FindGSSAPI.cmake +171 -287
- data/vendor/libgit2/cmake/FindGSSFramework.cmake +13 -13
- data/vendor/libgit2/cmake/{FindHTTP_Parser.cmake → FindHTTPParser.cmake} +17 -17
- data/vendor/libgit2/cmake/FindIconv.cmake +27 -27
- data/vendor/libgit2/cmake/FindLibSSH2.cmake +5 -5
- data/vendor/libgit2/cmake/FindPCRE.cmake +12 -13
- data/vendor/libgit2/cmake/FindPCRE2.cmake +12 -12
- data/vendor/libgit2/cmake/FindPkgLibraries.cmake +19 -19
- data/vendor/libgit2/cmake/FindSecurity.cmake +14 -14
- data/vendor/libgit2/cmake/FindStatNsec.cmake +12 -18
- data/vendor/libgit2/cmake/Findfutimens.cmake +8 -8
- data/vendor/libgit2/cmake/FindmbedTLS.cmake +63 -70
- data/vendor/libgit2/cmake/IdeSplitSources.cmake +18 -18
- data/vendor/libgit2/cmake/PkgBuildConfig.cmake +60 -60
- data/vendor/libgit2/cmake/SanitizeBool.cmake +20 -20
- data/vendor/libgit2/cmake/SelectGSSAPI.cmake +37 -37
- data/vendor/libgit2/cmake/SelectHTTPParser.cmake +19 -0
- data/vendor/libgit2/cmake/SelectHTTPSBackend.cmake +100 -100
- data/vendor/libgit2/cmake/SelectHashes.cmake +91 -53
- data/vendor/libgit2/cmake/SelectRegex.cmake +51 -0
- data/vendor/libgit2/cmake/SelectSSH.cmake +41 -0
- data/vendor/libgit2/cmake/SelectWinHTTP.cmake +17 -0
- data/vendor/libgit2/cmake/SelectZlib.cmake +34 -0
- data/vendor/libgit2/deps/chromium-zlib/CMakeLists.txt +6 -6
- data/vendor/libgit2/deps/ntlmclient/CMakeLists.txt +33 -31
- data/vendor/libgit2/deps/ntlmclient/crypt_openssl.c +3 -1
- data/vendor/libgit2/deps/ntlmclient/ntlm.c +4 -4
- data/vendor/libgit2/deps/ntlmclient/ntlm.h +4 -4
- data/vendor/libgit2/deps/ntlmclient/ntlmclient.h +2 -2
- data/vendor/libgit2/deps/pcre/CMakeLists.txt +88 -88
- data/vendor/libgit2/deps/winhttp/CMakeLists.txt +14 -16
- data/vendor/libgit2/deps/zlib/adler32.c +7 -0
- data/vendor/libgit2/deps/zlib/crc32.c +975 -288
- data/vendor/libgit2/deps/zlib/crc32.h +9441 -436
- data/vendor/libgit2/deps/zlib/deflate.c +83 -31
- data/vendor/libgit2/deps/zlib/deflate.h +12 -15
- data/vendor/libgit2/deps/zlib/gzguts.h +3 -2
- data/vendor/libgit2/deps/zlib/infback.c +2 -1
- data/vendor/libgit2/deps/zlib/inffast.c +14 -14
- data/vendor/libgit2/deps/zlib/inflate.c +39 -8
- data/vendor/libgit2/deps/zlib/inflate.h +3 -2
- data/vendor/libgit2/deps/zlib/inftrees.c +3 -3
- data/vendor/libgit2/deps/zlib/trees.c +27 -48
- data/vendor/libgit2/deps/zlib/zlib.h +126 -100
- data/vendor/libgit2/deps/zlib/zutil.c +2 -2
- data/vendor/libgit2/deps/zlib/zutil.h +12 -9
- data/vendor/libgit2/include/git2/apply.h +16 -2
- data/vendor/libgit2/include/git2/attr.h +11 -2
- data/vendor/libgit2/include/git2/blame.h +4 -1
- data/vendor/libgit2/include/git2/blob.h +14 -1
- data/vendor/libgit2/include/git2/branch.h +4 -2
- data/vendor/libgit2/include/git2/buffer.h +18 -78
- data/vendor/libgit2/include/git2/cert.h +2 -2
- data/vendor/libgit2/include/git2/checkout.h +5 -2
- data/vendor/libgit2/include/git2/clone.h +3 -3
- data/vendor/libgit2/include/git2/commit.h +2 -0
- data/vendor/libgit2/include/git2/common.h +38 -7
- data/vendor/libgit2/include/git2/config.h +25 -9
- data/vendor/libgit2/include/git2/credential.h +2 -1
- data/vendor/libgit2/include/git2/credential_helpers.h +1 -0
- data/vendor/libgit2/include/git2/deprecated.h +9 -1
- data/vendor/libgit2/include/git2/describe.h +7 -2
- data/vendor/libgit2/include/git2/diff.h +18 -10
- data/vendor/libgit2/include/git2/email.h +1 -1
- data/vendor/libgit2/include/git2/errors.h +18 -3
- data/vendor/libgit2/include/git2/experimental.h +20 -0
- data/vendor/libgit2/include/git2/filter.h +7 -2
- data/vendor/libgit2/include/git2/graph.h +1 -0
- data/vendor/libgit2/include/git2/ignore.h +1 -1
- data/vendor/libgit2/include/git2/index.h +11 -5
- data/vendor/libgit2/include/git2/indexer.h +48 -0
- data/vendor/libgit2/include/git2/merge.h +24 -4
- data/vendor/libgit2/include/git2/message.h +2 -0
- data/vendor/libgit2/include/git2/object.h +49 -0
- data/vendor/libgit2/include/git2/odb.h +94 -13
- data/vendor/libgit2/include/git2/odb_backend.h +107 -19
- data/vendor/libgit2/include/git2/oid.h +115 -15
- data/vendor/libgit2/include/git2/pack.h +24 -8
- data/vendor/libgit2/include/git2/patch.h +8 -0
- data/vendor/libgit2/include/git2/pathspec.h +1 -1
- data/vendor/libgit2/include/git2/proxy.h +1 -1
- data/vendor/libgit2/include/git2/rebase.h +9 -1
- data/vendor/libgit2/include/git2/refdb.h +3 -0
- data/vendor/libgit2/include/git2/reflog.h +1 -1
- data/vendor/libgit2/include/git2/refs.h +2 -2
- data/vendor/libgit2/include/git2/remote.h +184 -37
- data/vendor/libgit2/include/git2/repository.h +34 -10
- data/vendor/libgit2/include/git2/reset.h +2 -2
- data/vendor/libgit2/include/git2/revparse.h +1 -1
- data/vendor/libgit2/include/git2/revwalk.h +4 -1
- data/vendor/libgit2/include/git2/signature.h +1 -1
- data/vendor/libgit2/include/git2/stash.h +61 -7
- data/vendor/libgit2/include/git2/status.h +14 -5
- data/vendor/libgit2/include/git2/strarray.h +0 -13
- data/vendor/libgit2/include/git2/submodule.h +7 -2
- data/vendor/libgit2/include/git2/sys/commit_graph.h +1 -1
- data/vendor/libgit2/include/git2/sys/odb_backend.h +3 -6
- data/vendor/libgit2/include/git2/sys/remote.h +46 -0
- data/vendor/libgit2/include/git2/sys/stream.h +1 -1
- data/vendor/libgit2/include/git2/sys/transport.h +46 -39
- data/vendor/libgit2/include/git2/tag.h +1 -0
- data/vendor/libgit2/include/git2/tree.h +4 -3
- data/vendor/libgit2/include/git2/types.h +7 -7
- data/vendor/libgit2/include/git2/version.h +27 -6
- data/vendor/libgit2/include/git2/worktree.h +12 -2
- data/vendor/libgit2/include/git2.h +1 -0
- data/vendor/libgit2/src/CMakeLists.txt +177 -419
- data/vendor/libgit2/src/README.md +12 -0
- data/vendor/libgit2/src/cli/CMakeLists.txt +57 -0
- data/vendor/libgit2/src/cli/README.md +26 -0
- data/vendor/libgit2/src/cli/cli.h +20 -0
- data/vendor/libgit2/src/cli/cmd.c +21 -0
- data/vendor/libgit2/src/cli/cmd.h +33 -0
- data/vendor/libgit2/src/cli/cmd_cat_file.c +204 -0
- data/vendor/libgit2/src/cli/cmd_clone.c +176 -0
- data/vendor/libgit2/src/cli/cmd_hash_object.c +154 -0
- data/vendor/libgit2/src/cli/cmd_help.c +86 -0
- data/vendor/libgit2/src/cli/error.h +51 -0
- data/vendor/libgit2/src/cli/main.c +106 -0
- data/vendor/libgit2/src/cli/opt.c +669 -0
- data/vendor/libgit2/src/cli/opt.h +349 -0
- data/vendor/libgit2/src/cli/opt_usage.c +194 -0
- data/vendor/libgit2/src/cli/opt_usage.h +35 -0
- data/vendor/libgit2/src/cli/progress.c +345 -0
- data/vendor/libgit2/src/cli/progress.h +117 -0
- data/vendor/libgit2/src/cli/sighandler.h +20 -0
- data/vendor/libgit2/src/cli/unix/sighandler.c +36 -0
- data/vendor/libgit2/src/cli/win32/precompiled.h +3 -0
- data/vendor/libgit2/src/cli/win32/sighandler.c +37 -0
- data/vendor/libgit2/src/libgit2/CMakeLists.txt +141 -0
- data/vendor/libgit2/src/{annotated_commit.c → libgit2/annotated_commit.c} +1 -1
- data/vendor/libgit2/src/{annotated_commit.h → libgit2/annotated_commit.h} +2 -2
- data/vendor/libgit2/src/{apply.c → libgit2/apply.c} +18 -18
- data/vendor/libgit2/src/{apply.h → libgit2/apply.h} +2 -2
- data/vendor/libgit2/src/{attr.c → libgit2/attr.c} +18 -18
- data/vendor/libgit2/src/{attr_file.c → libgit2/attr_file.c} +18 -18
- data/vendor/libgit2/src/{attr_file.h → libgit2/attr_file.h} +4 -4
- data/vendor/libgit2/src/{attrcache.c → libgit2/attrcache.c} +18 -13
- data/vendor/libgit2/src/{blame.c → libgit2/blame.c} +2 -0
- data/vendor/libgit2/src/{blame_git.c → libgit2/blame_git.c} +1 -1
- data/vendor/libgit2/src/{blob.c → libgit2/blob.c} +38 -29
- data/vendor/libgit2/src/{blob.h → libgit2/blob.h} +3 -3
- data/vendor/libgit2/src/{branch.c → libgit2/branch.c} +164 -118
- data/vendor/libgit2/src/{branch.h → libgit2/branch.h} +15 -3
- data/vendor/libgit2/src/libgit2/buf.c +126 -0
- data/vendor/libgit2/src/libgit2/buf.h +50 -0
- data/vendor/libgit2/src/{checkout.c → libgit2/checkout.c} +74 -68
- data/vendor/libgit2/src/{cherrypick.c → libgit2/cherrypick.c} +13 -13
- data/vendor/libgit2/src/{clone.c → libgit2/clone.c} +96 -67
- data/vendor/libgit2/src/{commit.c → libgit2/commit.c} +178 -73
- data/vendor/libgit2/src/libgit2/commit.h +87 -0
- data/vendor/libgit2/src/{commit_graph.c → libgit2/commit_graph.c} +122 -89
- data/vendor/libgit2/src/{commit_graph.h → libgit2/commit_graph.h} +14 -4
- data/vendor/libgit2/src/{commit_list.c → libgit2/commit_list.c} +7 -4
- data/vendor/libgit2/src/libgit2/common.h +55 -0
- data/vendor/libgit2/src/{config.c → libgit2/config.c} +107 -71
- data/vendor/libgit2/src/{config.h → libgit2/config.h} +15 -2
- data/vendor/libgit2/src/{config_file.c → libgit2/config_file.c} +105 -93
- data/vendor/libgit2/src/{config_mem.c → libgit2/config_mem.c} +9 -9
- data/vendor/libgit2/src/{config_parse.c → libgit2/config_parse.c} +27 -23
- data/vendor/libgit2/src/{crlf.c → libgit2/crlf.c} +24 -21
- data/vendor/libgit2/src/{describe.c → libgit2/describe.c} +35 -27
- data/vendor/libgit2/src/{diff.c → libgit2/diff.c} +30 -9
- data/vendor/libgit2/src/{diff.h → libgit2/diff.h} +2 -4
- data/vendor/libgit2/src/{diff_driver.c → libgit2/diff_driver.c} +34 -36
- data/vendor/libgit2/src/{diff_driver.h → libgit2/diff_driver.h} +3 -3
- data/vendor/libgit2/src/{diff_file.c → libgit2/diff_file.c} +44 -26
- data/vendor/libgit2/src/{diff_generate.c → libgit2/diff_generate.c} +47 -18
- data/vendor/libgit2/src/{diff_generate.h → libgit2/diff_generate.h} +5 -3
- data/vendor/libgit2/src/{diff_print.c → libgit2/diff_print.c} +112 -100
- data/vendor/libgit2/src/{diff_stats.c → libgit2/diff_stats.c} +40 -29
- data/vendor/libgit2/src/libgit2/diff_stats.h +18 -0
- data/vendor/libgit2/src/{diff_tform.c → libgit2/diff_tform.c} +13 -8
- data/vendor/libgit2/src/{diff_xdiff.c → libgit2/diff_xdiff.c} +4 -8
- data/vendor/libgit2/src/{email.c → libgit2/email.c} +55 -39
- data/vendor/libgit2/src/{email.h → libgit2/email.h} +1 -1
- data/vendor/libgit2/src/{errors.c → libgit2/errors.c} +18 -18
- data/vendor/libgit2/src/{errors.h → libgit2/errors.h} +1 -2
- data/vendor/libgit2/src/libgit2/experimental.h.in +13 -0
- data/vendor/libgit2/src/{fetch.c → libgit2/fetch.c} +72 -27
- data/vendor/libgit2/src/{fetch.h → libgit2/fetch.h} +1 -1
- data/vendor/libgit2/src/{fetchhead.c → libgit2/fetchhead.c} +23 -23
- data/vendor/libgit2/src/{filter.c → libgit2/filter.c} +127 -53
- data/vendor/libgit2/src/{filter.h → libgit2/filter.h} +26 -5
- data/vendor/libgit2/src/{ident.c → libgit2/ident.c} +20 -20
- data/vendor/libgit2/src/{ignore.c → libgit2/ignore.c} +35 -34
- data/vendor/libgit2/src/{ignore.h → libgit2/ignore.h} +2 -2
- data/vendor/libgit2/src/{index.c → libgit2/index.c} +91 -90
- data/vendor/libgit2/src/{index.h → libgit2/index.h} +6 -3
- data/vendor/libgit2/src/{indexer.c → libgit2/indexer.c} +173 -92
- data/vendor/libgit2/src/{iterator.c → libgit2/iterator.c} +71 -61
- data/vendor/libgit2/src/{iterator.h → libgit2/iterator.h} +5 -5
- data/vendor/libgit2/src/{libgit2.c → libgit2/libgit2.c} +54 -11
- data/vendor/libgit2/src/{mailmap.c → libgit2/mailmap.c} +38 -36
- data/vendor/libgit2/src/{merge.c → libgit2/merge.c} +30 -30
- data/vendor/libgit2/src/{merge.h → libgit2/merge.h} +1 -14
- data/vendor/libgit2/src/{merge_driver.c → libgit2/merge_driver.c} +2 -2
- data/vendor/libgit2/src/{merge_file.c → libgit2/merge_file.c} +13 -3
- data/vendor/libgit2/src/{message.c → libgit2/message.c} +21 -10
- data/vendor/libgit2/src/{midx.c → libgit2/midx.c} +112 -92
- data/vendor/libgit2/src/{midx.h → libgit2/midx.h} +5 -4
- data/vendor/libgit2/src/{mwindow.c → libgit2/mwindow.c} +15 -12
- data/vendor/libgit2/src/{mwindow.h → libgit2/mwindow.h} +5 -2
- data/vendor/libgit2/src/{netops.c → libgit2/netops.c} +1 -2
- data/vendor/libgit2/src/{netops.h → libgit2/netops.h} +1 -1
- data/vendor/libgit2/src/{notes.c → libgit2/notes.c} +25 -34
- data/vendor/libgit2/src/{object.c → libgit2/object.c} +135 -30
- data/vendor/libgit2/src/{object.h → libgit2/object.h} +12 -3
- data/vendor/libgit2/src/{odb.c → libgit2/odb.c} +228 -81
- data/vendor/libgit2/src/{odb.h → libgit2/odb.h} +44 -5
- data/vendor/libgit2/src/{odb_loose.c → libgit2/odb_loose.c} +192 -134
- data/vendor/libgit2/src/{odb_mempack.c → libgit2/odb_mempack.c} +18 -5
- data/vendor/libgit2/src/{odb_pack.c → libgit2/odb_pack.c} +137 -85
- data/vendor/libgit2/src/{oid.c → libgit2/oid.c} +136 -90
- data/vendor/libgit2/src/libgit2/oid.h +273 -0
- data/vendor/libgit2/src/{oidmap.c → libgit2/oidmap.c} +1 -1
- data/vendor/libgit2/src/{pack-objects.c → libgit2/pack-objects.c} +56 -30
- data/vendor/libgit2/src/{pack-objects.h → libgit2/pack-objects.h} +11 -6
- data/vendor/libgit2/src/{pack.c → libgit2/pack.c} +114 -84
- data/vendor/libgit2/src/{pack.h → libgit2/pack.h} +31 -16
- data/vendor/libgit2/src/{parse.c → libgit2/parse.c} +4 -3
- data/vendor/libgit2/src/{patch.c → libgit2/patch.c} +3 -3
- data/vendor/libgit2/src/{patch.h → libgit2/patch.h} +1 -0
- data/vendor/libgit2/src/{patch_generate.c → libgit2/patch_generate.c} +27 -11
- data/vendor/libgit2/src/{patch_generate.h → libgit2/patch_generate.h} +5 -5
- data/vendor/libgit2/src/{patch_parse.c → libgit2/patch_parse.c} +29 -29
- data/vendor/libgit2/src/libgit2/path.c +375 -0
- data/vendor/libgit2/src/libgit2/path.h +68 -0
- data/vendor/libgit2/src/{pathspec.c → libgit2/pathspec.c} +6 -6
- data/vendor/libgit2/src/{pathspec.h → libgit2/pathspec.h} +2 -2
- data/vendor/libgit2/src/{proxy.c → libgit2/proxy.c} +4 -1
- data/vendor/libgit2/src/{proxy.h → libgit2/proxy.h} +1 -1
- data/vendor/libgit2/src/{push.c → libgit2/push.c} +43 -38
- data/vendor/libgit2/src/{push.h → libgit2/push.h} +4 -16
- data/vendor/libgit2/src/{reader.c → libgit2/reader.c} +9 -9
- data/vendor/libgit2/src/{reader.h → libgit2/reader.h} +2 -2
- data/vendor/libgit2/src/{rebase.c → libgit2/rebase.c} +119 -107
- data/vendor/libgit2/src/{refdb_fs.c → libgit2/refdb_fs.c} +506 -197
- data/vendor/libgit2/src/{reflog.c → libgit2/reflog.c} +7 -5
- data/vendor/libgit2/src/{reflog.h → libgit2/reflog.h} +1 -2
- data/vendor/libgit2/src/{refs.c → libgit2/refs.c} +34 -32
- data/vendor/libgit2/src/{refs.h → libgit2/refs.h} +2 -2
- data/vendor/libgit2/src/{refspec.c → libgit2/refspec.c} +32 -37
- data/vendor/libgit2/src/{refspec.h → libgit2/refspec.h} +5 -2
- data/vendor/libgit2/src/{remote.c → libgit2/remote.c} +718 -420
- data/vendor/libgit2/src/libgit2/remote.h +100 -0
- data/vendor/libgit2/src/{repository.c → libgit2/repository.c} +690 -366
- data/vendor/libgit2/src/{repository.h → libgit2/repository.h} +21 -9
- data/vendor/libgit2/src/{reset.c → libgit2/reset.c} +8 -5
- data/vendor/libgit2/src/{revert.c → libgit2/revert.c} +14 -14
- data/vendor/libgit2/src/{revparse.c → libgit2/revparse.c} +71 -42
- data/vendor/libgit2/src/{revwalk.c → libgit2/revwalk.c} +12 -8
- data/vendor/libgit2/src/{signature.c → libgit2/signature.c} +12 -6
- data/vendor/libgit2/src/{signature.h → libgit2/signature.h} +1 -1
- data/vendor/libgit2/src/{stash.c → libgit2/stash.c} +235 -61
- data/vendor/libgit2/src/{status.c → libgit2/status.c} +4 -1
- data/vendor/libgit2/src/{strarray.c → libgit2/strarray.c} +1 -0
- data/vendor/libgit2/src/libgit2/strarray.h +25 -0
- data/vendor/libgit2/src/{streams → libgit2/streams}/mbedtls.c +8 -6
- data/vendor/libgit2/src/{streams → libgit2/streams}/openssl.c +1 -1
- data/vendor/libgit2/src/{streams → libgit2/streams}/openssl_dynamic.c +7 -3
- data/vendor/libgit2/src/{streams → libgit2/streams}/openssl_dynamic.h +3 -3
- data/vendor/libgit2/src/{streams → libgit2/streams}/socket.c +4 -1
- data/vendor/libgit2/src/{submodule.c → libgit2/submodule.c} +177 -161
- data/vendor/libgit2/src/{submodule.h → libgit2/submodule.h} +1 -1
- data/vendor/libgit2/src/libgit2/sysdir.c +650 -0
- data/vendor/libgit2/src/{sysdir.h → libgit2/sysdir.h} +53 -18
- data/vendor/libgit2/src/{tag.c → libgit2/tag.c} +73 -42
- data/vendor/libgit2/src/{tag.h → libgit2/tag.h} +2 -2
- data/vendor/libgit2/src/{threadstate.c → libgit2/threadstate.c} +3 -3
- data/vendor/libgit2/src/{threadstate.h → libgit2/threadstate.h} +2 -2
- data/vendor/libgit2/src/{trace.c → libgit2/trace.c} +1 -14
- data/vendor/libgit2/src/{trace.h → libgit2/trace.h} +5 -22
- data/vendor/libgit2/src/{trailer.c → libgit2/trailer.c} +1 -1
- data/vendor/libgit2/src/{transaction.c → libgit2/transaction.c} +1 -1
- data/vendor/libgit2/src/{transport.c → libgit2/transport.c} +10 -10
- data/vendor/libgit2/src/{transports → libgit2/transports}/auth.c +7 -9
- data/vendor/libgit2/src/{transports → libgit2/transports}/auth.h +2 -3
- data/vendor/libgit2/src/{transports → libgit2/transports}/auth_negotiate.c +12 -13
- data/vendor/libgit2/src/{transports → libgit2/transports}/auth_ntlm.c +10 -10
- data/vendor/libgit2/src/{transports → libgit2/transports}/auth_ntlm.h +0 -1
- data/vendor/libgit2/src/{transports → libgit2/transports}/git.c +9 -11
- data/vendor/libgit2/src/{transports → libgit2/transports}/http.c +41 -20
- data/vendor/libgit2/src/{transports → libgit2/transports}/http.h +2 -3
- data/vendor/libgit2/src/{transports → libgit2/transports}/httpclient.c +75 -66
- data/vendor/libgit2/src/{transports → libgit2/transports}/httpclient.h +10 -0
- data/vendor/libgit2/src/{transports → libgit2/transports}/local.c +138 -116
- data/vendor/libgit2/src/{transports → libgit2/transports}/smart.c +92 -133
- data/vendor/libgit2/src/{transports → libgit2/transports}/smart.h +35 -32
- data/vendor/libgit2/src/{transports → libgit2/transports}/smart_pkt.c +177 -65
- data/vendor/libgit2/src/{transports → libgit2/transports}/smart_protocol.c +97 -49
- data/vendor/libgit2/src/{transports → libgit2/transports}/ssh.c +365 -198
- data/vendor/libgit2/src/{transports → libgit2/transports}/winhttp.c +58 -59
- data/vendor/libgit2/src/{tree-cache.c → libgit2/tree-cache.c} +8 -8
- data/vendor/libgit2/src/{tree-cache.h → libgit2/tree-cache.h} +2 -2
- data/vendor/libgit2/src/{tree.c → libgit2/tree.c} +93 -83
- data/vendor/libgit2/src/{tree.h → libgit2/tree.h} +4 -4
- data/vendor/libgit2/src/{worktree.c → libgit2/worktree.c} +121 -94
- data/vendor/libgit2/src/{worktree.h → libgit2/worktree.h} +1 -1
- data/vendor/libgit2/src/libgit2/xdiff/git-xdiff.h +53 -0
- data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xdiff.h +15 -15
- data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xdiffi.c +134 -108
- data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xemit.c +23 -7
- data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xhistogram.c +87 -78
- data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xinclude.h +1 -12
- data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xmerge.c +104 -117
- data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xpatience.c +6 -17
- data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xprepare.c +15 -20
- data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xutils.c +18 -7
- data/vendor/libgit2/src/util/CMakeLists.txt +80 -0
- data/vendor/libgit2/src/{allocators → util/allocators}/failalloc.h +1 -1
- data/vendor/libgit2/src/{allocators → util/allocators}/stdalloc.h +1 -1
- data/vendor/libgit2/src/{allocators → util/allocators}/win32_leakcheck.h +1 -1
- data/vendor/libgit2/src/{array.h → util/array.h} +1 -1
- data/vendor/libgit2/src/{assert_safe.h → util/assert_safe.h} +16 -0
- data/vendor/libgit2/src/{cc-compat.h → util/cc-compat.h} +1 -1
- data/vendor/libgit2/src/{date.c → util/date.c} +14 -20
- data/vendor/libgit2/src/util/date.h +33 -0
- data/vendor/libgit2/src/{filebuf.c → util/filebuf.c} +29 -29
- data/vendor/libgit2/src/{filebuf.h → util/filebuf.h} +2 -2
- data/vendor/libgit2/src/{path.c → util/fs_path.c} +580 -615
- data/vendor/libgit2/src/{path.h → util/fs_path.h} +234 -181
- data/vendor/libgit2/src/{futils.c → util/futils.c} +135 -90
- data/vendor/libgit2/src/{futils.h → util/futils.h} +28 -15
- data/vendor/libgit2/src/{features.h.in → util/git2_features.h.in} +15 -1
- data/vendor/libgit2/src/{common.h → util/git2_util.h} +20 -59
- data/vendor/libgit2/src/util/hash/builtin.c +53 -0
- data/vendor/libgit2/src/{hash/sha1/openssl.h → util/hash/builtin.h} +6 -6
- data/vendor/libgit2/src/{hash/sha1 → util/hash}/collisiondetect.c +3 -3
- data/vendor/libgit2/src/{hash/sha1 → util/hash}/collisiondetect.h +3 -3
- data/vendor/libgit2/src/util/hash/common_crypto.c +112 -0
- data/vendor/libgit2/src/{hash/sha1 → util/hash}/common_crypto.h +11 -3
- data/vendor/libgit2/src/util/hash/mbedtls.c +92 -0
- data/vendor/libgit2/src/{hash/sha1 → util/hash}/mbedtls.h +14 -4
- data/vendor/libgit2/src/util/hash/openssl.c +195 -0
- data/vendor/libgit2/src/util/hash/openssl.h +45 -0
- data/vendor/libgit2/src/util/hash/rfc6234/sha.h +243 -0
- data/vendor/libgit2/src/util/hash/rfc6234/sha224-256.c +601 -0
- data/vendor/libgit2/src/util/hash/sha.h +70 -0
- data/vendor/libgit2/src/{hash/sha1 → util/hash}/sha1dc/sha1.c +1 -1
- data/vendor/libgit2/src/util/hash/win32.c +549 -0
- data/vendor/libgit2/src/util/hash/win32.h +60 -0
- data/vendor/libgit2/src/util/hash.c +158 -0
- data/vendor/libgit2/src/util/hash.h +61 -0
- data/vendor/libgit2/src/{khash.h → util/khash.h} +1 -1
- data/vendor/libgit2/src/{map.h → util/map.h} +1 -1
- data/vendor/libgit2/src/util/net.c +1003 -0
- data/vendor/libgit2/src/{net.h → util/net.h} +18 -4
- data/vendor/libgit2/src/{pool.h → util/pool.h} +1 -1
- data/vendor/libgit2/src/{posix.c → util/posix.c} +3 -3
- data/vendor/libgit2/src/{posix.h → util/posix.h} +4 -1
- data/vendor/libgit2/src/{pqueue.h → util/pqueue.h} +2 -2
- data/vendor/libgit2/src/util/rand.c +234 -0
- data/vendor/libgit2/src/util/rand.h +37 -0
- data/vendor/libgit2/src/{regexp.c → util/regexp.c} +4 -4
- data/vendor/libgit2/src/{regexp.h → util/regexp.h} +1 -1
- data/vendor/libgit2/src/{runtime.c → util/runtime.c} +1 -1
- data/vendor/libgit2/src/{runtime.h → util/runtime.h} +1 -1
- data/vendor/libgit2/src/{sortedcache.c → util/sortedcache.c} +1 -1
- data/vendor/libgit2/src/{sortedcache.h → util/sortedcache.h} +2 -2
- data/vendor/libgit2/src/{buffer.c → util/str.c} +157 -151
- data/vendor/libgit2/src/util/str.h +357 -0
- data/vendor/libgit2/src/{strmap.h → util/strmap.h} +1 -1
- data/vendor/libgit2/src/{thread.c → util/thread.c} +1 -1
- data/vendor/libgit2/src/{thread.h → util/thread.h} +23 -22
- data/vendor/libgit2/src/{tsort.c → util/tsort.c} +1 -1
- data/vendor/libgit2/src/{unix → util/unix}/map.c +1 -3
- data/vendor/libgit2/src/{unix → util/unix}/posix.h +1 -4
- data/vendor/libgit2/src/{unix → util/unix}/realpath.c +1 -3
- data/vendor/libgit2/src/{utf8.c → util/utf8.c} +1 -1
- data/vendor/libgit2/src/{utf8.h → util/utf8.h} +1 -1
- data/vendor/libgit2/src/{util.c → util/util.c} +15 -15
- data/vendor/libgit2/src/{util.h → util/util.h} +4 -29
- data/vendor/libgit2/src/{varint.h → util/varint.h} +1 -1
- data/vendor/libgit2/src/{vector.h → util/vector.h} +2 -2
- data/vendor/libgit2/src/{wildmatch.h → util/wildmatch.h} +1 -1
- data/vendor/libgit2/src/{win32 → util/win32}/dir.h +1 -1
- data/vendor/libgit2/src/{win32 → util/win32}/error.h +1 -1
- data/vendor/libgit2/src/{win32 → util/win32}/map.c +1 -1
- data/vendor/libgit2/src/{win32 → util/win32}/path_w32.c +140 -9
- data/vendor/libgit2/src/{win32 → util/win32}/path_w32.h +3 -1
- data/vendor/libgit2/src/{win32 → util/win32}/posix.h +1 -2
- data/vendor/libgit2/src/{win32 → util/win32}/posix_w32.c +12 -28
- data/vendor/libgit2/src/util/win32/precompiled.c +1 -0
- data/vendor/libgit2/src/{win32 → util/win32}/precompiled.h +1 -1
- data/vendor/libgit2/src/{win32 → util/win32}/thread.h +1 -1
- data/vendor/libgit2/src/{win32 → util/win32}/utf-conv.h +1 -1
- data/vendor/libgit2/src/{win32 → util/win32}/w32_buffer.c +2 -3
- data/vendor/libgit2/src/{win32 → util/win32}/w32_buffer.h +3 -4
- data/vendor/libgit2/src/{win32 → util/win32}/w32_leakcheck.c +1 -1
- data/vendor/libgit2/src/{win32 → util/win32}/w32_leakcheck.h +1 -1
- data/vendor/libgit2/src/{win32 → util/win32}/w32_util.h +1 -1
- data/vendor/libgit2/src/{zstream.c → util/zstream.c} +5 -5
- data/vendor/libgit2/src/{zstream.h → util/zstream.h} +5 -5
- metadata +402 -356
- data/vendor/libgit2/src/buffer.h +0 -374
- data/vendor/libgit2/src/commit.h +0 -46
- data/vendor/libgit2/src/hash/sha1/common_crypto.c +0 -57
- data/vendor/libgit2/src/hash/sha1/generic.c +0 -300
- data/vendor/libgit2/src/hash/sha1/generic.h +0 -19
- data/vendor/libgit2/src/hash/sha1/mbedtls.c +0 -46
- data/vendor/libgit2/src/hash/sha1/openssl.c +0 -59
- data/vendor/libgit2/src/hash/sha1/win32.c +0 -333
- data/vendor/libgit2/src/hash/sha1/win32.h +0 -128
- data/vendor/libgit2/src/hash/sha1.h +0 -38
- data/vendor/libgit2/src/hash.c +0 -110
- data/vendor/libgit2/src/hash.h +0 -46
- data/vendor/libgit2/src/message.h +0 -17
- data/vendor/libgit2/src/net.c +0 -540
- data/vendor/libgit2/src/oid.h +0 -51
- data/vendor/libgit2/src/remote.h +0 -55
- data/vendor/libgit2/src/sysdir.c +0 -347
- data/vendor/libgit2/src/win32/findfile.c +0 -230
- data/vendor/libgit2/src/win32/findfile.h +0 -19
- /data/vendor/libgit2/src/{win32 → cli/win32}/precompiled.c +0 -0
- /data/vendor/libgit2/src/{attr.h → libgit2/attr.h} +0 -0
- /data/vendor/libgit2/src/{attrcache.h → libgit2/attrcache.h} +0 -0
- /data/vendor/libgit2/src/{blame.h → libgit2/blame.h} +0 -0
- /data/vendor/libgit2/src/{blame_git.h → libgit2/blame_git.h} +0 -0
- /data/vendor/libgit2/src/{cache.c → libgit2/cache.c} +0 -0
- /data/vendor/libgit2/src/{cache.h → libgit2/cache.h} +0 -0
- /data/vendor/libgit2/src/{checkout.h → libgit2/checkout.h} +0 -0
- /data/vendor/libgit2/src/{clone.h → libgit2/clone.h} +0 -0
- /data/vendor/libgit2/src/{commit_list.h → libgit2/commit_list.h} +0 -0
- /data/vendor/libgit2/src/{config_backend.h → libgit2/config_backend.h} +0 -0
- /data/vendor/libgit2/src/{config_cache.c → libgit2/config_cache.c} +0 -0
- /data/vendor/libgit2/src/{config_entries.c → libgit2/config_entries.c} +0 -0
- /data/vendor/libgit2/src/{config_entries.h → libgit2/config_entries.h} +0 -0
- /data/vendor/libgit2/src/{config_parse.h → libgit2/config_parse.h} +0 -0
- /data/vendor/libgit2/src/{config_snapshot.c → libgit2/config_snapshot.c} +0 -0
- /data/vendor/libgit2/src/{delta.c → libgit2/delta.c} +0 -0
- /data/vendor/libgit2/src/{delta.h → libgit2/delta.h} +0 -0
- /data/vendor/libgit2/src/{diff_file.h → libgit2/diff_file.h} +0 -0
- /data/vendor/libgit2/src/{diff_parse.c → libgit2/diff_parse.c} +0 -0
- /data/vendor/libgit2/src/{diff_parse.h → libgit2/diff_parse.h} +0 -0
- /data/vendor/libgit2/src/{diff_tform.h → libgit2/diff_tform.h} +0 -0
- /data/vendor/libgit2/src/{diff_xdiff.h → libgit2/diff_xdiff.h} +0 -0
- /data/vendor/libgit2/src/{fetchhead.h → libgit2/fetchhead.h} +0 -0
- /data/vendor/libgit2/src/{win32 → libgit2}/git2.rc +0 -0
- /data/vendor/libgit2/src/{graph.c → libgit2/graph.c} +0 -0
- /data/vendor/libgit2/src/{hashsig.c → libgit2/hashsig.c} +0 -0
- /data/vendor/libgit2/src/{idxmap.c → libgit2/idxmap.c} +0 -0
- /data/vendor/libgit2/src/{idxmap.h → libgit2/idxmap.h} +0 -0
- /data/vendor/libgit2/src/{indexer.h → libgit2/indexer.h} +0 -0
- /data/vendor/libgit2/src/{libgit2.h → libgit2/libgit2.h} +0 -0
- /data/vendor/libgit2/src/{mailmap.h → libgit2/mailmap.h} +0 -0
- /data/vendor/libgit2/src/{merge_driver.h → libgit2/merge_driver.h} +0 -0
- /data/vendor/libgit2/src/{notes.h → libgit2/notes.h} +0 -0
- /data/vendor/libgit2/src/{object_api.c → libgit2/object_api.c} +0 -0
- /data/vendor/libgit2/src/{offmap.c → libgit2/offmap.c} +0 -0
- /data/vendor/libgit2/src/{offmap.h → libgit2/offmap.h} +0 -0
- /data/vendor/libgit2/src/{oidarray.c → libgit2/oidarray.c} +0 -0
- /data/vendor/libgit2/src/{oidarray.h → libgit2/oidarray.h} +0 -0
- /data/vendor/libgit2/src/{oidmap.h → libgit2/oidmap.h} +0 -0
- /data/vendor/libgit2/src/{parse.h → libgit2/parse.h} +0 -0
- /data/vendor/libgit2/src/{patch_parse.h → libgit2/patch_parse.h} +0 -0
- /data/vendor/libgit2/src/{refdb.c → libgit2/refdb.c} +0 -0
- /data/vendor/libgit2/src/{refdb.h → libgit2/refdb.h} +0 -0
- /data/vendor/libgit2/src/{repo_template.h → libgit2/repo_template.h} +0 -0
- /data/vendor/libgit2/src/{revwalk.h → libgit2/revwalk.h} +0 -0
- /data/vendor/libgit2/src/{settings.h → libgit2/settings.h} +0 -0
- /data/vendor/libgit2/src/{status.h → libgit2/status.h} +0 -0
- /data/vendor/libgit2/src/{stream.h → libgit2/stream.h} +0 -0
- /data/vendor/libgit2/src/{streams → libgit2/streams}/mbedtls.h +0 -0
- /data/vendor/libgit2/src/{streams → libgit2/streams}/openssl.h +0 -0
- /data/vendor/libgit2/src/{streams → libgit2/streams}/openssl_legacy.c +0 -0
- /data/vendor/libgit2/src/{streams → libgit2/streams}/openssl_legacy.h +0 -0
- /data/vendor/libgit2/src/{streams → libgit2/streams}/registry.c +0 -0
- /data/vendor/libgit2/src/{streams → libgit2/streams}/registry.h +0 -0
- /data/vendor/libgit2/src/{streams → libgit2/streams}/socket.h +0 -0
- /data/vendor/libgit2/src/{streams → libgit2/streams}/stransport.c +0 -0
- /data/vendor/libgit2/src/{streams → libgit2/streams}/stransport.h +0 -0
- /data/vendor/libgit2/src/{streams → libgit2/streams}/tls.c +0 -0
- /data/vendor/libgit2/src/{streams → libgit2/streams}/tls.h +0 -0
- /data/vendor/libgit2/src/{transaction.h → libgit2/transaction.h} +0 -0
- /data/vendor/libgit2/src/{transports → libgit2/transports}/auth_negotiate.h +0 -0
- /data/vendor/libgit2/src/{transports → libgit2/transports}/credential.c +0 -0
- /data/vendor/libgit2/src/{transports → libgit2/transports}/credential_helpers.c +0 -0
- /data/vendor/libgit2/src/{transports → libgit2/transports}/ssh.h +0 -0
- /data/vendor/libgit2/src/{userdiff.h → libgit2/userdiff.h} +0 -0
- /data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xdiffi.h +0 -0
- /data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xemit.h +0 -0
- /data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xmacros.h +0 -0
- /data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xprepare.h +0 -0
- /data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xtypes.h +0 -0
- /data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xutils.h +0 -0
- /data/vendor/libgit2/src/{alloc.c → util/alloc.c} +0 -0
- /data/vendor/libgit2/src/{alloc.h → util/alloc.h} +0 -0
- /data/vendor/libgit2/src/{allocators → util/allocators}/failalloc.c +0 -0
- /data/vendor/libgit2/src/{allocators → util/allocators}/stdalloc.c +0 -0
- /data/vendor/libgit2/src/{allocators → util/allocators}/win32_leakcheck.c +0 -0
- /data/vendor/libgit2/src/{bitvec.h → util/bitvec.h} +0 -0
- /data/vendor/libgit2/src/{hash/sha1 → util/hash}/sha1dc/sha1.h +0 -0
- /data/vendor/libgit2/src/{hash/sha1 → util/hash}/sha1dc/ubc_check.c +0 -0
- /data/vendor/libgit2/src/{hash/sha1 → util/hash}/sha1dc/ubc_check.h +0 -0
- /data/vendor/libgit2/src/{integer.h → util/integer.h} +0 -0
- /data/vendor/libgit2/src/{pool.c → util/pool.c} +0 -0
- /data/vendor/libgit2/src/{pqueue.c → util/pqueue.c} +0 -0
- /data/vendor/libgit2/src/{strmap.c → util/strmap.c} +0 -0
- /data/vendor/libgit2/src/{strnlen.h → util/strnlen.h} +0 -0
- /data/vendor/libgit2/src/{unix → util/unix}/pthread.h +0 -0
- /data/vendor/libgit2/src/{varint.c → util/varint.c} +0 -0
- /data/vendor/libgit2/src/{vector.c → util/vector.c} +0 -0
- /data/vendor/libgit2/src/{wildmatch.c → util/wildmatch.c} +0 -0
- /data/vendor/libgit2/src/{win32 → util/win32}/dir.c +0 -0
- /data/vendor/libgit2/src/{win32 → util/win32}/error.c +0 -0
- /data/vendor/libgit2/src/{win32 → util/win32}/mingw-compat.h +0 -0
- /data/vendor/libgit2/src/{win32 → util/win32}/msvc-compat.h +0 -0
- /data/vendor/libgit2/src/{win32 → util/win32}/reparse.h +0 -0
- /data/vendor/libgit2/src/{win32 → util/win32}/thread.c +0 -0
- /data/vendor/libgit2/src/{win32 → util/win32}/utf-conv.c +0 -0
- /data/vendor/libgit2/src/{win32 → util/win32}/version.h +0 -0
- /data/vendor/libgit2/src/{win32 → util/win32}/w32_common.h +0 -0
- /data/vendor/libgit2/src/{win32 → util/win32}/w32_util.c +0 -0
- /data/vendor/libgit2/src/{win32 → util/win32}/win32-compat.h +0 -0
@@ -0,0 +1,1003 @@
|
|
1
|
+
/*
|
2
|
+
* Copyright (C) the libgit2 contributors. All rights reserved.
|
3
|
+
*
|
4
|
+
* This file is part of libgit2, distributed under the GNU GPL v2 with
|
5
|
+
* a Linking Exception. For full terms see the included COPYING file.
|
6
|
+
*/
|
7
|
+
|
8
|
+
#include "net.h"
|
9
|
+
|
10
|
+
#include <ctype.h>
|
11
|
+
|
12
|
+
#include "posix.h"
|
13
|
+
#include "str.h"
|
14
|
+
#include "http_parser.h"
|
15
|
+
#include "runtime.h"
|
16
|
+
|
17
|
+
#define DEFAULT_PORT_HTTP "80"
|
18
|
+
#define DEFAULT_PORT_HTTPS "443"
|
19
|
+
#define DEFAULT_PORT_GIT "9418"
|
20
|
+
#define DEFAULT_PORT_SSH "22"
|
21
|
+
|
22
|
+
bool git_net_str_is_url(const char *str)
|
23
|
+
{
|
24
|
+
const char *c;
|
25
|
+
|
26
|
+
for (c = str; *c; c++) {
|
27
|
+
if (*c == ':' && *(c+1) == '/' && *(c+2) == '/')
|
28
|
+
return true;
|
29
|
+
|
30
|
+
if ((*c < 'a' || *c > 'z') &&
|
31
|
+
(*c < 'A' || *c > 'Z') &&
|
32
|
+
(*c < '0' || *c > '9') &&
|
33
|
+
(*c != '+' && *c != '-' && *c != '.'))
|
34
|
+
break;
|
35
|
+
}
|
36
|
+
|
37
|
+
return false;
|
38
|
+
}
|
39
|
+
|
40
|
+
static const char *default_port_for_scheme(const char *scheme)
|
41
|
+
{
|
42
|
+
if (strcmp(scheme, "http") == 0)
|
43
|
+
return DEFAULT_PORT_HTTP;
|
44
|
+
else if (strcmp(scheme, "https") == 0)
|
45
|
+
return DEFAULT_PORT_HTTPS;
|
46
|
+
else if (strcmp(scheme, "git") == 0)
|
47
|
+
return DEFAULT_PORT_GIT;
|
48
|
+
else if (strcmp(scheme, "ssh") == 0 ||
|
49
|
+
strcmp(scheme, "ssh+git") == 0 ||
|
50
|
+
strcmp(scheme, "git+ssh") == 0)
|
51
|
+
return DEFAULT_PORT_SSH;
|
52
|
+
|
53
|
+
return NULL;
|
54
|
+
}
|
55
|
+
|
56
|
+
int git_net_url_dup(git_net_url *out, git_net_url *in)
|
57
|
+
{
|
58
|
+
if (in->scheme) {
|
59
|
+
out->scheme = git__strdup(in->scheme);
|
60
|
+
GIT_ERROR_CHECK_ALLOC(out->scheme);
|
61
|
+
}
|
62
|
+
|
63
|
+
if (in->host) {
|
64
|
+
out->host = git__strdup(in->host);
|
65
|
+
GIT_ERROR_CHECK_ALLOC(out->host);
|
66
|
+
}
|
67
|
+
|
68
|
+
if (in->port) {
|
69
|
+
out->port = git__strdup(in->port);
|
70
|
+
GIT_ERROR_CHECK_ALLOC(out->port);
|
71
|
+
}
|
72
|
+
|
73
|
+
if (in->path) {
|
74
|
+
out->path = git__strdup(in->path);
|
75
|
+
GIT_ERROR_CHECK_ALLOC(out->path);
|
76
|
+
}
|
77
|
+
|
78
|
+
if (in->query) {
|
79
|
+
out->query = git__strdup(in->query);
|
80
|
+
GIT_ERROR_CHECK_ALLOC(out->query);
|
81
|
+
}
|
82
|
+
|
83
|
+
if (in->username) {
|
84
|
+
out->username = git__strdup(in->username);
|
85
|
+
GIT_ERROR_CHECK_ALLOC(out->username);
|
86
|
+
}
|
87
|
+
|
88
|
+
if (in->password) {
|
89
|
+
out->password = git__strdup(in->password);
|
90
|
+
GIT_ERROR_CHECK_ALLOC(out->password);
|
91
|
+
}
|
92
|
+
|
93
|
+
return 0;
|
94
|
+
}
|
95
|
+
|
96
|
+
static int url_invalid(const char *message)
|
97
|
+
{
|
98
|
+
git_error_set(GIT_ERROR_NET, "invalid url: %s", message);
|
99
|
+
return GIT_EINVALIDSPEC;
|
100
|
+
}
|
101
|
+
|
102
|
+
static int url_parse_authority(
|
103
|
+
const char **user_start, size_t *user_len,
|
104
|
+
const char **password_start, size_t *password_len,
|
105
|
+
const char **host_start, size_t *host_len,
|
106
|
+
const char **port_start, size_t *port_len,
|
107
|
+
const char *authority_start, size_t len,
|
108
|
+
const char *scheme_start, size_t scheme_len)
|
109
|
+
{
|
110
|
+
const char *c, *hostport_end, *host_end = NULL,
|
111
|
+
*userpass_end, *user_end = NULL;
|
112
|
+
|
113
|
+
enum {
|
114
|
+
HOSTPORT, HOST, IPV6, HOST_END, USERPASS, USER
|
115
|
+
} state = HOSTPORT;
|
116
|
+
|
117
|
+
if (len == 0)
|
118
|
+
return 0;
|
119
|
+
|
120
|
+
/*
|
121
|
+
* walk the authority backwards so that we can parse google code's
|
122
|
+
* ssh urls that are not rfc compliant and allow @ in the username
|
123
|
+
*/
|
124
|
+
for (hostport_end = authority_start + len, c = hostport_end - 1;
|
125
|
+
c >= authority_start && !user_end;
|
126
|
+
c--) {
|
127
|
+
switch (state) {
|
128
|
+
case HOSTPORT:
|
129
|
+
if (*c == ':') {
|
130
|
+
*port_start = c + 1;
|
131
|
+
*port_len = hostport_end - *port_start;
|
132
|
+
host_end = c;
|
133
|
+
state = HOST;
|
134
|
+
break;
|
135
|
+
}
|
136
|
+
|
137
|
+
/*
|
138
|
+
* if we've only seen digits then we don't know
|
139
|
+
* if we're parsing just a host or a host and port.
|
140
|
+
* if we see a non-digit, then we're in a host,
|
141
|
+
* otherwise, fall through to possibly match the
|
142
|
+
* "@" (user/host separator).
|
143
|
+
*/
|
144
|
+
|
145
|
+
if (*c < '0' || *c > '9') {
|
146
|
+
host_end = hostport_end;
|
147
|
+
state = HOST;
|
148
|
+
}
|
149
|
+
|
150
|
+
/* fall through */
|
151
|
+
|
152
|
+
case HOST:
|
153
|
+
if (*c == ']' && host_end == c + 1) {
|
154
|
+
host_end = c;
|
155
|
+
state = IPV6;
|
156
|
+
}
|
157
|
+
|
158
|
+
else if (*c == '@') {
|
159
|
+
*host_start = c + 1;
|
160
|
+
*host_len = host_end ? host_end - *host_start :
|
161
|
+
hostport_end - *host_start;
|
162
|
+
userpass_end = c;
|
163
|
+
state = USERPASS;
|
164
|
+
}
|
165
|
+
|
166
|
+
else if (*c == '[' || *c == ']' || *c == ':') {
|
167
|
+
return url_invalid("malformed hostname");
|
168
|
+
}
|
169
|
+
|
170
|
+
break;
|
171
|
+
|
172
|
+
case IPV6:
|
173
|
+
if (*c == '[') {
|
174
|
+
*host_start = c + 1;
|
175
|
+
*host_len = host_end - *host_start;
|
176
|
+
state = HOST_END;
|
177
|
+
}
|
178
|
+
|
179
|
+
else if ((*c < '0' || *c > '9') &&
|
180
|
+
(*c < 'a' || *c > 'f') &&
|
181
|
+
(*c < 'A' || *c > 'F') &&
|
182
|
+
(*c != ':')) {
|
183
|
+
return url_invalid("malformed hostname");
|
184
|
+
}
|
185
|
+
|
186
|
+
break;
|
187
|
+
|
188
|
+
case HOST_END:
|
189
|
+
if (*c == '@') {
|
190
|
+
userpass_end = c;
|
191
|
+
state = USERPASS;
|
192
|
+
break;
|
193
|
+
}
|
194
|
+
|
195
|
+
return url_invalid("malformed hostname");
|
196
|
+
|
197
|
+
case USERPASS:
|
198
|
+
if (*c == '@' &&
|
199
|
+
strncasecmp(scheme_start, "ssh", scheme_len))
|
200
|
+
return url_invalid("malformed hostname");
|
201
|
+
|
202
|
+
if (*c == ':') {
|
203
|
+
*password_start = c + 1;
|
204
|
+
*password_len = userpass_end - *password_start;
|
205
|
+
user_end = c;
|
206
|
+
state = USER;
|
207
|
+
break;
|
208
|
+
}
|
209
|
+
|
210
|
+
break;
|
211
|
+
|
212
|
+
default:
|
213
|
+
GIT_ASSERT(!"unhandled state");
|
214
|
+
}
|
215
|
+
}
|
216
|
+
|
217
|
+
switch (state) {
|
218
|
+
case HOSTPORT:
|
219
|
+
*host_start = authority_start;
|
220
|
+
*host_len = (hostport_end - *host_start);
|
221
|
+
break;
|
222
|
+
case HOST:
|
223
|
+
*host_start = authority_start;
|
224
|
+
*host_len = (host_end - *host_start);
|
225
|
+
break;
|
226
|
+
case IPV6:
|
227
|
+
return url_invalid("malformed hostname");
|
228
|
+
case HOST_END:
|
229
|
+
break;
|
230
|
+
case USERPASS:
|
231
|
+
*user_start = authority_start;
|
232
|
+
*user_len = (userpass_end - *user_start);
|
233
|
+
break;
|
234
|
+
case USER:
|
235
|
+
*user_start = authority_start;
|
236
|
+
*user_len = (user_end - *user_start);
|
237
|
+
break;
|
238
|
+
default:
|
239
|
+
GIT_ASSERT(!"unhandled state");
|
240
|
+
}
|
241
|
+
|
242
|
+
return 0;
|
243
|
+
}
|
244
|
+
|
245
|
+
int git_net_url_parse(git_net_url *url, const char *given)
|
246
|
+
{
|
247
|
+
const char *c, *scheme_start, *authority_start, *user_start,
|
248
|
+
*password_start, *host_start, *port_start, *path_start,
|
249
|
+
*query_start, *fragment_start, *default_port;
|
250
|
+
git_str scheme = GIT_STR_INIT, user = GIT_STR_INIT,
|
251
|
+
password = GIT_STR_INIT, host = GIT_STR_INIT,
|
252
|
+
port = GIT_STR_INIT, path = GIT_STR_INIT,
|
253
|
+
query = GIT_STR_INIT, fragment = GIT_STR_INIT;
|
254
|
+
size_t scheme_len = 0, user_len = 0, password_len = 0, host_len = 0,
|
255
|
+
port_len = 0, path_len = 0, query_len = 0, fragment_len = 0;
|
256
|
+
bool hierarchical = false;
|
257
|
+
int error = 0;
|
258
|
+
|
259
|
+
enum {
|
260
|
+
SCHEME,
|
261
|
+
AUTHORITY_START, AUTHORITY,
|
262
|
+
PATH_START, PATH,
|
263
|
+
QUERY,
|
264
|
+
FRAGMENT
|
265
|
+
} state = SCHEME;
|
266
|
+
|
267
|
+
memset(url, 0, sizeof(git_net_url));
|
268
|
+
|
269
|
+
for (c = scheme_start = given; *c; c++) {
|
270
|
+
switch (state) {
|
271
|
+
case SCHEME:
|
272
|
+
if (*c == ':') {
|
273
|
+
scheme_len = (c - scheme_start);
|
274
|
+
|
275
|
+
if (*(c+1) == '/' && *(c+2) == '/') {
|
276
|
+
c += 2;
|
277
|
+
hierarchical = true;
|
278
|
+
state = AUTHORITY_START;
|
279
|
+
} else {
|
280
|
+
state = PATH_START;
|
281
|
+
}
|
282
|
+
} else if ((*c < 'A' || *c > 'Z') &&
|
283
|
+
(*c < 'a' || *c > 'z') &&
|
284
|
+
(*c < '0' || *c > '9') &&
|
285
|
+
(*c != '+' && *c != '-' && *c != '.')) {
|
286
|
+
/*
|
287
|
+
* an illegal scheme character means that we
|
288
|
+
* were just given a relative path
|
289
|
+
*/
|
290
|
+
path_start = given;
|
291
|
+
state = PATH;
|
292
|
+
break;
|
293
|
+
}
|
294
|
+
break;
|
295
|
+
|
296
|
+
case AUTHORITY_START:
|
297
|
+
authority_start = c;
|
298
|
+
state = AUTHORITY;
|
299
|
+
|
300
|
+
/* fall through */
|
301
|
+
|
302
|
+
case AUTHORITY:
|
303
|
+
if (*c != '/')
|
304
|
+
break;
|
305
|
+
|
306
|
+
/*
|
307
|
+
* authority is sufficiently complex that we parse
|
308
|
+
* it separately
|
309
|
+
*/
|
310
|
+
if ((error = url_parse_authority(
|
311
|
+
&user_start, &user_len,
|
312
|
+
&password_start,&password_len,
|
313
|
+
&host_start, &host_len,
|
314
|
+
&port_start, &port_len,
|
315
|
+
authority_start, (c - authority_start),
|
316
|
+
scheme_start, scheme_len)) < 0)
|
317
|
+
goto done;
|
318
|
+
|
319
|
+
/* fall through */
|
320
|
+
|
321
|
+
case PATH_START:
|
322
|
+
path_start = c;
|
323
|
+
state = PATH;
|
324
|
+
/* fall through */
|
325
|
+
|
326
|
+
case PATH:
|
327
|
+
switch (*c) {
|
328
|
+
case '?':
|
329
|
+
path_len = (c - path_start);
|
330
|
+
query_start = c + 1;
|
331
|
+
state = QUERY;
|
332
|
+
break;
|
333
|
+
case '#':
|
334
|
+
path_len = (c - path_start);
|
335
|
+
fragment_start = c + 1;
|
336
|
+
state = FRAGMENT;
|
337
|
+
break;
|
338
|
+
}
|
339
|
+
break;
|
340
|
+
|
341
|
+
case QUERY:
|
342
|
+
if (*c == '#') {
|
343
|
+
query_len = (c - query_start);
|
344
|
+
fragment_start = c + 1;
|
345
|
+
state = FRAGMENT;
|
346
|
+
}
|
347
|
+
break;
|
348
|
+
|
349
|
+
case FRAGMENT:
|
350
|
+
break;
|
351
|
+
|
352
|
+
default:
|
353
|
+
GIT_ASSERT(!"unhandled state");
|
354
|
+
}
|
355
|
+
}
|
356
|
+
|
357
|
+
switch (state) {
|
358
|
+
case SCHEME:
|
359
|
+
/*
|
360
|
+
* if we never saw a ':' then we were given a relative
|
361
|
+
* path, not a bare scheme
|
362
|
+
*/
|
363
|
+
path_start = given;
|
364
|
+
path_len = (c - scheme_start);
|
365
|
+
break;
|
366
|
+
case AUTHORITY_START:
|
367
|
+
break;
|
368
|
+
case AUTHORITY:
|
369
|
+
if ((error = url_parse_authority(
|
370
|
+
&user_start, &user_len,
|
371
|
+
&password_start,&password_len,
|
372
|
+
&host_start, &host_len,
|
373
|
+
&port_start, &port_len,
|
374
|
+
authority_start, (c - authority_start),
|
375
|
+
scheme_start, scheme_len)) < 0)
|
376
|
+
goto done;
|
377
|
+
break;
|
378
|
+
case PATH_START:
|
379
|
+
break;
|
380
|
+
case PATH:
|
381
|
+
path_len = (c - path_start);
|
382
|
+
break;
|
383
|
+
case QUERY:
|
384
|
+
query_len = (c - query_start);
|
385
|
+
break;
|
386
|
+
case FRAGMENT:
|
387
|
+
fragment_len = (c - fragment_start);
|
388
|
+
break;
|
389
|
+
default:
|
390
|
+
GIT_ASSERT(!"unhandled state");
|
391
|
+
}
|
392
|
+
|
393
|
+
if (scheme_len) {
|
394
|
+
if ((error = git_str_put(&scheme, scheme_start, scheme_len)) < 0)
|
395
|
+
goto done;
|
396
|
+
|
397
|
+
git__strntolower(scheme.ptr, scheme.size);
|
398
|
+
}
|
399
|
+
|
400
|
+
if (user_len &&
|
401
|
+
(error = git_str_decode_percent(&user, user_start, user_len)) < 0)
|
402
|
+
goto done;
|
403
|
+
|
404
|
+
if (password_len &&
|
405
|
+
(error = git_str_decode_percent(&password, password_start, password_len)) < 0)
|
406
|
+
goto done;
|
407
|
+
|
408
|
+
if (host_len &&
|
409
|
+
(error = git_str_decode_percent(&host, host_start, host_len)) < 0)
|
410
|
+
goto done;
|
411
|
+
|
412
|
+
if (port_len)
|
413
|
+
error = git_str_put(&port, port_start, port_len);
|
414
|
+
else if (scheme_len && (default_port = default_port_for_scheme(scheme.ptr)) != NULL)
|
415
|
+
error = git_str_puts(&port, default_port);
|
416
|
+
|
417
|
+
if (error < 0)
|
418
|
+
goto done;
|
419
|
+
|
420
|
+
if (path_len)
|
421
|
+
error = git_str_put(&path, path_start, path_len);
|
422
|
+
else if (hierarchical)
|
423
|
+
error = git_str_puts(&path, "/");
|
424
|
+
|
425
|
+
if (error < 0)
|
426
|
+
goto done;
|
427
|
+
|
428
|
+
if (query_len &&
|
429
|
+
(error = git_str_decode_percent(&query, query_start, query_len)) < 0)
|
430
|
+
goto done;
|
431
|
+
|
432
|
+
if (fragment_len &&
|
433
|
+
(error = git_str_decode_percent(&fragment, fragment_start, fragment_len)) < 0)
|
434
|
+
goto done;
|
435
|
+
|
436
|
+
url->scheme = git_str_detach(&scheme);
|
437
|
+
url->host = git_str_detach(&host);
|
438
|
+
url->port = git_str_detach(&port);
|
439
|
+
url->path = git_str_detach(&path);
|
440
|
+
url->query = git_str_detach(&query);
|
441
|
+
url->fragment = git_str_detach(&fragment);
|
442
|
+
url->username = git_str_detach(&user);
|
443
|
+
url->password = git_str_detach(&password);
|
444
|
+
|
445
|
+
error = 0;
|
446
|
+
|
447
|
+
done:
|
448
|
+
git_str_dispose(&scheme);
|
449
|
+
git_str_dispose(&user);
|
450
|
+
git_str_dispose(&password);
|
451
|
+
git_str_dispose(&host);
|
452
|
+
git_str_dispose(&port);
|
453
|
+
git_str_dispose(&path);
|
454
|
+
git_str_dispose(&query);
|
455
|
+
git_str_dispose(&fragment);
|
456
|
+
|
457
|
+
return error;
|
458
|
+
}
|
459
|
+
|
460
|
+
static int scp_invalid(const char *message)
|
461
|
+
{
|
462
|
+
git_error_set(GIT_ERROR_NET, "invalid scp-style path: %s", message);
|
463
|
+
return GIT_EINVALIDSPEC;
|
464
|
+
}
|
465
|
+
|
466
|
+
static bool is_ipv6(const char *str)
|
467
|
+
{
|
468
|
+
const char *c;
|
469
|
+
size_t colons = 0;
|
470
|
+
|
471
|
+
if (*str++ != '[')
|
472
|
+
return false;
|
473
|
+
|
474
|
+
for (c = str; *c; c++) {
|
475
|
+
if (*c == ':')
|
476
|
+
colons++;
|
477
|
+
|
478
|
+
if (*c == ']')
|
479
|
+
return (colons > 1);
|
480
|
+
|
481
|
+
if (*c != ':' &&
|
482
|
+
(*c < '0' || *c > '9') &&
|
483
|
+
(*c < 'a' || *c > 'f') &&
|
484
|
+
(*c < 'A' || *c > 'F'))
|
485
|
+
return false;
|
486
|
+
}
|
487
|
+
|
488
|
+
return false;
|
489
|
+
}
|
490
|
+
|
491
|
+
static bool has_at(const char *str)
|
492
|
+
{
|
493
|
+
const char *c;
|
494
|
+
|
495
|
+
for (c = str; *c; c++) {
|
496
|
+
if (*c == '@')
|
497
|
+
return true;
|
498
|
+
|
499
|
+
if (*c == ':')
|
500
|
+
break;
|
501
|
+
}
|
502
|
+
|
503
|
+
return false;
|
504
|
+
}
|
505
|
+
|
506
|
+
int git_net_url_parse_scp(git_net_url *url, const char *given)
|
507
|
+
{
|
508
|
+
const char *default_port = default_port_for_scheme("ssh");
|
509
|
+
const char *c, *user, *host, *port, *path = NULL;
|
510
|
+
size_t user_len = 0, host_len = 0, port_len = 0;
|
511
|
+
unsigned short bracket = 0;
|
512
|
+
|
513
|
+
enum {
|
514
|
+
NONE,
|
515
|
+
USER,
|
516
|
+
HOST_START, HOST, HOST_END,
|
517
|
+
IPV6, IPV6_END,
|
518
|
+
PORT_START, PORT, PORT_END,
|
519
|
+
PATH_START
|
520
|
+
} state = NONE;
|
521
|
+
|
522
|
+
memset(url, 0, sizeof(git_net_url));
|
523
|
+
|
524
|
+
for (c = given; *c && !path; c++) {
|
525
|
+
switch (state) {
|
526
|
+
case NONE:
|
527
|
+
switch (*c) {
|
528
|
+
case '@':
|
529
|
+
return scp_invalid("unexpected '@'");
|
530
|
+
case ':':
|
531
|
+
return scp_invalid("unexpected ':'");
|
532
|
+
case '[':
|
533
|
+
if (is_ipv6(c)) {
|
534
|
+
state = IPV6;
|
535
|
+
host = c;
|
536
|
+
} else if (bracket++ > 1) {
|
537
|
+
return scp_invalid("unexpected '['");
|
538
|
+
}
|
539
|
+
break;
|
540
|
+
default:
|
541
|
+
if (has_at(c)) {
|
542
|
+
state = USER;
|
543
|
+
user = c;
|
544
|
+
} else {
|
545
|
+
state = HOST;
|
546
|
+
host = c;
|
547
|
+
}
|
548
|
+
break;
|
549
|
+
}
|
550
|
+
break;
|
551
|
+
|
552
|
+
case USER:
|
553
|
+
if (*c == '@') {
|
554
|
+
user_len = (c - user);
|
555
|
+
state = HOST_START;
|
556
|
+
}
|
557
|
+
break;
|
558
|
+
|
559
|
+
case HOST_START:
|
560
|
+
state = (*c == '[') ? IPV6 : HOST;
|
561
|
+
host = c;
|
562
|
+
break;
|
563
|
+
|
564
|
+
case HOST:
|
565
|
+
if (*c == ':') {
|
566
|
+
host_len = (c - host);
|
567
|
+
state = bracket ? PORT_START : PATH_START;
|
568
|
+
} else if (*c == ']') {
|
569
|
+
if (bracket-- == 0)
|
570
|
+
return scp_invalid("unexpected ']'");
|
571
|
+
|
572
|
+
host_len = (c - host);
|
573
|
+
state = HOST_END;
|
574
|
+
}
|
575
|
+
break;
|
576
|
+
|
577
|
+
case HOST_END:
|
578
|
+
if (*c != ':')
|
579
|
+
return scp_invalid("unexpected character after hostname");
|
580
|
+
state = PATH_START;
|
581
|
+
break;
|
582
|
+
|
583
|
+
case IPV6:
|
584
|
+
if (*c == ']')
|
585
|
+
state = IPV6_END;
|
586
|
+
break;
|
587
|
+
|
588
|
+
case IPV6_END:
|
589
|
+
if (*c != ':')
|
590
|
+
return scp_invalid("unexpected character after ipv6 address");
|
591
|
+
|
592
|
+
host_len = (c - host);
|
593
|
+
state = bracket ? PORT_START : PATH_START;
|
594
|
+
break;
|
595
|
+
|
596
|
+
case PORT_START:
|
597
|
+
port = c;
|
598
|
+
state = PORT;
|
599
|
+
break;
|
600
|
+
|
601
|
+
case PORT:
|
602
|
+
if (*c == ']') {
|
603
|
+
if (bracket-- == 0)
|
604
|
+
return scp_invalid("unexpected ']'");
|
605
|
+
|
606
|
+
port_len = c - port;
|
607
|
+
state = PORT_END;
|
608
|
+
}
|
609
|
+
break;
|
610
|
+
|
611
|
+
case PORT_END:
|
612
|
+
if (*c != ':')
|
613
|
+
return scp_invalid("unexpected character after ipv6 address");
|
614
|
+
|
615
|
+
state = PATH_START;
|
616
|
+
break;
|
617
|
+
|
618
|
+
case PATH_START:
|
619
|
+
path = c;
|
620
|
+
break;
|
621
|
+
|
622
|
+
default:
|
623
|
+
GIT_ASSERT(!"unhandled state");
|
624
|
+
}
|
625
|
+
}
|
626
|
+
|
627
|
+
if (!path)
|
628
|
+
return scp_invalid("path is required");
|
629
|
+
|
630
|
+
GIT_ERROR_CHECK_ALLOC(url->scheme = git__strdup("ssh"));
|
631
|
+
|
632
|
+
if (user_len)
|
633
|
+
GIT_ERROR_CHECK_ALLOC(url->username = git__strndup(user, user_len));
|
634
|
+
|
635
|
+
GIT_ASSERT(host_len);
|
636
|
+
GIT_ERROR_CHECK_ALLOC(url->host = git__strndup(host, host_len));
|
637
|
+
|
638
|
+
if (port_len)
|
639
|
+
GIT_ERROR_CHECK_ALLOC(url->port = git__strndup(port, port_len));
|
640
|
+
else
|
641
|
+
GIT_ERROR_CHECK_ALLOC(url->port = git__strdup(default_port));
|
642
|
+
|
643
|
+
GIT_ASSERT(path);
|
644
|
+
GIT_ERROR_CHECK_ALLOC(url->path = git__strdup(path));
|
645
|
+
|
646
|
+
return 0;
|
647
|
+
}
|
648
|
+
|
649
|
+
int git_net_url_parse_standard_or_scp(git_net_url *url, const char *given)
|
650
|
+
{
|
651
|
+
return git_net_str_is_url(given) ?
|
652
|
+
git_net_url_parse(url, given) :
|
653
|
+
git_net_url_parse_scp(url, given);
|
654
|
+
}
|
655
|
+
|
656
|
+
int git_net_url_joinpath(
|
657
|
+
git_net_url *out,
|
658
|
+
git_net_url *one,
|
659
|
+
const char *two)
|
660
|
+
{
|
661
|
+
git_str path = GIT_STR_INIT;
|
662
|
+
const char *query;
|
663
|
+
size_t one_len, two_len;
|
664
|
+
|
665
|
+
git_net_url_dispose(out);
|
666
|
+
|
667
|
+
if ((query = strchr(two, '?')) != NULL) {
|
668
|
+
two_len = query - two;
|
669
|
+
|
670
|
+
if (*(++query) != '\0') {
|
671
|
+
out->query = git__strdup(query);
|
672
|
+
GIT_ERROR_CHECK_ALLOC(out->query);
|
673
|
+
}
|
674
|
+
} else {
|
675
|
+
two_len = strlen(two);
|
676
|
+
}
|
677
|
+
|
678
|
+
/* Strip all trailing `/`s from the first path */
|
679
|
+
one_len = one->path ? strlen(one->path) : 0;
|
680
|
+
while (one_len && one->path[one_len - 1] == '/')
|
681
|
+
one_len--;
|
682
|
+
|
683
|
+
/* Strip all leading `/`s from the second path */
|
684
|
+
while (*two == '/') {
|
685
|
+
two++;
|
686
|
+
two_len--;
|
687
|
+
}
|
688
|
+
|
689
|
+
git_str_put(&path, one->path, one_len);
|
690
|
+
git_str_putc(&path, '/');
|
691
|
+
git_str_put(&path, two, two_len);
|
692
|
+
|
693
|
+
if (git_str_oom(&path))
|
694
|
+
return -1;
|
695
|
+
|
696
|
+
out->path = git_str_detach(&path);
|
697
|
+
|
698
|
+
if (one->scheme) {
|
699
|
+
out->scheme = git__strdup(one->scheme);
|
700
|
+
GIT_ERROR_CHECK_ALLOC(out->scheme);
|
701
|
+
}
|
702
|
+
|
703
|
+
if (one->host) {
|
704
|
+
out->host = git__strdup(one->host);
|
705
|
+
GIT_ERROR_CHECK_ALLOC(out->host);
|
706
|
+
}
|
707
|
+
|
708
|
+
if (one->port) {
|
709
|
+
out->port = git__strdup(one->port);
|
710
|
+
GIT_ERROR_CHECK_ALLOC(out->port);
|
711
|
+
}
|
712
|
+
|
713
|
+
if (one->username) {
|
714
|
+
out->username = git__strdup(one->username);
|
715
|
+
GIT_ERROR_CHECK_ALLOC(out->username);
|
716
|
+
}
|
717
|
+
|
718
|
+
if (one->password) {
|
719
|
+
out->password = git__strdup(one->password);
|
720
|
+
GIT_ERROR_CHECK_ALLOC(out->password);
|
721
|
+
}
|
722
|
+
|
723
|
+
return 0;
|
724
|
+
}
|
725
|
+
|
726
|
+
/*
|
727
|
+
* Some servers strip the query parameters from the Location header
|
728
|
+
* when sending a redirect. Others leave it in place.
|
729
|
+
* Check for both, starting with the stripped case first,
|
730
|
+
* since it appears to be more common.
|
731
|
+
*/
|
732
|
+
static void remove_service_suffix(
|
733
|
+
git_net_url *url,
|
734
|
+
const char *service_suffix)
|
735
|
+
{
|
736
|
+
const char *service_query = strchr(service_suffix, '?');
|
737
|
+
size_t full_suffix_len = strlen(service_suffix);
|
738
|
+
size_t suffix_len = service_query ?
|
739
|
+
(size_t)(service_query - service_suffix) : full_suffix_len;
|
740
|
+
size_t path_len = strlen(url->path);
|
741
|
+
ssize_t truncate = -1;
|
742
|
+
|
743
|
+
/*
|
744
|
+
* Check for a redirect without query parameters,
|
745
|
+
* like "/newloc/info/refs"'
|
746
|
+
*/
|
747
|
+
if (suffix_len && path_len >= suffix_len) {
|
748
|
+
size_t suffix_offset = path_len - suffix_len;
|
749
|
+
|
750
|
+
if (git__strncmp(url->path + suffix_offset, service_suffix, suffix_len) == 0 &&
|
751
|
+
(!service_query || git__strcmp(url->query, service_query + 1) == 0)) {
|
752
|
+
truncate = suffix_offset;
|
753
|
+
}
|
754
|
+
}
|
755
|
+
|
756
|
+
/*
|
757
|
+
* If we haven't already found where to truncate to remove the
|
758
|
+
* suffix, check for a redirect with query parameters, like
|
759
|
+
* "/newloc/info/refs?service=git-upload-pack"
|
760
|
+
*/
|
761
|
+
if (truncate < 0 && git__suffixcmp(url->path, service_suffix) == 0)
|
762
|
+
truncate = path_len - full_suffix_len;
|
763
|
+
|
764
|
+
/* Ensure we leave a minimum of '/' as the path */
|
765
|
+
if (truncate == 0)
|
766
|
+
truncate++;
|
767
|
+
|
768
|
+
if (truncate > 0) {
|
769
|
+
url->path[truncate] = '\0';
|
770
|
+
|
771
|
+
git__free(url->query);
|
772
|
+
url->query = NULL;
|
773
|
+
}
|
774
|
+
}
|
775
|
+
|
776
|
+
int git_net_url_apply_redirect(
|
777
|
+
git_net_url *url,
|
778
|
+
const char *redirect_location,
|
779
|
+
bool allow_offsite,
|
780
|
+
const char *service_suffix)
|
781
|
+
{
|
782
|
+
git_net_url tmp = GIT_NET_URL_INIT;
|
783
|
+
int error = 0;
|
784
|
+
|
785
|
+
GIT_ASSERT(url);
|
786
|
+
GIT_ASSERT(redirect_location);
|
787
|
+
|
788
|
+
if (redirect_location[0] == '/') {
|
789
|
+
git__free(url->path);
|
790
|
+
|
791
|
+
if ((url->path = git__strdup(redirect_location)) == NULL) {
|
792
|
+
error = -1;
|
793
|
+
goto done;
|
794
|
+
}
|
795
|
+
} else {
|
796
|
+
git_net_url *original = url;
|
797
|
+
|
798
|
+
if ((error = git_net_url_parse(&tmp, redirect_location)) < 0)
|
799
|
+
goto done;
|
800
|
+
|
801
|
+
/* Validate that this is a legal redirection */
|
802
|
+
|
803
|
+
if (original->scheme &&
|
804
|
+
strcmp(original->scheme, tmp.scheme) != 0 &&
|
805
|
+
strcmp(tmp.scheme, "https") != 0) {
|
806
|
+
git_error_set(GIT_ERROR_NET, "cannot redirect from '%s' to '%s'",
|
807
|
+
original->scheme, tmp.scheme);
|
808
|
+
|
809
|
+
error = -1;
|
810
|
+
goto done;
|
811
|
+
}
|
812
|
+
|
813
|
+
if (original->host &&
|
814
|
+
!allow_offsite &&
|
815
|
+
git__strcasecmp(original->host, tmp.host) != 0) {
|
816
|
+
git_error_set(GIT_ERROR_NET, "cannot redirect from '%s' to '%s'",
|
817
|
+
original->host, tmp.host);
|
818
|
+
|
819
|
+
error = -1;
|
820
|
+
goto done;
|
821
|
+
}
|
822
|
+
|
823
|
+
git_net_url_swap(url, &tmp);
|
824
|
+
}
|
825
|
+
|
826
|
+
/* Remove the service suffix if it was given to us */
|
827
|
+
if (service_suffix)
|
828
|
+
remove_service_suffix(url, service_suffix);
|
829
|
+
|
830
|
+
done:
|
831
|
+
git_net_url_dispose(&tmp);
|
832
|
+
return error;
|
833
|
+
}
|
834
|
+
|
835
|
+
bool git_net_url_valid(git_net_url *url)
|
836
|
+
{
|
837
|
+
return (url->host && url->port && url->path);
|
838
|
+
}
|
839
|
+
|
840
|
+
bool git_net_url_is_default_port(git_net_url *url)
|
841
|
+
{
|
842
|
+
const char *default_port;
|
843
|
+
|
844
|
+
if (url->scheme && (default_port = default_port_for_scheme(url->scheme)) != NULL)
|
845
|
+
return (strcmp(url->port, default_port) == 0);
|
846
|
+
else
|
847
|
+
return false;
|
848
|
+
}
|
849
|
+
|
850
|
+
bool git_net_url_is_ipv6(git_net_url *url)
|
851
|
+
{
|
852
|
+
return (strchr(url->host, ':') != NULL);
|
853
|
+
}
|
854
|
+
|
855
|
+
void git_net_url_swap(git_net_url *a, git_net_url *b)
|
856
|
+
{
|
857
|
+
git_net_url tmp = GIT_NET_URL_INIT;
|
858
|
+
|
859
|
+
memcpy(&tmp, a, sizeof(git_net_url));
|
860
|
+
memcpy(a, b, sizeof(git_net_url));
|
861
|
+
memcpy(b, &tmp, sizeof(git_net_url));
|
862
|
+
}
|
863
|
+
|
864
|
+
int git_net_url_fmt(git_str *buf, git_net_url *url)
|
865
|
+
{
|
866
|
+
GIT_ASSERT_ARG(url);
|
867
|
+
GIT_ASSERT_ARG(url->scheme);
|
868
|
+
GIT_ASSERT_ARG(url->host);
|
869
|
+
|
870
|
+
git_str_puts(buf, url->scheme);
|
871
|
+
git_str_puts(buf, "://");
|
872
|
+
|
873
|
+
if (url->username) {
|
874
|
+
git_str_puts(buf, url->username);
|
875
|
+
|
876
|
+
if (url->password) {
|
877
|
+
git_str_puts(buf, ":");
|
878
|
+
git_str_puts(buf, url->password);
|
879
|
+
}
|
880
|
+
|
881
|
+
git_str_putc(buf, '@');
|
882
|
+
}
|
883
|
+
|
884
|
+
git_str_puts(buf, url->host);
|
885
|
+
|
886
|
+
if (url->port && !git_net_url_is_default_port(url)) {
|
887
|
+
git_str_putc(buf, ':');
|
888
|
+
git_str_puts(buf, url->port);
|
889
|
+
}
|
890
|
+
|
891
|
+
git_str_puts(buf, url->path ? url->path : "/");
|
892
|
+
|
893
|
+
if (url->query) {
|
894
|
+
git_str_putc(buf, '?');
|
895
|
+
git_str_puts(buf, url->query);
|
896
|
+
}
|
897
|
+
|
898
|
+
return git_str_oom(buf) ? -1 : 0;
|
899
|
+
}
|
900
|
+
|
901
|
+
int git_net_url_fmt_path(git_str *buf, git_net_url *url)
|
902
|
+
{
|
903
|
+
git_str_puts(buf, url->path ? url->path : "/");
|
904
|
+
|
905
|
+
if (url->query) {
|
906
|
+
git_str_putc(buf, '?');
|
907
|
+
git_str_puts(buf, url->query);
|
908
|
+
}
|
909
|
+
|
910
|
+
return git_str_oom(buf) ? -1 : 0;
|
911
|
+
}
|
912
|
+
|
913
|
+
static bool matches_pattern(
|
914
|
+
git_net_url *url,
|
915
|
+
const char *pattern,
|
916
|
+
size_t pattern_len)
|
917
|
+
{
|
918
|
+
const char *domain, *port = NULL, *colon;
|
919
|
+
size_t host_len, domain_len, port_len = 0, wildcard = 0;
|
920
|
+
|
921
|
+
GIT_UNUSED(url);
|
922
|
+
GIT_UNUSED(pattern);
|
923
|
+
|
924
|
+
if (!pattern_len)
|
925
|
+
return false;
|
926
|
+
else if (pattern_len == 1 && pattern[0] == '*')
|
927
|
+
return true;
|
928
|
+
else if (pattern_len > 1 && pattern[0] == '*' && pattern[1] == '.')
|
929
|
+
wildcard = 2;
|
930
|
+
else if (pattern[0] == '.')
|
931
|
+
wildcard = 1;
|
932
|
+
|
933
|
+
domain = pattern + wildcard;
|
934
|
+
domain_len = pattern_len - wildcard;
|
935
|
+
|
936
|
+
if ((colon = memchr(domain, ':', domain_len)) != NULL) {
|
937
|
+
domain_len = colon - domain;
|
938
|
+
port = colon + 1;
|
939
|
+
port_len = pattern_len - wildcard - domain_len - 1;
|
940
|
+
}
|
941
|
+
|
942
|
+
/* A pattern's port *must* match if it's specified */
|
943
|
+
if (port_len && git__strlcmp(url->port, port, port_len) != 0)
|
944
|
+
return false;
|
945
|
+
|
946
|
+
/* No wildcard? Host must match exactly. */
|
947
|
+
if (!wildcard)
|
948
|
+
return !git__strlcmp(url->host, domain, domain_len);
|
949
|
+
|
950
|
+
/* Wildcard: ensure there's (at least) a suffix match */
|
951
|
+
if ((host_len = strlen(url->host)) < domain_len ||
|
952
|
+
memcmp(url->host + (host_len - domain_len), domain, domain_len))
|
953
|
+
return false;
|
954
|
+
|
955
|
+
/* The pattern is *.domain and the host is simply domain */
|
956
|
+
if (host_len == domain_len)
|
957
|
+
return true;
|
958
|
+
|
959
|
+
/* The pattern is *.domain and the host is foo.domain */
|
960
|
+
return (url->host[host_len - domain_len - 1] == '.');
|
961
|
+
}
|
962
|
+
|
963
|
+
bool git_net_url_matches_pattern(git_net_url *url, const char *pattern)
|
964
|
+
{
|
965
|
+
return matches_pattern(url, pattern, strlen(pattern));
|
966
|
+
}
|
967
|
+
|
968
|
+
bool git_net_url_matches_pattern_list(
|
969
|
+
git_net_url *url,
|
970
|
+
const char *pattern_list)
|
971
|
+
{
|
972
|
+
const char *pattern, *pattern_end, *sep;
|
973
|
+
|
974
|
+
for (pattern = pattern_list;
|
975
|
+
pattern && *pattern;
|
976
|
+
pattern = sep ? sep + 1 : NULL) {
|
977
|
+
sep = strchr(pattern, ',');
|
978
|
+
pattern_end = sep ? sep : strchr(pattern, '\0');
|
979
|
+
|
980
|
+
if (matches_pattern(url, pattern, (pattern_end - pattern)))
|
981
|
+
return true;
|
982
|
+
}
|
983
|
+
|
984
|
+
return false;
|
985
|
+
}
|
986
|
+
|
987
|
+
void git_net_url_dispose(git_net_url *url)
|
988
|
+
{
|
989
|
+
if (url->username)
|
990
|
+
git__memzero(url->username, strlen(url->username));
|
991
|
+
|
992
|
+
if (url->password)
|
993
|
+
git__memzero(url->password, strlen(url->password));
|
994
|
+
|
995
|
+
git__free(url->scheme); url->scheme = NULL;
|
996
|
+
git__free(url->host); url->host = NULL;
|
997
|
+
git__free(url->port); url->port = NULL;
|
998
|
+
git__free(url->path); url->path = NULL;
|
999
|
+
git__free(url->query); url->query = NULL;
|
1000
|
+
git__free(url->fragment); url->fragment = NULL;
|
1001
|
+
git__free(url->username); url->username = NULL;
|
1002
|
+
git__free(url->password); url->password = NULL;
|
1003
|
+
}
|