rugged 0.19.0 → 0.21.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +7 -0
- data/LICENSE +1 -1
- data/README.md +151 -25
- data/ext/rugged/extconf.rb +48 -27
- data/ext/rugged/rugged.c +107 -35
- data/ext/rugged/rugged.h +44 -8
- data/ext/rugged/rugged_blame.c +292 -0
- data/ext/rugged/rugged_blob.c +84 -31
- data/ext/rugged/rugged_branch.c +90 -223
- data/ext/rugged/rugged_branch_collection.c +445 -0
- data/ext/rugged/rugged_commit.c +190 -9
- data/ext/rugged/rugged_config.c +1 -1
- data/ext/rugged/rugged_cred.c +125 -0
- data/ext/rugged/rugged_diff.c +267 -94
- data/ext/rugged/rugged_diff_delta.c +14 -3
- data/ext/rugged/rugged_diff_hunk.c +31 -28
- data/ext/rugged/rugged_diff_line.c +21 -17
- data/ext/rugged/rugged_index.c +326 -6
- data/ext/rugged/rugged_note.c +39 -34
- data/ext/rugged/rugged_object.c +9 -9
- data/ext/rugged/rugged_patch.c +245 -0
- data/ext/rugged/rugged_reference.c +67 -332
- data/ext/rugged/rugged_reference_collection.c +490 -0
- data/ext/rugged/rugged_remote.c +447 -351
- data/ext/rugged/rugged_remote_collection.c +285 -0
- data/ext/rugged/rugged_repo.c +752 -203
- data/ext/rugged/rugged_revwalk.c +119 -27
- data/ext/rugged/rugged_settings.c +48 -1
- data/ext/rugged/rugged_signature.c +30 -16
- data/ext/rugged/rugged_tag.c +86 -191
- data/ext/rugged/rugged_tag_collection.c +279 -0
- data/ext/rugged/rugged_tree.c +159 -22
- data/lib/rugged/branch.rb +8 -17
- data/lib/rugged/credentials.rb +43 -0
- data/lib/rugged/diff/delta.rb +1 -2
- data/lib/rugged/diff/hunk.rb +4 -9
- data/lib/rugged/diff/line.rb +23 -3
- data/lib/rugged/diff.rb +3 -1
- data/lib/rugged/patch.rb +26 -0
- data/lib/rugged/reference.rb +1 -3
- data/lib/rugged/remote.rb +0 -9
- data/lib/rugged/repository.rb +70 -13
- data/lib/rugged/tag.rb +23 -18
- data/lib/rugged/tree.rb +7 -0
- data/lib/rugged/version.rb +1 -1
- data/lib/rugged.rb +8 -1
- data/vendor/libgit2/AUTHORS +75 -0
- data/vendor/libgit2/CMakeLists.txt +490 -0
- data/vendor/libgit2/COPYING +920 -0
- data/vendor/libgit2/Makefile.embed +25 -7
- data/vendor/libgit2/cmake/Modules/AddCFlagIfSupported.cmake +16 -0
- data/vendor/libgit2/cmake/Modules/FindHTTP_Parser.cmake +39 -0
- data/vendor/libgit2/cmake/Modules/FindIconv.cmake +43 -0
- data/vendor/libgit2/cmake/Modules/FindLIBSSH2.cmake +44 -0
- data/vendor/libgit2/deps/http-parser/LICENSE-MIT +23 -0
- data/vendor/libgit2/deps/regex/regex.c +10 -3
- data/vendor/libgit2/include/git2/attr.h +2 -1
- data/vendor/libgit2/include/git2/blame.h +213 -0
- data/vendor/libgit2/include/git2/blob.h +57 -29
- data/vendor/libgit2/include/git2/branch.h +56 -44
- data/vendor/libgit2/include/git2/buffer.h +112 -0
- data/vendor/libgit2/include/git2/checkout.h +72 -37
- data/vendor/libgit2/include/git2/cherrypick.h +87 -0
- data/vendor/libgit2/include/git2/clone.h +153 -56
- data/vendor/libgit2/include/git2/commit.h +82 -12
- data/vendor/libgit2/include/git2/common.h +31 -19
- data/vendor/libgit2/include/git2/config.h +124 -19
- data/vendor/libgit2/include/git2/cred_helpers.h +1 -1
- data/vendor/libgit2/include/git2/diff.h +636 -494
- data/vendor/libgit2/include/git2/errors.h +48 -15
- data/vendor/libgit2/include/git2/filter.h +149 -0
- data/vendor/libgit2/include/git2/graph.h +14 -0
- data/vendor/libgit2/include/git2/index.h +95 -54
- data/vendor/libgit2/include/git2/indexer.h +15 -9
- data/vendor/libgit2/include/git2/merge.h +402 -39
- data/vendor/libgit2/include/git2/message.h +9 -14
- data/vendor/libgit2/include/git2/net.h +5 -0
- data/vendor/libgit2/include/git2/notes.h +6 -6
- data/vendor/libgit2/include/git2/object.h +34 -2
- data/vendor/libgit2/include/git2/odb.h +77 -14
- data/vendor/libgit2/include/git2/odb_backend.h +50 -6
- data/vendor/libgit2/include/git2/oid.h +4 -8
- data/vendor/libgit2/include/git2/pack.h +58 -4
- data/vendor/libgit2/include/git2/patch.h +277 -0
- data/vendor/libgit2/include/git2/pathspec.h +263 -0
- data/vendor/libgit2/include/git2/push.h +55 -5
- data/vendor/libgit2/include/git2/reflog.h +11 -8
- data/vendor/libgit2/include/git2/refs.h +219 -33
- data/vendor/libgit2/include/git2/refspec.h +3 -4
- data/vendor/libgit2/include/git2/remote.h +216 -76
- data/vendor/libgit2/include/git2/repository.h +85 -40
- data/vendor/libgit2/include/git2/reset.h +15 -4
- data/vendor/libgit2/include/git2/revert.h +86 -0
- data/vendor/libgit2/include/git2/revparse.h +27 -16
- data/vendor/libgit2/include/git2/revwalk.h +44 -6
- data/vendor/libgit2/include/git2/signature.h +17 -3
- data/vendor/libgit2/include/git2/stash.h +8 -12
- data/vendor/libgit2/include/git2/status.h +67 -18
- data/vendor/libgit2/include/git2/submodule.h +100 -85
- data/vendor/libgit2/include/git2/sys/commit.h +38 -4
- data/vendor/libgit2/include/git2/sys/config.h +44 -3
- data/vendor/libgit2/include/git2/sys/diff.h +91 -0
- data/vendor/libgit2/include/git2/sys/filter.h +301 -0
- data/vendor/libgit2/include/git2/sys/index.h +0 -2
- data/vendor/libgit2/include/git2/sys/mempack.h +85 -0
- data/vendor/libgit2/include/git2/sys/odb_backend.h +33 -11
- data/vendor/libgit2/include/git2/sys/refdb_backend.h +51 -5
- data/vendor/libgit2/include/git2/sys/reflog.h +21 -0
- data/vendor/libgit2/include/git2/sys/refs.h +2 -2
- data/vendor/libgit2/include/git2/sys/repository.h +19 -1
- data/vendor/libgit2/include/git2/transport.h +216 -75
- data/vendor/libgit2/include/git2/tree.h +32 -11
- data/vendor/libgit2/include/git2/types.h +124 -10
- data/vendor/libgit2/include/git2/version.h +4 -2
- data/vendor/libgit2/include/git2.h +41 -40
- data/vendor/libgit2/libgit2.pc.in +10 -0
- data/vendor/libgit2/src/array.h +16 -8
- data/vendor/libgit2/src/attr.c +140 -402
- data/vendor/libgit2/src/attr.h +1 -33
- data/vendor/libgit2/src/attr_file.c +298 -135
- data/vendor/libgit2/src/attr_file.h +61 -22
- data/vendor/libgit2/src/attrcache.c +449 -0
- data/vendor/libgit2/src/attrcache.h +38 -6
- data/vendor/libgit2/src/bitvec.h +75 -0
- data/vendor/libgit2/src/blame.c +488 -0
- data/vendor/libgit2/src/blame.h +93 -0
- data/vendor/libgit2/src/blame_git.c +624 -0
- data/vendor/libgit2/src/blame_git.h +20 -0
- data/vendor/libgit2/src/blob.c +137 -92
- data/vendor/libgit2/src/blob.h +9 -0
- data/vendor/libgit2/src/branch.c +175 -156
- data/vendor/libgit2/src/buf_text.c +29 -14
- data/vendor/libgit2/src/buf_text.h +5 -4
- data/vendor/libgit2/src/buffer.c +158 -15
- data/vendor/libgit2/src/buffer.h +33 -20
- data/vendor/libgit2/src/cc-compat.h +8 -2
- data/vendor/libgit2/src/checkout.c +1081 -287
- data/vendor/libgit2/src/checkout.h +1 -1
- data/vendor/libgit2/src/cherrypick.c +226 -0
- data/vendor/libgit2/src/clone.c +297 -245
- data/vendor/libgit2/src/{compress.h → clone.h} +4 -8
- data/vendor/libgit2/src/commit.c +313 -101
- data/vendor/libgit2/src/commit.h +6 -3
- data/vendor/libgit2/src/commit_list.c +3 -3
- data/vendor/libgit2/src/commit_list.h +1 -1
- data/vendor/libgit2/src/common.h +74 -1
- data/vendor/libgit2/src/config.c +570 -145
- data/vendor/libgit2/src/config.h +39 -6
- data/vendor/libgit2/src/config_cache.c +32 -18
- data/vendor/libgit2/src/config_file.c +711 -424
- data/vendor/libgit2/src/config_file.h +4 -3
- data/vendor/libgit2/src/crlf.c +149 -109
- data/vendor/libgit2/src/date.c +35 -7
- data/vendor/libgit2/src/delta.c +1 -1
- data/vendor/libgit2/src/diff.c +719 -414
- data/vendor/libgit2/src/diff.h +52 -7
- data/vendor/libgit2/src/diff_driver.c +183 -85
- data/vendor/libgit2/src/diff_driver.h +1 -1
- data/vendor/libgit2/src/diff_file.c +65 -84
- data/vendor/libgit2/src/diff_file.h +12 -10
- data/vendor/libgit2/src/diff_patch.c +274 -333
- data/vendor/libgit2/src/diff_patch.h +10 -9
- data/vendor/libgit2/src/diff_print.c +381 -179
- data/vendor/libgit2/src/diff_stats.c +336 -0
- data/vendor/libgit2/src/diff_tform.c +393 -215
- data/vendor/libgit2/src/diff_xdiff.c +117 -42
- data/vendor/libgit2/src/errors.c +59 -4
- data/vendor/libgit2/src/fetch.c +40 -34
- data/vendor/libgit2/src/fetch.h +2 -5
- data/vendor/libgit2/src/fetchhead.c +14 -7
- data/vendor/libgit2/src/filebuf.c +13 -24
- data/vendor/libgit2/src/filebuf.h +3 -3
- data/vendor/libgit2/src/fileops.c +104 -296
- data/vendor/libgit2/src/fileops.h +23 -94
- data/vendor/libgit2/src/filter.c +642 -43
- data/vendor/libgit2/src/filter.h +7 -66
- data/vendor/libgit2/src/fnmatch.c +46 -3
- data/vendor/libgit2/src/fnmatch.h +24 -3
- data/vendor/libgit2/src/global.c +158 -42
- data/vendor/libgit2/src/global.h +9 -0
- data/vendor/libgit2/src/graph.c +34 -20
- data/vendor/libgit2/src/hash/hash_generic.h +0 -1
- data/vendor/libgit2/src/hash/hash_openssl.h +0 -1
- data/vendor/libgit2/src/hash/hash_win32.c +14 -29
- data/vendor/libgit2/src/hash.h +0 -2
- data/vendor/libgit2/src/hashsig.c +97 -117
- data/vendor/libgit2/src/ident.c +125 -0
- data/vendor/libgit2/src/ignore.c +159 -110
- data/vendor/libgit2/src/ignore.h +13 -3
- data/vendor/libgit2/src/index.c +803 -445
- data/vendor/libgit2/src/index.h +43 -6
- data/vendor/libgit2/src/indexer.c +475 -157
- data/vendor/libgit2/src/iterator.c +198 -55
- data/vendor/libgit2/src/iterator.h +28 -4
- data/vendor/libgit2/src/map.h +1 -0
- data/vendor/libgit2/src/merge.c +849 -142
- data/vendor/libgit2/src/merge.h +11 -4
- data/vendor/libgit2/src/merge_file.c +183 -78
- data/vendor/libgit2/src/merge_file.h +0 -57
- data/vendor/libgit2/src/message.c +4 -28
- data/vendor/libgit2/src/mwindow.c +117 -8
- data/vendor/libgit2/src/mwindow.h +9 -1
- data/vendor/libgit2/src/netops.c +164 -59
- data/vendor/libgit2/src/netops.h +37 -1
- data/vendor/libgit2/src/notes.c +9 -18
- data/vendor/libgit2/src/notes.h +1 -1
- data/vendor/libgit2/src/object.c +78 -2
- data/vendor/libgit2/src/odb.c +191 -59
- data/vendor/libgit2/src/odb.h +2 -1
- data/vendor/libgit2/src/odb_loose.c +66 -51
- data/vendor/libgit2/src/odb_mempack.c +182 -0
- data/vendor/libgit2/src/odb_pack.c +151 -61
- data/vendor/libgit2/src/oid.c +30 -19
- data/vendor/libgit2/src/oid.h +13 -10
- data/vendor/libgit2/src/pack-objects.c +198 -147
- data/vendor/libgit2/src/pack-objects.h +7 -0
- data/vendor/libgit2/src/pack.c +272 -101
- data/vendor/libgit2/src/pack.h +15 -1
- data/vendor/libgit2/src/path.c +359 -117
- data/vendor/libgit2/src/path.h +110 -20
- data/vendor/libgit2/src/pathspec.c +583 -57
- data/vendor/libgit2/src/pathspec.h +36 -15
- data/vendor/libgit2/src/pool.c +4 -5
- data/vendor/libgit2/src/posix.c +45 -2
- data/vendor/libgit2/src/posix.h +13 -5
- data/vendor/libgit2/src/pqueue.c +73 -119
- data/vendor/libgit2/src/pqueue.h +35 -82
- data/vendor/libgit2/src/push.c +116 -48
- data/vendor/libgit2/src/push.h +5 -0
- data/vendor/libgit2/src/refdb.c +45 -6
- data/vendor/libgit2/src/refdb.h +13 -3
- data/vendor/libgit2/src/refdb_fs.c +1130 -551
- data/vendor/libgit2/src/reflog.c +36 -327
- data/vendor/libgit2/src/reflog.h +6 -1
- data/vendor/libgit2/src/refs.c +345 -142
- data/vendor/libgit2/src/refs.h +9 -2
- data/vendor/libgit2/src/refspec.c +90 -62
- data/vendor/libgit2/src/refspec.h +7 -24
- data/vendor/libgit2/src/remote.c +815 -415
- data/vendor/libgit2/src/remote.h +3 -4
- data/vendor/libgit2/src/repository.c +360 -207
- data/vendor/libgit2/src/repository.h +16 -10
- data/vendor/libgit2/src/reset.c +28 -13
- data/vendor/libgit2/src/revert.c +228 -0
- data/vendor/libgit2/src/revparse.c +29 -30
- data/vendor/libgit2/src/revwalk.c +141 -96
- data/vendor/libgit2/src/revwalk.h +6 -1
- data/vendor/libgit2/src/settings.c +140 -0
- data/vendor/libgit2/src/sha1_lookup.c +71 -0
- data/vendor/libgit2/src/sha1_lookup.h +5 -0
- data/vendor/libgit2/src/signature.c +38 -10
- data/vendor/libgit2/src/sortedcache.c +378 -0
- data/vendor/libgit2/src/sortedcache.h +178 -0
- data/vendor/libgit2/src/stash.c +98 -116
- data/vendor/libgit2/src/status.c +88 -60
- data/vendor/libgit2/src/status.h +2 -2
- data/vendor/libgit2/src/strmap.c +32 -0
- data/vendor/libgit2/src/strmap.h +14 -1
- data/vendor/libgit2/src/strnlen.h +23 -0
- data/vendor/libgit2/src/submodule.c +1073 -615
- data/vendor/libgit2/src/submodule.h +89 -21
- data/vendor/libgit2/src/sysdir.c +252 -0
- data/vendor/libgit2/src/sysdir.h +101 -0
- data/vendor/libgit2/src/tag.c +31 -20
- data/vendor/libgit2/src/thread-utils.h +98 -17
- data/vendor/libgit2/src/trace.h +0 -2
- data/vendor/libgit2/src/transport.c +76 -6
- data/vendor/libgit2/src/transports/cred.c +164 -61
- data/vendor/libgit2/src/transports/git.c +41 -48
- data/vendor/libgit2/src/transports/http.c +65 -109
- data/vendor/libgit2/src/transports/local.c +88 -65
- data/vendor/libgit2/src/transports/smart.c +91 -19
- data/vendor/libgit2/src/transports/smart.h +13 -5
- data/vendor/libgit2/src/transports/smart_pkt.c +24 -14
- data/vendor/libgit2/src/transports/smart_protocol.c +268 -113
- data/vendor/libgit2/src/transports/ssh.c +284 -186
- data/vendor/libgit2/src/transports/winhttp.c +279 -198
- data/vendor/libgit2/src/tree-cache.c +21 -23
- data/vendor/libgit2/src/tree-cache.h +1 -0
- data/vendor/libgit2/src/tree.c +109 -92
- data/vendor/libgit2/src/tree.h +2 -3
- data/vendor/libgit2/src/unix/map.c +7 -1
- data/vendor/libgit2/src/unix/posix.h +0 -1
- data/vendor/libgit2/src/userdiff.h +208 -0
- data/vendor/libgit2/src/util.c +16 -112
- data/vendor/libgit2/src/util.h +107 -3
- data/vendor/libgit2/src/vector.c +72 -17
- data/vendor/libgit2/src/vector.h +32 -5
- data/vendor/libgit2/src/win32/dir.c +15 -40
- data/vendor/libgit2/src/win32/dir.h +3 -2
- data/vendor/libgit2/src/win32/error.c +5 -31
- data/vendor/libgit2/src/win32/findfile.c +47 -66
- data/vendor/libgit2/src/win32/findfile.h +1 -12
- data/vendor/libgit2/src/win32/git2.rc +40 -0
- data/vendor/libgit2/src/win32/map.c +7 -1
- data/vendor/libgit2/src/win32/mingw-compat.h +3 -0
- data/vendor/libgit2/src/win32/posix.h +17 -11
- data/vendor/libgit2/src/win32/posix_w32.c +424 -292
- data/vendor/libgit2/src/win32/precompiled.h +6 -2
- data/vendor/libgit2/src/win32/pthread.c +141 -18
- data/vendor/libgit2/src/win32/pthread.h +50 -8
- data/vendor/libgit2/src/win32/reparse.h +57 -0
- data/vendor/libgit2/src/win32/utf-conv.c +117 -60
- data/vendor/libgit2/src/win32/utf-conv.h +81 -6
- data/vendor/libgit2/src/win32/version.h +21 -4
- data/vendor/libgit2/src/win32/w32_util.c +139 -0
- data/vendor/libgit2/src/win32/w32_util.h +54 -0
- data/vendor/libgit2/src/zstream.c +156 -0
- data/vendor/libgit2/src/zstream.h +39 -0
- metadata +84 -167
- data/Rakefile +0 -61
- data/ext/rugged/rugged_diff_patch.c +0 -169
- data/lib/rugged/diff/patch.rb +0 -28
- data/test/blob_test.rb +0 -341
- data/test/branch_test.rb +0 -199
- data/test/commit_test.rb +0 -104
- data/test/config_test.rb +0 -45
- data/test/coverage/cover.rb +0 -133
- data/test/diff_test.rb +0 -777
- data/test/errors_test.rb +0 -34
- data/test/fixtures/alternate/objects/14/6ae76773c91e3b1d00cf7a338ec55ae58297e2 +0 -0
- data/test/fixtures/alternate/objects/14/9c32d47e99d0a3572ff1e70a2e0051bbf347a9 +0 -0
- data/test/fixtures/alternate/objects/14/fb3108588f9421bf764041e5e3ac305eb6277f +0 -0
- data/test/fixtures/archive.tar.gz +0 -0
- data/test/fixtures/attr/attr0 +0 -1
- data/test/fixtures/attr/attr1 +0 -29
- data/test/fixtures/attr/attr2 +0 -21
- data/test/fixtures/attr/attr3 +0 -4
- data/test/fixtures/attr/binfile +0 -1
- data/test/fixtures/attr/dir/file +0 -0
- data/test/fixtures/attr/file +0 -1
- data/test/fixtures/attr/gitattributes +0 -29
- data/test/fixtures/attr/gitignore +0 -2
- data/test/fixtures/attr/ign +0 -1
- data/test/fixtures/attr/macro_bad +0 -1
- data/test/fixtures/attr/macro_test +0 -1
- data/test/fixtures/attr/root_test1 +0 -1
- data/test/fixtures/attr/root_test2 +0 -6
- data/test/fixtures/attr/root_test3 +0 -19
- data/test/fixtures/attr/root_test4.txt +0 -14
- data/test/fixtures/attr/sub/abc +0 -37
- data/test/fixtures/attr/sub/dir/file +0 -0
- data/test/fixtures/attr/sub/file +0 -1
- data/test/fixtures/attr/sub/ign/file +0 -1
- data/test/fixtures/attr/sub/ign/sub/file +0 -1
- data/test/fixtures/attr/sub/sub/dir +0 -0
- data/test/fixtures/attr/sub/sub/file +0 -1
- data/test/fixtures/attr/sub/sub/subsub.txt +0 -1
- data/test/fixtures/attr/sub/subdir_test1 +0 -2
- data/test/fixtures/attr/sub/subdir_test2.txt +0 -1
- data/test/fixtures/diff/another.txt +0 -38
- data/test/fixtures/diff/readme.txt +0 -36
- data/test/fixtures/mergedrepo/conflicts-one.txt +0 -5
- data/test/fixtures/mergedrepo/conflicts-two.txt +0 -5
- data/test/fixtures/mergedrepo/one.txt +0 -10
- data/test/fixtures/mergedrepo/two.txt +0 -12
- data/test/fixtures/status/current_file +0 -1
- data/test/fixtures/status/ignored_file +0 -1
- data/test/fixtures/status/modified_file +0 -2
- data/test/fixtures/status/new_file +0 -1
- data/test/fixtures/status/staged_changes +0 -2
- data/test/fixtures/status/staged_changes_modified_file +0 -3
- data/test/fixtures/status/staged_delete_modified_file +0 -1
- data/test/fixtures/status/staged_new_file +0 -1
- data/test/fixtures/status/staged_new_file_modified_file +0 -2
- data/test/fixtures/status/subdir/current_file +0 -1
- data/test/fixtures/status/subdir/modified_file +0 -2
- data/test/fixtures/status/subdir/new_file +0 -1
- data/test/fixtures/status/subdir.txt +0 -2
- data/test/fixtures/status//350/277/231 +0 -1
- data/test/fixtures/testrepo.git/HEAD +0 -1
- data/test/fixtures/testrepo.git/config +0 -13
- data/test/fixtures/testrepo.git/description +0 -1
- data/test/fixtures/testrepo.git/index +0 -0
- data/test/fixtures/testrepo.git/info/exclude +0 -6
- data/test/fixtures/testrepo.git/logs/HEAD +0 -3
- data/test/fixtures/testrepo.git/logs/refs/heads/master +0 -3
- data/test/fixtures/testrepo.git/logs/refs/notes/commits +0 -1
- data/test/fixtures/testrepo.git/objects/0c/37a5391bbff43c37f0d0371823a5509eed5b1d +0 -0
- data/test/fixtures/testrepo.git/objects/13/85f264afb75a56a5bec74243be9b367ba4ca08 +0 -0
- data/test/fixtures/testrepo.git/objects/18/1037049a54a1eb5fab404658a3a250b44335d7 +0 -0
- data/test/fixtures/testrepo.git/objects/18/10dff58d8a660512d4832e740f692884338ccd +0 -0
- data/test/fixtures/testrepo.git/objects/2d/2eff63372b08adf0a9eb84109ccf7d19e2f3a2 +0 -0
- data/test/fixtures/testrepo.git/objects/36/060c58702ed4c2a40832c51758d5344201d89a +0 -2
- data/test/fixtures/testrepo.git/objects/44/1034f860c1d5d90e4188d11ae0d325176869a8 +0 -1
- data/test/fixtures/testrepo.git/objects/45/b983be36b73c0788dc9cbcb76cbb80fc7bb057 +0 -0
- data/test/fixtures/testrepo.git/objects/4a/202b346bb0fb0db7eff3cffeb3c70babbd2045 +0 -2
- data/test/fixtures/testrepo.git/objects/5b/5b025afb0b4c913b4c338a42934a3863bf3644 +0 -2
- data/test/fixtures/testrepo.git/objects/60/d415052a33de2150bf68757f6461df4f563ae4 +0 -0
- data/test/fixtures/testrepo.git/objects/61/9f9935957e010c419cb9d15621916ddfcc0b96 +0 -0
- data/test/fixtures/testrepo.git/objects/68/8a8f4ef7496901d15322972f96e212a9e466cc +0 -1
- data/test/fixtures/testrepo.git/objects/75/057dd4114e74cca1d750d0aee1647c903cb60a +0 -0
- data/test/fixtures/testrepo.git/objects/77/71329dfa3002caf8c61a0ceb62a31d09023f37 +0 -0
- data/test/fixtures/testrepo.git/objects/81/4889a078c031f61ed08ab5fa863aea9314344d +0 -0
- data/test/fixtures/testrepo.git/objects/84/96071c1b46c854b31185ea97743be6a8774479 +0 -0
- data/test/fixtures/testrepo.git/objects/94/eca2de348d5f672faf56b0decafa5937e3235e +0 -0
- data/test/fixtures/testrepo.git/objects/9b/7384fe1676186192842f5d3e129457b62db9e3 +0 -0
- data/test/fixtures/testrepo.git/objects/9f/d738e8f7967c078dceed8190330fc8648ee56a +0 -3
- data/test/fixtures/testrepo.git/objects/a4/a7dce85cf63874e984719f4fdd239f5145052f +0 -2
- data/test/fixtures/testrepo.git/objects/a7/1586c1dfe8a71c6cbf6c129f404c5642ff31bd +0 -0
- data/test/fixtures/testrepo.git/objects/a8/233120f6ad708f843d861ce2b7228ec4e3dec6 +0 -0
- data/test/fixtures/testrepo.git/objects/b7/4713326bc972cc15751ed504dca6f6f3b91f7a +0 -3
- data/test/fixtures/testrepo.git/objects/be/3563ae3f795b2b4353bcce3a527ad0a4f7f644 +0 -3
- data/test/fixtures/testrepo.git/objects/c4/7800c7266a2be04c571c04d5a6614691ea99bd +0 -3
- data/test/fixtures/testrepo.git/objects/c4/dc1555e4d4fa0e0c9c3fc46734c7c35b3ce90b +0 -0
- data/test/fixtures/testrepo.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 +0 -0
- data/test/fixtures/testrepo.git/objects/f6/0079018b664e4e79329a7ef9559c8d9e0378d1 +0 -0
- data/test/fixtures/testrepo.git/objects/fa/49b077972391ad58037050f2a75f74e3671e92 +0 -0
- data/test/fixtures/testrepo.git/objects/fd/093bff70906175335656e6ce6ae05783708765 +0 -0
- data/test/fixtures/testrepo.git/objects/pack/pack-d7c6adf9f61318f041845b01440d09aa7a91e1b5.idx +0 -0
- data/test/fixtures/testrepo.git/objects/pack/pack-d7c6adf9f61318f041845b01440d09aa7a91e1b5.pack +0 -0
- data/test/fixtures/testrepo.git/packed-refs +0 -2
- data/test/fixtures/testrepo.git/refs/heads/master +0 -1
- data/test/fixtures/testrepo.git/refs/notes/commits +0 -1
- data/test/fixtures/testrepo.git/refs/tags/v0.9 +0 -1
- data/test/fixtures/testrepo.git/refs/tags/v1.0 +0 -1
- data/test/fixtures/text_file.md +0 -464
- data/test/fixtures/unsymlinked.git/HEAD +0 -1
- data/test/fixtures/unsymlinked.git/config +0 -6
- data/test/fixtures/unsymlinked.git/description +0 -1
- data/test/fixtures/unsymlinked.git/info/exclude +0 -2
- data/test/fixtures/unsymlinked.git/objects/08/8b64704e0d6b8bd061dea879418cb5442a3fbf +0 -0
- data/test/fixtures/unsymlinked.git/objects/13/a5e939bca25940c069fd2169d993dba328e30b +0 -0
- data/test/fixtures/unsymlinked.git/objects/19/bf568e59e3a0b363cafb4106226e62d4a4c41c +0 -0
- data/test/fixtures/unsymlinked.git/objects/58/1fadd35b4cf320d102a152f918729011604773 +0 -0
- data/test/fixtures/unsymlinked.git/objects/5c/87b6791e8b13da658a14d1ef7e09b5dc3bac8c +0 -0
- data/test/fixtures/unsymlinked.git/objects/6f/e5f5398af85fb3de8a6aba0339b6d3bfa26a27 +0 -0
- data/test/fixtures/unsymlinked.git/objects/7f/ccd75616ec188b8f1b23d67506a334cc34a49d +0 -0
- data/test/fixtures/unsymlinked.git/objects/80/6999882bf91d24241e4077906b9017605eb1f3 +0 -0
- data/test/fixtures/unsymlinked.git/objects/83/7d176303c5005505ec1e4a30231c40930c0230 +0 -0
- data/test/fixtures/unsymlinked.git/objects/a8/595ccca04f40818ae0155c8f9c77a230e597b6 +0 -2
- data/test/fixtures/unsymlinked.git/objects/cf/8f1cf5cce859c438d6cc067284cb5e161206e7 +0 -0
- data/test/fixtures/unsymlinked.git/objects/d5/278d05c8607ec420bfee4cf219fbc0eeebfd6a +0 -0
- data/test/fixtures/unsymlinked.git/objects/f4/e16fb76536591a41454194058d048d8e4dd2e9 +0 -0
- data/test/fixtures/unsymlinked.git/objects/f9/e65619d93fdf2673882e0a261c5e93b1a84006 +0 -0
- data/test/fixtures/unsymlinked.git/refs/heads/exe-file +0 -1
- data/test/fixtures/unsymlinked.git/refs/heads/master +0 -1
- data/test/fixtures/unsymlinked.git/refs/heads/reg-file +0 -1
- data/test/index_test.rb +0 -333
- data/test/lib_test.rb +0 -127
- data/test/note_test.rb +0 -158
- data/test/object_test.rb +0 -43
- data/test/reference_test.rb +0 -207
- data/test/remote_test.rb +0 -324
- data/test/repo_pack_test.rb +0 -24
- data/test/repo_reset_test.rb +0 -82
- data/test/repo_test.rb +0 -402
- data/test/tag_test.rb +0 -68
- data/test/test_helper.rb +0 -92
- data/test/tree_test.rb +0 -91
- data/test/walker_test.rb +0 -88
- data/vendor/libgit2/src/amiga/map.c +0 -48
- data/vendor/libgit2/src/compress.c +0 -53
@@ -21,6 +21,10 @@
|
|
21
21
|
|
22
22
|
#include <strsafe.h>
|
23
23
|
|
24
|
+
/* For IInternetSecurityManager zone check */
|
25
|
+
#include <objbase.h>
|
26
|
+
#include <urlmon.h>
|
27
|
+
|
24
28
|
/* For UuidCreate */
|
25
29
|
#pragma comment(lib, "rpcrt4")
|
26
30
|
|
@@ -52,6 +56,7 @@ static const int no_check_cert_flags = SECURITY_FLAG_IGNORE_CERT_CN_INVALID |
|
|
52
56
|
|
53
57
|
typedef enum {
|
54
58
|
GIT_WINHTTP_AUTH_BASIC = 1,
|
59
|
+
GIT_WINHTTP_AUTH_NEGOTIATE = 2,
|
55
60
|
} winhttp_authmechanism_t;
|
56
61
|
|
57
62
|
typedef struct {
|
@@ -73,17 +78,12 @@ typedef struct {
|
|
73
78
|
typedef struct {
|
74
79
|
git_smart_subtransport parent;
|
75
80
|
transport_smart *owner;
|
76
|
-
|
77
|
-
char *host;
|
78
|
-
char *port;
|
79
|
-
char *user_from_url;
|
80
|
-
char *pass_from_url;
|
81
|
+
gitno_connection_data connection_data;
|
81
82
|
git_cred *cred;
|
82
83
|
git_cred *url_cred;
|
83
84
|
int auth_mechanism;
|
84
85
|
HINTERNET session;
|
85
86
|
HINTERNET connection;
|
86
|
-
unsigned use_ssl : 1;
|
87
87
|
} winhttp_subtransport;
|
88
88
|
|
89
89
|
static int apply_basic_credential(HINTERNET request, git_cred *cred)
|
@@ -91,7 +91,7 @@ static int apply_basic_credential(HINTERNET request, git_cred *cred)
|
|
91
91
|
git_cred_userpass_plaintext *c = (git_cred_userpass_plaintext *)cred;
|
92
92
|
git_buf buf = GIT_BUF_INIT, raw = GIT_BUF_INIT;
|
93
93
|
wchar_t *wide = NULL;
|
94
|
-
int error = -1, wide_len
|
94
|
+
int error = -1, wide_len;
|
95
95
|
|
96
96
|
git_buf_printf(&raw, "%s:%s", c->username, c->password);
|
97
97
|
|
@@ -100,21 +100,7 @@ static int apply_basic_credential(HINTERNET request, git_cred *cred)
|
|
100
100
|
git_buf_put_base64(&buf, git_buf_cstr(&raw), raw.size) < 0)
|
101
101
|
goto on_error;
|
102
102
|
|
103
|
-
wide_len =
|
104
|
-
git_buf_cstr(&buf), -1, NULL, 0);
|
105
|
-
|
106
|
-
if (!wide_len) {
|
107
|
-
giterr_set(GITERR_OS, "Failed to measure string for wide conversion");
|
108
|
-
goto on_error;
|
109
|
-
}
|
110
|
-
|
111
|
-
wide = git__malloc(wide_len * sizeof(wchar_t));
|
112
|
-
|
113
|
-
if (!wide)
|
114
|
-
goto on_error;
|
115
|
-
|
116
|
-
if (!MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS,
|
117
|
-
git_buf_cstr(&buf), -1, wide, wide_len)) {
|
103
|
+
if ((wide_len = git__utf8_to_16_alloc(&wide, git_buf_cstr(&buf))) < 0) {
|
118
104
|
giterr_set(GITERR_OS, "Failed to convert string to wide form");
|
119
105
|
goto on_error;
|
120
106
|
}
|
@@ -143,6 +129,75 @@ on_error:
|
|
143
129
|
return error;
|
144
130
|
}
|
145
131
|
|
132
|
+
static int apply_default_credentials(HINTERNET request)
|
133
|
+
{
|
134
|
+
/* Either the caller explicitly requested that default credentials be passed,
|
135
|
+
* or our fallback credential callback was invoked and checked that the target
|
136
|
+
* URI was in the appropriate Internet Explorer security zone. By setting this
|
137
|
+
* flag, we guarantee that the credentials are delivered by WinHTTP. The default
|
138
|
+
* is "medium" which applies to the intranet and sounds like it would correspond
|
139
|
+
* to Internet Explorer security zones, but in fact does not. */
|
140
|
+
DWORD data = WINHTTP_AUTOLOGON_SECURITY_LEVEL_LOW;
|
141
|
+
|
142
|
+
if (!WinHttpSetOption(request, WINHTTP_OPTION_AUTOLOGON_POLICY, &data, sizeof(DWORD)))
|
143
|
+
return -1;
|
144
|
+
|
145
|
+
return 0;
|
146
|
+
}
|
147
|
+
|
148
|
+
static int fallback_cred_acquire_cb(
|
149
|
+
git_cred **cred,
|
150
|
+
const char *url,
|
151
|
+
const char *username_from_url,
|
152
|
+
unsigned int allowed_types,
|
153
|
+
void *payload)
|
154
|
+
{
|
155
|
+
int error = 1;
|
156
|
+
|
157
|
+
/* If the target URI supports integrated Windows authentication
|
158
|
+
* as an authentication mechanism */
|
159
|
+
if (GIT_CREDTYPE_DEFAULT & allowed_types) {
|
160
|
+
wchar_t *wide_url;
|
161
|
+
|
162
|
+
/* Convert URL to wide characters */
|
163
|
+
if (git__utf8_to_16_alloc(&wide_url, url) < 0) {
|
164
|
+
giterr_set(GITERR_OS, "Failed to convert string to wide form");
|
165
|
+
return -1;
|
166
|
+
}
|
167
|
+
|
168
|
+
if (SUCCEEDED(CoInitializeEx(NULL, COINIT_MULTITHREADED))) {
|
169
|
+
IInternetSecurityManager* pISM;
|
170
|
+
|
171
|
+
/* And if the target URI is in the My Computer, Intranet, or Trusted zones */
|
172
|
+
if (SUCCEEDED(CoCreateInstance(&CLSID_InternetSecurityManager, NULL,
|
173
|
+
CLSCTX_ALL, &IID_IInternetSecurityManager, (void **)&pISM))) {
|
174
|
+
DWORD dwZone;
|
175
|
+
|
176
|
+
if (SUCCEEDED(pISM->lpVtbl->MapUrlToZone(pISM, wide_url, &dwZone, 0)) &&
|
177
|
+
(URLZONE_LOCAL_MACHINE == dwZone ||
|
178
|
+
URLZONE_INTRANET == dwZone ||
|
179
|
+
URLZONE_TRUSTED == dwZone)) {
|
180
|
+
git_cred *existing = *cred;
|
181
|
+
|
182
|
+
if (existing)
|
183
|
+
existing->free(existing);
|
184
|
+
|
185
|
+
/* Then use default Windows credentials to authenticate this request */
|
186
|
+
error = git_cred_default_new(cred);
|
187
|
+
}
|
188
|
+
|
189
|
+
pISM->lpVtbl->Release(pISM);
|
190
|
+
}
|
191
|
+
|
192
|
+
CoUninitialize();
|
193
|
+
}
|
194
|
+
|
195
|
+
git__free(wide_url);
|
196
|
+
}
|
197
|
+
|
198
|
+
return error;
|
199
|
+
}
|
200
|
+
|
146
201
|
static int winhttp_stream_connect(winhttp_stream *s)
|
147
202
|
{
|
148
203
|
winhttp_subtransport *t = OWNING_SUBTRANSPORT(s);
|
@@ -151,30 +206,17 @@ static int winhttp_stream_connect(winhttp_stream *s)
|
|
151
206
|
wchar_t ct[MAX_CONTENT_TYPE_LEN];
|
152
207
|
wchar_t *types[] = { L"*/*", NULL };
|
153
208
|
BOOL peerdist = FALSE;
|
154
|
-
int error = -1
|
209
|
+
int error = -1;
|
210
|
+
unsigned long disable_redirects = WINHTTP_DISABLE_REDIRECTS;
|
155
211
|
|
156
212
|
/* Prepare URL */
|
157
|
-
git_buf_printf(&buf, "%s%s", t->path, s->service_url);
|
213
|
+
git_buf_printf(&buf, "%s%s", t->connection_data.path, s->service_url);
|
158
214
|
|
159
215
|
if (git_buf_oom(&buf))
|
160
216
|
return -1;
|
161
217
|
|
162
218
|
/* Convert URL to wide characters */
|
163
|
-
|
164
|
-
git_buf_cstr(&buf), -1, NULL, 0);
|
165
|
-
|
166
|
-
if (!wide_len) {
|
167
|
-
giterr_set(GITERR_OS, "Failed to measure string for wide conversion");
|
168
|
-
goto on_error;
|
169
|
-
}
|
170
|
-
|
171
|
-
s->request_uri = git__malloc(wide_len * sizeof(wchar_t));
|
172
|
-
|
173
|
-
if (!s->request_uri)
|
174
|
-
goto on_error;
|
175
|
-
|
176
|
-
if (!MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS,
|
177
|
-
git_buf_cstr(&buf), -1, s->request_uri, wide_len)) {
|
219
|
+
if (git__utf8_to_16_alloc(&s->request_uri, git_buf_cstr(&buf)) < 0) {
|
178
220
|
giterr_set(GITERR_OS, "Failed to convert string to wide form");
|
179
221
|
goto on_error;
|
180
222
|
}
|
@@ -187,7 +229,7 @@ static int winhttp_stream_connect(winhttp_stream *s)
|
|
187
229
|
NULL,
|
188
230
|
WINHTTP_NO_REFERER,
|
189
231
|
types,
|
190
|
-
t->use_ssl ? WINHTTP_FLAG_SECURE : 0);
|
232
|
+
t->connection_data.use_ssl ? WINHTTP_FLAG_SECURE : 0);
|
191
233
|
|
192
234
|
if (!s->request) {
|
193
235
|
giterr_set(GITERR_OS, "Failed to open request");
|
@@ -195,7 +237,7 @@ static int winhttp_stream_connect(winhttp_stream *s)
|
|
195
237
|
}
|
196
238
|
|
197
239
|
/* Set proxy if necessary */
|
198
|
-
if (git_remote__get_http_proxy(t->owner->owner, t->use_ssl, &proxy_url) < 0)
|
240
|
+
if (git_remote__get_http_proxy(t->owner->owner, !!t->connection_data.use_ssl, &proxy_url) < 0)
|
199
241
|
goto on_error;
|
200
242
|
|
201
243
|
if (proxy_url) {
|
@@ -203,30 +245,17 @@ static int winhttp_stream_connect(winhttp_stream *s)
|
|
203
245
|
wchar_t *proxy_wide;
|
204
246
|
|
205
247
|
/* Convert URL to wide characters */
|
206
|
-
|
207
|
-
proxy_url, -1, NULL, 0);
|
208
|
-
|
209
|
-
if (!wide_len) {
|
210
|
-
giterr_set(GITERR_OS, "Failed to measure string for wide conversion");
|
211
|
-
goto on_error;
|
212
|
-
}
|
213
|
-
|
214
|
-
proxy_wide = git__malloc(wide_len * sizeof(wchar_t));
|
248
|
+
int proxy_wide_len = git__utf8_to_16_alloc(&proxy_wide, proxy_url);
|
215
249
|
|
216
|
-
if (
|
217
|
-
goto on_error;
|
218
|
-
|
219
|
-
if (!MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS,
|
220
|
-
proxy_url, -1, proxy_wide, wide_len)) {
|
250
|
+
if (proxy_wide_len < 0) {
|
221
251
|
giterr_set(GITERR_OS, "Failed to convert string to wide form");
|
222
|
-
git__free(proxy_wide);
|
223
252
|
goto on_error;
|
224
253
|
}
|
225
254
|
|
226
255
|
/* Strip any trailing forward slash on the proxy URL;
|
227
256
|
* WinHTTP doesn't like it if one is present */
|
228
|
-
if (
|
229
|
-
proxy_wide[
|
257
|
+
if (proxy_wide_len > 1 && L'/' == proxy_wide[proxy_wide_len - 2])
|
258
|
+
proxy_wide[proxy_wide_len - 2] = L'\0';
|
230
259
|
|
231
260
|
proxy_info.dwAccessType = WINHTTP_ACCESS_TYPE_NAMED_PROXY;
|
232
261
|
proxy_info.lpszProxy = proxy_wide;
|
@@ -244,6 +273,17 @@ static int winhttp_stream_connect(winhttp_stream *s)
|
|
244
273
|
git__free(proxy_wide);
|
245
274
|
}
|
246
275
|
|
276
|
+
/* Disable WinHTTP redirects so we can handle them manually. Why, you ask?
|
277
|
+
* http://social.msdn.microsoft.com/Forums/windowsdesktop/en-US/b2ff8879-ab9f-4218-8f09-16d25dff87ae
|
278
|
+
*/
|
279
|
+
if (!WinHttpSetOption(s->request,
|
280
|
+
WINHTTP_OPTION_DISABLE_FEATURE,
|
281
|
+
&disable_redirects,
|
282
|
+
sizeof(disable_redirects))) {
|
283
|
+
giterr_set(GITERR_OS, "Failed to disable redirects");
|
284
|
+
goto on_error;
|
285
|
+
}
|
286
|
+
|
247
287
|
/* Strip unwanted headers (X-P2P-PeerDist, X-P2P-PeerDistEx) that WinHTTP
|
248
288
|
* adds itself. This option may not be supported by the underlying
|
249
289
|
* platform, so we do not error-check it */
|
@@ -258,22 +298,45 @@ static int winhttp_stream_connect(winhttp_stream *s)
|
|
258
298
|
goto on_error;
|
259
299
|
}
|
260
300
|
|
261
|
-
/* Send Content-Type header -- only necessary on a POST */
|
262
301
|
if (post_verb == s->verb) {
|
302
|
+
/* Send Content-Type and Accept headers -- only necessary on a POST */
|
303
|
+
git_buf_clear(&buf);
|
304
|
+
if (git_buf_printf(&buf,
|
305
|
+
"Content-Type: application/x-git-%s-request",
|
306
|
+
s->service) < 0)
|
307
|
+
goto on_error;
|
308
|
+
|
309
|
+
if (git__utf8_to_16(ct, MAX_CONTENT_TYPE_LEN, git_buf_cstr(&buf)) < 0) {
|
310
|
+
giterr_set(GITERR_OS, "Failed to convert content-type to wide characters");
|
311
|
+
goto on_error;
|
312
|
+
}
|
313
|
+
|
314
|
+
if (!WinHttpAddRequestHeaders(s->request, ct, (ULONG)-1L,
|
315
|
+
WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_REPLACE)) {
|
316
|
+
giterr_set(GITERR_OS, "Failed to add a header to the request");
|
317
|
+
goto on_error;
|
318
|
+
}
|
319
|
+
|
263
320
|
git_buf_clear(&buf);
|
264
|
-
if (git_buf_printf(&buf,
|
321
|
+
if (git_buf_printf(&buf,
|
322
|
+
"Accept: application/x-git-%s-result",
|
323
|
+
s->service) < 0)
|
265
324
|
goto on_error;
|
266
325
|
|
267
|
-
git__utf8_to_16(ct, MAX_CONTENT_TYPE_LEN, git_buf_cstr(&buf))
|
326
|
+
if (git__utf8_to_16(ct, MAX_CONTENT_TYPE_LEN, git_buf_cstr(&buf)) < 0) {
|
327
|
+
giterr_set(GITERR_OS, "Failed to convert accept header to wide characters");
|
328
|
+
goto on_error;
|
329
|
+
}
|
268
330
|
|
269
|
-
if (!WinHttpAddRequestHeaders(s->request, ct, (ULONG)
|
331
|
+
if (!WinHttpAddRequestHeaders(s->request, ct, (ULONG)-1L,
|
332
|
+
WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_REPLACE)) {
|
270
333
|
giterr_set(GITERR_OS, "Failed to add a header to the request");
|
271
334
|
goto on_error;
|
272
335
|
}
|
273
336
|
}
|
274
337
|
|
275
338
|
/* If requested, disable certificate validation */
|
276
|
-
if (t->use_ssl) {
|
339
|
+
if (t->connection_data.use_ssl) {
|
277
340
|
int flags;
|
278
341
|
|
279
342
|
if (t->owner->parent.read_flags(&t->owner->parent, &flags) < 0)
|
@@ -293,12 +356,17 @@ static int winhttp_stream_connect(winhttp_stream *s)
|
|
293
356
|
t->auth_mechanism == GIT_WINHTTP_AUTH_BASIC &&
|
294
357
|
apply_basic_credential(s->request, t->cred) < 0)
|
295
358
|
goto on_error;
|
359
|
+
else if (t->cred &&
|
360
|
+
t->cred->credtype == GIT_CREDTYPE_DEFAULT &&
|
361
|
+
t->auth_mechanism == GIT_WINHTTP_AUTH_NEGOTIATE &&
|
362
|
+
apply_default_credentials(s->request) < 0)
|
363
|
+
goto on_error;
|
296
364
|
|
297
365
|
/* If no other credentials have been applied and the URL has username and
|
298
366
|
* password, use those */
|
299
|
-
if (!t->cred && t->
|
367
|
+
if (!t->cred && t->connection_data.user && t->connection_data.pass) {
|
300
368
|
if (!t->url_cred &&
|
301
|
-
|
369
|
+
git_cred_userpass_plaintext_new(&t->url_cred, t->connection_data.user, t->connection_data.pass) < 0)
|
302
370
|
goto on_error;
|
303
371
|
if (apply_basic_credential(s->request, t->url_cred) < 0)
|
304
372
|
goto on_error;
|
@@ -337,6 +405,12 @@ static int parse_unauthorized_response(
|
|
337
405
|
*auth_mechanism = GIT_WINHTTP_AUTH_BASIC;
|
338
406
|
}
|
339
407
|
|
408
|
+
if ((WINHTTP_AUTH_SCHEME_NTLM & supported) ||
|
409
|
+
(WINHTTP_AUTH_SCHEME_NEGOTIATE & supported)) {
|
410
|
+
*allowed_types |= GIT_CREDTYPE_DEFAULT;
|
411
|
+
*auth_mechanism = GIT_WINHTTP_AUTH_NEGOTIATE;
|
412
|
+
}
|
413
|
+
|
340
414
|
return 0;
|
341
415
|
}
|
342
416
|
|
@@ -380,6 +454,59 @@ static int write_chunk(HINTERNET request, const char *buffer, size_t len)
|
|
380
454
|
return 0;
|
381
455
|
}
|
382
456
|
|
457
|
+
static int winhttp_connect(
|
458
|
+
winhttp_subtransport *t,
|
459
|
+
const char *url)
|
460
|
+
{
|
461
|
+
wchar_t *ua = L"git/1.0 (libgit2 " WIDEN(LIBGIT2_VERSION) L")";
|
462
|
+
wchar_t *wide_host;
|
463
|
+
int32_t port;
|
464
|
+
const char *default_port = "80";
|
465
|
+
int error = -1;
|
466
|
+
|
467
|
+
/* Prepare port */
|
468
|
+
if (git__strtol32(&port, t->connection_data.port, NULL, 10) < 0)
|
469
|
+
return -1;
|
470
|
+
|
471
|
+
/* Prepare host */
|
472
|
+
if (git__utf8_to_16_alloc(&wide_host, t->connection_data.host) < 0) {
|
473
|
+
giterr_set(GITERR_OS, "Unable to convert host to wide characters");
|
474
|
+
return -1;
|
475
|
+
}
|
476
|
+
|
477
|
+
/* Establish session */
|
478
|
+
t->session = WinHttpOpen(
|
479
|
+
ua,
|
480
|
+
WINHTTP_ACCESS_TYPE_DEFAULT_PROXY,
|
481
|
+
WINHTTP_NO_PROXY_NAME,
|
482
|
+
WINHTTP_NO_PROXY_BYPASS,
|
483
|
+
0);
|
484
|
+
|
485
|
+
if (!t->session) {
|
486
|
+
giterr_set(GITERR_OS, "Failed to init WinHTTP");
|
487
|
+
goto on_error;
|
488
|
+
}
|
489
|
+
|
490
|
+
/* Establish connection */
|
491
|
+
t->connection = WinHttpConnect(
|
492
|
+
t->session,
|
493
|
+
wide_host,
|
494
|
+
(INTERNET_PORT) port,
|
495
|
+
0);
|
496
|
+
|
497
|
+
if (!t->connection) {
|
498
|
+
giterr_set(GITERR_OS, "Failed to connect to host");
|
499
|
+
goto on_error;
|
500
|
+
}
|
501
|
+
|
502
|
+
error = 0;
|
503
|
+
|
504
|
+
on_error:
|
505
|
+
git__free(wide_host);
|
506
|
+
|
507
|
+
return error;
|
508
|
+
}
|
509
|
+
|
383
510
|
static int winhttp_stream_read(
|
384
511
|
git_smart_subtransport_stream *stream,
|
385
512
|
char *buffer,
|
@@ -511,55 +638,66 @@ replay:
|
|
511
638
|
|
512
639
|
/* Check for Windows 7. This workaround is only necessary on
|
513
640
|
* Windows Vista and earlier. Windows 7 is version 6.1. */
|
514
|
-
|
515
|
-
|
516
|
-
|
517
|
-
|
518
|
-
|
519
|
-
|
520
|
-
|
521
|
-
|
522
|
-
|
523
|
-
|
524
|
-
|
525
|
-
|
526
|
-
|
527
|
-
|
528
|
-
|
529
|
-
}
|
641
|
+
wchar_t *location;
|
642
|
+
DWORD location_length;
|
643
|
+
char *location8;
|
644
|
+
|
645
|
+
/* OK, fetch the Location header from the redirect. */
|
646
|
+
if (WinHttpQueryHeaders(s->request,
|
647
|
+
WINHTTP_QUERY_LOCATION,
|
648
|
+
WINHTTP_HEADER_NAME_BY_INDEX,
|
649
|
+
WINHTTP_NO_OUTPUT_BUFFER,
|
650
|
+
&location_length,
|
651
|
+
WINHTTP_NO_HEADER_INDEX) ||
|
652
|
+
GetLastError() != ERROR_INSUFFICIENT_BUFFER) {
|
653
|
+
giterr_set(GITERR_OS, "Failed to read Location header");
|
654
|
+
return -1;
|
655
|
+
}
|
530
656
|
|
531
|
-
|
532
|
-
|
533
|
-
|
534
|
-
if (!WinHttpQueryHeaders(s->request,
|
535
|
-
WINHTTP_QUERY_LOCATION,
|
536
|
-
WINHTTP_HEADER_NAME_BY_INDEX,
|
537
|
-
location,
|
538
|
-
&location_length,
|
539
|
-
WINHTTP_NO_HEADER_INDEX)) {
|
540
|
-
giterr_set(GITERR_OS, "Failed to read Location header");
|
541
|
-
git__free(location);
|
542
|
-
return -1;
|
543
|
-
}
|
657
|
+
location = git__malloc(location_length);
|
658
|
+
GITERR_CHECK_ALLOC(location);
|
544
659
|
|
545
|
-
|
546
|
-
|
660
|
+
if (!WinHttpQueryHeaders(s->request,
|
661
|
+
WINHTTP_QUERY_LOCATION,
|
662
|
+
WINHTTP_HEADER_NAME_BY_INDEX,
|
663
|
+
location,
|
664
|
+
&location_length,
|
665
|
+
WINHTTP_NO_HEADER_INDEX)) {
|
666
|
+
giterr_set(GITERR_OS, "Failed to read Location header");
|
547
667
|
git__free(location);
|
668
|
+
return -1;
|
669
|
+
}
|
548
670
|
|
549
|
-
|
550
|
-
|
551
|
-
|
552
|
-
|
553
|
-
|
671
|
+
/* Convert the Location header to UTF-8 */
|
672
|
+
if (git__utf16_to_8_alloc(&location8, location) < 0) {
|
673
|
+
giterr_set(GITERR_OS, "Failed to convert Location header to UTF-8");
|
674
|
+
git__free(location);
|
675
|
+
return -1;
|
676
|
+
}
|
554
677
|
|
555
|
-
|
678
|
+
git__free(location);
|
679
|
+
|
680
|
+
/* Replay the request */
|
681
|
+
WinHttpCloseHandle(s->request);
|
682
|
+
s->request = NULL;
|
683
|
+
s->sent_request = 0;
|
684
|
+
|
685
|
+
if (!git__prefixcmp_icase(location8, prefix_https)) {
|
686
|
+
/* Upgrade to secure connection; disconnect and start over */
|
687
|
+
if (gitno_connection_data_from_url(&t->connection_data, location8, s->service_url) < 0) {
|
688
|
+
git__free(location8);
|
689
|
+
return -1;
|
556
690
|
}
|
691
|
+
|
692
|
+
winhttp_connect(t, location8);
|
557
693
|
}
|
694
|
+
|
695
|
+
git__free(location8);
|
696
|
+
goto replay;
|
558
697
|
}
|
559
698
|
|
560
699
|
/* Handle authentication failures */
|
561
|
-
if (HTTP_STATUS_DENIED == status_code &&
|
562
|
-
get_verb == s->verb && t->owner->cred_acquire_cb) {
|
700
|
+
if (HTTP_STATUS_DENIED == status_code && get_verb == s->verb) {
|
563
701
|
int allowed_types;
|
564
702
|
|
565
703
|
if (parse_unauthorized_response(s->request, &allowed_types, &t->auth_mechanism) < 0)
|
@@ -567,18 +705,36 @@ replay:
|
|
567
705
|
|
568
706
|
if (allowed_types &&
|
569
707
|
(!t->cred || 0 == (t->cred->credtype & allowed_types))) {
|
708
|
+
int cred_error = 1;
|
570
709
|
|
571
|
-
|
572
|
-
|
710
|
+
/* Start with the user-supplied credential callback, if present */
|
711
|
+
if (t->owner->cred_acquire_cb) {
|
712
|
+
cred_error = t->owner->cred_acquire_cb(&t->cred, t->owner->url,
|
713
|
+
t->connection_data.user, allowed_types, t->owner->cred_acquire_payload);
|
573
714
|
|
574
|
-
|
715
|
+
if (cred_error < 0)
|
716
|
+
return cred_error;
|
717
|
+
}
|
718
|
+
|
719
|
+
/* Invoke the fallback credentials acquisition callback if necessary */
|
720
|
+
if (cred_error > 0) {
|
721
|
+
cred_error = fallback_cred_acquire_cb(&t->cred, t->owner->url,
|
722
|
+
t->connection_data.user, allowed_types, NULL);
|
723
|
+
|
724
|
+
if (cred_error < 0)
|
725
|
+
return cred_error;
|
726
|
+
}
|
727
|
+
|
728
|
+
if (!cred_error) {
|
729
|
+
assert(t->cred);
|
575
730
|
|
576
|
-
|
577
|
-
|
578
|
-
|
731
|
+
WinHttpCloseHandle(s->request);
|
732
|
+
s->request = NULL;
|
733
|
+
s->sent_request = 0;
|
579
734
|
|
580
|
-
|
581
|
-
|
735
|
+
/* Successfully acquired a credential */
|
736
|
+
goto replay;
|
737
|
+
}
|
582
738
|
}
|
583
739
|
}
|
584
740
|
|
@@ -593,7 +749,11 @@ replay:
|
|
593
749
|
else
|
594
750
|
snprintf(expected_content_type_8, MAX_CONTENT_TYPE_LEN, "application/x-git-%s-advertisement", s->service);
|
595
751
|
|
596
|
-
git__utf8_to_16(expected_content_type, MAX_CONTENT_TYPE_LEN, expected_content_type_8)
|
752
|
+
if (git__utf8_to_16(expected_content_type, MAX_CONTENT_TYPE_LEN, expected_content_type_8) < 0) {
|
753
|
+
giterr_set(GITERR_OS, "Failed to convert expected content-type to wide characters");
|
754
|
+
return -1;
|
755
|
+
}
|
756
|
+
|
597
757
|
content_type_length = sizeof(content_type);
|
598
758
|
|
599
759
|
if (!WinHttpQueryHeaders(s->request,
|
@@ -888,68 +1048,6 @@ static int winhttp_stream_alloc(winhttp_subtransport *t, winhttp_stream **stream
|
|
888
1048
|
return 0;
|
889
1049
|
}
|
890
1050
|
|
891
|
-
static int winhttp_connect(
|
892
|
-
winhttp_subtransport *t,
|
893
|
-
const char *url)
|
894
|
-
{
|
895
|
-
wchar_t *ua = L"git/1.0 (libgit2 " WIDEN(LIBGIT2_VERSION) L")";
|
896
|
-
wchar_t host[GIT_WIN_PATH];
|
897
|
-
int32_t port;
|
898
|
-
const char *default_port = "80";
|
899
|
-
int ret;
|
900
|
-
|
901
|
-
if (!git__prefixcmp(url, prefix_http)) {
|
902
|
-
url = url + strlen(prefix_http);
|
903
|
-
default_port = "80";
|
904
|
-
}
|
905
|
-
|
906
|
-
if (!git__prefixcmp(url, prefix_https)) {
|
907
|
-
url += strlen(prefix_https);
|
908
|
-
default_port = "443";
|
909
|
-
t->use_ssl = 1;
|
910
|
-
}
|
911
|
-
|
912
|
-
if ((ret = gitno_extract_url_parts(&t->host, &t->port, &t->user_from_url,
|
913
|
-
&t->pass_from_url, url, default_port)) < 0)
|
914
|
-
return ret;
|
915
|
-
|
916
|
-
t->path = strchr(url, '/');
|
917
|
-
|
918
|
-
/* Prepare port */
|
919
|
-
if (git__strtol32(&port, t->port, NULL, 10) < 0)
|
920
|
-
return -1;
|
921
|
-
|
922
|
-
/* Prepare host */
|
923
|
-
git__utf8_to_16(host, GIT_WIN_PATH, t->host);
|
924
|
-
|
925
|
-
/* Establish session */
|
926
|
-
t->session = WinHttpOpen(
|
927
|
-
ua,
|
928
|
-
WINHTTP_ACCESS_TYPE_DEFAULT_PROXY,
|
929
|
-
WINHTTP_NO_PROXY_NAME,
|
930
|
-
WINHTTP_NO_PROXY_BYPASS,
|
931
|
-
0);
|
932
|
-
|
933
|
-
if (!t->session) {
|
934
|
-
giterr_set(GITERR_OS, "Failed to init WinHTTP");
|
935
|
-
return -1;
|
936
|
-
}
|
937
|
-
|
938
|
-
/* Establish connection */
|
939
|
-
t->connection = WinHttpConnect(
|
940
|
-
t->session,
|
941
|
-
host,
|
942
|
-
port,
|
943
|
-
0);
|
944
|
-
|
945
|
-
if (!t->connection) {
|
946
|
-
giterr_set(GITERR_OS, "Failed to connect to host");
|
947
|
-
return -1;
|
948
|
-
}
|
949
|
-
|
950
|
-
return 0;
|
951
|
-
}
|
952
|
-
|
953
1051
|
static int winhttp_uploadpack_ls(
|
954
1052
|
winhttp_subtransport *t,
|
955
1053
|
winhttp_stream *s)
|
@@ -989,7 +1087,7 @@ static int winhttp_receivepack(
|
|
989
1087
|
{
|
990
1088
|
/* WinHTTP only supports Transfer-Encoding: chunked
|
991
1089
|
* on Windows Vista (NT 6.0) and higher. */
|
992
|
-
s->chunked = git_has_win32_version(6, 0);
|
1090
|
+
s->chunked = git_has_win32_version(6, 0, 0);
|
993
1091
|
|
994
1092
|
if (s->chunked)
|
995
1093
|
s->parent.write = winhttp_stream_write_chunked;
|
@@ -1013,9 +1111,10 @@ static int winhttp_action(
|
|
1013
1111
|
winhttp_stream *s;
|
1014
1112
|
int ret = -1;
|
1015
1113
|
|
1016
|
-
if (!t->connection
|
1017
|
-
|
1018
|
-
|
1114
|
+
if (!t->connection)
|
1115
|
+
if (gitno_connection_data_from_url(&t->connection_data, url, NULL) < 0 ||
|
1116
|
+
winhttp_connect(t, url) < 0)
|
1117
|
+
return -1;
|
1019
1118
|
|
1020
1119
|
if (winhttp_stream_alloc(t, &s) < 0)
|
1021
1120
|
return -1;
|
@@ -1056,25 +1155,7 @@ static int winhttp_close(git_smart_subtransport *subtransport)
|
|
1056
1155
|
winhttp_subtransport *t = (winhttp_subtransport *)subtransport;
|
1057
1156
|
int ret = 0;
|
1058
1157
|
|
1059
|
-
|
1060
|
-
git__free(t->host);
|
1061
|
-
t->host = NULL;
|
1062
|
-
}
|
1063
|
-
|
1064
|
-
if (t->port) {
|
1065
|
-
git__free(t->port);
|
1066
|
-
t->port = NULL;
|
1067
|
-
}
|
1068
|
-
|
1069
|
-
if (t->user_from_url) {
|
1070
|
-
git__free(t->user_from_url);
|
1071
|
-
t->user_from_url = NULL;
|
1072
|
-
}
|
1073
|
-
|
1074
|
-
if (t->pass_from_url) {
|
1075
|
-
git__free(t->pass_from_url);
|
1076
|
-
t->pass_from_url = NULL;
|
1077
|
-
}
|
1158
|
+
gitno_connection_data_free_ptrs(&t->connection_data);
|
1078
1159
|
|
1079
1160
|
if (t->cred) {
|
1080
1161
|
t->cred->free(t->cred);
|