wt/openrouter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added dns local domains

Browse Source
This commit is contained in:
wt
2024-07-01 18:46:32 +07:00
parent a7ff04b7c2
commit 77fb7b0816
15 changed files with 296 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+3 -2
View File
@@ -11,8 +11,9 @@ add_executable(
src/settings/telnet/telnet.cpp
src/settings/dns/dns.cpp
src/settings/dns/dns_servers.cpp
src/settings/dns/enabled.cpp
src/settings/dns/servers.cpp
src/settings/dns/local_domains.cpp
src/settings/ftp/ftp.cpp
src/openrouter.cpp
+2
View File
@@ -19,6 +19,8 @@ int main() {
srv.Post("/api/settings/dns/set", set_dns);
srv.Post("/api/settings/dns/servers/get", get_dns_servers);
srv.Post("/api/settings/dns/servers/set", set_dns_servers);
srv.Post("/api/settings/dns/domains/get", get_local_domains);
srv.Post("/api/settings/dns/domains/set", set_local_domains);
srv.Post("/api/settings/ftp/get", get_ftp);
srv.Post("/api/settings/ftp/set", set_ftp);
src/settings/dns/dns.hpp
+4
View File
@@ -5,7 +5,11 @@
void get_dns(const httplib::Request &request, httplib::Response &response);
void set_dns(const httplib::Request &request, httplib::Response &response);
void get_dns_servers(const httplib::Request &request, httplib::Response &response);
void set_dns_servers(const httplib::Request &request, httplib::Response &response);
void get_local_domains(const httplib::Request &request, httplib::Response &response);
void set_local_domains(const httplib::Request &request, httplib::Response &response);
#endif // DNS_HPP
src/settings/dns/dns.cpp → src/settings/dns/enabled.cpp
View File
src/settings/dns/local_domains.cpp
+98
View File
@@ -0,0 +1,98 @@
#include "dns.hpp"
#include <colors.h>
#include <json.hpp>
#include "../../routes.hpp"
#include "../../types.hpp"
void get_local_domains(const httplib::Request &request, httplib::Response &response) {
std::cout << GREEN << request.path << RESET << " " << request.method << std::endl;
response.set_header("Access-Control-Allow-Origin", "*");
if (request.body.empty()) {
response.set_content(ACCESS_REQUIRED_STRING, JSON_TYPE);
return;
}
nlohmann::json json_body = nlohmann::json::parse(request.body);
if (json_body["token"] == nullptr) {
response.set_content(ACCESS_REQUIRED_STRING, JSON_TYPE);
return;
}
httplib::Client cli(AUTH_SERVICE);
std::stringstream body;
body << R"({"token":)" << json_body["token"] << R"(})";
httplib::Result res = cli.Post("/api/access", body.str().c_str(), JSON_TYPE);
if (res->status == httplib::OK_200) {
nlohmann::json resjson = nlohmann::json::parse(res->body);
if (resjson["access"] == "reject") {
response.set_content(resjson.dump().c_str(), JSON_TYPE);
return;
}
std::ifstream domainsfile("/etc/dnsmasq.conf.d/hosts");
std::stringstream responsedata;
responsedata << R"({"domains":[)";
std::string ip_string = "";
std::string domain_string = "";
int iter = 0;
while (!domainsfile.eof()) {
domainsfile >> ip_string;
domainsfile >> domain_string;
if (domain_string == "") {
continue;
}
responsedata << R"({"ip":")" << ip_string << R"(","domain":")" << domain_string << R"("},)";
ip_string = "";
domain_string = "";
iter++;
}
if (iter != 0) {
responsedata.str(responsedata.str().erase(responsedata.str().size()-1, 1) + "]}");
} else {
responsedata << "]}";
}
domainsfile.close();
response.set_content(responsedata.str(), JSON_TYPE);
}
}
void set_local_domains(const httplib::Request &request, httplib::Response &response) {
std::cout << GREEN << request.path << RESET << " " << request.method << std::endl;
response.set_header("Access-Control-Allow-Origin", "*");
if (request.body.empty()) {
response.set_content(ACCESS_REQUIRED_STRING, JSON_TYPE);
return;
}
nlohmann::json json_body = nlohmann::json::parse(request.body);
if (json_body["token"] == nullptr) {
response.set_content(ACCESS_REQUIRED_STRING, JSON_TYPE);
return;
}
httplib::Client cli(AUTH_SERVICE);
std::stringstream body;
body << R"({"token":)" << json_body["token"] << R"(})";
httplib::Result res = cli.Post("/api/access", body.str().c_str(), JSON_TYPE);
if (res->status == httplib::OK_200) {
nlohmann::json resjson = nlohmann::json::parse(res->body);
if (resjson["access"] == "reject") {
response.set_content(resjson.dump().c_str(), JSON_TYPE);
return;
}
std::ofstream domainsfile("/etc/dnsmasq.conf.d/hosts");
nlohmann::json domains = json_body["domains"];
for (nlohmann::json_abi_v3_11_3::json domain : domains) {
std::string ip = domain["ip"];
std::string dom = domain["domain"];
domainsfile << ip << " " << dom << "\n";
}
domainsfile.close();
system("/etc/init.d/dnsmasq restart");
std::string responsedata = R"({"success":"true"})";
response.set_content(responsedata, JSON_TYPE);
}
}
src/settings/dns/dns_servers.cpp → src/settings/dns/servers.cpp
+12 -3
View File
@@ -34,14 +34,20 @@ void get_dns_servers(const httplib::Request &request, httplib::Response &respons
}
std::ifstream dnsserversfile("/etc/dnsmasq.conf.d/resolv.conf");
std::stringstream responsedata;
responsedata << R"({"servers":[")";
responsedata << R"({"servers":[)";
std::string dns_server_string = "";
int iter = 0;
while (std::getline(dnsserversfile, dns_server_string)) {
dns_server_string.erase(0, 11);
responsedata << dns_server_string << R"(",")";
responsedata << "\"" << dns_server_string << R"(",)";
dns_server_string = "";
iter++;
}
if (iter != 0) {
responsedata.str(responsedata.str().erase(responsedata.str().size()-1, 1) + "]}");
} else {
responsedata << "]}";
}
responsedata.str(responsedata.str().erase(responsedata.str().size()-2, 2) + "]}");
dnsserversfile.close();
response.set_content(responsedata.str(), JSON_TYPE);
}
@@ -77,6 +83,9 @@ void set_dns_servers(const httplib::Request &request, httplib::Response &respons
nlohmann::json servers = json_body["servers"];
for (nlohmann::json_abi_v3_11_3::json server : servers) {
std::string srv = server;
if (server == "") {
continue;
}
dnsserversfile << "nameserver " << srv << "\n";
}
dnsserversfile.close();
src/web/css/settings.css
+29 -3
View File
@@ -67,7 +67,7 @@
.settingssection {
display: flex;
flex-direction: column;
/* flex-direction: column; */
gap: 10px;
}
@@ -137,24 +137,50 @@
}
table {
position: relative;
width: 100%;
border: 2px solid ;
border-radius: 10px;
margin: 10px 0;
}
thead>tr>th {
border-bottom: 2px solid;
padding: 10px;
width: 100%;
width: 50%;
}
tbody>tr>th {
.one {
border: 2px solid;
padding: 10px;
border-radius: 10px;
display: flex;
align-items: center;
justify-content: space-between;
width: 100%;
}
.three {
width: 33%;
}
/* tbody>tr>th.one {
border: 2px solid;
padding: 10px;
border-radius: 10px;
display: flex;
align-items: center;
justify-content: space-between;
} */
tbody>tr>th {
border: 2px solid;
padding: 10px;
border-radius: 10px;
width: 50%;
/* display: flex;
align-items: center;
justify-content: space-between; */
}
@media screen and (max-width: 1200px) {
src/web/index.html
+33 -1
View File
@@ -76,8 +76,21 @@
<tbody id="dnsserverstablebody">
</tbody>
</table>
<h3>Domains Table</h3>
<table class="domains">
<thead>
<tr>
<th class="three">IP</th>
<th class="three">Domain</th>
<!-- <th class="three">Del</th> -->
</tr>
</thead>
<tbody id="domainsstablebody">
</tbody>
</table>
</div>
<div class="settingrectfooter">
<button id="add_local_domain_button" class="hiddenbutton settingrectfooterbutton">Add Local Domain</button>
<button id="add_dns_server_button" class="hiddenbutton settingrectfooterbutton">Add DNS server</button>
<button class="settingrectfooterbutton" id="set_dns_settings">Confirm</button>
</div>
@@ -138,7 +151,7 @@
<div class="formbody adddnsserverformbody">
<h1 class="formheader" id="adddnsserverform">Add DNS server</h1>
<div class="forminputbody adddnsserverform">
<label for="adddnsserverinput" class="forminputlabel"></label>
<label for="adddnsserverinput" class="forminputlabel">Server IP</label>
<input required type="text" class="forminput" id="adddnsserverinput">
</div>
<div class="forminputbody confirmform">
@@ -148,6 +161,25 @@
</div>
</div>
<!-- add DNS server form -->
<!-- add local domain form -->
<div class="form" id="addlocaldomainform">
<div class="formbody addlocaldomainformbody">
<h1 class="formheader" id="addlocaldomainform">Add Local Domain</h1>
<div class="forminputbody addlocaldomainform">
<label for="ipinput" class="forminputlabel">IP</label>
<input required type="text" class="forminput" id="ipinput">
</div>
<div class="forminputbody addlocaldomainform">
<label for="domaininput" class="forminputlabel">Domain</label>
<input required type="text" class="forminput" id="domaininput">
</div>
<div class="forminputbody confirmform">
<button class="formbutton" id="addlocaldomaincancel">Cancel</button>
<button class="formbutton" id="addlocaldomainconfirm">Add</button>
</div>
</div>
</div>
<!-- add local domain form -->
<!-- loader -->
<div class="loader">
<h1 id="loaderheader">Reboting</h1>
src/web/js/login.js
-3
View File
@@ -26,15 +26,12 @@ const login = async (username, password) => {
body: `{"username":"${username}","password":"${password}"}`
}).then(data => data.json()).then(jsondata => jsondata).catch((error) => {
if (error.message === "Unexpected end of JSON input") {
console.log("error")
notification(`Ошибка на сервере: Создайте файл users.json и запишите в него первого пользователя`, "error")
} else {
console.log("error")
notification(`Ошибка на сервере: ${error}`, "error")
}
})
if (response.status === "403") {
console.log("Неправильный логин или пароль")
notification("Неправильный логин или пароль", "error")
}
if (response.token) {
src/web/js/routes.js
+2
View File
@@ -12,6 +12,8 @@ const routes = {
dns_status_set: () => [host, prefix, 'settings', 'dns', 'set'].join('/'),
dns_servers_get: () => [host, prefix, 'settings', 'dns', 'servers', 'get'].join('/'),
dns_servers_set: () => [host, prefix, 'settings', 'dns', 'servers', 'set'].join('/'),
dns_local_domains_get: () => [host, prefix, 'settings', 'dns', 'domains', 'get'].join('/'),
dns_local_domains_set: () => [host, prefix, 'settings', 'dns', 'domains', 'set'].join('/'),
ftp_status: () => [host, prefix, 'settings', 'ftp', 'get'].join('/'),
ftp_status_set: () => [host, prefix, 'settings', 'ftp', 'set'].join('/'),
src/web/js/settings/confirm.js
-3
View File
@@ -8,11 +8,8 @@ const defaultcancelreqfunc = () => {
}
const get_confirm_form = (header, reqfunc = defaultcancelreqfunc, cancelreqfunc = defaultcancelreqfunc) => {
console.log("confirmform")
confirmformheader.innerHTML = header
console.log("confirmformheader")
confirmform.classList.add('active')
console.log("activeconfirmform")
var confirmbutton = document.createElement('button')
confirmbutton.classList.add('formbutton')
src/web/js/settings/dns.js
+110 -9
View File
@@ -9,19 +9,28 @@ const adddnsservercancelbutton = document.querySelector('#adddnsservercancel')
const adddnsserverconfirmbutton = document.querySelector('#adddnsserverconfirm')
const adddnsserverinput = document.querySelector('#adddnsserverinput')
const localdomainstablebody = document.querySelector('#domainsstablebody')
const addlocaldomainbutton = document.querySelector('#add_local_domain_button')
const addlocaldomainform = document.querySelector('#addlocaldomainform')
const addlocaldomaincancelbutton = document.querySelector('#addlocaldomaincancel')
const addlocaldomainconfirmbutton = document.querySelector('#addlocaldomainconfirm')
const domaininput = document.querySelector('#domaininput')
const ipinput = document.querySelector('#ipinput')
const domainstablebody = document.querySelector('#domainsstablebody')
let dnsservers = []
let localdomains = []
const get_dns_enabled_status = () => {
fetch(routes.dns_status(), {
method: 'POST',
body: `{"token":"${localStorage.getItem("token")}"}`
}).then(res => res.json()).then(jsondata => {
console.log(jsondata)
if (jsondata.enabled === '1') {
dnsenabled.checked = true
dnssettingbody.classList.add('active')
adddnsserverbutton.classList.add('active')
// adddnsserverbutton.parentElement.classList.remove('onebutton')
addlocaldomainbutton.classList.add('active')
return;
} else {
adddnsserverbutton.parentElement.classList.add('onebutton')
@@ -49,7 +58,10 @@ const set_dns_enabled_status = () => {
const set_dns_settings = () => {
set_dns_enabled_status()
set_dns_server()
if (dnsenabled.checked) {
set_dns_server()
set_local_domains()
}
}
setdnssettingsbutton.addEventListener('click', () =>{
@@ -60,11 +72,13 @@ dnsenabled.addEventListener('click', () => {
if (dnsenabled.checked) {
dnssettingbody.classList.add('active')
adddnsserverbutton.classList.add('active')
addlocaldomainbutton.classList.add('active')
adddnsserverbutton.parentElement.classList.remove('onebutton')
get_dns_server()
} else {
dnssettingbody.classList.remove('active')
adddnsserverbutton.classList.remove('active')
addlocaldomainbutton.classList.remove('active')
adddnsserverbutton.parentElement.classList.add('onebutton')
}
})
@@ -74,11 +88,15 @@ const get_dns_server = () => {
method: 'POST',
body: `{"token":"${localStorage.getItem("token")}"}`
}).then(res => res.json()).then(jsondata => {
console.log(jsondata)
dnsservers = jsondata.servers
dnsserverstablebody.innerHTML = ""
for (const server in jsondata.servers) {
dnsserverstablebody.innerHTML += `<tr><th>${jsondata.servers[server]} <button class="deldnsserverbutton" id="${jsondata.servers[server]}">Del</button></th></tr>`
dnsserverstablebody.innerHTML += `<tr>
<th class="one">
${jsondata.servers[server]}
<button class="deldnsserverbutton" id="${jsondata.servers[server]}">Del</button>
</th>
</tr>`
}
}).catch((error) => {
notification(`Ошибка на сервере: ${error}`, "error")
@@ -87,13 +105,18 @@ const get_dns_server = () => {
const set_dns_server = () => {
start_loader("Load DNS")
console.log(`{"token":"${localStorage.getItem('token')}","servers":${JSON.stringify(dnsservers)}}`)
dnsservers.push(adddnsserverinput.value)
fetch(routes.dns_servers_set(), {
method: 'POST',
body: `{"token":"${localStorage.getItem('token')}","servers":${JSON.stringify(dnsservers)}}`
}).then(data => data.json()).then(jsondata => {
stop_loader()
jsondata.success ? get_dns_server() : notification("Неизвестная ошибка", "error")
if (jsondata.success) {
get_dns_server()
notification("Настройки dns сохранены", "success")
} else {
notification("Неизвестная ошибка", "error")
}
}).catch((error) => {
notification(`Ошибка на сервере: ${error}`, "error")
})
@@ -121,7 +144,6 @@ adddnsserverconfirmbutton.addEventListener('click', () => {
if (adddnsserverinput.value === "") {
return
}
dnsservers.push(adddnsserverinput.value)
get_confirm_form(`Confirm DNS settings? (Add DNS server: ${adddnsserverinput.value})`, set_dns_server, cancel_confirm_add_dns_server)
})
@@ -129,7 +151,86 @@ dnsserverstablebody.addEventListener('click', (e) => {
if (e.target.classList.contains('deldnsserverbutton')) {
dnsservers.splice(dnsservers.indexOf(e.target.id), 1)
set_dns_server()
console.log('del', e.target.id)
get_dns_server()
}
})
// ---------------------- local domains ---------------------------
const get_local_domains = () => {
fetch(routes.dns_local_domains_get(), {
method: 'POST',
body: `{"token":"${localStorage.getItem('token')}"}`
}).then(data => data.json()).then(jsondata => {
localdomains = jsondata.domains
localdomainstablebody.innerHTML = ""
for (const domain in jsondata.domains) {
localdomainstablebody.innerHTML += `<tr>
<th class="three">${jsondata.domains[domain].ip}</th>
<th class="three" style="display:flex;align-items:center;justify-content:space-between;width:100%">
${jsondata.domains[domain].domain}
<button class="deldomain" id="${jsondata.domains[domain].domain}">Del</button>
</th>
</tr>`
}
}).catch((error) => {
notification(`Ошибка на сервере: ${error}`, "error")
})
}
const set_local_domains = (domains = localdomains) => {
start_loader()
fetch(routes.dns_local_domains_set(), {
method: 'POST',
body: `{"token":"${localStorage.getItem('token')}","domains":${JSON.stringify(domains)}}`
}).then(data => data.json()).then(jsondata => {
stop_loader()
if (jsondata.success) {
get_local_domains()
notification("Настройки dns сохранены", "success")
} else {
notification("Неизвестная ошибка", "error")
}
}).catch((error) => {
notification(`Ошибка на сервере: ${error}`, "error")
})
}
const cancel_confirm_add_localdomain = () => {
confirmform.classList.remove('active')
addlocaldomainform.classList.add('active')
}
addlocaldomainbutton.addEventListener('click', () => {
addlocaldomainform.classList.add('active')
})
addlocaldomaincancelbutton.addEventListener('click', () => {
addlocaldomainform.classList.remove('active')
domaininput.value = "";
ipinput.value = "";
})
addlocaldomainconfirmbutton.addEventListener('click', () => {
addlocaldomainform.classList.remove('active')
get_confirm_form(`Confirm DNS settings? (Add Local Domain: ${ipinput.value} ${domaininput.value})`, () => {
localdomains.push({"ip": ipinput.value, "domain": domaininput.value});
set_local_domains()
ipinput.value = ""
domaininput.value = ""
}, cancel_confirm_add_localdomain)
})
domainstablebody.addEventListener('click', (e) => {
if (e.target.classList.contains('deldomain')) {
// const delel = localdomains.find(dom => dom.domain === e.target.id)
// delete localdomains.domains[localdomains.indexOf(delel)]
localdomains.splice(localdomains.indexOf(localdomains.find(dom => dom.domain === e.target.id)), 1)
// get_confirm_form(`Confirm DNS settings? (delete Local Domain: ${e.target.id})`, () => set_local_domains(localdomains))
set_local_domains()
get_local_domains()
}
})
// ------------------------- local domains end --------------------
src/web/js/settings/ftp.js
-1
View File
@@ -6,7 +6,6 @@ const get_ftp_enabled_status = () => {
method: 'POST',
body: `{"token":"${localStorage.getItem("token")}"}`
}).then(res => res.json()).then(jsondata => {
console.log(jsondata)
if (jsondata.enabled === '1') {
ftpenabled.checked = true
// ftpsettingbody.classList.add('active')
src/web/js/settings/settings.js
+3
View File
@@ -1,6 +1,9 @@
const get_all_settings = () => {
get_dns_enabled_status()
get_dns_server()
get_local_domains()
get_ftp_enabled_status()
get_telnet_enabled_status()
}
src/web/js/settings/telnet.js
-1
View File
@@ -8,7 +8,6 @@ const get_telnet_enabled_status = () => {
method: 'POST',
body: `{"token":"${localStorage.getItem("token")}"}`
}).then(res => res.json()).then(jsondata => {
console.log(jsondata)
if (jsondata.enabled === '1') {
telnetenabled.checked = true
addtelnetuserbutton.classList.add('active')