Blob

Date:
Message:
fix an issue where 'git fetch' would error or hang against gotd If Git has more than 16 have-lines to send it will send a flush-pkt followed by more have-lines. Due to a misunderstanding on my part, gotd didn't like this because it assumed that the flush-pkt terminates the list. Add a test coverage in a new file which we can use to test Git interop issues. Fixes a problem seen by Thomas Adam upon git fetch from got.g.o.
Actions:
History | Blame | Raw File
1 .include "../../got-version.mk"

3 REGRESS_TARGETS=test_repo_read test_repo_read_group \

4 	test_repo_read_denied_user test_repo_read_denied_group \

5 	test_repo_read_bad_user test_repo_read_bad_group \

6 	test_repo_write test_repo_write_empty test_request_bad \

7 	test_repo_write_protected test_repo_write_readonly \

8 	test_email_notification test_http_notification \

9 	test_git_interop

10 NOOBJ=Yes

11 CLEANFILES=gotd.conf

13 .PHONY: ensure_root prepare_test_repo check_test_repo start_gotd

15 GOTD_TEST_ROOT=/tmp

16 GOTD_DEVUSER?=gotdev

17 GOTD_DEVUSER_HOME!=userinfo $(GOTD_DEVUSER) | awk '/^dir/ {print $$2}'

18 GOTD_TEST_REPO!?=mktemp -d "$(GOTD_TEST_ROOT)/gotd-test-repo-XXXXXXXXXX"

19 GOTD_TEST_REPO_NAME=test-repo

20 GOTD_TEST_REPO_URL=ssh://${GOTD_DEVUSER}@127.0.0.1/$(GOTD_TEST_REPO_NAME)

21 GOTD_TEST_SMTP_PORT=2525

22 GOTD_TEST_HTTP_PORT=8000

24 GOTD_TEST_USER?=${DOAS_USER}

25 .if empty(GOTD_TEST_USER)

26 GOTD_TEST_USER=${SUDO_USER}

27 .endif

28 .if empty(GOTD_TEST_USER)

29 GOTD_TEST_USER=${USER}

30 .endif

31 GOTD_TEST_USER_HOME!=userinfo $(GOTD_TEST_USER) | awk '/^dir/ {print $$2}'

33 # gotd.conf parameters

34 GOTD_USER?=got

35 GOTD_SOCK=${GOTD_DEVUSER_HOME}/gotd.sock

37 .if "${GOT_RELEASE}" == "Yes"

38 PREFIX ?= /usr/local

39 BINDIR ?= ${PREFIX}/bin

40 .else

41 PREFIX ?= ${GOTD_TEST_USER_HOME}

42 BINDIR ?= ${PREFIX}/bin

43 .endif

45 GOTD_START_CMD?=env ${GOTD_ENV} $(BINDIR)/gotd -vv -f $(PWD)/gotd.conf

46 GOTD_STOP_CMD?=$(BINDIR)/gotctl -f $(GOTD_SOCK) stop

47 GOTD_TRAP=trap "$(GOTD_STOP_CMD)" HUP INT QUIT PIPE TERM

49 GOTD_ENV=GOT_NOTIFY_EMAIL_TIMEOUT=1

51 GOTD_TEST_ENV=GOTD_TEST_ROOT=$(GOTD_TEST_ROOT) \

52 	GOTD_TEST_REPO_URL=$(GOTD_TEST_REPO_URL) \

53 	GOTD_TEST_REPO_NAME=$(GOTD_TEST_REPO_NAME) \

54 	GOTD_TEST_REPO=$(GOTD_TEST_REPO) \

55 	GOTD_SOCK=$(GOTD_SOCK) \

56 	GOTD_DEVUSER=$(GOTD_DEVUSER) \

57 	GOTD_USER=$(GOTD_USER) \

58 	GOTD_TEST_SMTP_PORT=$(GOTD_TEST_SMTP_PORT) \

59 	GOTD_TEST_HTTP_PORT=$(GOTD_TEST_HTTP_PORT) \

60 	HOME=$(GOTD_TEST_USER_HOME) \

61 	PATH=$(GOTD_TEST_USER_HOME)/bin:$(PATH)

63 ensure_root:

64 	@if [[ `id -u` -ne 0 ]]; then \

65 		echo gotd test suite must be started by root >&2; \

66 		false; \

67 	fi ; \

68 	if [[ "$(GOTD_TEST_USER)" = "root" ]]; then \

69 		echo GOTD_TEST_USER must be a non-root user >&2; \

70 		false; \

71 	fi

73 start_gotd_ro: ensure_root

74 	@echo 'listen on "$(GOTD_SOCK)"' > $(PWD)/gotd.conf

75 	@echo "user $(GOTD_USER)" >> $(PWD)/gotd.conf

76 	@echo 'repository "test-repo" {' >> $(PWD)/gotd.conf

77 	@echo '    path "$(GOTD_TEST_REPO)"' >> $(PWD)/gotd.conf

78 	@echo '    permit ro $(GOTD_DEVUSER)' >> $(PWD)/gotd.conf

79 	@echo "}" >> $(PWD)/gotd.conf

80 	@$(GOTD_TRAP); $(GOTD_START_CMD)

81 	@$(GOTD_TRAP); sleep .5

83 start_gotd_implicit_ro: ensure_root

84 	@echo 'listen on "$(GOTD_SOCK)"' > $(PWD)/gotd.conf

85 	@echo "user $(GOTD_USER)" >> $(PWD)/gotd.conf

86 	@echo 'repository "test-repo" {' >> $(PWD)/gotd.conf

87 	@echo '    path "$(GOTD_TEST_REPO)"' >> $(PWD)/gotd.conf

88 	@echo "}" >> $(PWD)/gotd.conf

89 	@$(GOTD_TRAP); $(GOTD_START_CMD)

90 	@$(GOTD_TRAP); sleep .5

92 start_gotd_ro_group: ensure_root

93 	@echo 'listen on "$(GOTD_SOCK)"' > $(PWD)/gotd.conf

94 	@echo "user $(GOTD_USER)" >> $(PWD)/gotd.conf

95 	@echo 'repository "test-repo" {' >> $(PWD)/gotd.conf

96 	@echo '    path "$(GOTD_TEST_REPO)"' >> $(PWD)/gotd.conf

97 	@echo '    permit ro :$(GOTD_DEVUSER)' >> $(PWD)/gotd.conf

98 	@echo "}" >> $(PWD)/gotd.conf

99 	@$(GOTD_TRAP); $(GOTD_START_CMD)

100 	@$(GOTD_TRAP); sleep .5

102 # try a permit rule followed by a deny rule; last matched rule wins

103 start_gotd_ro_denied_user: ensure_root

104 	@echo 'listen on "$(GOTD_SOCK)"' > $(PWD)/gotd.conf

105 	@echo "user $(GOTD_USER)" >> $(PWD)/gotd.conf

106 	@echo 'repository "test-repo" {' >> $(PWD)/gotd.conf

107 	@echo '    path "$(GOTD_TEST_REPO)"' >> $(PWD)/gotd.conf

108 	@echo '    permit ro $(GOTD_DEVUSER)' >> $(PWD)/gotd.conf

109 	@echo '    deny $(GOTD_DEVUSER)' >> $(PWD)/gotd.conf

110 	@echo "}" >> $(PWD)/gotd.conf

111 	@$(GOTD_TRAP); $(GOTD_START_CMD)

112 	@$(GOTD_TRAP); sleep .5

114 # try a permit rule followed by a deny rule; last matched rule wins

115 start_gotd_ro_denied_group: ensure_root

116 	@echo 'listen on "$(GOTD_SOCK)"' > $(PWD)/gotd.conf

117 	@echo "user $(GOTD_USER)" >> $(PWD)/gotd.conf

118 	@echo 'repository "test-repo" {' >> $(PWD)/gotd.conf

119 	@echo '    path "$(GOTD_TEST_REPO)"' >> $(PWD)/gotd.conf

120 	@echo '    permit ro $(GOTD_DEVUSER)' >> $(PWD)/gotd.conf

121 	@echo '    deny :$(GOTD_DEVUSER)' >> $(PWD)/gotd.conf

122 	@echo "}" >> $(PWD)/gotd.conf

123 	@$(GOTD_TRAP); $(GOTD_START_CMD)

124 	@$(GOTD_TRAP); sleep .5

126 # $GOTD_DEVUSER should not equal $GOTD_USER

127 start_gotd_ro_bad_user: ensure_root

128 	@echo 'listen on "$(GOTD_SOCK)"' > $(PWD)/gotd.conf

129 	@echo "user $(GOTD_USER)" >> $(PWD)/gotd.conf

130 	@echo 'repository "test-repo" {' >> $(PWD)/gotd.conf

131 	@echo '    path "$(GOTD_TEST_REPO)"' >> $(PWD)/gotd.conf

132 	@echo '    permit ro $(GOTD_USER)' >> $(PWD)/gotd.conf

133 	@echo "}" >> $(PWD)/gotd.conf

134 	@$(GOTD_TRAP); $(GOTD_START_CMD)

135 	@$(GOTD_TRAP); sleep .5

137 # $GOTD_DEVUSER should not be in group wheel

138 start_gotd_ro_bad_group: ensure_root

139 	@echo 'listen on "$(GOTD_SOCK)"' > $(PWD)/gotd.conf

140 	@echo "user $(GOTD_USER)" >> $(PWD)/gotd.conf

141 	@echo 'repository "test-repo" {' >> $(PWD)/gotd.conf

142 	@echo '    path "$(GOTD_TEST_REPO)"' >> $(PWD)/gotd.conf

143 	@echo '    permit ro :wheel' >> $(PWD)/gotd.conf

144 	@echo "}" >> $(PWD)/gotd.conf

145 	@$(GOTD_TRAP); $(GOTD_START_CMD)

146 	@$(GOTD_TRAP); sleep .5

148 start_gotd_rw: ensure_root

149 	@echo 'listen on "$(GOTD_SOCK)"' > $(PWD)/gotd.conf

150 	@echo "user $(GOTD_USER)" >> $(PWD)/gotd.conf

151 	@echo 'repository "test-repo" {' >> $(PWD)/gotd.conf

152 	@echo '    path "$(GOTD_TEST_REPO)"' >> $(PWD)/gotd.conf

153 	@echo '    permit rw $(GOTD_DEVUSER)' >> $(PWD)/gotd.conf

154 	@echo "}" >> $(PWD)/gotd.conf

155 	@$(GOTD_TRAP); $(GOTD_START_CMD)

156 	@$(GOTD_TRAP); sleep .5

158 start_gotd_rw_protected: ensure_root

159 	@echo 'listen on "$(GOTD_SOCK)"' > $(PWD)/gotd.conf

160 	@echo "user $(GOTD_USER)" >> $(PWD)/gotd.conf

161 	@echo 'repository "test-repo" {' >> $(PWD)/gotd.conf

162 	@echo '    path "$(GOTD_TEST_REPO)"' >> $(PWD)/gotd.conf

163 	@echo '    permit rw $(GOTD_DEVUSER)' >> $(PWD)/gotd.conf

164 	@echo '    protect branch "foo"' >> $(PWD)/gotd.conf

165 	@echo '    protect tag namespace "refs/tags/"' >> $(PWD)/gotd.conf

166 	@echo '    protect branch "refs/heads/main"' >> $(PWD)/gotd.conf

167 	@echo "}" >> $(PWD)/gotd.conf

168 	@$(GOTD_TRAP); $(GOTD_START_CMD)

169 	@$(GOTD_TRAP); sleep .5

171 start_gotd_email_notification: ensure_root

172 	@echo 'listen on "$(GOTD_SOCK)"' > $(PWD)/gotd.conf

173 	@echo "user $(GOTD_USER)" >> $(PWD)/gotd.conf

174 	@echo 'repository "test-repo" {' >> $(PWD)/gotd.conf

175 	@echo '    path "$(GOTD_TEST_REPO)"' >> $(PWD)/gotd.conf

176 	@echo '    permit rw $(GOTD_DEVUSER)' >> $(PWD)/gotd.conf

177 	@echo '    notify {' >> $(PWD)/gotd.conf

178 	@echo -n '      email to ${GOTD_DEVUSER}' >> $(PWD)/gotd.conf

179 	@echo ' relay 127.0.0.1 port ${GOTD_TEST_SMTP_PORT}' >> $(PWD)/gotd.conf

180 	@echo "    }" >> $(PWD)/gotd.conf

181 	@echo "}" >> $(PWD)/gotd.conf

182 	@$(GOTD_TRAP); $(GOTD_START_CMD)

183 	@$(GOTD_TRAP); sleep .5

185 start_gotd_http_notification: ensure_root

186 	@echo 'listen on "$(GOTD_SOCK)"' > $(PWD)/gotd.conf

187 	@echo "user $(GOTD_USER)" >> $(PWD)/gotd.conf

188 	@echo 'repository "test-repo" {' >> $(PWD)/gotd.conf

189 	@echo '    path "$(GOTD_TEST_REPO)"' >> $(PWD)/gotd.conf

190 	@echo '    permit rw $(GOTD_DEVUSER)' >> $(PWD)/gotd.conf

191 	@echo '    notify {' >> $(PWD)/gotd.conf

192 	@echo '         url "http://localhost:${GOTD_TEST_HTTP_PORT}/" user flan password "password" insecure' >> $(PWD)/gotd.conf

193 	@echo "    }" >> $(PWD)/gotd.conf

194 	@echo "}" >> $(PWD)/gotd.conf

195 	@$(GOTD_TRAP); $(GOTD_START_CMD)

196 	@$(GOTD_TRAP); sleep .5

198 prepare_test_repo: ensure_root

199 	@chown ${GOTD_USER} "${GOTD_TEST_REPO}"

200 	@su -m ${GOTD_USER} -c 'env $(GOTD_TEST_ENV) sh ./prepare_test_repo.sh'

202 prepare_test_repo_empty: ensure_root

203 	@chown ${GOTD_USER} "${GOTD_TEST_REPO}"

204 	@su -m ${GOTD_USER} -c 'env $(GOTD_TEST_ENV) sh ./prepare_test_repo.sh 1'

206 test_repo_read: prepare_test_repo start_gotd_ro

207 	@-$(GOTD_TRAP); su ${GOTD_TEST_USER} -c \

208 		'env $(GOTD_TEST_ENV) sh ./repo_read.sh'

209 	@$(GOTD_STOP_CMD) 2>/dev/null

210 	@su -m ${GOTD_USER} -c 'env $(GOTD_TEST_ENV) sh ./check_test_repo.sh'

212 test_repo_read_group: prepare_test_repo start_gotd_ro_group

213 	@-$(GOTD_TRAP); su ${GOTD_TEST_USER} -c \

214 		'env $(GOTD_TEST_ENV) sh ./repo_read.sh'

215 	@$(GOTD_STOP_CMD) 2>/dev/null

216 	@su -m ${GOTD_USER} -c 'env $(GOTD_TEST_ENV) sh ./check_test_repo.sh'

218 test_repo_read_denied_user: prepare_test_repo start_gotd_ro_denied_user

219 	@-$(GOTD_TRAP); su ${GOTD_TEST_USER} -c \

220 		'env $(GOTD_TEST_ENV) sh ./repo_read_access_denied.sh'

221 	@$(GOTD_STOP_CMD) 2>/dev/null

222 	@su -m ${GOTD_USER} -c 'env $(GOTD_TEST_ENV) sh ./check_test_repo.sh'

224 test_repo_read_denied_group: prepare_test_repo start_gotd_ro_denied_group

225 	@-$(GOTD_TRAP); su ${GOTD_TEST_USER} -c \

226 		'env $(GOTD_TEST_ENV) sh ./repo_read_access_denied.sh'

227 	@$(GOTD_STOP_CMD) 2>/dev/null

228 	@su -m ${GOTD_USER} -c 'env $(GOTD_TEST_ENV) sh ./check_test_repo.sh'

230 test_repo_read_bad_user: prepare_test_repo start_gotd_ro_bad_user

231 	@-$(GOTD_TRAP); su ${GOTD_TEST_USER} -c \

232 		'env $(GOTD_TEST_ENV) sh ./repo_read_access_denied.sh'

233 	@$(GOTD_STOP_CMD) 2>/dev/null

234 	@su -m ${GOTD_USER} -c 'env $(GOTD_TEST_ENV) sh ./check_test_repo.sh'

236 test_repo_read_bad_group: prepare_test_repo start_gotd_ro_bad_group

237 	@-$(GOTD_TRAP); su ${GOTD_TEST_USER} -c \

238 		'env $(GOTD_TEST_ENV) sh ./repo_read_access_denied.sh'

239 	@$(GOTD_STOP_CMD) 2>/dev/null

240 	@su -m ${GOTD_USER} -c 'env $(GOTD_TEST_ENV) sh ./check_test_repo.sh'

242 test_repo_write: prepare_test_repo start_gotd_rw

243 	@-$(GOTD_TRAP); su ${GOTD_TEST_USER} -c \

244 		'env $(GOTD_TEST_ENV) sh ./repo_write.sh'

245 	@$(GOTD_STOP_CMD) 2>/dev/null

246 	@su -m ${GOTD_USER} -c 'env $(GOTD_TEST_ENV) sh ./check_test_repo.sh'

248 test_repo_write_empty: prepare_test_repo_empty start_gotd_rw

249 	@-$(GOTD_TRAP); su ${GOTD_TEST_USER} -c \

250 		'env $(GOTD_TEST_ENV) sh ./repo_write_empty.sh'

251 	@$(GOTD_STOP_CMD) 2>/dev/null

252 	@su -m ${GOTD_USER} -c 'env $(GOTD_TEST_ENV) sh ./check_test_repo.sh'

254 test_repo_write_protected: prepare_test_repo start_gotd_rw_protected

255 	@-$(GOTD_TRAP); su ${GOTD_TEST_USER} -c \

256 		'env $(GOTD_TEST_ENV) sh ./repo_write_protected.sh'

257 	@$(GOTD_STOP_CMD) 2>/dev/null

258 	@su -m ${GOTD_USER} -c 'env $(GOTD_TEST_ENV) sh ./check_test_repo.sh'

260 test_repo_write_readonly: prepare_test_repo_empty start_gotd_implicit_ro

261 	@-$(GOTD_TRAP); su ${GOTD_TEST_USER} -c \

262 		'env $(GOTD_TEST_ENV) sh ./repo_write_readonly.sh'

263 	@$(GOTD_STOP_CMD) 2>/dev/null

264 	@su -m ${GOTD_USER} -c 'env $(GOTD_TEST_ENV) sh ./check_test_repo.sh'

266 test_request_bad: prepare_test_repo_empty start_gotd_ro

267 	@-$(GOTD_TRAP); su -m ${GOTD_TEST_USER} -c \

268 		'env $(GOTD_TEST_ENV) sh ./request_bad.sh'

269 	@$(GOTD_STOP_CMD) 2>/dev/null

271 test_email_notification: prepare_test_repo start_gotd_email_notification

272 	@-$(GOTD_TRAP); su -m ${GOTD_TEST_USER} -c \

273 		'env $(GOTD_TEST_ENV) sh ./email_notification.sh'

274 	@$(GOTD_STOP_CMD) 2>/dev/null

276 test_http_notification: prepare_test_repo start_gotd_http_notification

277 	@-$(GOTD_TRAP); su -m ${GOTD_TEST_USER} -c \

278 		'env $(GOTD_TEST_ENV) sh ./http_notification.sh'

279 	@$(GOTD_STOP_CMD) 2>/dev/null

281 test_git_interop: prepare_test_repo start_gotd_rw

282 	@-$(GOTD_TRAP); su ${GOTD_TEST_USER} -c \

283 		'env $(GOTD_TEST_ENV) sh ./test_git_interop.sh'

284 	@$(GOTD_STOP_CMD) 2>/dev/null

285 	@su -m ${GOTD_USER} -c 'env $(GOTD_TEST_ENV) sh ./check_test_repo.sh'

287 .include <bsd.regress.mk>