xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2026-09-12 12:36:24 +00:00
Code Issues Projects Releases Wiki Activity

Fix -s on certutil

Browse Source
This commit is contained in:
Jarrod Johnson
2026-06-29 11:30:49 -04:00
parent 2c669358b3
commit 3ce0988f5a
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
confluent_server/confluent/certutil.py
+12 -5
View File
@@ -472,11 +472,13 @@ async def main():
sindex = sys.argv.index('-s')
subj = sys.argv.pop(sindex + 1) # Remove subject argument
sys.argv.pop(sindex) # Remove -s flag
try:
ipaddress.ip_address(subj)
sans.add('IP:{0}'.format(subj))
except ValueError:
sans.add('DNS:{0}'.format(subj))
subjs = subj.split(',')
for subj in subjs:
try:
ipaddress.ip_address(subj)
sans.add('IP:{0}'.format(subj))
except ValueError:
sans.add('DNS:{0}'.format(subj))
san = ','.join(sans) if sans else None
except ValueError:
pass
@@ -489,6 +491,11 @@ async def main():
csrout = sys.argv[1]
except IndexError:
csrout = None
if '-r' in sys.argv:
rindex = sys.argv.index('-r')
csrout = sys.argv.pop(rindex + 1) # Remove csrout argument
sys.argv.pop(rindex) # Remove -r flag
keyout = None
await create_certificate(keyout, certout, csrout, subj, san, backdate=False, days=days)
if __name__ == '__main__':