mirror of
https://github.com/AlistGo/alist.git
synced 2025-04-22 21:04:07 +08:00
fix: some missing regexp lib modified
This commit is contained in:
parent
478470f609
commit
57bac9e0d2
@ -2,7 +2,6 @@ package common
|
||||
|
||||
import (
|
||||
"path"
|
||||
"regexp"
|
||||
"strings"
|
||||
|
||||
"github.com/alist-org/alist/v3/internal/conf"
|
||||
@ -10,6 +9,7 @@ import (
|
||||
"github.com/alist-org/alist/v3/internal/model"
|
||||
"github.com/alist-org/alist/v3/internal/op"
|
||||
"github.com/alist-org/alist/v3/pkg/utils"
|
||||
"github.com/dlclark/regexp2"
|
||||
)
|
||||
|
||||
func IsStorageSignEnabled(rawPath string) bool {
|
||||
@ -36,8 +36,8 @@ func CanAccess(user *model.User, meta *model.Meta, reqPath string, password stri
|
||||
if meta != nil && !user.CanSeeHides() && meta.Hide != "" &&
|
||||
IsApply(meta.Path, path.Dir(reqPath), meta.HSub) { // the meta should apply to the parent of current path
|
||||
for _, hide := range strings.Split(meta.Hide, "\n") {
|
||||
re := regexp.MustCompile(hide)
|
||||
if re.MatchString(path.Base(reqPath)) {
|
||||
re := regexp2.MustCompile(hide, regexp2.None)
|
||||
if isMatch, _ := re.MatchString(path.Base(reqPath)); isMatch {
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
@ -2,13 +2,13 @@ package handles
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"regexp"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"github.com/alist-org/alist/v3/internal/model"
|
||||
"github.com/alist-org/alist/v3/internal/op"
|
||||
"github.com/alist-org/alist/v3/server/common"
|
||||
"github.com/dlclark/regexp2"
|
||||
"github.com/gin-gonic/gin"
|
||||
log "github.com/sirupsen/logrus"
|
||||
)
|
||||
@ -71,7 +71,7 @@ func UpdateMeta(c *gin.Context) {
|
||||
func validHide(hide string) (string, error) {
|
||||
rs := strings.Split(hide, "\n")
|
||||
for _, r := range rs {
|
||||
_, err := regexp.Compile(r)
|
||||
_, err := regexp2.Compile(r, regexp2.None)
|
||||
if err != nil {
|
||||
return r, err
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user