SelfPrivacy
/
selfprivacy-rest-api
7
2
Fork 1
Code Issues 15 Pull Requests 4 Projects Releases 1 Wiki Activity

feat: Provide display names in DNS records
continuous-integration/drone/push Build is failing Details

not-autobackup-disabled
Inex Code 2023-11-24 13:57:52 +03:00
parent 860071e046
commit 6d09c7aa9b
13 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
selfprivacy_api/graphql/common_types/dns.py
View File

@ -11,3 +11,4 @@ class DnsRecord:
content: str
ttl: int
priority: typing.Optional[int]
display_name: str

1
selfprivacy_api/graphql/common_types/service.py
View File

@ -139,6 +139,7 @@ def service_to_graphql_service(service: ServiceInterface) -> Service:
content=record.content,
ttl=record.ttl,
priority=record.priority,
display_name=record.display_name,
)
for record in service.get_dns_records()
],

1
selfprivacy_api/graphql/queries/system.py
View File

@ -33,6 +33,7 @@ class SystemDomainInfo:
content=record.content,
ttl=record.ttl,
priority=record.priority,
display_name=record.display_name,
)
for record in get_all_required_dns_records()
]

2
selfprivacy_api/services/__init__.py
View File

@ -54,12 +54,14 @@ def get_all_required_dns_records() -> list[ServiceDnsRecord]:
name="api",
content=ip4,
ttl=3600,
display_name="SelfPrivacy API",
),
ServiceDnsRecord(
type="AAAA",
name="api",
content=ip6,
ttl=3600,
display_name="SelfPrivacy API (IPv6)",
),
]
for service in get_enabled_services():

2
selfprivacy_api/services/bitwarden/__init__.py
View File

@ -129,12 +129,14 @@ class Bitwarden(Service):
name="password",
content=network_utils.get_ip4(),
ttl=3600,
display_name="Bitwarden",
),
ServiceDnsRecord(
type="AAAA",
name="password",
content=network_utils.get_ip6(),
ttl=3600,
display_name="Bitwarden (IPv6)",
),
]

2
selfprivacy_api/services/gitea/__init__.py
View File

@ -123,12 +123,14 @@ class Gitea(Service):
name="git",
content=network_utils.get_ip4(),
ttl=3600,
display_name="Gitea",
),
ServiceDnsRecord(
type="AAAA",
name="git",
content=network_utils.get_ip6(),
ttl=3600,
display_name="Gitea (IPv6)",
),
]

2
selfprivacy_api/services/jitsi/__init__.py
View File

@ -132,12 +132,14 @@ class Jitsi(Service):
name="meet",
content=ip4,
ttl=3600,
display_name="Jitsi",
),
ServiceDnsRecord(
type="AAAA",
name="meet",
content=ip6,
ttl=3600,
display_name="Jitsi (IPv6)",
),
]

22
selfprivacy_api/services/mailserver/__init__.py
View File

@ -121,27 +121,43 @@ class MailServer(Service):
name=domain,
content=ip4,
ttl=3600,
display_name="Root Domain",
),
ServiceDnsRecord(
type="AAAA",
name=domain,
content=ip6,
ttl=3600,
display_name="Root Domain (IPv6)",
),
ServiceDnsRecord(
type="MX", name=domain, content=domain, ttl=3600, priority=10
type="MX",
name=domain,
content=domain,
ttl=3600,
priority=10,
display_name="Mail server record",
),
ServiceDnsRecord(
type="TXT", name="_dmarc", content="v=DMARC1; p=none", ttl=18000
type="TXT",
name="_dmarc",
content="v=DMARC1; p=none",
ttl=18000,
display_name="DMARC record",
),
ServiceDnsRecord(
type="TXT",
name=domain,
content=f"v=spf1 a mx ip4:{ip4} -all",
ttl=18000,
display_name="SPF record",
),
ServiceDnsRecord(
type="TXT", name="selector._domainkey", content=dkim_record, ttl=18000
type="TXT",
name="selector._domainkey",
content=dkim_record,
ttl=18000,
display_name="DKIM key",
),
]

2
selfprivacy_api/services/nextcloud/__init__.py
View File

@ -128,12 +128,14 @@ class Nextcloud(Service):
name="cloud",
content=network_utils.get_ip4(),
ttl=3600,
display_name="Nextcloud",
),
ServiceDnsRecord(
type="AAAA",
name="cloud",
content=network_utils.get_ip6(),
ttl=3600,
display_name="Nextcloud (IPv6)",
),
]

2
selfprivacy_api/services/ocserv/__init__.py
View File

@ -106,12 +106,14 @@ class Ocserv(Service):
name="vpn",
content=network_utils.get_ip4(),
ttl=3600,
display_name="OpenConnect VPN",
),
ServiceDnsRecord(
type="AAAA",
name="vpn",
content=network_utils.get_ip6(),
ttl=3600,
display_name="OpenConnect VPN (IPv6)",
),
]

2
selfprivacy_api/services/pleroma/__init__.py
View File

@ -127,12 +127,14 @@ class Pleroma(Service):
name="social",
content=network_utils.get_ip4(),
ttl=3600,
display_name="Pleroma",
),
ServiceDnsRecord(
type="AAAA",
name="social",
content=network_utils.get_ip6(),
ttl=3600,
display_name="Pleroma (IPv6)",
),
]

1
selfprivacy_api/services/service.py
View File

@ -33,6 +33,7 @@ class ServiceDnsRecord(BaseModel):
name: str
content: str
ttl: int
display_name: str
priority: typing.Optional[int] = None

2
selfprivacy_api/services/test_service/__init__.py
View File

@ -186,12 +186,14 @@ class DummyService(Service):
name="password",
content=network_utils.get_ip4(),
ttl=3600,
display_name="Test Service",
),
ServiceDnsRecord(
type="AAAA",
name="password",
content=network_utils.get_ip6(),
ttl=3600,
display_name="Test Service (IPv6)",
),
]