[svn] commit: r1277 - in /trunk/src/bin/cmdctl: Makefile.am TODO b10-cmdctl.pem cmdctl-accounts.csv cmdctl-certfile.pem cmdctl-keyfile.pem cmdctl.py.in cmdctl.spec passwd.csv

[BIND 10 source code commits]

Author: zhanglikun
Date: Wed Mar 10 12:08:47 2010
New Revision: 1277

Log:
1. Rename cmdctl account file name from 'passwd.csv' to 'cmdctl-accounts.csv': 
2. Create file for private key and certificate seperately.
3. Add spec file for cmdctl.
4. Update todo list.

Added:
    trunk/src/bin/cmdctl/cmdctl-accounts.csv
    trunk/src/bin/cmdctl/cmdctl-certfile.pem
    trunk/src/bin/cmdctl/cmdctl-keyfile.pem
    trunk/src/bin/cmdctl/cmdctl.spec
Removed:
    trunk/src/bin/cmdctl/b10-cmdctl.pem
    trunk/src/bin/cmdctl/passwd.csv
Modified:
    trunk/src/bin/cmdctl/Makefile.am
    trunk/src/bin/cmdctl/TODO
    trunk/src/bin/cmdctl/cmdctl.py.in

Modified: trunk/src/bin/cmdctl/Makefile.am
==============================================================================
--- trunk/src/bin/cmdctl/Makefile.am (original)
+++ trunk/src/bin/cmdctl/Makefile.am Wed Mar 10 12:08:47 2010
@@ -4,7 +4,7 @@
 
 b10_cmdctldir = $(DESTDIR)$(pkgdatadir)
 # TODO: this is dangerous -- will overwrite!
-b10_cmdctl_DATA = passwd.csv b10-cmdctl.pem
+b10_cmdctl_DATA = cmdctl-accounts.csv cmdctl-keyfile.pem cmdctl-certfile.pem cmdctl.spec
 
 CLEANFILES=	b10-cmdctl
 
@@ -15,5 +15,6 @@
 	chmod a+x $@
 
 install-data-local:
-	chmod go-rwx $(DESTDIR)$(pkgdatadir)/passwd.csv
-	chmod go-rwx $(DESTDIR)$(pkgdatadir)/b10-cmdctl.pem
+	chmod go-rwx $(DESTDIR)$(pkgdatadir)/cmdctl-accounts.csv
+	chmod go-rwx $(DESTDIR)$(pkgdatadir)/cmdctl-certfile.pem
+	chmod go-rwx $(DESTDIR)$(pkgdatadir)/cmdctl-keyfile.pem

Modified: trunk/src/bin/cmdctl/TODO
==============================================================================
--- trunk/src/bin/cmdctl/TODO (original)
+++ trunk/src/bin/cmdctl/TODO Wed Mar 10 12:08:47 2010
@@ -1,8 +1,8 @@
-1. Refine code for b10-cmdctl.
-2. Add value type check according module specification.
-3. Description/Requirement document for b10-cmdctl.
-4. RESTful API document for b10-cmdctl.
-5. Unit tests for b10-cmdctl.
-6. Man page for b10-cmdctl?
-7. Support 'make install', Save user information and ssl certificate file to configmanager.
+. Refine code for b10-cmdctl.
+. Add value type check according module specification.
+. Add return code for RESTful API document of b10-cmdctl.
+. Add more unit tests for b10-cmdctl.
+. Update man page for b10-cmdctl?
 
+. Add id to each command, so the receiver knows if the response is what it wants.
+. Make cmdctl can be configured through bindctl.(after id is added)

Modified: trunk/src/bin/cmdctl/cmdctl.py.in
==============================================================================
--- trunk/src/bin/cmdctl/cmdctl.py.in (original)
+++ trunk/src/bin/cmdctl/cmdctl.py.in Wed Mar 10 12:08:47 2010
@@ -60,8 +60,9 @@
     DATAROOTDIR = "@datarootdir@"
     SPECFILE_PATH = "@datadir@/@PACKAGE@".replace("${datarootdir}", DATAROOTDIR).replace("${prefix}", PREFIX)
 SPECFILE_LOCATION = SPECFILE_PATH + "/cmdctl.spec"
-USER_INFO_FILE = SPECFILE_PATH + "/passwd.csv"
-CERTIFICATE_FILE = SPECFILE_PATH + "/b10-cmdctl.pem"
+USER_INFO_FILE = SPECFILE_PATH + "/cmdctl-accounts.csv"
+PRIVATE_KEY_FILE = SPECFILE_PATH + "/cmdctl-keyfile.pem"
+CERTIFICATE_FILE = SPECFILE_PATH + "/cmdctl-certfile.pem"
         
 class SecureHTTPRequestHandler(http.server.BaseHTTPRequestHandler):
     '''https connection request handler.
@@ -357,7 +358,7 @@
             connstream = ssl.wrap_socket(newsocket,
                                      server_side = True,
                                      certfile = CERTIFICATE_FILE,
-                                     keyfile = CERTIFICATE_FILE,
+                                     keyfile = PRIVATE_KEY_FILE,
                                      ssl_version = ssl.PROTOCOL_SSLv23)
             return (connstream, fromaddr)
         except ssl.SSLError as e :