Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid importing modules/web/middleware in modules/session #30584

Merged
merged 3 commits into from
Apr 19, 2024
Merged

Avoid importing modules/web/middleware in modules/session #30584

merged 3 commits into from
Apr 19, 2024

Conversation

wolfogre
Copy link
Member

@wolfogre wolfogre commented Apr 19, 2024

Related to #30375.

It doesn't make sense to import modules/web/middleware and modules/setting in modules/web/session since the last one is more low-level.

And it looks like a workaround to call DeleteLegacySiteCookie in RegenerateSession, so maybe we could reverse the importing by registering hook functions.

@wolfogre wolfogre added type/enhancement An improvement of existing functionality backport/v1.21 This PR should be backported to Gitea 1.21 backport/v1.22 This PR should be backported to Gitea 1.22 labels Apr 19, 2024
@wolfogre wolfogre added this to the 1.23.0 milestone Apr 19, 2024
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 19, 2024
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Apr 19, 2024
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label Apr 19, 2024
@wolfogre
Copy link
Member Author

Although it's not a bugfix, I still hope to backport it to follow #30375.

@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Apr 19, 2024
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Apr 19, 2024
@wolfogre wolfogre added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 19, 2024
@wolfogre wolfogre enabled auto-merge (squash) April 19, 2024 03:39
@wolfogre wolfogre merged commit 61457cd into go-gitea:main Apr 19, 2024
26 checks passed
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Apr 19, 2024
…ea#30584)

Related to go-gitea#30375.

It doesn't make sense to import `modules/web/middleware` and
`modules/setting` in `modules/web/session` since the last one is more
low-level.

And it looks like a workaround to call `DeleteLegacySiteCookie` in
`RegenerateSession`, so maybe we could reverse the importing by
registering hook functions.
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Apr 19, 2024
…ea#30584)

Related to go-gitea#30375.

It doesn't make sense to import `modules/web/middleware` and
`modules/setting` in `modules/web/session` since the last one is more
low-level.

And it looks like a workaround to call `DeleteLegacySiteCookie` in
`RegenerateSession`, so maybe we could reverse the importing by
registering hook functions.
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 19, 2024
@wolfogre wolfogre added the skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. label Apr 19, 2024
silverwind pushed a commit that referenced this pull request Apr 19, 2024
#30588)

Backport #30584 by @wolfogre

Related to #30375.

It doesn't make sense to import `modules/web/middleware` and
`modules/setting` in `modules/web/session` since the last one is more
low-level.

And it looks like a workaround to call `DeleteLegacySiteCookie` in
`RegenerateSession`, so maybe we could reverse the importing by
registering hook functions.

Co-authored-by: Jason Song <i@wolfogre.com>
silverwind pushed a commit that referenced this pull request Apr 19, 2024
#30589)

Backport #30584 by @wolfogre

Related to #30375.

It doesn't make sense to import `modules/web/middleware` and
`modules/setting` in `modules/web/session` since the last one is more
low-level.

And it looks like a workaround to call `DeleteLegacySiteCookie` in
`RegenerateSession`, so maybe we could reverse the importing by
registering hook functions.

Co-authored-by: Jason Song <i@wolfogre.com>
zjjhot added a commit to zjjhot/gitea that referenced this pull request Apr 19, 2024
* giteaofficial/main:
  Fix project description rendering for org (go-gitea#30587)
  Fix changelog (main) (go-gitea#30582)
  Avoid importing `modules/web/middleware` in `modules/session` (go-gitea#30584)
  Enable npm cache on `setup-node` action (go-gitea#30577)
@wxiaoguang wxiaoguang modified the milestones: 1.23.0, 1.22.0 Apr 27, 2024
@yardenshoham yardenshoham added the backport/done All backports for this PR have been created label May 3, 2024
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jul 18, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport/done All backports for this PR have been created backport/v1.21 This PR should be backported to Gitea 1.21 backport/v1.22 This PR should be backported to Gitea 1.22 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/go Pull requests that update Go code size/S Denotes a PR that changes 10-29 lines, ignoring generated files. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. type/enhancement An improvement of existing functionality
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants