mirror of
https://github.com/JGeek00/adguard-home-manager.git
synced 2025-04-28 01:36:07 +00:00
Added dns rewrite rules list
This commit is contained in:
parent
ab874512b8
commit
79be1cca75
7 changed files with 316 additions and 2 deletions
|
@ -378,5 +378,11 @@
|
||||||
"leasesRestored": "Leases restored successfully",
|
"leasesRestored": "Leases restored successfully",
|
||||||
"leasesNotRestored": "The leases couldn't be restored",
|
"leasesNotRestored": "The leases couldn't be restored",
|
||||||
"dhcpLeases": "DHCP leases",
|
"dhcpLeases": "DHCP leases",
|
||||||
"noLeases": "No DHCP leases available"
|
"noLeases": "No DHCP leases available",
|
||||||
|
"dnsRewrites": "DNS rewrites",
|
||||||
|
"dnsRewritesDescription": "Configure custom DNS rules",
|
||||||
|
"loadingRewriteRules": "Loading rewrite rules...",
|
||||||
|
"rewriteRulesNotLoaded": "DNS rewrite rules could not be loaded.",
|
||||||
|
"noRewriteRules": "No DNS rewrite rules",
|
||||||
|
"answer": "Answer"
|
||||||
}
|
}
|
|
@ -378,5 +378,11 @@
|
||||||
"leasesRestored": "Asignaciones restauradas correctamente",
|
"leasesRestored": "Asignaciones restauradas correctamente",
|
||||||
"leasesNotRestored": "Las asignaciones no pudieron ser restauradas",
|
"leasesNotRestored": "Las asignaciones no pudieron ser restauradas",
|
||||||
"dhcpLeases": "Asignaciones DHCP",
|
"dhcpLeases": "Asignaciones DHCP",
|
||||||
"noLeases": "No hay asignaciones DHCP disponibles"
|
"noLeases": "No hay asignaciones DHCP disponibles",
|
||||||
|
"dnsRewrites": "Reescrituras DNS",
|
||||||
|
"dnsRewritesDescription": "Configurar reglas DNS personalizadas",
|
||||||
|
"loadingRewriteRules": "Cargando reescrituras DNS...",
|
||||||
|
"rewriteRulesNotLoaded": "No se han podido cargar las reescrituras DNS.",
|
||||||
|
"noRewriteRules": "No hay reescrituras DNS.",
|
||||||
|
"answer": "Respuesta"
|
||||||
}
|
}
|
35
lib/models/rewrite_rules.dart
Normal file
35
lib/models/rewrite_rules.dart
Normal file
|
@ -0,0 +1,35 @@
|
||||||
|
import 'dart:convert';
|
||||||
|
|
||||||
|
class RewriteRules {
|
||||||
|
int loadStatus = 0;
|
||||||
|
List<RewriteRulesData>? data;
|
||||||
|
|
||||||
|
RewriteRules({
|
||||||
|
required this.loadStatus,
|
||||||
|
this.data
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
List<RewriteRulesData> rewriteRulesDataFromJson(String str) => List<RewriteRulesData>.from(json.decode(str).map((x) => RewriteRulesData.fromJson(x)));
|
||||||
|
|
||||||
|
String rewriteRulesDataToJson(List<RewriteRulesData> data) => json.encode(List<RewriteRulesData>.from(data.map((x) => x.toJson())));
|
||||||
|
|
||||||
|
class RewriteRulesData {
|
||||||
|
final String domain;
|
||||||
|
final String answer;
|
||||||
|
|
||||||
|
RewriteRulesData({
|
||||||
|
required this.domain,
|
||||||
|
required this.answer,
|
||||||
|
});
|
||||||
|
|
||||||
|
factory RewriteRulesData.fromJson(Map<String, dynamic> json) => RewriteRulesData(
|
||||||
|
domain: json["domain"],
|
||||||
|
answer: json["answer"],
|
||||||
|
);
|
||||||
|
|
||||||
|
Map<String, dynamic> toJson() => {
|
||||||
|
"domain": domain,
|
||||||
|
"answer": answer,
|
||||||
|
};
|
||||||
|
}
|
|
@ -3,6 +3,7 @@ import 'package:sqflite/sqflite.dart';
|
||||||
|
|
||||||
import 'package:adguard_home_manager/models/filtering.dart';
|
import 'package:adguard_home_manager/models/filtering.dart';
|
||||||
import 'package:adguard_home_manager/models/dhcp.dart';
|
import 'package:adguard_home_manager/models/dhcp.dart';
|
||||||
|
import 'package:adguard_home_manager/models/rewrite_rules.dart';
|
||||||
import 'package:adguard_home_manager/models/filtering_status.dart';
|
import 'package:adguard_home_manager/models/filtering_status.dart';
|
||||||
import 'package:adguard_home_manager/models/clients_allowed_blocked.dart';
|
import 'package:adguard_home_manager/models/clients_allowed_blocked.dart';
|
||||||
import 'package:adguard_home_manager/models/clients.dart';
|
import 'package:adguard_home_manager/models/clients.dart';
|
||||||
|
@ -37,6 +38,11 @@ class ServersProvider with ChangeNotifier {
|
||||||
data: null
|
data: null
|
||||||
);
|
);
|
||||||
|
|
||||||
|
final RewriteRules _rewriteRules = RewriteRules(
|
||||||
|
loadStatus: 0, // 0 = loading, 1 = loaded, 2 = error
|
||||||
|
data: null
|
||||||
|
);
|
||||||
|
|
||||||
FilteringStatus? _filteringStatus;
|
FilteringStatus? _filteringStatus;
|
||||||
|
|
||||||
List<Server> get serversList {
|
List<Server> get serversList {
|
||||||
|
@ -71,6 +77,10 @@ class ServersProvider with ChangeNotifier {
|
||||||
return _dhcp;
|
return _dhcp;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
RewriteRules get rewriteRules {
|
||||||
|
return _rewriteRules;
|
||||||
|
}
|
||||||
|
|
||||||
void setDbInstance(Database db) {
|
void setDbInstance(Database db) {
|
||||||
_dbInstance = db;
|
_dbInstance = db;
|
||||||
}
|
}
|
||||||
|
@ -157,6 +167,18 @@ class ServersProvider with ChangeNotifier {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void setRewriteRulesData(List<RewriteRulesData> data) {
|
||||||
|
_rewriteRules.data = data;
|
||||||
|
notifyListeners();
|
||||||
|
}
|
||||||
|
|
||||||
|
void setRewriteRulesLoadStatus(int status, bool notify) {
|
||||||
|
_rewriteRules.loadStatus = status;
|
||||||
|
if (notify == true) {
|
||||||
|
notifyListeners();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Future<bool> createServer(Server server) async {
|
Future<bool> createServer(Server server) async {
|
||||||
final saved = await saveServerIntoDb(server);
|
final saved = await saveServerIntoDb(server);
|
||||||
if (saved == true) {
|
if (saved == true) {
|
||||||
|
|
192
lib/screens/settings/dns_rewrites/dns_rewrites.dart
Normal file
192
lib/screens/settings/dns_rewrites/dns_rewrites.dart
Normal file
|
@ -0,0 +1,192 @@
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:provider/provider.dart';
|
||||||
|
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
||||||
|
|
||||||
|
import 'package:adguard_home_manager/services/http_requests.dart';
|
||||||
|
import 'package:adguard_home_manager/providers/app_config_provider.dart';
|
||||||
|
import 'package:adguard_home_manager/providers/servers_provider.dart';
|
||||||
|
|
||||||
|
class DnsRewrites extends StatelessWidget {
|
||||||
|
const DnsRewrites({Key? key}) : super(key: key);
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final serversProvider = Provider.of<ServersProvider>(context);
|
||||||
|
final appConfigProvider = Provider.of<AppConfigProvider>(context);
|
||||||
|
|
||||||
|
return DnsRewritesWidget(
|
||||||
|
serversProvider: serversProvider,
|
||||||
|
appConfigProvider: appConfigProvider,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class DnsRewritesWidget extends StatefulWidget {
|
||||||
|
final ServersProvider serversProvider;
|
||||||
|
final AppConfigProvider appConfigProvider;
|
||||||
|
|
||||||
|
const DnsRewritesWidget({
|
||||||
|
Key? key,
|
||||||
|
required this.serversProvider,
|
||||||
|
required this.appConfigProvider
|
||||||
|
}) : super(key: key);
|
||||||
|
|
||||||
|
@override
|
||||||
|
State<DnsRewritesWidget> createState() => _DnsRewritesWidgetState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class _DnsRewritesWidgetState extends State<DnsRewritesWidget> {
|
||||||
|
void fetchData() async {
|
||||||
|
widget.serversProvider.setRewriteRulesLoadStatus(0, false);
|
||||||
|
|
||||||
|
final result = await getDnsRewriteRules(server: widget.serversProvider.selectedServer!);
|
||||||
|
|
||||||
|
if (result['result'] == 'success') {
|
||||||
|
widget.serversProvider.setRewriteRulesData(result['data']);
|
||||||
|
widget.serversProvider.setRewriteRulesLoadStatus(1, true);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
widget.appConfigProvider.addLog(result['log']);
|
||||||
|
widget.serversProvider.setRewriteRulesLoadStatus(2, true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void initState() {
|
||||||
|
fetchData();
|
||||||
|
super.initState();
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final serversProvider = Provider.of<ServersProvider>(context);
|
||||||
|
|
||||||
|
Widget generateBody() {
|
||||||
|
switch (serversProvider.rewriteRules.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)!.loadingRewriteRules,
|
||||||
|
style: const TextStyle(
|
||||||
|
fontSize: 22,
|
||||||
|
color: Colors.grey,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
case 1:
|
||||||
|
if (serversProvider.rewriteRules.data!.isNotEmpty) {
|
||||||
|
return ListView.builder(
|
||||||
|
padding: const EdgeInsets.only(top: 0),
|
||||||
|
itemCount: serversProvider.rewriteRules.data!.length,
|
||||||
|
itemBuilder: (context, index) => Container(
|
||||||
|
padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 10),
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
border: Border(
|
||||||
|
bottom: BorderSide(
|
||||||
|
color: Colors.grey.shade200
|
||||||
|
)
|
||||||
|
)
|
||||||
|
),
|
||||||
|
child: Row(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||||
|
children: [
|
||||||
|
Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Row(
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
"${AppLocalizations.of(context)!.domain}: ",
|
||||||
|
style: const TextStyle(
|
||||||
|
fontWeight: FontWeight.w500
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Text(
|
||||||
|
serversProvider.rewriteRules.data![index].domain,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
const SizedBox(height: 3),
|
||||||
|
Row(
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
"${AppLocalizations.of(context)!.answer}: ",
|
||||||
|
style: const TextStyle(
|
||||||
|
fontWeight: FontWeight.w500
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Text(
|
||||||
|
serversProvider.rewriteRules.data![index].answer,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
IconButton(
|
||||||
|
onPressed: () => {},
|
||||||
|
icon: const Icon(Icons.delete)
|
||||||
|
)
|
||||||
|
],
|
||||||
|
),
|
||||||
|
)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
return Center(
|
||||||
|
child: Text(
|
||||||
|
AppLocalizations.of(context)!.noRewriteRules,
|
||||||
|
style: const TextStyle(
|
||||||
|
fontSize: 22,
|
||||||
|
color: Colors.grey,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
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)!.rewriteRulesNotLoaded,
|
||||||
|
style: const TextStyle(
|
||||||
|
fontSize: 22,
|
||||||
|
color: Colors.grey,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
default:
|
||||||
|
return const SizedBox();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return Scaffold(
|
||||||
|
appBar: AppBar(
|
||||||
|
title: Text(AppLocalizations.of(context)!.dnsRewrites),
|
||||||
|
),
|
||||||
|
body: generateBody(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
|
@ -10,6 +10,7 @@ import 'package:adguard_home_manager/screens/settings/server_info/server_info.da
|
||||||
import 'package:adguard_home_manager/screens/settings/access_settings/access_settings.dart';
|
import 'package:adguard_home_manager/screens/settings/access_settings/access_settings.dart';
|
||||||
import 'package:adguard_home_manager/screens/settings/dhcp/dhcp.dart';
|
import 'package:adguard_home_manager/screens/settings/dhcp/dhcp.dart';
|
||||||
import 'package:adguard_home_manager/screens/settings/section_label.dart';
|
import 'package:adguard_home_manager/screens/settings/section_label.dart';
|
||||||
|
import 'package:adguard_home_manager/screens/settings/dns_rewrites/dns_rewrites.dart';
|
||||||
import 'package:adguard_home_manager/screens/settings/appbar.dart';
|
import 'package:adguard_home_manager/screens/settings/appbar.dart';
|
||||||
import 'package:adguard_home_manager/screens/servers/servers.dart';
|
import 'package:adguard_home_manager/screens/servers/servers.dart';
|
||||||
import 'package:adguard_home_manager/screens/settings/advanced_setings.dart';
|
import 'package:adguard_home_manager/screens/settings/advanced_setings.dart';
|
||||||
|
@ -112,6 +113,18 @@ class Settings extends StatelessWidget {
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
|
CustomListTile(
|
||||||
|
leadingIcon: Icons.route_rounded,
|
||||||
|
label: AppLocalizations.of(context)!.dnsRewrites,
|
||||||
|
description: AppLocalizations.of(context)!.dnsRewritesDescription,
|
||||||
|
onTap: () => {
|
||||||
|
Navigator.of(context).push(
|
||||||
|
MaterialPageRoute(
|
||||||
|
builder: (context) => const DnsRewrites()
|
||||||
|
)
|
||||||
|
)
|
||||||
|
},
|
||||||
|
),
|
||||||
CustomListTile(
|
CustomListTile(
|
||||||
leadingIcon: Icons.info_rounded,
|
leadingIcon: Icons.info_rounded,
|
||||||
label: AppLocalizations.of(context)!.serverInformation,
|
label: AppLocalizations.of(context)!.serverInformation,
|
||||||
|
|
|
@ -9,6 +9,7 @@ import 'package:adguard_home_manager/models/filtering.dart';
|
||||||
import 'package:adguard_home_manager/models/logs.dart';
|
import 'package:adguard_home_manager/models/logs.dart';
|
||||||
import 'package:adguard_home_manager/models/filtering_status.dart';
|
import 'package:adguard_home_manager/models/filtering_status.dart';
|
||||||
import 'package:adguard_home_manager/models/app_log.dart';
|
import 'package:adguard_home_manager/models/app_log.dart';
|
||||||
|
import 'package:adguard_home_manager/models/rewrite_rules.dart';
|
||||||
import 'package:adguard_home_manager/models/server_info.dart';
|
import 'package:adguard_home_manager/models/server_info.dart';
|
||||||
import 'package:adguard_home_manager/models/server_status.dart';
|
import 'package:adguard_home_manager/models/server_status.dart';
|
||||||
import 'package:adguard_home_manager/models/clients.dart';
|
import 'package:adguard_home_manager/models/clients.dart';
|
||||||
|
@ -1355,3 +1356,42 @@ Future restoreAllLeases({
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Future getDnsRewriteRules({
|
||||||
|
required Server server,
|
||||||
|
}) async {
|
||||||
|
final result = await apiRequest(
|
||||||
|
urlPath: '/rewrite/list',
|
||||||
|
method: 'get',
|
||||||
|
server: server,
|
||||||
|
type: 'get_dns_rewrite_rules'
|
||||||
|
);
|
||||||
|
|
||||||
|
if (result['hasResponse'] == true) {
|
||||||
|
if (result['statusCode'] == 200) {
|
||||||
|
final List<RewriteRulesData> data = List<RewriteRulesData>.from(
|
||||||
|
jsonDecode(result['body']).map((item) => RewriteRulesData.fromJson(item))
|
||||||
|
);
|
||||||
|
|
||||||
|
return {
|
||||||
|
'result': 'success',
|
||||||
|
'data': data
|
||||||
|
};
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
return {
|
||||||
|
'result': 'error',
|
||||||
|
'log': AppLog(
|
||||||
|
type: 'get_dns_rewrite_rules',
|
||||||
|
dateTime: DateTime.now(),
|
||||||
|
message: 'error_code_not_expected',
|
||||||
|
statusCode: result['statusCode'].toString(),
|
||||||
|
resBody: result['body'],
|
||||||
|
)
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
}
|
Loading…
Add table
Reference in a new issue