Fixed frontend vulnerabilities

This commit is contained in:
frikky
2021-02-03 03:03:50 +01:00
parent 7c0b0c8c2b
commit 11ddf604ec
5 changed files with 12 additions and 6 deletions
+1
View File
@@ -1476,6 +1476,7 @@ class AppBase:
#json_replacement = tmpitem.replace(actualitem[0][0], replacement, 1) #json_replacement = tmpitem.replace(actualitem[0][0], replacement, 1)
#print("AFTER POST replacement: %s" % json_replacement) #print("AFTER POST replacement: %s" % json_replacement)
#json_replacement = replacement
try: try:
json_replacement = json.loads(replacement) json_replacement = json.loads(replacement)
except json.decoder.JSONDecodeError as e: except json.decoder.JSONDecodeError as e:
+2 -2
View File
@@ -36,7 +36,7 @@
"react-alert": "^5.5.0", "react-alert": "^5.5.0",
"react-alert-template-basic": "^1.0.0", "react-alert-template-basic": "^1.0.0",
"react-beforeunload": "^2.2.1", "react-beforeunload": "^2.2.1",
"react-chartjs-2": "^2.8.0", "react-chartjs-2": "^2.11.1",
"react-cookie": "^4.0.1", "react-cookie": "^4.0.1",
"react-cytoscapejs": "^1.2.0", "react-cytoscapejs": "^1.2.0",
"react-device-detect": "^1.9.10", "react-device-detect": "^1.9.10",
@@ -52,7 +52,7 @@
"react-powerhooks": "0.0.7", "react-powerhooks": "0.0.7",
"react-router": "^4.3.1", "react-router": "^4.3.1",
"react-router-dom": "^4.3.1", "react-router-dom": "^4.3.1",
"react-scripts": "^3.4.1", "react-scripts": "^4.0.1",
"reactstrap": "^7.1.0", "reactstrap": "^7.1.0",
"shellwords": "^0.1.1", "shellwords": "^0.1.1",
"simplebar": "^4.2.3", "simplebar": "^4.2.3",
+2 -2
View File
@@ -1702,7 +1702,7 @@ const AppCreator = (props) => {
<FormControl style={{backgroundColor: surfaceColor, color: "white",}}> <FormControl style={{backgroundColor: surfaceColor, color: "white",}}>
<DialogTitle><div style={{color: "white"}}>New action</div></DialogTitle> <DialogTitle><div style={{color: "white"}}>New action</div></DialogTitle>
<DialogContent> <DialogContent>
<a target="_blank" href="https://shuffler.io/docs/apps#actions" style={{textDecoration: "none", color: "#f85a3e"}}>Learn more about actions</Link> <a target="_blank" href="https://shuffler.io/docs/workflows#conditions" style={{textDecoration: "none", color: "#f85a3e"}}>Learn more about actions</a>
<div style={{marginTop: "15px"}}/> <div style={{marginTop: "15px"}}/>
Name Name
<TextField <TextField
@@ -2033,7 +2033,7 @@ const AppCreator = (props) => {
<div style={{color: "white"}}> <div style={{color: "white"}}>
<h2>Actions ({actions.length})</h2> <h2>Actions ({actions.length})</h2>
Actions are the tasks performed by an app. Read more about actions and apps Actions are the tasks performed by an app. Read more about actions and apps
<a target="_blank" href="https://shuffler.io/docs/apps#actions" style={{textDecoration: "none", color: "#f85a3e"}}> here</Link>. <a target="_blank" src="https://shuffler.io/docs/apps#actions" style={{textDecoration: "none", color: "#f85a3e"}}> here</a>.
<div> <div>
{loopActions} {loopActions}
<div style={{display: "flex"}}> <div style={{display: "flex"}}>
+5
View File
@@ -168,6 +168,10 @@ const Apps = (props) => {
}) })
function sortByKey(array, key) { function sortByKey(array, key) {
if (array === undefined || array === null) {
return []
}
return array.sort(function(a, b) { return array.sort(function(a, b) {
var x = a[key]; var x = a[key];
var y = b[key]; var y = b[key];
@@ -222,6 +226,7 @@ const Apps = (props) => {
return response.json() return response.json()
}) })
.then((responseJson) => { .then((responseJson) => {
console.log("Apps: ", responseJson)
responseJson = sortByKey(responseJson, "large_image") responseJson = sortByKey(responseJson, "large_image")
setApps(responseJson) setApps(responseJson)
+2 -2
View File
@@ -839,7 +839,7 @@ func shutdown(executionId, workflowId string) {
log.Printf("[INFO] Failed abort request: %s", err) log.Printf("[INFO] Failed abort request: %s", err)
} }
sleepDuration := 0 sleepDuration := 1
log.Printf("[INFO] Finished shutdown (after %d seconds).", sleepDuration) log.Printf("[INFO] Finished shutdown (after %d seconds).", sleepDuration)
// Allows everything to finish in subprocesses // Allows everything to finish in subprocesses
time.Sleep(time.Duration(sleepDuration) * time.Second) time.Sleep(time.Duration(sleepDuration) * time.Second)
@@ -2754,7 +2754,7 @@ func main() {
if firstRequest { if firstRequest {
firstRequest = false firstRequest = false
workflowExecution.StartedAt = int64(time.Now().Unix()) //workflowExecution.StartedAt = int64(time.Now().Unix())
cacheKey := fmt.Sprintf("workflowexecution-%s", workflowExecution.ExecutionId) cacheKey := fmt.Sprintf("workflowexecution-%s", workflowExecution.ExecutionId)
requestCache = cache.New(5*time.Minute, 10*time.Minute) requestCache = cache.New(5*time.Minute, 10*time.Minute)