summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur de Jong <arthur@arthurdejong.org>2011-03-06 15:09:20 +0000
committerArthur de Jong <arthur@arthurdejong.org>2011-03-06 15:09:20 +0000
commitaf1e00c48eb8db0f2075212e6c6cd46549d4b476 (patch)
tree1ff3d3fc73626c11b0302abed5532282a3c29e2e
parent22caa34b311a9e1c03cda16544b0ef6b907dba05 (diff)
add network name lookups
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd@1380 ef36b2f9-881f-0410-afb5-c4e39611909c
-rw-r--r--pynslcd/Makefile.am3
-rw-r--r--pynslcd/network.py87
-rwxr-xr-xpynslcd/pynslcd.py3
3 files changed, 91 insertions, 2 deletions
diff --git a/pynslcd/Makefile.am b/pynslcd/Makefile.am
index 664d6bf..ae94a50 100644
--- a/pynslcd/Makefile.am
+++ b/pynslcd/Makefile.am
@@ -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)
diff --git a/pynslcd/network.py b/pynslcd/network.py
new file mode 100644
index 0000000..672b9e4
--- /dev/null
+++ b/pynslcd/network.py
@@ -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
diff --git a/pynslcd/pynslcd.py b/pynslcd/pynslcd.py
index a30023a..1b95b97 100755
--- a/pynslcd/pynslcd.py
+++ b/pynslcd/pynslcd.py
@@ -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('alias'))
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'))