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

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

Author: arthur
Date: Mon Feb 14 22:12:05 2011
New Revision: 1373
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?view=rev&revision=1373

Log:
implement module for hostname lookups

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

Modified: nss-pam-ldapd/pynslcd/Makefile.am
==============================================================================
--- nss-pam-ldapd/pynslcd/Makefile.am   Mon Feb 14 22:11:30 2011        (r1372)
+++ nss-pam-ldapd/pynslcd/Makefile.am   Mon Feb 14 22:12:05 2011        (r1373)
@@ -20,7 +20,7 @@
 pynslcddir = $(datadir)/pynslcd
 
 pynslcd_PYTHON = pynslcd.py cfg.py common.py tio.py mypidfile.py \
-                 alias.py ether.py group.py pam.py passwd.py shadow.py
+                 alias.py ether.py group.py host.py pam.py passwd.py shadow.py
 nodist_pynslcd_PYTHON = constants.py config.py
 CLEANFILES = $(nodist_pynslcd_PYTHON)
 

Added: nss-pam-ldapd/pynslcd/host.py
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ nss-pam-ldapd/pynslcd/host.py       Mon Feb 14 22:12:05 2011        (r1373)
@@ -0,0 +1,87 @@
+
+# host.py - lookup functions for hostnet 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 HostRequest(common.Request):
+
+    filter = '(objectClass=ieee802Device)'
+
+    attmap_cn           = 'cn'
+    attmap_ipHostNumber = 'ipHostNumber'
+
+    attributes = ( 'cn', 'ipHostNumber' )
+
+    def write(self, entry):
+        dn, attributes = entry
+        hostname = common.get_rdn_value(entry, self.attmap_cn)
+        hostnames = attributes.get(self.attmap_cn, [])
+        if not hostnames:
+            print 'Error: entry %s does not contain %s value' % ( dn, 
self.attmap_cn)
+        if not hostname:
+            hostname = hostnames.pop(0)
+        else:
+            hostnames.remove(hostname)
+        addresses = attributes.get(self.attmap_ipHostNumber, [])
+        if not addresses:
+            print 'Error: entry %s does not contain %s value' % ( dn, 
self.attmap_ipHostNumber)
+        # write result
+        self.fp.write_int32(constants.NSLCD_RESULT_BEGIN)
+        self.fp.write_string(hostname)
+        self.fp.write_stringlist(hostnames)
+        self.fp.write_int32(len(addresses))
+        for address in addresses:
+            self.fp.write_address(address)
+
+
+class HostByNameRequest(HostRequest):
+
+    action = constants.NSLCD_ACTION_HOST_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 HostByAddressRequest(HostRequest):
+
+    action = constants.NSLCD_ACTION_HOST_BYADDR
+
+    def read_parameters(self):
+        self.address = self.fp.read_address()
+
+    def mk_filter(self):
+        return '(&%s(%s=%s))' % ( self.filter,
+                  self.attmap_ipHostNumber,
+                  ldap.filter.escape_filter_chars(self.address) )
+
+
+class HostAllRequest(HostRequest):
+
+    action = constants.NSLCD_ACTION_HOST_ALL

Modified: nss-pam-ldapd/pynslcd/pynslcd.py
==============================================================================
--- nss-pam-ldapd/pynslcd/pynslcd.py    Mon Feb 14 22:11:30 2011        (r1372)
+++ nss-pam-ldapd/pynslcd/pynslcd.py    Mon Feb 14 22:12:05 2011        (r1373)
@@ -141,6 +141,7 @@
 handlers.update(common.get_handlers('alias'))
 handlers.update(common.get_handlers('ether'))
 handlers.update(common.get_handlers('group'))
+handlers.update(common.get_handlers('host'))
 handlers.update(common.get_handlers('pam'))
 handlers.update(common.get_handlers('passwd'))
 handlers.update(common.get_handlers('shadow'))

Modified: nss-pam-ldapd/pynslcd/tio.py
==============================================================================
--- nss-pam-ldapd/pynslcd/tio.py        Mon Feb 14 22:11:30 2011        (r1372)
+++ nss-pam-ldapd/pynslcd/tio.py        Mon Feb 14 22:12:05 2011        (r1373)
@@ -66,6 +66,12 @@
             raise TIOStreamError()
         return self.read(len)
 
+    def read_address(self):
+        """Read an address (usually IPv4 or IPv6) from the stream and return
+        the address as a string representation."""
+        af = self.read_int32()
+        return socket.inet_ntop(af, self.read_string(maxsize=64))
+
     def write(self, value):
         self.fp.write(value)
 
@@ -88,6 +94,24 @@
         for string in lst:
             self.write_string(string)
 
+    @staticmethod
+    def _to_address(value):
+        # try IPv4 first
+        try:
+            return socket.AF_INET, socket.inet_pton(socket.AF_INET, value)
+        except socket.error:
+            pass # try the next one
+        # fall back to IPv6
+        return socket.AF_INET6, socket.inet_pton(socket.AF_INET6, value)
+
+    def write_address(self, value):
+        """Write an address (usually IPv4 or IPv6) in a string representation
+        to the stream."""
+        # first try to make it into an IPv6 address
+        af, address = TIOStream._to_address(value)
+        self.write_int32(af)
+        self.write_string(address)
+
     def close(self):
         try:
             self.fp.close()
-- 
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits