9:42 a.m.
Repo: https://github.com/benjamb/gitano.git
Ref: benbrown/broken-pattern
Sha1: 585acfadb73469d8486a861bc4d8a97672ba1730
I wasn't certain whether to also include a patch to update usercommand to accept
dots in tag names, since the pattern to list keys includes them.
Ben Brown (2):
Fix broken match by moving dash to end of set
Update test to verify tag names with dashes are accepted
lib/gitano/config.lua | 2 +-
testing/02-commands-sshkey.yarn | 12 ++++++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
--
2.10.2
9:42 a.m.
New subject: [PATCH 1/2] Fix broken match by moving dash to end of set
The '-' fails to represent a range between '.' and '_'.
---
lib/gitano/config.lua | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/gitano/config.lua b/lib/gitano/config.lua
index 8d5e53b..76262f0 100644
--- a/lib/gitano/config.lua
+++ b/lib/gitano/config.lua
@@ -118,7 +118,7 @@ local function parse_admin_config(commit)
-- Now gather the users' keys
local all_keys = {}
for filename, obj in pairs(flat_tree) do
- local prefix, username, keyname =
filename:match("^(users/.-)([a-z][a-z0-9_.-]+)/([a-z][a-z0-9_-.]+)%.key$")
+ local prefix, username, keyname =
filename:match("^(users/.-)([a-z][a-z0-9_.-]+)/([a-z][a-z0-9_.-]+)%.key$")
if prefix and username and keyname then
if not users[username] then
return nil, i18n.expand("ERROR_ORPHAN_KEY",
--
2.10.2
9:42 a.m.
New subject: [PATCH 2/2] Update test to verify tag names with dashes are accepted
---
testing/02-commands-sshkey.yarn | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/testing/02-commands-sshkey.yarn b/testing/02-commands-sshkey.yarn
index 4d79a25..769ef73 100644
--- a/testing/02-commands-sshkey.yarn
+++ b/testing/02-commands-sshkey.yarn
@@ -19,8 +19,20 @@ New keys can be added.
WHEN testinstance uses their ssh public key called newkey as stdin
AND testinstance adminkey runs sshkey add newkey
THEN stderr contains SSH authorised key file updated
+
+We should also be able to add keys with underscores and/or dashes in the tag
+name.
+
+ GIVEN testinstance has keys called testkey
+ WHEN testinstance uses their ssh public key called testkey as stdin
+ AND testinstance adminkey runs sshkey add test-key_
+ THEN stderr contains SSH authorised key file updated
+
+Verify the new keys are listed for the user.
+
WHEN testinstance adminkey runs sshkey list
THEN stderr contains newkey
+ AND stderr contains test-key_
Now that we have multiple keys assigned to a user
it is necessary for gitano to be able to tell us which key is being used.
--
2.10.2
5:52 a.m.
On Sun, Dec 11, 2016 at 14:42:19 +0000, Ben Brown wrote:
Repo: https://github.com/benjamb/gitano.git
Ref: benbrown/broken-pattern
Sha1: 585acfadb73469d8486a861bc4d8a97672ba1730
I wasn't certain whether to also include a patch to update usercommand to accept
dots in tag names, since the pattern to list keys includes them.
Ben Brown (2):
Fix broken match by moving dash to end of set
Update test to verify tag names with dashes are accepted
lib/gitano/config.lua | 2 +-
testing/02-commands-sshkey.yarn | 12 ++++++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
This series looks good, I shall endeavour to merge it ASAP. It also hilights
to me that sshkey output is going on stderr. In general I think I need to
review where output goes because stdout and stderr are being misused in far too
many places.
D.
--
Daniel Silverstone http://www.digital-scurf.org/
PGP mail accepted and encouraged. Key Id: 3CCE BABE 206C 3B69
4:32 p.m.
On Sun, Dec 11, 2016 at 14:42:19 +0000, Ben Brown wrote:
Repo: https://github.com/benjamb/gitano.git
Ref: benbrown/broken-pattern
Sha1: 585acfadb73469d8486a861bc4d8a97672ba1730
Merged, thank you.
I wasn't certain whether to also include a patch to update
usercommand to accept
dots in tag names, since the pattern to list keys includes them.
It's okay, I've noted the problem:
https://trello.com/c/TeWxymVD/216
Thanks,
D.
--
Daniel Silverstone http://www.digital-scurf.org/
PGP mail accepted and encouraged. Key Id: 3CCE BABE 206C 3B69
2367
days inactive
2368
days old
4 comments
2 participants
participants (2)
-
Ben Brown -
Daniel Silverstone