From b10e01d6afb9467918414f9691397859d523d7fe Mon Sep 17 00:00:00 2001 From: Leonidas Poulopoulos <leopoul@noc.grnet.gr> Date: Sun, 20 Nov 2011 22:36:01 +0200 Subject: [PATCH] Changed logic to all parts. Dev db is incorporated --- flowspec/admin.py | 36 ++++++----- flowspec/models.py | 150 ++++++++++++++++++++------------------------- flowspec_dev.db | Bin 0 -> 70656 bytes utils/proxy.py | 68 +++++++++++--------- 4 files changed, 129 insertions(+), 125 deletions(-) create mode 100644 flowspec_dev.db diff --git a/flowspec/admin.py b/flowspec/admin.py index 283bd642..f6c3ad9e 100644 --- a/flowspec/admin.py +++ b/flowspec/admin.py @@ -10,33 +10,41 @@ class RouteAdmin(admin.ModelAdmin): applier = PR.Applier(route_objects=queryset) commit, response = applier.apply(configuration=applier.delete_routes()) if commit: - rows = queryset.update(is_online=False) + rows = queryset.update(is_online=False, is_active=False) queryset.update(response="Successfully removed route from network") self.message_user(request, "Successfully removed %s routes from network" % rows) else: self.message_user(request, "Could not remove routes from network") - deactivate.short_description = "Remove selected routes from network" - - list_display = ('name', 'get_match', 'get_then', 'is_online', 'applier', 'response') - fields = ('name', 'match','then','applier', 'expires') + deactivate.short_description = "Deactivate selected routes from network" + + list_display = ('name', 'is_online', 'applier', 'get_match', 'get_then', 'response') + fieldsets = [ + (None, {'fields': ['name',]}), + ("Match", {'fields': ['source', 'sourceport', 'destination', 'destinationport', 'port']}), + ('Advanced Match Statements', {'fields': ['dscp', 'fragmenttype', 'icmpcode', 'icmptype', 'packetlength', 'protocol', 'tcpflag'], 'classes': ['collapse']}), + ("Then", {'fields': ['then' ]}), + (None, {'fields': ['comments',]}), + + ] +# fields = ('name', 'applier', 'expires') #def formfield_for_dbfield(self, db_field, **kwargs): # if db_field.name == 'password': # kwargs['widget'] = PasswordInput # return db_field.formfield(**kwargs) -admin.site.register(MatchAddress) +#admin.site.register(MatchAddress) admin.site.register(MatchPort) admin.site.register(MatchDscp) -admin.site.register(MatchFragmentType) -admin.site.register(MatchIcmpCode) -admin.site.register(MatchIcmpType) -admin.site.register(MatchPacketLength) -admin.site.register(MatchProtocol) -admin.site.register(MatchTcpFlag) +#admin.site.register(MatchFragmentType) +#admin.site.register(MatchIcmpCode) +#admin.site.register(MatchIcmpType) +#admin.site.register(MatchPacketLength) +#admin.site.register(MatchProtocol) +#admin.site.register(MatchTcpFlag) admin.site.register(ThenAction) -admin.site.register(ThenStatement) -admin.site.register(MatchStatement) +#admin.site.register(ThenStatement) +#admin.site.register(MatchStatement) admin.site.register(Route, RouteAdmin) admin.site.disable_action('delete_selected') diff --git a/flowspec/models.py b/flowspec/models.py index eb9c44b9..b3f917b8 100644 --- a/flowspec/models.py +++ b/flowspec/models.py @@ -2,9 +2,11 @@ # vim: tabstop=4:shiftwidth=4:softtabstop=4:expandtab from django.db import models +from django.conf import settings from django.contrib.auth.models import User from utils import proxy as PR from ipaddr import * +from datetime import * import logging FORMAT = '%(asctime)s %(levelname)s: %(message)s' @@ -32,23 +34,8 @@ THEN_CHOICES = ( ) +def days_offset(): return datetime.now() + timedelta(days = settings.EXPIRATION_DAYS_OFFSET) -class MatchAddress(models.Model): - address = models.CharField(max_length=255, help_text=u"Network address. Use address/CIDR notation") - def __unicode__(self): - return self.address - - def clean(self, *args, **kwargs): - from django.core.exceptions import ValidationError - try: - address = IPNetwork(self.address) - self.address = address.exploded - except Exception: - raise ValidationError('Invalid network address format') - - class Meta: - db_table = u'match_address' - class MatchPort(models.Model): port = models.CharField(max_length=24) def __unicode__(self): @@ -65,70 +52,72 @@ class MatchDscp(models.Model): class ThenAction(models.Model): - action = models.CharField(max_length=60, choices=THEN_CHOICES) - action_value = models.CharField(max_length=255, blank=True, null=True) + action = models.CharField(max_length=60, choices=THEN_CHOICES, verbose_name="Action") + action_value = models.CharField(max_length=255, blank=True, null=True, verbose_name="Action Value") def __unicode__(self): - return "%s %s" %(self.action, self.action_value) + return "%s: %s" %(self.action, self.action_value) class Meta: db_table = u'then_action' class Route(models.Model): name = models.CharField(max_length=128) applier = models.ForeignKey(User) - destination = models.CharField(max_length=32, blank=True, null=True, help_text=u"Network address. Use address/CIDR notation") - destinationport = models.ManyToManyField(MatchPort, blank=True, null=True, related_name="matchDestinationPort") - dscp = models.ManyToManyField(MatchDscp, blank=True, null=True) - fragmenttype = models.CharField(max_length=20, choices=FRAGMENT_CODES, blank=True, null=True) - icmpcode = models.CharField(max_length=32, blank=True, null=True) - icmptype = models.CharField(max_length=32, blank=True, null=True) - packetlength = models.IntegerField(blank=True, null=True) - port = models.ManyToManyField(MatchPort, blank=True, null=True, related_name="matchPort") - protocol = models.CharField(max_length=32, blank=True, null=True) - source = models.CharField(max_length=32, blank=True, null=True, help_text=u"Network address. Use address/CIDR notation") - sourceport = models.ManyToManyField(MatchPort, blank=True, null=True, related_name="matchSourcePort") - tcpflag = models.CharField(max_length=128, blank=True, null=True) - then = models.ManyToManyField(ThenAction) + source = models.CharField(max_length=32, blank=True, null=True, help_text=u"Network address. Use address/CIDR notation", verbose_name="Source Address") + sourceport = models.ManyToManyField(MatchPort, blank=True, null=True, related_name="matchSourcePort", verbose_name="Source Port") + destination = models.CharField(max_length=32, blank=True, null=True, help_text=u"Network address. Use address/CIDR notation", verbose_name="Destination Address") + destinationport = models.ManyToManyField(MatchPort, blank=True, null=True, related_name="matchDestinationPort", verbose_name="Destination Port") + port = models.ManyToManyField(MatchPort, blank=True, null=True, related_name="matchPort", verbose_name="Port" ) + dscp = models.ManyToManyField(MatchDscp, blank=True, null=True, verbose_name="DSCP") + fragmenttype = models.CharField(max_length=20, choices=FRAGMENT_CODES, blank=True, null=True, verbose_name="Fragment Type") + icmpcode = models.CharField(max_length=32, blank=True, null=True, verbose_name="ICMP Code") + icmptype = models.CharField(max_length=32, blank=True, null=True, verbose_name="ICMP Type") + packetlength = models.IntegerField(blank=True, null=True, verbose_name="Packet Length") + protocol = models.CharField(max_length=32, blank=True, null=True, verbose_name="Protocol") + tcpflag = models.CharField(max_length=128, blank=True, null=True, verbose_name="TCP flag") + then = models.ManyToManyField(ThenAction, verbose_name="Then") filed = models.DateTimeField(auto_now_add=True) last_updated = models.DateTimeField(auto_now=True) is_online = models.BooleanField(default=False) is_active = models.BooleanField(default=False) - expires = models.DateTimeField() + expires = models.DateField(default=days_offset) response = models.CharField(max_length=512, blank=True, null=True) - comments = models.TextField(null=True, blank=True) + comments = models.TextField(null=True, blank=True, verbose_name="Comments") def __unicode__(self): return self.name class Meta: + unique_together = (("name", "is_active"),) db_table = u'route' def clean(self, *args, **kwargs): from django.core.exceptions import ValidationError if self.destination: try: - address = IPNetwork(self.address) - self.address = address.exploded + address = IPNetwork(self.destination) + self.destination = address.exploded except Exception: - raise ValidationError('Invalid network address format') + raise ValidationError('Invalid network address format at Destination Field') if self.source: try: - address = IPNetwork(self.address) - self.address = address.exploded + address = IPNetwork(self.source) + self.source = address.exploded except Exception: - raise ValidationError('Invalid network address format') + raise ValidationError('Invalid network address format at Source Field') def save(self, *args, **kwargs): applier = PR.Applier(route_object=self) commit, response = applier.apply() if commit: self.is_online = True + self.is_active = True self.response = response else: self.is_online = False self.response = response super(Route, self).save(*args, **kwargs) - + def is_synced(self): found = False @@ -144,11 +133,10 @@ class Route(models.Model): found = True logger.info('Found a matching route name') devicematch = route.match - routematch = self.match try: - assert(routematch.matchDestination.address) + assert(self.destination) assert(devicematch['destination'][0]) - if routematch.matchDestination.address == devicematch['destination'][0]: + if self.destination == devicematch['destination'][0]: found = found and True logger.info('Found a matching destination') else: @@ -157,9 +145,9 @@ class Route(models.Model): except: pass try: - assert(routematch.matchSource.address) + assert(self.source) assert(devicematch['source'][0]) - if routematch.matchSource.address == devicematch['source'][0]: + if self.source == devicematch['source'][0]: found = found and True logger.info('Found a matching source') else: @@ -168,9 +156,9 @@ class Route(models.Model): except: pass try: - assert(routematch.matchfragmenttype.fragmenttype) + assert(self.fragmenttype) assert(devicematch['fragment'][0]) - if routematch.matchfragmenttype.fragmenttype == devicematch['fragment'][0]: + if self.fragmenttype == devicematch['fragment'][0]: found = found and True logger.info('Found a matching fragment type') else: @@ -179,9 +167,9 @@ class Route(models.Model): except: pass try: - assert(routematch.matchicmpcode.icmp_code) + assert(self.icmpcode) assert(devicematch['icmp-code'][0]) - if routematch.matchicmpcode.icmp_code == devicematch['icmp-code'][0]: + if self.icmpcode == devicematch['icmp-code'][0]: found = found and True logger.info('Found a matching icmp code') else: @@ -190,9 +178,9 @@ class Route(models.Model): except: pass try: - assert(routematch.matchicmptype.icmp_type) + assert(self.icmptype) assert(devicematch['icmp-type'][0]) - if routematch.matchicmpcode.icmp_type == devicematch['icmp-type'][0]: + if self.icmptype == devicematch['icmp-type'][0]: found = found and True logger.info('Found a matching icmp type') else: @@ -201,9 +189,9 @@ class Route(models.Model): except: pass try: - assert(routematch.matchprotocol.protocol) + assert(self.protocol) assert(devicematch['protocol'][0]) - if routematch.matchprotocol.protocol == devicematch['protocol'][0]: + if self.protocol == devicematch['protocol'][0]: found = found and True logger.info('Found a matching protocol') else: @@ -217,10 +205,9 @@ class Route(models.Model): return found - def get_then(self): ret = '' - then_statements = self.then.thenaction.all() + then_statements = self.then.all() for statement in then_statements: if statement.action_value: ret = "%s %s:<strong>%s</strong><br/>" %(ret, statement.action, statement.action_value) @@ -230,37 +217,36 @@ class Route(models.Model): get_then.short_description = 'Then statement' get_then.allow_tags = True - +# def get_match(self): ret = '' - match = self.match - if match.matchDestination: - ret = ret = '%s Destination Address:<strong>%s</strong><br/>' %(ret, match.matchDestination) - if match.matchfragmenttype: - ret = ret = "%s Fragment Type:<strong>%s</strong><br/>" %(ret, match.matchfragmenttype) - if match.matchicmpcode: - ret = ret = "%s ICMP code:<strong>%s</strong><br/>" %(ret, match.matchicmpcode) - if match.matchicmptype: - ret = ret = "%s ICMP Type:<strong>%s</strong><br/>" %(ret, match.matchicmptype) - if match.matchpacketlength: - ret = ret = "%s Packet Length:<strong>%s</strong><br/>" %(ret, match.matchpacketlength) - if match.matchprotocol: - ret = ret = "%s Protocol:<strong>%s</strong><br/>" %(ret, match.matchprotocol) - if match.matchSource: - ret = ret = "%s Source Address:<strong>%s</strong><br/>" %(ret, match.matchSource) - if match.matchTcpFlag: - ret = ret = "%s TCP flag:<strong>%s</strong><br/>" %(ret, match.matchTcpFlag) - if match.matchport: - for port in match.matchport.all(): + if self.destination: + ret = ret = '%s Destination Address:<strong>%s</strong><br/>' %(ret, self.destination) + if self.fragmenttype: + ret = ret = "%s Fragment Type:<strong>%s</strong><br/>" %(ret, self.fragmenttype) + if self.icmpcode: + ret = ret = "%s ICMP code:<strong>%s</strong><br/>" %(ret, self.icmpcode) + if self.icmptype: + ret = ret = "%s ICMP Type:<strong>%s</strong><br/>" %(ret, self.icmptype) + if self.packetlength: + ret = ret = "%s Packet Length:<strong>%s</strong><br/>" %(ret, self.packetlength) + if self.protocol: + ret = ret = "%s Protocol:<strong>%s</strong><br/>" %(ret, self.protocol) + if self.source: + ret = ret = "%s Source Address:<strong>%s</strong><br/>" %(ret, self.source) + if self.tcpflag: + ret = ret = "%s TCP flag:<strong>%s</strong><br/>" %(ret, self.tcpflag) + if self.port: + for port in self.port.all(): ret = "%s Port:<strong>%s</strong><br/>" %(ret, port) - if match.matchDestinationPort: - for port in match.matchDestinationPort.all(): + if self.destinationport: + for port in self.destinationport.all(): ret = "%s Port:<strong>%s</strong><br/>" %(ret, port) - if match.matchSourcePort: - for port in match.matchSourcePort.all(): + if self.sourceport: + for port in self.sourceport.all(): ret = "%s Port:<strong>%s</strong><br/>" %(ret, port) - if match.matchdscp: - for dscp in match.matchdscp.all(): + if self.dscp: + for dscp in self.dscp.all(): ret = "%s Port:<strong>%s</strong><br/>" %(ret, dscp) return ret.rstrip('<br/>') diff --git a/flowspec_dev.db b/flowspec_dev.db new file mode 100644 index 0000000000000000000000000000000000000000..9a32e30710d85f24c691b2c2a8e55e0697254adc GIT binary patch literal 70656 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 Roc}q%=YMm7&;RCN1OUzqFbMzv literal 0 HcmV?d00001 diff --git a/utils/proxy.py b/utils/proxy.py index 46bc5da5..a845d185 100644 --- a/utils/proxy.py +++ b/utils/proxy.py @@ -66,35 +66,45 @@ class Applier(object): flow.routes.append(route) device.routing_options.append(flow) route.name = route_obj.name - match = route_obj.match - if match.matchSource: - route.match['source'].append(match.matchSource.address) - if match.matchDestination: - route.match['destination'].append(match.matchDestination.address) - if match.matchprotocol: - route.match['protocol'].append(match.matchprotocol.protocol) - if match.matchport: - for port in match.matchport.all(): - route.match['port'].append(port.port) - if match.matchDestinationPort: - for port in match.matchDestinationPort.all(): - route.match['destination-port'].append(port.port) - if match.matchSourcePort: - for port in match.matchSourcePort.all(): - route.match['source-port'].append(port.port) - if match.matchicmpcode: - route.match['icmp-code'].append(match.matchicmpcode.icmp_code) - if match.matchicmptype: - route.match['icmp-type'].append(match.matchicmptype.icmp_type) - if match.matchTcpFlag: - route.match['tcp-flags'].append(match.matchTcpFlag.tcp_flags) - if match.matchdscp: - for dscp in match.matchdscp.all(): - route.match['dscp'].append(dscp.dscp) - if match.matchfragmenttype: - route.match['fragment'].append(match.matchfragmenttype.fragmenttype) - then = route_obj.then - for thenaction in then.thenaction.all(): + if route_obj.source: + route.match['source'].append(route_obj.source) + if route_obj.destination: + route.match['destination'].append(route_obj.destination) + if route_obj.protocol: + route.match['protocol'].append(route_obj.protocol) + try: + if route_obj.port: + for port in route_obj.port.all(): + route.match['port'].append(port.port) + except: + pass + try: + if route_obj.destinationport: + for port in route_obj.destinationport.all(): + route.match['destination-port'].append(port.port) + except: + pass + try: + if route_obj.sourceport: + for port in route_obj.sourceport.all(): + route.match['source-port'].append(port.port) + except: + pass + if route_obj.icmpcode: + route.match['icmp-code'].append(route_obj.icmpcode) + if route_obj.icmptype: + route.match['icmp-type'].append(route_obj.icmptype) + if route_obj.tcpflag: + route.match['tcp-flags'].append(route_obj.tcpflag) + try: + if route_obj.dscp: + for dscp in route_obj.dscp.all(): + route.match['dscp'].append(dscp.dscp) + except: + pass + if route_obj.fragmenttype: + route.match['fragment'].append(route_obj.fragmenttype) + for thenaction in route_obj.then.all(): if thenaction.action_value: route.then[thenaction.action] = thenaction.action_value else: -- GitLab