Do not allow different storage configurations to point to the same directory #30169
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -324,15 +324,14 @@ func loadServerFrom(rootCfg ConfigProvider) { | |||||
| if !filepath.IsAbs(AppDataPath) { | ||||||
| AppDataPath = filepath.ToSlash(filepath.Join(AppWorkPath, AppDataPath)) | ||||||
| } | ||||||
|
|
||||||
| EnableGzip = sec.Key("ENABLE_GZIP").MustBool() | ||||||
| EnablePprof = sec.Key("ENABLE_PPROF").MustBool(false) | ||||||
| PprofDataPath = sec.Key("PPROF_DATA_PATH").MustString(filepath.Join(AppWorkPath, "data/tmp/pprof")) | ||||||
| if !filepath.IsAbs(PprofDataPath) { | ||||||
| PprofDataPath = filepath.Join(AppWorkPath, PprofDataPath) | ||||||
| } | ||||||
| checkOverlappedPath("server.PPROF_DATA_PATH", PprofDataPath) | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
|
|
||||||
| landingPage := sec.Key("LANDING_PAGE").MustString("home") | ||||||
| switch landingPage { | ||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -46,7 +46,7 @@ func loadSessionFrom(rootCfg ConfigProvider) { | |||||
| SessionConfig.ProviderConfig = strings.Trim(sec.Key("PROVIDER_CONFIG").MustString(filepath.Join(AppDataPath, "sessions")), "\" ") | ||||||
| if SessionConfig.Provider == "file" && !filepath.IsAbs(SessionConfig.ProviderConfig) { | ||||||
| SessionConfig.ProviderConfig = filepath.Join(AppWorkPath, SessionConfig.ProviderConfig) | ||||||
| checkOverlappedPath("session.PROVIDER_CONFIG", SessionConfig.ProviderConfig) | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| } | ||||||
| SessionConfig.CookieName = sec.Key("COOKIE_NAME").MustString("i_like_gitea") | ||||||
| SessionConfig.CookiePath = AppSubURL | ||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -230,11 +230,14 @@ func LoadSettingsForInstall() { | |||||||||||||||||||||||||||||||||||||||
| loadMailerFrom(CfgProvider) | ||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||
| var configuredPaths = make(map[string]string) | ||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||
| func checkOverlappedPath(name, path string) { | ||||||||||||||||||||||||||||||||||||||||
| // TODO: some paths shouldn't overlap (storage.xxx.path), while some could (data path is the base path for storage path) | ||||||||||||||||||||||||||||||||||||||||
| if targetName, ok := configuredPaths[path]; ok && targetName != name { | ||||||||||||||||||||||||||||||||||||||||
| msg := fmt.Sprintf("Configured path %q is used by %q and %q at the same time. The paths must be unique to prevent data loss.", path, targetName, name) | ||||||||||||||||||||||||||||||||||||||||
| log.Error("%s", msg) | ||||||||||||||||||||||||||||||||||||||||
| DeprecatedWarnings = append(DeprecatedWarnings, msg) | ||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||
|
Comment on lines
+236
to
241
There was a problem hiding this comment. Can't we fix this completely using
Suggested change
(assuming we have an There was a problem hiding this comment. It is not right (incomplete). If you would like to "complete" it, it also needs enough tests. There was a problem hiding this comment. But your "msg" is still not right, and it doesn't have tests. As I said: "I won't do any further change". So feel free to take it, or improve it, or discard it. There was a problem hiding this comment. And one more thing, |
||||||||||||||||||||||||||||||||||||||||
| configuredPaths[path] = name | ||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -240,7 +240,7 @@ func getStorageForLocal(targetSec, overrideSec ConfigSection, tp targetSecType, | |||||
| } | ||||||
| } | ||||||
|
|
||||||
| checkOverlappedPath("storage."+name+".PATH", storage.Path) | ||||||
|
There was a problem hiding this comment.
Suggested change
There was a problem hiding this comment. It is not right by your approach. |
||||||
|
|
||||||
| return &storage, nil | ||||||
| } | ||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2775,6 +2775,7 @@ teams.invite.by = Invited by %s | |
| teams.invite.description = Please click the button below to join the team. | ||
|
|
||
| [admin] | ||
| maintenance = Maintenance | ||
| dashboard = Dashboard | ||
| self_check = Self Check | ||
| identity_access = Identity & Access | ||
|
|
@@ -2798,7 +2799,7 @@ settings = Admin Settings | |
|
|
||
| dashboard.new_version_hint = Gitea %s is now available, you are running %s. Check <a target="_blank" rel="noreferrer" href="https://blog.gitea.io">the blog</a> for more details. | ||
| dashboard.statistic = Summary | ||
| dashboard.maintenance_operations = Maintenance Operations | ||
| dashboard.system_status = System Status | ||
| dashboard.operation_name = Operation Name | ||
| dashboard.operation_switch = Switch | ||
|
|
@@ -3305,6 +3306,7 @@ notices.op = Op. | |
| notices.delete_success = The system notices have been deleted. | ||
|
|
||
| self_check.no_problem_found = No problem found yet. | ||
| self_check.startup_warnings = Startup warnings: | ||
| self_check.database_collation_mismatch = Expect database to use collation: %s | ||
| self_check.database_collation_case_insensitive = Database is using a collation %s, which is an insensitive collation. Although Gitea could work with it, there might be some rare cases which don't work as expected. | ||
| self_check.database_inconsistent_collation_columns = Database is using collation %s, but these columns are using mismatched collations. It might cause some unexpected problems. | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -190,6 +190,14 @@ func DashboardPost(ctx *context.Context) { | |
|
|
||
| func SelfCheck(ctx *context.Context) { | ||
| ctx.Data["PageIsAdminSelfCheck"] = true | ||
|
|
||
| ctx.Data["DeprecatedWarnings"] = setting.DeprecatedWarnings | ||
delvh marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| if len(setting.DeprecatedWarnings) == 0 && !setting.IsProd { | ||
| if time.Now().Unix()%2 == 0 { | ||
| ctx.Data["DeprecatedWarnings"] = []string{"This is a test warning message in dev mode"} | ||
| } | ||
delvh marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| r, err := db.CheckCollationsDefaultEngine() | ||
| if err != nil { | ||
| ctx.Flash.Error(fmt.Sprintf("CheckCollationsDefaultEngine: %v", err), true) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,7 +6,7 @@ | |
| </div> | ||
| {{end}} | ||
| <h4 class="ui top attached header"> | ||
| {{ctx.Locale.Tr "admin.dashboard.maintenance_operations"}} | ||
| </h4> | ||
| <div class="ui attached table segment"> | ||
| <form method="post" action="{{AppSubUrl}}/admin"> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,18 @@ | ||
| <div class="flex-container-nav"> | ||
| <div class="ui fluid vertical menu"> | ||
| <div class="header item">{{ctx.Locale.Tr "admin.settings"}}</div> | ||
|
|
||
| <details class="item toggleable-item" {{if or .PageIsAdminDashboard .PageIsAdminSelfCheck}}open{{end}}> | ||
| <summary>{{ctx.Locale.Tr "admin.maintenance"}}</summary> | ||
| <div class="menu"> | ||
| <a class="{{if .PageIsAdminDashboard}}active {{end}}item" href="{{AppSubUrl}}/admin"> | ||
| {{ctx.Locale.Tr "admin.dashboard"}} | ||
| </a> | ||
| <a class="{{if .PageIsAdminSelfCheck}}active {{end}}item" href="{{AppSubUrl}}/admin/self_check"> | ||
| {{ctx.Locale.Tr "admin.self_check"}} | ||
| </a> | ||
| </div> | ||
| </details> | ||
| <details class="item toggleable-item" {{if or .PageIsAdminUsers .PageIsAdminEmails .PageIsAdminOrganizations .PageIsAdminAuthentications}}open{{end}}> | ||
| <summary>{{ctx.Locale.Tr "admin.identity_access"}}</summary> | ||
| <div class="menu"> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,33 +4,47 @@ | |
| <h4 class="ui top attached header"> | ||
| {{ctx.Locale.Tr "admin.self_check"}} | ||
| </h4> | ||
|
|
||
| {{if .DeprecatedWarnings}} | ||
| <div class="ui attached segment"> | ||
| <div class="ui warning message"> | ||
| <div>{{ctx.Locale.Tr "admin.self_check.startup_warnings"}}</div> | ||
| <ul class="tw-w-full">{{range .DeprecatedWarnings}}<li>{{.}}</li>{{end}}</ul> | ||
| </div> | ||
| </div> | ||
| {{end}} | ||
|
|
||
| {{if .DatabaseCheckHasProblems}} | ||
| <div class="ui attached segment"> | ||
| {{if .DatabaseType.IsMySQL}} | ||
| <div class="tw-p-2">{{ctx.Locale.Tr "admin.self_check.database_fix_mysql"}}</div> | ||
| {{else if .DatabaseType.IsMSSQL}} | ||
| <div class="tw-p-2">{{ctx.Locale.Tr "admin.self_check.database_fix_mssql"}}</div> | ||
| {{end}} | ||
| {{if .DatabaseCheckCollationMismatch}} | ||
| <div class="ui red message">{{ctx.Locale.Tr "admin.self_check.database_collation_mismatch" .DatabaseCheckResult.ExpectedCollation}}</div> | ||
| {{end}} | ||
| {{if .DatabaseCheckCollationCaseInsensitive}} | ||
| <div class="ui warning message">{{ctx.Locale.Tr "admin.self_check.database_collation_case_insensitive" .DatabaseCheckResult.DatabaseCollation}}</div> | ||
| {{end}} | ||
| {{if .DatabaseCheckInconsistentCollationColumns}} | ||
| <div class="ui red message"> | ||
| {{ctx.Locale.Tr "admin.self_check.database_inconsistent_collation_columns" .DatabaseCheckResult.DatabaseCollation}} | ||
| <ul class="tw-w-full"> | ||
| {{range .DatabaseCheckInconsistentCollationColumns}} | ||
| <li>{{.}}</li> | ||
| {{end}} | ||
| </ul> | ||
| </div> | ||
| {{end}} | ||
| </div> | ||
| {{end}} | ||
|
|
||
| {{if and (not .DeprecatedWarnings) (not .DatabaseCheckHasProblems)}} | ||
| <div class="ui attached segment"> | ||
| {{ctx.Locale.Tr "admin.self_check.no_problem_found"}} | ||
| </div> | ||
| {{end}} | ||
| </div> | ||
|
|
||
| {{template "admin/layout_footer" .}} | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it's better if we notify the users explicitly what the section is: