daxi20/AdGuardHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Hide 80 web port

Browse Source
This commit is contained in:
Ildar Kamalov
2019-02-06 17:32:32 +03:00
parent 672ff33879
commit ba678ffa82
4 changed files with 33 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
client/src/helpers/constants.js
View File

@@ -72,3 +72,4 @@ export const SETTINGS_NAMES = {
};
export const STANDARD_DNS_PORT = 53;
export const STANDARD_WEB_PORT = 80;

38
client/src/helpers/helpers.js
View File

@@ -4,7 +4,7 @@ import subHours from 'date-fns/sub_hours';
import addHours from 'date-fns/add_hours';
import round from 'lodash/round';
import { STATS_NAMES, STANDARD_DNS_PORT } from './constants';
import { STATS_NAMES, STANDARD_DNS_PORT, STANDARD_WEB_PORT } from './constants';
export const formatTime = (time) => {
const parsedTime = dateParse(time);
@@ -111,20 +111,32 @@ export const getIpList = (interfaces) => {
return list.sort();
};
export const getAddress = (ip, port = '', isDns = false) => {
if (!port) {
return isDns ? ip : `http://${ip}`;
}
export const getDnsAddress = (ip, port = '') => {
const isStandardDnsPort = port === STANDARD_DNS_PORT;
let address = ip;
if (isDns) {
if (ip.includes(':') && port !== STANDARD_DNS_PORT) {
return `[${ip}]:${port}`;
} else if (port !== STANDARD_DNS_PORT) {
return `${ip}:${port}`;
if (port) {
if (ip.includes(':') && !isStandardDnsPort) {
address = `[${ip}]:${port}`;
} else if (!isStandardDnsPort) {
address = `${ip}:${port}`;
}
return ip;
}
return ip.includes(':') ? `http://[${ip}]:${port}` : `http://${ip}:${port}`;
return address;
};
export const getWebAddress = (ip, port = '') => {
const isStandardWebPort = port === STANDARD_WEB_PORT;
let address = `http://${ip}`;
if (port) {
if (ip.includes(':') && !isStandardWebPort) {
address = `http://[${ip}]:${port}`;
} else if (!isStandardWebPort) {
address = `http://${ip}:${port}`;
}
}
return address;
};