Infra
/
lemur
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

better structure of the query and and removing ilike

This commit is contained in:
Hossein Shafagh 2020-10-26 18:32:53 -07:00
parent d58b32a19c
commit 709a9808aa
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lemur/certificates/service.py
View File

@ -560,18 +560,29 @@ def query_common_name(common_name, args):
:return: :return:
""" """
owner = args.pop("owner") owner = args.pop("owner")
if not owner:
owner = "%"
# only not expired certificates # only not expired certificates
current_time = arrow.utcnow() current_time = arrow.utcnow()
result = ( if common_name == "%" and not owner:
Certificate.query.filter(Certificate.cn.ilike(common_name)) result = (
.filter(Certificate.owner.ilike(owner)) Certificate.query.filter(Certificate.not_after >= current_time.format("YYYY-MM-DD"))
.filter(Certificate.not_after >= current_time.format("YYYY-MM-DD")) .all()
.all() )
) elif common_name == "%":
# all valid certs from the owner
result = (
Certificate.query.filter(Certificate.not_after >= current_time.format("YYYY-MM-DD"))
.filter(Certificate.owner == owner)
.all()
)
else:
# search based on owner and cn
result = (
Certificate.query.filter(Certificate.not_after >= current_time.format("YYYY-MM-DD"))
.filter(Certificate.cn.like(common_name))
.filter(Certificate.owner == owner)
.all()
)
return result return result