SelfPrivacy/selfprivacy-rest-api
1
0
Fork 0
mirror of https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git synced 2025-01-26 10:46:35 +00:00
Code Issues Projects Releases Wiki Activity

refactor: Temporarily disable CAA records as clients are not ready

Browse source
This commit is contained in:
Inex Code 2024-12-15 16:30:29 +03:00
parent 8a672bab07
commit 7d9150a77a
No known key found for this signature in database
2 changed files with 54 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
selfprivacy_api/services/__init__.py
View file

@ -68,18 +68,20 @@ class ServiceManager(Service):
dns_records: list[ServiceDnsRecord] = [] dns_records: list[ServiceDnsRecord] = []
try: # TODO: Reenable with 3.5.0 release when clients are ready.
dns_records.append( # Do not forget about tests!
ServiceDnsRecord( # try:
type="CAA", # dns_records.append(
name=get_domain(), # ServiceDnsRecord(
content=f'128 issue "letsencrypt.org;accounturi={read_account_uri()}"', # type="CAA",
ttl=3600, # name=get_domain(),
display_name="CAA record", # content=f'128 issue "letsencrypt.org;accounturi={read_account_uri()}"',
) # ttl=3600,
) # display_name="CAA record",
except Exception as e: # )
logging.error(f"Error creating CAA: {e}") # )
# except Exception as e:
# logging.error(f"Error creating CAA: {e}")
for service in ServiceManager.get_enabled_services(): for service in ServiceManager.get_enabled_services():
dns_records += service.get_dns_records(ip4, ip6) dns_records += service.get_dns_records(ip4, ip6)

76
tests/test_graphql/test_system.py
View file

@ -394,15 +394,16 @@ def test_graphql_get_domain(
ttl=18000, ttl=18000,
), ),
) )
assert is_dns_record_in_array( # TODO: Reenable with 3.5.0 release when clients are ready.
dns_records, # assert is_dns_record_in_array(
dns_record( # dns_records,
name="test-domain.tld", # dns_record(
record_type="CAA", # name="test-domain.tld",
content='128 issue "letsencrypt.org;accounturi=https://acme-v02.api.letsencrypt.org/acme/acct/234340396"', # record_type="CAA",
ttl=3600, # content='128 issue "letsencrypt.org;accounturi=https://acme-v02.api.letsencrypt.org/acme/acct/234340396"',
), # ttl=3600,
) # ),
# )
def test_dns_records_no_duplicates( def test_dns_records_no_duplicates(
@ -546,15 +547,16 @@ def test_graphql_get_domain_no_uri_account_file(
ttl=18000, ttl=18000,
), ),
) )
assert not is_dns_record_in_array( # TODO: Reenable with 3.5.0 release when clients are ready.
dns_records, # assert not is_dns_record_in_array(
dns_record( # dns_records,
name="test-domain.tld", # dns_record(
record_type="CAA", # name="test-domain.tld",
content='128 issue "letsencrypt.org;accounturi=https://acme-v02.api.letsencrypt.org/acme/acct/234340396"', # record_type="CAA",
ttl=3600, # content='128 issue "letsencrypt.org;accounturi=https://acme-v02.api.letsencrypt.org/acme/acct/234340396"',
), # ttl=3600,
) # ),
# )
def test_graphql_get_domain_not_found_account_file( def test_graphql_get_domain_not_found_account_file(
@ -645,15 +647,16 @@ def test_graphql_get_domain_not_found_account_file(
ttl=18000, ttl=18000,
), ),
) )
assert not is_dns_record_in_array( # TODO: Reenable with 3.5.0 release when clients are ready.
dns_records, # assert not is_dns_record_in_array(
dns_record( # dns_records,
name="test-domain.tld", # dns_record(
record_type="CAA", # name="test-domain.tld",
content='128 issue "letsencrypt.org;accounturi=https://acme-v02.api.letsencrypt.org/acme/acct/234340396"', # record_type="CAA",
ttl=3600, # content='128 issue "letsencrypt.org;accounturi=https://acme-v02.api.letsencrypt.org/acme/acct/234340396"',
), # ttl=3600,
) # ),
# )
def test_graphql_get_domain_black_account_file( def test_graphql_get_domain_black_account_file(
@ -744,15 +747,16 @@ def test_graphql_get_domain_black_account_file(
ttl=18000, ttl=18000,
), ),
) )
assert not is_dns_record_in_array( # TODO: Reenable with 3.5.0 release when clients are ready.
dns_records, # assert not is_dns_record_in_array(
dns_record( # dns_records,
name="test-domain.tld", # dns_record(
record_type="CAA", # name="test-domain.tld",
content='128 issue "letsencrypt.org;accounturi=https://acme-v02.api.letsencrypt.org/acme/acct/234340396"', # record_type="CAA",
ttl=3600, # content='128 issue "letsencrypt.org;accounturi=https://acme-v02.api.letsencrypt.org/acme/acct/234340396"',
), # ttl=3600,
) # ),
# )
API_GET_TIMEZONE = """ API_GET_TIMEZONE = """