Disable unnecessary SSH elements

This mod fixes disabling unnecessary SSH elements.

Related: go-gitea#13129
Author-Change-Id: IB#1115249

Author: pboguslawski

modules/templates/helper.go

@@ -239,6 +239,9 @@ func NewFuncMap() []template.FuncMap {
 		"DisableImportLocal": func() bool {
 			return !setting.ImportLocalPaths
 		},
+		"DisableSSH": func() bool {
+			return setting.SSH.Disabled
+		},
 		"Dict": func(values ...interface{}) (map[string]interface{}, error) {
 			if len(values)%2 != 0 {
 				return nil, errors.New("invalid dict call")

options/locale/locale_en-US.ini

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

services/cron/tasks_extended.go

@@ -158,8 +158,12 @@ func initExtendedTasks() {
 	registerDeleteInactiveUsers()
 	registerDeleteRepositoryArchives()
 	registerGarbageCollectRepositories()
-	registerRewriteAllPublicKeys()
-	registerRewriteAllPrincipalKeys()
+	if !setting.SSH.Disabled && !setting.SSH.StartBuiltinServer && setting.SSH.CreateAuthorizedKeysFile {
+		registerRewriteAllPublicKeys()
+	}
+	if !setting.SSH.Disabled && !setting.SSH.StartBuiltinServer && setting.SSH.CreateAuthorizedPrincipalsFile {
+		registerRewriteAllPrincipalKeys()
+	}
 	registerRepositoryUpdateHook()
 	registerReinitMissingRepositories()
 	registerDeleteMissingRepositories()

templates/admin/dashboard.tmpl

@@ -40,12 +40,14 @@
 							<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 and (not .SSH.Disabled) (not .SSH.StartBuiltinServer)}}
+						{{if and (not .SSH.Disabled) (not .SSH.StartBuiltinServer) (.SSH.CreateAuthorizedKeysFile) }}
 							<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 and (not .SSH.Disabled) (not .SSH.StartBuiltinServer) (.SSH.CreateAuthorizedPrincipalsFile) }}
 							<tr>
 								<td>{{.i18n.Tr "admin.dashboard.resync_all_sshprincipals"}}<br/>
 								{{.i18n.Tr "admin.dashboard.resync_all_sshprincipals.desc"}}</td>

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

@@ -12,7 +12,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

@@ -24,9 +24,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/keys_principal.tmpl

@@ -1,12 +1,8 @@
-{{if .AllowPrincipals}}
+{{if and .AllowPrincipals (not DisableSSH)}}
 	<h4 class="ui top attached header">
 		{{.i18n.Tr "settings.manage_ssh_principals"}}
 		<div class="ui right">
-		{{if not .DisableSSH}}
 			<div class="ui blue tiny show-panel button" data-panel="#add-ssh-principal-panel">{{.i18n.Tr "settings.add_new_principal"}}</div>
-		{{else}}
-			<div class="ui blue tiny button disabled">{{.i18n.Tr "settings.ssh_disabled"}}</div>
-		{{end}}
 		</div>
 	</h4>
 	<div class="ui attached segment">

templates/user/settings/keys_ssh.tmpl

@@ -1,13 +1,10 @@
+{{if not DisableSSH}}
 <h4 class="ui top attached header">
 	{{.i18n.Tr "settings.manage_ssh_keys"}}
 	<div class="ui right">
-		{{if not .DisableSSH }}
-			<div id="add-ssh-button" 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 id="add-ssh-button" class="ui blue tiny show-panel button" data-panel="#add-ssh-key-panel">
+			{{.i18n.Tr "settings.add_key"}}
+		</div>
 	</div>
 </h4>
 <div class="ui attached segment">
@@ -109,3 +106,4 @@
 	</div>
 	{{template "base/delete_modal_actions" .}}
 </div>
+{{end}}

templates/user/settings/navbar.tmpl

@@ -16,7 +16,7 @@
 			{{.i18n.Tr "settings.applications"}}
 		</a>
 		<a class="{{if .PageIsSettingsKeys}}active{{end}} item" href="{{AppSubUrl}}/user/settings/keys">
-			{{.i18n.Tr "settings.ssh_gpg_keys"}}
+			{{.i18n.Tr "settings.keys"}}
 		</a>
 		<a class="{{if .PageIsSettingsOrganization}}active{{end}} item" href="{{AppSubUrl}}/user/settings/organization">
 			{{.i18n.Tr "settings.organization"}}