@@ -27,6 +27,9 @@ noc_cert_1_subject="MIGCMQswCQYDVQQGEwJVWjETMBEGA1UECAwKU29tZSBTdGF0ZTETMBEGA1UE
27
27
noc_cert_1_subject_key_id=" 02:72:6E:BC:BB:EF:D6:BD:8D:9B:42:AE:D4:3C:C0:55:5F:66:3A:B3"
28
28
noc_cert_1_serial_number=" 631388393741945881054190991612463928825155142122"
29
29
30
+ noc_cert_1_copy_path=" integration_tests/constants/noc_cert_1_copy"
31
+ noc_cert_1_copy_serial_number=" 169445068204646961882009388640343665944683778293"
32
+
30
33
noc_cert_2_path=" integration_tests/constants/noc_cert_2"
31
34
noc_cert_2_subject=" MIGCMQswCQYDVQQGEwJVWjETMBEGA1UECAwKU29tZSBTdGF0ZTETMBEGA1UEBwwKU29tZSBTdGF0ZTEYMBYGA1UECgwPRXhhbXBsZSBDb21wYW55MRkwFwYDVQQLDBBUZXN0aW5nIERpdmlzaW9uMRQwEgYDVQQDDAtOT0MtY2hpbGQtMg=="
32
35
noc_cert_2_subject_key_id=" 87:48:A2:33:12:1F:51:5C:93:E6:90:40:4A:2C:AB:9E:D6:19:E5:AD"
@@ -221,12 +224,17 @@ echo "Add second NOC certificate by vendor with VID = $vid"
221
224
result=$( echo " $passphrase " | dcld tx pki add-noc-x509-cert --certificate=" $noc_cert_2_path " --from $vendor_account --yes)
222
225
check_response " $result " " \" code\" : 0"
223
226
227
+ echo " Add third NOC certificate by vendor with VID = $vid "
228
+ result=$( echo " $passphrase " | dcld tx pki add-noc-x509-cert --certificate=" $noc_cert_1_copy_path " --from $vendor_account --yes)
229
+ check_response " $result " " \" code\" : 0"
230
+
224
231
echo " Request all NOC certificates"
225
232
result=$( dcld query pki all-noc-x509-certs)
226
233
echo $result | jq
227
234
check_response " $result " " \" subject\" : \" $noc_cert_1_subject \" "
228
235
check_response " $result " " \" subjectKeyId\" : \" $noc_cert_1_subject_key_id \" "
229
236
check_response " $result " " \" serialNumber\" : \" $noc_cert_1_serial_number \" "
237
+ check_response " $result " " \" serialNumber\" : \" $noc_cert_1_copy_serial_number \" "
230
238
check_response " $result " " \" subject\" : \" $noc_cert_2_subject \" "
231
239
check_response " $result " " \" subjectKeyId\" : \" $noc_cert_2_subject_key_id \" "
232
240
check_response " $result " " \" serialNumber\" : \" $noc_cert_2_serial_number \" "
@@ -240,6 +248,7 @@ check_response "$result" "\"serialNumber\": \"$noc_root_cert_1_serial_number\""
240
248
check_response " $result " " \" subject\" : \" $noc_cert_1_subject \" "
241
249
check_response " $result " " \" subjectKeyId\" : \" $noc_cert_1_subject_key_id \" "
242
250
check_response " $result " " \" serialNumber\" : \" $noc_cert_1_serial_number \" "
251
+ check_response " $result " " \" serialNumber\" : \" $noc_cert_1_copy_serial_number \" "
243
252
check_response " $result " " \" subject\" : \" $noc_cert_2_subject \" "
244
253
check_response " $result " " \" subjectKeyId\" : \" $noc_cert_2_subject_key_id \" "
245
254
check_response " $result " " \" serialNumber\" : \" $noc_cert_2_serial_number \" "
@@ -266,10 +275,11 @@ echo "Request all NOC certificates"
266
275
result=$( dcld query pki all-noc-x509-certs)
267
276
echo $result | jq
268
277
check_response " $result " " \" serialNumber\" : \" $noc_cert_1_serial_number \" "
278
+ check_response " $result " " \" serialNumber\" : \" $noc_cert_1_copy_serial_number \" "
269
279
check_response " $result " " \" serialNumber\" : \" $noc_cert_2_serial_number \" "
270
280
check_response " $result " " \" serialNumber\" : \" $noc_leaf_cert_1_serial_number \" "
271
281
272
- echo " Try to revoke intermediate with different VID = $vid_2 "
282
+ echo " Try to revoke NOC root certificate with different VID = $vid_2 "
273
283
result=$( echo " $passphrase " | dcld tx pki revoke-noc-x509-root-cert --subject=" $noc_root_cert_1_subject " --subject-key-id=" $noc_root_cert_1_subject_key_id " --from $vendor_account_2 --yes)
274
284
check_response " $result " " \" code\" : 439"
275
285
@@ -349,13 +359,15 @@ check_response "$result" "\"subject\": \"$noc_leaf_cert_1_subject\""
349
359
check_response " $result " " \" subjectKeyId\" : \" $noc_cert_1_subject_key_id \" "
350
360
check_response " $result " " \" subjectKeyId\" : \" $noc_leaf_cert_1_subject_key_id \" "
351
361
check_response " $result " " \" serialNumber\" : \" $noc_cert_1_serial_number \" "
362
+ check_response " $result " " \" serialNumber\" : \" $noc_cert_1_copy_serial_number \" "
352
363
check_response " $result " " \" serialNumber\" : \" $noc_leaf_cert_1_serial_number \" "
353
364
354
365
echo " Request all approved certificates should not contain revoked NOC root certificates"
355
366
result=$( dcld query pki all-x509-certs)
356
367
check_response " $result " " \" subject\" : \" $noc_cert_1_subject \" "
357
368
check_response " $result " " \" subjectKeyId\" : \" $noc_cert_1_subject_key_id \" "
358
369
check_response " $result " " \" serialNumber\" : \" $noc_cert_1_serial_number \" "
370
+ check_response " $result " " \" serialNumber\" : \" $noc_cert_1_copy_serial_number \" "
359
371
check_response " $result " " \" subject\" : \" $noc_leaf_cert_1_subject \" "
360
372
check_response " $result " " \" subjectKeyId\" : \" $noc_leaf_cert_1_subject_key_id \" "
361
373
check_response " $result " " \" serialNumber\" : \" $noc_leaf_cert_1_serial_number \" "
@@ -365,4 +377,71 @@ response_does_not_contain "$result" "\"serialNumber\": \"$noc_root_cert_1_serial
365
377
response_does_not_contain " $result " " \" serialNumber\" : \" $noc_root_cert_1_copy_serial_number \" "
366
378
echo $result | jq
367
379
368
- test_divider
380
+ test_divider
381
+
382
+ echo " REVOCATION OF NON-ROOT NOC CERTIFICATES"
383
+
384
+ echo " Try to revoke NOC certificate with different VID = $vid_2 "
385
+ result=$( echo " $passphrase " | dcld tx pki revoke-noc-x509-cert --subject=" $noc_cert_1_subject " --subject-key-id=" $noc_cert_1_subject_key_id " --from $vendor_account_2 --yes)
386
+ check_response " $result " " \" code\" : 439"
387
+
388
+ echo " $vendor_account Vendor revokes only NOC certificates, it should not revoke leaf certificates"
389
+ result=$( echo " $passphrase " | dcld tx pki revoke-noc-x509-cert --subject=" $noc_cert_1_subject " --subject-key-id=" $noc_cert_1_subject_key_id " --from=$vendor_account --yes)
390
+ check_response " $result " " \" code\" : 0"
391
+
392
+ echo " Request all revoked certificates should not contain leaf certificate"
393
+ result=$( dcld query pki all-revoked-x509-certs)
394
+ echo $result | jq
395
+ check_response " $result " " \" subject\" : \" $noc_root_cert_1_subject "
396
+ check_response " $result " " \" subjectKeyId\" : \" $noc_root_cert_1_subject_key_id \" "
397
+ check_response " $result " " \" serialNumber\" : \" $noc_root_cert_1_serial_number \" "
398
+ check_response " $result " " \" serialNumber\" : \" $noc_root_cert_1_copy_serial_number \" "
399
+ check_response " $result " " \" subject\" : \" $noc_cert_1_subject \" "
400
+ check_response " $result " " \" subjectKeyId\" : \" $noc_cert_1_subject_key_id \" "
401
+ check_response " $result " " \" serialNumber\" : \" $noc_cert_1_serial_number "
402
+ response_does_not_contain " $result " " \" subject\" : \" $noc_leaf_cert_1_subject \" "
403
+ response_does_not_contain " $result " " \" subjectKeyId\" : \" $noc_leaf_cert_1_subject_key_id \" "
404
+ response_does_not_contain " $result " " \" serialNumber\" : \" $noc_leaf_cert_1_serial_number "
405
+
406
+ echo " Request all revoked noc root certificates should not contain non-root NOC certificates"
407
+ result=$( dcld query pki all-revoked-noc-x509-root-certs)
408
+ echo $result | jq
409
+ response_does_not_contain " $result " " \" subjectKeyId\" : \" $noc_cert_1_subject_key_id "
410
+ response_does_not_contain " $result " " \" subjectKeyId\" : \" $noc_leaf_cert_1_subject_key_id \" "
411
+
412
+ echo " Request all certificates by subject must be empty"
413
+ result=$( dcld query pki all-subject-x509-certs --subject=" $noc_cert_1_subject " )
414
+ response_does_not_contain " $result " " \" subject\" : \" $noc_cert_1_subject \" "
415
+ response_does_not_contain " $result " " \" subjectKeyId\" : \" $noc_cert_1_subject_key_id \" "
416
+ echo $result | jq
417
+
418
+ echo " Request all certificates by subjectKeyId must be empty"
419
+ result=$( dcld query pki x509-cert --subject-key-id=" $noc_cert_1_subject_key_id " )
420
+ check_response " $result " " Not Found"
421
+ response_does_not_contain " $result " " \" subject\" : \" $noc_cert_1_subject \" "
422
+ response_does_not_contain " $result " " \" subjectKeyId\" : \" $noc_cert_1_subject_key_id \" "
423
+ response_does_not_contain " $result " " \" serialNumber\" : \" $noc_cert_1_serial_number \" "
424
+ response_does_not_contain " $result " " \" serialNumber\" : \" $noc_cert_1_copy_serial_number \" "
425
+ echo $result | jq
426
+
427
+ echo " Request NOC certificate by VID = $vid should contain one leaf certificate"
428
+ result=$( dcld query pki noc-x509-certs --vid=" $vid " )
429
+ echo $result | jq
430
+ check_response " $result " " \" subject\" : \" $noc_leaf_cert_1_subject \" "
431
+ check_response " $result " " \" subjectKeyId\" : \" $noc_leaf_cert_1_subject_key_id \" "
432
+ response_does_not_contain " $result " " \" subject\" : \" $noc_cert_1_subject \" "
433
+ response_does_not_contain " $result " " \" subjectKeyId\" : \" $noc_cert_1_subject_key_id \" "
434
+
435
+ echo " Request all approved certificates should not contain revoked NOC certificates"
436
+ result=$( dcld query pki all-x509-certs)
437
+ check_response " $result " " \" subject\" : \" $noc_leaf_cert_1_subject \" "
438
+ check_response " $result " " \" subjectKeyId\" : \" $noc_leaf_cert_1_subject_key_id \" "
439
+ check_response " $result " " \" serialNumber\" : \" $noc_leaf_cert_1_serial_number \" "
440
+ response_does_not_contain " $result " " \" subject\" : \" $noc_cert_1_subject \" "
441
+ response_does_not_contain " $result " " \" subjectKeyId\" : \" $noc_cert_1_subject_key_id \" "
442
+ response_does_not_contain " $result " " \" serialNumber\" : \" $noc_cert_1_serial_number \" "
443
+ response_does_not_contain " $result " " \" subject\" : \" $noc_root_cert_1_subject \" "
444
+ response_does_not_contain " $result " " \" subjectKeyId\" : \" $noc_root_cert_1_subject_key_id \" "
445
+ response_does_not_contain " $result " " \" serialNumber\" : \" $noc_root_cert_1_serial_number \" "
446
+ response_does_not_contain " $result " " \" serialNumber\" : \" $noc_root_cert_1_copy_serial_number \" "
447
+ echo $result | jq
0 commit comments