THIS IS A TEST INSTANCE ONLY! REPOSITORIES CAN BE DELETED AT ANY TIME!

Browse Source

Fix redirect with non-ascii branch names (#4764) (#4810)

* Fix redirect with non-ascii branch names (#4764)

* Add integration tests for non-ascii branch redirect

* Fix mysql test and coverage test
pull/2917/merge
SagePtr 8 months ago
parent
commit
bf55276189
49 changed files with 786 additions and 8 deletions
  1. 3
    3
      integrations/api_repo_test.go
  2. 1
    0
      integrations/gitea-repositories-meta/user2/utf8.git/HEAD
  3. 4
    0
      integrations/gitea-repositories-meta/user2/utf8.git/config
  4. 1
    0
      integrations/gitea-repositories-meta/user2/utf8.git/description
  5. 15
    0
      integrations/gitea-repositories-meta/user2/utf8.git/hooks/applypatch-msg.sample
  6. 24
    0
      integrations/gitea-repositories-meta/user2/utf8.git/hooks/commit-msg.sample
  7. 7
    0
      integrations/gitea-repositories-meta/user2/utf8.git/hooks/post-receive
  8. 2
    0
      integrations/gitea-repositories-meta/user2/utf8.git/hooks/post-receive.d/gitea
  9. 8
    0
      integrations/gitea-repositories-meta/user2/utf8.git/hooks/post-update.sample
  10. 14
    0
      integrations/gitea-repositories-meta/user2/utf8.git/hooks/pre-applypatch.sample
  11. 49
    0
      integrations/gitea-repositories-meta/user2/utf8.git/hooks/pre-commit.sample
  12. 53
    0
      integrations/gitea-repositories-meta/user2/utf8.git/hooks/pre-push.sample
  13. 169
    0
      integrations/gitea-repositories-meta/user2/utf8.git/hooks/pre-rebase.sample
  14. 7
    0
      integrations/gitea-repositories-meta/user2/utf8.git/hooks/pre-receive
  15. 2
    0
      integrations/gitea-repositories-meta/user2/utf8.git/hooks/pre-receive.d/gitea
  16. 36
    0
      integrations/gitea-repositories-meta/user2/utf8.git/hooks/prepare-commit-msg.sample
  17. 7
    0
      integrations/gitea-repositories-meta/user2/utf8.git/hooks/update
  18. 2
    0
      integrations/gitea-repositories-meta/user2/utf8.git/hooks/update.d/gitea
  19. 128
    0
      integrations/gitea-repositories-meta/user2/utf8.git/hooks/update.sample
  20. 6
    0
      integrations/gitea-repositories-meta/user2/utf8.git/info/exclude
  21. 9
    0
      integrations/gitea-repositories-meta/user2/utf8.git/info/refs
  22. BIN
      integrations/gitea-repositories-meta/user2/utf8.git/objects/14/c42687126acae9d1ad41d7bdb528f811065a6a
  23. BIN
      integrations/gitea-repositories-meta/user2/utf8.git/objects/1d/5e00f305a7ca6a8a94e65456820a6d260adab8
  24. 3
    0
      integrations/gitea-repositories-meta/user2/utf8.git/objects/28/d579e4920fbf4f66e71dab3e779d9fbf41422a
  25. BIN
      integrations/gitea-repositories-meta/user2/utf8.git/objects/3a/810dbf6b96afaa8c5f69a8b6ec1dabfca7368b
  26. BIN
      integrations/gitea-repositories-meta/user2/utf8.git/objects/3a/a73c3499bff049a352b4e265575373e964b89a
  27. BIN
      integrations/gitea-repositories-meta/user2/utf8.git/objects/3a/c6084110205f98174c4f1ec7e78cb21a15dfc2
  28. BIN
      integrations/gitea-repositories-meta/user2/utf8.git/objects/56/92bcf9f7c9eacb1ad68442161f2573877f96f4
  29. BIN
      integrations/gitea-repositories-meta/user2/utf8.git/objects/6d/0c79ce3401c67d1ad522e61c47083a9fdee16c
  30. BIN
      integrations/gitea-repositories-meta/user2/utf8.git/objects/a9/a61830fbf4e84999d3b20cf178954366701fe5
  31. 1
    0
      integrations/gitea-repositories-meta/user2/utf8.git/objects/eb/f146f803fccbc1471ef01d8fa0fe12c14e61a5
  32. BIN
      integrations/gitea-repositories-meta/user2/utf8.git/objects/ee/9686cb562f492f64381bff7f298b2a1c67a141
  33. BIN
      integrations/gitea-repositories-meta/user2/utf8.git/objects/f4/02ff67c0b3161c3988dbf6188e6e0df257fd75
  34. 1
    0
      integrations/gitea-repositories-meta/user2/utf8.git/objects/info/packs
  35. 1
    0
      integrations/gitea-repositories-meta/user2/utf8.git/refs/heads/Grüßen
  36. 1
    0
      integrations/gitea-repositories-meta/user2/utf8.git/refs/heads/Plus+Is+Not+Space
  37. 1
    0
      integrations/gitea-repositories-meta/user2/utf8.git/refs/heads/master
  38. 1
    0
      integrations/gitea-repositories-meta/user2/utf8.git/refs/heads/ГлавнаяВетка
  39. 1
    0
      integrations/gitea-repositories-meta/user2/utf8.git/refs/heads/а/б/в
  40. 1
    0
      integrations/gitea-repositories-meta/user2/utf8.git/refs/heads/ブランチ
  41. 1
    0
      integrations/gitea-repositories-meta/user2/utf8.git/refs/tags/Ё/人
  42. 1
    0
      integrations/gitea-repositories-meta/user2/utf8.git/refs/tags/Тэг
  43. 1
    0
      integrations/gitea-repositories-meta/user2/utf8.git/refs/tags/タグ
  44. 178
    0
      integrations/nonascii_branches_test.go
  45. 35
    0
      models/fixtures/repo_unit.yml
  46. 7
    0
      models/fixtures/repository.yml
  47. 1
    1
      models/fixtures/user.yml
  48. 3
    3
      models/repo_list_test.go
  49. 1
    1
      modules/context/repo.go

+ 3
- 3
integrations/api_repo_test.go View File

@@ -67,9 +67,9 @@ func TestAPISearchRepo(t *testing.T) {
67 67
 		expectedResults
68 68
 	}{
69 69
 		{name: "RepositoriesMax50", requestURL: "/api/v1/repos/search?limit=50", expectedResults: expectedResults{
70
-			nil:   {count: 16},
71
-			user:  {count: 16},
72
-			user2: {count: 16}},
70
+			nil:   {count: 17},
71
+			user:  {count: 17},
72
+			user2: {count: 17}},
73 73
 		},
74 74
 		{name: "RepositoriesMax10", requestURL: "/api/v1/repos/search?limit=10", expectedResults: expectedResults{
75 75
 			nil:   {count: 10},

+ 1
- 0
integrations/gitea-repositories-meta/user2/utf8.git/HEAD View File

@@ -0,0 +1 @@
1
+ref: refs/heads/master

+ 4
- 0
integrations/gitea-repositories-meta/user2/utf8.git/config View File

@@ -0,0 +1,4 @@
1
+[core]
2
+	repositoryformatversion = 0
3
+	filemode = true
4
+	bare = true

+ 1
- 0
integrations/gitea-repositories-meta/user2/utf8.git/description View File

@@ -0,0 +1 @@
1
+Unnamed repository; edit this file 'description' to name the repository.

+ 15
- 0
integrations/gitea-repositories-meta/user2/utf8.git/hooks/applypatch-msg.sample View File

@@ -0,0 +1,15 @@
1
+#!/bin/sh
2
+#
3
+# An example hook script to check the commit log message taken by
4
+# applypatch from an e-mail message.
5
+#
6
+# The hook should exit with non-zero status after issuing an
7
+# appropriate message if it wants to stop the commit.  The hook is
8
+# allowed to edit the commit message file.
9
+#
10
+# To enable this hook, rename this file to "applypatch-msg".
11
+
12
+. git-sh-setup
13
+commitmsg="$(git rev-parse --git-path hooks/commit-msg)"
14
+test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"}
15
+:

+ 24
- 0
integrations/gitea-repositories-meta/user2/utf8.git/hooks/commit-msg.sample View File

@@ -0,0 +1,24 @@
1
+#!/bin/sh
2
+#
3
+# An example hook script to check the commit log message.
4
+# Called by "git commit" with one argument, the name of the file
5
+# that has the commit message.  The hook should exit with non-zero
6
+# status after issuing an appropriate message if it wants to stop the
7
+# commit.  The hook is allowed to edit the commit message file.
8
+#
9
+# To enable this hook, rename this file to "commit-msg".
10
+
11
+# Uncomment the below to add a Signed-off-by line to the message.
12
+# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
13
+# hook is more suited to it.
14
+#
15
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
16
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
17
+
18
+# This example catches duplicate Signed-off-by lines.
19
+
20
+test "" = "$(grep '^Signed-off-by: ' "$1" |
21
+	 sort | uniq -c | sed -e '/^[ 	]*1[ 	]/d')" || {
22
+	echo >&2 Duplicate Signed-off-by lines.
23
+	exit 1
24
+}

+ 7
- 0
integrations/gitea-repositories-meta/user2/utf8.git/hooks/post-receive View File

@@ -0,0 +1,7 @@
1
+#!/usr/bin/env bash
2
+ORI_DIR=`pwd`
3
+SHELL_FOLDER=$(cd "$(dirname "$0")";pwd)
4
+cd "$ORI_DIR"
5
+for i in `ls "$SHELL_FOLDER/post-receive.d"`; do
6
+    sh "$SHELL_FOLDER/post-receive.d/$i"
7
+done

+ 2
- 0
integrations/gitea-repositories-meta/user2/utf8.git/hooks/post-receive.d/gitea View File

@@ -0,0 +1,2 @@
1
+#!/usr/bin/env bash
2
+"$GITEA_ROOT/gitea" hook --config="$GITEA_ROOT/$GITEA_CONF" post-receive

+ 8
- 0
integrations/gitea-repositories-meta/user2/utf8.git/hooks/post-update.sample View File

@@ -0,0 +1,8 @@
1
+#!/bin/sh
2
+#
3
+# An example hook script to prepare a packed repository for use over
4
+# dumb transports.
5
+#
6
+# To enable this hook, rename this file to "post-update".
7
+
8
+exec git update-server-info

+ 14
- 0
integrations/gitea-repositories-meta/user2/utf8.git/hooks/pre-applypatch.sample View File

@@ -0,0 +1,14 @@
1
+#!/bin/sh
2
+#
3
+# An example hook script to verify what is about to be committed
4
+# by applypatch from an e-mail message.
5
+#
6
+# The hook should exit with non-zero status after issuing an
7
+# appropriate message if it wants to stop the commit.
8
+#
9
+# To enable this hook, rename this file to "pre-applypatch".
10
+
11
+. git-sh-setup
12
+precommit="$(git rev-parse --git-path hooks/pre-commit)"
13
+test -x "$precommit" && exec "$precommit" ${1+"$@"}
14
+:

+ 49
- 0
integrations/gitea-repositories-meta/user2/utf8.git/hooks/pre-commit.sample View File

@@ -0,0 +1,49 @@
1
+#!/bin/sh
2
+#
3
+# An example hook script to verify what is about to be committed.
4
+# Called by "git commit" with no arguments.  The hook should
5
+# exit with non-zero status after issuing an appropriate message if
6
+# it wants to stop the commit.
7
+#
8
+# To enable this hook, rename this file to "pre-commit".
9
+
10
+if git rev-parse --verify HEAD >/dev/null 2>&1
11
+then
12
+	against=HEAD
13
+else
14
+	# Initial commit: diff against an empty tree object
15
+	against=4b825dc642cb6eb9a060e54bf8d69288fbee4904
16
+fi
17
+
18
+# If you want to allow non-ASCII filenames set this variable to true.
19
+allownonascii=$(git config --bool hooks.allownonascii)
20
+
21
+# Redirect output to stderr.
22
+exec 1>&2
23
+
24
+# Cross platform projects tend to avoid non-ASCII filenames; prevent
25
+# them from being added to the repository. We exploit the fact that the
26
+# printable range starts at the space character and ends with tilde.
27
+if [ "$allownonascii" != "true" ] &&
28
+	# Note that the use of brackets around a tr range is ok here, (it's
29
+	# even required, for portability to Solaris 10's /usr/bin/tr), since
30
+	# the square bracket bytes happen to fall in the designated range.
31
+	test $(git diff --cached --name-only --diff-filter=A -z $against |
32
+	  LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
33
+then
34
+	cat <<\EOF
35
+Error: Attempt to add a non-ASCII file name.
36
+
37
+This can cause problems if you want to work with people on other platforms.
38
+
39
+To be portable it is advisable to rename the file.
40
+
41
+If you know what you are doing you can disable this check using:
42
+
43
+  git config hooks.allownonascii true
44
+EOF
45
+	exit 1
46
+fi
47
+
48
+# If there are whitespace errors, print the offending file names and fail.
49
+exec git diff-index --check --cached $against --

+ 53
- 0
integrations/gitea-repositories-meta/user2/utf8.git/hooks/pre-push.sample View File

@@ -0,0 +1,53 @@
1
+#!/bin/sh
2
+
3
+# An example hook script to verify what is about to be pushed.  Called by "git
4
+# push" after it has checked the remote status, but before anything has been
5
+# pushed.  If this script exits with a non-zero status nothing will be pushed.
6
+#
7
+# This hook is called with the following parameters:
8
+#
9
+# $1 -- Name of the remote to which the push is being done
10
+# $2 -- URL to which the push is being done
11
+#
12
+# If pushing without using a named remote those arguments will be equal.
13
+#
14
+# Information about the commits which are being pushed is supplied as lines to
15
+# the standard input in the form:
16
+#
17
+#   <local ref> <local sha1> <remote ref> <remote sha1>
18
+#
19
+# This sample shows how to prevent push of commits where the log message starts
20
+# with "WIP" (work in progress).
21
+
22
+remote="$1"
23
+url="$2"
24
+
25
+z40=0000000000000000000000000000000000000000
26
+
27
+while read local_ref local_sha remote_ref remote_sha
28
+do
29
+	if [ "$local_sha" = $z40 ]
30
+	then
31
+		# Handle delete
32
+		:
33
+	else
34
+		if [ "$remote_sha" = $z40 ]
35
+		then
36
+			# New branch, examine all commits
37
+			range="$local_sha"
38
+		else
39
+			# Update to existing branch, examine new commits
40
+			range="$remote_sha..$local_sha"
41
+		fi
42
+
43
+		# Check for WIP commit
44
+		commit=`git rev-list -n 1 --grep '^WIP' "$range"`
45
+		if [ -n "$commit" ]
46
+		then
47
+			echo >&2 "Found WIP commit in $local_ref, not pushing"
48
+			exit 1
49
+		fi
50
+	fi
51
+done
52
+
53
+exit 0

+ 169
- 0
integrations/gitea-repositories-meta/user2/utf8.git/hooks/pre-rebase.sample View File

@@ -0,0 +1,169 @@
1
+#!/bin/sh
2
+#
3
+# Copyright (c) 2006, 2008 Junio C Hamano
4
+#
5
+# The "pre-rebase" hook is run just before "git rebase" starts doing
6
+# its job, and can prevent the command from running by exiting with
7
+# non-zero status.
8
+#
9
+# The hook is called with the following parameters:
10
+#
11
+# $1 -- the upstream the series was forked from.
12
+# $2 -- the branch being rebased (or empty when rebasing the current branch).
13
+#
14
+# This sample shows how to prevent topic branches that are already
15
+# merged to 'next' branch from getting rebased, because allowing it
16
+# would result in rebasing already published history.
17
+
18
+publish=next
19
+basebranch="$1"
20
+if test "$#" = 2
21
+then
22
+	topic="refs/heads/$2"
23
+else
24
+	topic=`git symbolic-ref HEAD` ||
25
+	exit 0 ;# we do not interrupt rebasing detached HEAD
26
+fi
27
+
28
+case "$topic" in
29
+refs/heads/??/*)
30
+	;;
31
+*)
32
+	exit 0 ;# we do not interrupt others.
33
+	;;
34
+esac
35
+
36
+# Now we are dealing with a topic branch being rebased
37
+# on top of master.  Is it OK to rebase it?
38
+
39
+# Does the topic really exist?
40
+git show-ref -q "$topic" || {
41
+	echo >&2 "No such branch $topic"
42
+	exit 1
43
+}
44
+
45
+# Is topic fully merged to master?
46
+not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
47
+if test -z "$not_in_master"
48
+then
49
+	echo >&2 "$topic is fully merged to master; better remove it."
50
+	exit 1 ;# we could allow it, but there is no point.
51
+fi
52
+
53
+# Is topic ever merged to next?  If so you should not be rebasing it.
54
+only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
55
+only_next_2=`git rev-list ^master           ${publish} | sort`
56
+if test "$only_next_1" = "$only_next_2"
57
+then
58
+	not_in_topic=`git rev-list "^$topic" master`
59
+	if test -z "$not_in_topic"
60
+	then
61
+		echo >&2 "$topic is already up-to-date with master"
62
+		exit 1 ;# we could allow it, but there is no point.
63
+	else
64
+		exit 0
65
+	fi
66
+else
67
+	not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
68
+	/usr/bin/perl -e '
69
+		my $topic = $ARGV[0];
70
+		my $msg = "* $topic has commits already merged to public branch:\n";
71
+		my (%not_in_next) = map {
72
+			/^([0-9a-f]+) /;
73
+			($1 => 1);
74
+		} split(/\n/, $ARGV[1]);
75
+		for my $elem (map {
76
+				/^([0-9a-f]+) (.*)$/;
77
+				[$1 => $2];
78
+			} split(/\n/, $ARGV[2])) {
79
+			if (!exists $not_in_next{$elem->[0]}) {
80
+				if ($msg) {
81
+					print STDERR $msg;
82
+					undef $msg;
83
+				}
84
+				print STDERR " $elem->[1]\n";
85
+			}
86
+		}
87
+	' "$topic" "$not_in_next" "$not_in_master"
88
+	exit 1
89
+fi
90
+
91
+<<\DOC_END
92
+
93
+This sample hook safeguards topic branches that have been
94
+published from being rewound.
95
+
96
+The workflow assumed here is:
97
+
98
+ * Once a topic branch forks from "master", "master" is never
99
+   merged into it again (either directly or indirectly).
100
+
101
+ * Once a topic branch is fully cooked and merged into "master",
102
+   it is deleted.  If you need to build on top of it to correct
103
+   earlier mistakes, a new topic branch is created by forking at
104
+   the tip of the "master".  This is not strictly necessary, but
105
+   it makes it easier to keep your history simple.
106
+
107
+ * Whenever you need to test or publish your changes to topic
108
+   branches, merge them into "next" branch.
109
+
110
+The script, being an example, hardcodes the publish branch name
111
+to be "next", but it is trivial to make it configurable via
112
+$GIT_DIR/config mechanism.
113
+
114
+With this workflow, you would want to know:
115
+
116
+(1) ... if a topic branch has ever been merged to "next".  Young
117
+    topic branches can have stupid mistakes you would rather
118
+    clean up before publishing, and things that have not been
119
+    merged into other branches can be easily rebased without
120
+    affecting other people.  But once it is published, you would
121
+    not want to rewind it.
122
+
123
+(2) ... if a topic branch has been fully merged to "master".
124
+    Then you can delete it.  More importantly, you should not
125
+    build on top of it -- other people may already want to
126
+    change things related to the topic as patches against your
127
+    "master", so if you need further changes, it is better to
128
+    fork the topic (perhaps with the same name) afresh from the
129
+    tip of "master".
130
+
131
+Let's look at this example:
132
+
133
+		   o---o---o---o---o---o---o---o---o---o "next"
134
+		  /       /           /           /
135
+		 /   a---a---b A     /           /
136
+		/   /               /           /
137
+	       /   /   c---c---c---c B         /
138
+	      /   /   /             \         /
139
+	     /   /   /   b---b C     \       /
140
+	    /   /   /   /             \     /
141
+    ---o---o---o---o---o---o---o---o---o---o---o "master"
142
+
143
+
144
+A, B and C are topic branches.
145
+
146
+ * A has one fix since it was merged up to "next".
147
+
148
+ * B has finished.  It has been fully merged up to "master" and "next",
149
+   and is ready to be deleted.
150
+
151
+ * C has not merged to "next" at all.
152
+
153
+We would want to allow C to be rebased, refuse A, and encourage
154
+B to be deleted.
155
+
156
+To compute (1):
157
+
158
+	git rev-list ^master ^topic next
159
+	git rev-list ^master        next
160
+
161
+	if these match, topic has not merged in next at all.
162
+
163
+To compute (2):
164
+
165
+	git rev-list master..topic
166
+
167
+	if this is empty, it is fully merged to "master".
168
+
169
+DOC_END

+ 7
- 0
integrations/gitea-repositories-meta/user2/utf8.git/hooks/pre-receive View File

@@ -0,0 +1,7 @@
1
+#!/usr/bin/env bash
2
+ORI_DIR=`pwd`
3
+SHELL_FOLDER=$(cd "$(dirname "$0")";pwd)
4
+cd "$ORI_DIR"
5
+for i in `ls "$SHELL_FOLDER/pre-receive.d"`; do
6
+    sh "$SHELL_FOLDER/pre-receive.d/$i"
7
+done

+ 2
- 0
integrations/gitea-repositories-meta/user2/utf8.git/hooks/pre-receive.d/gitea View File

@@ -0,0 +1,2 @@
1
+#!/usr/bin/env bash
2
+"$GITEA_ROOT/gitea" hook --config="$GITEA_ROOT/$GITEA_CONF" pre-receive

+ 36
- 0
integrations/gitea-repositories-meta/user2/utf8.git/hooks/prepare-commit-msg.sample View File

@@ -0,0 +1,36 @@
1
+#!/bin/sh
2
+#
3
+# An example hook script to prepare the commit log message.
4
+# Called by "git commit" with the name of the file that has the
5
+# commit message, followed by the description of the commit
6
+# message's source.  The hook's purpose is to edit the commit
7
+# message file.  If the hook fails with a non-zero status,
8
+# the commit is aborted.
9
+#
10
+# To enable this hook, rename this file to "prepare-commit-msg".
11
+
12
+# This hook includes three examples.  The first comments out the
13
+# "Conflicts:" part of a merge commit.
14
+#
15
+# The second includes the output of "git diff --name-status -r"
16
+# into the message, just before the "git status" output.  It is
17
+# commented because it doesn't cope with --amend or with squashed
18
+# commits.
19
+#
20
+# The third example adds a Signed-off-by line to the message, that can
21
+# still be edited.  This is rarely a good idea.
22
+
23
+case "$2,$3" in
24
+  merge,)
25
+    /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;;
26
+
27
+# ,|template,)
28
+#   /usr/bin/perl -i.bak -pe '
29
+#      print "\n" . `git diff --cached --name-status -r`
30
+#	 if /^#/ && $first++ == 0' "$1" ;;
31
+
32
+  *) ;;
33
+esac
34
+
35
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
36
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"

+ 7
- 0
integrations/gitea-repositories-meta/user2/utf8.git/hooks/update View File

@@ -0,0 +1,7 @@
1
+#!/usr/bin/env bash
2
+ORI_DIR=`pwd`
3
+SHELL_FOLDER=$(cd "$(dirname "$0")";pwd)
4
+cd "$ORI_DIR"
5
+for i in `ls "$SHELL_FOLDER/update.d"`; do
6
+    sh "$SHELL_FOLDER/update.d/$i" $1 $2 $3
7
+done

+ 2
- 0
integrations/gitea-repositories-meta/user2/utf8.git/hooks/update.d/gitea View File

@@ -0,0 +1,2 @@
1
+#!/usr/bin/env bash
2
+"$GITEA_ROOT/gitea" hook --config="$GITEA_ROOT/$GITEA_CONF" update $1 $2 $3

+ 128
- 0
integrations/gitea-repositories-meta/user2/utf8.git/hooks/update.sample View File

@@ -0,0 +1,128 @@
1
+#!/bin/sh
2
+#
3
+# An example hook script to block unannotated tags from entering.
4
+# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
5
+#
6
+# To enable this hook, rename this file to "update".
7
+#
8
+# Config
9
+# ------
10
+# hooks.allowunannotated
11
+#   This boolean sets whether unannotated tags will be allowed into the
12
+#   repository.  By default they won't be.
13
+# hooks.allowdeletetag
14
+#   This boolean sets whether deleting tags will be allowed in the
15
+#   repository.  By default they won't be.
16
+# hooks.allowmodifytag
17
+#   This boolean sets whether a tag may be modified after creation. By default
18
+#   it won't be.
19
+# hooks.allowdeletebranch
20
+#   This boolean sets whether deleting branches will be allowed in the
21
+#   repository.  By default they won't be.
22
+# hooks.denycreatebranch
23
+#   This boolean sets whether remotely creating branches will be denied
24
+#   in the repository.  By default this is allowed.
25
+#
26
+
27
+# --- Command line
28
+refname="$1"
29
+oldrev="$2"
30
+newrev="$3"
31
+
32
+# --- Safety check
33
+if [ -z "$GIT_DIR" ]; then
34
+	echo "Don't run this script from the command line." >&2
35
+	echo " (if you want, you could supply GIT_DIR then run" >&2
36
+	echo "  $0 <ref> <oldrev> <newrev>)" >&2
37
+	exit 1
38
+fi
39
+
40
+if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
41
+	echo "usage: $0 <ref> <oldrev> <newrev>" >&2
42
+	exit 1
43
+fi
44
+
45
+# --- Config
46
+allowunannotated=$(git config --bool hooks.allowunannotated)
47
+allowdeletebranch=$(git config --bool hooks.allowdeletebranch)
48
+denycreatebranch=$(git config --bool hooks.denycreatebranch)
49
+allowdeletetag=$(git config --bool hooks.allowdeletetag)
50
+allowmodifytag=$(git config --bool hooks.allowmodifytag)
51
+
52
+# check for no description
53
+projectdesc=$(sed -e '1q' "$GIT_DIR/description")
54
+case "$projectdesc" in
55
+"Unnamed repository"* | "")
56
+	echo "*** Project description file hasn't been set" >&2
57
+	exit 1
58
+	;;
59
+esac
60
+
61
+# --- Check types
62
+# if $newrev is 0000...0000, it's a commit to delete a ref.
63
+zero="0000000000000000000000000000000000000000"
64
+if [ "$newrev" = "$zero" ]; then
65
+	newrev_type=delete
66
+else
67
+	newrev_type=$(git cat-file -t $newrev)
68
+fi
69
+
70
+case "$refname","$newrev_type" in
71
+	refs/tags/*,commit)
72
+		# un-annotated tag
73
+		short_refname=${refname##refs/tags/}
74
+		if [ "$allowunannotated" != "true" ]; then
75
+			echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
76
+			echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
77
+			exit 1
78
+		fi
79
+		;;
80
+	refs/tags/*,delete)
81
+		# delete tag
82
+		if [ "$allowdeletetag" != "true" ]; then
83
+			echo "*** Deleting a tag is not allowed in this repository" >&2
84
+			exit 1
85
+		fi
86
+		;;
87
+	refs/tags/*,tag)
88
+		# annotated tag
89
+		if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
90
+		then
91
+			echo "*** Tag '$refname' already exists." >&2
92
+			echo "*** Modifying a tag is not allowed in this repository." >&2
93
+			exit 1
94
+		fi
95
+		;;
96
+	refs/heads/*,commit)
97
+		# branch
98
+		if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
99
+			echo "*** Creating a branch is not allowed in this repository" >&2
100
+			exit 1
101
+		fi
102
+		;;
103
+	refs/heads/*,delete)
104
+		# delete branch
105
+		if [ "$allowdeletebranch" != "true" ]; then
106
+			echo "*** Deleting a branch is not allowed in this repository" >&2
107
+			exit 1
108
+		fi
109
+		;;
110
+	refs/remotes/*,commit)
111
+		# tracking branch
112
+		;;
113
+	refs/remotes/*,delete)
114
+		# delete tracking branch
115
+		if [ "$allowdeletebranch" != "true" ]; then
116
+			echo "*** Deleting a tracking branch is not allowed in this repository" >&2
117
+			exit 1
118
+		fi
119
+		;;
120
+	*)
121
+		# Anything else (is there anything else?)
122
+		echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
123
+		exit 1
124
+		;;
125
+esac
126
+
127
+# --- Finished
128
+exit 0

+ 6
- 0
integrations/gitea-repositories-meta/user2/utf8.git/info/exclude View File

@@ -0,0 +1,6 @@
1
+# git ls-files --others --exclude-from=.git/info/exclude
2
+# Lines that start with '#' are comments.
3
+# For a project mostly in C, the following would be a good set of
4
+# exclude patterns (uncomment them if you want to use them):
5
+# *.[oa]
6
+# *~

+ 9
- 0
integrations/gitea-repositories-meta/user2/utf8.git/info/refs View File

@@ -0,0 +1,9 @@
1
+ebf146f803fccbc1471ef01d8fa0fe12c14e61a5	refs/heads/Grüßen
2
+3a810dbf6b96afaa8c5f69a8b6ec1dabfca7368b	refs/heads/Plus+Is+Not+Space
3
+3aa73c3499bff049a352b4e265575373e964b89a	refs/heads/master
4
+ebf146f803fccbc1471ef01d8fa0fe12c14e61a5	refs/heads/ГлавнаяВетка
5
+ebf146f803fccbc1471ef01d8fa0fe12c14e61a5	refs/heads/а/б/в
6
+28d579e4920fbf4f66e71dab3e779d9fbf41422a	refs/heads/ブランチ
7
+ebf146f803fccbc1471ef01d8fa0fe12c14e61a5	refs/tags/Ё/人
8
+ebf146f803fccbc1471ef01d8fa0fe12c14e61a5	refs/tags/Тэг
9
+28d579e4920fbf4f66e71dab3e779d9fbf41422a	refs/tags/タグ

BIN
integrations/gitea-repositories-meta/user2/utf8.git/objects/14/c42687126acae9d1ad41d7bdb528f811065a6a View File


BIN
integrations/gitea-repositories-meta/user2/utf8.git/objects/1d/5e00f305a7ca6a8a94e65456820a6d260adab8 View File


+ 3
- 0
integrations/gitea-repositories-meta/user2/utf8.git/objects/28/d579e4920fbf4f66e71dab3e779d9fbf41422a View File

@@ -0,0 +1,3 @@
1
+x•ŽAjÄ0E»ö)´œR(²ci<PJ{Å–˜)ILo_ÓM×]}xü/×u½uDO½©‚/¤ˆ6!É9K’KT¦Hœ
2
+—À(EæäviºuÐÙ|dK8YÎsöñìÕЗd‚¦>¢ì…œÜûµ6¸Ú¼ý·>dÝ}Íu}OñÄ)xÁ€èi]ÿ%¹ÏRàKvÙôP°Û¢Ð똛lù
3
+u[¾ád£§ëÑÇ£>»²´QÑ

BIN
integrations/gitea-repositories-meta/user2/utf8.git/objects/3a/810dbf6b96afaa8c5f69a8b6ec1dabfca7368b View File


BIN
integrations/gitea-repositories-meta/user2/utf8.git/objects/3a/a73c3499bff049a352b4e265575373e964b89a View File


BIN
integrations/gitea-repositories-meta/user2/utf8.git/objects/3a/c6084110205f98174c4f1ec7e78cb21a15dfc2 View File


BIN
integrations/gitea-repositories-meta/user2/utf8.git/objects/56/92bcf9f7c9eacb1ad68442161f2573877f96f4 View File


BIN
integrations/gitea-repositories-meta/user2/utf8.git/objects/6d/0c79ce3401c67d1ad522e61c47083a9fdee16c View File


BIN
integrations/gitea-repositories-meta/user2/utf8.git/objects/a9/a61830fbf4e84999d3b20cf178954366701fe5 View File


+ 1
- 0
integrations/gitea-repositories-meta/user2/utf8.git/objects/eb/f146f803fccbc1471ef01d8fa0fe12c14e61a5 View File

@@ -0,0 +1 @@
1
+x��]jC!�ћь*цНPtFЧ+�в.e4#ЎЙС�ьОЖ;шг�УљљЪб{���_цPеФ�ЋOXйгцr­Бbк2�+ХygЎ2є2�D"ђ)­�ѕI(`і�BiЭљМ%1r�чcР§Іс§O>ѕ!§Кы[9њИ@��-!МZДж,wЁM§WЩ|�NPлЎ№нцЪsД}o.вцёћr�ЁUQѓ�M�

BIN
integrations/gitea-repositories-meta/user2/utf8.git/objects/ee/9686cb562f492f64381bff7f298b2a1c67a141 View File


BIN
integrations/gitea-repositories-meta/user2/utf8.git/objects/f4/02ff67c0b3161c3988dbf6188e6e0df257fd75 View File


+ 1
- 0
integrations/gitea-repositories-meta/user2/utf8.git/objects/info/packs View File

@@ -0,0 +1 @@
1
+

+ 1
- 0
integrations/gitea-repositories-meta/user2/utf8.git/refs/heads/Grüßen View File

@@ -0,0 +1 @@
1
+ebf146f803fccbc1471ef01d8fa0fe12c14e61a5

+ 1
- 0
integrations/gitea-repositories-meta/user2/utf8.git/refs/heads/Plus+Is+Not+Space View File

@@ -0,0 +1 @@
1
+3a810dbf6b96afaa8c5f69a8b6ec1dabfca7368b

+ 1
- 0
integrations/gitea-repositories-meta/user2/utf8.git/refs/heads/master View File

@@ -0,0 +1 @@
1
+3aa73c3499bff049a352b4e265575373e964b89a

+ 1
- 0
integrations/gitea-repositories-meta/user2/utf8.git/refs/heads/ГлавнаяВетка View File

@@ -0,0 +1 @@
1
+ebf146f803fccbc1471ef01d8fa0fe12c14e61a5

+ 1
- 0
integrations/gitea-repositories-meta/user2/utf8.git/refs/heads/а/б/в View File

@@ -0,0 +1 @@
1
+ebf146f803fccbc1471ef01d8fa0fe12c14e61a5

+ 1
- 0
integrations/gitea-repositories-meta/user2/utf8.git/refs/heads/ブランチ View File

@@ -0,0 +1 @@
1
+28d579e4920fbf4f66e71dab3e779d9fbf41422a

+ 1
- 0
integrations/gitea-repositories-meta/user2/utf8.git/refs/tags/Ё/人 View File

@@ -0,0 +1 @@
1
+ebf146f803fccbc1471ef01d8fa0fe12c14e61a5

+ 1
- 0
integrations/gitea-repositories-meta/user2/utf8.git/refs/tags/Тэг View File

@@ -0,0 +1 @@
1
+ebf146f803fccbc1471ef01d8fa0fe12c14e61a5

+ 1
- 0
integrations/gitea-repositories-meta/user2/utf8.git/refs/tags/タグ View File

@@ -0,0 +1 @@
1
+28d579e4920fbf4f66e71dab3e779d9fbf41422a

+ 178
- 0
integrations/nonascii_branches_test.go View File

@@ -0,0 +1,178 @@
1
+// Copyright 2018 The Gitea Authors. All rights reserved.
2
+// Use of this source code is governed by a MIT-style
3
+// license that can be found in the LICENSE file.
4
+
5
+package integrations
6
+
7
+import (
8
+	"net/http"
9
+	"path"
10
+	"testing"
11
+
12
+	"github.com/stretchr/testify/assert"
13
+)
14
+
15
+func testSrcRouteRedirect(t *testing.T, session *TestSession, user, repo, route, expectedLocation string, expectedStatus int) {
16
+	prefix := path.Join("/", user, repo, "src")
17
+
18
+	// Make request
19
+	req := NewRequest(t, "GET", path.Join(prefix, route))
20
+	resp := session.MakeRequest(t, req, http.StatusFound)
21
+
22
+	// Check Location header
23
+	location := resp.HeaderMap.Get("Location")
24
+	assert.Equal(t, path.Join(prefix, expectedLocation), location)
25
+
26
+	// Perform redirect
27
+	req = NewRequest(t, "GET", location)
28
+	resp = session.MakeRequest(t, req, expectedStatus)
29
+}
30
+
31
+func setDefaultBranch(t *testing.T, session *TestSession, user, repo, branch string) {
32
+	location := path.Join("/", user, repo, "settings/branches")
33
+	csrf := GetCSRF(t, session, location)
34
+	req := NewRequestWithValues(t, "POST", location, map[string]string{
35
+		"_csrf":  csrf,
36
+		"action": "default_branch",
37
+		"branch": branch,
38
+	})
39
+	session.MakeRequest(t, req, http.StatusFound)
40
+}
41
+
42
+func TestNonasciiBranches(t *testing.T) {
43
+	testRedirects := []struct {
44
+		from   string
45
+		to     string
46
+		status int
47
+	}{
48
+		// Branches
49
+		{
50
+			from:   "master",
51
+			to:     "branch/master",
52
+			status: http.StatusOK,
53
+		},
54
+		{
55
+			from:   "master/README.md",
56
+			to:     "branch/master/README.md",
57
+			status: http.StatusOK,
58
+		},
59
+		{
60
+			from:   "master/badfile",
61
+			to:     "branch/master/badfile",
62
+			status: http.StatusNotFound, // it does not exists
63
+		},
64
+		{
65
+			from:   "ГлавнаяВетка",
66
+			to:     "branch/%d0%93%d0%bb%d0%b0%d0%b2%d0%bd%d0%b0%d1%8f%d0%92%d0%b5%d1%82%d0%ba%d0%b0",
67
+			status: http.StatusOK,
68
+		},
69
+		{
70
+			from:   "а/б/в",
71
+			to:     "branch/%d0%b0/%d0%b1/%d0%b2",
72
+			status: http.StatusOK,
73
+		},
74
+		{
75
+			from:   "Grüßen/README.md",
76
+			to:     "branch/Gr%c3%bc%c3%9fen/README.md",
77
+			status: http.StatusOK,
78
+		},
79
+		{
80
+			from:   "Plus+Is+Not+Space",
81
+			to:     "branch/Plus+Is+Not+Space",
82
+			status: http.StatusOK,
83
+		},
84
+		{
85
+			from:   "Plus+Is+Not+Space/Файл.md",
86
+			to:     "branch/Plus+Is+Not+Space/%d0%a4%d0%b0%d0%b9%d0%bb.md",
87
+			status: http.StatusOK,
88
+		},
89
+		{
90
+			from:   "Plus+Is+Not+Space/and+it+is+valid.md",
91
+			to:     "branch/Plus+Is+Not+Space/and+it+is+valid.md",
92
+			status: http.StatusOK,
93
+		},
94
+		{
95
+			from:   "ブランチ",
96
+			to:     "branch/%e3%83%96%e3%83%a9%e3%83%b3%e3%83%81",
97
+			status: http.StatusOK,
98
+		},
99
+		// Tags
100
+		{
101
+			from:   "Тэг",
102
+			to:     "tag/%d0%a2%d1%8d%d0%b3",
103
+			status: http.StatusOK,
104
+		},
105
+		{
106
+			from:   "Ё/人",
107
+			to:     "tag/%d0%81/%e4%ba%ba",
108
+			status: http.StatusOK,
109
+		},
110
+		{
111
+			from:   "タグ",
112
+			to:     "tag/%e3%82%bf%e3%82%b0",
113
+			status: http.StatusOK,
114
+		},
115
+		{
116
+			from:   "タグ/ファイル.md",
117
+			to:     "tag/%e3%82%bf%e3%82%b0/%e3%83%95%e3%82%a1%e3%82%a4%e3%83%ab.md",
118
+			status: http.StatusOK,
119
+		},
120
+		// Files
121
+		{
122
+			from:   "README.md",
123
+			to:     "branch/Plus+Is+Not+Space/README.md",
124
+			status: http.StatusOK,
125
+		},
126
+		{
127
+			from:   "Файл.md",
128
+			to:     "branch/Plus+Is+Not+Space/%d0%a4%d0%b0%d0%b9%d0%bb.md",
129
+			status: http.StatusOK,
130
+		},
131
+		{
132
+			from:   "ファイル.md",
133
+			to:     "branch/Plus+Is+Not+Space/%e3%83%95%e3%82%a1%e3%82%a4%e3%83%ab.md",
134
+			status: http.StatusNotFound, // it's not on default branch
135
+		},
136
+		// Same but url-encoded (few tests)
137
+		{
138
+			from:   "%E3%83%96%E3%83%A9%E3%83%B3%E3%83%81",
139
+			to:     "branch/%e3%83%96%e3%83%a9%e3%83%b3%e3%83%81",
140
+			status: http.StatusOK,
141
+		},
142
+		{
143
+			from:   "%E3%82%BF%E3%82%b0",
144
+			to:     "tag/%e3%82%bf%e3%82%b0",
145
+			status: http.StatusOK,
146
+		},
147
+		{
148
+			from:   "%D0%A4%D0%B0%D0%B9%D0%BB.md",
149
+			to:     "branch/Plus+Is+Not+Space/%d0%a4%d0%b0%d0%b9%d0%bb.md",
150
+			status: http.StatusOK,
151
+		},
152
+		{
153
+			from:   "%D0%81%2F%E4%BA%BA",
154
+			to:     "tag/%d0%81/%e4%ba%ba",
155
+			status: http.StatusOK,
156
+		},
157
+		{
158
+			from:   "Ё%2F%E4%BA%BA",
159
+			to:     "tag/%d0%81/%e4%ba%ba",
160
+			status: http.StatusOK,
161
+		},
162
+	}
163
+
164
+	prepareTestEnv(t)
165
+
166
+	user := "user2"
167
+	repo := "utf8"
168
+	session := loginUser(t, user)
169
+
170
+	setDefaultBranch(t, session, user, repo, "Plus+Is+Not+Space")
171
+
172
+	for _, test := range testRedirects {
173
+		testSrcRouteRedirect(t, session, user, repo, test.from, test.to, test.status)
174
+	}
175
+
176
+	setDefaultBranch(t, session, user, repo, "master")
177
+
178
+}

+ 35
- 0
models/fixtures/repo_unit.yml View File

@@ -74,3 +74,38 @@
74 74
   type: 1
75 75
   config: "{}"
76 76
   created_unix: 1524304355
77
+
78
+-
79
+  id: 12
80
+  repo_id: 33
81
+  type: 1
82
+  config: "{}"
83
+  created_unix: 1535593231
84
+
85
+-
86
+  id: 13
87
+  repo_id: 33
88
+  type: 2
89
+  config: "{\"EnableTimetracker\":true,\"AllowOnlyContributorsToTrackTime\":true}"
90
+  created_unix: 1535593231
91
+
92
+-
93
+  id: 14
94
+  repo_id: 33
95
+  type: 3
96
+  config: "{\"IgnoreWhitespaceConflicts\":false,\"AllowMerge\":true,\"AllowRebase\":true,\"AllowSquash\":true}"
97
+  created_unix: 1535593231
98
+
99
+-
100
+  id: 15
101
+  repo_id: 33
102
+  type: 4
103
+  config: "{}"
104
+  created_unix: 1535593231
105
+
106
+-
107
+  id: 16
108
+  repo_id: 33
109
+  type: 5
110
+  config: "{}"
111
+  created_unix: 1535593231

+ 7
- 0
models/fixtures/repository.yml View File

@@ -400,3 +400,10 @@
400 400
   num_forks: 0
401 401
   num_issues: 0
402 402
   is_mirror: false
403
+
404
+-
405
+  id: 33
406
+  owner_id: 2
407
+  lower_name: utf8
408
+  name: utf8
409
+  is_private: false

+ 1
- 1
models/fixtures/user.yml View File

@@ -27,7 +27,7 @@
27 27
   is_admin: false
28 28
   avatar: avatar2
29 29
   avatar_email: user2@example.com
30
-  num_repos: 5
30
+  num_repos: 6
31 31
   num_stars: 2
32 32
   num_followers: 2
33 33
   num_following: 1

+ 3
- 3
models/repo_list_test.go View File

@@ -147,10 +147,10 @@ func TestSearchRepositoryByName(t *testing.T) {
147 147
 			count: 14},
148 148
 		{name: "AllPublic/PublicRepositoriesOfUserIncludingCollaborative",
149 149
 			opts:  &SearchRepoOptions{Page: 1, PageSize: 10, OwnerID: 15, AllPublic: true},
150
-			count: 16},
150
+			count: 17},
151 151
 		{name: "AllPublic/PublicAndPrivateRepositoriesOfUserIncludingCollaborative",
152 152
 			opts:  &SearchRepoOptions{Page: 1, PageSize: 10, OwnerID: 15, Private: true, AllPublic: true},
153
-			count: 20},
153
+			count: 21},
154 154
 		{name: "AllPublic/PublicAndPrivateRepositoriesOfUserIncludingCollaborativeByName",
155 155
 			opts:  &SearchRepoOptions{Keyword: "test", Page: 1, PageSize: 10, OwnerID: 15, Private: true, AllPublic: true},
156 156
 			count: 13},
@@ -159,7 +159,7 @@ func TestSearchRepositoryByName(t *testing.T) {
159 159
 			count: 11},
160 160
 		{name: "AllPublic/PublicRepositoriesOfOrganization",
161 161
 			opts:  &SearchRepoOptions{Page: 1, PageSize: 10, OwnerID: 17, AllPublic: true, Collaborate: util.OptionalBoolFalse},
162
-			count: 16},
162
+			count: 17},
163 163
 	}
164 164
 
165 165
 	for _, testCase := range testCases {

+ 1
- 1
modules/context/repo.go View File

@@ -625,7 +625,7 @@ func RepoRefByType(refType RepoRefType) macaron.Handler {
625 625
 				// redirect from old URL scheme to new URL scheme
626 626
 				ctx.Redirect(path.Join(
627 627
 					setting.AppSubURL,
628
-					strings.TrimSuffix(ctx.Req.URL.String(), ctx.Params("*")),
628
+					strings.TrimSuffix(ctx.Req.URL.Path, ctx.Params("*")),
629 629
 					ctx.Repo.BranchNameSubURL(),
630 630
 					ctx.Repo.TreePath))
631 631
 				return

Loading…
Cancel
Save