Skip to content

Commit cd94b0d

Browse files
authored
Merge branch 'master' into lunny/change_hook_task_type
2 parents d78d218 + 18712ea commit cd94b0d

File tree

31 files changed

+363
-295
lines changed

31 files changed

+363
-295
lines changed

CHANGELOG.md

Lines changed: 43 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,17 @@ This changelog goes through all the changes that have been made in each release
44
without substantial changes to our git log; to see the highlights of what has
55
been added to each release, please refer to the [blog](https://blog.gitea.io).
66

7-
## [1.13.0-RC1](https://github.com/go-gitea/gitea/releases/tag/v1.13.0-rc1) - 2020-10-14
8-
7+
## [1.13.0](https://github.com/go-gitea/gitea/releases/tag/v1.13.0) - 2020-12-01
98
* SECURITY
9+
* Add Allow-/Block-List for Migrate & Mirrors (#13610) (#13776)
10+
* Prevent git operations for inactive users (#13527) (#13536)
11+
* Disallow urlencoded new lines in git protocol paths if there is a port (#13521) (#13524)
1012
* Mitigate Security vulnerability in the git hook feature (#13058)
1113
* Disable DSA ssh keys by default (#13056)
1214
* Set TLS minimum version to 1.2 (#12689)
1315
* Use argon as default password hash algorithm (#12688)
1416
* BREAKING
17+
* Set RUN_MODE prod by default (#13765) (#13767)
1518
* Don't replace underscores in auto-generated IDs in goldmark (#12805)
1619
* Add Primary Key to Topic and RepoTopic tables (#12639)
1720
* Disable password complexity check default (#12557)
@@ -71,6 +74,40 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
7174
* Add endpoint for Branch Creation (#11607)
7275
* Add pagination headers on endpoints that support total count from database (#11145)
7376
* BUGFIXES
77+
* Fix bogus http requests on diffs (#13760) (#13761)
78+
* Show 'owner' tag for real owner (#13689) (#13743)
79+
* Validate email before inserting/updating (#13475) (#13666)
80+
* Fix issue/pull request list assignee filter (#13647) (#13651)
81+
* Gitlab migration support for subdirectories (#13563) (#13591)
82+
* Fix logic for preferred license setting (#13550) (#13557)
83+
* Add missed sync branch/tag webhook (#13538) (#13556)
84+
* Migration won't fail on non-migrated reactions (#13507)
85+
* Fix Italian language file parsing error (#13156)
86+
* Show outdated comments in pull request (#13148) (#13162)
87+
* Fix parsing of pre-release git version (#13169) (#13172)
88+
* Fix diff skipping lines (#13154) (#13155)
89+
* When handling errors in storageHandler check underlying error (#13178) (#13193)
90+
* Fix size and clickable area on file table back link (#13205) (#13207)
91+
* Add better error checking for inline html diff code (#13251)
92+
* Fix initial commit page & binary munching problem (#13249) (#13258)
93+
* Fix migrations from remote Gitea instances when configuration not set (#13229) (#13273)
94+
* Store task errors following migrations and display them (#13246) (#13287)
95+
* Fix bug isEnd detection on getIssues/getPullRequests (#13299) (#13301)
96+
* When the git ref is unable to be found return broken pr (#13218) (#13303)
97+
* Ensure topics added using the API are added to the repository (#13285) (#13302)
98+
* Fix avatar autogeneration (#13233) (#13282)
99+
* Add migrated pulls to pull request task queue (#13331) (#13334)
100+
* Issue comment reactions should also check pull type on API (#13349) (#13350)
101+
* Fix links to repositories in /user/setting/repos (#13360) (#13362)
102+
* Remove obsolete change of email on profile page (#13341) (#13347)
103+
* Fix scrolling to resolved comment anchors (#13343) (#13371)
104+
* Storage configuration support `[storage]` (#13314) (#13379)
105+
* When creating line diffs do not split within an html entity (#13357) (#13375) (#13425) (#13427)
106+
* Fix reactions on code comments (#13390) (#13401)
107+
* Add missing full names when DEFAULT_SHOW_FULL_NAME is enabled (#13424)
108+
* Replies to outdated code comments should also be outdated (#13217) (#13433)
109+
* Fix panic bug in handling multiple references in commit (#13486) (#13487)
110+
* Prevent panic on git blame by limiting lines to 4096 bytes at most (#13470) (#13491)
74111
* Show original author's reviews on pull summary box (#13127)
75112
* Update golangci-lint to version 1.31.0 (#13102)
76113
* Fix line break for MS teams webhook (#13081)
@@ -140,6 +177,10 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
140177
* Fix Enter not working in SimpleMDE (#11564)
141178
* Fix bug about can't skip commits base on base branch (#11555)
142179
* ENHANCEMENTS
180+
* Only Return JSON for responses (#13511) (#13565)
181+
* Use existing analyzer module for language detection for highlighting (#13522) (#13551)
182+
* Return the full rejection message and errors in flash errors (#13221) (#13237)
183+
* Remove PAM from auth dropdown when unavailable (#13276) (#13281)
143184
* Add HostCertificate to sshd_config in Docker image (#13143)
144185
* Save TimeStamps for Star, Label, Follow, Watch and Collaboration to Database (#13124)
145186
* Improve error feedback for duplicate deploy keys (#13112)

Makefile

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -223,15 +223,15 @@ clean:
223223

224224
.PHONY: fmt
225225
fmt:
226-
$(GOFMT) -w $(GO_SOURCES_OWN)
226+
@echo "Running go fmt..."
227+
@$(GOFMT) -w $(GO_SOURCES_OWN)
227228

228229
.PHONY: vet
229230
vet:
230-
# Default vet
231-
$(GO) vet $(GO_PACKAGES)
232-
# Custom vet
233-
$(GO) build -mod=vendor code.gitea.io/gitea-vet
234-
$(GO) vet -vettool=gitea-vet $(GO_PACKAGES)
231+
@echo "Running go vet..."
232+
@$(GO) vet $(GO_PACKAGES)
233+
@$(GO) build -mod=vendor code.gitea.io/gitea-vet
234+
@$(GO) vet -vettool=gitea-vet $(GO_PACKAGES)
235235

236236
.PHONY: $(TAGS_EVIDENCE)
237237
$(TAGS_EVIDENCE):
@@ -268,7 +268,8 @@ errcheck:
268268
@hash errcheck > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
269269
GO111MODULE=off $(GO) get -u github.com/kisielk/errcheck; \
270270
fi
271-
errcheck $(GO_PACKAGES)
271+
@echo "Running errcheck..."
272+
@errcheck $(GO_PACKAGES)
272273

273274
.PHONY: revive
274275
revive:
@@ -279,14 +280,16 @@ misspell-check:
279280
@hash misspell > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
280281
GO111MODULE=off $(GO) get -u github.com/client9/misspell/cmd/misspell; \
281282
fi
282-
misspell -error -i unknwon,destory $(GO_SOURCES_OWN)
283+
@echo "Running misspell-check..."
284+
@misspell -error -i unknwon,destory $(GO_SOURCES_OWN)
283285

284286
.PHONY: misspell
285287
misspell:
286288
@hash misspell > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
287289
GO111MODULE=off $(GO) get -u github.com/client9/misspell/cmd/misspell; \
288290
fi
289-
misspell -w -i unknwon $(GO_SOURCES_OWN)
291+
@echo "Running go misspell..."
292+
@misspell -w -i unknwon $(GO_SOURCES_OWN)
290293

291294
.PHONY: fmt-check
292295
fmt-check:
@@ -336,11 +339,12 @@ watch-backend: go-check
336339

337340
.PHONY: test
338341
test:
339-
$(GO) test $(GOTESTFLAGS) -mod=vendor -tags='sqlite sqlite_unlock_notify' $(GO_PACKAGES)
342+
@echo "Running go test..."
343+
@$(GO) test $(GOTESTFLAGS) -mod=vendor -tags='sqlite sqlite_unlock_notify' $(GO_PACKAGES)
340344

341345
.PHONY: test-check
342346
test-check:
343-
@echo "Checking if tests have changed the source tree...";
347+
@echo "Running test-check...";
344348
@diff=$$(git status -s); \
345349
if [ -n "$$diff" ]; then \
346350
echo "make test has changed files in the source tree:"; \
@@ -352,15 +356,17 @@ test-check:
352356

353357
.PHONY: test\#%
354358
test\#%:
355-
$(GO) test -mod=vendor -tags='sqlite sqlite_unlock_notify' -run $(subst .,/,$*) $(GO_PACKAGES)
359+
@echo "Running go test..."
360+
@$(GO) test -mod=vendor -tags='sqlite sqlite_unlock_notify' -run $(subst .,/,$*) $(GO_PACKAGES)
356361

357362
.PHONY: coverage
358363
coverage:
359364
GO111MODULE=on $(GO) run -mod=vendor build/gocovmerge.go integration.coverage.out $(shell find . -type f -name "coverage.out") > coverage.all
360365

361366
.PHONY: unit-test-coverage
362367
unit-test-coverage:
363-
$(GO) test $(GOTESTFLAGS) -mod=vendor -tags='sqlite sqlite_unlock_notify' -cover -coverprofile coverage.out $(GO_PACKAGES) && echo "\n==>\033[32m Ok\033[m\n" || exit 1
368+
@echo "Running unit-test-coverage..."
369+
@$(GO) test $(GOTESTFLAGS) -mod=vendor -tags='sqlite sqlite_unlock_notify' -cover -coverprofile coverage.out $(GO_PACKAGES) && echo "\n==>\033[32m Ok\033[m\n" || exit 1
364370

365371
.PHONY: vendor
366372
vendor:
@@ -548,7 +554,8 @@ backend: go-check generate $(EXECUTABLE)
548554

549555
.PHONY: generate
550556
generate: $(TAGS_PREREQ)
551-
CC= GOOS= GOARCH= $(GO) generate -mod=vendor -tags '$(TAGS)' $(GO_PACKAGES)
557+
@echo "Running go generate..."
558+
@CC= GOOS= GOARCH= $(GO) generate -mod=vendor -tags '$(TAGS)' $(GO_PACKAGES)
552559

553560
$(EXECUTABLE): $(GO_SOURCES) $(TAGS_PREREQ)
554561
CGO_CFLAGS="$(CGO_CFLAGS)" $(GO) build -mod=vendor $(GOFLAGS) $(EXTRA_GOFLAGS) -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -o $@

docs/config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ params:
1818
description: Git with a cup of tea
1919
author: The Gitea Authors
2020
website: https://docs.gitea.io
21-
version: 1.12.6
21+
version: 1.13.0
2222
minGoVersion: 1.13
2323
goVersion: 1.15
2424
minNodeVersion: 10.13

docs/content/doc/installation/with-docker.en-us.md

Lines changed: 41 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,8 @@ files; for named volumes, this is done through another container or by direct ac
291291
:exclamation::exclamation: **Make sure you have volumed data to somewhere outside Docker container** :exclamation::exclamation:
292292

293293
To upgrade your installation to the latest release:
294-
```
294+
295+
```bash
295296
# Edit `docker-compose.yml` to update the version, if you have one specified
296297
# Pull new images
297298
docker-compose pull
@@ -301,88 +302,66 @@ docker-compose up -d
301302

302303
# SSH Container Passthrough
303304

304-
Since SSH is running inside the container, you'll have to pass SSH from the host to the
305-
container if you wish to use SSH support. If you wish to do this without running the container
306-
SSH on a non-standard port (or move your host port to a non-standard port), you can forward
307-
SSH connections destined for the container with a little extra setup.
305+
Since SSH is running inside the container, SSH needs to be passed through from the host to the container if SSH support is desired. One option would be to run the container SSH on a non-standard port (or moving the host port to a non-standard port). Another option which might be more straightforward is to forward SSH connections from the host to the container. This setup is explained in the following.
308306

309-
This guide assumes that you have created a user on the host called `git` which shares the same
310-
UID/GID as the container values `USER_UID`/`USER_GID`. You should also create the directory
311-
`/var/lib/gitea` on the host, owned by the `git` user and mounted in the container, e.g.
307+
This guide assumes that you have created a user on the host called `git` which shares the same `UID`/ `GID` as the container values `USER_UID`/ `USER_GID`. These values can be set as environment variables in the `docker-compose.yml`:
312308

309+
```bash
310+
environment:
311+
- USER_UID=1000
312+
- USER_GID=1000
313313
```
314-
version: "3"
315314

316-
services:
317-
server:
318-
image: gitea/gitea:{{< version >}}
319-
container_name: gitea
320-
environment:
321-
- USER_UID=1000
322-
- USER_GID=1000
323-
restart: always
324-
networks:
325-
- gitea
326-
volumes:
327-
- /var/lib/gitea:/data
328-
- /etc/timezone:/etc/timezone:ro
329-
- /etc/localtime:/etc/localtime:ro
330-
ports:
331-
- "3000:3000"
332-
- "127.0.0.1:2222:22"
333-
```
315+
Next mount `/home/git/.ssh` of the host into the container. Otherwise the SSH authentication cannot work inside the container.
334316

335-
You can see that we're also exposing the container SSH port to port 2222 on the host, and binding this
336-
to 127.0.0.1 to prevent it being accessible external to the host machine itself.
317+
```bash
318+
volumes:
319+
- /home/git/.ssh/:/data/git/.ssh
320+
```
337321

338-
On the **host**, you should create the file `/app/gitea/gitea` with the following contents and
339-
make it executable (`chmod +x /app/gitea/gitea`):
322+
Now a SSH key pair needs to be created on the host. This key pair will be used to authenticate the `git` user on the host to the container.
340323

324+
```bash
325+
sudo -u git ssh-keygen -t rsa -b 4096 -C "Gitea Host Key"
341326
```
342-
#!/bin/sh
327+
328+
In the next step a file named `/app/gitea/gitea` (with executable permissions) needs to be created on the host. This file will issue the SSH forwarding from the host to the container. Add the following contents to `/app/gitea/gitea`:
329+
330+
```bash
343331
ssh -p 2222 -o StrictHostKeyChecking=no [email protected] "SSH_ORIGINAL_COMMAND=\"$SSH_ORIGINAL_COMMAND\" $0 $@"
344332
```
345333

346-
Your `git` user needs to have an SSH key generated:
334+
To make the forwarding work, the SSH port of the container (22) needs to be mapped to the host port 2222 in `docker-compose.yml` . Since this port does not need to be exposed to the outside world, it can be mapped to the `localhost` of the host machine:
347335

336+
```bash
337+
ports:
338+
# [...]
339+
- "127.0.0.1:2222:22"
348340
```
349-
sudo -u git ssh-keygen -t rsa -b 4096 -C "Gitea Host Key"
350-
```
351-
352-
Now, proceed with one of the points given below:
353341

354-
- symlink the container `.ssh/authorized_keys` file to your git user `.ssh/authorized_keys`.
355-
This can be done on the host as the `/var/lib/gitea` directory is mounted inside the container under `/data`:
342+
In addition, `/home/git/.ssh/authorized_keys` on the host needs to be modified. It needs to act in the same way as `authorized_keys` within the Gitea container. Therefore add
356343

357-
```
358-
ln -s /var/lib/gitea/git/.ssh/authorized_keys /home/git/.ssh/authorized_keys
344+
```bash
345+
command="/app/gitea/gitea --config=/data/gitea/conf/app.ini serv key-1",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty ssh-rsa <YOUR_SSH_PUBKEY>
359346
```
360347

361-
Then echo the `git` user SSH key into the authorized_keys file so the host can talk to the container over SSH:
348+
and replace `<YOUR_SSH_PUBKEY>` with a valid SSH public key of yours.
362349

363-
```
364-
echo "no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty $(cat /home/git/.ssh/id_rsa.pub)" >> /var/lib/gitea/git/.ssh/authorized_keys
365-
```
350+
In addition the public key of the `git` user on the host needs to be added to `/home/git/.ssh/authorized_keys` so authentication against the container can succeed: `echo "$(cat /home/git/.ssh/id_rsa.pub)" >> /home/git/.ssh/authorized_keys`.
366351

367-
Lastly, Gitea makes `authorized_keys` backups by default. This could be a problem
368-
as the symbolic link made to `authorized_keys` previously could end up pointing
369-
to an old backup. To resolve this, please put the following into your Gitea
370-
config:
352+
Here is a detailed explanation what is happening when a SSH request is made:
371353

372-
```
373-
[ssh]
374-
SSH_AUTHORIZED_KEYS_BACKUP=false
375-
```
354+
1. A SSH request is made against the host using the `git` user, e.g. `git clone git@domain:user/repo.git`.
355+
2. In `/home/git/.ssh/authorized_keys` , the command executes the `/app/gitea/gitea` script.
356+
3. `/app/gitea/gitea` forwards the SSH request to port 2222 which is mapped to the SSH port (22) of the container.
357+
4. Due to the existence of the public key of the `git` user in `/home/git/.ssh/authorized_keys` the authentication host → container succeeds and the SSH request get forwarded to Gitea running in the docker container.
376358

377-
- mount your `.ssh` directory directly into the container i.e. add the
378-
following to the `volumes` section of your Docker container config:
359+
If a new SSH key is added in the Gitea web interface, it will be appended to `.ssh/authorized_keys` in the same way as the already existing key.
379360

380-
```
381-
- /home/git/.ssh/:/data/git/.ssh/
382-
```
361+
**Notes**
383362

384-
Now you should be able to use Git over SSH to your container without disrupting SSH access to the host.
363+
SSH container passthrough will work only if
385364

386-
Please note: SSH container passthrough will work only if using opensshd in container, and will not work if
387-
`AuthorizedKeysCommand` is used in combination with setting `SSH_CREATE_AUTHORIZED_KEYS_FILE=false` to disable
388-
authorized files key generation.
365+
- `opensshd` is used in the container
366+
- if `AuthorizedKeysCommand` is _not used_ in combination with `SSH_CREATE_AUTHORIZED_KEYS_FILE=false` to disable authorized files key generation
367+
- `LOCAL_ROOT_URL` is not changed

integrations/git_helper_for_declarative_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ func onGiteaRun(t *testing.T, callback func(*testing.T, *url.URL), prepare ...bo
111111

112112
func doGitClone(dstLocalPath string, u *url.URL) func(*testing.T) {
113113
return func(t *testing.T) {
114-
assert.NoError(t, git.CloneWithArgs(u.String(), dstLocalPath, allowLFSFilters(), git.CloneRepoOptions{}))
114+
assert.NoError(t, git.CloneWithArgs(context.Background(), u.String(), dstLocalPath, allowLFSFilters(), git.CloneRepoOptions{}))
115115
assert.True(t, com.IsExist(filepath.Join(dstLocalPath, "README.md")))
116116
}
117117
}

0 commit comments

Comments
 (0)