Skip to content

Commit 2895e84

Browse files
blink1073blink1073
authored
PYTHON-4818 Use OCSP Scripts from Drivers-Tools (mongodb#1895)
1 parent ac198af commit 2895e84

File tree

1 file changed

+47
-74
lines changed

1 file changed

+47
-74
lines changed

‎.evergreen/config.yml

Lines changed: 47 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -651,63 +651,16 @@ functions:
651651
CA_FILE="${DRIVERS_TOOLS}/.evergreen/ocsp/${OCSP_ALGORITHM}/ca.pem" \
652652
OCSP_TLS_SHOULD_SUCCEED="${OCSP_TLS_SHOULD_SUCCEED}" \
653653
bash ${PROJECT_DIRECTORY}/.evergreen/hatch.sh test:test-eg
654+
bash ${DRIVERS_TOOLS}/.evergreen/ocsp/teardown.sh
654655
655-
run-valid-ocsp-server:
656-
- command: shell.exec
657-
params:
658-
background: true
659-
script: |
660-
. src/.evergreen/scripts/env.sh
661-
cd ${DRIVERS_TOOLS}/.evergreen/ocsp
662-
. ./activate-ocspvenv.sh
663-
python ocsp_mock.py \
664-
--ca_file ${OCSP_ALGORITHM}/ca.pem \
665-
--ocsp_responder_cert ${OCSP_ALGORITHM}/ca.crt \
666-
--ocsp_responder_key ${OCSP_ALGORITHM}/ca.key \
667-
-p 8100 -v
668-
run-revoked-ocsp-server:
669-
- command: shell.exec
670-
params:
671-
background: true
672-
script: |
673-
. src/.evergreen/scripts/env.sh
674-
cd ${DRIVERS_TOOLS}/.evergreen/ocsp
675-
. ./activate-ocspvenv.sh
676-
python ocsp_mock.py \
677-
--ca_file ${OCSP_ALGORITHM}/ca.pem \
678-
--ocsp_responder_cert ${OCSP_ALGORITHM}/ca.crt \
679-
--ocsp_responder_key ${OCSP_ALGORITHM}/ca.key \
680-
-p 8100 \
681-
-v \
682-
--fault revoked
683-
run-valid-delegate-ocsp-server:
684-
- command: shell.exec
685-
params:
686-
background: true
687-
script: |
688-
. src/.evergreen/scripts/env.sh
689-
cd ${DRIVERS_TOOLS}/.evergreen/ocsp
690-
. ./activate-ocspvenv.sh
691-
python ocsp_mock.py \
692-
--ca_file ${OCSP_ALGORITHM}/ca.pem \
693-
--ocsp_responder_cert ${OCSP_ALGORITHM}/ocsp-responder.crt \
694-
--ocsp_responder_key ${OCSP_ALGORITHM}/ocsp-responder.key \
695-
-p 8100 -v
696-
run-revoked-delegate-ocsp-server:
697-
- command: shell.exec
656+
"run-ocsp-server":
657+
- command: subprocess.exec
698658
params:
699659
background: true
700-
script: |
701-
. src/.evergreen/scripts/env.sh
702-
cd ${DRIVERS_TOOLS}/.evergreen/ocsp
703-
. ./activate-ocspvenv.sh
704-
python ocsp_mock.py \
705-
--ca_file ${OCSP_ALGORITHM}/ca.pem \
706-
--ocsp_responder_cert ${OCSP_ALGORITHM}/ocsp-responder.crt \
707-
--ocsp_responder_key ${OCSP_ALGORITHM}/ocsp-responder.key \
708-
-p 8100 \
709-
-v \
710-
--fault revoked
660+
binary: bash
661+
include_expansions_in_env: [SERVER_TYPE, OCSP_ALGORITHM]
662+
args:
663+
- ${DRIVERS_TOOLS}/.evergreen/ocsp/setup.sh
711664

712665
"run load-balancer":
713666
- command: shell.exec
@@ -1360,9 +1313,10 @@ tasks:
13601313
- name: test-ocsp-rsa-valid-cert-server-staples
13611314
tags: ["ocsp", "ocsp-rsa", "ocsp-staple"]
13621315
commands:
1363-
- func: run-valid-ocsp-server
1316+
- func: run-ocsp-server
13641317
vars:
13651318
OCSP_ALGORITHM: "rsa"
1319+
SERVER_TYPE: "valid"
13661320
- func: "bootstrap mongo-orchestration"
13671321
vars:
13681322
ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json"
@@ -1374,9 +1328,10 @@ tasks:
13741328
- name: test-ocsp-rsa-invalid-cert-server-staples
13751329
tags: ["ocsp", "ocsp-rsa", "ocsp-staple"]
13761330
commands:
1377-
- func: run-revoked-ocsp-server
1331+
- func: run-ocsp-server
13781332
vars:
13791333
OCSP_ALGORITHM: "rsa"
1334+
SERVER_TYPE: "revoked"
13801335
- func: "bootstrap mongo-orchestration"
13811336
vars:
13821337
ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json"
@@ -1388,9 +1343,10 @@ tasks:
13881343
- name: test-ocsp-rsa-valid-cert-server-does-not-staple
13891344
tags: ["ocsp", "ocsp-rsa"]
13901345
commands:
1391-
- func: run-valid-ocsp-server
1346+
- func: run-ocsp-server
13921347
vars:
13931348
OCSP_ALGORITHM: "rsa"
1349+
SERVER_TYPE: valid
13941350
- func: "bootstrap mongo-orchestration"
13951351
vars:
13961352
ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json"
@@ -1402,9 +1358,10 @@ tasks:
14021358
- name: test-ocsp-rsa-invalid-cert-server-does-not-staple
14031359
tags: ["ocsp", "ocsp-rsa"]
14041360
commands:
1405-
- func: run-revoked-ocsp-server
1361+
- func: run-ocsp-server
14061362
vars:
14071363
OCSP_ALGORITHM: "rsa"
1364+
SERVER_TYPE: revoked
14081365
- func: "bootstrap mongo-orchestration"
14091366
vars:
14101367
ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json"
@@ -1427,9 +1384,10 @@ tasks:
14271384
- name: test-ocsp-rsa-malicious-invalid-cert-mustStaple-server-does-not-staple
14281385
tags: ["ocsp", "ocsp-rsa"]
14291386
commands:
1430-
- func: run-revoked-ocsp-server
1387+
- func: run-ocsp-server
14311388
vars:
14321389
OCSP_ALGORITHM: "rsa"
1390+
SERVER_TYPE: revoked
14331391
- func: "bootstrap mongo-orchestration"
14341392
vars:
14351393
ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple-disableStapling.json"
@@ -1452,9 +1410,10 @@ tasks:
14521410
- name: test-ocsp-rsa-delegate-valid-cert-server-staples
14531411
tags: ["ocsp", "ocsp-rsa", "ocsp-staple"]
14541412
commands:
1455-
- func: run-valid-delegate-ocsp-server
1413+
- func: run-ocsp-server
14561414
vars:
14571415
OCSP_ALGORITHM: "rsa"
1416+
SERVER_TYPE: valid-delegate
14581417
- func: "bootstrap mongo-orchestration"
14591418
vars:
14601419
ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json"
@@ -1466,9 +1425,10 @@ tasks:
14661425
- name: test-ocsp-rsa-delegate-invalid-cert-server-staples
14671426
tags: ["ocsp", "ocsp-rsa", "ocsp-staple"]
14681427
commands:
1469-
- func: run-revoked-delegate-ocsp-server
1428+
- func: run-ocsp-server
14701429
vars:
14711430
OCSP_ALGORITHM: "rsa"
1431+
SERVER_TYPE: revoked-delegate
14721432
- func: "bootstrap mongo-orchestration"
14731433
vars:
14741434
ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json"
@@ -1480,9 +1440,10 @@ tasks:
14801440
- name: test-ocsp-rsa-delegate-valid-cert-server-does-not-staple
14811441
tags: ["ocsp", "ocsp-rsa"]
14821442
commands:
1483-
- func: run-valid-delegate-ocsp-server
1443+
- func: run-ocsp-server
14841444
vars:
14851445
OCSP_ALGORITHM: "rsa"
1446+
SERVER_TYPE: valid-delegate
14861447
- func: "bootstrap mongo-orchestration"
14871448
vars:
14881449
ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json"
@@ -1494,9 +1455,10 @@ tasks:
14941455
- name: test-ocsp-rsa-delegate-invalid-cert-server-does-not-staple
14951456
tags: ["ocsp", "ocsp-rsa"]
14961457
commands:
1497-
- func: run-revoked-delegate-ocsp-server
1458+
- func: run-ocsp-server
14981459
vars:
14991460
OCSP_ALGORITHM: "rsa"
1461+
SERVER_TYPE: revoked-delegate
15001462
- func: "bootstrap mongo-orchestration"
15011463
vars:
15021464
ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json"
@@ -1508,9 +1470,10 @@ tasks:
15081470
- name: test-ocsp-rsa-delegate-malicious-invalid-cert-mustStaple-server-does-not-staple
15091471
tags: ["ocsp", "ocsp-rsa"]
15101472
commands:
1511-
- func: run-revoked-delegate-ocsp-server
1473+
- func: run-ocsp-server
15121474
vars:
15131475
OCSP_ALGORITHM: "rsa"
1476+
SERVER_TYPE: revoked-delegate
15141477
- func: "bootstrap mongo-orchestration"
15151478
vars:
15161479
ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple-disableStapling.json"
@@ -1522,9 +1485,10 @@ tasks:
15221485
- name: test-ocsp-ecdsa-valid-cert-server-staples
15231486
tags: ["ocsp", "ocsp-ecdsa", "ocsp-staple"]
15241487
commands:
1525-
- func: run-valid-ocsp-server
1488+
- func: run-ocsp-server
15261489
vars:
15271490
OCSP_ALGORITHM: "ecdsa"
1491+
SERVER_TYPE: valid
15281492
- func: "bootstrap mongo-orchestration"
15291493
vars:
15301494
ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json"
@@ -1536,9 +1500,10 @@ tasks:
15361500
- name: test-ocsp-ecdsa-invalid-cert-server-staples
15371501
tags: ["ocsp", "ocsp-ecdsa", "ocsp-staple"]
15381502
commands:
1539-
- func: run-revoked-ocsp-server
1503+
- func: run-ocsp-server
15401504
vars:
15411505
OCSP_ALGORITHM: "ecdsa"
1506+
SERVER_TYPE: revoked
15421507
- func: "bootstrap mongo-orchestration"
15431508
vars:
15441509
ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json"
@@ -1550,9 +1515,10 @@ tasks:
15501515
- name: test-ocsp-ecdsa-valid-cert-server-does-not-staple
15511516
tags: ["ocsp", "ocsp-ecdsa"]
15521517
commands:
1553-
- func: run-valid-ocsp-server
1518+
- func: run-ocsp-server
15541519
vars:
15551520
OCSP_ALGORITHM: "ecdsa"
1521+
SERVER_TYPE: valid
15561522
- func: "bootstrap mongo-orchestration"
15571523
vars:
15581524
ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json"
@@ -1564,9 +1530,10 @@ tasks:
15641530
- name: test-ocsp-ecdsa-invalid-cert-server-does-not-staple
15651531
tags: ["ocsp", "ocsp-ecdsa"]
15661532
commands:
1567-
- func: run-revoked-ocsp-server
1533+
- func: run-ocsp-server
15681534
vars:
15691535
OCSP_ALGORITHM: "ecdsa"
1536+
SERVER_TYPE: revoked
15701537
- func: "bootstrap mongo-orchestration"
15711538
vars:
15721539
ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json"
@@ -1589,9 +1556,10 @@ tasks:
15891556
- name: test-ocsp-ecdsa-malicious-invalid-cert-mustStaple-server-does-not-staple
15901557
tags: ["ocsp", "ocsp-ecdsa"]
15911558
commands:
1592-
- func: run-revoked-ocsp-server
1559+
- func: run-ocsp-server
15931560
vars:
15941561
OCSP_ALGORITHM: "ecdsa"
1562+
SERVER_TYPE: revoked
15951563
- func: "bootstrap mongo-orchestration"
15961564
vars:
15971565
ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json"
@@ -1614,9 +1582,10 @@ tasks:
16141582
- name: test-ocsp-ecdsa-delegate-valid-cert-server-staples
16151583
tags: ["ocsp", "ocsp-ecdsa", "ocsp-staple"]
16161584
commands:
1617-
- func: run-valid-delegate-ocsp-server
1585+
- func: run-ocsp-server
16181586
vars:
16191587
OCSP_ALGORITHM: "ecdsa"
1588+
SERVER_TYPE: valid-delegate
16201589
- func: "bootstrap mongo-orchestration"
16211590
vars:
16221591
ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json"
@@ -1628,9 +1597,10 @@ tasks:
16281597
- name: test-ocsp-ecdsa-delegate-invalid-cert-server-staples
16291598
tags: ["ocsp", "ocsp-ecdsa", "ocsp-staple"]
16301599
commands:
1631-
- func: run-revoked-delegate-ocsp-server
1600+
- func: run-ocsp-server
16321601
vars:
16331602
OCSP_ALGORITHM: "ecdsa"
1603+
SERVER_TYPE: revoked-delegate
16341604
- func: "bootstrap mongo-orchestration"
16351605
vars:
16361606
ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json"
@@ -1642,9 +1612,10 @@ tasks:
16421612
- name: test-ocsp-ecdsa-delegate-valid-cert-server-does-not-staple
16431613
tags: ["ocsp", "ocsp-ecdsa"]
16441614
commands:
1645-
- func: run-valid-delegate-ocsp-server
1615+
- func: run-ocsp-server
16461616
vars:
16471617
OCSP_ALGORITHM: "ecdsa"
1618+
SERVER_TYPE: valid-delegate
16481619
- func: "bootstrap mongo-orchestration"
16491620
vars:
16501621
ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json"
@@ -1656,9 +1627,10 @@ tasks:
16561627
- name: test-ocsp-ecdsa-delegate-invalid-cert-server-does-not-staple
16571628
tags: ["ocsp", "ocsp-ecdsa"]
16581629
commands:
1659-
- func: run-revoked-delegate-ocsp-server
1630+
- func: run-ocsp-server
16601631
vars:
16611632
OCSP_ALGORITHM: "ecdsa"
1633+
SERVER_TYPE: revoked-delegate
16621634
- func: "bootstrap mongo-orchestration"
16631635
vars:
16641636
ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json"
@@ -1670,9 +1642,10 @@ tasks:
16701642
- name: test-ocsp-ecdsa-delegate-malicious-invalid-cert-mustStaple-server-does-not-staple
16711643
tags: ["ocsp", "ocsp-ecdsa"]
16721644
commands:
1673-
- func: run-revoked-delegate-ocsp-server
1645+
- func: run-ocsp-server
16741646
vars:
16751647
OCSP_ALGORITHM: "ecdsa"
1648+
SERVER_TYPE: valid-delegate
16761649
- func: "bootstrap mongo-orchestration"
16771650
vars:
16781651
ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json"

0 commit comments

Comments
 (0)