Substitute variables in path names of template repos too #25294
Merged
Conversation
This file contains 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
GiteaBot
added
the
lgtm/need 2
pull-request-size
bot
added
the
size/M
kdumontnu
force-pushed
the
kd/subst-repo_template_path_var
branch
from
f906781 to
3cdaf8b
Compare
silverwind
reviewed
Jun 16, 2023
jtran
reviewed
Jun 16, 2023
delvh
changed the title
kdumontnu
force-pushed
the
kd/subst-repo_template_path_var
branch
from
86022f3 to
3b8fe94
Compare
silverwind
approved these changes
Jun 19, 2023
GiteaBot
added
lgtm/need 1
wxiaoguang
reviewed
Jun 20, 2023
wxiaoguang
reviewed
Jun 20, 2023
wxiaoguang
reviewed
Jun 20, 2023
| @@ -191,10 +195,24 @@ func generateRepoCommit(ctx context.Context, repo, templateRepo, generateRepo *r | |||
| } | |||
|
|
|||
| if err := os.WriteFile(path, | |||
| []byte(generateExpansion(string(content), templateRepo, generateRepo)), | |||
| []byte(generateExpansion(string(content), templateRepo, generateRepo, false)), | |||
There was a problem hiding this comment.
Why here use "false" for file naming escaping (actually sanitizing)?
It seems that the rule can be applied to all.
There was a problem hiding this comment.
The other case expansion is used is in files (eg. in README text). Is there a reason to sanitize in that case?
I planned to leave that unchanged from the current behavior
wxiaoguang
approved these changes
Jun 20, 2023
GiteaBot
removed
the
lgtm/need 1
GiteaBot
added
the
lgtm/done
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
Jun 21, 2023
* giteaofficial/main: Refactor path & config system (go-gitea#25330) Add actor and status dropdowns to run list (go-gitea#25118) Use the new download domain replace the old (go-gitea#25405) Avoid polluting config file when "save" (go-gitea#25395) Fix dropdown icon layout on diff page (go-gitea#25397) Support configuration variables on Gitea Actions (go-gitea#24724) Substitute variables in path names of template repos too (go-gitea#25294) Navbar styling rework (go-gitea#25343) Fix blank dir message when uploading files from web editor (go-gitea#25391) Add git-lfs support to devcontainer (go-gitea#25385) Use qwtel.sqlite-viewer instead of alexcvzz.vscode-sqlite (go-gitea#25386) Use Actions git context instead of dynamically created buildkit one (go-gitea#25381) rename tributeValues to mentionValues (go-gitea#25375) Fix LDAP sync when Username Attribute is empty (go-gitea#25278) Fetch all git data for embedding correct version in docker image (go-gitea#25361) Fix sidebar label dropdown divider (go-gitea#25359) Fix issue filters on mobile view (go-gitea#25368) Refactor: TotalTimest return seconds (go-gitea#25370)
KN4CK3R
reviewed
Jun 21, 2023
jolheiser
added a commit
that referenced
this pull request
Jun 21, 2023
/cc @KN4CK3R #25294 (comment) I also searched the codebase and found a few more. --------- Signed-off-by: jolheiser <john.olheiser@gmail.com>
silverwind
added a commit
to silverwind/gitea
that referenced
this pull request
Jun 21, 2023
* origin/main: (47 commits) Move some regexp out of functions (go-gitea#25430) Show outdated comments in files changed tab (go-gitea#24936) Remove "CHARSET" config option for MySQL, always use "utf8mb4" (go-gitea#25413) Fine tune project board label colors and modal content background (go-gitea#25419) Fix missing commit message body when the message has leading newlines (go-gitea#25418) add python/poetry to devcontainer (go-gitea#25407) Refactor path & config system (go-gitea#25330) Add actor and status dropdowns to run list (go-gitea#25118) Use the new download domain replace the old (go-gitea#25405) Avoid polluting config file when "save" (go-gitea#25395) Fix dropdown icon layout on diff page (go-gitea#25397) Support configuration variables on Gitea Actions (go-gitea#24724) Substitute variables in path names of template repos too (go-gitea#25294) Navbar styling rework (go-gitea#25343) Fix blank dir message when uploading files from web editor (go-gitea#25391) Add git-lfs support to devcontainer (go-gitea#25385) Use qwtel.sqlite-viewer instead of alexcvzz.vscode-sqlite (go-gitea#25386) Use Actions git context instead of dynamically created buildkit one (go-gitea#25381) rename tributeValues to mentionValues (go-gitea#25375) Fix LDAP sync when Username Attribute is empty (go-gitea#25278) ...
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Summary
Extend the template variable substitution to replace file paths. This can be helpful for setting up log files & directories that should match the repository name.
PR Changes
escapingsanitization for cross-platform support and to prevent directory traversal (thanks @silverwind for the reference)I had to fix the existing repo template integration test and extend it to add a check for variable substitutions.
Example:
