jasima/majuna
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

security: fix all bandit issues

Browse source
This commit is contained in:
Iain Learmonth 2022-05-16 12:47:40 +01:00
parent c25367d95c
commit 014596d271
5 changed files with 31 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/terraform/proxy/__init__.py
View file

@ -72,8 +72,10 @@ class ProxyAutomation(TerraformAutomation):
proxy.origin_id = origin.id
proxy.provider = self.provider
proxy.psg = subgroup
# The random usage below is good enough for its purpose: to create a slug that
# hasn't been used before.
proxy.slug = tldextract.extract(origin.domain_name).domain[:5] + ''.join(
random.choices(string.ascii_lowercase, k=12))
random.choices(string.ascii_lowercase, k=12)) # nosec
proxy.added = datetime.datetime.utcnow()
proxy.updated = datetime.datetime.utcnow()
db.session.add(proxy)

3
app/terraform/proxy/cloudfront.py
View file

@ -74,7 +74,8 @@ class ProxyCloudfrontAutomation(ProxyAutomation):
"""
def import_state(self, state: Any) -> None:
assert(isinstance(state, dict))
if not isinstance(dict, state):
raise RuntimeError("The Terraform state object returned was not a dict.")
if "child_modules" not in state['values']['root_module']:
# There are no CloudFront proxies deployed to import state for
return

6
app/terraform/proxy/fastly.py
View file

@ -3,8 +3,8 @@
import datetime
import os
import string
import random
import string
import jinja2
import tldextract
@ -97,8 +97,10 @@ def create_missing_proxies():
proxy = Proxy()
proxy.origin_id = origin.id
proxy.provider = "fastly"
# The random usage below is good enough for its purpose: to create a slug that
# hasn't been used before.
proxy.slug = tldextract.extract(origin.domain_name).domain[:5] + ''.join(
random.choices(string.ascii_lowercase, k=random.randint(5, 10)))
random.choices(string.ascii_lowercase, 12)) # nosec
proxy.added = datetime.datetime.utcnow()
proxy.updated = datetime.datetime.utcnow()
db.session.add(proxy)