Skip to content

Commit

Permalink
Merge branch 'main' into dsomm
Browse files Browse the repository at this point in the history
Signed-off-by: Spyros <[email protected]>
  • Loading branch information
northdpole authored Nov 19, 2023
2 parents feea868 + d1f2162 commit e191859
Show file tree
Hide file tree
Showing 7 changed files with 554 additions and 4 deletions.
10 changes: 9 additions & 1 deletion .slugignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,12 @@ cres/
.devcontainer/
docs/
application/tests
application/frontend/src/test/basic-e2e.test.ts
application/frontend/src/test/basic-e2e.test.ts
.github
README.md
LICENSE
CONTRIBUTING.md
.gitignore
.dockerignore
Dockerfile-dev
docker-entrypoint.sh
7 changes: 6 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,12 @@ migrate-downgrade:

import-all:
[ -d "./venv" ] && . ./venv/bin/activate
rm -rf standards_cache.sqlite && make migrate-upgrade && export FLASK_APP=$(CURDIR)/cre.py && python cre.py --add --from_spreadsheet https://docs.google.com/spreadsheets/d/1eZOEYgts7d_-Dr-1oAbogPfzBLh6511b58pX3b59kvg && python cre.py --generate_embeddings && python cre.py --zap_in --cheatsheets_in --github_tools_in --capec_in --owasp_secure_headers_in --pci_dss_4_in --juiceshop_in --dsomm_in && python cre.py --generate_embeddings
rm -rf standards_cache.sqlite &&\
make migrate-upgrade && export FLASK_APP=$(CURDIR)/cre.py &&\
python cre.py --add --from_spreadsheet https://docs.google.com/spreadsheets/d/1eZOEYgts7d_-Dr-1oAbogPfzBLh6511b58pX3b59kvg &&\
python cre.py --generate_embeddings && \
python cre.py --zap_in --cheatsheets_in --github_tools_in --capec_in --owasp_secure_headers_in --pci_dss_4_in --juiceshop_in --dsomm_in --dsomm_in --cloud_native_security_controls_in &&\
python cre.py --generate_embeddings

import-neo4j:
[ -d "./venv" ] && . ./venv/bin/activate
Expand Down
6 changes: 5 additions & 1 deletion application/cmd/cre_main.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
pci_dss,
juiceshop,
dsomm,
cloud_native_security_controls,
)
from application.prompt_client import prompt_client as prompt_client
from application.utils import gap_analysis
Expand Down Expand Up @@ -419,7 +420,10 @@ def run(args: argparse.Namespace) -> None: # pragma: no cover
dsomm.parse(
cache=db_connect(args.cache_file),
)

if args.cloud_native_security_controls_in:
cloud_native_security_controls.parse(
cache=db_connect(args.cache_file),
)
if args.generate_embeddings:
generate_embeddings(args.cache_file)
if args.owasp_proj_meta:
Expand Down
Loading

0 comments on commit e191859

Please sign in to comment.