marker/shuffle-cracked
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor fixes from code scanning that had no direct necessary impact

Browse Source
This commit is contained in:
Frikky
2025-03-21 12:37:09 +01:00
parent bc936ab137
commit 9476020b50
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/go-app/main.go
+1 -1
View File
@@ -4458,7 +4458,7 @@ func handleStopCloudSync(syncUrl string, org shuffle.Org) (*shuffle.Org, error)
return &org, errors.New(fmt.Sprintf("Couldn't find any sync key to disable org %s", org.Id)) return &org, errors.New(fmt.Sprintf("Couldn't find any sync key to disable org %s", org.Id))
} }
log.Printf("[INFO] Should run cloud sync disable for org %s with URL %s and sync key %s", org.Id, syncUrl, org.SyncConfig.Apikey) log.Printf("[INFO] Should run cloud sync disable for org %s with URL %s", org.Id, syncUrl)
client := shuffle.GetExternalClient(syncUrl) client := shuffle.GetExternalClient(syncUrl)
req, err := http.NewRequest( req, err := http.NewRequest(
functions/onprem/orborus/orborus.go
+6 -3
View File
@@ -986,8 +986,6 @@ func fixk8sRoles() {
} }
} }
func int32Ptr(i int32) *int32 { return &i }
func deployK8sWorker(image string, identifier string, env []string) error { func deployK8sWorker(image string, identifier string, env []string) error {
env = append(env, fmt.Sprintf("IS_KUBERNETES=true")) env = append(env, fmt.Sprintf("IS_KUBERNETES=true"))
env = append(env, fmt.Sprintf("KUBERNETES_NAMESPACE=%s", os.Getenv("KUBERNETES_NAMESPACE"))) env = append(env, fmt.Sprintf("KUBERNETES_NAMESPACE=%s", os.Getenv("KUBERNETES_NAMESPACE")))
@@ -1199,7 +1197,7 @@ func deployK8sWorker(image string, identifier string, env []string) error {
Name: identifier, Name: identifier,
}, },
Spec: appsv1.DeploymentSpec{ Spec: appsv1.DeploymentSpec{
Replicas: int32Ptr(replicaNumberInt32), Replicas: &replicaNumberInt32,
Selector: &metav1.LabelSelector{ Selector: &metav1.LabelSelector{
MatchLabels: containerLabels, MatchLabels: containerLabels,
}, },
@@ -3338,6 +3336,11 @@ func extractZIP(zipFile, destDir string) error {
} }
for _, f := range r.File { for _, f := range r.File {
// Fix path traversal
if strings.Contains(f.Name, "..") {
return fmt.Errorf("illegal file name: %s", f.Name)
}
err := extractFile(f, destDir) err := extractFile(f, destDir)
if err != nil { if err != nil {
return err return err
functions/onprem/worker/worker.go
+2 -4
View File
@@ -389,8 +389,6 @@ func shutdown(workflowExecution shuffle.WorkflowExecution, nodeId string, reason
} }
} }
func int32Ptr(i int32) *int32 { return &i }
// ** STARTREMOVE ***/ // ** STARTREMOVE ***/
func deployk8sApp(image string, identifier string, env []string) error { func deployk8sApp(image string, identifier string, env []string) error {
if len(os.Getenv("KUBERNETES_NAMESPACE")) > 0 { if len(os.Getenv("KUBERNETES_NAMESPACE")) > 0 {
@@ -569,7 +567,7 @@ func deployk8sApp(image string, identifier string, env []string) error {
Name: podName, Name: podName,
}, },
Spec: appsv1.DeploymentSpec{ Spec: appsv1.DeploymentSpec{
Replicas: int32Ptr(replicaNumberInt32), Replicas: &replicaNumberInt32,
Selector: &metav1.LabelSelector{ Selector: &metav1.LabelSelector{
MatchLabels: map[string]string{ MatchLabels: map[string]string{
"app": podName, "app": podName,
@@ -919,7 +917,7 @@ func deployApp(cli *dockerclient.Client, image string, identifier string, env []
Env: env, Env: env,
} }
log.Printf("[DEBUG] Deploying image with env: %#v", env) //log.Printf("[DEBUG] Deploying image with env: %#v", env)
// Checking as late as possible, just in case. // Checking as late as possible, just in case.
newExecId := fmt.Sprintf("%s_%s", workflowExecution.ExecutionId, action.ID) newExecId := fmt.Sprintf("%s_%s", workflowExecution.ExecutionId, action.ID)