Changeset 118

Timestamp:

05/16/05 08:26:48 (4 years ago)

Author:

athomas

Message:

More fixes, made object stuff more generic.

Files:

• fwc/trunk/fwc (modified) (10 diffs)
• fwc/trunk/Object.py (modified) (1 diff)
• fwc/trunk/Resolver.py (modified) (6 diffs)

fwc/trunk/fwc

@@ -34 +34 @@
-# Help extractors
-
+def help_object(context, type):
+        help = { '<%s>' % type : '%s object.' % type.title() }
+        for o in resolver.get_objects(type):
+                if o.description:
+                        help[o.name] = '%s (%s)' % (o.description, o.value)
+                else:
+                        help[o.name] = '%s object (%s)' % (type.title(), o.value)
+        return help
+
-def help_network(context):
-        help = { '<network>' : 'Network address.'}
@@ -60 +69 @@
-def NETWORK(context, str):
-        return re.match(Object.NETWORK_PATTERN, str) \
-network(context
+object(context, 'network'
-
-def PORT(context, str):
-        return re.match(Object.PORT_PATTERN, str) \
-port(context
+object(context, 'port'
-
-def PORT_RANGE(context, str):
@@ -198 +207 @@
-
-protocol_rules = {
-foo: [x.name for x in resolver.get_objects('protocol')]
+token: resolver.have_object(Object.PROTOCOL, token)
-                GROUP : 30,
-                UNLESS_VAR : 'protocol',
@@ -323 +332 @@
-                                                JUMP : 'commands',
-                                                JUMP_TO : 'sport',
-help_port
+lambda ctx: help_object(ctx, 'port')
-                                        },
-                                        IF : check_port_protocol,
@@ -413 +422 @@
-        },
-        'object' : {
-manipulation objects
+object manipulation
-                'import' : {
-                        LABEL : 'import',
-
+
+
+
+
+
+
+
+
+
-                                VAR : 'import_types',
-
-x, import_types: resolver.populate_defaults(tolist(import_types)
+ + 's'
+ctx, import_types, **args: resolver.populate_defaults(tolist(import_types), with_aliases = 'aliases' in ctx
-                        },
-                        HELP : 'Import system objects.',
-x: resolver.populate_defaults(
+ctx, **args: resolver.populate_defaults(with_aliases = 'aliases' in ctx
-                },
-                'create' : {
-                        HELP : 'Create a ruleset object.',
-Object.NETWORK
+'|'.join(Resolver.get_object_types())
-                                VAR : 'type',
-'Create network object.'
+lambda ctx: [(x, 'Create %s object' % x) for x in Resolver.get_object_types()]
-                                Object.NAME_PATTERN : {
-                                        VAR : 'name',
-                                        HELP : { '<name>' : 'Name of object to create.' },
-
+
+
-                                                VAR : 'value',
-
-
-
-
-
+
+
+
-                                                        ACTION : create_object,
-                                                },
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-                                                },
-                                        },
@@ -467 +474 @@
-                        '|'.join(Resolver.get_object_types()) : {
-                                VAR : 'type',
-
-
-
-
+
-                        },
-                },
@@ -479 +483 @@
-                                ACTION : list_objects,
-                        },
-|'.join(Resolver.get_object_types())
+s|'.join(Resolver.get_object_types()) + 's'
-                                VAR : 'type',
-
+ + 's'
-                                ACTION : list_objects,
-                        },
@@ -487 +491 @@
-        },
-        'delete' : {
-1
+2
-                IF : have_modifiable_firewall,
-                HELP : 'Remove rule(s) from the ruleset.',
@@ -499 +503 @@
-        },
-        'list' : {
-1
+2
-                IF : have_firewall,
-                HELP : 'List ruleset.',
@@ -505 +509 @@
-        },
-        'move' : {
-1
+2
-                IF : have_modifiable_firewall,
-                HELP : 'Move rule.',

fwc/trunk/Object.py

@@ -8 +8 @@
-        PORT_PATTERN = r'\d{1,5}'
-        PROTOCOL_PATTERN = r'\d{1,3}'
+
+        TYPE_PATTERNS = {
+                'network' : NETWORK_PATTERN,
+                'port' : PORT_PATTERN,
+                'protocol' : PROTOCOL_PATTERN,
+        }
-
-        # Regex matching a valid object name

fwc/trunk/Resolver.py

@@ -48 +48 @@
-                self.add_object(Object(Object.NETWORK, 'any', '0.0.0.0/0', 'Any network address'))
-                self.add_object(Object(Object.NETWORK, 'localhost', '127.0.0.1', 'Local host'))
--65535
+
-                # Default protocols
-                self.add_object(Object(Object.PROTOCOL, 'tcp', '6', 'Transmission Control Protocol'))
-                self.add_object(Object(Object.PROTOCOL, 'udp', '17', 'User Datagram Protocol'))
-                self.add_object(Object(Object.PROTOCOL, 'icmp', '1', 'Internet Control Message Protocol'))
+
+        def have_object(self, type, name):
+                if type in self.__objects and name in self.__objects[type]:
+                        return self.__objects[type][name]
+                return None
-
-        def resolve_object(self, type, name):
@@ -86 +91 @@
-                        raise Resolver.InvalidObject("Object '%s:%s' not in ruleset" % (object.type, object.name))
-
-
+, with_aliases = False
-                """ Populate object database from system. """
-                for type in types:
+                        if type[-1] == 's': type = type[0:-1]
-                        objects = 0
-                        if type == Object.PORT:
@@ -103 +109 @@
-                                                name = tokens.pop(0)
-                                                port, proto = tokens.pop(0).split('/')
-
+
+
+
+
-                                                for token in tokens:
-                                                        try:
@@ -127 +136 @@
-                                                ip, names = host.split(None, 1)
-                                                names = names.split()
+                                                if not with_aliases:
+                                                        names = names[0:1]
-                                                for name in names:
-                                                        try:
@@ -163 +174 @@
-                                        pass
-                                info("added", objects, "protocol objects")
+                        else:
+                                raise Resolver.Error("can't import unknown object type '%s'" % type)
-
-        @staticmethod
@@ -170 +183 @@
-
-        def get_objects(self, type):
+                if type[-1] == 's': type = type[0:-1]
-                return self.__objects[type].values()
-