Skip to content

Fix engine healthcheck of cli #73

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
J12934 merged 3 commits into from
Mar 15, 2019
Merged

Fix engine healthcheck of cli #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a1c05d
Removed travis folding
J12934 Mar 15, 2019
c8d7cfc
Corrected engine endpoint and expected response
J12934 Mar 15, 2019
ae063ed
Added basic integration test for cli
J12934 Mar 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,10 @@ script:
- npm test -- --verbose --forceExit
after_failure:
- docker ps -a
- echo -en "travis_fold:start:EngineLogs\r"
- docker logs securecodebox_engine_1
- echo -en "travis_fold:end:EngineLogs\r"
- echo -en "travis_fold:start:ZapLogs\r"
- docker logs securecodebox_scanner-webapplication-zap_1
- echo -en "travis_fold:end:ZapLogs\r"
- echo -en "travis_fold:start:ArachniLogs\r"
- docker logs securecodebox_scanner-webapplication-arachni_1
- echo -en "travis_fold:end:ArachniLogs\r"
- echo -en "travis_fold:start:AmassLogs\r"
- docker logs securecodebox_scanner-infrastructure-amass_1
- echo -en "travis_fold:end:AmassLogs\r"
- echo -en "travis_fold:start:NmapLogs\r"
- docker logs securecodebox_scanner-infrastructure-nmap_1
- echo -en "travis_fold:end:NmapLogs\r"
- echo -en "travis_fold:start:SSLyzeLogs\r"
- docker logs securecodebox_scanner-webapplication-sslyze_1
- echo -en "travis_fold:end:SSLyzeLogs\r"
- echo -en "travis_fold:start:NiktoLogs\r"
- docker logs securecodebox_scanner-webserver-nikto_1
- echo -en "travis_fold:end:NiktoLogs\r"
6 changes: 3 additions & 3 deletions cli/run_scanner.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,9 +266,9 @@ if [ $(is_number "$MAX_ITER") != true ]; then
fi

# Verify that SCB is reachable
response=`curl --connect-timeout 5 --silent --stderr --insecure ${CURL_AUTH_ARG} ${SCB_URL}/processes/`
if [[ ! ${response} == *"key"* ]]; then
error "Failed to contact engine service! Used URI: '${SCB_URL}/processes/" "${response}"
response=`curl --connect-timeout 5 --silent --stderr --insecure ${CURL_AUTH_ARG} ${SCB_URL}/securityTests/definitions`
if [[ ! ${response} == *"nmap"* ]]; then
error "Failed to contact engine service! Used URI: '${SCB_URL}/securityTests/definitions" "${response}"
NUM_ERRORS=$((NUM_ERRORS + 1))
fi

Expand Down
25 changes: 25 additions & 0 deletions test/cli.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
const { Time } = require('./sdk');
const child_process = require('child_process');

test(
'finds open juice-shop ports when started via cli',
async () => {
const authstring = `${global.username}:${global.password}`;
child_process.execSync(
`./run_scanner.sh -a ${authstring} nmap juice-shop`,
{
cwd: '../cli',
}
);

const { report } = require('../cli/job_nmap_result.json');

expect(report.findings.length).toBe(1);

expect(report.findings[0].description).toBe(
'Port 3000 is open using tcp protocol.'
);
expect(report.findings[0].category).toBe('Open Port');
},
1 * Time.Minute
);