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.

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

V2 1 rc2 master into preview #386

Merged
merged 61 commits into from
Jun 10, 2020
Merged

V2 1 rc2 master into preview #386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
d174d59
Adding back the prod deployment blocker (#189)
kremi Aug 9, 2019
8731f7f
Merging branch 1.4.x into master
NikolaNaydenov Aug 20, 2019
f224037
extra tests for code quality (#196)
Aug 20, 2019
f94c0cc
Merge branch '1.4.x' of github.com:hmcts/idam-web-public
NikolaNaydenov Aug 20, 2019
e6d5ea4
Removing blocker for go live
NikolaNaydenov Aug 27, 2019
4bb7c16
Load vault secrets fix
NikolaNaydenov Aug 27, 2019
934d75e
Security fix
NikolaNaydenov Aug 27, 2019
aaa8965
Adding go live blocker
NikolaNaydenov Aug 28, 2019
91446c4
Securityscan master (#197)
dfourn Aug 28, 2019
ba52459
[PREVIEW] Fixing the pipeline (#211)
dfourn Sep 18, 2019
54cebfd
[PREVIEW] Minor content changes for 1.4.1 (#210)
dfourn Sep 18, 2019
a00aeb5
[PREVIEW] 1.4.1 Scope Change (#216) (#218)
nikola-naydenov-hmcts Sep 25, 2019
6a15b73
Add CVE-14540 and 16335 supressions
NikolaNaydenov Sep 25, 2019
f735457
Adding prod blocker
NikolaNaydenov Oct 1, 2019
2db2a6c
Disable functional tests
NikolaNaydenov Oct 1, 2019
a9db5c5
Web public tests 1.5 (#267)
shravanmechineni Nov 11, 2019
17d4778
feat(SIDM-3410-ips): filter out internal ips from policy valuation (#…
tbamido Nov 14, 2019
26e44e1
This should fix the ArrAffinity token problem (#277)
nikola-naydenov-hmcts Nov 20, 2019
390d5d6
feat(SIDM-3441-sso): Policy eval: remove bearer auth token (#283)
tbamido Nov 20, 2019
80c12ca
Include fix for 1.5 (#275)
nikola-naydenov-hmcts Nov 21, 2019
aed261e
feat(sidm-3410-rc2): merge 3410 preview into RC (#284)
tbamido Nov 21, 2019
b0eeb2e
feat(SIDM-3437-redir): login/mfa: redirecting using slash (#280) (#287)
tbamido Nov 21, 2019
27515dd
Mergin 1.5.RC
NikolaNaydenov Nov 29, 2019
16c2a31
Adding prod blocker
NikolaNaydenov Nov 29, 2019
5454a95
Duplicated code fix
NikolaNaydenov Nov 29, 2019
fcff4be
Enable functionals
NikolaNaydenov Dec 2, 2019
e1af002
Update contact us details. (#253)
dfourn Nov 6, 2019
f150aac
Removing prod blocker
NikolaNaydenov Dec 4, 2019
231e8f2
Merging 1.5.1.RC
NikolaNaydenov Jan 20, 2020
3741de9
Eliminating vulnerabilities
NikolaNaydenov Jan 30, 2020
86b0950
Removing blocker
NikolaNaydenov Jan 30, 2020
1ebdebd
Disable functionals
NikolaNaydenov Jan 30, 2020
e3b48fc
Merge branch 'master' into 2-0-0-rc1
kremi Mar 10, 2020
383f3fe
Adding support for multiple affinity cookies (#332)
nikola-naydenov-hmcts Mar 12, 2020
263106a
Apply suggestions from code review
henrydobson Mar 13, 2020
bea12c6
remove waits and add suggestions
Mar 13, 2020
6b00701
fix test failure
Mar 13, 2020
c8b5f6e
Merge branch '2-0-0-rc1' of github.com:hmcts/idam-web-public into 2-0…
Mar 13, 2020
f655528
add wait for failing tests
Mar 13, 2020
28cf6b8
ci(prod blocker): add
henrydobson Mar 13, 2020
8d8e3f1
fix hmcts policy set for block user test
Mar 13, 2020
ac3829d
Merge branch '2-0-0-rc1' of github.com:hmcts/idam-web-public into 2-0…
Mar 13, 2020
ba2c99f
fix(aat deployment): add credential and environment overrides
henrydobson Mar 14, 2020
b79a13c
2.0 RC (#330)
kremi Mar 14, 2020
0ca8d72
feat(chart): aat values
henrydobson Mar 23, 2020
19309ca
Merge remote-tracking branch 'origin/master' into 2-0-0-rc1
henrydobson Mar 23, 2020
0ba09e0
2.0.0 RC1 aat values (#336)
henrydobson Mar 23, 2020
dfd495c
Merge remote-tracking branch 'origin/master' into 2-0-0-rc1
henrydobson Mar 23, 2020
70bab50
fix(docker): flexvolume mapping to property
henrydobson Mar 23, 2020
38e0150
fix(idam-aat): add test variables (#338)
henrydobson Mar 26, 2020
3a5120a
SIDM-2868 - Add nightly tests for 2.0.0 (#341)
henrydobson Mar 26, 2020
9bac306
SIDM-3977 - v2 fix selfservice (#351)
henrydobson Apr 6, 2020
bb506f1
chore(idam-prod): remove prod blocker (#358)
henrydobson Apr 20, 2020
1a8c0ef
Zap Scanner exclusions
May 4, 2020
9108e45
excluding contact-us.* from zap scanner
May 6, 2020
c4c81c9
excluding login.* from zap scanner
May 6, 2020
ceea998
Ignoring some reverse proxy false positives
May 11, 2020
7c2b849
v2 rc1 (#375)
henrydobson Jun 9, 2020
72a500b
v2.1-rc2 (#379)
tbamido Jun 10, 2020
85355d3
V2 1 rc2 preview into master (#383)
tbamido Jun 10, 2020
bd00fb4
Merge branch 'master' into v2-1-rc2-master-into-preview
tbamido Jun 10, 2020
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
4 changes: 4 additions & 0 deletions Jenkinsfile_CNP
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,4 +188,8 @@ withPipeline(type, product, component) {
reportName : "IDAM Web Public E2E functional tests result"
]
}

before('buildinfra:idam-prod') {
error('Stopping pipeline before Prod stages')
}
}
2 changes: 1 addition & 1 deletion security.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,4 @@ chown -R $(id -u):$(id -u) activescan.html
cp *.html functional-output/
zap-cli -p $ZAP_PORT alerts -l Informational
zap-cli --zap-url http://$ZAP_HOST -p $ZAP_PORT alerts -l High --exit-code False
curl --fail http://${ZAP_HOST}:${ZAP_PORT}/OTHER/core/other/jsonreport/?formMethod=GET --output report.json
curl --fail http://${ZAP_HOST}:${ZAP_PORT}/OTHER/core/other/jsonreport/?formMethod=GET --output report.json