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

Fix the secret regexp pattern on web page #26910

Merged
merged 3 commits into from Sep 5, 2023

Conversation

lng2020
Copy link
Member

@lng2020 lng2020 commented Sep 5, 2023

Before
ksnip_20230905-122214
After
ksnip_20230905-130714
However, the error is caused by the web page not handling the post form failure, which is 400 bad requests in this case. But I'm not sure where to add the error handle. Any advice is appreciated.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Sep 5, 2023
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Sep 5, 2023
@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 Sep 5, 2023
@silverwind
Copy link
Member

Should we add a config option for this pattern? I think it is used in many places in the backend as well so one shared definition will help for these patterns to no longer go out of sync. The regexp must be compatible with both the JS and Golang flavor, but that's easily verified on https://regex101.com/.

@lunny lunny added the topic/ui Change the appearance of the Gitea UI label Sep 5, 2023
@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 Sep 5, 2023
@delvh delvh added type/bug backport/v1.20 This PR should be backported to Gitea 1.20 labels Sep 5, 2023
@techknowlogick techknowlogick enabled auto-merge (squash) September 5, 2023 19:42
@techknowlogick techknowlogick added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Sep 5, 2023
@techknowlogick techknowlogick merged commit 01e71e2 into go-gitea:main Sep 5, 2023
24 checks passed
@GiteaBot GiteaBot added this to the 1.22.0 milestone Sep 5, 2023
@GiteaBot
Copy link
Contributor

GiteaBot commented Sep 5, 2023

I was unable to create a backport for 1.20. @lng2020, please send one manually. 🍵

go run ./contrib/backport 26910
...  // fix git conflicts if any
go run ./contrib/backport --continue

@GiteaBot GiteaBot added backport/manual No power to the bots! Create your backport yourself! and removed reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels Sep 5, 2023
zjjhot added a commit to zjjhot/gitea that referenced this pull request Sep 6, 2023
* giteaofficial/main:
  Add missing translation (go-gitea#26926)
  Vendor `jquery.are-you-sure` with strict mode fixes (go-gitea#26901)
  Fix the secret regexp pattern on web page (go-gitea#26910)
  Add @chenrui333 as maintainer (go-gitea#26917)
  Move notification interface to services layer (go-gitea#26915)
  fetch emails of currently displayed user on admin page (go-gitea#26918)
  Improve LDAP group config documentation, fixes go-gitea#21159 (go-gitea#21227)
  update footer link to new landing page (go-gitea#26916)
  Remove `Named` interface (go-gitea#26913)
  Refactor secrets modification logic (go-gitea#26873)
  Add missing `reqToken()` to notifications endpoints (go-gitea#26914)
  feat(API): add routes and functions for managing user's secrets (go-gitea#26909)
  Move feed notification service layer (go-gitea#26908)
  Extract common code to new template (go-gitea#26903)
  Move ui notification to service layer (go-gitea#26907)
  Remove duplicated notify mail configuration on tests (go-gitea#26912)
  Move indexer notification to service layer (go-gitea#26906)

# Conflicts:
#	templates/base/footer_content.tmpl
@techknowlogick techknowlogick modified the milestones: 1.22.0, 1.21.0 Sep 6, 2023
@lng2020
Copy link
Member Author

lng2020 commented Sep 7, 2023

The code doesn't exist in v1.20, so we don't need a backport

@silverwind silverwind removed backport/manual No power to the bots! Create your backport yourself! backport/v1.20 This PR should be backported to Gitea 1.20 labels Sep 7, 2023
@lng2020 lng2020 deleted the fix/sercet-regexr-pattern branch September 13, 2023 12:34
lunny pushed a commit that referenced this pull request Sep 21, 2023
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Sep 21, 2023
silverwind pushed a commit that referenced this pull request Sep 21, 2023
Backport #27161 by @lng2020

same as (#26910)

Co-authored-by: Nanguan Lin <70063547+lng2020@users.noreply.github.com>
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Dec 4, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. topic/ui Change the appearance of the Gitea UI type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants