Diff
1diff --git a/README.md b/README.md
2index d5bd030a0f82435bd4a8529bacf57ddce76afeb2..cbefcd78454a8727921dd3365f298e54026f3724 100644
3--- a/README.md
4+++ b/README.md
5@@ -158,32 +158,6 @@ ssh:
6 # This is the address that will be used to clone repositories.
7 public_url: "ssh://localhost:23231"
8
9- # The cross-origin request security options
10- cors:
11- # The allowed cross-origin headers
12- allowed_headers:
13- - Accept
14- - Accept-Language
15- - Content-Language
16- - Origin
17- # - Content-Type
18- # - X-Requested-With
19- # - User-Agent
20- # - Authorization
21- # - Access-Control-Request-Method
22-
23- # The allowed cross-origin URLs
24- # allowed_origins:
25- # - *
26-
27- # The allowed cross-origin methods
28- allowed_methods:
29- - GET
30- - HEAD
31- - POST
32- # - PUT
33- # - OPTIONS
34-
35 # The path to the SSH server's private key.
36 key_path: "ssh/soft_serve_host"
37
38diff --git a/cmd/soft/hook/hook.go b/cmd/soft/hook/hook.go
39index 43718ed22042e0c9d5c6b84cb9ac1488b3c724eb..e9b3f1f5c1ff6c3ebf40cbf3f5d5160c53ed8953 100644
40--- a/cmd/soft/hook/hook.go
41+++ b/cmd/soft/hook/hook.go
42@@ -65,6 +65,8 @@ var (
43 // This is set in the server before invoking git-receive-pack/git-upload-pack
44 repoName := os.Getenv("SOFT_SERVE_REPO_NAME")
45
46+ logger := log.FromContext(ctx).With("repo", repoName)
47+
48 stdin := cmd.InOrStdin()
49 stdout := cmd.OutOrStdout()
50 stderr := cmd.ErrOrStderr()
51@@ -80,9 +82,11 @@ var (
52 scanner := bufio.NewScanner(stdin)
53 for scanner.Scan() {
54 buf.Write(scanner.Bytes())
55+ buf.WriteByte('\n')
56 fields := strings.Fields(scanner.Text())
57 if len(fields) != 3 {
58- return fmt.Errorf("invalid hook input: %s", scanner.Text())
59+ logger.Error(fmt.Sprintf("invalid %s hook input", cmdName), "input", scanner.Text())
60+ continue
61 }
62 opts = append(opts, hooks.HookArg{
63 OldSha: fields[0],
64@@ -99,7 +103,8 @@ var (
65 }
66 case hooks.UpdateHook:
67 if len(args) != 3 {
68- return fmt.Errorf("invalid update hook input: %s", args)
69+ logger.Error("invalid update hook input", "input", args)
70+ break
71 }
72
73 hks.Update(ctx, stdout, stderr, repoName, hooks.HookArg{
74@@ -115,7 +120,7 @@ var (
75 if stat, err := os.Stat(customHookPath); err == nil && !stat.IsDir() && stat.Mode()&0o111 != 0 {
76 // If the custom hook is executable, run it
77 if err := runCommand(ctx, &buf, stdout, stderr, customHookPath, args...); err != nil {
78- return fmt.Errorf("failed to run custom hook: %w", err)
79+ logger.Error("failed to run custom hook", "err", err)
80 }
81 }
82
83diff --git a/go.mod b/go.mod
84index 9fbd9d81d16b368c9651e59c7f1ffcf684cc1a7c..ffd590990293616db03614748deade271399e236 100644
85--- a/go.mod
86+++ b/go.mod
87@@ -4,6 +4,7 @@ go 1.23.0
88
89 require (
90 github.com/charmbracelet/glamour v0.9.1
91+ github.com/charmbracelet/lipgloss v1.1.0 // indirect
92 github.com/dustin/go-humanize v1.0.1
93 github.com/go-git/go-git/v5 v5.14.0
94 github.com/matryer/is v1.4.1
95@@ -22,15 +23,15 @@ require (
96 github.com/charmbracelet/bubbletea/v2 v2.0.0-alpha.2.0.20250318133619-2ce107c85fed
97 github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc
98 github.com/charmbracelet/git-lfs-transfer v0.1.1-0.20240708204110-bacbfdb68d92
99- github.com/charmbracelet/keygen v0.5.1
100+ github.com/charmbracelet/keygen v0.5.3
101 github.com/charmbracelet/lipgloss/v2 v2.0.0-alpha.2.0.20250313133401-58331b1fff40
102- github.com/charmbracelet/log v0.4.1-0.20241101171137-e66b83d34ed9
103+ github.com/charmbracelet/log v0.4.1
104 github.com/charmbracelet/ssh v0.0.0-20250128164007-98fd5ae11894
105 github.com/charmbracelet/wish/v2 v2.0.0-20250319172925-3ae4bfe9c24e
106 github.com/charmbracelet/x/ansi v0.8.0
107 github.com/go-jose/go-jose/v3 v3.0.3
108 github.com/gobwas/glob v0.2.3
109- github.com/golang-jwt/jwt/v5 v5.2.1
110+ github.com/golang-jwt/jwt/v5 v5.2.2
111 github.com/google/go-querystring v1.1.0
112 github.com/google/uuid v1.6.0
113 github.com/gorilla/handlers v1.5.2
114@@ -45,7 +46,7 @@ require (
115 github.com/rogpeppe/go-internal v1.14.1
116 github.com/spf13/cobra v1.9.1
117 go.uber.org/automaxprocs v1.6.0
118- golang.org/x/crypto v0.35.0
119+ golang.org/x/crypto v0.36.0
120 golang.org/x/sync v0.12.0
121 gopkg.in/yaml.v3 v3.0.1
122 modernc.org/sqlite v1.36.1
123@@ -58,7 +59,6 @@ require (
124 github.com/aymerick/douceur v0.2.0 // indirect
125 github.com/beorn7/perks v1.0.1 // indirect
126 github.com/cespare/xxhash/v2 v2.3.0 // indirect
127- github.com/charmbracelet/lipgloss v1.1.0 // indirect
128 github.com/charmbracelet/log/v2 v2.0.0-20250226163916-c379e29ff706 // indirect
129 github.com/charmbracelet/x/cellbuf v0.0.13 // indirect
130 github.com/charmbracelet/x/conpty v0.1.0 // indirect
131@@ -97,7 +97,7 @@ require (
132 github.com/yuin/goldmark v1.7.8 // indirect
133 github.com/yuin/goldmark-emoji v1.0.5 // indirect
134 golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
135- golang.org/x/net v0.35.0 // indirect
136+ golang.org/x/net v0.36.0 // indirect
137 golang.org/x/sys v0.31.0 // indirect
138 golang.org/x/term v0.30.0 // indirect
139 golang.org/x/text v0.23.0 // indirect
140diff --git a/go.sum b/go.sum
141index 6655db7d3b67c61670ef5680a56bab373d7884bb..91a8baea2b45cb5fff2f52414d7b68c5819af1d7 100644
142--- a/go.sum
143+++ b/go.sum
144@@ -38,14 +38,14 @@ github.com/charmbracelet/git-lfs-transfer v0.1.1-0.20240708204110-bacbfdb68d92 h
145 github.com/charmbracelet/git-lfs-transfer v0.1.1-0.20240708204110-bacbfdb68d92/go.mod h1:UrXUCm3xLQkq15fu7qlXHUMlrhdlXHoi13KH2Dfiits=
146 github.com/charmbracelet/glamour v0.9.1 h1:Q7PdJLOx8EoepsXUvW6Puz5WQ3YUElIGQdYKrIpiGLA=
147 github.com/charmbracelet/glamour v0.9.1/go.mod h1:+SHvIS8qnwhgTpVMiXwn7OfGomSqff1cHBCI8jLOetk=
148-github.com/charmbracelet/keygen v0.5.1 h1:zBkkYPtmKDVTw+cwUyY6ZwGDhRxXkEp0Oxs9sqMLqxI=
149-github.com/charmbracelet/keygen v0.5.1/go.mod h1:zznJVmK/GWB6dAtjluqn2qsttiCBhA5MZSiwb80fcHw=
150+github.com/charmbracelet/keygen v0.5.3 h1:2MSDC62OUbDy6VmjIE2jM24LuXUvKywLCmaJDmr/Z/4=
151+github.com/charmbracelet/keygen v0.5.3/go.mod h1:TcpNoMAO5GSmhx3SgcEMqCrtn8BahKhB8AlwnLjRUpk=
152 github.com/charmbracelet/lipgloss v1.1.0 h1:vYXsiLHVkK7fp74RkV7b2kq9+zDLoEU4MZoFqR/noCY=
153 github.com/charmbracelet/lipgloss v1.1.0/go.mod h1:/6Q8FR2o+kj8rz4Dq0zQc3vYf7X+B0binUUBwA0aL30=
154 github.com/charmbracelet/lipgloss/v2 v2.0.0-alpha.2.0.20250313133401-58331b1fff40 h1:9IxBdCOOJoJ1PYXgxWXJCk3Fkl7h2n+b7VtY+5BbIuQ=
155 github.com/charmbracelet/lipgloss/v2 v2.0.0-alpha.2.0.20250313133401-58331b1fff40/go.mod h1:XhU7tcZRWVGzkjWQ6XYRH7tIVqYuWLx6XLjVqAz+7FU=
156-github.com/charmbracelet/log v0.4.1-0.20241101171137-e66b83d34ed9 h1:m72jc7WwobapT4NLVVAjejNsz26f2UQ2Mz74uTq/Tro=
157-github.com/charmbracelet/log v0.4.1-0.20241101171137-e66b83d34ed9/go.mod h1:soIjG88SDQxYFpbhYXbrDTPbd/07bfo66OjADdnY5HE=
158+github.com/charmbracelet/log v0.4.1 h1:6AYnoHKADkghm/vt4neaNEXkxcXLSV2g1rdyFDOpTyk=
159+github.com/charmbracelet/log v0.4.1/go.mod h1:pXgyTsqsVu4N9hGdHmQ0xEA4RsXof402LX9ZgiITn2I=
160 github.com/charmbracelet/log/v2 v2.0.0-20250226163916-c379e29ff706 h1:WkwO6Ks3mSIGnGuSdKl9qDSyfbYK50z2wc2gGMggegE=
161 github.com/charmbracelet/log/v2 v2.0.0-20250226163916-c379e29ff706/go.mod h1:mjJGp00cxcfvD5xdCa+bso251Jt4owrQvuimJtVmEmM=
162 github.com/charmbracelet/ssh v0.0.0-20250128164007-98fd5ae11894 h1:Ffon9TbltLGBsT6XE//YvNuu4OAaThXioqalhH11xEw=
163@@ -96,8 +96,8 @@ github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpv
164 github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
165 github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
166 github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
167-github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=
168-github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
169+github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8=
170+github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
171 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
172 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
173 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
174@@ -226,8 +226,8 @@ go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwE
175 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
176 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
177 golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
178-golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=
179-golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=
180+golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
181+golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
182 golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8=
183 golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
184 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
185@@ -239,8 +239,8 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
186 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
187 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
188 golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
189-golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8=
190-golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk=
191+golang.org/x/net v0.36.0 h1:vWF2fRbw4qslQsQzgFqZff+BItCvGFQqKzKIzx1rmoA=
192+golang.org/x/net v0.36.0/go.mod h1:bFmbeoIPfrw4sMHNhb4J9f6+tPziuGjq7Jk/38fxi1I=
193 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
194 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
195 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
196diff --git a/pkg/config/config.go b/pkg/config/config.go
197index 8db84ebf2763ad9fe15f24948c3268de39738d73..05dd2c38e3e3f70d6e7facfe526afd8fe0fc4215 100644
198--- a/pkg/config/config.go
199+++ b/pkg/config/config.go
200@@ -61,15 +61,6 @@ type GitConfig struct {
201 MaxConnections int `env:"MAX_CONNECTIONS" yaml:"max_connections"`
202 }
203
204-// CORSConfig is the CORS configuration for the server.
205-type CORSConfig struct {
206- AllowedHeaders []string `env:"ALLOWED_HEADERS" yaml:"allowed_headers"`
207-
208- AllowedOrigins []string `env:"ALLOWED_ORIGINS" yaml:"allowed_origins"`
209-
210- AllowedMethods []string `env:"ALLOWED_METHODS" yaml:"allowed_methods"`
211-}
212-
213 // HTTPConfig is the HTTP configuration for the server.
214 type HTTPConfig struct {
215 // Enabled toggles the HTTP server on/off
216@@ -86,9 +77,6 @@ type HTTPConfig struct {
217
218 // PublicURL is the public URL of the HTTP server.
219 PublicURL string `env:"PUBLIC_URL" yaml:"public_url"`
220-
221- // HTTP is the configuration for the HTTP server.
222- CORS CORSConfig `envPrefix:"CORS_" yaml:"cors"`
223 }
224
225 // StatsConfig is the configuration for the stats server.
226@@ -208,9 +196,6 @@ func (c *Config) Environ() []string {
227 fmt.Sprintf("SOFT_SERVE_HTTP_TLS_KEY_PATH=%s", c.HTTP.TLSKeyPath),
228 fmt.Sprintf("SOFT_SERVE_HTTP_TLS_CERT_PATH=%s", c.HTTP.TLSCertPath),
229 fmt.Sprintf("SOFT_SERVE_HTTP_PUBLIC_URL=%s", c.HTTP.PublicURL),
230- fmt.Sprintf("SOFT_SERVE_HTTP_CORS_ALLOWED_HEADERS=%s", strings.Join(c.HTTP.CORS.AllowedHeaders, ",")),
231- fmt.Sprintf("SOFT_SERVE_HTTP_CORS_ALLOWED_ORIGINS=%s", strings.Join(c.HTTP.CORS.AllowedOrigins, ",")),
232- fmt.Sprintf("SOFT_SERVE_HTTP_CORS_ALLOWED_METHODS=%s", strings.Join(c.HTTP.CORS.AllowedMethods, ",")),
233 fmt.Sprintf("SOFT_SERVE_STATS_ENABLED=%t", c.Stats.Enabled),
234 fmt.Sprintf("SOFT_SERVE_STATS_LISTEN_ADDR=%s", c.Stats.ListenAddr),
235 fmt.Sprintf("SOFT_SERVE_LOG_FORMAT=%s", c.Log.Format),
236diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go
237index b0653f28241239b14c225f76f247c154d67c82aa..8b84ed8222ba39ca5ad4d1236f5c787b19b0ab00 100644
238--- a/pkg/config/config_test.go
239+++ b/pkg/config/config_test.go
240@@ -79,47 +79,3 @@ func TestCustomConfigLocation(t *testing.T) {
241 cfg = DefaultConfig()
242 is.Equal(cfg.Name, "Soft Serve")
243 }
244-
245-func TestParseMultipleHeaders(t *testing.T) {
246- is := is.New(t)
247- is.NoErr(os.Setenv("SOFT_SERVE_HTTP_CORS_ALLOWED_HEADERS", "Accept,Accept-Language,User-Agent"))
248- t.Cleanup(func() {
249- is.NoErr(os.Unsetenv("SOFT_SERVE_HTTP_CORS_ALLOWED_HEADERS"))
250- })
251- cfg := DefaultConfig()
252- is.NoErr(cfg.ParseEnv())
253- is.Equal(cfg.HTTP.CORS.AllowedHeaders, []string{
254- "Accept",
255- "Accept-Language",
256- "User-Agent",
257- })
258-}
259-
260-func TestParseMultipleOrigins(t *testing.T) {
261- is := is.New(t)
262- is.NoErr(os.Setenv("SOFT_SERVE_HTTP_CORS_ALLOWED_ORIGINS", "https://foo.example,https://foo.example2"))
263- t.Cleanup(func() {
264- is.NoErr(os.Unsetenv("SOFT_SERVE_HTTP_CORS_ALLOWED_ORIGINS"))
265- })
266- cfg := DefaultConfig()
267- is.NoErr(cfg.ParseEnv())
268- is.Equal(cfg.HTTP.CORS.AllowedOrigins, []string{
269- "https://foo.example",
270- "https://foo.example2",
271- })
272-}
273-
274-func TestParseMultipleMethods(t *testing.T) {
275- is := is.New(t)
276- is.NoErr(os.Setenv("SOFT_SERVE_HTTP_CORS_ALLOWED_METHODS", "GET,POST,PUT"))
277- t.Cleanup(func() {
278- is.NoErr(os.Unsetenv("SOFT_SERVE_HTTP_CORS_ALLOWED_METHODS"))
279- })
280- cfg := DefaultConfig()
281- is.NoErr(cfg.ParseEnv())
282- is.Equal(cfg.HTTP.CORS.AllowedMethods, []string{
283- "GET",
284- "POST",
285- "PUT",
286- })
287-}
288diff --git a/pkg/web/server.go b/pkg/web/server.go
289index ab336e89a5f358be803812b93144a10722af4010..74a04f5b176bee7d1710f023643436119b181c97 100644
290--- a/pkg/web/server.go
291+++ b/pkg/web/server.go
292@@ -5,7 +5,6 @@ import (
293 "net/http"
294
295 "github.com/charmbracelet/log"
296- "github.com/charmbracelet/soft-serve/pkg/config"
297 "github.com/gorilla/handlers"
298 "github.com/gorilla/mux"
299 )
300@@ -27,12 +26,5 @@ func NewRouter(ctx context.Context) http.Handler {
301 h = handlers.CompressHandler(h)
302 h = handlers.RecoveryHandler()(h)
303
304- cfg := config.FromContext(ctx)
305-
306- h = handlers.CORS(handlers.AllowedHeaders(cfg.HTTP.CORS.AllowedHeaders),
307- handlers.AllowedOrigins(cfg.HTTP.CORS.AllowedOrigins),
308- handlers.AllowedMethods(cfg.HTTP.CORS.AllowedMethods),
309- )(h)
310-
311 return h
312 }
313diff --git a/testscript/testdata/http-cors.txtar b/testscript/testdata/http-cors.txtar
314deleted file mode 100644
315index c545ab7a1d908fde301410b90a651d8992aeb9e0..0000000000000000000000000000000000000000
316--- a/testscript/testdata/http-cors.txtar
317+++ /dev/null
318@@ -1,64 +0,0 @@
319-# vi: set ft=conf
320-
321-# FIXME: don't skip windows
322-[windows] skip 'curl makes github actions hang'
323-
324-# convert crlf to lf on windows
325-[windows] dos2unix http1.txt http2.txt http3.txt goget.txt gitclone.txt
326-
327-# start soft serve
328-exec soft serve &
329-# wait for SSH server to start
330-ensureserverrunning SSH_PORT
331-
332-# create user
333-soft user create user1 --key "$USER1_AUTHORIZED_KEY"
334-
335-# create access token
336-soft token create --expires-in '1h' 'repo2'
337-cp stdout tokenfile
338-envfile TOKEN=tokenfile
339-soft token create --expires-in '1ns' 'repo2'
340-cp stdout etokenfile
341-envfile ETOKEN=etokenfile
342-usoft token create 'repo2'
343-cp stdout utokenfile
344-envfile UTOKEN=utokenfile
345-
346-# push & create repo with some files, commits, tags...
347-mkdir ./repo2
348-git -c init.defaultBranch=master -C repo2 init
349-mkfile ./repo2/README.md '# Project\nfoo'
350-mkfile ./repo2/foo.png 'foo'
351-mkfile ./repo2/bar.png 'bar'
352-git -C repo2 remote add origin http://$TOKEN@localhost:$HTTP_PORT/repo2
353-git -C repo2 lfs install --local
354-git -C repo2 lfs track '*.png'
355-git -C repo2 add -A
356-git -C repo2 commit -m 'first'
357-git -C repo2 tag v0.1.0
358-git -C repo2 push origin HEAD
359-git -C repo2 push origin HEAD --tags
360-
361-curl -v --request OPTIONS http://localhost:$HTTP_PORT/repo2.git/info/refs -H 'Origin: https://foo.example' -H 'Access-Control-Request-Method: GET'
362-stderr '.*Method Not Allowed.*'
363-
364-# stop the server
365-stopserver
366-
367-# allow cross-origin OPTIONS requests
368-env SOFT_SERVE_HTTP_CORS_ALLOWED_ORIGINS="https://foo.example"
369-env SOFT_SERVE_HTTP_CORS_ALLOWED_METHODS="GET,OPTIONS"
370-env SOFT_SERVE_HTTP_CORS_ALLOWED_HEADERS="Origin,Access-Control-Request-Method"
371-
372-# restart soft serve
373-exec soft serve &
374-# wait for SSH server to start
375-ensureserverrunning SSH_PORT
376-
377-curl -v --request OPTIONS http://localhost:$HTTP_PORT/repo2.git/info/refs -H 'Origin: https://foo.example' -H 'Access-Control-Request-Method: GET'
378-stderr '.*200 OK.*'
379-
380-# stop the server
381-[windows] stopserver
382-[windows] ! stderr .
383diff --git a/testscript/testdata/repo-push.txtar b/testscript/testdata/repo-push.txtar
384index d9f947537f105e879ab54275777c62250ffaa673..c4a5e243e1a9b021d207dddb6279588beeab37fe 100644
385--- a/testscript/testdata/repo-push.txtar
386+++ b/testscript/testdata/repo-push.txtar
387@@ -11,8 +11,14 @@ soft repo create repo-empty -d 'description' -H -p -n 'repo-empty'
388 # clone repo
389 git clone ssh://localhost:$SSH_PORT/repo-empty repo-empty
390
391-# push repo
392+# push repo without any commits
393 ! git -C repo-empty push origin HEAD
394
395+# push repo with a commit
396+mkfile ./repo-empty/README.md '# Hello\n\nwelcome'
397+git -C repo-empty add README.md
398+git -C repo-empty commit -m 'first'
399+git -C repo-empty push origin HEAD
400+
401 # stop the server
402 [windows] stopserver