Skip to content

dim/rpc: quick path for simple wildcard in rr_list() #297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
zeromind wants to merge 1 commit into from
Closed

dim/rpc: quick path for simple wildcard in rr_list() #297

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion dim/dim/rpc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2296,7 +2296,19 @@ def rr_list(self, pattern=None, type=None, zone=None, view=None, profile=False,
.join(RR.view).join(ZoneView.zone).filter(Zone.profile == profile)\
.outerjoin(RR.ipblock).outerjoin(Ipblock.layer3domain)
soa_query = ZoneView.query.join(ZoneView.zone).options(contains_eager(ZoneView.zone)).filter(Zone.profile == profile)
if zone:
if pattern and not zone and pattern.startswith('*') and pattern.endswith('.') and pattern.count('*') == 1 and pattern.count('?') == 0:
_zone = get_rr_zone(pattern, zone=None, profile=profile)
_zones = [_zone]
if _zone and pattern == f'*.{_zone.name}':
_zones += list(db.session.query(Zone).filter(Zone.name.like(f'%.{_zone.name}')).filter(Zone.profile==profile).all())
_zones = [z for z in _zones if z]
if len(_zones) >= 1:
_views = [get_view(_z, profile) for _z in _zones]
if len(_views) >= 1:
rr_query = rr_query.filter(RR.zoneview_id.in_([_view.id for _view in _views]))
soa_query = soa_query.filter(RR.zoneview_id.in_([_view.id for _view in _views]))
reverse_zone_sorting = False
elif zone:
zone = get_zone(zone, profile)
view = get_view(zone, view)
rr_query = rr_query.filter(RR.view == view)
Expand Down