Skip to content
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.

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

Mv dependencies #1820

Merged
merged 28 commits into from
Jun 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
1e11789
0.11.1 okta
Nov 11, 2022
b9116ec
Merge branch '0.11.1-okta' into 'main'
Nov 11, 2022
a0bdf7a
add_baseline feature
Dec 13, 2022
942b6e1
Merge branch 'develop' into 'main'
Dec 14, 2022
346233c
Update siteapp/authentication/OIDCAuthentication.py
Jan 14, 2023
6434f20
Merge branch 'OIDC_fix' into 'main'
Jan 18, 2023
31e8e63
Dynamically set Internet schme (http or https) for swagger interface
Jan 28, 2023
23596c9
Bulk update a component's statements across all systems
Feb 24, 2023
dbe61aa
Added support for multiple overlays and compliance catalogs
Mar 2, 2023
1b5da58
Add SAST and secrets detection to linting
Apr 25, 2023
d40fdfb
Merge branch 'load-default-ssp' into 'main'
May 2, 2023
a96a984
Sync requirements.in with latest version
May 8, 2023
6fb277f
Merge branch 'multiverse/requirements' into 'main'
Jun 1, 2023
f97fe0e
1-Add CMMCv2 catalog/baselines
Jun 5, 2023
0a4d8cc
1-Update python libraries for urllib3
Jun 5, 2023
c68eb68
2-Add --extra-index-url to requirements.txt
Jun 5, 2023
fa907a2
3-Change python index to pypi.org/simple
Jun 5, 2023
40831f3
4-Bump pyopenssl==23.2.0
Jun 5, 2023
6ca98c8
5-downgrade to Django 18
Jun 6, 2023
d33752b
6-Controls/models.py auto_prefetch.Model.Meta
Jun 6, 2023
cc37e7f
7-Bump Django version to 3.2.19
Jun 7, 2023
b63f768
8-Point index-url to pypi
Jun 7, 2023
2107189
1-Add CMMCv2 catalog/baselines
Jun 5, 2023
2d359ac
2-Updated python libraries
Jun 9, 2023
4640129
2-updated requirements files
Jun 9, 2023
8381485
3-GovReady updae python requirements
Jun 9, 2023
f779a92
Delete q-files/vendors/laurasia directory
wbnod Jun 19, 2023
f81bfaf
Merge branch 'mv-dependencies' into mv-dependencies
gregelin Jun 25, 2023
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
69 changes: 69 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
# see http://editorconfig.org
root = true

[*]
end_of_line = lf
trim_trailing_whitespace = true
insert_final_newline = false
indent_style = space
indent_size = 4
charset = utf-8

[*.{tf,tfvars,tpl}]
end_of_line = lf
trim_trailing_whitespace = true
insert_final_newline = true
indent_style = space
indent_size = 2
charset = utf-8

[*.sh]
indent_style = unset
trim_trailing_whitespace = unset
insert_final_newline = unset
indent_size = 2
charset = utf-8

[*.py]
charset = utf-8

[*.md]
trim_trailing_whitespace = false
indent_size = 2
charset = utf-8

[*.{yml,ansible-lint,yamllint}]
end_of_line = lf
trim_trailing_whitespace = true
insert_final_newline = true
indent_style = space
indent_size = 2
charset = utf-8

[Makefile]
indent_style = tab
indent_size = 1

[*.ps1]
indent_style = space
indent_size = 4

[*.snyk]
indent_size = 2
charset = utf-8

[/**]
indent_size = unset
insert_final_newline = unset
indent_size = unset
indent_style = unset
insert_final_newline = unset
trim_trailing_whitespace = unset

[q-files/**]
indent_size = unset
insert_final_newline = unset
indent_size = unset
indent_style = unset
insert_final_newline = unset
trim_trailing_whitespace = unset
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -128,4 +128,4 @@ frontend/static/
environment.okta.json

# branding
*_branding
*_branding
122 changes: 122 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
---
variables:
PYTHONIOENCODING: "utf-8"
LDRNET_CERT: $LDRNET_CERT
UMBRELLA_CERT: $UMBRELLA_CERT

default:
tags:
- docker

include:
- template: Jobs/SAST-IaC.gitlab-ci.yml
- template: Jobs/SAST.gitlab-ci.yml
- template: Jobs/Secret-Detection.gitlab-ci.yml

stages:
- lint
- test

lint-terraform:
stage: lint
image:
name: hashicorp/terraform:latest
entrypoint: [""]
environment:
name: "Terraform Lint Check"
script:
- terraform fmt -check=true -diff=true -recursive
when: always
only:
- pushes
- merge_requests
tags:
- docker

lint-editorconfig:
stage: lint
image: moskey71/eclint-lint:v1
script:
- make -f /Makefile eclint/lint
when: always
only:
- pushes
- merge_requests
tags:
- docker

secret_detection:
tags:
- docker

iac-sast:
tags:
- docker

kics-iac-sast:
tags:
- docker

sast:
tags:
- docker

bandit-sast:
tags:
- docker

brakeman-sast:
tags:
- docker

eslint-sast:
tags:
- docker

flawfinder-sast:
tags:
- docker

kubesec-sast:
tags:
- docker

gosec-sast:
tags:
- docker

mobsf-android-sast:
tags:
- docker

mobsf-ios-sast:
tags:
- docker

nodejs-scan-sast:
tags:
- docker

phpcs-security-audit-sast:
tags:
- docker

pmd-apex-sast:
tags:
- docker

security-code-scan-sast:
tags:
- docker

semgrep-sast:
tags:
- docker

sobelow-sast:
tags:
- docker

spotbugs-sast:
tags:
- docker
13 changes: 13 additions & 0 deletions .yamllint
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
extends: default
rules:
document-end: disable
document-start: disable
comments:
min-spaces-from-content: 1
line-length:
level: warning
max: 500

yaml-files:
- '*.yaml'
81 changes: 72 additions & 9 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,69 @@
GovReady-Q Release Notes
========================
v0.12.2-multi (June 5, 2023)
---------------------------

* Add CMMC version2 catalog and baseline level 1 & 2
* Updated VERSION and CHANGELOG.md

**Laurasia changes**

v0.12.1-dev (April 19, 2023)
---------------------------

**Laurasia changes**

* Add new siteapp/management/commands to load default Laurasia SSP if it doesn't exist. This works
around the problem of this feature in API.

- Bulk update a component's statements across all systems
- Add JSIG and Privacy catalogs/baselines
- Extended Django Webhooks and Management Commands
- load_app_template.py calls a compliance app template like JSIG_SSP
- set_baseline_controls.py sets compliance catalog baseline
- Add support for multiple overlays
- load_component_from_library.py places a Library Component into a target SSP
- import_control_catalog.py allows uploading a new control catalog source
- Update python packages and pin urllib3
- Add Laurasia JSIG questionnaire template and Appsource
- Added support for printing SSP with multiple catalogs

v0.11.6 (March 14, 2023)
---------------------------

**Developer changes**

* Upgrade Python libraries.

**Developer changes**
* Add siteapp.management_views as webhooks for calling Django management commands.

v0.11.5 (March 2, 2023)
---------------------------

**Developer changes**

* Upgrade Python libraries.
* Update npm packages.

v0.12.0-dev (February 4, 2022)
---------------------------

**Developer changes**

* Add API endpoint and Element (component) model method to force update all Element consuming systems's control implementation statements with library Elements content.
* Add parameter createOSCAL API endpoint to indicate update existing components.
* Upgrade Python libraries.
* Update NPM libraries.


v0.11.4 (December 17, 2022)
---------------------------

**Developer changes**

* Dynamically set Internet schme (http or https) for swagger interface to support proper URL strings in swagger.


v0.11.7 (June 11, 2023)
---------------------------
Expand Down Expand Up @@ -45,8 +109,7 @@ v0.11.3 (December 10, 2022)

**Developer changes**

* Add processing for question actions targeted at system to handle `system/add_baseline/<value>` to add additional baseline set of controls to a system without deleting already assigned controls.A

* Add processing for question actions targeted at system to handle `system/add_baseline/<value>` to add additional baseline set of controls to a system without deleting already assigned controls.

v0.11.2 (December 10, 2022)
---------------------------
Expand Down Expand Up @@ -2048,12 +2111,12 @@ v0.9.1.20 (May 31, 2020)
# Legacy version local/environment.json file using deprecated host, https parameter

{
"db": "mysql://USER:PASSWORD@HOST:PORT/NAME",
"host": "localhost:8000",
"https": false,
"debug": false,
"secret-key": "long_random_string_here",
...
"db": "mysql://USER:PASSWORD@HOST:PORT/NAME",
"host": "localhost:8000",
"https": false,
"debug": false,
"secret-key": "long_random_string_here",
...
}
```

Expand Down Expand Up @@ -2889,4 +2952,4 @@ Development changes:
v0.7.0-rc2 (January 8, 2018)
----------------------------

First release.
First release.
Loading