In order to communicate the protocol supported by the server side, add support for advertising the object-format capability. We check that the client side sends us an identical algorithm if it sends us its own object-format capability, and assume it speaks SHA-1 if not. In the test, when we're using an algorithm other than SHA-1, we need to specify the algorithm in use so we don't get a failure with an "unknown format" message. Add a test that we handle a mismatched algorithm. Remove the test_oid_init call since it's no longer necessary. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
		
			
				
	
	
		
			241 lines
		
	
	
		
			5.4 KiB
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
			
		
		
	
	
			241 lines
		
	
	
		
			5.4 KiB
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
#!/bin/sh
 | 
						|
 | 
						|
test_description='test protocol v2 server commands'
 | 
						|
 | 
						|
. ./test-lib.sh
 | 
						|
 | 
						|
test_expect_success 'test capability advertisement' '
 | 
						|
	test_oid_cache <<-EOF &&
 | 
						|
	wrong_algo sha1:sha256
 | 
						|
	wrong_algo sha256:sha1
 | 
						|
	EOF
 | 
						|
	cat >expect <<-EOF &&
 | 
						|
	version 2
 | 
						|
	agent=git/$(git version | cut -d" " -f3)
 | 
						|
	ls-refs
 | 
						|
	fetch=shallow
 | 
						|
	server-option
 | 
						|
	object-format=$(test_oid algo)
 | 
						|
	0000
 | 
						|
	EOF
 | 
						|
 | 
						|
	GIT_TEST_SIDEBAND_ALL=0 test-tool serve-v2 \
 | 
						|
		--advertise-capabilities >out &&
 | 
						|
	test-tool pkt-line unpack <out >actual &&
 | 
						|
	test_cmp expect actual
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success 'stateless-rpc flag does not list capabilities' '
 | 
						|
	# Empty request
 | 
						|
	test-tool pkt-line pack >in <<-EOF &&
 | 
						|
	0000
 | 
						|
	EOF
 | 
						|
	test-tool serve-v2 --stateless-rpc >out <in &&
 | 
						|
	test_must_be_empty out &&
 | 
						|
 | 
						|
	# EOF
 | 
						|
	test-tool serve-v2 --stateless-rpc >out &&
 | 
						|
	test_must_be_empty out
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success 'request invalid capability' '
 | 
						|
	test-tool pkt-line pack >in <<-EOF &&
 | 
						|
	foobar
 | 
						|
	0000
 | 
						|
	EOF
 | 
						|
	test_must_fail test-tool serve-v2 --stateless-rpc 2>err <in &&
 | 
						|
	test_i18ngrep "unknown capability" err
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success 'request with no command' '
 | 
						|
	test-tool pkt-line pack >in <<-EOF &&
 | 
						|
	agent=git/test
 | 
						|
	object-format=$(test_oid algo)
 | 
						|
	0000
 | 
						|
	EOF
 | 
						|
	test_must_fail test-tool serve-v2 --stateless-rpc 2>err <in &&
 | 
						|
	test_i18ngrep "no command requested" err
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success 'request invalid command' '
 | 
						|
	test-tool pkt-line pack >in <<-EOF &&
 | 
						|
	command=foo
 | 
						|
	object-format=$(test_oid algo)
 | 
						|
	agent=git/test
 | 
						|
	0000
 | 
						|
	EOF
 | 
						|
	test_must_fail test-tool serve-v2 --stateless-rpc 2>err <in &&
 | 
						|
	test_i18ngrep "invalid command" err
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success 'wrong object-format' '
 | 
						|
	test-tool pkt-line pack >in <<-EOF &&
 | 
						|
	command=fetch
 | 
						|
	agent=git/test
 | 
						|
	object-format=$(test_oid wrong_algo)
 | 
						|
	0000
 | 
						|
	EOF
 | 
						|
	test_must_fail test-tool serve-v2 --stateless-rpc 2>err <in &&
 | 
						|
	test_i18ngrep "mismatched object format" err
 | 
						|
'
 | 
						|
 | 
						|
# Test the basics of ls-refs
 | 
						|
#
 | 
						|
test_expect_success 'setup some refs and tags' '
 | 
						|
	test_commit one &&
 | 
						|
	git branch dev master &&
 | 
						|
	test_commit two &&
 | 
						|
	git symbolic-ref refs/heads/release refs/heads/master &&
 | 
						|
	git tag -a -m "annotated tag" annotated-tag
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success 'basics of ls-refs' '
 | 
						|
	test-tool pkt-line pack >in <<-EOF &&
 | 
						|
	command=ls-refs
 | 
						|
	object-format=$(test_oid algo)
 | 
						|
	0000
 | 
						|
	EOF
 | 
						|
 | 
						|
	cat >expect <<-EOF &&
 | 
						|
	$(git rev-parse HEAD) HEAD
 | 
						|
	$(git rev-parse refs/heads/dev) refs/heads/dev
 | 
						|
	$(git rev-parse refs/heads/master) refs/heads/master
 | 
						|
	$(git rev-parse refs/heads/release) refs/heads/release
 | 
						|
	$(git rev-parse refs/tags/annotated-tag) refs/tags/annotated-tag
 | 
						|
	$(git rev-parse refs/tags/one) refs/tags/one
 | 
						|
	$(git rev-parse refs/tags/two) refs/tags/two
 | 
						|
	0000
 | 
						|
	EOF
 | 
						|
 | 
						|
	test-tool serve-v2 --stateless-rpc <in >out &&
 | 
						|
	test-tool pkt-line unpack <out >actual &&
 | 
						|
	test_cmp expect actual
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success 'basic ref-prefixes' '
 | 
						|
	test-tool pkt-line pack >in <<-EOF &&
 | 
						|
	command=ls-refs
 | 
						|
	object-format=$(test_oid algo)
 | 
						|
	0001
 | 
						|
	ref-prefix refs/heads/master
 | 
						|
	ref-prefix refs/tags/one
 | 
						|
	0000
 | 
						|
	EOF
 | 
						|
 | 
						|
	cat >expect <<-EOF &&
 | 
						|
	$(git rev-parse refs/heads/master) refs/heads/master
 | 
						|
	$(git rev-parse refs/tags/one) refs/tags/one
 | 
						|
	0000
 | 
						|
	EOF
 | 
						|
 | 
						|
	test-tool serve-v2 --stateless-rpc <in >out &&
 | 
						|
	test-tool pkt-line unpack <out >actual &&
 | 
						|
	test_cmp expect actual
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success 'refs/heads prefix' '
 | 
						|
	test-tool pkt-line pack >in <<-EOF &&
 | 
						|
	command=ls-refs
 | 
						|
	object-format=$(test_oid algo)
 | 
						|
	0001
 | 
						|
	ref-prefix refs/heads/
 | 
						|
	0000
 | 
						|
	EOF
 | 
						|
 | 
						|
	cat >expect <<-EOF &&
 | 
						|
	$(git rev-parse refs/heads/dev) refs/heads/dev
 | 
						|
	$(git rev-parse refs/heads/master) refs/heads/master
 | 
						|
	$(git rev-parse refs/heads/release) refs/heads/release
 | 
						|
	0000
 | 
						|
	EOF
 | 
						|
 | 
						|
	test-tool serve-v2 --stateless-rpc <in >out &&
 | 
						|
	test-tool pkt-line unpack <out >actual &&
 | 
						|
	test_cmp expect actual
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success 'peel parameter' '
 | 
						|
	test-tool pkt-line pack >in <<-EOF &&
 | 
						|
	command=ls-refs
 | 
						|
	object-format=$(test_oid algo)
 | 
						|
	0001
 | 
						|
	peel
 | 
						|
	ref-prefix refs/tags/
 | 
						|
	0000
 | 
						|
	EOF
 | 
						|
 | 
						|
	cat >expect <<-EOF &&
 | 
						|
	$(git rev-parse refs/tags/annotated-tag) refs/tags/annotated-tag peeled:$(git rev-parse refs/tags/annotated-tag^{})
 | 
						|
	$(git rev-parse refs/tags/one) refs/tags/one
 | 
						|
	$(git rev-parse refs/tags/two) refs/tags/two
 | 
						|
	0000
 | 
						|
	EOF
 | 
						|
 | 
						|
	test-tool serve-v2 --stateless-rpc <in >out &&
 | 
						|
	test-tool pkt-line unpack <out >actual &&
 | 
						|
	test_cmp expect actual
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success 'symrefs parameter' '
 | 
						|
	test-tool pkt-line pack >in <<-EOF &&
 | 
						|
	command=ls-refs
 | 
						|
	object-format=$(test_oid algo)
 | 
						|
	0001
 | 
						|
	symrefs
 | 
						|
	ref-prefix refs/heads/
 | 
						|
	0000
 | 
						|
	EOF
 | 
						|
 | 
						|
	cat >expect <<-EOF &&
 | 
						|
	$(git rev-parse refs/heads/dev) refs/heads/dev
 | 
						|
	$(git rev-parse refs/heads/master) refs/heads/master
 | 
						|
	$(git rev-parse refs/heads/release) refs/heads/release symref-target:refs/heads/master
 | 
						|
	0000
 | 
						|
	EOF
 | 
						|
 | 
						|
	test-tool serve-v2 --stateless-rpc <in >out &&
 | 
						|
	test-tool pkt-line unpack <out >actual &&
 | 
						|
	test_cmp expect actual
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success 'sending server-options' '
 | 
						|
	test-tool pkt-line pack >in <<-EOF &&
 | 
						|
	command=ls-refs
 | 
						|
	object-format=$(test_oid algo)
 | 
						|
	server-option=hello
 | 
						|
	server-option=world
 | 
						|
	0001
 | 
						|
	ref-prefix HEAD
 | 
						|
	0000
 | 
						|
	EOF
 | 
						|
 | 
						|
	cat >expect <<-EOF &&
 | 
						|
	$(git rev-parse HEAD) HEAD
 | 
						|
	0000
 | 
						|
	EOF
 | 
						|
 | 
						|
	test-tool serve-v2 --stateless-rpc <in >out &&
 | 
						|
	test-tool pkt-line unpack <out >actual &&
 | 
						|
	test_cmp expect actual
 | 
						|
'
 | 
						|
 | 
						|
test_expect_success 'unexpected lines are not allowed in fetch request' '
 | 
						|
	git init server &&
 | 
						|
 | 
						|
	test-tool pkt-line pack >in <<-EOF &&
 | 
						|
	command=fetch
 | 
						|
	object-format=$(test_oid algo)
 | 
						|
	0001
 | 
						|
	this-is-not-a-command
 | 
						|
	0000
 | 
						|
	EOF
 | 
						|
 | 
						|
	(
 | 
						|
		cd server &&
 | 
						|
		test_must_fail test-tool serve-v2 --stateless-rpc
 | 
						|
	) <in >/dev/null 2>err &&
 | 
						|
	grep "unexpected line: .this-is-not-a-command." err
 | 
						|
'
 | 
						|
 | 
						|
test_done
 |