Skip to content

Commit 673dafb

Browse files
blink1073blink1073
committed
update tasks
1 parent 176b086 commit 673dafb

File tree

2 files changed

+122
-20
lines changed

2 files changed

+122
-20
lines changed

‎.evergreen/generated_configs/tasks.yml

Lines changed: 112 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -777,8 +777,36 @@ tasks:
777777
OCSP_SERVER_TYPE: revoked
778778
TEST_NAME: ocsp
779779
tags: [ocsp, ocsp-ecdsa]
780+
- name: test-ocsp-ecdsa-basic-tls-ocsp-disableStapling-valid-delegate
781+
commands:
782+
- func: run server
783+
vars:
784+
TEST_NAME: ocsp
785+
ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-disableStapling.json
786+
- func: run tests
787+
vars:
788+
ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-disableStapling.json
789+
OCSP_SERVER_TYPE: valid-delegate
790+
TEST_NAME: ocsp
791+
tags: [ocsp, ocsp-ecdsa]
792+
- name: test-ocsp-ecdsa-basic-tls-ocsp-disableStapling-revoked-delegate
793+
commands:
794+
- func: run server
795+
vars:
796+
TEST_NAME: ocsp
797+
ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-disableStapling.json
798+
- func: run tests
799+
vars:
800+
ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-disableStapling.json
801+
OCSP_SERVER_TYPE: revoked-delegate
802+
TEST_NAME: ocsp
803+
tags: [ocsp, ocsp-ecdsa]
780804
- name: test-ocsp-ecdsa-basic-tls-ocsp-disableStapling-no-responder
781805
commands:
806+
- func: run server
807+
vars:
808+
TEST_NAME: ocsp
809+
ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-disableStapling.json
782810
- func: run tests
783811
vars:
784812
ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-disableStapling.json
@@ -809,8 +837,36 @@ tasks:
809837
OCSP_SERVER_TYPE: revoked
810838
TEST_NAME: ocsp
811839
tags: [ocsp, ocsp-ecdsa]
840+
- name: test-ocsp-ecdsa-basic-tls-ocsp-mustStaple-disableStapling-valid-delegate
841+
commands:
842+
- func: run server
843+
vars:
844+
TEST_NAME: ocsp
845+
ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json
846+
- func: run tests
847+
vars:
848+
ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json
849+
OCSP_SERVER_TYPE: valid-delegate
850+
TEST_NAME: ocsp
851+
tags: [ocsp, ocsp-ecdsa]
852+
- name: test-ocsp-ecdsa-basic-tls-ocsp-mustStaple-disableStapling-revoked-delegate
853+
commands:
854+
- func: run server
855+
vars:
856+
TEST_NAME: ocsp
857+
ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json
858+
- func: run tests
859+
vars:
860+
ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json
861+
OCSP_SERVER_TYPE: revoked-delegate
862+
TEST_NAME: ocsp
863+
tags: [ocsp, ocsp-ecdsa]
812864
- name: test-ocsp-ecdsa-basic-tls-ocsp-mustStaple-disableStapling-no-responder
813865
commands:
866+
- func: run server
867+
vars:
868+
TEST_NAME: ocsp
869+
ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json
814870
- func: run tests
815871
vars:
816872
ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json
@@ -841,14 +897,6 @@ tasks:
841897
OCSP_SERVER_TYPE: revoked
842898
TEST_NAME: ocsp
843899
tags: [ocsp, ocsp-ecdsa, ocsp-staple]
844-
- name: test-ocsp-ecdsa-basic-tls-ocsp-mustStaple-no-responder
845-
commands:
846-
- func: run tests
847-
vars:
848-
ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-mustStaple.json
849-
OCSP_SERVER_TYPE: no-responder
850-
TEST_NAME: ocsp
851-
tags: [ocsp, ocsp-ecdsa, ocsp-staple]
852900
- name: test-ocsp-ecdsa-basic-tls-ocsp-mustStaple-valid-delegate
853901
commands:
854902
- func: run server
@@ -897,8 +945,36 @@ tasks:
897945
OCSP_SERVER_TYPE: revoked
898946
TEST_NAME: ocsp
899947
tags: [ocsp, ocsp-rsa]
948+
- name: test-ocsp-rsa-basic-tls-ocsp-mustStaple-disableStapling-valid-delegate
949+
commands:
950+
- func: run server
951+
vars:
952+
TEST_NAME: ocsp
953+
ORCHESTRATION_FILE: rsa-basic-tls-ocsp-mustStaple-disableStapling.json
954+
- func: run tests
955+
vars:
956+
ORCHESTRATION_FILE: rsa-basic-tls-ocsp-mustStaple-disableStapling.json
957+
OCSP_SERVER_TYPE: valid-delegate
958+
TEST_NAME: ocsp
959+
tags: [ocsp, ocsp-rsa]
960+
- name: test-ocsp-rsa-basic-tls-ocsp-mustStaple-disableStapling-revoked-delegate
961+
commands:
962+
- func: run server
963+
vars:
964+
TEST_NAME: ocsp
965+
ORCHESTRATION_FILE: rsa-basic-tls-ocsp-mustStaple-disableStapling.json
966+
- func: run tests
967+
vars:
968+
ORCHESTRATION_FILE: rsa-basic-tls-ocsp-mustStaple-disableStapling.json
969+
OCSP_SERVER_TYPE: revoked-delegate
970+
TEST_NAME: ocsp
971+
tags: [ocsp, ocsp-rsa]
900972
- name: test-ocsp-rsa-basic-tls-ocsp-mustStaple-disableStapling-no-responder
901973
commands:
974+
- func: run server
975+
vars:
976+
TEST_NAME: ocsp
977+
ORCHESTRATION_FILE: rsa-basic-tls-ocsp-mustStaple-disableStapling.json
902978
- func: run tests
903979
vars:
904980
ORCHESTRATION_FILE: rsa-basic-tls-ocsp-mustStaple-disableStapling.json
@@ -929,8 +1005,36 @@ tasks:
9291005
OCSP_SERVER_TYPE: revoked
9301006
TEST_NAME: ocsp
9311007
tags: [ocsp, ocsp-rsa]
1008+
- name: test-ocsp-rsa-basic-tls-ocsp-disableStapling-valid-delegate
1009+
commands:
1010+
- func: run server
1011+
vars:
1012+
TEST_NAME: ocsp
1013+
ORCHESTRATION_FILE: rsa-basic-tls-ocsp-disableStapling.json
1014+
- func: run tests
1015+
vars:
1016+
ORCHESTRATION_FILE: rsa-basic-tls-ocsp-disableStapling.json
1017+
OCSP_SERVER_TYPE: valid-delegate
1018+
TEST_NAME: ocsp
1019+
tags: [ocsp, ocsp-rsa]
1020+
- name: test-ocsp-rsa-basic-tls-ocsp-disableStapling-revoked-delegate
1021+
commands:
1022+
- func: run server
1023+
vars:
1024+
TEST_NAME: ocsp
1025+
ORCHESTRATION_FILE: rsa-basic-tls-ocsp-disableStapling.json
1026+
- func: run tests
1027+
vars:
1028+
ORCHESTRATION_FILE: rsa-basic-tls-ocsp-disableStapling.json
1029+
OCSP_SERVER_TYPE: revoked-delegate
1030+
TEST_NAME: ocsp
1031+
tags: [ocsp, ocsp-rsa]
9321032
- name: test-ocsp-rsa-basic-tls-ocsp-disableStapling-no-responder
9331033
commands:
1034+
- func: run server
1035+
vars:
1036+
TEST_NAME: ocsp
1037+
ORCHESTRATION_FILE: rsa-basic-tls-ocsp-disableStapling.json
9341038
- func: run tests
9351039
vars:
9361040
ORCHESTRATION_FILE: rsa-basic-tls-ocsp-disableStapling.json
@@ -961,14 +1065,6 @@ tasks:
9611065
OCSP_SERVER_TYPE: revoked
9621066
TEST_NAME: ocsp
9631067
tags: [ocsp, ocsp-rsa, ocsp-staple]
964-
- name: test-ocsp-rsa-basic-tls-ocsp-mustStaple-no-responder
965-
commands:
966-
- func: run tests
967-
vars:
968-
ORCHESTRATION_FILE: rsa-basic-tls-ocsp-mustStaple.json
969-
OCSP_SERVER_TYPE: no-responder
970-
TEST_NAME: ocsp
971-
tags: [ocsp, ocsp-rsa, ocsp-staple]
9721068
- name: test-ocsp-rsa-basic-tls-ocsp-mustStaple-valid-delegate
9731069
commands:
9741070
- func: run server

‎.evergreen/scripts/generate_config.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -911,12 +911,18 @@ def create_ocsp_tasks():
911911
for path in config_path.glob("*ocsp*"):
912912
if "singleEndpoint" in path.name:
913913
continue
914-
server_types = ["valid", "revoked", "no-responder"]
915-
if "disableStapling" not in path.name:
916-
server_types.extend(["valid-delegate", "revoked-delegate"])
917-
for server_type in server_types:
914+
# Handle the tests that start an OCSP server.
915+
for server_type in ["valid", "revoked", "valid-delegate", "revoked-delegate"]:
918916
task = _create_ocsp_task(path.name, server_type)
919917
tasks.append(task)
918+
# Soft Fail Test: No OCSP Responder + server that does not staple.
919+
if "basic-tls-ocsp-disableStapling.json" in path.name:
920+
task = _create_ocsp_task(path.name, "no-responder")
921+
tasks.append(task)
922+
# Malicious Server Test 2: No OCSP Responder + server w/ Must- Staple cert that does not staple.
923+
elif "basic-tls-ocsp-mustStaple-disableStapling.json" in path.name:
924+
task = _create_ocsp_task(path.name, "no-responder")
925+
tasks.append(task)
920926

921927
return tasks
922928

0 commit comments

Comments
 (0)