diff options
author | QuaSoft <info@quasoft.net> | 2019-11-23 01:33:31 +0200 |
---|---|---|
committer | Lauris BH <lauris@nix.lv> | 2019-11-23 01:33:31 +0200 |
commit | 7b4d2f7a2aa3af093571628f979bdc939f10890c (patch) | |
tree | f9abd74c01d006892f5474557cb545e4f60dfe71 /templates | |
parent | eb1b225d9a920e68ce415b9732b4ec1d9527a2a2 (diff) | |
download | gitea-7b4d2f7a2aa3af093571628f979bdc939f10890c.tar.gz gitea-7b4d2f7a2aa3af093571628f979bdc939f10890c.zip |
Add single sign-on support via SSPI on Windows (#8463)
* Add single sign-on support via SSPI on Windows
* Ensure plugins implement interface
* Ensure plugins implement interface
* Move functions used only by the SSPI auth method to sspi_windows.go
* Field SSPISeparatorReplacement of AuthenticationForm should not be required via binding, as binding will insist the field is non-empty even if another login type is selected
* Fix breaking of oauth authentication on download links. Do not create new session with SSPI authentication on download links.
* Update documentation for the new 'SPNEGO with SSPI' login source
* Mention in documentation that ROOT_URL should contain the FQDN of the server
* Make sure that Contexter is not checking for active login sources when the ORM engine is not initialized (eg. when installing)
* Always initialize and free SSO methods, even if they are not enabled, as a method can be activated while the app is running (from Authentication sources)
* Add option in SSPIConfig for removing of domains from logon names
* Update helper text for StripDomainNames option
* Make sure handleSignIn() is called after a new user object is created by SSPI auth method
* Remove default value from text of form field helper
Co-Authored-By: Lauris BH <lauris@nix.lv>
* Remove default value from text of form field helper
Co-Authored-By: Lauris BH <lauris@nix.lv>
* Remove default value from text of form field helper
Co-Authored-By: Lauris BH <lauris@nix.lv>
* Only make a query to the DB to check if SSPI is enabled on handlers that need that information for templates
* Remove code duplication
* Log errors in ActiveLoginSources
Co-Authored-By: Lauris BH <lauris@nix.lv>
* Revert suffix of randomly generated E-mails for Reverse proxy authentication
Co-Authored-By: Lauris BH <lauris@nix.lv>
* Revert unneeded white-space change in template
Co-Authored-By: Lauris BH <lauris@nix.lv>
* Add copyright comments at the top of new files
* Use loopback name for randomly generated emails
* Add locale tag for the SSPISeparatorReplacement field with proper casing
* Revert casing of SSPISeparatorReplacement field in locale file, moving it up, next to other form fields
* Update docs/content/doc/features/authentication.en-us.md
Co-Authored-By: guillep2k <18600385+guillep2k@users.noreply.github.com>
* Remove Priority() method and define the order in which SSO auth methods should be executed in one place
* Log authenticated username only if it's not empty
* Rephrase helper text for automatic creation of users
* Return error if more than one active SSPI auth source is found
* Change newUser() function to return error, letting caller log/handle the error
* Move isPublicResource, isPublicPage and handleSignIn functions outside SSPI auth method to allow other SSO methods to reuse them if needed
* Refactor initialization of the list containing SSO auth methods
* Validate SSPI settings on POST
* Change SSPI to only perform authentication on its own login page, API paths and download links. Leave Toggle middleware to redirect non authenticated users to login page
* Make 'Default language' in SSPI config empty, unless changed by admin
* Show error if admin tries to add a second authentication source of type SSPI
* Simplify declaration of global variable
* Rebuild gitgraph.js on Linux
* Make sure config values containing only whitespace are not accepted
Diffstat (limited to 'templates')
-rw-r--r-- | templates/admin/auth/edit.tmpl | 46 | ||||
-rw-r--r-- | templates/admin/auth/new.tmpl | 3 | ||||
-rw-r--r-- | templates/admin/auth/source/sspi.tmpl | 43 | ||||
-rw-r--r-- | templates/user/auth/signin_navbar.tmpl | 10 |
4 files changed, 101 insertions, 1 deletions
diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl index 6a176a43a8..d1a614b1f0 100644 --- a/templates/admin/auth/edit.tmpl +++ b/templates/admin/auth/edit.tmpl @@ -213,6 +213,52 @@ {{end}}{{end}} {{end}} + <!-- SSPI --> + {{if .Source.IsSSPI}} + {{ $cfg:=.Source.SSPI }} + <div class="field"> + <div class="ui checkbox"> + <label for="sspi_auto_create_users"><strong>{{.i18n.Tr "admin.auths.sspi_auto_create_users"}}</strong></label> + <input id="sspi_auto_create_users" name="sspi_auto_create_users" class="sspi-auto-create-users" type="checkbox" {{if $cfg.AutoCreateUsers}}checked{{end}}> + <p class="help">{{.i18n.Tr "admin.auths.sspi_auto_create_users_helper"}}</p> + </div> + </div> + <div class="field"> + <div class="ui checkbox"> + <label for="sspi_auto_activate_users"><strong>{{.i18n.Tr "admin.auths.sspi_auto_activate_users"}}</strong></label> + <input id="sspi_auto_activate_users" name="sspi_auto_activate_users" class="sspi-auto-activate-users" type="checkbox" {{if $cfg.AutoActivateUsers}}checked{{end}}> + <p class="help">{{.i18n.Tr "admin.auths.sspi_auto_activate_users_helper"}}</p> + </div> + </div> + <div class="field"> + <div class="ui checkbox"> + <label for="sspi_strip_domain_names"><strong>{{.i18n.Tr "admin.auths.sspi_strip_domain_names"}}</strong></label> + <input id="sspi_strip_domain_names" name="sspi_strip_domain_names" class="sspi-strip-domain-names" type="checkbox" {{if $cfg.StripDomainNames}}checked{{end}}> + <p class="help">{{.i18n.Tr "admin.auths.sspi_strip_domain_names_helper"}}</p> + </div> + </div> + <div class="required field"> + <label for="sspi_separator_replacement">{{.i18n.Tr "admin.auths.sspi_separator_replacement"}}</label> + <input id="sspi_separator_replacement" name="sspi_separator_replacement" value="{{$cfg.SeparatorReplacement}}" required> + <p class="help">{{.i18n.Tr "admin.auths.sspi_separator_replacement_helper"}}</p> + </div> + <div class="field"> + <label for="sspi_default_language">{{.i18n.Tr "admin.auths.sspi_default_language"}}</label> + <div class="ui language selection dropdown" id="sspi_default_language"> + <input name="sspi_default_language" type="hidden" value="{{$cfg.DefaultLanguage}}"> + <i class="dropdown icon"></i> + <div class="text">{{range .AllLangs}}{{if eq $cfg.DefaultLanguage .Lang}}{{.Name}}{{end}}{{end}}</div> + <div class="menu"> + <div class="item{{if not $.SSPIDefaultLanguage}} active selected{{end}}" data-value="">-</div> + {{range .AllLangs}} + <div class="item{{if eq $cfg.DefaultLanguage .Lang}} active selected{{end}}" data-value="{{.Lang}}">{{.Name}}</div> + {{end}} + </div> + </div> + <p class="help">{{.i18n.Tr "admin.auths.sspi_default_language_helper"}}</p> + </div> + {{end}} + <div class="inline field {{if not .Source.IsSMTP}}hide{{end}}"> <div class="ui checkbox"> <label><strong>{{.i18n.Tr "admin.auths.enable_tls"}}</strong></label> diff --git a/templates/admin/auth/new.tmpl b/templates/admin/auth/new.tmpl index e759ec0ba4..f2fc26cdc8 100644 --- a/templates/admin/auth/new.tmpl +++ b/templates/admin/auth/new.tmpl @@ -43,6 +43,9 @@ <!-- OAuth2 --> {{ template "admin/auth/source/oauth" . }} + <!-- SSPI --> + {{ template "admin/auth/source/sspi" . }} + <div class="ldap field"> <div class="ui checkbox"> <label><strong>{{.i18n.Tr "admin.auths.attributes_in_bind"}}</strong></label> diff --git a/templates/admin/auth/source/sspi.tmpl b/templates/admin/auth/source/sspi.tmpl new file mode 100644 index 0000000000..50f9f99a8d --- /dev/null +++ b/templates/admin/auth/source/sspi.tmpl @@ -0,0 +1,43 @@ +<div class="sspi field {{if not (eq .type 7)}}hide{{end}}"> + <div class="field"> + <div class="ui checkbox"> + <label for="sspi_auto_create_users"><strong>{{.i18n.Tr "admin.auths.sspi_auto_create_users"}}</strong></label> + <input id="sspi_auto_create_users" name="sspi_auto_create_users" class="sspi-auto-create-users" type="checkbox" {{if .SSPIAutoCreateUsers}}checked{{end}}> + <p class="help">{{.i18n.Tr "admin.auths.sspi_auto_create_users_helper"}}</p> + </div> + </div> + <div class="field"> + <div class="ui checkbox"> + <label for="sspi_auto_activate_users"><strong>{{.i18n.Tr "admin.auths.sspi_auto_activate_users"}}</strong></label> + <input id="sspi_auto_activate_users" name="sspi_auto_activate_users" class="sspi-auto-activate-users" type="checkbox" {{if .SSPIAutoActivateUsers}}checked{{end}}> + <p class="help">{{.i18n.Tr "admin.auths.sspi_auto_activate_users_helper"}}</p> + </div> + </div> + <div class="field"> + <div class="ui checkbox"> + <label for="sspi_strip_domain_names"><strong>{{.i18n.Tr "admin.auths.sspi_strip_domain_names"}}</strong></label> + <input id="sspi_strip_domain_names" name="sspi_strip_domain_names" class="sspi-strip-domain-names" type="checkbox" {{if .SSPIStripDomainNames}}checked{{end}}> + <p class="help">{{.i18n.Tr "admin.auths.sspi_strip_domain_names_helper"}}</p> + </div> + </div> + <div class="required field"> + <label for="sspi_separator_replacement">{{.i18n.Tr "admin.auths.sspi_separator_replacement"}}</label> + <input id="sspi_separator_replacement" name="sspi_separator_replacement" value="{{.SSPISeparatorReplacement}}"> + <p class="help">{{.i18n.Tr "admin.auths.sspi_separator_replacement_helper"}}</p> + </div> + <div class="field"> + <label for="sspi_default_language">{{.i18n.Tr "admin.auths.sspi_default_language"}}</label> + <div class="ui language selection dropdown" id="sspi_default_language"> + <input name="sspi_default_language" type="hidden" value="{{.SSPIDefaultLanguage}}"> + <i class="dropdown icon"></i> + <div class="text">{{range .AllLangs}}{{if eq $.SSPIDefaultLanguage .Lang}}{{.Name}}{{end}}{{end}}</div> + <div class="menu"> + <div class="item{{if not $.SSPIDefaultLanguage}} active selected{{end}}" data-value="">-</div> + {{range .AllLangs}} + <div class="item{{if eq $.SSPIDefaultLanguage .Lang}} active selected{{end}}" data-value="{{.Lang}}">{{.Name}}</div> + {{end}} + </div> + </div> + <p class="help">{{.i18n.Tr "admin.auths.sspi_default_language_helper"}}</p> + </div> +</div> diff --git a/templates/user/auth/signin_navbar.tmpl b/templates/user/auth/signin_navbar.tmpl index 345e221296..428a3d843a 100644 --- a/templates/user/auth/signin_navbar.tmpl +++ b/templates/user/auth/signin_navbar.tmpl @@ -1,11 +1,19 @@ -{{if .EnableOpenIDSignIn}} +{{if or .EnableOpenIDSignIn .EnableSSPI}} <div class="ui secondary pointing tabular top attached borderless menu new-menu navbar"> <a class="{{if .PageIsLogin}}active{{end}} item" rel="nofollow" href="{{AppSubUrl}}/user/login"> {{.i18n.Tr "auth.login_userpass"}} </a> + {{if .EnableOpenIDSignIn}} <a class="{{if .PageIsLoginOpenID}}active{{end}} item" rel="nofollow" href="{{AppSubUrl}}/user/login/openid"> <i class="fa fa-openid"></i> OpenID </a> + {{end}} + {{if .EnableSSPI}} + <a class="item" rel="nofollow" href="{{AppSubUrl}}/user/login?auth_with_sspi=1"> + <i class="fa fa-windows"></i> + SSPI + </a> + {{end}} </div> {{end}} |