mirror of
https://codeberg.org/davrot/forgejo.git
synced 2025-07-21 04:00:03 +02:00

This makes it easier for people to verify their SSH key with various setups. People with a key stored in a file won't have to manually substitute the correct file path anymore. People who store their SSH key in a password manager and access it via an ssh-agent won't have to copy the private key to a temporary file or figure out the process substitution thing anymore. A slight disadvantage is that the fish shell doesn't have the same syntax for process substitution as POSIX shells. For that reason, a default-collapsed box with a custom command for fish users is provided, just like for the Windows shells. The Windows shells do not have an equivalent to process substitution, so those commands remain unchanged. ## Checklist The [contributor guide](https://forgejo.org/docs/next/contributor/) contains information that will be helpful to first time contributors. There also are a few [conditions for merging Pull Requests in Forgejo repositories](https://codeberg.org/forgejo/governance/src/branch/main/PullRequestsAgreement.md). You are also welcome to join the [Forgejo development chatroom](https://matrix.to/#/#forgejo-development:matrix.org). ### Tests - I added test coverage for Go changes... - [ ] ~in their respective `*_test.go` for unit tests.~ - [ ] ~in the `tests/integration` directory if it involves interactions with a live Forgejo server.~ - I added test coverage for JavaScript changes... - [ ] ~in `web_src/js/*.test.js` if it can be unit tested.~ - [ ] ~in `tests/e2e/*.test.e2e.js` if it requires interactions with a live Forgejo server (see also the [developer guide for JavaScript testing](https://codeberg.org/forgejo/forgejo/src/branch/forgejo/tests/e2e/README.md#end-to-end-tests)).~ ### Documentation - [ ] ~I created a pull request [to the documentation](https://codeberg.org/forgejo/docs) to explain to Forgejo users how to use this change.~ - [x] I did not document these changes and I do not expect someone else to do it. ### Release notes - [ ] I do not want this change to show in the release notes. - [x] I want the title to show in the release notes with a link to this pull request. - [ ] I want the content of the `release-notes/<pull request number>.md` to be be used for the release notes instead of the title. ## [](#testing)Testing * `pr=7516 ; git fetch forgejo +refs/pull/$pr/head:refs/heads/wip-pr-$pr` * `git checkout wip-pr-$pr` * `make TAGS='sqlite sqlite_unlock_notify' watch` * login * visit /user/settings/keys and add an ssh key * click verify * see a CLI sample is displayed  * run CLI sample, copy paste the output and submit it * check that the verification is successful  <!--start release-notes-assistant--> ## Release notes <!--URL:https://codeberg.org/forgejo/forgejo--> - User Interface features - [PR](https://codeberg.org/forgejo/forgejo/pulls/7516): <!--number 7516 --><!--line 0 --><!--description aW5saW5lIHB1YmxpYyBzc2gga2V5IGluIHZlcmlmaWNhdGlvbiBjb21tYW5k-->inline public ssh key in verification command<!--description--> <!--end release-notes-assistant--> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7516 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org> Co-authored-by: Remo Senekowitsch <remo@buenzli.dev> Co-committed-by: Remo Senekowitsch <remo@buenzli.dev>
121 lines
5.8 KiB
Go HTML Template
121 lines
5.8 KiB
Go HTML Template
<h4 class="ui top attached header">
|
|
{{ctx.Locale.Tr "settings.manage_ssh_keys"}}
|
|
<div class="ui right">
|
|
<button id="add-ssh-button" class="ui primary tiny show-panel toggle button" data-panel="#add-ssh-key-panel">
|
|
{{ctx.Locale.Tr "settings.add_key"}}
|
|
</button>
|
|
</div>
|
|
</h4>
|
|
<div class="ui attached segment">
|
|
<div class="{{if not .HasSSHError}}tw-hidden{{end}} tw-mb-4" id="add-ssh-key-panel">
|
|
<form class="ui form" action="{{.Link}}" method="post">
|
|
{{.CsrfTokenHtml}}
|
|
<div class="field {{if .Err_Title}}error{{end}}">
|
|
<label for="ssh-key-title">{{ctx.Locale.Tr "settings.key_name"}}</label>
|
|
<input id="ssh-key-title" name="title" value="{{.title}}" autofocus required maxlength="50">
|
|
</div>
|
|
<div class="field {{if .Err_Content}}error{{end}}">
|
|
<label for="ssh-key-content">{{ctx.Locale.Tr "settings.key_content"}}</label>
|
|
<textarea id="ssh-key-content" name="content" class="js-quick-submit" placeholder="{{ctx.Locale.Tr "settings.key_content_ssh_placeholder"}}" required>{{.content}}</textarea>
|
|
</div>
|
|
<input name="type" type="hidden" value="ssh">
|
|
<button class="ui primary button">
|
|
{{ctx.Locale.Tr "settings.add_key"}}
|
|
</button>
|
|
<button id="cancel-ssh-button" class="ui hide-panel button" data-panel="#add-ssh-key-panel">
|
|
{{ctx.Locale.Tr "cancel"}}
|
|
</button>
|
|
</form>
|
|
</div>
|
|
<div id="keys-ssh" class="flex-list">
|
|
<div class="flex-item">
|
|
<p>
|
|
{{ctx.Locale.Tr "settings.ssh_desc"}}<br>
|
|
{{ctx.Locale.Tr "settings.ssh_helper" "https://docs.codeberg.org/security/ssh-key/" "https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/troubleshooting-ssh"}}
|
|
</p>
|
|
</div>
|
|
{{if .DisableSSH}}
|
|
<div class="flex-item">
|
|
{{ctx.Locale.Tr "settings.ssh_signonly"}}
|
|
</div>
|
|
{{end}}
|
|
{{range $index, $key := .Keys}}
|
|
<div class="flex-item">
|
|
<div class="flex-item-leading">
|
|
<span class="text {{if .HasRecentActivity}}green{{end}}" {{if .HasRecentActivity}}data-tooltip-content="{{ctx.Locale.Tr "settings.key_state_desc"}}"{{end}}>{{svg "octicon-key" 32}}</span>
|
|
</div>
|
|
<div class="flex-item-main">
|
|
{{if .Verified}}
|
|
<div class="flex-item-title flex-text-block" data-tooltip-content="{{ctx.Locale.Tr "settings.ssh_key_verified_long"}}">{{svg "octicon-verified"}}{{ctx.Locale.Tr "settings.ssh_key_verified"}}</div>
|
|
{{end}}
|
|
<div class="flex-item-title">{{.Name}}</div>
|
|
<div class="flex-item-body">
|
|
{{.Fingerprint}}
|
|
</div>
|
|
<div class="flex-item-body">
|
|
<p>{{ctx.Locale.Tr "settings.added_on" (DateUtils.AbsoluteShort .CreatedUnix)}} — {{svg "octicon-info"}} {{if .HasUsed}}{{ctx.Locale.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="text green"{{end}}>{{DateUtils.AbsoluteShort .UpdatedUnix}}</span>{{else}}{{ctx.Locale.Tr "settings.no_activity"}}{{end}}</p>
|
|
</div>
|
|
</div>
|
|
<div class="flex-item-trailing">
|
|
<button class="ui red tiny button delete-button{{if index $.ExternalKeys $index}} disabled{{end}}" data-modal-id="delete-ssh" data-url="{{$.Link}}/delete?type=ssh" data-id="{{.ID}}"{{if index $.ExternalKeys $index}} title="{{ctx.Locale.Tr "settings.ssh_externally_managed"}}"{{end}}>
|
|
{{ctx.Locale.Tr "settings.delete_key"}}
|
|
</button>
|
|
{{if and (not .Verified) (ne $.VerifyingFingerprint .Fingerprint)}}
|
|
<a class="ui primary tiny button" href="?verify_ssh={{.Fingerprint}}">{{ctx.Locale.Tr "settings.ssh_key_verify"}}</a>
|
|
{{end}}
|
|
</div>
|
|
</div>
|
|
{{if and (not .Verified) (eq $.VerifyingFingerprint .Fingerprint)}}
|
|
<div class="ui segment">
|
|
<h4>{{ctx.Locale.Tr "settings.ssh_token_required"}}</h4>
|
|
<form class="ui form{{if $.HasSSHVerifyError}} error{{end}}" action="{{$.Link}}" method="post">
|
|
{{$.CsrfTokenHtml}}
|
|
<input type="hidden" name="title" value="none">
|
|
<input type="hidden" name="content" value="{{.Content}}">
|
|
<input type="hidden" name="fingerprint" value="{{.Fingerprint}}">
|
|
<div class="field">
|
|
<label for="token">{{ctx.Locale.Tr "settings.ssh_token"}}</label>
|
|
<input readonly="" value="{{$.TokenToSign}}">
|
|
<div class="help">
|
|
<p>{{ctx.Locale.Tr "settings.ssh_token_help"}}</p>
|
|
<div class="markup"><pre class="code-block"><code>bash -c "echo -n '{{$.TokenToSign}}' | ssh-keygen -Y sign -n gitea -f <(echo '{{.OmitEmail}}')"</code></pre></div>
|
|
<br>
|
|
<details>
|
|
<summary>Windows PowerShell</summary>
|
|
<div class="markup"><pre class="code-block"><code>cmd /c "<NUL set /p=`"{{$.TokenToSign}}`"| ssh-keygen -Y sign -n gitea -f /path_to_PrivateKey_or_RelatedPublicKey"</code></pre></div>
|
|
</details>
|
|
<br>
|
|
<details>
|
|
<summary>Windows CMD</summary>
|
|
<div class="markup"><pre class="code-block"><code>set /p={{$.TokenToSign}}| ssh-keygen -Y sign -n gitea -f /path_to_PrivateKey_or_RelatedPublicKey</code></pre></div>
|
|
</details>
|
|
</div>
|
|
<br>
|
|
</div>
|
|
<div class="field">
|
|
<label for="signature">{{ctx.Locale.Tr "settings.ssh_token_signature"}}</label>
|
|
<textarea id="ssh-key-signature" name="signature" class="js-quick-submit" placeholder="{{ctx.Locale.Tr "settings.key_signature_ssh_placeholder"}}" required>{{$.signature}}</textarea>
|
|
</div>
|
|
<input name="type" type="hidden" value="verify_ssh">
|
|
<button class="ui primary button">
|
|
{{ctx.Locale.Tr "settings.ssh_key_verify"}}
|
|
</button>
|
|
<a class="ui red button" href="{{$.Link}}">
|
|
{{ctx.Locale.Tr "settings.cancel"}}
|
|
</a>
|
|
</form>
|
|
</div>
|
|
{{end}}
|
|
{{end}}
|
|
</div>
|
|
<div class="ui g-modal-confirm delete modal" id="delete-ssh">
|
|
<div class="header">
|
|
{{svg "octicon-trash"}}
|
|
{{ctx.Locale.Tr "settings.ssh_key_deletion"}}
|
|
</div>
|
|
<div class="content">
|
|
<p>{{ctx.Locale.Tr "settings.ssh_key_deletion_desc"}}</p>
|
|
</div>
|
|
{{template "base/modal_actions_confirm" .}}
|
|
</div>
|
|
</div>
|