luckyimnotanigger/adguard-home-manager
1
0
Fork 0
mirror of https://github.com/JGeek00/adguard-home-manager.git synced 2025-05-14 05:52:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added load dns info data

Browse source
This commit is contained in:
Juan Gilsanz Polo 2022-10-19 20:26:40 +02:00
parent 45946ddc1a
commit ea1cb6165c
11 changed files with 540 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

23
lib/screens/settings/dns/bootstrap_dns.dart
View file

@ -1,17 +1,32 @@
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:adguard_home_manager/providers/servers_provider.dart';
class BootstrapDnsScreen extends StatefulWidget {
const BootstrapDnsScreen({Key? key}) : super(key: key);
final ServersProvider serversProvider;
const BootstrapDnsScreen({
Key? key,
required this.serversProvider,
}) : super(key: key);
@override
State<BootstrapDnsScreen> createState() => _BootstrapDnsScreenState();
}
class _BootstrapDnsScreenState extends State<BootstrapDnsScreen> {
List<TextEditingController> bootstrapControllers = [
TextEditingController()
];
List<TextEditingController> bootstrapControllers = [];
@override
void initState() {
for (var item in widget.serversProvider.dnsInfo.data!.bootstrapDns) {
final controller = TextEditingController();
controller.text = item;
bootstrapControllers.add(controller);
}
super.initState();
}
@override
Widget build(BuildContext context) {

20
lib/screens/settings/dns/cache_config.dart
View file

@ -3,8 +3,15 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:adguard_home_manager/widgets/custom_switch_list_tile.dart';
import 'package:adguard_home_manager/providers/servers_provider.dart';
class CacheConfigDnsScreen extends StatefulWidget {
const CacheConfigDnsScreen({Key? key}) : super(key: key);
final ServersProvider serversProvider;
const CacheConfigDnsScreen({
Key? key,
required this.serversProvider
}) : super(key: key);
@override
State<CacheConfigDnsScreen> createState() => _CacheConfigDnsScreenState();
@ -22,6 +29,15 @@ class _CacheConfigDnsScreenState extends State<CacheConfigDnsScreen> {
bool optimisticCache = false;
@override
void initState() {
cacheSizeController.text = widget.serversProvider.dnsInfo.data!.cacheSize.toString();
overrideMinTtlController.text = widget.serversProvider.dnsInfo.data!.cacheTtlMin.toString();
overrideMaxTtlController.text = widget.serversProvider.dnsInfo.data!.cacheTtlMax.toString();
optimisticCache = widget.serversProvider.dnsInfo.data!.cacheOptimistic;
super.initState();
}
@override
Widget build(BuildContext context) {
@ -35,7 +51,7 @@ class _CacheConfigDnsScreenState extends State<CacheConfigDnsScreen> {
return Padding(
padding: const EdgeInsets.symmetric(horizontal: 20),
child: TextFormField(
controller: overrideMinTtlController,
controller: controller,
onChanged: onChanged,
decoration: InputDecoration(
prefixIcon: const Icon(Icons.timer_rounded),

251
lib/screens/settings/dns/dns.dart
View file

@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:adguard_home_manager/screens/settings/dns/cache_config.dart';
@ -7,79 +8,201 @@ import 'package:adguard_home_manager/screens/settings/dns/bootstrap_dns.dart';
import 'package:adguard_home_manager/screens/settings/dns/private_reverse_servers.dart';
import 'package:adguard_home_manager/screens/settings/dns/upstream_dns.dart';
import 'package:adguard_home_manager/providers/servers_provider.dart';
import 'package:adguard_home_manager/providers/app_config_provider.dart';
import 'package:adguard_home_manager/services/http_requests.dart';
class DnsSettings extends StatelessWidget {
const DnsSettings({Key? key}) : super(key: key);
@override
Widget build(BuildContext context) {
final serversProvider = Provider.of<ServersProvider>(context);
final appConfigProvider = Provider.of<AppConfigProvider>(context);
return DnsSettingsWidget(
serversProvider: serversProvider,
appConfigProvider: appConfigProvider,
);
}
}
class DnsSettingsWidget extends StatefulWidget {
final ServersProvider serversProvider;
final AppConfigProvider appConfigProvider;
const DnsSettingsWidget({
required this.serversProvider,
required this.appConfigProvider,
Key? key
}) : super(key: key);
@override
State<DnsSettingsWidget> createState() => _DnsSettingsWidgetState();
}
class _DnsSettingsWidgetState extends State<DnsSettingsWidget> {
void fetchData() async {
widget.serversProvider.setDnsInfoLoadStatus(0, false);
final result = await getDnsInfo(server: widget.serversProvider.selectedServer!);
if (mounted) {
if (result['result'] == 'success') {
widget.serversProvider.setDnsInfoData(result['data']);
widget.serversProvider.setDnsInfoLoadStatus(1, true);
}
else {
widget.appConfigProvider.addLog(result['log']);
widget.serversProvider.setDnsInfoLoadStatus(2, true);
}
}
}
@override
void initState() {
fetchData();
super.initState();
}
@override
Widget build(BuildContext context) {
final serversProvider = Provider.of<ServersProvider>(context);
Widget generateBody() {
switch (widget.serversProvider.dnsInfo.loadStatus) {
case 0:
return SizedBox(
width: double.maxFinite,
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
const CircularProgressIndicator(),
const SizedBox(height: 30),
Text(
AppLocalizations.of(context)!.loadingDnsConfig,
textAlign: TextAlign.center,
style: const TextStyle(
fontSize: 22,
color: Colors.grey,
),
)
],
)
);
case 1:
return ListView(
children: [
ListTile(
title: Text(
AppLocalizations.of(context)!.upstreamDns,
style: const TextStyle(
fontSize: 16,
fontWeight: FontWeight.normal
),
),
onTap: () => Navigator.push(context, MaterialPageRoute(
builder: (context) => UpstreamDnsScreen(
serversProvider: serversProvider
)
)),
),
ListTile(
title: Text(
AppLocalizations.of(context)!.bootstrapDns,
style: const TextStyle(
fontSize: 16,
fontWeight: FontWeight.normal
),
),
onTap: () => Navigator.push(context, MaterialPageRoute(
builder: (context) => BootstrapDnsScreen(
serversProvider: serversProvider
)
)),
),
ListTile(
title: Text(
AppLocalizations.of(context)!.privateReverseDnsServers,
style: const TextStyle(
fontSize: 16,
fontWeight: FontWeight.normal
),
),
onTap: () => Navigator.push(context, MaterialPageRoute(
builder: (context) => PrivateReverseDnsServersScreen(
serversProvider: serversProvider
)
)),
),
ListTile(
title: Text(
AppLocalizations.of(context)!.dnsServerSettings,
style: const TextStyle(
fontSize: 16,
fontWeight: FontWeight.normal
),
),
onTap: () => Navigator.push(context, MaterialPageRoute(
builder: (context) => DnsServerSettingsScreen(
serversProvider: serversProvider
)
)),
),
ListTile(
title: Text(
AppLocalizations.of(context)!.dnsCacheConfig,
style: const TextStyle(
fontSize: 16,
fontWeight: FontWeight.normal
),
),
onTap: () => Navigator.push(context, MaterialPageRoute(
builder: (context) => CacheConfigDnsScreen(
serversProvider: serversProvider
)
)),
),
],
);
case 2:
return SizedBox(
width: double.maxFinite,
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
const Icon(
Icons.error,
color: Colors.red,
size: 50,
),
const SizedBox(height: 30),
Text(
AppLocalizations.of(context)!.dnsConfigNotLoaded,
textAlign: TextAlign.center,
style: const TextStyle(
fontSize: 22,
color: Colors.grey,
),
)
],
),
);
default:
return const SizedBox();
}
}
return Scaffold(
appBar: AppBar(
title: Text(AppLocalizations.of(context)!.dnsSettings),
),
body: ListView(
children: [
ListTile(
title: Text(
AppLocalizations.of(context)!.upstreamDns,
style: const TextStyle(
fontSize: 16,
fontWeight: FontWeight.normal
),
),
onTap: () => Navigator.push(context, MaterialPageRoute(
builder: (context) => const UpstreamDnsScreen()
)),
),
ListTile(
title: Text(
AppLocalizations.of(context)!.bootstrapDns,
style: const TextStyle(
fontSize: 16,
fontWeight: FontWeight.normal
),
),
onTap: () => Navigator.push(context, MaterialPageRoute(
builder: (context) => const BootstrapDnsScreen()
)),
),
ListTile(
title: Text(
AppLocalizations.of(context)!.privateReverseDnsServers,
style: const TextStyle(
fontSize: 16,
fontWeight: FontWeight.normal
),
),
onTap: () => Navigator.push(context, MaterialPageRoute(
builder: (context) => const PrivateReverseDnsServersScreen()
)),
),
ListTile(
title: Text(
AppLocalizations.of(context)!.dnsServerSettings,
style: const TextStyle(
fontSize: 16,
fontWeight: FontWeight.normal
),
),
onTap: () => Navigator.push(context, MaterialPageRoute(
builder: (context) => const DnsServerSettingsScreen()
)),
),
ListTile(
title: Text(
AppLocalizations.of(context)!.dnsCacheConfig,
style: const TextStyle(
fontSize: 16,
fontWeight: FontWeight.normal
),
),
onTap: () => Navigator.push(context, MaterialPageRoute(
builder: (context) => const CacheConfigDnsScreen()
)),
),
],
),
body: generateBody(),
);
}
}

92
lib/screens/settings/dns/dns_server_settings.dart
View file

@ -5,8 +5,15 @@ import 'package:adguard_home_manager/widgets/custom_radio_list_tile.dart';
import 'package:adguard_home_manager/screens/settings/section_label.dart';
import 'package:adguard_home_manager/widgets/custom_switch_list_tile.dart';
import 'package:adguard_home_manager/providers/servers_provider.dart';
class DnsServerSettingsScreen extends StatefulWidget {
const DnsServerSettingsScreen({Key? key}) : super(key: key);
final ServersProvider serversProvider;
const DnsServerSettingsScreen({
Key? key,
required this.serversProvider
}) : super(key: key);
@override
State<DnsServerSettingsScreen> createState() => _DnsServerSettingsScreenState();
@ -21,8 +28,36 @@ class _DnsServerSettingsScreenState extends State<DnsServerSettingsScreen> {
String blockingMode = "default";
final TextEditingController ipv4controller = TextEditingController();
String? ipv4error;
final TextEditingController ipv6controller = TextEditingController();
String? ipv6error;
@override
void initState() {
limitRequestsController.text = widget.serversProvider.dnsInfo.data!.ratelimit.toString();
enableEdns = widget.serversProvider.dnsInfo.data!.ednsCsEnabled;
enableDnssec = widget.serversProvider.dnsInfo.data!.dnssecEnabled;
disableIpv6Resolving = widget.serversProvider.dnsInfo.data!.disableIpv6;
blockingMode = widget.serversProvider.dnsInfo.data!.blockingMode;
ipv4controller.text = widget.serversProvider.dnsInfo.data!.blockingIpv4;
ipv6controller.text = widget.serversProvider.dnsInfo.data!.blockingIpv6;
super.initState();
}
@override
Widget build(BuildContext context) {
void updateBlockingMode(String mode) {
if (mode != 'custom_ip') {
ipv4controller.text = '';
ipv4error = null;
ipv6controller.text = '';
ipv6error = null;
}
setState(() => blockingMode = mode);
}
return Scaffold(
appBar: AppBar(
title: Text(AppLocalizations.of(context)!.dnsServerSettings),
@ -81,7 +116,7 @@ class _DnsServerSettingsScreenState extends State<DnsServerSettingsScreen> {
radioBackgroundColor: Theme.of(context).dialogBackgroundColor,
title: AppLocalizations.of(context)!.defaultMode,
subtitle: AppLocalizations.of(context)!.defaultDescription,
onChanged: (value) => setState(() => blockingMode = value),
onChanged: updateBlockingMode,
),
CustomRadioListTile(
groupValue: blockingMode,
@ -89,7 +124,7 @@ class _DnsServerSettingsScreenState extends State<DnsServerSettingsScreen> {
radioBackgroundColor: Theme.of(context).dialogBackgroundColor,
title: "REFUSED",
subtitle: AppLocalizations.of(context)!.refusedDescription,
onChanged: (value) => setState(() => blockingMode = value),
onChanged: updateBlockingMode,
),
CustomRadioListTile(
groupValue: blockingMode,
@ -97,7 +132,7 @@ class _DnsServerSettingsScreenState extends State<DnsServerSettingsScreen> {
radioBackgroundColor: Theme.of(context).dialogBackgroundColor,
title: "NXDOMAIN",
subtitle: AppLocalizations.of(context)!.nxdomainDescription,
onChanged: (value) => setState(() => blockingMode = value),
onChanged: updateBlockingMode,
),
CustomRadioListTile(
groupValue: blockingMode,
@ -105,7 +140,7 @@ class _DnsServerSettingsScreenState extends State<DnsServerSettingsScreen> {
radioBackgroundColor: Theme.of(context).dialogBackgroundColor,
title: AppLocalizations.of(context)!.nullIp,
subtitle: AppLocalizations.of(context)!.nullIpDescription,
onChanged: (value) => setState(() => blockingMode = value),
onChanged: updateBlockingMode,
),
CustomRadioListTile(
groupValue: blockingMode,
@ -113,8 +148,53 @@ class _DnsServerSettingsScreenState extends State<DnsServerSettingsScreen> {
radioBackgroundColor: Theme.of(context).dialogBackgroundColor,
title: AppLocalizations.of(context)!.customIp,
subtitle: AppLocalizations.of(context)!.customIpDescription,
onChanged: (value) => setState(() => blockingMode = value),
onChanged: updateBlockingMode,
),
const SizedBox(height: 10),
if (blockingMode == 'custom_ip') ...[
Padding(
padding: const EdgeInsets.symmetric(horizontal: 24),
child: TextFormField(
controller: ipv4controller,
// onChanged: onChanged,
decoration: InputDecoration(
prefixIcon: const Icon(Icons.link_rounded),
border: const OutlineInputBorder(
borderRadius: BorderRadius.all(
Radius.circular(10)
)
),
errorText: ipv4error,
helperText: AppLocalizations.of(context)!.blockingIpv4Description,
helperMaxLines: 10,
labelText: AppLocalizations.of(context)!.blockingIpv4,
),
keyboardType: TextInputType.number,
),
),
const SizedBox(height: 30),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 24),
child: TextFormField(
controller: ipv6controller,
// onChanged: onChanged,
decoration: InputDecoration(
prefixIcon: const Icon(Icons.link_rounded),
border: const OutlineInputBorder(
borderRadius: BorderRadius.all(
Radius.circular(10)
)
),
errorText: ipv6error,
helperText: AppLocalizations.of(context)!.blockingIpv6Description,
helperMaxLines: 10,
labelText: AppLocalizations.of(context)!.blockingIpv6,
),
keyboardType: TextInputType.number,
),
),
const SizedBox(height: 30)
]
],
),
);

31
lib/screens/settings/dns/private_reverse_servers.dart
View file

@ -3,17 +3,22 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:adguard_home_manager/widgets/custom_switch_list_tile.dart';
import 'package:adguard_home_manager/providers/servers_provider.dart';
class PrivateReverseDnsServersScreen extends StatefulWidget {
const PrivateReverseDnsServersScreen({Key? key}) : super(key: key);
final ServersProvider serversProvider;
const PrivateReverseDnsServersScreen({
Key? key,
required this.serversProvider,
}) : super(key: key);
@override
State<PrivateReverseDnsServersScreen> createState() => _PrivateReverseDnsServersScreenState();
}
class _PrivateReverseDnsServersScreenState extends State<PrivateReverseDnsServersScreen> {
List<TextEditingController> privateControllers = [];
List<String> defaultReverseResolvers = ["80.58.61.250", "80.58.61.251"];
List<String> defaultReverseResolvers = [];
bool editReverseResolvers = false;
List<TextEditingController> reverseResolversControllers = [
TextEditingController()
@ -21,6 +26,24 @@ class _PrivateReverseDnsServersScreenState extends State<PrivateReverseDnsServer
bool usePrivateReverseDnsResolvers = false;
bool enableReverseResolve = false;
@override
void initState() {
for (var item in widget.serversProvider.dnsInfo.data!.defaultLocalPtrUpstreams) {
defaultReverseResolvers.add(item);
}
for (var item in widget.serversProvider.dnsInfo.data!.localPtrUpstreams) {
final controller = TextEditingController();
controller.text = item;
reverseResolversControllers.add(controller);
}
if (widget.serversProvider.dnsInfo.data!.localPtrUpstreams.isNotEmpty) {
editReverseResolvers = true;
}
usePrivateReverseDnsResolvers = widget.serversProvider.dnsInfo.data!.usePrivatePtrResolvers;
enableReverseResolve = widget.serversProvider.dnsInfo.data!.resolveClients;
super.initState();
}
@override
Widget build(BuildContext context) {
return Scaffold(

30
lib/screens/settings/dns/upstream_dns.dart
View file

@ -4,20 +4,36 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:adguard_home_manager/screens/settings/section_label.dart';
import 'package:adguard_home_manager/widgets/custom_radio_list_tile.dart';
import 'package:adguard_home_manager/providers/servers_provider.dart';
class UpstreamDnsScreen extends StatefulWidget {
const UpstreamDnsScreen({Key? key}) : super(key: key);
final ServersProvider serversProvider;
const UpstreamDnsScreen({
Key? key,
required this.serversProvider,
}) : super(key: key);
@override
State<UpstreamDnsScreen> createState() => _UpstreamDnsScreenState();
}
class _UpstreamDnsScreenState extends State<UpstreamDnsScreen> {
List<TextEditingController> upstreamControllers = [
TextEditingController()
];
List<TextEditingController> upstreamControllers = [];
String upstreamMode = "load_balancing";
@override
void initState() {
for (var item in widget.serversProvider.dnsInfo.data!.upstreamDns) {
final controller = TextEditingController();
controller.text = item;
upstreamControllers.add(controller);
}
upstreamMode = widget.serversProvider.dnsInfo.data!.upstreamMode;
super.initState();
}
@override
Widget build(BuildContext context) {
return Scaffold(
@ -88,7 +104,7 @@ class _UpstreamDnsScreenState extends State<UpstreamDnsScreen> {
SectionLabel(label: AppLocalizations.of(context)!.dnsMode),
CustomRadioListTile(
groupValue: upstreamMode,
value: "load_balancing",
value: "",
radioBackgroundColor: Theme.of(context).dialogBackgroundColor,
title: AppLocalizations.of(context)!.loadBalancing,
subtitle: AppLocalizations.of(context)!.loadBalancingDescription,
@ -96,7 +112,7 @@ class _UpstreamDnsScreenState extends State<UpstreamDnsScreen> {
),
CustomRadioListTile(
groupValue: upstreamMode,
value: "parallel_requests",
value: "parallel",
radioBackgroundColor: Theme.of(context).dialogBackgroundColor,
title: AppLocalizations.of(context)!.parallelRequests,
subtitle: AppLocalizations.of(context)!.parallelRequestsDescription,
@ -104,7 +120,7 @@ class _UpstreamDnsScreenState extends State<UpstreamDnsScreen> {
),
CustomRadioListTile(
groupValue: upstreamMode,
value: "fastest_ip_address",
value: "fastest_addr",
radioBackgroundColor: Theme.of(context).dialogBackgroundColor,
title: AppLocalizations.of(context)!.fastestIpAddress,
subtitle: AppLocalizations.of(context)!.fastestIpAddressDescription,