Skip to content

Commit a8e4418

Browse files
ReneWerner87ReneWerner87
authored
Merge pull request #228 from gofiber/codex/2025-11-29-16-00-16
2 parents 72f3762 + 32d93a0 commit a8e4418

File tree

6 files changed

+48
-25
lines changed

6 files changed

+48
-25
lines changed

‎cmd/internal/migrations/v3/csrfconfig.go‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ func MigrateCSRFConfig(cmd *cobra.Command, cwd string, _, _ *semver.Version) err
3636
var extractor string
3737
switch {
3838
case strings.HasPrefix(val, "header:"):
39-
extractor = fmt.Sprintf("Extractor: csrf.FromHeader(%q)", strings.TrimPrefix(val, "header:"))
39+
extractor = fmt.Sprintf("Extractor: extractors.FromHeader(%q)", strings.TrimPrefix(val, "header:"))
4040
case strings.HasPrefix(val, "form:"):
41-
extractor = fmt.Sprintf("Extractor: csrf.FromForm(%q)", strings.TrimPrefix(val, "form:"))
41+
extractor = fmt.Sprintf("Extractor: extractors.FromForm(%q)", strings.TrimPrefix(val, "form:"))
4242
case strings.HasPrefix(val, "query:"):
43-
extractor = fmt.Sprintf("Extractor: csrf.FromQuery(%q)", strings.TrimPrefix(val, "query:"))
43+
extractor = fmt.Sprintf("Extractor: extractors.FromQuery(%q)", strings.TrimPrefix(val, "query:"))
4444
default:
4545
if comment != "" {
4646
comment = " " + comment
@@ -62,7 +62,12 @@ func MigrateCSRFConfig(cmd *cobra.Command, cwd string, _, _ *semver.Version) err
6262
if _, err := b.WriteString(content[last:]); err != nil {
6363
return content
6464
}
65-
return b.String()
65+
66+
updated := b.String()
67+
if updated != content {
68+
updated = addImport(updated, "github.com/gofiber/fiber/v3/extractors")
69+
}
70+
return updated
6671
})
6772
if err != nil {
6873
return fmt.Errorf("failed to migrate CSRF configs: %w", err)

‎cmd/internal/migrations/v3/csrfconfig_test.go‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,8 @@ var _ = csrf.New(csrf.Config{
8585

8686
content := readFile(t, file)
8787
assert.NotContains(t, content, "KeyLookup")
88-
assert.Contains(t, content, `Extractor: csrf.FromHeader("X-CSRF-Token")`)
88+
assert.Contains(t, content, `Extractor: extractors.FromHeader("X-CSRF-Token")`)
89+
assert.Contains(t, content, `"github.com/gofiber/fiber/v3/extractors"`)
8990
assert.Contains(t, buf.String(), "Migrating CSRF middleware configs")
9091
}
9192

@@ -110,7 +111,8 @@ var _ = csrf.New(csrf.Config{
110111

111112
content := readFile(t, file)
112113
assert.NotContains(t, content, "KeyLookup")
113-
assert.Contains(t, content, `Extractor: csrf.FromForm("csrf")`)
114+
assert.Contains(t, content, `Extractor: extractors.FromForm("csrf")`)
115+
assert.Contains(t, content, `"github.com/gofiber/fiber/v3/extractors"`)
114116
assert.Contains(t, buf.String(), "Migrating CSRF middleware configs")
115117
}
116118

‎cmd/internal/migrations/v3/key_auth_config.go‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ func MigrateKeyAuthConfig(cmd *cobra.Command, cwd string, _, _ *semver.Version)
1717
reAuthScheme := regexp.MustCompile(`(?m)\s*AuthScheme:\s*([^,\n]+)`)
1818

1919
changed, err := internal.ChangeFileContent(cwd, func(content string) string {
20-
return reConfig.ReplaceAllStringFunc(content, func(cfg string) string {
20+
updated := reConfig.ReplaceAllStringFunc(content, func(cfg string) string {
2121
cfg = replaceKeyLookup(cfg, func(indent, val, comma, comment, newline string) string {
2222
scheme := "Bearer"
2323
if am := reAuthScheme.FindStringSubmatch(cfg); len(am) > 1 {
@@ -35,18 +35,18 @@ func MigrateKeyAuthConfig(cmd *cobra.Command, cwd string, _, _ *semver.Version)
3535
case strings.HasPrefix(p, "header:"):
3636
header := strings.TrimPrefix(p, "header:")
3737
if strings.EqualFold(header, "Authorization") {
38-
extractors = append(extractors, fmt.Sprintf("keyauth.FromAuthHeader(%q, %q)", header, scheme))
38+
extractors = append(extractors, fmt.Sprintf("extractors.FromAuthHeader(%q)", scheme))
3939
} else {
40-
extractors = append(extractors, fmt.Sprintf("keyauth.FromHeader(%q)", header))
40+
extractors = append(extractors, fmt.Sprintf("extractors.FromHeader(%q)", header))
4141
}
4242
case strings.HasPrefix(p, "query:"):
43-
extractors = append(extractors, fmt.Sprintf("keyauth.FromQuery(%q)", strings.TrimPrefix(p, "query:")))
43+
extractors = append(extractors, fmt.Sprintf("extractors.FromQuery(%q)", strings.TrimPrefix(p, "query:")))
4444
case strings.HasPrefix(p, "param:"):
45-
extractors = append(extractors, fmt.Sprintf("keyauth.FromParam(%q)", strings.TrimPrefix(p, "param:")))
45+
extractors = append(extractors, fmt.Sprintf("extractors.FromParam(%q)", strings.TrimPrefix(p, "param:")))
4646
case strings.HasPrefix(p, "form:"):
47-
extractors = append(extractors, fmt.Sprintf("keyauth.FromForm(%q)", strings.TrimPrefix(p, "form:")))
47+
extractors = append(extractors, fmt.Sprintf("extractors.FromForm(%q)", strings.TrimPrefix(p, "form:")))
4848
case strings.HasPrefix(p, "cookie:"):
49-
extractors = append(extractors, fmt.Sprintf("keyauth.FromCookie(%q)", strings.TrimPrefix(p, "cookie:")))
49+
extractors = append(extractors, fmt.Sprintf("extractors.FromCookie(%q)", strings.TrimPrefix(p, "cookie:")))
5050
default:
5151
if comment != "" {
5252
comment = " " + comment
@@ -59,7 +59,7 @@ func MigrateKeyAuthConfig(cmd *cobra.Command, cwd string, _, _ *semver.Version)
5959
if len(extractors) == 1 {
6060
extractor = extractors[0]
6161
} else if len(extractors) > 1 {
62-
extractor = fmt.Sprintf("keyauth.Chain(%s)", strings.Join(extractors, ", "))
62+
extractor = fmt.Sprintf("extractors.Chain(%s)", strings.Join(extractors, ", "))
6363
}
6464
if extractor == "" {
6565
if comment != "" {
@@ -77,6 +77,11 @@ func MigrateKeyAuthConfig(cmd *cobra.Command, cwd string, _, _ *semver.Version)
7777
cfg = removeConfigField(cfg, "AuthScheme")
7878
return cfg
7979
})
80+
81+
if updated != content {
82+
updated = addImport(updated, "github.com/gofiber/fiber/v3/extractors")
83+
}
84+
return updated
8085
})
8186
if err != nil {
8287
return fmt.Errorf("failed to migrate keyauth configs: %w", err)

‎cmd/internal/migrations/v3/key_auth_config_test.go‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ var _ = keyauth.New(keyauth.Config{
3232
content := readFile(t, file)
3333
assert.NotContains(t, content, "KeyLookup")
3434
assert.NotContains(t, content, "AuthScheme")
35-
assert.Contains(t, content, `Extractor: keyauth.Chain(keyauth.FromAuthHeader("Authorization", "Bearer"), keyauth.FromQuery("api"))`)
35+
assert.Contains(t, content, `Extractor: extractors.Chain(extractors.FromAuthHeader("Bearer"), extractors.FromQuery("api"))`)
36+
assert.Contains(t, content, `"github.com/gofiber/fiber/v3/extractors"`)
3637
assert.Contains(t, buf.String(), "Migrating keyauth middleware configs")
3738
}
3839

@@ -55,7 +56,8 @@ var _ = keyauth.New(keyauth.Config{
5556

5657
content := readFile(t, file)
5758
assert.NotContains(t, content, "KeyLookup")
58-
assert.Contains(t, content, `Extractor: keyauth.Chain(keyauth.FromCookie("__Host-session"), keyauth.FromForm("csrf"))`)
59+
assert.Contains(t, content, `Extractor: extractors.Chain(extractors.FromCookie("__Host-session"), extractors.FromForm("csrf"))`)
60+
assert.Contains(t, content, `"github.com/gofiber/fiber/v3/extractors"`)
5961
assert.Contains(t, buf.String(), "Migrating keyauth middleware configs")
6062
}
6163

‎cmd/internal/migrations/v3/session_config_test.go‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ var _ = session.New(session.Config{
5656

5757
content := readFile(t, file)
5858
assert.NotContains(t, content, "KeyLookup")
59-
assert.Contains(t, content, `Extractor: session.FromCookie("__Host-session"), // comment`)
59+
assert.Contains(t, content, `Extractor: extractors.FromCookie("__Host-session"), // comment`)
60+
assert.Contains(t, content, `"github.com/gofiber/fiber/v3/extractors"`)
6061
assert.Contains(t, buf.String(), "Migrating session KeyLookup config")
6162
}
6263

@@ -80,7 +81,8 @@ var _ = session.New(session.Config{
8081

8182
content := readFile(t, file)
8283
assert.NotContains(t, content, "KeyLookup")
83-
assert.Contains(t, content, `Extractor: session.FromCookie("__Host-session")`)
84+
assert.Contains(t, content, `Extractor: extractors.FromCookie("__Host-session")`)
85+
assert.Contains(t, content, `"github.com/gofiber/fiber/v3/extractors"`)
8486
assert.Contains(t, buf.String(), "Migrating session KeyLookup config")
8587
}
8688

@@ -103,7 +105,8 @@ var _ = session.New(session.Config{
103105

104106
content := readFile(t, file)
105107
assert.NotContains(t, content, "KeyLookup")
106-
assert.Contains(t, content, `Extractor: session.FromHeader("X-Session-ID")`)
108+
assert.Contains(t, content, `Extractor: extractors.FromHeader("X-Session-ID")`)
109+
assert.Contains(t, content, `"github.com/gofiber/fiber/v3/extractors"`)
107110
assert.Contains(t, buf.String(), "Migrating session KeyLookup config")
108111
}
109112

@@ -126,7 +129,8 @@ var _ = session.New(session.Config{
126129

127130
content := readFile(t, file)
128131
assert.NotContains(t, content, "KeyLookup")
129-
assert.Contains(t, content, `Extractor: session.FromQuery("session_id")`)
132+
assert.Contains(t, content, `Extractor: extractors.FromQuery("session_id")`)
133+
assert.Contains(t, content, `"github.com/gofiber/fiber/v3/extractors"`)
130134
assert.Contains(t, buf.String(), "Migrating session KeyLookup config")
131135
}
132136

‎cmd/internal/migrations/v3/session_extractor.go‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ func MigrateSessionExtractor(cmd *cobra.Command, cwd string, _, _ *semver.Versio
3535
p = strings.TrimSpace(p)
3636
switch {
3737
case strings.HasPrefix(p, "cookie:"):
38-
extractors = append(extractors, fmt.Sprintf("session.FromCookie(%q)", strings.TrimPrefix(p, "cookie:")))
38+
extractors = append(extractors, fmt.Sprintf("extractors.FromCookie(%q)", strings.TrimPrefix(p, "cookie:")))
3939
case strings.HasPrefix(p, "header:"):
40-
extractors = append(extractors, fmt.Sprintf("session.FromHeader(%q)", strings.TrimPrefix(p, "header:")))
40+
extractors = append(extractors, fmt.Sprintf("extractors.FromHeader(%q)", strings.TrimPrefix(p, "header:")))
4141
case strings.HasPrefix(p, "query:"):
42-
extractors = append(extractors, fmt.Sprintf("session.FromQuery(%q)", strings.TrimPrefix(p, "query:")))
42+
extractors = append(extractors, fmt.Sprintf("extractors.FromQuery(%q)", strings.TrimPrefix(p, "query:")))
4343
default:
4444
if comment != "" {
4545
comment = " " + comment
@@ -57,7 +57,7 @@ func MigrateSessionExtractor(cmd *cobra.Command, cwd string, _, _ *semver.Versio
5757

5858
extractor := extractors[0]
5959
if len(extractors) > 1 {
60-
extractor = fmt.Sprintf("session.Chain(%s)", strings.Join(extractors, ", "))
60+
extractor = fmt.Sprintf("extractors.Chain(%s)", strings.Join(extractors, ", "))
6161
}
6262

6363
if comment != "" {
@@ -73,7 +73,12 @@ func MigrateSessionExtractor(cmd *cobra.Command, cwd string, _, _ *semver.Versio
7373
if _, err := b.WriteString(content[last:]); err != nil {
7474
return content
7575
}
76-
return b.String()
76+
77+
updated := b.String()
78+
if updated != content {
79+
updated = addImport(updated, "github.com/gofiber/fiber/v3/extractors")
80+
}
81+
return updated
7782
})
7883
if err != nil {
7984
return fmt.Errorf("failed to migrate session extractor config: %w", err)

0 commit comments

Comments
 (0)