Skip to content

Commit 6cea1b5

Browse files
author
siewrgrz
committed
Fix to dependency track running scripts
1 parent 495db59 commit 6cea1b5

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

DependencyTrackScripts/dTrackJs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
#!/bin/sh
1+
#!/bin/bash
22
PROJECT=$1
33
URL=$2
44
TOKEN=$3
55
npm install --save ignore-errors
66
cyclonedx-bom -o bom.xml
77
BOM=$(base64 bom.xml |tr -d \\n)
88
POSTDATA="{\"project\":\"$PROJECT\",\"bom\":\"$BOM\"}"
9-
curl -X "PUT" $URL \
9+
curl -X "PUT" "$URL/api/v1/bom" \
1010
-k \
1111
--noproxy "*" \
1212
-H 'Content-Type: application/json' \

DependencyTrackScripts/dTrackMvn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
#!/bin/sh
1+
#!/bin/bash
22
PROJECT=$1
33
URL=$2
44
TOKEN=$3
55
mvn org.cyclonedx:cyclonedx-maven-plugin:makeAggregateBom
66
BOM=$(base64 target/bom.xml |tr -d \\n)
77
POSTDATA="{\"project\":\"$PROJECT\",\"bom\":\"$BOM\"}"
8-
curl -X "PUT" $URL \
8+
curl -X "PUT" "$URL/api/v1/bom" \
99
-k \
1010
--noproxy "*" \
1111
-H 'Content-Type: application/json' \

DependencyTrackScripts/dTrackPHP

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
#!/bin/sh
1+
#!/bin/bash
22
PROJECT=$1
33
URL=$2
44
TOKEN=$3
55
composer require --dev cyclonedx/cyclonedx-php-composer --ignore-platform-reqs
66
composer make-bom
77
BOM=$(base64 bom.xml |tr -d \\n)
88
POSTDATA="{\"project\":\"$PROJECT\",\"bom\":\"$BOM\"}"
9-
curl -X "PUT" $URL \
9+
curl -X "PUT" "$URL/api/v1/bom" \
1010
-k \
1111
--noproxy "*" \
1212
-H 'Content-Type: application/json' \

DependencyTrackScripts/dTrackPy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
#!/bin/sh
1+
#!/bin/bash
22
PROJECT=$1
33
URL=$2
44
TOKEN=$3
55
pip freeze > requirements.txt
66
cyclonedx-py -i requirements.txt -o bom.xml
77
BOM=$(base64 bom.xml |tr -d \\n)
88
POSTDATA="{\"project\":\"$PROJECT\",\"bom\":\"$BOM\"}"
9-
curl -X "PUT" $PROJECT \
9+
curl -X "PUT" "$URL/api/v1/bom" \
1010
-k \
1111
--noproxy "*" \
1212
-H 'Content-Type: application/json' \

src/main/java/io/mixeway/fortifyscaapi/dtrack/DependencyTrackScriptExecutor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public void runDTrackScript(CreateScanRequest createScanRequest, Project project
1515
logger.info("Starting to generate BOM for {}", project.getProjectName());
1616

1717
ProcessBuilder builder = new ProcessBuilder();
18-
builder.command("sh", "-c", script,project.getdTrackUuid(), createScanRequest.getdTrackUrl(), createScanRequest.getdTrackToken());
18+
builder.command("/bin/sh", script,project.getdTrackUuid(), createScanRequest.getdTrackUrl(), createScanRequest.getdTrackToken());
1919
logger.info("Running {} inside {}",String.join(" ",
2020
Arrays.asList("sh", "-c", script,project.getdTrackUuid(), createScanRequest.getdTrackUrl(), createScanRequest.getdTrackToken())),
2121
path.toFile());

0 commit comments

Comments
 (0)