From e7a1cc68c7e30d0f3c9af33aa39871dda064a58d Mon Sep 17 00:00:00 2001
From: Tommi Virtanen <tv@eagain.net>
Date: Mon, 3 Sep 2007 21:54:20 -0700
Subject: Let SSH public key user fields have a bit more varied content.

---
 gitosis/init.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gitosis/init.py')

diff --git a/gitosis/init.py b/gitosis/init.py
index 61504c8..7ba04cd 100644
--- a/gitosis/init.py
+++ b/gitosis/init.py
@@ -25,7 +25,7 @@ def read_ssh_pubkey(fp=None):
     line = fp.readline()
     return line
 
-_ACCEPTABLE_USER_RE = re.compile(r'^[a-z][a-z0-9]*@[a-z][a-z0-9]*$')
+_ACCEPTABLE_USER_RE = re.compile(r'^[a-z][a-z0-9]*(@[a-z][a-z0-9.-]*)?$')
 
 class InsecureSSHKeyUsername(Exception):
     """Username contains not allowed characters"""
-- 
cgit v1.2.3