Rework SSH key management UI to add GPG #1293

sapk · 2017-03-17T00:12:44Z

Complete GPG implementation #710 and #1150

TODO :

Fastidious · 2017-03-20T16:57:13Z

An early, and minimal, suggestion: change the key icon to a lock icon for the GPG/PGP portion. Really love, and appreciate the work you are doing to get this in!

drsect0r · 2017-03-22T18:58:31Z

Awesome work! 👍

sapk · 2017-03-23T16:03:52Z

@Fastidious I was thinking of making it like github that use also a key for both but add a label under. But it would be better to just have a different icon like you propose.
For the next 5 days, I will not have much time but I will finish it just after.

sapk · 2017-03-23T16:12:08Z

Other icon possibility : http:https://fontawesome.io/icon/key/, http:https://fontawesome.io/icon/pencil/ (for signing), http:https://fontawesome.io/icon/check-square-o/, http:https://fontawesome.io/icon/paperclip/

pree · 2017-03-24T10:20:15Z

Hey, I just tested the gpg Validation and really like it!
Is it intended, that the Validation (green box + icons) are not shown in the Code-Overview ?
This is something that GitHub doesn't have, because they are not showing the commit-ref in the Code-Overview, but since Gitea shows that, it would be really awesome to see the verified "Checkmarks" there too

sapk · 2017-03-24T15:41:47Z

@Schizopriest It could be included in most part easily now with just passing commit list to ParseCommitsWithSignature like https://github.com/go-gitea/gitea/pull/1150/files#diff-da47b1b0b02ed3ac1a84db3edc178279R71 this will add information about validity of signature in template and use it like https://github.com/go-gitea/gitea/pull/1150/files#diff-7a50b55ffb3c01e4e467c74b23e0863bR44). I simply wanted to make it work simple at first and not change everywhere for base and not change a lot a pages. But now it could be done everywhere

bkcsoft · 2017-04-18T06:35:31Z

Woooh! Awesome 😄 Few conflicts though.

Some notes:

Maybe break the template down, see Refactor large templates #1275
Not a fan of any of the suggested alternative icons. TBH just go with the same key for both, potential icon-changes can be discussed in a later issue 🙂

sapk · 2017-04-18T21:16:29Z

I broke myself this PR with a other PR removing extra formatting in settings pages. ^^

I will put time on this one soon since it is the last part of sign commit with GPG key.

sapk · 2017-04-19T02:52:56Z

This PR work now, I will look into optimization of verification since I found that hash class are consume and not re-usable so I fix it by regenerating hash before verifying against commiter keys but this is not really efficient way. I think, I will put it under a other PR since this only a overhead for signed commit and relative to the number of key of the signing user (and stop at first validation).

lunny · 2017-04-19T05:16:25Z

@sapk great job! I will test this.

bkcsoft · 2017-04-20T03:09:59Z

public/js/index.js

+ if ($this.attr("id")) {
+ filter += "#"+$this.attr("id")
+ }
+ $('.delete.modal'+filter).modal({


Are you sure that nothing else on the site uses this?

I have check that all matching .delete-button don't have id so that this change don't interact with it. I will double check and confirm it.

I confirm !

bkcsoft · 2017-04-20T03:12:34Z

templates/user/settings/keys.tmpl

@@ -0,0 +1,144 @@
+{{template "base/head" .}}


Could we break this file into 3? Having settings/keys.tmpl, settings/keys_ssh.tmpl and settings/keys_gpg.tmpl? Would make it easier to copy-paste a file to possibly add more key-types in the future. Also makes the files smaller ;)

Ok I will do that.

lunny · 2017-04-20T08:03:57Z

500 when I add a GPG key with a non-exist email address.

sapk · 2017-04-20T23:56:28Z

Thanks for the feedback.

@lunny I added a error type to catch to be display.

I think that when integration test are ready, this functionality will need some testing scenario.

lunny · 2017-04-21T01:50:19Z

@sapk another consideration. After I added a gpg key, then I remove the email address. What will happen?

sapk · 2017-04-21T01:54:23Z

Good question ^^

sapk · 2017-04-21T02:01:17Z

For validation of commit, those will failed because of 14fe901#diff-212b9fa4c927665ecbc5a5a36382ecedR385

For display of GPG keys this need to be checked. At first view, I think that there will still be display and not failed because we grab them by OwnerID. But I don't know how xorm will handle Emails fields leading to nothing. ca1c3f1#diff-212b9fa4c927665ecbc5a5a36382ecedR33

lunny · 2017-04-21T15:26:33Z

But anyhow I will give this LGTM.

bkcsoft · 2017-04-25T17:11:43Z

Yeah, appart from the conflict this is LGTM :D

sapk · 2017-04-25T17:44:42Z

OK I will rebase

- Fix duplicate entry in locale - Re-generate hash before verification since they are consumed

sapk · 2017-04-26T12:13:15Z

Done, conflict was from #1290 because it move route from cmd to a package (for a good reason ^^).

lunny added this to the 1.2.0 milestone Mar 17, 2017

lunny added type/feature Completely new functionality. Can only be merged if feature freeze is not active. pr/wip This PR is not ready for review labels Mar 17, 2017

sapk mentioned this pull request Mar 19, 2017

GPG commit validation #1150

Merged

6 tasks

tboerger added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Mar 20, 2017

sapk force-pushed the gpg-key-management branch 3 times, most recently from 9c9a60e to b185d55 Compare March 25, 2017 16:49

sapk force-pushed the gpg-key-management branch 2 times, most recently from 629e2ba to 2a3947e Compare April 19, 2017 02:46

sapk force-pushed the gpg-key-management branch from 52537e2 to 76ca188 Compare April 19, 2017 03:05

sapk changed the title ~~[WIP] Rework SSH key management UI to add GPG~~ Rework SSH key management UI to add GPG Apr 19, 2017

lunny removed the pr/wip This PR is not ready for review label Apr 19, 2017

bkcsoft reviewed Apr 20, 2017

View reviewed changes

tboerger added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Apr 21, 2017

tboerger added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Apr 25, 2017

sapk and others added 9 commits April 26, 2017 14:11

Rework SSH key management UI to add GPG

d5d0e29

Add more detail to gpg key display

28cae96

Update CHANGELOG.md

106738b

Implement deletion UI

f9f4607

Implement adding gpg UI

1ecdea6

Various fixes

68a5533

- Fix duplicate entry in locale - Re-generate hash before verification since they are consumed

Add missing translation

6801a41

Split template

47eb429

Catch not found/verified email error

8b63db4

sapk force-pushed the gpg-key-management branch from 78cec74 to 8b63db4 Compare April 26, 2017 12:11

lunny merged commit 8371f94 into go-gitea:master Apr 26, 2017

pree mentioned this pull request Apr 27, 2017

Missing translation for gpg in crowdin #1625

Closed

Fastidious mentioned this pull request Apr 27, 2017

GPG key validity affected by non-expiring key #1626

Closed

3 tasks

sapk deleted the gpg-key-management branch April 28, 2017 10:04

jag3773 mentioned this pull request Aug 30, 2017

Setup Nginx URL redirects unfoldingWord/dcs#221

Closed

2 tasks

go-gitea locked and limited conversation to collaborators Nov 23, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rework SSH key management UI to add GPG #1293

Rework SSH key management UI to add GPG #1293

sapk commented Mar 17, 2017 •

edited

Loading

Fastidious commented Mar 20, 2017

drsect0r commented Mar 22, 2017

sapk commented Mar 23, 2017

sapk commented Mar 23, 2017

pree commented Mar 24, 2017

sapk commented Mar 24, 2017 •

edited

Loading

bkcsoft commented Apr 18, 2017

sapk commented Apr 18, 2017

sapk commented Apr 19, 2017 •

edited

Loading

lunny commented Apr 19, 2017

bkcsoft Apr 20, 2017

sapk Apr 20, 2017 •

edited

Loading

sapk Apr 20, 2017

bkcsoft Apr 20, 2017

sapk Apr 20, 2017

sapk Apr 20, 2017

lunny commented Apr 20, 2017

sapk commented Apr 20, 2017

lunny commented Apr 21, 2017

sapk commented Apr 21, 2017

sapk commented Apr 21, 2017

lunny commented Apr 21, 2017

bkcsoft commented Apr 25, 2017

sapk commented Apr 25, 2017

sapk commented Apr 26, 2017

Rework SSH key management UI to add GPG #1293

Rework SSH key management UI to add GPG #1293

Conversation

sapk commented Mar 17, 2017 • edited Loading

Fastidious commented Mar 20, 2017

drsect0r commented Mar 22, 2017

sapk commented Mar 23, 2017

sapk commented Mar 23, 2017

pree commented Mar 24, 2017

sapk commented Mar 24, 2017 • edited Loading

bkcsoft commented Apr 18, 2017

sapk commented Apr 18, 2017

sapk commented Apr 19, 2017 • edited Loading

lunny commented Apr 19, 2017

bkcsoft Apr 20, 2017

Choose a reason for hiding this comment

sapk Apr 20, 2017 • edited Loading

Choose a reason for hiding this comment

sapk Apr 20, 2017

Choose a reason for hiding this comment

bkcsoft Apr 20, 2017

Choose a reason for hiding this comment

sapk Apr 20, 2017

Choose a reason for hiding this comment

sapk Apr 20, 2017

Choose a reason for hiding this comment

lunny commented Apr 20, 2017

sapk commented Apr 20, 2017

lunny commented Apr 21, 2017

sapk commented Apr 21, 2017

sapk commented Apr 21, 2017

lunny commented Apr 21, 2017

bkcsoft commented Apr 25, 2017

sapk commented Apr 25, 2017

sapk commented Apr 26, 2017

sapk commented Mar 17, 2017 •

edited

Loading

sapk commented Mar 24, 2017 •

edited

Loading

sapk commented Apr 19, 2017 •

edited

Loading

sapk Apr 20, 2017 •

edited

Loading