Skip to content

Commit 42996e8

Browse files
DavidCrucianiDavidCruciani
committed
fix: [website] config + query
1 parent 4d0672f commit 42996e8

File tree

2 files changed

+46
-53
lines changed

2 files changed

+46
-53
lines changed

‎webiste/app/session.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,19 @@ def __init__(self, request_json) -> None:
2525
self.modules_list = request_json["modules"]
2626
self.nb_errors = 0
2727
self.config_module = self.config_module_setter(request_json)
28+
2829

2930
def config_module_setter(self, request_json):
30-
if request_json["config"]:
31-
for query in self.modules_list:
32-
if not query in request_json["config"]:
33-
request_json["config"][query] = {}
34-
module = HomeModel.get_module_by_name(query)
35-
mcs = HomeModel.get_module_config_module(module.id)
36-
for mc in mcs:
37-
config_db = HomeModel.get_config(mc.config_id)
38-
request_json["config"][query][config_db.name] = mc.value
39-
return request_json["config"]
40-
return {}
31+
"""Setter for config for all modules used"""
32+
for query in self.modules_list:
33+
if not query in request_json["config"]:
34+
request_json["config"][query] = {}
35+
module = HomeModel.get_module_by_name(query)
36+
mcs = HomeModel.get_module_config_module(module.id)
37+
for mc in mcs:
38+
config_db = HomeModel.get_config(mc.config_id)
39+
request_json["config"][query][config_db.name] = mc.value
40+
return request_json["config"]
4141

4242
def start(self):
4343
"""Start all worker"""
@@ -103,7 +103,6 @@ def process(self):
103103
if work[1] in self.config_module:
104104
loc_config = self.config_module[work[1]]
105105

106-
107106
if loc_query:
108107
send_to = {"module": work[1], "attribute": loc_query, "config": loc_config}
109108
else:
@@ -121,6 +120,7 @@ def get_result(self):
121120
return self.result
122121

123122
def save_info(self):
123+
"""Save info in the db"""
124124
s = Session_db(
125125
uuid=str(self.id),
126126
modules_list=json.dumps(self.modules_list),

‎webiste/app/templates/home.html

Lines changed: 34 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ <h4>[[module.name]]</h4>
7474
createApp({
7575
delimiters: ['[[', ']]'],
7676
setup() {
77-
const query = ref("Query")
7877
const modules_list = ref([])
7978
const misp_attributes_list = ref({})
8079
const attr_selected = ref([])
@@ -97,48 +96,43 @@ <h4>[[module.name]]</h4>
9796
status_site.value = ""
9897
}
9998

100-
if (query.value == 'Query') {
101-
progress.value = 0
102-
let error_flag = false
99+
progress.value = 0
100+
let error_flag = false
103101

104-
let result_dict = {"modules": $("#modules_select").val(),
105-
"input": $("#input_select").val(),
106-
"query": current_query.value
107-
}
108-
result_dict["config"] = {}
109-
for(let el in config_query.value){
110-
result_dict["config"][config_query.value[el].name] = {}
111-
for(let conf in config_query.value[el].meta.config){
112-
$("#error-"+config_query.value[el].meta.config[conf]+"-"+config_query.value[el].name).text("")
113-
let loc = $("#form-"+config_query.value[el].meta.config[conf]+"-"+config_query.value[el].name).val()
114-
if(!loc){
115-
error_flag = true
116-
$("#error-"+config_query.value[el].meta.config[conf]+"-"+config_query.value[el].name).text("Please enter value")
117-
}else{
118-
result_dict["config"][config_query.value[el].name][config_query.value[el].meta.config[conf]] = loc
119-
}
102+
let result_dict = {"modules": $("#modules_select").val(),
103+
"input": $("#input_select").val(),
104+
"query": current_query.value
105+
}
106+
result_dict["config"] = {}
107+
for(let el in config_query.value){
108+
result_dict["config"][config_query.value[el].name] = {}
109+
for(let conf in config_query.value[el].meta.config){
110+
$("#error-"+config_query.value[el].meta.config[conf]+"-"+config_query.value[el].name).text("")
111+
let loc = $("#form-"+config_query.value[el].meta.config[conf]+"-"+config_query.value[el].name).val()
112+
if(!loc){
113+
error_flag = true
114+
$("#error-"+config_query.value[el].meta.config[conf]+"-"+config_query.value[el].name).text("Please enter value")
115+
}else{
116+
result_dict["config"][config_query.value[el].name][config_query.value[el].meta.config[conf]] = loc
120117
}
121118
}
122-
if(!error_flag){
123-
const res = await fetch('/run_modules',{
124-
headers: { "X-CSRFToken": $("#csrf_token").val(), "Content-Type": "application/json" },
125-
method: "POST",
126-
body: JSON.stringify(result_dict)
127-
})
128-
if(await res.status == 201){
129-
let loc = await res.json()
130-
query.value = 'Stop'
131-
console.log(loc['id']);
132-
await nextTick()
133-
window.location.href="/query/" + loc['id']
134-
}else{
135-
let loc = await res.json()
136-
query.value = 'Query'
137-
status_site.value = loc['message'] || 'Something went wrong'
138-
139-
if(status_site.value.includes("]")){
140-
status_site.value = status_site.value.split("]")[1]
141-
}
119+
}
120+
if(!error_flag){
121+
const res = await fetch('/run_modules',{
122+
headers: { "X-CSRFToken": $("#csrf_token").val(), "Content-Type": "application/json" },
123+
method: "POST",
124+
body: JSON.stringify(result_dict)
125+
})
126+
if(await res.status == 201){
127+
let loc = await res.json()
128+
await nextTick()
129+
window.location.href="/query/" + loc['id']
130+
}else{
131+
let loc = await res.json()
132+
status_site.value = loc['message'] || 'Something went wrong'
133+
134+
if(status_site.value.includes("]")){
135+
status_site.value = status_site.value.split("]")[1]
142136
}
143137
}
144138
}
@@ -227,7 +221,6 @@ <h4>[[module.name]]</h4>
227221

228222
return {
229223
message_list,
230-
query,
231224
progress,
232225
modules_list,
233226
misp_attributes_list,

0 commit comments

Comments
 (0)