From MAILER-DAEMON Thu Sep 22 04:59:50 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1EIMve-0008Vy-Mu
	for mharc-sshproxy-dev@gnu.org; Thu, 22 Sep 2005 04:59:43 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1EIMvT-0008UB-1L
	for sshproxy-dev@nongnu.org; Thu, 22 Sep 2005 04:59:31 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1EIMvM-0008TR-Tv
	for sshproxy-dev@nongnu.org; Thu, 22 Sep 2005 04:59:27 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1EIMuY-0008II-5U
	for sshproxy-dev@nongnu.org; Thu, 22 Sep 2005 04:58:36 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1EIMuW-0001lQ-9j
	for sshproxy-dev@nongnu.org; Thu, 22 Sep 2005 04:58:32 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.36 #1 (Debian))
	id 1EIMuV-0002Ar-00
	for <sshproxy-dev@nongnu.org>; Thu, 22 Sep 2005 04:58:31 -0400
To: sshproxy-dev@nongnu.org
From: David Guerizec <david@guerizec.net>
Message-Id: <E1EIMuV-0002Ar-00@savannah.gnu.org>
Date: Thu, 22 Sep 2005 04:58:31 -0400
Subject: [sshproxy-dev] sshproxy/SSHproxy/pwdb mysql.py
X-BeenThere: sshproxy-dev@nongnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SSH proxy developer list <sshproxy-dev.nongnu.org>
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/sshproxy-dev>
List-Post: <mailto:sshproxy-dev@nongnu.org>
List-Help: <mailto:sshproxy-dev-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Sep 2005 08:59:35 -0000

CVSROOT:	/cvsroot/sshproxy
Module name:	sshproxy
Branch: 	
Changes by:	David Guerizec <dguerizec@savannah.gnu.org>	05/09/22 08:58:31

Modified files:
	SSHproxy/pwdb  : mysql.py 

Log message:
	Clean up presentation

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/sshproxy/sshproxy/SSHproxy/pwdb/mysql.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text




From MAILER-DAEMON Thu Sep 22 05:09:45 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1EIN5K-0000uf-CW
	for mharc-sshproxy-dev@gnu.org; Thu, 22 Sep 2005 05:09:42 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1EIN5D-0000sF-C5
	for sshproxy-dev@nongnu.org; Thu, 22 Sep 2005 05:09:36 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1EIN2w-0000XJ-7h
	for sshproxy-dev@nongnu.org; Thu, 22 Sep 2005 05:07:24 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1EIMu4-0008II-5g
	for sshproxy-dev@nongnu.org; Thu, 22 Sep 2005 04:58:05 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1EIMu1-0001jG-Sg
	for sshproxy-dev@nongnu.org; Thu, 22 Sep 2005 04:58:02 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.36 #1 (Debian))
	id 1EIMtw-0001pW-00
	for <sshproxy-dev@nongnu.org>; Thu, 22 Sep 2005 04:57:56 -0400
To: sshproxy-dev@nongnu.org
From: David Guerizec <david@guerizec.net>
Message-Id: <E1EIMtw-0001pW-00@savannah.gnu.org>
Date: Thu, 22 Sep 2005 04:57:56 -0400
Subject: [sshproxy-dev] Changes to sshproxy/SSHproxy/client/ssh.py
X-BeenThere: sshproxy-dev@nongnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SSH proxy developer list <sshproxy-dev.nongnu.org>
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/sshproxy-dev>
List-Post: <mailto:sshproxy-dev@nongnu.org>
List-Help: <mailto:sshproxy-dev-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Sep 2005 09:09:38 -0000

Index: sshproxy/SSHproxy/client/ssh.py
diff -u sshproxy/SSHproxy/client/ssh.py:1.3 sshproxy/SSHproxy/client/ssh.py:1.4
--- sshproxy/SSHproxy/client/ssh.py:1.3	Tue Aug  2 13:25:45 2005
+++ sshproxy/SSHproxy/client/ssh.py	Thu Sep 22 08:57:55 2005
@@ -168,6 +168,8 @@
                         break
                     if ord(x[0]) == 11: # CTRL-K
                         CK += 1
+                        # increment the following number if only one Ctrl-K
+                        # interferes with another application
                         if CK >= 1:
                             self.reset_term()
                             self.fdout.write("\n")



From MAILER-DAEMON Thu Sep 22 05:12:12 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1EIN7N-0001wb-Vs
	for mharc-sshproxy-dev@gnu.org; Thu, 22 Sep 2005 05:11:50 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1EIN71-0001aX-9d
	for sshproxy-dev@nongnu.org; Thu, 22 Sep 2005 05:11:27 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1EIN2P-0000Te-4I
	for sshproxy-dev@nongnu.org; Thu, 22 Sep 2005 05:06:42 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1EIMwc-0008II-Ca
	for sshproxy-dev@nongnu.org; Thu, 22 Sep 2005 05:00:44 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1EIMwU-0001vf-Il
	for sshproxy-dev@nongnu.org; Thu, 22 Sep 2005 05:00:34 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.36 #1 (Debian))
	id 1EIMtx-0001ps-00
	for <sshproxy-dev@nongnu.org>; Thu, 22 Sep 2005 04:57:57 -0400
To: sshproxy-dev@nongnu.org
From: David Guerizec <david@guerizec.net>
Message-Id: <E1EIMtx-0001ps-00@savannah.gnu.org>
Date: Thu, 22 Sep 2005 04:57:57 -0400
Subject: [sshproxy-dev] sshproxy/SSHproxy/client ssh.py
X-BeenThere: sshproxy-dev@nongnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SSH proxy developer list <sshproxy-dev.nongnu.org>
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/sshproxy-dev>
List-Post: <mailto:sshproxy-dev@nongnu.org>
List-Help: <mailto:sshproxy-dev-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Sep 2005 09:11:44 -0000

CVSROOT:	/cvsroot/sshproxy
Module name:	sshproxy
Branch: 	
Changes by:	David Guerizec <dguerizec@savannah.gnu.org>	05/09/22 08:57:55

Modified files:
	SSHproxy/client: ssh.py 

Log message:
	Information added

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/sshproxy/sshproxy/SSHproxy/client/ssh.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text




From MAILER-DAEMON Thu Sep 22 05:12:58 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1EIN8F-0002mq-Gw
	for mharc-sshproxy-dev@gnu.org; Thu, 22 Sep 2005 05:12:44 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1EIN7G-0001q8-UP
	for sshproxy-dev@nongnu.org; Thu, 22 Sep 2005 05:11:43 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1EIN5b-0000zp-CM
	for sshproxy-dev@nongnu.org; Thu, 22 Sep 2005 05:11:10 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1EIMul-0008II-6y
	for sshproxy-dev@nongnu.org; Thu, 22 Sep 2005 04:58:48 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1EIMuW-0001lL-12
	for sshproxy-dev@nongnu.org; Thu, 22 Sep 2005 04:58:32 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.36 #1 (Debian))
	id 1EIMuV-0002Ad-00
	for <sshproxy-dev@nongnu.org>; Thu, 22 Sep 2005 04:58:31 -0400
To: sshproxy-dev@nongnu.org
From: David Guerizec <david@guerizec.net>
Message-Id: <E1EIMuV-0002Ad-00@savannah.gnu.org>
Date: Thu, 22 Sep 2005 04:58:31 -0400
Subject: [sshproxy-dev] Changes to sshproxy/SSHproxy/pwdb/mysql.py
X-BeenThere: sshproxy-dev@nongnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SSH proxy developer list <sshproxy-dev.nongnu.org>
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/sshproxy-dev>
List-Post: <mailto:sshproxy-dev@nongnu.org>
List-Help: <mailto:sshproxy-dev-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Sep 2005 09:12:14 -0000

Index: sshproxy/SSHproxy/pwdb/mysql.py
diff -u sshproxy/SSHproxy/pwdb/mysql.py:1.1 sshproxy/SSHproxy/pwdb/mysql.py:1.2
--- sshproxy/SSHproxy/pwdb/mysql.py:1.1	Thu Jul 21 09:43:36 2005
+++ sshproxy/SSHproxy/pwdb/mysql.py	Thu Sep 22 08:58:31 2005
@@ -24,7 +24,12 @@
 
 cfg = MySQLConfig()
 
-db = MySQLdb.connect(host=cfg.host, port=cfg.port, db=cfg.db, user=cfg.user, passwd=cfg.password)
+db = MySQLdb.connect(
+        host=cfg.host,
+        port=cfg.port,
+        db=cfg.db,
+        user=cfg.user,
+        passwd=cfg.password)
 
 class MySQLPwDB(simple.SimplePwDB):
     def __init__(self):



From MAILER-DAEMON Fri Sep 23 11:36:16 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1EIpaw-0007PH-Oe
	for mharc-sshproxy-dev@gnu.org; Fri, 23 Sep 2005 11:36:15 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1EIpau-0007NX-BW
	for sshproxy-dev@nongnu.org; Fri, 23 Sep 2005 11:36:12 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1EIpar-0007Lc-M9
	for sshproxy-dev@nongnu.org; Fri, 23 Sep 2005 11:36:10 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1EIpar-0007LT-8m
	for sshproxy-dev@nongnu.org; Fri, 23 Sep 2005 11:36:09 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1EIpab-0005Dg-DU
	for sshproxy-dev@nongnu.org; Fri, 23 Sep 2005 11:35:53 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.36 #1 (Debian))
	id 1EIpaT-0004DO-00
	for <sshproxy-dev@nongnu.org>; Fri, 23 Sep 2005 11:35:45 -0400
To: sshproxy-dev@nongnu.org
From: Pierre-Yves Rofes <py@wcube.org>
Message-Id: <E1EIpaT-0004DO-00@savannah.gnu.org>
Date: Fri, 23 Sep 2005 11:35:45 -0400
Subject: [sshproxy-dev] Changes to sshproxy/SSHproxy/client/ssh.py
X-BeenThere: sshproxy-dev@nongnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SSH proxy developer list <sshproxy-dev.nongnu.org>
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/sshproxy-dev>
List-Post: <mailto:sshproxy-dev@nongnu.org>
List-Help: <mailto:sshproxy-dev-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Sep 2005 15:36:13 -0000

Index: sshproxy/SSHproxy/client/ssh.py
diff -u sshproxy/SSHproxy/client/ssh.py:1.4 sshproxy/SSHproxy/client/ssh.py:1.5
--- sshproxy/SSHproxy/client/ssh.py:1.4	Thu Sep 22 08:57:55 2005
+++ sshproxy/SSHproxy/client/ssh.py	Fri Sep 23 15:35:45 2005
@@ -171,14 +171,14 @@
                         # increment the following number if only one Ctrl-K
                         # interferes with another application
                         if CK >= 1:
-                            self.reset_term()
-                            self.fdout.write("\n")
-                            self.cmd.cmdloop()
-                            fcntl.fcntl(self.fdin, fcntl.F_SETFL, os.O_NDELAY)
-                            self.set_term()
+			    self.reset_term()
+			    self.fdout.write("\n")
+			    self.cmd.cmdloop()
+			    fcntl.fcntl(self.fdin, fcntl.F_SETFL, os.O_NDELAY)
+			    self.set_term()
                             # send ^L to clear screen and restore cmd line
-                            self.session.send(chr(12))
-                            CK = 0
+			    self.session.send(chr(12))
+			    CK = 0
                         continue
 
                     self.session.send(x)



From MAILER-DAEMON Fri Sep 23 11:36:21 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1EIpb0-0007S7-Us
	for mharc-sshproxy-dev@gnu.org; Fri, 23 Sep 2005 11:36:19 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1EIpav-0007Ou-Vq
	for sshproxy-dev@nongnu.org; Fri, 23 Sep 2005 11:36:14 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1EIpat-0007NC-V4
	for sshproxy-dev@nongnu.org; Fri, 23 Sep 2005 11:36:12 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1EIpat-0007LT-F9
	for sshproxy-dev@nongnu.org; Fri, 23 Sep 2005 11:36:11 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1EIpac-0005E7-TE
	for sshproxy-dev@nongnu.org; Fri, 23 Sep 2005 11:35:54 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.36 #1 (Debian))
	id 1EIpab-0004GB-00
	for <sshproxy-dev@nongnu.org>; Fri, 23 Sep 2005 11:35:53 -0400
To: sshproxy-dev@nongnu.org
From: Pierre-Yves Rofes <py@wcube.org>
Message-Id: <E1EIpab-0004GB-00@savannah.gnu.org>
Date: Fri, 23 Sep 2005 11:35:53 -0400
Subject: [sshproxy-dev] sshproxy SSHproxy/client/ssh.py SSHproxy/pwdb/m...
X-BeenThere: sshproxy-dev@nongnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SSH proxy developer list <sshproxy-dev.nongnu.org>
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/sshproxy-dev>
List-Post: <mailto:sshproxy-dev@nongnu.org>
List-Help: <mailto:sshproxy-dev-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Sep 2005 15:36:16 -0000

CVSROOT:	/cvsroot/sshproxy
Module name:	sshproxy
Branch: 	
Changes by:	Pierre-Yves Rofes <pyrofes@savannah.gnu.org>	05/09/23 15:35:45

Modified files:
	SSHproxy/client: ssh.py 
	SSHproxy/pwdb  : mysql.py simple.py 
	SSHproxy/server: server.py session.py 
	sql            : sshproxy.sql 

Log message:
	Draft implementation of ACL system with functions is_allowed and can_connect

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/sshproxy/sshproxy/SSHproxy/client/ssh.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/sshproxy/sshproxy/SSHproxy/pwdb/mysql.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/sshproxy/sshproxy/SSHproxy/pwdb/simple.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/sshproxy/sshproxy/SSHproxy/server/server.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/sshproxy/sshproxy/SSHproxy/server/session.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/sshproxy/sshproxy/sql/sshproxy.sql.diff?tr1=1.1&tr2=1.2&r1=text&r2=text




From MAILER-DAEMON Fri Sep 23 11:40:02 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1EIpea-0000f6-KE
	for mharc-sshproxy-dev@gnu.org; Fri, 23 Sep 2005 11:40:01 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1EIpeU-0000bI-Oc
	for sshproxy-dev@nongnu.org; Fri, 23 Sep 2005 11:39:55 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1EIpeQ-0000YZ-5u
	for sshproxy-dev@nongnu.org; Fri, 23 Sep 2005 11:39:53 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1EIpeO-0000PI-Jn
	for sshproxy-dev@nongnu.org; Fri, 23 Sep 2005 11:39:48 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1EIpcg-0005TF-9D
	for sshproxy-dev@nongnu.org; Fri, 23 Sep 2005 11:38:02 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.36 #1 (Debian))
	id 1EIpaY-0004FQ-00
	for <sshproxy-dev@nongnu.org>; Fri, 23 Sep 2005 11:35:50 -0400
To: sshproxy-dev@nongnu.org
From: Pierre-Yves Rofes <py@wcube.org>
Message-Id: <E1EIpaY-0004FQ-00@savannah.gnu.org>
Date: Fri, 23 Sep 2005 11:35:50 -0400
Subject: [sshproxy-dev] Changes to sshproxy/SSHproxy/server/session.py
X-BeenThere: sshproxy-dev@nongnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SSH proxy developer list <sshproxy-dev.nongnu.org>
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/sshproxy-dev>
List-Post: <mailto:sshproxy-dev@nongnu.org>
List-Help: <mailto:sshproxy-dev-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Sep 2005 15:39:57 -0000

Index: sshproxy/SSHproxy/server/session.py
diff -u sshproxy/SSHproxy/server/session.py:1.1 sshproxy/SSHproxy/server/session.py:1.2
--- sshproxy/SSHproxy/server/session.py:1.1	Thu Jul 21 09:43:36 2005
+++ sshproxy/SSHproxy/server/session.py	Fri Sep 23 15:35:45 2005
@@ -30,6 +30,7 @@
 
     def connect(self, sid):
         user, site = self.pwdb.get_site(sid)
+	SSHproxy.db = self.pwdb.db
         if not user or not site:
             return None
         hostname = site.ip_address



From MAILER-DAEMON Fri Sep 23 11:40:08 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1EIped-0000hH-Ny
	for mharc-sshproxy-dev@gnu.org; Fri, 23 Sep 2005 11:40:03 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1EIpeW-0000cA-CU
	for sshproxy-dev@nongnu.org; Fri, 23 Sep 2005 11:39:57 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1EIpeQ-0000Yh-EH
	for sshproxy-dev@nongnu.org; Fri, 23 Sep 2005 11:39:54 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1EIpeN-0000PI-TD
	for sshproxy-dev@nongnu.org; Fri, 23 Sep 2005 11:39:48 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1EIpcg-0005TL-Ua
	for sshproxy-dev@nongnu.org; Fri, 23 Sep 2005 11:38:03 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.36 #1 (Debian))
	id 1EIpaV-0004Dt-00
	for <sshproxy-dev@nongnu.org>; Fri, 23 Sep 2005 11:35:47 -0400
To: sshproxy-dev@nongnu.org
From: Pierre-Yves Rofes <py@wcube.org>
Message-Id: <E1EIpaV-0004Dt-00@savannah.gnu.org>
Date: Fri, 23 Sep 2005 11:35:47 -0400
Subject: [sshproxy-dev] Changes to sshproxy/SSHproxy/pwdb/mysql.py
X-BeenThere: sshproxy-dev@nongnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SSH proxy developer list <sshproxy-dev.nongnu.org>
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/sshproxy-dev>
List-Post: <mailto:sshproxy-dev@nongnu.org>
List-Help: <mailto:sshproxy-dev-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Sep 2005 15:40:00 -0000

Index: sshproxy/SSHproxy/pwdb/mysql.py
diff -u sshproxy/SSHproxy/pwdb/mysql.py:1.2 sshproxy/SSHproxy/pwdb/mysql.py:1.3
--- sshproxy/SSHproxy/pwdb/mysql.py:1.2	Thu Sep 22 08:58:31 2005
+++ sshproxy/SSHproxy/pwdb/mysql.py	Fri Sep 23 15:35:45 2005
@@ -33,6 +33,7 @@
 
 class MySQLPwDB(simple.SimplePwDB):
     def __init__(self):
+        self.db = db
         q_sites = """
             select id, name, ip_address, port, location
                 from site order by name
@@ -56,10 +57,63 @@
                                               port=port,
                                               location=location,
                                               user_list=user_list))
+	    #print 'site ' + name + ' grants access to ' + user_list.__repr__()
 
         simple.SimplePwDB.__init__(self, site_list)
-        db.close()
-
-
 
+    #def __del__(self):
+    #    db.close()
 
+    def get_site(self, sid):
+        user = None
+	if sid.find('@') >= 0:
+	    user, sid = sid.split('@')
+        if not user:
+            q_user = """
+            select uid from site,user where site.id = user.site_id and site.name = '%s'
+ order by `primary` desc limit 1            
+"""
+            users = db.cursor()
+            users.execute(q_user % sid)
+            user = users.fetchone()
+            if not user or not len(user):
+                return None, None
+            user = user[0]
+            users.close()
+	if not self.can_connect(user, sid):
+	    print 'User \'%s\' is not allowed to connect to \'%s\'' % (user, sid)
+            return None, None
+	return self.sites[sid].default_user(), self.sites[sid]
+
+    def is_allowed(self, user, passwd):
+        q_access = """
+        select count(*) from login where uid = '%s' and `password` = '%s'"""
+        logins = db.cursor()
+        logins.execute(q_access % (user, passwd))
+        login = logins.fetchone()[0]
+        logins.close()
+        if login:
+            self.login = user
+	return login
+       
+    def can_connect(self, user, site):
+        q_group = """
+        select count(*) 
+        from login,login_profile,profile,profile_sgroup,sgroup,sgroup_site,site,user 
+        where login.uid = '%s' 
+          and login.id = login_profile.login_id 
+          and login_profile.profile_id = profile.id 
+          and profile.id = profile_sgroup.profile_id 
+          and profile_sgroup.sgroup_id = sgroup.id
+          and sgroup.id = sgroup_site.sgroup_id
+          and sgroup_site.site_id = site.id
+          and site.name = '%s'
+          and user.site_id = site.id
+          and user.uid = '%s'  
+        """
+	group = db.cursor()
+	group.execute(q_group % (self.login, site, user))
+	gr = group.fetchone()[0]
+        print 'requete can_connect: %d' % gr
+	group.close()
+	return gr



From MAILER-DAEMON Fri Sep 23 11:41:15 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1EIpfm-0001M9-T2
	for mharc-sshproxy-dev@gnu.org; Fri, 23 Sep 2005 11:41:15 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1EIpfj-0001KN-MQ
	for sshproxy-dev@nongnu.org; Fri, 23 Sep 2005 11:41:12 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1EIpfh-0001JF-OP
	for sshproxy-dev@nongnu.org; Fri, 23 Sep 2005 11:41:10 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1EIpfh-0001J6-Ef
	for sshproxy-dev@nongnu.org; Fri, 23 Sep 2005 11:41:09 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1EIpfA-0005rC-SI
	for sshproxy-dev@nongnu.org; Fri, 23 Sep 2005 11:40:36 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.36 #1 (Debian))
	id 1EIpaX-0004F0-00
	for <sshproxy-dev@nongnu.org>; Fri, 23 Sep 2005 11:35:49 -0400
To: sshproxy-dev@nongnu.org
From: Pierre-Yves Rofes <py@wcube.org>
Message-Id: <E1EIpaX-0004F0-00@savannah.gnu.org>
Date: Fri, 23 Sep 2005 11:35:49 -0400
Subject: [sshproxy-dev] Changes to sshproxy/SSHproxy/server/server.py
X-BeenThere: sshproxy-dev@nongnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SSH proxy developer list <sshproxy-dev.nongnu.org>
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/sshproxy-dev>
List-Post: <mailto:sshproxy-dev@nongnu.org>
List-Help: <mailto:sshproxy-dev-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Sep 2005 15:41:13 -0000

Index: sshproxy/SSHproxy/server/server.py
diff -u sshproxy/SSHproxy/server/server.py:1.2 sshproxy/SSHproxy/server/server.py:1.3
--- sshproxy/SSHproxy/server/server.py:1.2	Mon Jul 25 21:41:37 2005
+++ sshproxy/SSHproxy/server/server.py	Fri Sep 23 15:35:45 2005
@@ -42,8 +42,10 @@
         return paramiko.OPEN_FAILED_ADMINISTRATIVELY_PROHIBITED
 
     def check_auth_password(self, username, password):
-        if login.login(username=username, password=password):
+        if pwdb.is_allowed(user=username, passwd=password):
             return paramiko.AUTH_SUCCESSFUL
+        #if login.login(username=username, password=password):
+        #    return paramiko.AUTH_SUCCESSFUL
         return paramiko.AUTH_FAILED
 
     def check_auth_publickey(self, username, key):



From MAILER-DAEMON Fri Sep 23 11:53:47 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1EIprQ-0000Y8-Rf
	for mharc-sshproxy-dev@gnu.org; Fri, 23 Sep 2005 11:53:18 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1EIprK-0000U7-0y
	for sshproxy-dev@nongnu.org; Fri, 23 Sep 2005 11:53:11 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1EIprE-0000N7-AJ
	for sshproxy-dev@nongnu.org; Fri, 23 Sep 2005 11:53:04 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1EIprD-0000LT-TH
	for sshproxy-dev@nongnu.org; Fri, 23 Sep 2005 11:53:03 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1EIpqp-000797-Gx
	for sshproxy-dev@nongnu.org; Fri, 23 Sep 2005 11:52:39 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.36 #1 (Debian))
	id 1EIpaa-0004Ft-00
	for <sshproxy-dev@nongnu.org>; Fri, 23 Sep 2005 11:35:52 -0400
To: sshproxy-dev@nongnu.org
From: Pierre-Yves Rofes <py@wcube.org>
Message-Id: <E1EIpaa-0004Ft-00@savannah.gnu.org>
Date: Fri, 23 Sep 2005 11:35:52 -0400
Subject: [sshproxy-dev] Changes to sshproxy/sql/sshproxy.sql
X-BeenThere: sshproxy-dev@nongnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SSH proxy developer list <sshproxy-dev.nongnu.org>
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/sshproxy-dev>
List-Post: <mailto:sshproxy-dev@nongnu.org>
List-Help: <mailto:sshproxy-dev-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Sep 2005 15:53:14 -0000

Index: sshproxy/sql/sshproxy.sql
diff -u sshproxy/sql/sshproxy.sql:1.1 sshproxy/sql/sshproxy.sql:1.2
--- sshproxy/sql/sshproxy.sql:1.1	Thu Jul 21 09:43:36 2005
+++ sshproxy/sql/sshproxy.sql	Fri Sep 23 15:35:45 2005
@@ -29,6 +29,24 @@
 -- 
 
 INSERT INTO `login` VALUES (1, 'david', 'david', '');
+INSERT INTO `login` VALUES (3, 'py', 'test', 1);
+
+
+-- --------------------------------------------------------
+
+--
+-- Structure de la table `login_profile`
+-- 
+
+CREATE TABLE `login_profile` (
+  `login_id` int(10) unsigned NOT NULL default '0',
+  `profile_id` int(10) unsigned NOT NULL default '0',
+  PRIMARY KEY (`login_id`,`profile_id`)
+) TYPE=MyISAM COMMENT='login profil link';
+
+--
+-- Contnu de la table `login_profile`
+--
 
 -- --------------------------------------------------------
 
@@ -141,3 +159,4 @@
 
 INSERT INTO `user` VALUES (1, 1, 'romain', 'rom', 1);
 INSERT INTO `user` VALUES (2, 2, 'david', 'dav', 1);
+INSERT INTO `user` VALUES (3, 3, 'py', 'test', 1);



From MAILER-DAEMON Fri Sep 23 11:56:10 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1EIpuE-0001v2-8W
	for mharc-sshproxy-dev@gnu.org; Fri, 23 Sep 2005 11:56:10 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1EIprR-0000Xo-7l
	for sshproxy-dev@nongnu.org; Fri, 23 Sep 2005 11:53:18 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1EIprG-0000Q2-M6
	for sshproxy-dev@nongnu.org; Fri, 23 Sep 2005 11:53:06 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1EIprF-0000LT-TH
	for sshproxy-dev@nongnu.org; Fri, 23 Sep 2005 11:53:05 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1EIpoy-00071h-98
	for sshproxy-dev@nongnu.org; Fri, 23 Sep 2005 11:50:44 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.36 #1 (Debian))
	id 1EIpaW-0004EU-00
	for <sshproxy-dev@nongnu.org>; Fri, 23 Sep 2005 11:35:48 -0400
To: sshproxy-dev@nongnu.org
From: Pierre-Yves Rofes <py@wcube.org>
Message-Id: <E1EIpaW-0004EU-00@savannah.gnu.org>
Date: Fri, 23 Sep 2005 11:35:48 -0400
Subject: [sshproxy-dev] Changes to sshproxy/SSHproxy/pwdb/simple.py
X-BeenThere: sshproxy-dev@nongnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SSH proxy developer list <sshproxy-dev.nongnu.org>
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/sshproxy-dev>
List-Post: <mailto:sshproxy-dev@nongnu.org>
List-Help: <mailto:sshproxy-dev-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Sep 2005 15:56:08 -0000

Index: sshproxy/SSHproxy/pwdb/simple.py
diff -u sshproxy/SSHproxy/pwdb/simple.py:1.1 sshproxy/SSHproxy/pwdb/simple.py:1.2
--- sshproxy/SSHproxy/pwdb/simple.py:1.1	Thu Jul 21 09:43:36 2005
+++ sshproxy/SSHproxy/pwdb/simple.py	Fri Sep 23 15:35:45 2005
@@ -91,4 +91,8 @@
     def list_sites(self):
         return self.sites.keys()
 
+    def is_allowed(self, user, passwd):
+        return true
 
+    def can_connect(self, user, site):
+        return true



From MAILER-DAEMON Mon Sep 26 05:29:50 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1EJpId-00019g-A8
	for mharc-sshproxy-dev@gnu.org; Mon, 26 Sep 2005 05:29:27 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1EJpIR-00013e-I5
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 05:29:16 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1EJpAA-0000K9-Nd
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 05:21:00 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1EJp3y-0007N4-09
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 05:14:19 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1EJp3x-000504-R6
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 05:14:17 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.36 #1 (Debian))
	id 1EJp3x-0004zc-00
	for <sshproxy-dev@nongnu.org>; Mon, 26 Sep 2005 05:14:17 -0400
To: sshproxy-dev@nongnu.org
From: David Guerizec <david@guerizec.net>
Message-Id: <E1EJp3x-0004zc-00@savannah.gnu.org>
Date: Mon, 26 Sep 2005 05:14:17 -0400
Subject: [sshproxy-dev] Changes to sshproxy/SSHproxy/server/server.py
X-BeenThere: sshproxy-dev@nongnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SSH proxy developer list <sshproxy-dev.nongnu.org>
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/sshproxy-dev>
List-Post: <mailto:sshproxy-dev@nongnu.org>
List-Help: <mailto:sshproxy-dev-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Sep 2005 09:29:21 -0000

Index: sshproxy/SSHproxy/server/server.py
diff -u sshproxy/SSHproxy/server/server.py:1.3 sshproxy/SSHproxy/server/server.py:1.4
--- sshproxy/SSHproxy/server/server.py:1.3	Fri Sep 23 15:35:45 2005
+++ sshproxy/SSHproxy/server/server.py	Mon Sep 26 09:14:16 2005
@@ -42,14 +42,14 @@
         return paramiko.OPEN_FAILED_ADMINISTRATIVELY_PROHIBITED
 
     def check_auth_password(self, username, password):
-        if pwdb.is_allowed(user=username, passwd=password):
+        if pwdb.is_allowed(username=username, password=password):
             return paramiko.AUTH_SUCCESSFUL
         #if login.login(username=username, password=password):
         #    return paramiko.AUTH_SUCCESSFUL
         return paramiko.AUTH_FAILED
 
     def check_auth_publickey(self, username, key):
-        if login.login(username=username, key=key):
+        if pwd.is_allowed(username=username, key=key):
             return paramiko.AUTH_SUCCESSFUL
         return paramiko.AUTH_FAILED
 



From MAILER-DAEMON Mon Sep 26 05:32:17 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1EJpDy-0000fq-74
	for mharc-sshproxy-dev@gnu.org; Mon, 26 Sep 2005 05:24:39 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1EJp3J-0008Hn-Is
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 05:13:38 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1EJp1L-00084D-JB
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 05:11:37 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1EJow7-0007N4-PY
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 05:06:12 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1EJovY-0004Jw-KP
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 05:05:36 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.36 #1 (Debian))
	id 1EJovX-0000s4-00
	for <sshproxy-dev@nongnu.org>; Mon, 26 Sep 2005 05:05:35 -0400
To: sshproxy-dev@nongnu.org
From: David Guerizec <david@guerizec.net>
Message-Id: <E1EJovX-0000s4-00@savannah.gnu.org>
Date: Mon, 26 Sep 2005 05:05:36 -0400
Subject: [sshproxy-dev] sshproxy SSHproxy/pwdb/mysql.py scripts/add_gro...
X-BeenThere: sshproxy-dev@nongnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SSH proxy developer list <sshproxy-dev.nongnu.org>
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/sshproxy-dev>
List-Post: <mailto:sshproxy-dev@nongnu.org>
List-Help: <mailto:sshproxy-dev-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Sep 2005 09:24:29 -0000

CVSROOT:	/cvsroot/sshproxy
Module name:	sshproxy
Branch: 	
Changes by:	David Guerizec <dguerizec@savannah.gnu.org>	05/09/26 09:05:31

Modified files:
	SSHproxy/pwdb  : mysql.py 
Added files:
	scripts        : add_group add_profile 

Log message:
	Tools to manage database

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/sshproxy/sshproxy/SSHproxy/pwdb/mysql.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/sshproxy/sshproxy/scripts/add_group?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/sshproxy/sshproxy/scripts/add_profile?rev=1.1




From MAILER-DAEMON Mon Sep 26 05:33:35 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1EJpLg-0002PM-Q2
	for mharc-sshproxy-dev@gnu.org; Mon, 26 Sep 2005 05:32:37 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1EJpIU-000151-P2
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 05:29:19 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1EJpH6-0000uH-2P
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 05:28:20 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1EJp4G-0007N4-Od
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 05:14:38 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1EJp3y-00050L-Rm
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 05:14:18 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.36 #1 (Debian))
	id 1EJp3y-000507-00
	for <sshproxy-dev@nongnu.org>; Mon, 26 Sep 2005 05:14:18 -0400
To: sshproxy-dev@nongnu.org
From: David Guerizec <david@guerizec.net>
Message-Id: <E1EJp3y-000507-00@savannah.gnu.org>
Date: Mon, 26 Sep 2005 05:14:18 -0400
Subject: [sshproxy-dev] sshproxy/SSHproxy server/session.py server/serv...
X-BeenThere: sshproxy-dev@nongnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SSH proxy developer list <sshproxy-dev.nongnu.org>
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/sshproxy-dev>
List-Post: <mailto:sshproxy-dev@nongnu.org>
List-Help: <mailto:sshproxy-dev-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Sep 2005 09:32:26 -0000

CVSROOT:	/cvsroot/sshproxy
Module name:	sshproxy
Branch: 	
Changes by:	David Guerizec <dguerizec@savannah.gnu.org>	05/09/26 09:14:16

Modified files:
	SSHproxy/server: session.py server.py 
	SSHproxy/client: ssh.py 

Log message:
	Get rid of TABs

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/sshproxy/sshproxy/SSHproxy/server/session.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/sshproxy/sshproxy/SSHproxy/server/server.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/sshproxy/sshproxy/SSHproxy/client/ssh.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text




From MAILER-DAEMON Mon Sep 26 05:33:50 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1EJpMN-0002kj-S7
	for mharc-sshproxy-dev@gnu.org; Mon, 26 Sep 2005 05:33:20 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1EJpLF-00027w-Q2
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 05:32:10 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1EJpGc-0000rV-8S
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 05:27:25 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1EJp4O-0007N4-K2
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 05:14:45 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1EJp3x-0004zy-7l
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 05:14:17 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.36 #1 (Debian))
	id 1EJp3w-0004zO-00
	for <sshproxy-dev@nongnu.org>; Mon, 26 Sep 2005 05:14:16 -0400
To: sshproxy-dev@nongnu.org
From: David Guerizec <david@guerizec.net>
Message-Id: <E1EJp3w-0004zO-00@savannah.gnu.org>
Date: Mon, 26 Sep 2005 05:14:16 -0400
Subject: [sshproxy-dev] Changes to sshproxy/SSHproxy/client/ssh.py
X-BeenThere: sshproxy-dev@nongnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SSH proxy developer list <sshproxy-dev.nongnu.org>
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/sshproxy-dev>
List-Post: <mailto:sshproxy-dev@nongnu.org>
List-Help: <mailto:sshproxy-dev-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Sep 2005 09:33:15 -0000

Index: sshproxy/SSHproxy/client/ssh.py
diff -u sshproxy/SSHproxy/client/ssh.py:1.5 sshproxy/SSHproxy/client/ssh.py:1.6
--- sshproxy/SSHproxy/client/ssh.py:1.5	Fri Sep 23 15:35:45 2005
+++ sshproxy/SSHproxy/client/ssh.py	Mon Sep 26 09:14:16 2005
@@ -80,7 +80,7 @@
 
     def connect(self, username, password):
         try:
-            self.hostkey = None
+            #self.hostkey = None
             self.transport.connect(username=username,
                                    password=password,
                                    hostkey=self.hostkey)
@@ -171,14 +171,14 @@
                         # increment the following number if only one Ctrl-K
                         # interferes with another application
                         if CK >= 1:
-			    self.reset_term()
-			    self.fdout.write("\n")
-			    self.cmd.cmdloop()
-			    fcntl.fcntl(self.fdin, fcntl.F_SETFL, os.O_NDELAY)
-			    self.set_term()
+                            self.reset_term()
+                            self.fdout.write("\n")
+                            self.cmd.cmdloop()
+                            fcntl.fcntl(self.fdin, fcntl.F_SETFL, os.O_NDELAY)
+                            self.set_term()
                             # send ^L to clear screen and restore cmd line
-			    self.session.send(chr(12))
-			    CK = 0
+                            self.session.send(chr(12))
+                            CK = 0
                         continue
 
                     self.session.send(x)



From MAILER-DAEMON Mon Sep 26 05:34:45 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1EJpM2-0002aP-5E
	for mharc-sshproxy-dev@gnu.org; Mon, 26 Sep 2005 05:32:58 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1EJpIO-00012Y-1k
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 05:29:13 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1EJpBt-0000Sq-Rn
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 05:22:30 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1EJp4K-0007N4-Ek
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 05:14:42 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1EJp3y-00050D-BQ
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 05:14:18 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.36 #1 (Debian))
	id 1EJp3x-0004zt-00
	for <sshproxy-dev@nongnu.org>; Mon, 26 Sep 2005 05:14:17 -0400
To: sshproxy-dev@nongnu.org
From: David Guerizec <david@guerizec.net>
Message-Id: <E1EJp3x-0004zt-00@savannah.gnu.org>
Date: Mon, 26 Sep 2005 05:14:17 -0400
Subject: [sshproxy-dev] Changes to sshproxy/SSHproxy/server/session.py
X-BeenThere: sshproxy-dev@nongnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SSH proxy developer list <sshproxy-dev.nongnu.org>
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/sshproxy-dev>
List-Post: <mailto:sshproxy-dev@nongnu.org>
List-Help: <mailto:sshproxy-dev-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Sep 2005 09:32:53 -0000

Index: sshproxy/SSHproxy/server/session.py
diff -u sshproxy/SSHproxy/server/session.py:1.2 sshproxy/SSHproxy/server/session.py:1.3
--- sshproxy/SSHproxy/server/session.py:1.2	Fri Sep 23 15:35:45 2005
+++ sshproxy/SSHproxy/server/session.py	Mon Sep 26 09:14:16 2005
@@ -30,7 +30,7 @@
 
     def connect(self, sid):
         user, site = self.pwdb.get_site(sid)
-	SSHproxy.db = self.pwdb.db
+        SSHproxy.db = self.pwdb.db
         if not user or not site:
             return None
         hostname = site.ip_address



From MAILER-DAEMON Mon Sep 26 05:41:04 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1EJpTr-0005EM-3q
	for mharc-sshproxy-dev@gnu.org; Mon, 26 Sep 2005 05:41:03 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1EJpMC-0002f2-FQ
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 05:33:09 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1EJpIP-00012f-B3
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 05:29:27 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1EJoxG-0007N4-5l
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 05:07:24 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1EJovX-0004Jk-AG
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 05:05:35 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.36 #1 (Debian))
	id 1EJovV-0000rQ-00
	for <sshproxy-dev@nongnu.org>; Mon, 26 Sep 2005 05:05:33 -0400
To: sshproxy-dev@nongnu.org
From: David Guerizec <david@guerizec.net>
Message-Id: <E1EJovV-0000rQ-00@savannah.gnu.org>
Date: Mon, 26 Sep 2005 05:05:33 -0400
Subject: [sshproxy-dev] Changes to sshproxy/scripts/add_group
X-BeenThere: sshproxy-dev@nongnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SSH proxy developer list <sshproxy-dev.nongnu.org>
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/sshproxy-dev>
List-Post: <mailto:sshproxy-dev@nongnu.org>
List-Help: <mailto:sshproxy-dev-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Sep 2005 09:40:59 -0000





From MAILER-DAEMON Mon Sep 26 05:46:14 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1EJpJ5-0001LP-E8
	for mharc-sshproxy-dev@gnu.org; Mon, 26 Sep 2005 05:29:55 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1EJpIt-0001F4-V4
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 05:29:44 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1EJp30-0008DH-Oj
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 05:13:20 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1EJox8-0007N4-QF
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 05:07:17 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1EJovY-0004Jr-2T
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 05:05:36 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.36 #1 (Debian))
	id 1EJovX-0000ro-00
	for <sshproxy-dev@nongnu.org>; Mon, 26 Sep 2005 05:05:35 -0400
To: sshproxy-dev@nongnu.org
From: David Guerizec <david@guerizec.net>
Message-Id: <E1EJovX-0000ro-00@savannah.gnu.org>
Date: Mon, 26 Sep 2005 05:05:35 -0400
Subject: [sshproxy-dev] Changes to sshproxy/scripts/add_profile
X-BeenThere: sshproxy-dev@nongnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SSH proxy developer list <sshproxy-dev.nongnu.org>
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/sshproxy-dev>
List-Post: <mailto:sshproxy-dev@nongnu.org>
List-Help: <mailto:sshproxy-dev-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Sep 2005 09:29:48 -0000





From MAILER-DAEMON Mon Sep 26 05:47:13 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1EJpXE-0006Jq-5y
	for mharc-sshproxy-dev@gnu.org; Mon, 26 Sep 2005 05:44:36 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1EJpXA-0006IU-3w
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 05:44:28 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1EJpX8-0006Hu-M7
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 05:44:27 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1EJpO9-0003ZH-97
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 05:35:09 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1EJouL-00049O-Dk
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 05:04:21 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.36 #1 (Debian))
	id 1EJouE-0000cX-00
	for <sshproxy-dev@nongnu.org>; Mon, 26 Sep 2005 05:04:14 -0400
To: sshproxy-dev@nongnu.org
From: David Guerizec <david@guerizec.net>
Message-Id: <E1EJouE-0000cX-00@savannah.gnu.org>
Date: Mon, 26 Sep 2005 05:04:14 -0400
Subject: [sshproxy-dev] sshproxy/scripts
X-BeenThere: sshproxy-dev@nongnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SSH proxy developer list <sshproxy-dev.nongnu.org>
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/sshproxy-dev>
List-Post: <mailto:sshproxy-dev@nongnu.org>
List-Help: <mailto:sshproxy-dev-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Sep 2005 09:44:29 -0000

CVSROOT:	/cvsroot/sshproxy
Module name:	sshproxy
Branch: 	
Changes by:	David Guerizec <dguerizec@savannah.gnu.org>	05/09/26 09:04:14

sshproxy/scripts

Update of /cvsroot/sshproxy/sshproxy/scripts
In directory savannah:/tmp/cvs-serv2367/scripts

Log Message:
Directory /cvsroot/sshproxy/sshproxy/scripts added to the repository




From MAILER-DAEMON Mon Sep 26 06:07:59 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1EJpqX-000470-MZ
	for mharc-sshproxy-dev@gnu.org; Mon, 26 Sep 2005 06:04:30 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1EJpXO-0006MY-M3
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 05:44:42 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1EJpOF-0003hw-0N
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 05:35:18 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1EJpO1-0003ZH-CM
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 05:35:01 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1EJovV-0004JL-O4
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 05:05:34 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.36 #1 (Debian))
	id 1EJovT-0000qy-00
	for <sshproxy-dev@nongnu.org>; Mon, 26 Sep 2005 05:05:31 -0400
To: sshproxy-dev@nongnu.org
From: David Guerizec <david@guerizec.net>
Message-Id: <E1EJovT-0000qy-00@savannah.gnu.org>
Date: Mon, 26 Sep 2005 05:05:31 -0400
Subject: [sshproxy-dev] Changes to sshproxy/SSHproxy/pwdb/mysql.py
X-BeenThere: sshproxy-dev@nongnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SSH proxy developer list <sshproxy-dev.nongnu.org>
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/sshproxy-dev>
List-Post: <mailto:sshproxy-dev@nongnu.org>
List-Help: <mailto:sshproxy-dev-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Sep 2005 10:04:26 -0000

Index: sshproxy/SSHproxy/pwdb/mysql.py
diff -u sshproxy/SSHproxy/pwdb/mysql.py:1.3 sshproxy/SSHproxy/pwdb/mysql.py:1.4
--- sshproxy/SSHproxy/pwdb/mysql.py:1.3	Fri Sep 23 15:35:45 2005
+++ sshproxy/SSHproxy/pwdb/mysql.py	Mon Sep 26 09:05:30 2005
@@ -57,17 +57,108 @@
                                               port=port,
                                               location=location,
                                               user_list=user_list))
-	    #print 'site ' + name + ' grants access to ' + user_list.__repr__()
+        #print 'site ' + name + ' grants access to ' + user_list.__repr__()
 
         simple.SimplePwDB.__init__(self, site_list)
 
-    #def __del__(self):
-    #    db.close()
+#    def __del__(self):
+#        db.close()
+
+    def list_profiles(self):
+        q_getprofile = """
+            select id, name from profile
+        """
+        profile = db.cursor()
+        profile.execute(q_getprofile)
+        p = []
+        for id, name in profile.fetchall():
+            p.append({ 'id': id, 'name': name })
+        profile.close()
+        return p
+
+    def get_profile(self, name):
+        q_getprofile = """
+            select id, name from profile where name = '%s'
+        """
+        profile = db.cursor()
+        profile.execute(q_getprofile % name)
+        p = profile.fetchone()
+        if not p or not len(p):
+            return None
+        profile.close()
+        return { 'id': p[0], 'name': p[1] }
+
+    def add_profile(self, name):
+        q_addprofile = """
+            insert into profile (name) values ('%s')
+        """
+        if self.get_profile(name):
+            return None
+        profile = db.cursor()
+        profile.execute(q_addprofile % name)
+        profile.close()
+        return 1
+        
+    def list_groups(self):
+        q_getgroup = """
+            select id, name from sgroup
+        """
+        group = db.cursor()
+        group.execute(q_getgroup)
+        p = []
+        for id, name in group.fetchall():
+            p.append({ 'id': id, 'name': name })
+        group.close()
+        return p
+
+    def get_group(self, name):
+        q_getgroup = """
+            select id, name from sgroup where name = '%s'
+        """
+        group = db.cursor()
+        group.execute(q_getgroup % name)
+        p = group.fetchone()
+        if not p or not len(p):
+            return None
+        group.close()
+        return { 'id': p[0], 'name': p[1] }
+
+    def add_group(self, name):
+        q_addgroup = """
+            insert into sgroup (name) values ('%s')
+        """
+        if self.get_group(name):
+            return None
+        group = db.cursor()
+        group.execute(q_addgroup % name)
+        group.close()
+        return 1
+        
+
+    def is_allowed(self, username, password=None, key=None):
+        """Check is a user is allowed to connect to the proxy."""
+        if password is None and key is None:
+            return None
+        if key is None:
+            q_access = """
+                select id from login where uid = '%s' and `password` = '%s'
+            """ % (username, password)
+        else:
+            q_access = """
+                select id from login where uid = '%s' and `key` = '%s'
+            """ % (username, key)
+        logins = db.cursor()
+        logins.execute(q_access)
+        login = logins.fetchone()[0]
+        logins.close()
+        if login:
+            self.login = username
+        return login
 
     def get_site(self, sid):
         user = None
-	if sid.find('@') >= 0:
-	    user, sid = sid.split('@')
+        if sid.find('@') >= 0:
+            user, sid = sid.split('@')
         if not user:
             q_user = """
             select uid from site,user where site.id = user.site_id and site.name = '%s'
@@ -80,26 +171,23 @@
                 return None, None
             user = user[0]
             users.close()
-	if not self.can_connect(user, sid):
-	    print 'User \'%s\' is not allowed to connect to \'%s\'' % (user, sid)
+        if not self.can_connect(user, sid):
+            print 'User \'%s\' is not allowed to connect to \'%s\'' % (user, sid)
             return None, None
-	return self.sites[sid].default_user(), self.sites[sid]
+        return self.sites[sid].default_user(), self.sites[sid]
 
-    def is_allowed(self, user, passwd):
-        q_access = """
-        select count(*) from login where uid = '%s' and `password` = '%s'"""
-        logins = db.cursor()
-        logins.execute(q_access % (user, passwd))
-        login = logins.fetchone()[0]
-        logins.close()
-        if login:
-            self.login = user
-	return login
-       
     def can_connect(self, user, site):
         q_group = """
         select count(*) 
-        from login,login_profile,profile,profile_sgroup,sgroup,sgroup_site,site,user 
+        from
+            login,
+            login_profile,
+            profile,
+            profile_sgroup,
+            sgroup,
+            sgroup_site,
+            site,
+            user 
         where login.uid = '%s' 
           and login.id = login_profile.login_id 
           and login_profile.profile_id = profile.id 
@@ -111,9 +199,10 @@
           and user.site_id = site.id
           and user.uid = '%s'  
         """
-	group = db.cursor()
-	group.execute(q_group % (self.login, site, user))
-	gr = group.fetchone()[0]
+        group = db.cursor()
+        group.execute(q_group % (self.login, site, user))
+        gr = group.fetchone()[0]
         print 'requete can_connect: %d' % gr
-	group.close()
-	return gr
+        group.close()
+        return gr
+



From MAILER-DAEMON Mon Sep 26 09:40:46 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1EJtDo-00070K-T6
	for mharc-sshproxy-dev@gnu.org; Mon, 26 Sep 2005 09:40:45 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1EJtDm-0006yL-3Y
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 09:40:42 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1EJtDh-0006vU-1S
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 09:40:40 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1EJtDf-0006Yl-8N
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 09:40:35 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1EJtDe-0005mm-QR
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 09:40:34 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.36 #1 (Debian))
	id 1EJt8y-0008Ra-00
	for <sshproxy-dev@nongnu.org>; Mon, 26 Sep 2005 09:35:44 -0400
To: sshproxy-dev@nongnu.org
From: David Guerizec <david@guerizec.net>
Message-Id: <E1EJt8y-0008Ra-00@savannah.gnu.org>
Date: Mon, 26 Sep 2005 09:35:44 -0400
Subject: [sshproxy-dev] sshproxy/SSHproxy/client ssh.py
X-BeenThere: sshproxy-dev@nongnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SSH proxy developer list <sshproxy-dev.nongnu.org>
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/sshproxy-dev>
List-Post: <mailto:sshproxy-dev@nongnu.org>
List-Help: <mailto:sshproxy-dev-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Sep 2005 13:40:43 -0000

CVSROOT:	/cvsroot/sshproxy
Module name:	sshproxy
Branch: 	
Changes by:	David Guerizec <dguerizec@savannah.gnu.org>	05/09/26 13:35:38

Modified files:
	SSHproxy/client: ssh.py 

Log message:
	Host key is not yet available

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/sshproxy/sshproxy/SSHproxy/client/ssh.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text




From MAILER-DAEMON Mon Sep 26 09:41:34 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1EJtEP-0007Rf-SC
	for mharc-sshproxy-dev@gnu.org; Mon, 26 Sep 2005 09:41:22 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1EJtEF-0007L5-4B
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 09:41:11 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1EJtEA-0007IS-E6
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 09:41:09 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1EJtE9-0006Yl-Mh
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 09:41:05 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1EJt92-0005M0-9z
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 09:35:56 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.36 #1 (Debian))
	id 1EJt8t-0008R3-00
	for <sshproxy-dev@nongnu.org>; Mon, 26 Sep 2005 09:35:39 -0400
To: sshproxy-dev@nongnu.org
From: David Guerizec <david@guerizec.net>
Message-Id: <E1EJt8t-0008R3-00@savannah.gnu.org>
Date: Mon, 26 Sep 2005 09:35:39 -0400
Subject: [sshproxy-dev] Changes to sshproxy/SSHproxy/client/ssh.py
X-BeenThere: sshproxy-dev@nongnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SSH proxy developer list <sshproxy-dev.nongnu.org>
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/sshproxy-dev>
List-Post: <mailto:sshproxy-dev@nongnu.org>
List-Help: <mailto:sshproxy-dev-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Sep 2005 13:41:15 -0000

Index: sshproxy/SSHproxy/client/ssh.py
diff -u sshproxy/SSHproxy/client/ssh.py:1.6 sshproxy/SSHproxy/client/ssh.py:1.7
--- sshproxy/SSHproxy/client/ssh.py:1.6	Mon Sep 26 09:14:16 2005
+++ sshproxy/SSHproxy/client/ssh.py	Mon Sep 26 13:35:37 2005
@@ -80,7 +80,7 @@
 
     def connect(self, username, password):
         try:
-            #self.hostkey = None
+            self.hostkey = None
             self.transport.connect(username=username,
                                    password=password,
                                    hostkey=self.hostkey)



From MAILER-DAEMON Mon Sep 26 10:57:14 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1EJuMj-0002ZX-UK
	for mharc-sshproxy-dev@gnu.org; Mon, 26 Sep 2005 10:54:01 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1EJuMe-0002X2-Ls
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 10:53:56 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1EJuMb-0002VI-H1
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 10:53:55 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1EJuJU-0001BH-3r
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 10:50:40 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1EJu6p-00063x-Vw
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 10:37:36 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.36 #1 (Debian))
	id 1EJu6n-000186-00
	for <sshproxy-dev@nongnu.org>; Mon, 26 Sep 2005 10:37:33 -0400
To: sshproxy-dev@nongnu.org
From: Pierre-Yves Rofes <py@wcube.org>
Message-Id: <E1EJu6n-000186-00@savannah.gnu.org>
Date: Mon, 26 Sep 2005 10:37:33 -0400
Subject: [sshproxy-dev] Changes to sshproxy/scripts/add_site
X-BeenThere: sshproxy-dev@nongnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SSH proxy developer list <sshproxy-dev.nongnu.org>
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/sshproxy-dev>
List-Post: <mailto:sshproxy-dev@nongnu.org>
List-Help: <mailto:sshproxy-dev-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Sep 2005 14:53:58 -0000





From MAILER-DAEMON Mon Sep 26 10:59:37 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1EJuRo-0004pS-7T
	for mharc-sshproxy-dev@gnu.org; Mon, 26 Sep 2005 10:59:16 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1EJuOD-0003IS-Rg
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 10:55:34 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1EJuO0-00039k-7c
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 10:55:20 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1EJuJT-0001BH-Uo
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 10:50:39 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1EJu6s-000657-HR
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 10:37:38 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.36 #1 (Debian))
	id 1EJu6q-00018q-00
	for <sshproxy-dev@nongnu.org>; Mon, 26 Sep 2005 10:37:36 -0400
To: sshproxy-dev@nongnu.org
From: Pierre-Yves Rofes <py@wcube.org>
Message-Id: <E1EJu6q-00018q-00@savannah.gnu.org>
Date: Mon, 26 Sep 2005 10:37:36 -0400
Subject: [sshproxy-dev] sshproxy/scripts add_site add_user
X-BeenThere: sshproxy-dev@nongnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SSH proxy developer list <sshproxy-dev.nongnu.org>
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/sshproxy-dev>
List-Post: <mailto:sshproxy-dev@nongnu.org>
List-Help: <mailto:sshproxy-dev-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Sep 2005 14:59:10 -0000

CVSROOT:	/cvsroot/sshproxy
Module name:	sshproxy
Branch: 	
Changes by:	Pierre-Yves Rofes <pyrofes@savannah.gnu.org>	05/09/26 14:37:33

Added files:
	scripts        : add_site add_user 

Log message:
	Added scripts for adding sites and users

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/sshproxy/sshproxy/scripts/add_site?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/sshproxy/sshproxy/scripts/add_user?rev=1.1




From MAILER-DAEMON Mon Sep 26 11:04:45 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1EJuX6-0007Cd-St
	for mharc-sshproxy-dev@gnu.org; Mon, 26 Sep 2005 11:04:44 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1EJuRq-0004qO-Rb
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 10:59:19 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1EJuOD-0003I9-DI
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 10:55:33 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1EJuJT-0001BH-2e
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 10:50:39 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1EJu7F-00069z-Sp
	for sshproxy-dev@nongnu.org; Mon, 26 Sep 2005 10:38:02 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.36 #1 (Debian))
	id 1EJu6o-00018S-00
	for <sshproxy-dev@nongnu.org>; Mon, 26 Sep 2005 10:37:34 -0400
To: sshproxy-dev@nongnu.org
From: Pierre-Yves Rofes <py@wcube.org>
Message-Id: <E1EJu6o-00018S-00@savannah.gnu.org>
Date: Mon, 26 Sep 2005 10:37:34 -0400
Subject: [sshproxy-dev] Changes to sshproxy/scripts/add_user
X-BeenThere: sshproxy-dev@nongnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SSH proxy developer list <sshproxy-dev.nongnu.org>
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/sshproxy-dev>
List-Post: <mailto:sshproxy-dev@nongnu.org>
List-Help: <mailto:sshproxy-dev-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Sep 2005 15:04:43 -0000





From MAILER-DAEMON Tue Sep 27 05:07:14 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1EKBJf-0006cK-DT
	for mharc-sshproxy-dev@gnu.org; Tue, 27 Sep 2005 05:00:01 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1EKB8O-00063v-Ff
	for sshproxy-dev@nongnu.org; Tue, 27 Sep 2005 04:48:24 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1EKB6r-0005lx-CY
	for sshproxy-dev@nongnu.org; Tue, 27 Sep 2005 04:46:46 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1EKB6K-0005Tv-3z
	for sshproxy-dev@nongnu.org; Tue, 27 Sep 2005 04:46:13 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1EKAs9-0003Sg-QV
	for sshproxy-dev@nongnu.org; Tue, 27 Sep 2005 04:31:34 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.36 #1 (Debian))
	id 1EKAqX-0005eB-00
	for <sshproxy-dev@nongnu.org>; Tue, 27 Sep 2005 04:29:53 -0400
To: sshproxy-dev@nongnu.org
From: Pierre-Yves Rofes <py@wcube.org>
Message-Id: <E1EKAqX-0005eB-00@savannah.gnu.org>
Date: Tue, 27 Sep 2005 04:29:53 -0400
Subject: [sshproxy-dev] Changes to sshproxy/scripts/add_login_profile
X-BeenThere: sshproxy-dev@nongnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SSH proxy developer list <sshproxy-dev.nongnu.org>
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/sshproxy-dev>
List-Post: <mailto:sshproxy-dev@nongnu.org>
List-Help: <mailto:sshproxy-dev-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Sep 2005 08:59:51 -0000





From MAILER-DAEMON Tue Sep 27 05:08:29 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1EKBRs-0007RZ-D6
	for mharc-sshproxy-dev@gnu.org; Tue, 27 Sep 2005 05:08:28 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1EKBRn-0007PZ-Ln
	for sshproxy-dev@nongnu.org; Tue, 27 Sep 2005 05:08:24 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1EKBRl-0007OT-C2
	for sshproxy-dev@nongnu.org; Tue, 27 Sep 2005 05:08:22 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1EKB6b-0005Tv-QV
	for sshproxy-dev@nongnu.org; Tue, 27 Sep 2005 04:46:31 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1EKArp-0003QJ-7h
	for sshproxy-dev@nongnu.org; Tue, 27 Sep 2005 04:31:13 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.36 #1 (Debian))
	id 1EKAqX-0005eT-00
	for <sshproxy-dev@nongnu.org>; Tue, 27 Sep 2005 04:29:53 -0400
To: sshproxy-dev@nongnu.org
From: Pierre-Yves Rofes <py@wcube.org>
Message-Id: <E1EKAqX-0005eT-00@savannah.gnu.org>
Date: Tue, 27 Sep 2005 04:29:53 -0400
Subject: [sshproxy-dev] Changes to sshproxy/scripts/add_profile_group
X-BeenThere: sshproxy-dev@nongnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SSH proxy developer list <sshproxy-dev.nongnu.org>
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/sshproxy-dev>
List-Post: <mailto:sshproxy-dev@nongnu.org>
List-Help: <mailto:sshproxy-dev-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Sep 2005 09:08:25 -0000





From MAILER-DAEMON Tue Sep 27 05:09:17 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1EKBSf-0007fw-8G
	for mharc-sshproxy-dev@gnu.org; Tue, 27 Sep 2005 05:09:17 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1EKBSd-0007f2-NS
	for sshproxy-dev@nongnu.org; Tue, 27 Sep 2005 05:09:15 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1EKBSc-0007eh-Hi
	for sshproxy-dev@nongnu.org; Tue, 27 Sep 2005 05:09:14 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1EKB6w-0005Tv-2G
	for sshproxy-dev@nongnu.org; Tue, 27 Sep 2005 04:46:50 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1EKAqY-0003K1-Jj
	for sshproxy-dev@nongnu.org; Tue, 27 Sep 2005 04:29:54 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.36 #1 (Debian))
	id 1EKAqW-0005dd-00
	for <sshproxy-dev@nongnu.org>; Tue, 27 Sep 2005 04:29:52 -0400
To: sshproxy-dev@nongnu.org
From: Pierre-Yves Rofes <py@wcube.org>
Message-Id: <E1EKAqW-0005dd-00@savannah.gnu.org>
Date: Tue, 27 Sep 2005 04:29:52 -0400
Subject: [sshproxy-dev] Changes to sshproxy/scripts/add_group_site
X-BeenThere: sshproxy-dev@nongnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SSH proxy developer list <sshproxy-dev.nongnu.org>
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/sshproxy-dev>
List-Post: <mailto:sshproxy-dev@nongnu.org>
List-Help: <mailto:sshproxy-dev-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Sep 2005 09:09:16 -0000





From MAILER-DAEMON Tue Sep 27 05:13:53 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1EKBX6-0000mY-Dw
	for mharc-sshproxy-dev@gnu.org; Tue, 27 Sep 2005 05:13:52 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1EKBWf-0000Sn-7Y
	for sshproxy-dev@nongnu.org; Tue, 27 Sep 2005 05:13:25 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1EKBLa-0006iU-NT
	for sshproxy-dev@nongnu.org; Tue, 27 Sep 2005 05:02:01 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1EKB6Y-0005Tv-5X
	for sshproxy-dev@nongnu.org; Tue, 27 Sep 2005 04:46:26 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1EKArq-0003QR-Mf
	for sshproxy-dev@nongnu.org; Tue, 27 Sep 2005 04:31:14 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.36 #1 (Debian))
	id 1EKAqW-0005du-00
	for <sshproxy-dev@nongnu.org>; Tue, 27 Sep 2005 04:29:52 -0400
To: sshproxy-dev@nongnu.org
From: Pierre-Yves Rofes <py@wcube.org>
Message-Id: <E1EKAqW-0005du-00@savannah.gnu.org>
Date: Tue, 27 Sep 2005 04:29:52 -0400
Subject: [sshproxy-dev] Changes to sshproxy/scripts/add_login
X-BeenThere: sshproxy-dev@nongnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SSH proxy developer list <sshproxy-dev.nongnu.org>
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/sshproxy-dev>
List-Post: <mailto:sshproxy-dev@nongnu.org>
List-Help: <mailto:sshproxy-dev-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Sep 2005 09:13:49 -0000





From MAILER-DAEMON Tue Sep 27 05:13:53 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1EKBTd-00080g-S8
	for mharc-sshproxy-dev@gnu.org; Tue, 27 Sep 2005 05:10:20 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1EKB7T-0005x4-Bo
	for sshproxy-dev@nongnu.org; Tue, 27 Sep 2005 04:47:24 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1EKB7H-0005sw-Nl
	for sshproxy-dev@nongnu.org; Tue, 27 Sep 2005 04:47:20 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1EKB2F-0005Tv-Sg
	for sshproxy-dev@nongnu.org; Tue, 27 Sep 2005 04:42:04 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1EKAwf-0003nR-WE
	for sshproxy-dev@nongnu.org; Tue, 27 Sep 2005 04:36:14 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.36 #1 (Debian))
	id 1EKAqX-0005ec-00
	for <sshproxy-dev@nongnu.org>; Tue, 27 Sep 2005 04:29:53 -0400
To: sshproxy-dev@nongnu.org
From: Pierre-Yves Rofes <py@wcube.org>
Message-Id: <E1EKAqX-0005ec-00@savannah.gnu.org>
Date: Tue, 27 Sep 2005 04:29:53 -0400
Subject: [sshproxy-dev] sshproxy/scripts add_group_site add_login add_l...
X-BeenThere: sshproxy-dev@nongnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SSH proxy developer list <sshproxy-dev.nongnu.org>
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/sshproxy-dev>
List-Post: <mailto:sshproxy-dev@nongnu.org>
List-Help: <mailto:sshproxy-dev-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Sep 2005 09:09:59 -0000

CVSROOT:	/cvsroot/sshproxy
Module name:	sshproxy
Branch: 	
Changes by:	Pierre-Yves Rofes <pyrofes@savannah.gnu.org>	05/09/27 08:29:52

Added files:
	scripts        : add_group_site add_login add_login_profile 
	                 add_profile_group 

Log message:
	Added some scripts for managing SQL database

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/sshproxy/sshproxy/scripts/add_group_site?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/sshproxy/sshproxy/scripts/add_login?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/sshproxy/sshproxy/scripts/add_login_profile?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/sshproxy/sshproxy/scripts/add_profile_group?rev=1.1




From MAILER-DAEMON Tue Sep 27 10:05:09 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1EKG4M-0001FD-6U
	for mharc-sshproxy-dev@gnu.org; Tue, 27 Sep 2005 10:04:30 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1EKG3l-0000w2-Vq
	for sshproxy-dev@nongnu.org; Tue, 27 Sep 2005 10:03:54 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1EKG3h-0000ti-D2
	for sshproxy-dev@nongnu.org; Tue, 27 Sep 2005 10:03:52 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1EKG2H-0007b2-DX
	for sshproxy-dev@nongnu.org; Tue, 27 Sep 2005 10:02:21 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1EKFw0-0005QL-Ke
	for sshproxy-dev@nongnu.org; Tue, 27 Sep 2005 09:55:53 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.36 #1 (Debian))
	id 1EKFvw-0007Fr-00
	for <sshproxy-dev@nongnu.org>; Tue, 27 Sep 2005 09:55:48 -0400
To: sshproxy-dev@nongnu.org
From: Pierre-Yves Rofes <py@wcube.org>
Message-Id: <E1EKFvw-0007Fr-00@savannah.gnu.org>
Date: Tue, 27 Sep 2005 09:55:48 -0400
Subject: [sshproxy-dev] Changes to sshproxy/SSHproxy/pwdb/mysql.py
X-BeenThere: sshproxy-dev@nongnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SSH proxy developer list <sshproxy-dev.nongnu.org>
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/sshproxy-dev>
List-Post: <mailto:sshproxy-dev@nongnu.org>
List-Help: <mailto:sshproxy-dev-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Sep 2005 14:03:58 -0000

Index: sshproxy/SSHproxy/pwdb/mysql.py
diff -u sshproxy/SSHproxy/pwdb/mysql.py:1.4 sshproxy/SSHproxy/pwdb/mysql.py:1.5
--- sshproxy/SSHproxy/pwdb/mysql.py:1.4	Mon Sep 26 09:05:30 2005
+++ sshproxy/SSHproxy/pwdb/mysql.py	Tue Sep 27 13:55:48 2005
@@ -42,7 +42,6 @@
             select id, site_id, uid, password, `primary`
                 from user where site_id = %d
             """
-
         site_list = []
         sites = db.cursor()
         sites.execute(q_sites)
@@ -57,12 +56,12 @@
                                               port=port,
                                               location=location,
                                               user_list=user_list))
-        #print 'site ' + name + ' grants access to ' + user_list.__repr__()
-
         simple.SimplePwDB.__init__(self, site_list)
 
-#    def __del__(self):
-#        db.close()
+    #def __del__(self):
+    #   db.close()
+
+################## functions for script/add_profile #####################
 
     def list_profiles(self):
         q_getprofile = """
@@ -98,7 +97,9 @@
         profile.execute(q_addprofile % name)
         profile.close()
         return 1
-        
+
+################ functions for scripts/add_group ########################
+
     def list_groups(self):
         q_getgroup = """
             select id, name from sgroup
@@ -133,7 +134,191 @@
         group.execute(q_addgroup % name)
         group.close()
         return 1
-        
+
+################ functions for scripts/add_site #######################
+
+    def list_sites(self):
+        q_listsite = """
+            select id, name, ip_address, port, location from site
+        """
+        site = db.cursor()
+        site.execute(q_listsite)
+        p = []
+        for id, name, ip_address, port, location in site.fetchall():
+            p.append({ 'id': id, 'name': name, 'ip': ip_address, 'port': port, 'location': location })
+        site.close()
+        return p
+
+    def get_site_for_script(self, name):
+        q_getsite = """
+            select id, name, ip_address, port, location from site where name = '%s'
+        """
+        site = db.cursor()
+        site.execute(q_getsite % name)
+        p = site.fetchone()
+        if not p or not len(p):
+            return None
+        site.close()
+        return { 'id': p[0], 'name': p[1], 'ip_address': p[2], 'port': p[3], 'location': p[4] }
+
+    def add_site(self, name, ip_address, port, location):
+        q_addsite = """
+            insert into site (name, ip_address, port, location) values ('%s','%s',%d,'%s')
+        """
+        if self.get_site_for_script(name):
+            return None
+        site = db.cursor()
+        site.execute(q_addsite % (name, ip_address, port, location))
+        site.close()
+        return 1
+
+################## functions for scripts/add_user #####################
+
+    def list_users(self):
+        q_listuser = """
+            select site_id, uid, password, `primary` from user
+        """
+        site = db.cursor()
+        site.execute(q_listuser)
+        p = []
+        for site_id, uid, password, primary in site.fetchall():
+            p.append({ 'uid': uid, 'site_id': site_id, 'password': password, 'primary': primary })
+        site.close()
+        return p
+
+    def get_users(self, uid):
+        q_getuser = """
+            select site_id, uid, password, `primary` from user where uid = '%s'
+        """
+        user = db.cursor()
+        user.execute(q_getuser % uid)
+        p = user.fetchone()
+        if not p or not len(p):
+            return None
+        user.close()
+        return { 'site_id': p[0], 'uid': p[1], 'password': p[2], 'primary': p[3] }
+
+    def add_user(self, uid, site_id, password, primary):
+        q_adduser = """
+            insert into user (uid, site_id, password, `primary`) values ('%s','%s','%s',%d)
+        """
+        if self.get_users(uid):
+            return None
+        user = db.cursor()
+        user.execute(q_adduser % (uid, site_id, password, primary))
+        user.close()
+        return 1
+
+################### functions for scripts/add_login   #############
+
+    def list_logins(self):
+        q_listlogin = """
+            select uid, password, `key` from login
+        """
+        site = db.cursor()
+        site.execute(q_listlogin)
+        p = []
+        for uid, password, key in site.fetchall():
+            p.append({ 'uid': uid, 'password': password, 'key': key })
+        site.close()
+        return p
+
+    def get_logins(self, uid):
+        q_getlogin = """
+            select uid, password, `key` from login where uid = '%s'
+        """
+        login = db.cursor()
+        login.execute(q_getlogin % uid)
+        p = login.fetchone()
+        if not p or not len(p):
+            return None
+        login.close()
+        return { 'uid': p[0], 'password': p[1], 'key': p[2] }
+
+    def add_login(self, uid, password, key):
+        q_addlogin = """
+            insert into login (uid, password, `key`) values ('%s','%s','%s')
+        """
+        if self.get_logins(uid):
+            return None
+        login = db.cursor()
+        login.execute(q_addlogin % (uid, password, key))
+        login.close()
+        return 1
+
+######### functions for link scripts/add_login_profile ###############
+
+    def list_login_prof(self):
+        q_list = """
+             select login_id, profile_id from login_profile
+        """
+        lists = db.cursor()
+        lists.execute(q_list)
+        p = []
+        for login_id,profile_id in lists.fetchall():
+            p.append({ 'login_id': login_id, 'profile_id': profile_id })
+        lists.close()
+        return p
+
+    def add_login_prof(self, login_id, profile_id):
+        q_addlogin = """
+            insert into login_profile (login_id, profile_id) values (%d,%d)
+        """
+        login = db.cursor()
+        login.execute(q_addlogin % (login_id, profile_id))
+        login.close()
+        return 1
+
+
+######### functions for link scripts/add_profile_sgroup ###############
+
+    def list_prof_group(self):
+        q_list = """
+             select profile_id, sgroup_id from profile_sgroup
+        """
+        lists = db.cursor()
+        lists.execute(q_list)
+        p = []
+        for profile_id,sgroup_id in lists.fetchall():
+            p.append({ 'profile_id': profile_id, 'sgroup_id': sgroup_id })
+        lists.close()
+        return p
+
+    def add_prof_group(self, profile_id, sgroup_id):
+        q_addlogin = """
+            insert into profile_sgroup (profile_id,sgroup_id) values (%d,%d)
+        """
+        login = db.cursor()
+        login.execute(q_addlogin % (profile_id, sgroup_id))
+        login.close()
+        return 1
+
+
+######### functions for link scripts/add_sgroup_site ###############
+
+    def list_group_site(self):
+        q_list = """
+             select sgroup_id,site_id from sgroup_site
+        """
+        lists = db.cursor()
+        lists.execute(q_list)
+        p = []
+        for sgroup_id,site_id in lists.fetchall():
+            p.append({ 'sgroup_id': sgroup_id, 'site_id': site_id })
+        lists.close()
+        return p
+
+    def add_group_site(self, sgroup_id, site_id):
+        q_addlogin = """
+            insert into sgroup_site (sgroup_id, site_id) values (%d,%d)
+        """
+        login = db.cursor()
+        login.execute(q_addlogin % (sgroup_id, site_id))
+        login.close()
+        return 1
+
+
+#######################################################################
 
     def is_allowed(self, username, password=None, key=None):
         """Check is a user is allowed to connect to the proxy."""



From MAILER-DAEMON Tue Sep 27 10:05:50 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1EKG4T-0001Ht-8i
	for mharc-sshproxy-dev@gnu.org; Tue, 27 Sep 2005 10:04:38 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1EKG42-0000zt-AO
	for sshproxy-dev@nongnu.org; Tue, 27 Sep 2005 10:04:10 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1EKG3q-0000xZ-ML
	for sshproxy-dev@nongnu.org; Tue, 27 Sep 2005 10:04:01 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1EKG2C-0007b2-Hu
	for sshproxy-dev@nongnu.org; Tue, 27 Sep 2005 10:02:16 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1EKFwM-0005TB-TC
	for sshproxy-dev@nongnu.org; Tue, 27 Sep 2005 09:56:15 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.36 #1 (Debian))
	id 1EKFvy-0007GW-00
	for <sshproxy-dev@nongnu.org>; Tue, 27 Sep 2005 09:55:50 -0400
To: sshproxy-dev@nongnu.org
From: Pierre-Yves Rofes <py@wcube.org>
Message-Id: <E1EKFvy-0007GW-00@savannah.gnu.org>
Date: Tue, 27 Sep 2005 09:55:50 -0400
Subject: [sshproxy-dev] sshproxy SSHproxy/pwdb/mysql.py ./setup.py
X-BeenThere: sshproxy-dev@nongnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SSH proxy developer list <sshproxy-dev.nongnu.org>
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/sshproxy-dev>
List-Post: <mailto:sshproxy-dev@nongnu.org>
List-Help: <mailto:sshproxy-dev-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Sep 2005 14:04:30 -0000

CVSROOT:	/cvsroot/sshproxy
Module name:	sshproxy
Branch: 	
Changes by:	Pierre-Yves Rofes <pyrofes@savannah.gnu.org>	05/09/27 13:55:48

Modified files:
	SSHproxy/pwdb  : mysql.py 
Added files:
	.              : setup.py 

Log message:
	Added installation script

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/sshproxy/sshproxy/setup.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/sshproxy/sshproxy/SSHproxy/pwdb/mysql.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text




From MAILER-DAEMON Tue Sep 27 10:09:41 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1EKG9J-0004tR-BJ
	for mharc-sshproxy-dev@gnu.org; Tue, 27 Sep 2005 10:09:38 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1EKG9E-0004qe-Bp
	for sshproxy-dev@nongnu.org; Tue, 27 Sep 2005 10:09:33 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1EKG9C-0004pG-14
	for sshproxy-dev@nongnu.org; Tue, 27 Sep 2005 10:09:30 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1EKG9B-0004kX-Bg
	for sshproxy-dev@nongnu.org; Tue, 27 Sep 2005 10:09:29 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1EKG7p-0006s7-Ht
	for sshproxy-dev@nongnu.org; Tue, 27 Sep 2005 10:08:05 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.36 #1 (Debian))
	id 1EKFvx-0007G8-00
	for <sshproxy-dev@nongnu.org>; Tue, 27 Sep 2005 09:55:49 -0400
To: sshproxy-dev@nongnu.org
From: Pierre-Yves Rofes <py@wcube.org>
Message-Id: <E1EKFvx-0007G8-00@savannah.gnu.org>
Date: Tue, 27 Sep 2005 09:55:49 -0400
Subject: [sshproxy-dev] Changes to sshproxy/setup.py
X-BeenThere: sshproxy-dev@nongnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SSH proxy developer list <sshproxy-dev.nongnu.org>
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/sshproxy-dev>
List-Post: <mailto:sshproxy-dev@nongnu.org>
List-Help: <mailto:sshproxy-dev-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/sshproxy-dev>,
	<mailto:sshproxy-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Sep 2005 14:09:35 -0000





