Skip to content

Commit 6c2f348

Browse files
xhofexhofe
committed
fix!: reverse proxy to sub-directory (AlistGo#3483)
from this commit, if you want reverse proxy to sub-directory like `alist` with `nginx`, you need config: ```nginx location /alist/ { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header Host $http_host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header Range $http_range; proxy_set_header If-Range $http_if_range; proxy_redirect off; proxy_pass http://127.0.0.1:5244/alist/; # the max size of file to upload client_max_body_size 20000m; } ```
1 parent 3c7512f commit 6c2f348

7 files changed

Lines changed: 49 additions & 50 deletions

File tree

‎go.sum‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -120,14 +120,10 @@ github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7P
120120
github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
121121
github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
122122
github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
123-
github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E=
124123
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk=
125124
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
126-
github.com/jackc/pgx/v5 v5.2.0 h1:NdPpngX0Y6z6XDFKqmFQaE+bCtkqzvQIOt1wvBlAqs8=
127-
github.com/jackc/pgx/v5 v5.2.0/go.mod h1:Ptn7zmohNsWEsdxRawMzk3gaKma2obW+NWTnKa0S4nk=
128125
github.com/jackc/pgx/v5 v5.3.0 h1:/NQi8KHMpKWHInxXesC8yD4DhkXPrVhmnwYkjp9AmBA=
129126
github.com/jackc/pgx/v5 v5.3.0/go.mod h1:t3JDKnCBlYIc0ewLF0Q7B8MXmoIaBOZj/ic7iHozM/8=
130-
github.com/jackc/puddle/v2 v2.1.2/go.mod h1:2lpufsF5mRHO6SuZkm0fNYxM6SWHfvyFj62KwNzgels=
131127
github.com/jackc/puddle/v2 v2.2.0/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
132128
github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
133129
github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
@@ -206,7 +202,6 @@ github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpE
206202
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
207203
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
208204
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
209-
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
210205
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
211206
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
212207
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
@@ -227,7 +222,6 @@ github.com/winfsp/cgofuse v1.5.0/go.mod h1:h3awhoUOcn2VYVKCwDaYxSLlZwnyK+A8KaDoL
227222
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
228223
go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0=
229224
go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
230-
go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
231225
golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
232226
golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
233227
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@@ -236,13 +230,9 @@ golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5y
236230
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
237231
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
238232
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
239-
golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
240-
golang.org/x/crypto v0.4.0/go.mod h1:3quD/ATkf6oY+rnes5c3ExXTbLc8mueNue5/DoinL80=
241233
golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc=
242234
golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
243235
golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
244-
golang.org/x/image v0.4.0 h1:x1RWAiZIvERqkltrFjtQP1ycmiR5pmhjtCfVOtdURuQ=
245-
golang.org/x/image v0.4.0/go.mod h1:FVC7BI/5Ym8R25iw5OLsgshdUBbT1h5jZTpA+mvAdZ4=
246236
golang.org/x/image v0.5.0 h1:5JMiNunQeQw++mMOz48/ISeNu3Iweh/JaZU8ZLqHRrI=
247237
golang.org/x/image v0.5.0/go.mod h1:FVC7BI/5Ym8R25iw5OLsgshdUBbT1h5jZTpA+mvAdZ4=
248238
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
@@ -253,14 +243,11 @@ golang.org/x/net v0.0.0-20211029224645-99673261e6eb/go.mod h1:9nx3DQGgdP8bBQD5qx
253243
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
254244
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
255245
golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
256-
golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
257-
golang.org/x/net v0.6.0 h1:L4ZwwTvKW9gr0ZMS1yrHD9GZhIuVjOBBnaKH+SPQK0Q=
258246
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
259247
golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
260248
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
261249
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
262250
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
263-
golang.org/x/sync v0.0.0-20220923202941-7f9b1623fab7/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
264251
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
265252
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
266253
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -278,22 +265,18 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc
278265
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
279266
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
280267
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
281-
golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
282268
golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
283269
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
284270
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
285271
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
286272
golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
287-
golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
288273
golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY=
289274
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
290275
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
291276
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
292277
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
293278
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
294-
golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
295279
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
296-
golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
297280
golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
298281
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
299282
golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -325,12 +308,8 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C
325308
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
326309
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
327310
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
328-
gorm.io/driver/mysql v1.4.6 h1:5zS3vIKcyb46byXZNcYxaT9EWNIhXzu0gPuvvVrwZ8s=
329-
gorm.io/driver/mysql v1.4.6/go.mod h1:SxzItlnT1cb6e1e4ZRpgJN2VYtcqJgqnHxWr4wsP8oc=
330311
gorm.io/driver/mysql v1.4.7 h1:rY46lkCspzGHn7+IYsNpSfEv9tA+SU4SkkB+GFX125Y=
331312
gorm.io/driver/mysql v1.4.7/go.mod h1:SxzItlnT1cb6e1e4ZRpgJN2VYtcqJgqnHxWr4wsP8oc=
332-
gorm.io/driver/postgres v1.4.7 h1:J06jXZCNq7Pdf7LIPn8tZn9LsWjd81BRSKveKNr0ZfA=
333-
gorm.io/driver/postgres v1.4.7/go.mod h1:UJChCNLFKeBqQRE+HrkFUbKbq9idPXmTOk2u4Wok8S4=
334313
gorm.io/driver/postgres v1.4.8 h1:NDWizaclb7Q2aupT0jkwK8jx1HVCNzt+PQ8v/VnxviA=
335314
gorm.io/driver/postgres v1.4.8/go.mod h1:O9MruWGNLUBUWVYfWuBClpf3HeGjOoybY0SNmCs3wsw=
336315
gorm.io/driver/sqlite v1.4.4 h1:gIufGoR0dQzjkyqDyYSCvsYR6fba1Gw5YKDqKeChxFc=

‎internal/bootstrap/config.go‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@ package bootstrap
22

33
import (
44
"crypto/tls"
5+
"net/url"
56
"os"
67
"path/filepath"
8+
"strings"
79

810
"github.com/alist-org/alist/v3/cmd/flags"
911
"github.com/alist-org/alist/v3/drivers/base"
@@ -79,6 +81,7 @@ func InitConfig() {
7981
if conf.Conf.TlsInsecureSkipVerify {
8082
base.RestyClient = base.RestyClient.SetTLSClientConfig(&tls.Config{InsecureSkipVerify: true})
8183
}
84+
initURL()
8285
}
8386

8487
func confFromEnv() {
@@ -93,3 +96,14 @@ func confFromEnv() {
9396
log.Fatalf("load config from env error: %+v", err)
9497
}
9598
}
99+
100+
func initURL() {
101+
if !strings.Contains(conf.Conf.SiteURL, "://") {
102+
conf.Conf.SiteURL = utils.FixAndCleanPath(conf.Conf.SiteURL)
103+
}
104+
u, err := url.Parse(conf.Conf.SiteURL)
105+
if err != nil {
106+
utils.Log.Fatalf("can't parse site_url: %+v", err)
107+
}
108+
conf.URL = u
109+
}

‎internal/conf/var.go‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
package conf
22

3-
import "regexp"
3+
import (
4+
"net/url"
5+
"regexp"
6+
)
47

58
var (
69
BuiltAt string
@@ -13,6 +16,7 @@ var (
1316

1417
var (
1518
Conf *Config
19+
URL *url.URL
1620
)
1721

1822
var SlicesMap = make(map[string][]string)

‎server/router.go‎

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"github.com/alist-org/alist/v3/cmd/flags"
55
"github.com/alist-org/alist/v3/internal/conf"
66
"github.com/alist-org/alist/v3/internal/message"
7+
"github.com/alist-org/alist/v3/pkg/utils"
78
"github.com/alist-org/alist/v3/server/common"
89
"github.com/alist-org/alist/v3/server/handles"
910
"github.com/alist-org/alist/v3/server/middlewares"
@@ -12,21 +13,27 @@ import (
1213
"github.com/gin-gonic/gin"
1314
)
1415

15-
func Init(r *gin.Engine) {
16+
func Init(e *gin.Engine) {
17+
if !utils.SliceContains([]string{"", "/"}, conf.URL.Path) {
18+
e.GET("/", func(c *gin.Context) {
19+
c.Redirect(302, conf.URL.Path)
20+
})
21+
}
22+
g := e.Group(conf.URL.Path)
1623
common.SecretKey = []byte(conf.Conf.JwtSecret)
17-
Cors(r)
18-
r.Use(middlewares.StoragesLoaded)
24+
Cors(g)
25+
g.Use(middlewares.StoragesLoaded)
1926
if conf.Conf.MaxConnections > 0 {
20-
r.Use(middlewares.MaxAllowed(conf.Conf.MaxConnections))
27+
g.Use(middlewares.MaxAllowed(conf.Conf.MaxConnections))
2128
}
22-
WebDav(r.Group("/dav"))
29+
WebDav(g.Group("/dav"))
2330

24-
r.GET("/favicon.ico", handles.Favicon)
25-
r.GET("/i/:link_name", handles.Plist)
26-
r.GET("/d/*path", middlewares.Down, handles.Down)
27-
r.GET("/p/*path", middlewares.Down, handles.Proxy)
31+
g.GET("/favicon.ico", handles.Favicon)
32+
g.GET("/i/:link_name", handles.Plist)
33+
g.GET("/d/*path", middlewares.Down, handles.Down)
34+
g.GET("/p/*path", middlewares.Down, handles.Proxy)
2835

29-
api := r.Group("/api")
36+
api := g.Group("/api")
3037
auth := api.Group("", middlewares.Auth)
3138

3239
api.POST("/auth/login", handles.Login)
@@ -46,9 +53,11 @@ func Init(r *gin.Engine) {
4653
_fs(auth.Group("/fs"))
4754
admin(auth.Group("/admin", middlewares.AuthAdmin))
4855
if flags.Dev {
49-
dev(r.Group("/dev"))
56+
dev(g.Group("/dev"))
5057
}
51-
static.Static(r)
58+
static.Static(g, func(handlers ...gin.HandlerFunc) {
59+
e.NoRoute(handlers...)
60+
})
5261
}
5362

5463
func admin(g *gin.RouterGroup) {
@@ -124,10 +133,9 @@ func _fs(g *gin.RouterGroup) {
124133
g.POST("/add_qbit", handles.AddQbittorrent)
125134
}
126135

127-
func Cors(r *gin.Engine) {
136+
func Cors(r *gin.RouterGroup) {
128137
config := cors.DefaultConfig()
129138
config.AllowAllOrigins = true
130-
//config.AllowHeaders = append(config.AllowHeaders, "Authorization", "range", "File-Path", "As-Task", "Password")
131139
config.AllowHeaders = []string{"*"}
132140
config.AllowMethods = []string{"*"}
133141
r.Use(cors.New(config))

‎server/static/config.go‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package static
22

33
import (
4-
"net/url"
54
"strings"
65

76
"github.com/alist-org/alist/v3/internal/conf"
@@ -15,20 +14,16 @@ type SiteConfig struct {
1514
}
1615

1716
func getSiteConfig() SiteConfig {
18-
u, err := url.Parse(conf.Conf.SiteURL)
19-
if err != nil {
20-
utils.Log.Fatalf("can't parse site_url: %+v", err)
21-
}
2217
siteConfig := SiteConfig{
2318
ApiURL: conf.Conf.SiteURL,
24-
BasePath: u.Path,
19+
BasePath: conf.URL.Path,
2520
Cdn: strings.ReplaceAll(strings.TrimSuffix(conf.Conf.Cdn, "/"), "$version", conf.WebVersion),
2621
}
2722
if siteConfig.BasePath != "" {
2823
siteConfig.BasePath = utils.FixAndCleanPath(siteConfig.BasePath)
2924
}
3025
if siteConfig.Cdn == "" {
31-
siteConfig.Cdn = siteConfig.BasePath
26+
siteConfig.Cdn = strings.TrimSuffix(siteConfig.BasePath, "/")
3227
}
3328
return siteConfig
3429
}

‎server/static/static.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func UpdateIndex() {
6262
}
6363
}
6464

65-
func Static(r *gin.Engine) {
65+
func Static(r *gin.RouterGroup, noRoute func(handlers ...gin.HandlerFunc)) {
6666
InitIndex()
6767
folders := []string{"assets", "images", "streamer", "static"}
6868
r.Use(func(c *gin.Context) {
@@ -81,7 +81,7 @@ func Static(r *gin.Engine) {
8181
r.StaticFS(fmt.Sprintf("/%s/", folders[i]), http.FS(sub))
8282
}
8383

84-
r.NoRoute(func(c *gin.Context) {
84+
noRoute(func(c *gin.Context) {
8585
c.Header("Content-Type", "text/html")
8686
c.Status(200)
8787
if strings.HasPrefix(c.Request.URL.Path, "/@manage") {

‎server/webdav.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ package server
33
import (
44
"context"
55
"net/http"
6+
"path"
67

8+
"github.com/alist-org/alist/v3/internal/conf"
79
"github.com/alist-org/alist/v3/internal/model"
810
"github.com/alist-org/alist/v3/internal/op"
911
"github.com/alist-org/alist/v3/pkg/utils"
@@ -14,17 +16,14 @@ import (
1416

1517
var handler *webdav.Handler
1618

17-
func init() {
19+
func WebDav(dav *gin.RouterGroup) {
1820
handler = &webdav.Handler{
19-
Prefix: "/dav",
21+
Prefix: path.Join(conf.URL.Path, "/dav"),
2022
LockSystem: webdav.NewMemLS(),
2123
Logger: func(request *http.Request, err error) {
2224
log.Errorf("%s %s %+v", request.Method, request.URL.Path, err)
2325
},
2426
}
25-
}
26-
27-
func WebDav(dav *gin.RouterGroup) {
2827
dav.Use(WebDAVAuth)
2928
dav.Any("/*path", ServeWebDAV)
3029
dav.Any("", ServeWebDAV)

0 commit comments

Comments
 (0)