Disabling application elements fixed

Gitea does not remove all elements (UI, cron tasks) of some
disabled features which makes UI unnecessarily complicated.

This mod removes these unnecessary elements from UI/cron:

* token edition in user settings is not available
  when ENABLE_SWAGGER=false,

* application tab is not available in user settings
  if swagger and oauth2 are both disabled,

* SSH keys editor is not displayed if SSH is disabled
  and tab name changed to more general "Keys",

* resync_all_sshkeys cron task is disabled if SSH
  is disabled,

* deploy keys tab is not displayed if SSH is disabled,

* git hook access option hidden in user settings when
  git hooks are disabled,

* git hook sync cron task removed when git hooks
  are disabled.

Author-Change-Id: IB#1105071

Author: pboguslawski

modules/cron/tasks_extended.go

@@ -111,8 +111,12 @@ func initExtendedTasks() {
 	registerDeleteInactiveUsers()
 	registerDeleteRepositoryArchives()
 	registerGarbageCollectRepositories()
-	registerRewriteAllPublicKeys()
-	registerRepositoryUpdateHook()
+	if !setting.SSH.Disabled {
+		registerRewriteAllPublicKeys()
+	}
+	if !setting.DisableGitHooks {
+		registerRepositoryUpdateHook()
+	}
 	registerReinitMissingRepositories()
 	registerDeleteMissingRepositories()
 	registerRemoveRandomAvatars()

modules/templates/helper.go

@@ -228,6 +228,15 @@ func NewFuncMap() []template.FuncMap {
 		"DisableImportLocal": func() bool {
 			return !setting.ImportLocalPaths
 		},
+		"DisableSSH": func() bool {
+			return setting.SSH.Disabled
+		},
+		"DisableSwagger": func() bool {
+			return !setting.API.EnableSwagger
+		},
+		"DisableOAuth2": func() bool {
+			return !setting.OAuth2.Enable
+		},
 		"TrN": TrN,
 		"Dict": func(values ...interface{}) (map[string]interface{}, error) {
 			if len(values)%2 != 0 {

options/locale/locale_bg-BG.ini

@@ -358,7 +358,6 @@ account=Профил
 password=Парола
 security=Сигурност
 avatar=Аватар
-ssh_gpg_keys=SSH / GPG ключове
 social=Социални профили
 applications=Приложения
 orgs=Управление на организации

options/locale/locale_cs-CZ.ini

@@ -410,7 +410,6 @@ account=Účet
 password=Heslo
 security=Zabezpečení
 avatar=Avatar
-ssh_gpg_keys=SSH / GPG klíče
 social=Účty sociálních sítí
 applications=Aplikace
 orgs=Spravovat organizace

options/locale/locale_de-DE.ini

@@ -412,7 +412,6 @@ account=Account
 password=Passwort
 security=Sicherheit
 avatar=Profilbild
-ssh_gpg_keys=SSH- / GPG-Schlüssel
 social=Soziale Konten
 applications=Anwendungen
 orgs=Organisationen verwalten

options/locale/locale_en-US.ini

@@ -417,7 +417,7 @@ account = Account
 password = Password
 security = Security
 avatar = Avatar
-ssh_gpg_keys = SSH / GPG Keys
+keys = Keys
 social = Social Accounts
 applications = Applications
 orgs = Manage Organizations

options/locale/locale_es-ES.ini

@@ -412,7 +412,6 @@ account=Cuenta
 password=Contraseña
 security=Seguridad
 avatar=Avatar
-ssh_gpg_keys=SSH / claves GPG
 social=Redes Sociales
 applications=Aplicaciones
 orgs=Administrar organizaciones

options/locale/locale_fa-IR.ini

@@ -407,7 +407,6 @@ account=حساب کاربری
 password=گذرواژه
 security=امنیت
 avatar=آواتار
-ssh_gpg_keys=کلید‌های SSH / GPG
 social=حساب های اجتماعی
 applications=برنامه‌ها
 orgs=مدیریت سازمان‌ها

options/locale/locale_fi-FI.ini

@@ -348,7 +348,6 @@ account=Tili
 password=Salasana
 security=Turvallisuus
 avatar=Profiilikuva
-ssh_gpg_keys=SSH / GPG-avaimet
 social=Sosiaaliset tilit
 applications=Sovellukset
 orgs=Hallitse organisaatioita

options/locale/locale_fr-FR.ini

@@ -394,7 +394,6 @@ account=Compte
 password=Mot de passe
 security=Sécurité
 avatar=Avatar
-ssh_gpg_keys=Clés SSH / GPG
 social=Réseaux Sociaux
 applications=Applications
 orgs=Gérer les organisations

options/locale/locale_hu-HU.ini

@@ -380,7 +380,6 @@ account=Fiók
 password=Jelszó
 security=Biztonság
 avatar=Profilkép
-ssh_gpg_keys=SSH / GPG kulcsok
 social=Közösségi fiókok
 applications=Alkalmazások
 orgs=Szervezetek kezelése

options/locale/locale_id-ID.ini

@@ -384,7 +384,6 @@ account=Akun
 password=Kata Sandi
 security=Keamanan
 avatar=Avatar
-ssh_gpg_keys=Kunci SSH / GPG
 social=Akun Sosial
 applications=Aplikasi
 orgs=Kelola organisasi

options/locale/locale_it-IT.ini

@@ -388,7 +388,6 @@ account=Account
 password=Password
 security=Sicurezza
 avatar=Avatar
-ssh_gpg_keys=Chiavi SSH / GPG
 social=Account Sociali
 applications=Applicazioni
 orgs=Gestisci le organizzazioni

options/locale/locale_ja-JP.ini

@@ -412,7 +412,6 @@ account=アカウント
 password=パスワード
 security=セキュリティ
 avatar=アバター
-ssh_gpg_keys=SSH / GPGキー
 social=ソーシャルアカウント
 applications=アプリケーション
 orgs=組織の管理

options/locale/locale_ko-KR.ini

@@ -365,7 +365,6 @@ account=계정
 password=비밀번호
 security=보안
 avatar=아바타
-ssh_gpg_keys=SSH / GPG 키
 social=소셜 계정
 applications=어플리케이션
 orgs=조직 관리

options/locale/locale_lv-LV.ini

@@ -412,7 +412,6 @@ account=Konts
 password=Parole
 security=Drošība
 avatar=Profila attēls
-ssh_gpg_keys=SSH / GPG atslēgas
 social=Sociālie konti
 applications=Lietotnes
 orgs=Pārvaldīt organizācijas

options/locale/locale_ml-IN.ini

@@ -356,7 +356,6 @@ account=അക്കൗണ്ട്
 password=രഹസ്യവാക്കു്
 security=സുരക്ഷ
 avatar=അവതാര്‍
-ssh_gpg_keys=SSH / GPG കീകള്‍
 social=സോഷ്യൽ അക്കൗണ്ടുകൾ
 applications=അപ്ലിക്കേഷനുകൾ
 orgs=സംഘടനകളെ നിയന്ത്രിക്കുക

options/locale/locale_nl-NL.ini

@@ -400,7 +400,6 @@ account=Account
 password=Wachtwoord
 security=Beveiliging
 avatar=Profielfoto
-ssh_gpg_keys=SSH / GPG sleutels
 social=Sociale netwerk-accounts
 applications=Applicaties
 orgs=Beheer organisaties

options/locale/locale_pl-PL.ini

@@ -407,7 +407,7 @@ account=Konto
 password=Hasło
 security=Bezpieczeństwo
 avatar=Awatar
-ssh_gpg_keys=Klucze SSH / GPG
+keys=Klucze
 social=Konta społecznościowe
 applications=Aplikacje
 orgs=Zarządzaj organizacjami

options/locale/locale_pt-BR.ini

@@ -396,7 +396,6 @@ account=Conta
 password=Senha
 security=Segurança
 avatar=Avatar
-ssh_gpg_keys=Chaves SSH / GPG
 social=Contas sociais
 applications=Aplicativos
 orgs=Gerenciar organizações

options/locale/locale_pt-PT.ini

@@ -412,7 +412,6 @@ account=Conta
 password=Senha
 security=Segurança
 avatar=Avatar
-ssh_gpg_keys=Chaves SSH / GPG
 social=Contas sociais
 applications=Aplicações
 orgs=Gerir organizações

options/locale/locale_ru-RU.ini

@@ -412,7 +412,6 @@ account=Аккаунт
 password=Пароль
 security=Безопасность
 avatar=Аватар
-ssh_gpg_keys=SSH / GPG ключи
 social=Учетные записи в соцсетях
 applications=Приложения
 orgs=Управление организациями

options/locale/locale_sv-SE.ini

@@ -391,7 +391,6 @@ account=Konto
 password=Lösenord
 security=Säkerhet
 avatar=Visningsbild
-ssh_gpg_keys=SSH / GPG-nycklar
 social=Sociala konton
 applications=Applikationer
 orgs=Hantera Organisationer

options/locale/locale_tr-TR.ini

@@ -416,7 +416,6 @@ account=Hesap
 password=Parola
 security=Güvenlik
 avatar=Avatar
-ssh_gpg_keys=SSH / GPG Anahtarları
 social=Sosyal Medya Hesapları
 applications=Uygulamalar
 orgs=Organizasyonları Yönet

options/locale/locale_uk-UA.ini

@@ -407,7 +407,6 @@ account=Обліковий запис
 password=Пароль
 security=Безпека
 avatar=Аватар
-ssh_gpg_keys=SSH / GPG ключі
 social=Соціальні облікові записи
 applications=Додатки
 orgs=Керування організаціями

options/locale/locale_zh-CN.ini

@@ -412,7 +412,6 @@ account=账号
 password=修改密码
 security=安全
 avatar=头像设置
-ssh_gpg_keys=SSH / GPG 密钥
 social=社交帐号绑定
 applications=应用
 orgs=管理组织

options/locale/locale_zh-HK.ini

@@ -167,7 +167,6 @@ form.name_reserved=這個使用者名稱已被系統保留，請改用其他名
 profile=個人訊息
 password=修改密碼
 avatar=頭像
-ssh_gpg_keys=SSH / GPG 金鑰
 social=社交帳號綁定
 delete=刪除帳戶
 twofa=兩步驟驗證

options/locale/locale_zh-TW.ini

@@ -405,7 +405,6 @@ account=帳戶
 password=修改密碼
 security=安全性
 avatar=大頭貼
-ssh_gpg_keys=SSH / GPG 金鑰
 social=社群帳戶
 applications=應用程式
 orgs=管理組織

routers/user/setting/applications.go

@@ -6,6 +6,8 @@
 package setting
 
 import (
+	"fmt"
+
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/auth"
 	"code.gitea.io/gitea/modules/base"
@@ -39,6 +41,11 @@ func ApplicationsPost(ctx *context.Context, form auth.NewAccessTokenForm) {
 		return
 	}
 
+	if !setting.API.EnableSwagger {
+		ctx.ServerError("AccessToken", fmt.Errorf("cannot modify access tokens; swagger disabled"))
+		return
+	}
+
 	t := &models.AccessToken{
 		UID:  ctx.User.ID,
 		Name: form.Name,
@@ -68,6 +75,11 @@ func ApplicationsPost(ctx *context.Context, form auth.NewAccessTokenForm) {
 
 // DeleteApplication response for delete user access token
 func DeleteApplication(ctx *context.Context) {
+	if !setting.API.EnableSwagger {
+		ctx.ServerError("DeleteAccessToken", fmt.Errorf("cannot delete access token; swagger disabled"))
+		return
+	}
+
 	if err := models.DeleteAccessTokenByID(ctx.QueryInt64("id"), ctx.User.ID); err != nil {
 		ctx.Flash.Error("DeleteAccessTokenByID: " + err.Error())
 	} else {
@@ -80,14 +92,17 @@ func DeleteApplication(ctx *context.Context) {
 }
 
 func loadApplicationsData(ctx *context.Context) {
-	tokens, err := models.ListAccessTokens(models.ListAccessTokensOptions{UserID: ctx.User.ID})
-	if err != nil {
-		ctx.ServerError("ListAccessTokens", err)
-		return
+	if setting.API.EnableSwagger {
+		tokens, err := models.ListAccessTokens(models.ListAccessTokensOptions{UserID: ctx.User.ID})
+		if err != nil {
+			ctx.ServerError("ListAccessTokens", err)
+			return
+		}
+		ctx.Data["Tokens"] = tokens
 	}
-	ctx.Data["Tokens"] = tokens
 	ctx.Data["EnableOAuth2"] = setting.OAuth2.Enable
 	if setting.OAuth2.Enable {
+		var err error
 		ctx.Data["Applications"], err = models.GetOAuth2ApplicationsByUserID(ctx.User.ID)
 		if err != nil {
 			ctx.ServerError("GetOAuth2ApplicationsByUserID", err)

templates/admin/dashboard.tmpl

@@ -35,15 +35,19 @@
 							<td>{{.i18n.Tr "admin.dashboard.git_gc_repos"}}</td>
 							<td><button type="submit" class="ui green button" name="op" value="git_gc_repos">{{svg "octicon-play"}} {{.i18n.Tr "admin.dashboard.operation_run"}}</button></td>
 						</tr>
+						{{if not DisableSSH}}
 						<tr>
 							<td>{{.i18n.Tr "admin.dashboard.resync_all_sshkeys"}}<br/>
 							{{.i18n.Tr "admin.dashboard.resync_all_sshkeys.desc"}}</td>
 							<td><button type="submit" class="ui green button" name="op" value="resync_all_sshkeys">{{svg "octicon-play"}} {{.i18n.Tr "admin.dashboard.operation_run"}}</button></td>
 						</tr>
+						{{end}}
+						{{if not DisableGitHooks}}
 						<tr>
 							<td>{{.i18n.Tr "admin.dashboard.resync_all_hooks"}}</td>
 							<td><button type="submit" class="ui green button" name="op" value="resync_all_hooks">{{svg "octicon-play"}} {{.i18n.Tr "admin.dashboard.operation_run"}}</button></td>
 						</tr>
+						{{end}}
 						<tr>
 							<td>{{.i18n.Tr "admin.dashboard.reinit_missing_repos"}}</td>
 							<td><button type="submit" class="ui green button" name="op" value="reinit_missing_repos">{{svg "octicon-play"}} {{.i18n.Tr "admin.dashboard.operation_run"}}</button></td>

templates/admin/user/edit.tmpl

@@ -89,7 +89,7 @@
 						<input name="restricted" type="checkbox" {{if .User.IsRestricted}}checked{{end}}>
 					</div>
 				</div>
-				<div class="inline field">
+				<div class="inline field"{{if DisableGitHooks}} hidden{{end}}>
 					<div class="ui checkbox" data-tooltip="{{.i18n.Tr "admin.users.allow_git_hook_tooltip"}}">
 						<label><strong>{{.i18n.Tr "admin.users.allow_git_hook"}}</strong></label>
 						<input name="allow_git_hook" type="checkbox" {{if .User.CanEditGitHook}}checked{{end}} {{if DisableGitHooks}}disabled{{end}}>

templates/repo/settings/deploy_keys.tmpl

@@ -7,11 +7,7 @@
 		<h4 class="ui top attached header">
 			{{.i18n.Tr "repo.settings.deploy_keys"}}
 			<div class="ui right">
-			{{if not .DisableSSH}}
 				<div class="ui blue tiny show-panel button" data-panel="#add-deploy-key-panel">{{.i18n.Tr "repo.settings.add_deploy_key"}}</div>
-			{{else}}
-				<div class="ui blue tiny button disabled">{{.i18n.Tr "settings.ssh_disabled"}}</div>
-			{{end}}
 			</div>
 		</h4>
 		<div class="ui attached segment">

templates/repo/settings/nav.tmpl

@@ -9,7 +9,9 @@
 			{{if or .SignedUser.AllowGitHook .SignedUser.IsAdmin}}
 				<li {{if .PageIsSettingsGitHooks}}class="current"{{end}}><a href="{{.RepoLink}}/settings/hooks/git">{{.i18n.Tr "repo.settings.githooks"}}</a></li>
 			{{end}}
+			{{if not DisableSSH}}
 			<li {{if .PageIsSettingsKeys}}class="current"{{end}}><a href="{{.RepoLink}}/settings/keys">{{.i18n.Tr "repo.settings.deploy_keys"}}</a></li>
+			{{end}}
 		</ul>
 	</div>
 </div>

templates/repo/settings/navbar.tmpl

@@ -18,9 +18,11 @@
 			{{.i18n.Tr "repo.settings.githooks"}}
 		</a>
 	{{end}}
+	{{if not DisableSSH}}
 	<a class="{{if .PageIsSettingsKeys}}active{{end}} item" href="{{.RepoLink}}/settings/keys">
 		{{.i18n.Tr "repo.settings.deploy_keys"}}
 	</a>
+	{{end}}
 	{{if .LFSStartServer}}
 		<a class="{{if .PageIsSettingsLFS}}active{{end}} item" href="{{.RepoLink}}/settings/lfs">
 			{{.i18n.Tr "repo.settings.lfs"}}

templates/user/settings/applications.tmpl

@@ -3,6 +3,7 @@
 	{{template "user/settings/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
+		{{if not DisableSwagger}}
 		<h4 class="ui top attached header">
 			{{.i18n.Tr "settings.manage_access_token"}}
 		</h4>
@@ -45,6 +46,7 @@
 				</button>
 			</form>
 		</div>
+		{{end}}
 
 		{{if .EnableOAuth2}}
 			{{template "user/settings/grants_oauth2" .}}

templates/user/settings/keys_ssh.tmpl

@@ -1,11 +1,8 @@
+{{if not DisableSSH}}
 <h4 class="ui top attached header">
 	{{.i18n.Tr "settings.manage_ssh_keys"}}
 	<div class="ui right">
-	{{if not .DisableSSH}}
 		<div class="ui blue tiny show-panel button" data-panel="#add-ssh-key-panel">{{.i18n.Tr "settings.add_key"}}</div>
-	{{else}}
-		<div class="ui blue tiny button disabled">{{.i18n.Tr "settings.ssh_disabled"}}</div>
-	{{end}}
 	</div>
 </h4>
 <div class="ui attached segment">
@@ -71,3 +68,4 @@
 	</div>
 	{{template "base/delete_modal_actions" .}}
 </div>
+{{end}}