nss-pam-ldapd commit: r1380 - nss-pam-ldapd/pynslcd

[Commits of the nss-pam-ldapd project <nss-pam-ldapd-commits [at] lists.arthurdejong.org>]

Author: arthur
Date: Sun Mar  6 16:09:20 2011
New Revision: 1380
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?view=rev&revision=1380

Log:
add network name lookups

Added:
   nss-pam-ldapd/pynslcd/network.py
Modified:
   nss-pam-ldapd/pynslcd/Makefile.am
   nss-pam-ldapd/pynslcd/pynslcd.py

Modified: nss-pam-ldapd/pynslcd/Makefile.am
==============================================================================
--- nss-pam-ldapd/pynslcd/Makefile.am   Sun Mar  6 16:06:08 2011        (r1379)
+++ nss-pam-ldapd/pynslcd/Makefile.am   Sun Mar  6 16:09:20 2011        (r1380)
@@ -20,7 +20,8 @@
 pynslcddir = $(datadir)/pynslcd
 
 pynslcd_PYTHON = pynslcd.py cfg.py common.py tio.py mypidfile.py \
-                 alias.py ether.py group.py host.py pam.py passwd.py shadow.py
+                 alias.py ether.py group.py host.py network.py pam.py \
+                 passwd.py shadow.py
 nodist_pynslcd_PYTHON = constants.py config.py
 CLEANFILES = $(nodist_pynslcd_PYTHON)
 

Added: nss-pam-ldapd/pynslcd/network.py
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ nss-pam-ldapd/pynslcd/network.py    Sun Mar  6 16:09:20 2011        (r1380)
@@ -0,0 +1,87 @@
+
+# network.py - lookup functions for network names and addresses
+#
+# Copyright (C) 2011 Arthur de Jong
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA
+
+import constants
+import common
+
+import struct
+import ldap.filter
+import socket
+
+
+class NetworkRequest(common.Request):
+
+    filter = '(objectClass=ipNetwork)'
+
+    attmap_cn           = 'cn'
+    attmap_ipNetworkNumber = 'ipNetworkNumber'
+
+    attributes = ( 'cn', 'ipNetworkNumber' )
+
+    def write(self, entry):
+        dn, attributes = entry
+        networkname = common.get_rdn_value(entry, self.attmap_cn)
+        networknames = attributes.get(self.attmap_cn, [])
+        if not networknames:
+            print 'Error: entry %s does not contain %s value' % ( dn, 
self.attmap_cn)
+        if not networkname:
+            networkname = networknames.pop(0)
+        else:
+            networknames.remove(networkname)
+        addresses = attributes.get(self.attmap_ipNetworkNumber, [])
+        if not addresses:
+            print 'Error: entry %s does not contain %s value' % ( dn, 
self.attmap_ipNetworkNumber)
+        # write result
+        self.fp.write_int32(constants.NSLCD_RESULT_BEGIN)
+        self.fp.write_string(networkname)
+        self.fp.write_stringlist(networknames)
+        self.fp.write_int32(len(addresses))
+        for address in addresses:
+            self.fp.write_address(address)
+
+
+class NetworkByNameRequest(NetworkRequest):
+
+    action = constants.NSLCD_ACTION_NETWORK_BYNAME
+
+    def read_parameters(self):
+        self.name = self.fp.read_string()
+
+    def mk_filter(self):
+        return '(&%s(%s=%s))' % ( self.filter,
+                  self.attmap_cn, ldap.filter.escape_filter_chars(self.name) )
+
+
+class NetworkByAddressRequest(NetworkRequest):
+
+    action = constants.NSLCD_ACTION_NETWORK_BYADDR
+
+    def read_parameters(self):
+        self.address = self.fp.read_address()
+
+    def mk_filter(self):
+        return '(&%s(%s=%s))' % ( self.filter,
+                  self.attmap_ipNetworkNumber,
+                  ldap.filter.escape_filter_chars(self.address) )
+
+
+class NetworkAllRequest(NetworkRequest):
+
+    action = constants.NSLCD_ACTION_NETWORK_ALL

Modified: nss-pam-ldapd/pynslcd/pynslcd.py
==============================================================================
--- nss-pam-ldapd/pynslcd/pynslcd.py    Sun Mar  6 16:06:08 2011        (r1379)
+++ nss-pam-ldapd/pynslcd/pynslcd.py    Sun Mar  6 16:09:20 2011        (r1380)
@@ -2,7 +2,7 @@
 
 # pynslcd.py - main daemon module
 #
-# Copyright (C) 2010 Arthur de Jong
+# Copyright (C) 2010, 2011 Arthur de Jong
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -142,6 +142,7 @@
 handlers.update(common.get_handlers('ether'))
 handlers.update(common.get_handlers('group'))
 handlers.update(common.get_handlers('host'))
+handlers.update(common.get_handlers('network'))
 handlers.update(common.get_handlers('pam'))
 handlers.update(common.get_handlers('passwd'))
 handlers.update(common.get_handlers('shadow'))
-- 
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits