preliminary support for loading of mibs

#46
mushorg · May 24, 2013 · 768b77d · 768b77d
1 parent cb22bb1
commit 768b77d
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 11 deletions.
diff --git a/bin/conpot b/bin/conpot
@@ -73,6 +73,11 @@ def main():
                         default=os.path.join(package_directory, 'conpot.cfg'),
                         metavar="config.cfg"
                         )
+
+    parser.add_argument("-m", "--mibpath",
+                        help="path to compiled MIB files. (compiled with build-pysnmp-mib)",
+                        default=os.getcwd())
+
     args = parser.parse_args()
 
     config = ConfigParser()
@@ -102,7 +107,7 @@ def main():
 
     snmp_host = config.get('snmp', 'host')
     snmp_port = config.getint('snmp', 'port')
-    snmp_server = SNMPServer(snmp_host, snmp_port, args.template, log_queue)
+    snmp_server = SNMPServer(snmp_host, snmp_port, args.template, log_queue, args.mibpath)
 
     try:
         #add greenlets to list
@@ -122,4 +127,4 @@ def main():
 
 
 if __name__ == "__main__":
-    main()
+    main()
diff --git a/conpot/snmp/snmp_command_responder.py b/conpot/snmp/snmp_command_responder.py
@@ -2,12 +2,14 @@
 # Based on examples from http://pysnmp.sourceforge.net/
 
 import logging
+import os
 from datetime import datetime
 
 from pysnmp.entity import config
 from pysnmp.entity.rfc3413 import context
 from pysnmp.carrier.asynsock.dgram import udp
 from pysnmp.entity import engine
+from pysnmp.smi import builder
 import gevent
 from gevent import socket
 
@@ -64,12 +66,18 @@ def getTimerResolution(self):
 
 
 class CommandResponder(object):
-    def __init__(self, host, port, log_queue):
+    def __init__(self, host, port, log_queue, mibpath):
+
         self.log_queue = log_queue
         # Create SNMP engine
         self.snmpEngine = engine.SnmpEngine()
-        # Transport setup
 
+        #path to custom mibs
+        mibBuilder = self.snmpEngine.msgAndPduDsp.mibInstrumController.mibBuilder
+        mibSources = mibBuilder.getMibSources() + (builder.DirMibSource(mibpath),)
+        mibBuilder.setMibSources(*mibSources)
+
+        # Transport setup
         udp_sock = gevent.socket.socket(gevent.socket.AF_INET, gevent.socket.SOCK_DGRAM)
         udp_sock.setsockopt(gevent.socket.SOL_SOCKET, gevent.socket.SO_BROADCAST, 1)
         udp_sock.bind((host, port))
@@ -128,12 +136,15 @@ def addSocketTransport(self, snmpEngine, transportDomain, transport):
         snmpEngine.transportDispatcher.registerTransport(transportDomain, transport)
 
     def register(self, mibname, symbolname, value):
+        self.snmpEngine.msgAndPduDsp.mibInstrumController.mibBuilder.loadModules(mibname)
         s = self._get_mibSymbol(mibname, symbolname)
         logger.info('Registered: {0}'.format(s))
+
         MibScalarInstance, = self.snmpEngine.msgAndPduDsp.mibInstrumController.mibBuilder.importSymbols('SNMPv2-SMI',
                                                                                                         'MibScalarInstance')
-        scalar = MibScalarInstance(s.name, (0,), s.syntax.clone(value))
-        self.snmpEngine.msgAndPduDsp.mibInstrumController.mibBuilder.exportSymbols('SNMPv2-MIB', scalar)
+
+        x = MibScalarInstance(s.name, (0,), s.syntax.clone(value))
+        self.snmpEngine.msgAndPduDsp.mibInstrumController.mibBuilder.exportSymbols(mibname, x)
 
     def _get_mibSymbol(self, mibname, symbolname):
         modules = self.snmpEngine.msgAndPduDsp.mibInstrumController.mibBuilder.mibSymbols
@@ -151,4 +162,4 @@ def stop(self):
 if __name__ == "__main__":
     server = CommandResponder()
     print 'Starting echo server on port 161'
-    server.serve_forever()
+    server.serve_forever()
diff --git a/conpot/snmp/snmp_server.py b/conpot/snmp/snmp_server.py
@@ -15,7 +15,6 @@
 # Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-
 import logging
 
 from lxml import etree
@@ -25,7 +24,7 @@
 
 
 class SNMPServer(object):
-    def __init__(self, host, port, template, log_queue):
+    def __init__(self, host, port, template, log_queue, mibpath):
         self.host = host
         self.port = port
         dom = etree.parse(template)
@@ -34,7 +33,7 @@ def __init__(self, host, port, template, log_queue):
         if not mibs:
             self.snmp_server = None
         else:
-            self.snmp_server = CommandResponder(self.host, self.port, log_queue)
+            self.snmp_server = CommandResponder(self.host, self.port, log_queue, mibpath)
 
         for mib in mibs:
             mib_name = mib.attrib['name']

diff --git a/conpot/tests/test_snmp_server.py b/conpot/tests/test_snmp_server.py
@@ -16,6 +16,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 
+import os
 import unittest
 from datetime import datetime
 
@@ -44,7 +45,7 @@ def setUp(self):
         if not mibs:
             raise Exception("No configuration for SNMP server")
         else:
-            self.snmp_server = snmp_command_responder.CommandResponder(self.host, self.port, self.log_queue)
+            self.snmp_server = snmp_command_responder.CommandResponder(self.host, self.port, self.log_queue, os.getcwd())
 
         for mib in mibs:
             mib_name = mib.attrib['name']