Skip to content

Commit 6a5a459

Browse files
committed
reverts revoke changes and minor logic update to vaas retire
1 parent af1cfef commit 6a5a459

4 files changed

Lines changed: 25 additions & 21 deletions

File tree

tests/test_tpp.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -160,22 +160,24 @@ def test_revoke_not_issued(self):
160160
def test_revoke_normal(self):
161161
req, cert = simple_enroll(self.tpp_conn, self.tpp_zone)
162162
rev_req = RevocationRequest(req_id=req.id)
163-
revoke_data = self.tpp_conn.revoke_cert(rev_req)
163+
self.tpp_conn.revoke_cert(rev_req)
164164
time.sleep(1)
165-
assert revoke_data['Success'] is True
165+
with self.assertRaises(Exception):
166+
self.tpp_conn.renew_cert(req)
166167

167168
def test_revoke_without_disable(self):
168169
req, cert = simple_enroll(self.tpp_conn, self.tpp_zone)
169170
rev_req = RevocationRequest(req_id=req.id, disable=False)
170-
revoke_data = self.tpp_conn.revoke_cert(rev_req)
171+
self.tpp_conn.revoke_cert(rev_req)
171172
time.sleep(1)
172-
assert revoke_data['Success'] is True
173+
self.tpp_conn.renew_cert(req)
173174

174175
def test_revoke_normal_thumbprint(self):
175176
req, cert = simple_enroll(self.tpp_conn, self.tpp_zone)
176177
cert = x509.load_pem_x509_certificate(cert.cert.encode(), default_backend())
177178
thumbprint = binascii.hexlify(cert.fingerprint(hashes.SHA1())).decode()
178179
rev_req = RevocationRequest(thumbprint=thumbprint)
179-
revoke_data = self.tpp_conn.revoke_cert(rev_req)
180+
self.tpp_conn.revoke_cert(rev_req)
180181
time.sleep(1)
181-
assert revoke_data['Success'] is True
182+
with self.assertRaises(Exception):
183+
self.tpp_conn.renew_cert(req)

tests/test_tpp_token.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -170,26 +170,28 @@ def test_token_revoke_not_issued(self):
170170
def test_token_revoke_normal(self):
171171
req, cert = simple_enroll(self.tpp_conn, self.tpp_zone)
172172
rev_req = RevocationRequest(req_id=req.id)
173-
revoke_data = self.tpp_conn.revoke_cert(rev_req)
173+
self.tpp_conn.revoke_cert(rev_req)
174174
time.sleep(1)
175-
assert revoke_data['Success'] is True
175+
with self.assertRaises(Exception):
176+
self.tpp_conn.renew_cert(req)
176177

177178

178179
def test_token_revoke_without_disable(self):
179180
req, cert = simple_enroll(self.tpp_conn, self.tpp_zone)
180181
rev_req = RevocationRequest(req_id=req.id, disable=False)
181-
revoke_data = self.tpp_conn.revoke_cert(rev_req)
182+
self.tpp_conn.revoke_cert(rev_req)
182183
time.sleep(1)
183-
assert revoke_data['Success'] is True
184+
self.tpp_conn.renew_cert(req)
184185

185186
def test_token_revoke_normal_thumbprint(self):
186187
req, cert = simple_enroll(self.tpp_conn, self.tpp_zone)
187188
cert = x509.load_pem_x509_certificate(cert.cert.encode(), default_backend())
188189
thumbprint = binascii.hexlify(cert.fingerprint(hashes.SHA1())).decode()
189190
rev_req = RevocationRequest(thumbprint=thumbprint)
190-
revoke_data = self.tpp_conn.revoke_cert(rev_req)
191+
self.tpp_conn.revoke_cert(rev_req)
191192
time.sleep(1)
192-
assert revoke_data['Success'] is True
193+
with self.assertRaises(Exception):
194+
self.tpp_conn.renew_cert(req)
193195

194196
def test_tpp_token_enroll_valid_hours(self):
195197
cn = f"{random_word(10)}.venafi.example.com"

vcert/connection_cloud.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -484,17 +484,17 @@ def retire_cert(self, request):
484484
log.error("id or thumbprint must be specified for retiring certificate")
485485
raise ClientBadData
486486

487-
if request.thumbprint:
487+
if request.id:
488+
cert_id = request.id
489+
490+
elif request.thumbprint:
488491
response = self.search_by_thumbprint(request.thumbprint)
489492
cert_ids = response.certificateIds
490493
if len(cert_ids) > 1:
491494
log.error(f"multiple certificates matching thumbprint found")
492495
raise VenafiError
493496
cert_id = cert_ids[0]
494497

495-
if request.id:
496-
cert_id = request.id
497-
498498
retire_data = {
499499
'certificateIds': [
500500
cert_id

vcert/connection_tpp_abstract.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -331,17 +331,17 @@ def renew_cert(self, request, reuse_key=False):
331331
def revoke_cert(self, request):
332332
if not (request.id or request.thumbprint):
333333
raise ClientBadData
334-
d = dict()
334+
d = {
335+
'Disable': request.disable
336+
}
337+
if request.reason:
338+
d['Reason'] = request.reason
335339
if request.id:
336340
d['CertificateDN'] = request.id
337341
elif request.thumbprint:
338342
d['Thumbprint'] = request.thumbprint
339343
else:
340344
raise ClientBadData
341-
req_args = {
342-
'url': URLS.CERTIFICATE_REVOKE,
343-
'data': d
344-
}
345345
# TODO: Change _post() with post(args)
346346
status, data = self._post(URLS.CERTIFICATE_REVOKE, data=d)
347347
if status in (HTTPStatus.OK, HTTPStatus.ACCEPTED):

0 commit comments

Comments
 (0)