diff --git a/ABOUT-FORK.md b/ABOUT-FORK.md new file mode 100644 index 0000000000..d4c2af2063 --- /dev/null +++ b/ABOUT-FORK.md @@ -0,0 +1,25 @@ +## FORK + +This is a fork of Forgejo. + +This fork doesn't add any specialized features. It adds things that should be in Forgejo, but aren't. + +This fork is based on a release. There's no master branch. Patches of this fork do not follow releases; because of scope, they're released immediately. + +This fork is a drop-in replacement. You can switch back and forth, as there are no breaking changes. + +### Features + +- Privacy Policy support + - Consent checkbox + - Footer link + - Configured with `service.PRIVACY_POLICY_URL` +- Captcha tweaks + - Shorter: 4-5 instead of 6 digits + - Bigger + - Fixed colors on dark theme +- Aesthetics + +### Builds + +Docker builds [are available here](https://hub.docker.com/r/minecon724/forgejo724) for amd64 and arm64. diff --git a/README.md b/README.md index 0c4becacc4..3ba47dcce6 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,9 @@ +## FORK + +This is a fork of Forgejo. [Read more here.](ABOUT-FORK.md) + + +

Welcome to Forgejo

diff --git a/modules/setting/service.go b/modules/setting/service.go index 74ed5cd3c9..f69041b3dc 100644 --- a/modules/setting/service.go +++ b/modules/setting/service.go @@ -85,6 +85,7 @@ var Service = struct { DefaultOrgMemberVisible bool UserDeleteWithCommentsMaxTime time.Duration ValidSiteURLSchemes []string + PrivacyPolicyURL string // OpenID settings EnableOpenIDSignIn bool @@ -263,6 +264,8 @@ func loadServiceFrom(rootCfg ConfigProvider) { } Service.ValidSiteURLSchemes = schemes + Service.PrivacyPolicyURL = sec.Key("PRIVACY_POLICY_URL").MustString("") + mustMapSetting(rootCfg, "service.explore", &Service.Explore) loadOpenIDSetting(rootCfg) diff --git a/modules/web/middleware/data.go b/modules/web/middleware/data.go index 08d83f94be..d33cf966c4 100644 --- a/modules/web/middleware/data.go +++ b/modules/web/middleware/data.go @@ -58,6 +58,7 @@ func CommonTemplateContextData() ContextData { "EnableOpenIDSignIn": setting.Service.EnableOpenIDSignIn, "PageStartTime": time.Now(), - "RunModeIsProd": setting.IsProd, + "RunModeIsProd": setting.IsProd, + "PrivacyPolicyURL": setting.Service.PrivacyPolicyURL, } } diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 53a47f0c17..876ff9edba 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -28,6 +28,7 @@ licenses = Licenses return_to_forgejo = Return to Forgejo toggle_menu = Toggle menu more_items = More items +privacy_policy = Privacy Policy username = Username email = Email address @@ -38,6 +39,7 @@ captcha = CAPTCHA twofa = Two-factor authentication twofa_scratch = Two-factor scratch code passcode = Passcode +consent_agree = I agree to the Privacy Policy webauthn_insert_key = Insert your security key webauthn_sign_in = Press the button on your security key. If your security key has no button, re-insert it. @@ -485,6 +487,7 @@ password_pwned_err = Could not complete request to HaveIBeenPwned last_admin = You cannot remove the last admin. There must be at least one admin. back_to_sign_in = Back to Sign in sign_in_openid = Proceed with OpenID +must_consent = Agreement to our Privacy Policy is required to register. [mail] view_it_on = View it on %s diff --git a/routers/web/auth/auth.go b/routers/web/auth/auth.go index ccab47a9a2..ef61c756e2 100644 --- a/routers/web/auth/auth.go +++ b/routers/web/auth/auth.go @@ -479,6 +479,12 @@ func SignUpPost(ctx *context.Context) { ctx.RenderWithErr(password.BuildComplexityError(ctx.Locale), tplSignUp, &form) return } + + if !form.Consent { + ctx.RenderWithErr(ctx.Tr("auth.must_consent"), tplSignUp, &form) + return + } // consent is required before sending password anywhere + if err := password.IsPwned(ctx, form.Password); err != nil { errMsg := ctx.Tr("auth.password_pwned", "https://haveibeenpwned.com/Passwords") if password.IsErrIsPwnedRequest(err) { diff --git a/services/context/captcha.go b/services/context/captcha.go index da837acb00..58c9205d54 100644 --- a/services/context/captcha.go +++ b/services/context/captcha.go @@ -5,6 +5,7 @@ package context import ( "fmt" + "math/rand" "sync" "code.gitea.io/gitea/modules/base" @@ -55,7 +56,9 @@ func GetImageCaptcha() string { imageCaptchaOnce.Do(func() { captcha.SetCustomStore(&imageCaptchaStore{c: cache.GetCache()}) }) - return captcha.New() + + length := 4 + rand.Intn(2) // 4 or 5 chars + return captcha.NewLen(length) } // SetCaptchaData sets common captcha data diff --git a/services/forms/user_form.go b/services/forms/user_form.go index 3ba8724c92..c24fa0186e 100644 --- a/services/forms/user_form.go +++ b/services/forms/user_form.go @@ -96,6 +96,7 @@ type RegisterForm struct { Email string `binding:"Required;MaxSize(254)"` Password string `binding:"MaxSize(255)"` Retype string + Consent bool } // Validate validates the fields diff --git a/templates/base/footer_content.tmpl b/templates/base/footer_content.tmpl index 133ebac33a..4a1f26fd08 100644 --- a/templates/base/footer_content.tmpl +++ b/templates/base/footer_content.tmpl @@ -4,11 +4,10 @@ {{ctx.Locale.Tr "powered_by" "Forgejo"}} {{end}} {{if (or .ShowFooterVersion .PageIsAdmin)}} - {{ctx.Locale.Tr "version"}}: {{if .IsAdmin}} - {{AppVer}} + v{{AppVer}} {{else}} - {{AppVerNoMetadata}} + v{{AppVerNoMetadata}} {{end}} {{end}} {{if and .TemplateLoadTimes ShowFooterTemplateLoadTime}} @@ -26,7 +25,7 @@
{{ctx.Locale.Tr "licenses"}} - {{if .EnableSwagger}}API{{end}} + {{if .PrivacyPolicyURL}}{{ctx.Locale.Tr "privacy_policy"}}{{end}} {{template "custom/extra_links_footer" .}} diff --git a/templates/user/auth/signup_inner.tmpl b/templates/user/auth/signup_inner.tmpl index 6c5ac6731f..f26dd0e4bf 100644 --- a/templates/user/auth/signup_inner.tmpl +++ b/templates/user/auth/signup_inner.tmpl @@ -37,6 +37,17 @@ {{template "user/auth/captcha" .}} + {{ if (.PrivacyPolicyURL) }} +
+
+ + +
+
+ {{ else }} + + {{ end }} +