From d429a344ef34bb9289616dc7ca11c161fabce5d7 Mon Sep 17 00:00:00 2001 From: Emiliano Ciavatta Date: Fri, 16 Oct 2020 15:26:55 +0200 Subject: Refactor js arrow functions --- frontend/src/components/App.js | 2 +- frontend/src/components/Notifications.js | 2 +- frontend/src/components/Timeline.js | 2 +- frontend/src/components/filters/AdvancedFilters.js | 4 ++-- .../src/components/filters/ExitSearchFilter.js | 2 +- .../components/filters/RulesConnectionsFilter.js | 2 +- frontend/src/components/objects/Connection.js | 4 ++-- .../components/objects/ConnectionMatchedRules.js | 4 ++-- frontend/src/components/panels/ConnectionsPane.js | 10 +++++----- frontend/src/components/panels/PcapsPane.js | 6 +++--- frontend/src/components/panels/RulesPane.js | 16 ++++++++-------- frontend/src/components/panels/SearchPane.js | 22 +++++++++++----------- frontend/src/components/panels/ServicesPane.js | 10 +++++----- frontend/src/components/panels/StreamsPane.js | 6 +++--- frontend/src/dispatcher.js | 8 ++++---- frontend/src/log.js | 2 +- parsers/http_request_parser.go | 3 +-- 17 files changed, 52 insertions(+), 53 deletions(-) diff --git a/frontend/src/components/App.js b/frontend/src/components/App.js index 888ff86..e12a99d 100644 --- a/frontend/src/components/App.js +++ b/frontend/src/components/App.js @@ -27,7 +27,7 @@ class App extends Component { state = {}; componentDidMount() { - dispatcher.register("notifications", payload => { + dispatcher.register("notifications", (payload) => { if (payload.event === "connected") { this.setState({ connected: true, diff --git a/frontend/src/components/Notifications.js b/frontend/src/components/Notifications.js index a81eba1..0b47b43 100644 --- a/frontend/src/components/Notifications.js +++ b/frontend/src/components/Notifications.js @@ -107,7 +107,7 @@ class Notifications extends Component {
{ - this.state.closedNotifications.concat(this.state.notifications).map(n => { + this.state.closedNotifications.concat(this.state.notifications).map((n) => { const notificationClassnames = { "notification": true, "notification-closed": n.closed, diff --git a/frontend/src/components/Timeline.js b/frontend/src/components/Timeline.js index 94fa4d0..9ecbd80 100644 --- a/frontend/src/components/Timeline.js +++ b/frontend/src/components/Timeline.js @@ -127,7 +127,7 @@ class Timeline extends Component { const series = new TimeSeries({ name: "statistics", columns: ["time"].concat(columns), - points: zeroFilledMetrics.map((m) => [m["range_start"]].concat(columns.map(c => + points: zeroFilledMetrics.map((m) => [m["range_start"]].concat(columns.map((c) => ((metric in m) && (m[metric] != null)) ? (m[metric][c] || 0) : 0 ))) }); diff --git a/frontend/src/components/filters/AdvancedFilters.js b/frontend/src/components/filters/AdvancedFilters.js index 15667a5..8598185 100644 --- a/frontend/src/components/filters/AdvancedFilters.js +++ b/frontend/src/components/filters/AdvancedFilters.js @@ -28,10 +28,10 @@ class AdvancedFilters extends Component { componentDidMount() { this.urlParams = new URLSearchParams(this.props.location.search); - this.connectionsFiltersCallback = payload => { + this.connectionsFiltersCallback = (payload) => { this.urlParams = updateParams(this.urlParams, payload); const active = ["client_address", "client_port", "min_duration", "max_duration", "min_bytes", "max_bytes"] - .some(f => this.urlParams.has(f)); + .some((f) => this.urlParams.has(f)); if (this.state.active !== active) { this.setState({active}); } diff --git a/frontend/src/components/filters/ExitSearchFilter.js b/frontend/src/components/filters/ExitSearchFilter.js index 72cfb0c..0aacfd6 100644 --- a/frontend/src/components/filters/ExitSearchFilter.js +++ b/frontend/src/components/filters/ExitSearchFilter.js @@ -28,7 +28,7 @@ class ExitSearchFilter extends Component { let params = new URLSearchParams(this.props.location.search); this.setState({performedSearch: params.get("performed_search")}); - this.connectionsFiltersCallback = payload => { + this.connectionsFiltersCallback = (payload) => { if (this.state.performedSearch !== payload["performed_search"]) { this.setState({performedSearch: payload["performed_search"]}); } diff --git a/frontend/src/components/filters/RulesConnectionsFilter.js b/frontend/src/components/filters/RulesConnectionsFilter.js index 37d36b7..210ee36 100644 --- a/frontend/src/components/filters/RulesConnectionsFilter.js +++ b/frontend/src/components/filters/RulesConnectionsFilter.js @@ -37,7 +37,7 @@ class RulesConnectionsFilter extends Component { backend.get("/api/rules").then((res) => { let rules = res.json.flatMap((rule) => rule.enabled ? [{id: rule.id, name: rule.name}] : []); - activeRules = rules.filter((rule) => activeRules.some(id => rule.id === id)); + activeRules = rules.filter((rule) => activeRules.some((id) => rule.id === id)); this.setState({rules, activeRules}); }); diff --git a/frontend/src/components/objects/Connection.js b/frontend/src/components/objects/Connection.js index e5896e9..b70b7f7 100644 --- a/frontend/src/components/objects/Connection.js +++ b/frontend/src/components/objects/Connection.js @@ -37,7 +37,7 @@ class Connection extends Component { if (name === "hide") { const enabled = !this.props.data.hidden; backend.post(`/api/connections/${this.props.data.id}/${enabled ? "hide" : "show"}`) - .then(_ => { + .then((_) => { this.props.onEnabled(!enabled); this.setState({update: true}); }); @@ -45,7 +45,7 @@ class Connection extends Component { if (name === "mark") { const marked = this.props.data.marked; backend.post(`/api/connections/${this.props.data.id}/${marked ? "unmark" : "mark"}`) - .then(_ => { + .then((_) => { this.props.onMarked(!marked); this.setState({update: true}); }); diff --git a/frontend/src/components/objects/ConnectionMatchedRules.js b/frontend/src/components/objects/ConnectionMatchedRules.js index cfd1254..a69cad8 100644 --- a/frontend/src/components/objects/ConnectionMatchedRules.js +++ b/frontend/src/components/objects/ConnectionMatchedRules.js @@ -33,8 +33,8 @@ class ConnectionMatchedRules extends Component { }; render() { - const matchedRules = this.props.matchedRules.map(mr => { - const rule = this.props.rules.find(r => r.id === mr); + const matchedRules = this.props.matchedRules.map((mr) => { + const rule = this.props.rules.find((r) => r.id === mr); return this.onMatchedRulesSelected(rule.id)} name={rule.name} color={rule.color} small/>; }); diff --git a/frontend/src/components/panels/ConnectionsPane.js b/frontend/src/components/panels/ConnectionsPane.js index 9418fad..457c249 100644 --- a/frontend/src/components/panels/ConnectionsPane.js +++ b/frontend/src/components/panels/ConnectionsPane.js @@ -61,8 +61,8 @@ class ConnectionsPane extends Component { const id = match[1]; additionalParams.from = id; backend.get(`/api/connections/${id}`) - .then(res => this.connectionSelected(res.json)) - .catch(error => log.error("Error loading initial connection", error)); + .then((res) => this.connectionSelected(res.json)) + .catch((error) => log.error("Error loading initial connection", error)); } this.loadConnections(additionalParams, urlParams, true).then(() => log.debug("Connections loaded")); @@ -283,11 +283,11 @@ class ConnectionsPane extends Component { { - this.state.connections.flatMap(c => { + this.state.connections.flatMap((c) => { return [ this.connectionSelected(c)} selected={this.state.selected === c.id} - onMarked={marked => c.marked = marked} - onEnabled={enabled => c.hidden = !enabled} + onMarked={(marked) => c.marked = marked} + onEnabled={(enabled) => c.hidden = !enabled} services={this.state.services}/>, c.matched_rules.length > 0 && { this.setState({ processStatusCode: res.status, diff --git a/frontend/src/components/panels/RulesPane.js b/frontend/src/components/panels/RulesPane.js index 0bbd407..cdfe185 100644 --- a/frontend/src/components/panels/RulesPane.js +++ b/frontend/src/components/panels/RulesPane.js @@ -103,17 +103,17 @@ class RulesPane extends Component { }; loadRules = () => { - backend.get("/api/rules").then(res => this.setState({rules: res.json, rulesStatusCode: res.status})) - .catch(res => this.setState({rulesStatusCode: res.status, rulesResponse: JSON.stringify(res.json)})); + backend.get("/api/rules").then((res) => this.setState({rules: res.json, rulesStatusCode: res.status})) + .catch((res) => this.setState({rulesStatusCode: res.status, rulesResponse: JSON.stringify(res.json)})); }; addRule = () => { if (this.validateRule(this.state.newRule)) { - backend.post("/api/rules", this.state.newRule).then(res => { + backend.post("/api/rules", this.state.newRule).then((res) => { this.reset(); this.setState({ruleStatusCode: res.status}); this.loadRules(); - }).catch(res => { + }).catch((res) => { this.setState({ruleStatusCode: res.status, ruleResponse: JSON.stringify(res.json)}); }); } @@ -122,11 +122,11 @@ class RulesPane extends Component { updateRule = () => { const rule = this.state.selectedRule; if (this.validateRule(rule)) { - backend.put(`/api/rules/${rule.id}`, rule).then(res => { + backend.put(`/api/rules/${rule.id}`, rule).then((res) => { this.reset(); this.setState({ruleStatusCode: res.status}); this.loadRules(); - }).catch(res => { + }).catch((res) => { this.setState({ruleStatusCode: res.status, ruleResponse: JSON.stringify(res.json)}); }); } @@ -247,7 +247,7 @@ class RulesPane extends Component { const rule = this.currentRule(); const pattern = this.state.selectedPattern || this.state.newPattern; - let rules = this.state.rules.map(r => + let rules = this.state.rules.map((r) => { this.reset(); this.setState({selectedRule: _.cloneDeep(r)}); @@ -262,7 +262,7 @@ class RulesPane extends Component { let patterns = (this.state.selectedPattern == null && !isUpdate ? rule.patterns.concat(this.state.newPattern) : rule.patterns - ).map(p => p === pattern ? + ).map((p) => p === pattern ?
- { + { return {name: t}; })} name="terms" min={3} inline allowNew={true} readonly={regexOptionsModified || options["text_search"]["exact_phrase"]} - onChange={(tags) => this.updateParam(s => s["text_search"].terms = tags.map(t => t.name))}/> + onChange={(tags) => this.updateParam((s) => s["text_search"].terms = tags.map(t => t.name))}/> { return {name: t}; })} name="excluded_terms" min={3} inline allowNew={true} readonly={regexOptionsModified || options["text_search"]["exact_phrase"]} - onChange={(tags) => this.updateParam(s => s["text_search"]["excluded_terms"] = tags.map(t => t.name))}/> + onChange={(tags) => this.updateParam((s) => s["text_search"]["excluded_terms"] = tags.map(t => t.name))}/> or this.updateParam(s => s["text_search"]["exact_phrase"] = v)} + onChange={(v) => this.updateParam((s) => s["text_search"]["exact_phrase"] = v)} readonly={regexOptionsModified || (Array.isArray(options["text_search"].terms) && options["text_search"].terms.length > 0)}/> this.updateParam(s => s["text_search"]["case_sensitive"] = v)}/> + onChange={(v) => this.updateParam((s) => s["text_search"]["case_sensitive"] = v)}/>
@@ -264,28 +264,28 @@ class SearchPane extends Component { this.updateParam(s => s["regex_search"].pattern = v)}/> + onChange={(v) => this.updateParam((s) => s["regex_search"].pattern = v)}/> or this.updateParam(s => s["regex_search"]["not_pattern"] = v)}/> + onChange={(v) => this.updateParam((s) => s["regex_search"]["not_pattern"] = v)}/>
this.updateParam(s => s["regex_search"]["case_insensitive"] = v)}/> + onChange={(v) => this.updateParam((s) => s["regex_search"]["case_insensitive"] = v)}/> this.updateParam(s => s["regex_search"]["multi_line"] = v)}/> + onChange={(v) => this.updateParam((s) => s["regex_search"]["multi_line"] = v)}/> this.updateParam(s => s["regex_search"]["ignore_whitespaces"] = v)}/> + onChange={(v) => this.updateParam((s) => s["regex_search"]["ignore_whitespaces"] = v)}/> this.updateParam(s => s["regex_search"]["dot_character"] = v)}/> + onChange={(v) => this.updateParam((s) => s["regex_search"]["dot_character"] = v)}/>
diff --git a/frontend/src/components/panels/ServicesPane.js b/frontend/src/components/panels/ServicesPane.js index 48d9e29..5986804 100644 --- a/frontend/src/components/panels/ServicesPane.js +++ b/frontend/src/components/panels/ServicesPane.js @@ -68,18 +68,18 @@ class ServicesPane extends Component { loadServices = () => { backend.get("/api/services") - .then(res => this.setState({services: Object.values(res.json), servicesStatusCode: res.status})) - .catch(res => this.setState({servicesStatusCode: res.status, servicesResponse: JSON.stringify(res.json)})); + .then((res) => this.setState({services: Object.values(res.json), servicesStatusCode: res.status})) + .catch((res) => this.setState({servicesStatusCode: res.status, servicesResponse: JSON.stringify(res.json)})); }; updateService = () => { const service = this.state.currentService; if (this.validateService(service)) { - backend.put("/api/services", service).then(res => { + backend.put("/api/services", service).then((res) => { this.reset(); this.setState({serviceStatusCode: res.status}); this.loadServices(); - }).catch(res => { + }).catch((res) => { this.setState({serviceStatusCode: res.status, serviceResponse: JSON.stringify(res.json)}); }); } @@ -126,7 +126,7 @@ class ServicesPane extends Component { const isUpdate = this.state.isUpdate; const service = this.state.currentService; - let services = this.state.services.map(s => + let services = this.state.services.map((s) => { this.reset(); this.setState({isUpdate: true, currentService: _.cloneDeep(s)}); diff --git a/frontend/src/components/panels/StreamsPane.js b/frontend/src/components/panels/StreamsPane.js index 1819fec..9470d7d 100644 --- a/frontend/src/components/panels/StreamsPane.js +++ b/frontend/src/components/panels/StreamsPane.js @@ -67,7 +67,7 @@ class StreamsPane extends Component { loadStream = (connectionId) => { this.setState({messages: [], currentId: connectionId}); backend.get(`/api/streams/${connectionId}?format=${this.state.format}`) - .then(res => this.setState({messages: res.json})); + .then((res) => this.setState({messages: res.json})); }; setFormat = (format) => { @@ -166,8 +166,8 @@ class StreamsPane extends Component { downloadStreamRaw = (value) => { if (this.state.currentId) { backend.download(`/api/streams/${this.props.connection.id}/download?format=${this.state.format}&type=${value}`) - .then(res => downloadBlob(res.blob, `${this.state.currentId}-${value}-${this.state.format}.txt`)) - .catch(_ => log.error("Failed to download stream messages")); + .then((res) => downloadBlob(res.blob, `${this.state.currentId}-${value}-${this.state.format}.txt`)) + .catch((_) => log.error("Failed to download stream messages")); } }; diff --git a/frontend/src/dispatcher.js b/frontend/src/dispatcher.js index ef5dbde..32f3f33 100644 --- a/frontend/src/dispatcher.js +++ b/frontend/src/dispatcher.js @@ -24,7 +24,7 @@ class Dispatcher { } dispatch = (topic, payload) => { - this.listeners.filter(l => l.topic === topic).forEach(l => l.callback(payload)); + this.listeners.filter((l) => l.topic === topic).forEach((l) => l.callback(payload)); }; register = (topic, callback) => { @@ -34,20 +34,20 @@ class Dispatcher { if (typeof topic === "string") { this.listeners.push({topic, callback}); } else if (typeof topic === "object" && Array.isArray(topic)) { - topic.forEach(e => { + topic.forEach((e) => { if (typeof e !== "string") { throw new Error("all topics must be strings"); } }); - topic.forEach(e => this.listeners.push({e, callback})); + topic.forEach((e) => this.listeners.push({e, callback})); } else { throw new Error("topic must be a string or an array of strings"); } }; unregister = (callback) => { - _.remove(this.listeners, l => l.callback === callback); + _.remove(this.listeners, (l) => l.callback === callback); }; } diff --git a/frontend/src/log.js b/frontend/src/log.js index 0afac47..9a75fbc 100644 --- a/frontend/src/log.js +++ b/frontend/src/log.js @@ -23,7 +23,7 @@ const log = { }; function isDevelopment() { - return !process.env.NODE_ENV || process.env.NODE_ENV === 'development'; + return !process.env.NODE_ENV || process.env.NODE_ENV === "development"; } export default log; diff --git a/parsers/http_request_parser.go b/parsers/http_request_parser.go index d7ed81c..98ba8e3 100644 --- a/parsers/http_request_parser.go +++ b/parsers/http_request_parser.go @@ -148,9 +148,8 @@ func fetchRequest(request *http.Request, body string) string { if jsonData := toJSON(data); jsonData != "" { return "fetch(\"" + request.URL.String() + "\", " + jsonData + ");" - } else { - return "invalid-request" } + return "invalid-request" } func toJSON(obj interface{}) string { -- cgit v1.2.3-70-g09d2