diff --git a/app/api/packs/campaign.py b/app/api/packs/campaign.py index 577573f60..3c5ca1dbe 100644 --- a/app/api/packs/campaign.py +++ b/app/api/packs/campaign.py @@ -1,5 +1,4 @@ import operator -import os from collections import defaultdict from aiohttp_jinja2 import template @@ -79,11 +78,11 @@ async def _section_profiles(self, request): @template('operations.html') async def _section_operations(self, request): def load_usage_markdown(header): - f = open('plugins/fieldmanual/sphinx-docs/Basic-Usage.md','r') - markdown = [] - seen_header = False - for x in f: - if (not seen_header and "## Operations" in x): + f = open('plugins/fieldmanual/sphinx-docs/Basic-Usage.md', 'r') + markdown = [] + seen_header = False + for x in f: + if (not seen_header and "## Operations" in x): markdown = [] seen_header = True elif (seen_header and "## " in x): @@ -95,8 +94,8 @@ def load_usage_markdown(header): key = key.split("*")[3] val = val.strip("\n") markdown.append({key: val}) - f.close() - return markdown + f.close() + return markdown access = dict(access=tuple(await self.auth_svc.get_permissions(request))) hosts = [h.display for h in await self.data_svc.locate('agents', match=access)] groups = sorted(list(set(([h['group'] for h in hosts])))) diff --git a/app/api/rest_api.py b/app/api/rest_api.py index 0edbf2e49..be4e10112 100644 --- a/app/api/rest_api.py +++ b/app/api/rest_api.py @@ -12,7 +12,6 @@ from app.api.packs.advanced import AdvancedPack from app.api.packs.campaign import CampaignPack from app.objects.secondclass.c_link import Link -from app.service.app_svc import Error from app.service.auth_svc import check_authorization from app.utility.base_world import BaseWorld