SelfPrivacy
/
selfprivacy.org.app
10
7
Fork 5
Code Issues 75 Pull Requests 3 Projects 1 Releases 24 Wiki Activity

Catch cloudflare exceptions

pull/111/head
NaiJi ✨ 2022-09-09 12:14:37 +03:00
parent 06fbcff9a9
commit e4bb35d5d8
4 changed files with 69 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
lib/logic/api_maps/rest_maps/dns_providers/cloudflare/cloudflare.dart
View File

@ -76,22 +76,23 @@ class CloudflareApi extends DnsProviderApi {
} }
@override @override
Future<String> getZoneId(final String domain) async { Future<String?> getZoneId(final String domain) async {
validateStatus = (final status) => String? zoneId;
status == HttpStatus.ok || status == HttpStatus.forbidden;
final Dio client = await getClient(); final Dio client = await getClient();
final Response response = await client.get( try {
'/zones', final Response response = await client.get(
queryParameters: {'name': domain}, '/zones',
); queryParameters: {'name': domain},
);
close(client); zoneId = response.data['result'][0]['id'];
} catch (e) {
if (response.data['result'].isEmpty) { print(e);
throw DomainNotFoundException('No domains found'); } finally {
} else { close(client);
return response.data['result'][0]['id'];
} }
return zoneId;
} }
@override @override
@ -105,21 +106,25 @@ class CloudflareApi extends DnsProviderApi {
final String url = '/zones/$domainZoneId/dns_records'; final String url = '/zones/$domainZoneId/dns_records';
final Dio client = await getClient(); final Dio client = await getClient();
final Response response = await client.get(url); try {
final Response response = await client.get(url);
final List records = response.data['result'] ?? []; final List records = response.data['result'] ?? [];
final List<Future> allDeleteFutures = <Future>[]; final List<Future> allDeleteFutures = <Future>[];
for (final record in records) { for (final record in records) {
if (record['zone_name'] == domainName) { if (record['zone_name'] == domainName) {
allDeleteFutures.add( allDeleteFutures.add(
client.delete('$url/${record["id"]}'), client.delete('$url/${record["id"]}'),
); );
}
} }
await Future.wait(allDeleteFutures);
} catch (e) {
print(e);
} finally {
close(client);
} }
await Future.wait(allDeleteFutures);
close(client);
} }
@override @override
@ -252,27 +257,38 @@ class CloudflareApi extends DnsProviderApi {
); );
final Dio client = await getClient(); final Dio client = await getClient();
await client.post( try {
url, await client.post(
data: dkimRecord.toJson(), url,
); data: dkimRecord.toJson(),
);
client.close(); } catch (e) {
print(e);
} finally {
close(client);
}
} }
@override @override
Future<List<String>> domainList() async { Future<List<String>> domainList() async {
final String url = '$rootAddress/zones'; final String url = '$rootAddress/zones';
List<String> domains = [];
final Dio client = await getClient(); final Dio client = await getClient();
try {
final Response response = await client.get(
url,
queryParameters: {'per_page': 50},
);
domains = response.data['result']
.map<String>((final el) => el['name'] as String)
.toList();
} catch (e) {
print(e);
} finally {
close(client);
}
final Response response = await client.get( return domains;
url,
queryParameters: {'per_page': 50},
);
close(client);
return response.data['result']
.map<String>((final el) => el['name'] as String)
.toList();
} }
} }

2
lib/logic/api_maps/rest_maps/dns_providers/dns_provider.dart
View File

@ -23,7 +23,7 @@ abstract class DnsProviderApi extends ApiMap {
final String dkimRecordString, final String dkimRecordString,
final ServerDomain domain, final ServerDomain domain,
); );
Future<String> getZoneId(final String domain); Future<String?> getZoneId(final String domain);
Future<List<String>> domainList(); Future<List<String>> domainList();
Future<bool> isApiTokenValid(final String token); Future<bool> isApiTokenValid(final String token);

18
lib/logic/cubit/forms/setup/initializing/domain_setup_cubit.dart
View File

@ -31,19 +31,21 @@ class DomainSetupCubit extends Cubit<DomainSetupState> {
emit(Loading(LoadingTypes.saving)); emit(Loading(LoadingTypes.saving));
final String zoneId = await serverInstallationCubit final String? zoneId = await serverInstallationCubit
.repository.dnsProviderApiFactory! .repository.dnsProviderApiFactory!
.getDnsProvider() .getDnsProvider()
.getZoneId(domainName); .getZoneId(domainName);
final ServerDomain domain = ServerDomain( if (zoneId != null) {
domainName: domainName, final ServerDomain domain = ServerDomain(
zoneId: zoneId, domainName: domainName,
provider: DnsProvider.cloudflare, zoneId: zoneId,
); provider: DnsProvider.cloudflare,
);
serverInstallationCubit.setDomain(domain); serverInstallationCubit.setDomain(domain);
emit(DomainSet()); emit(DomainSet());
}
} }
} }

8
lib/logic/cubit/server_installation/server_installation_repository.dart
View File

@ -169,12 +169,8 @@ class ServerInstallationRepository {
), ),
); );
try { final String? domainId = await dnsProviderApi.getZoneId(domain);
final String domainId = await dnsProviderApi.getZoneId(domain); return domainId;
return domainId;
} on DomainNotFoundException {
return null;
}
} }
Future<Map<String, bool>> isDnsAddressesMatch( Future<Map<String, bool>> isDnsAddressesMatch(