diff options
| author | Michael Elkins <melkins@tislabs.com> | 2013-03-29 21:23:16 +0000 |
|---|---|---|
| committer | Michael Elkins <melkins@tislabs.com> | 2013-03-29 21:23:16 +0000 |
| commit | ec79e0bb4ef156f60b488a508a46417ec8fb53ae (patch) | |
| tree | 101e0bfe4586f079191bff192decf13c54ff5d3d /rpkid/rpki/gui | |
| parent | b512ddec4b5221396f7d2931eeb6e508c708dd99 (diff) | |
a roa only matches a route if it exactly matches or is an aggregrate. if the route is an aggregate of the roa, it does not match.
svn path=/trunk/; revision=5247
Diffstat (limited to 'rpkid/rpki/gui')
| -rw-r--r-- | rpkid/rpki/gui/app/models.py | 8 | ||||
| -rw-r--r-- | rpkid/rpki/gui/cacheview/models.py | 5 | ||||
| -rw-r--r-- | rpkid/rpki/gui/routeview/models.py | 8 |
3 files changed, 10 insertions, 11 deletions
diff --git a/rpkid/rpki/gui/app/models.py b/rpkid/rpki/gui/app/models.py index 64dcc656..5e74d27c 100644 --- a/rpkid/rpki/gui/app/models.py +++ b/rpkid/rpki/gui/app/models.py @@ -221,8 +221,8 @@ class ROARequest(rpki.irdb.models.ROARequest): # this assumes one prefix per ROA rng = self.prefixes.filter(version=4)[0].as_resource_range() return rpki.gui.routeview.models.RouteOrigin.objects.filter( - prefix_min__lte=rng.max, - prefix_max__gte=rng.min + prefix_min__gte=rng.min, + prefix_max__lte=rng.max ) @property @@ -231,8 +231,8 @@ class ROARequest(rpki.irdb.models.ROARequest): # this assumes one prefix per ROA rng = self.prefixes.filter(version=6)[0].as_resource_range() return rpki.gui.routeview.models.RouteOriginV6.objects.filter( - prefix_min__lte=rng.max, - prefix_max__gte=rng.min + prefix_min__gte=rng.min, + prefix_max__lte=rng.max ) diff --git a/rpkid/rpki/gui/cacheview/models.py b/rpkid/rpki/gui/cacheview/models.py index 9ba71f82..1fbed743 100644 --- a/rpkid/rpki/gui/cacheview/models.py +++ b/rpkid/rpki/gui/cacheview/models.py @@ -180,9 +180,8 @@ class ROAPrefixV4(ROAPrefix, rpki.gui.models.PrefixV4): @property def routes(self): """return all routes covered by this roa prefix""" - return RouteOrigin.objects.filter( - prefix_min__lte=self.prefix_max, - prefix_max__gte=self.prefix_min) + return RouteOrigin.objects.filter(prefix_min__gte=self.prefix_min, + prefix_max__lte=self.prefix_max) class Meta: ordering = ('prefix_min',) diff --git a/rpkid/rpki/gui/routeview/models.py b/rpkid/rpki/gui/routeview/models.py index acf05dc2..3989a5e1 100644 --- a/rpkid/rpki/gui/routeview/models.py +++ b/rpkid/rpki/gui/routeview/models.py @@ -32,16 +32,16 @@ class RouteOrigin(rpki.gui.models.PrefixV4): def roas(self): "Return a queryset of ROAs which cover this route." return cacheview.models.ROA.objects.filter( - prefixes__prefix_min__lte=self.prefix_max, - prefixes__prefix_max__gte=self.prefix_min + prefixes__prefix_min__lte=self.prefix_min, + prefixes__prefix_max__gte=self.prefix_max ) @property def roa_prefixes(self): "Return a queryset of ROA prefixes which cover this route." return cacheview.models.ROAPrefixV4.objects.filter( - prefix_min__lte=self.prefix_max, - prefix_max__gte=self.prefix_min + prefix_min__lte=self.prefix_min, + prefix_max__gte=self.prefix_max ) @property |