Pathogen
/
neptune
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improve context passing and implement superuser override for redactions

This commit is contained in:
Mark Veidemanis 2022-07-21 13:49:32 +01:00
parent 2362048cc7
commit 4df8afef1c
Signed by: m
GPG Key ID: 5ACFCEED46C0904F
3 changed files with 41 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
core/lib/opensearch.py
View File

@ -25,13 +25,13 @@ def initialise_opensearch():
return client return client
def construct_query(query, fields, results): def construct_query(query, fields, size):
if not fields: if not fields:
fields = settings.OPENSEARCH_MAIN_SEARCH_FIELDS fields = settings.OPENSEARCH_MAIN_SEARCH_FIELDS
if not results: if not size:
results = 5 size = 5
query = { query = {
"size": results, "size": size,
"query": { "query": {
"query_string": { "query_string": {
"query": query, "query": query,
@ -61,7 +61,7 @@ def construct_query(query, fields, results):
return query return query
def filter_blacklisted(response): def filter_blacklisted(user, response):
pp.pprint(response["hits"]["hits"]) pp.pprint(response["hits"]["hits"])
print("LEN", len(response["hits"]["hits"])) print("LEN", len(response["hits"]["hits"]))
response["redacted"] = 0 response["redacted"] = 0
@ -79,15 +79,24 @@ def filter_blacklisted(response):
if blacklisted_item in str(content): if blacklisted_item in str(content):
# Remove the item # Remove the item
if item in response["hits"]["hits"]: if item in response["hits"]["hits"]:
response["hits"]["hits"].remove(item) if not user.is_superuser:
response["hits"]["hits"].remove(item)
# Let the UI know something was redacted # Let the UI know something was redacted
response["redacted"] += 1 response["redacted"] += 1
response["exemption"] = True
def run_main_query(client, query, fields=None, results=None): def run_main_query(client, user, query, fields=None, size=None):
search_query = construct_query(query, fields, results) if fields:
for field in fields:
if field not in settings.OPENSEARCH_MAIN_SEARCH_FIELDS:
return False
if size:
if size not in settings.OPENSEARCH_MAIN_SIZES:
return False
search_query = construct_query(query, fields, size)
# fmt: off # fmt: off
response = client.search(body=search_query, response = client.search(body=search_query,
index=settings.OPENSEARCH_INDEX_MAIN) index=settings.OPENSEARCH_INDEX_MAIN)
filter_blacklisted(response) filter_blacklisted(user, response)
return response return response

24
core/templates/ui/drilldown.html
View File

@ -27,12 +27,9 @@
<div class="control is-expanded has-icons-left"> <div class="control is-expanded has-icons-left">
<div class="select is-fullwidth"> <div class="select is-fullwidth">
<select name="timescale"> <select name="timescale">
<option value="minute">Minute</option> {% for timescale in timescales %}
<option value="hour">Hour</option> <option value="{{ timescale }}">{{ timescale }}</option>
<option value="day">Day</option> {% endfor %}
<option value="week">Week</option>
<option value="month">Month</option>
<option value="6months">6 months</option>
</select> </select>
<span class="icon is-small is-left"> <span class="icon is-small is-left">
<i class="fas fa-magnifying-glass"></i> <i class="fas fa-magnifying-glass"></i>
@ -65,14 +62,10 @@
<div class="field"> <div class="field">
<div class="control is-expanded has-icons-left"> <div class="control is-expanded has-icons-left">
<div class="select is-fullwidth"> <div class="select is-fullwidth">
<select name="results"> <select name="size">
<option value="5">5</option> {% for size in sizes %}
<option value="10">10</option> <option value="{{ size }}">{{ size }}</option>
<option value="15">15</option> {% endfor %}
<option value="20">20</option>
<option value="50">50</option>
<option value="100">100</option>
<option value="200">200</option>
</select> </select>
<span class="icon is-small is-left"> <span class="icon is-small is-left">
<i class="fas fa-magnifying-glass"></i> <i class="fas fa-magnifying-glass"></i>
@ -127,6 +120,9 @@
</div> </div>
<p>{{ card }} hits</p> <p>{{ card }} hits</p>
<p>{{ redacted }} redacted</p> <p>{{ redacted }} redacted</p>
{% if exemption is not None %}
<p>redaction overriden by superuser</p>
{% endif %}
<p>{{ took }}ms</p> <p>{{ took }}ms</p>
{% endif %} {% endif %}

17
core/ui/views/drilldown.py
View File

@ -18,7 +18,11 @@ class Drilldown(LoginRequiredMixin, View):
def get(self, request): def get(self, request):
if not request.user.has_plan(self.plan_name): if not request.user.has_plan(self.plan_name):
return render(request, "denied.html") return render(request, "denied.html")
context = {"fields": settings.OPENSEARCH_MAIN_SEARCH_FIELDS} context = {
"fields": settings.OPENSEARCH_MAIN_SEARCH_FIELDS,
"sizes": settings.OPENSEARCH_MAIN_SIZES,
"timescales": settings.OPENSEARCH_MAIN_TIMESCALES,
}
return render(request, self.template_name, context) return render(request, self.template_name, context)
def post(self, request): def post(self, request):
@ -27,13 +31,15 @@ class Drilldown(LoginRequiredMixin, View):
fields = None fields = None
if "fields" in request.POST: if "fields" in request.POST:
fields = request.POST.getlist("fields") fields = request.POST.getlist("fields")
if "results" in request.POST: if "size" in request.POST:
results = request.POST["results"] size = request.POST["size"]
if "query" in request.POST: if "query" in request.POST:
query = request.POST["query"] query = request.POST["query"]
# field = results.POST["field"] # field = results.POST["field"]
# print("FIELD ", field) # print("FIELD ", field)
results = run_main_query(client, query, fields, results) results = run_main_query(client, request.user, query, fields, size)
if not results:
return render(request, "denied.html")
# pp.pprint(results) # pp.pprint(results)
results_parsed = [] results_parsed = []
if "hits" in results.keys(): if "hits" in results.keys():
@ -46,7 +52,10 @@ class Drilldown(LoginRequiredMixin, View):
"card": results["hits"]["total"]["value"], "card": results["hits"]["total"]["value"],
"took": results["took"], "took": results["took"],
"redacted": results["redacted"], "redacted": results["redacted"],
"exemption": results["exemption"],
"fields": settings.OPENSEARCH_MAIN_SEARCH_FIELDS, "fields": settings.OPENSEARCH_MAIN_SEARCH_FIELDS,
"sizes": settings.OPENSEARCH_MAIN_SIZES,
"timescales": settings.OPENSEARCH_MAIN_TIMESCALES,
} }
return render(request, self.template_name, context) return render(request, self.template_name, context)
return render(request, self.template_name) return render(request, self.template_name)