{Object.values(BLOCKING_MODES)
- .map(mode => (
+ .map((mode) => (
@@ -167,7 +165,7 @@ Form = connect((state) => {
})(Form);
export default flow([
- withNamespaces(),
+ withTranslation(),
reduxForm({
form: 'blockingModeForm',
}),
diff --git a/client/src/components/Settings/Dns/Config/index.js b/client/src/components/Settings/Dns/Config/index.js
index 58221cb7..7cf52eb4 100644
--- a/client/src/components/Settings/Dns/Config/index.js
+++ b/client/src/components/Settings/Dns/Config/index.js
@@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
-import { withNamespaces } from 'react-i18next';
+import { withTranslation } from 'react-i18next';
import Card from '../../../ui/Card';
import Form from './Form';
@@ -52,4 +52,4 @@ Config.propTypes = {
t: PropTypes.func.isRequired,
};
-export default withNamespaces()(Config);
+export default withTranslation()(Config);
diff --git a/client/src/components/Settings/Dns/Upstream/Examples.js b/client/src/components/Settings/Dns/Upstream/Examples.js
index 4a464a5e..de779b18 100644
--- a/client/src/components/Settings/Dns/Upstream/Examples.js
+++ b/client/src/components/Settings/Dns/Upstream/Examples.js
@@ -1,8 +1,8 @@
import React from 'react';
import PropTypes from 'prop-types';
-import { Trans, withNamespaces } from 'react-i18next';
+import { Trans, withTranslation } from 'react-i18next';
-const Examples = props => (
+const Examples = (props) => (
[{
+const getInputFields = () => [{
// eslint-disable-next-line react/display-name
getTitle: () =>
);
- } else if (isAboutExpire) {
+ } if (isAboutExpire) {
return (
link]}>
@@ -40,4 +40,4 @@ EncryptionTopline.propTypes = {
notAfter: PropTypes.string.isRequired,
};
-export default withNamespaces()(EncryptionTopline);
+export default withTranslation()(EncryptionTopline);
diff --git a/client/src/components/ui/Footer.js b/client/src/components/ui/Footer.js
index 8174ba2d..14f37637 100644
--- a/client/src/components/ui/Footer.js
+++ b/client/src/components/ui/Footer.js
@@ -1,6 +1,7 @@
import React, { Component, Fragment } from 'react';
import PropTypes from 'prop-types';
-import { Trans, withNamespaces } from 'react-i18next';
+import { Trans, withTranslation } from 'react-i18next';
+import classNames from 'classnames';
import { REPOSITORY, PRIVACY_POLICY_LINK } from '../../helpers/constants';
import { LANGUAGES } from '../../helpers/twosky';
@@ -10,6 +11,22 @@ import Version from './Version';
import './Footer.css';
import './Select.css';
+const linksData = [
+ {
+ href: REPOSITORY.URL,
+ name: 'homepage',
+ },
+ {
+ href: PRIVACY_POLICY_LINK,
+ name: 'privacy_policy',
+ },
+ {
+ href: REPOSITORY.ISSUES,
+ className: 'btn btn-outline-primary btn-sm footer__link--report',
+ name: 'report_an_issue',
+ },
+];
+
class Footer extends Component {
getYear = () => {
const today = new Date();
@@ -20,9 +37,27 @@ class Footer extends Component {
i18n.changeLanguage(event.target.value);
};
+ renderCopyright = () =>
+
+
copyright © {this.getYear()}{' '}
+
AdGuard
+
+
-
-
-
-
-
copyright © {this.getYear()}{' '}
-
AdGuard
-
-
-
-
-
+
+
+
+ {this.renderCopyright()}
+
+
- )}
+
);
}
@@ -110,6 +109,7 @@ Footer.propTypes = {
dnsVersion: PropTypes.string,
processingVersion: PropTypes.bool,
getVersion: PropTypes.func,
+ checkUpdateFlag: PropTypes.bool,
};
-export default withNamespaces()(Footer);
+export default withTranslation()(Footer);
diff --git a/client/src/components/ui/Guide.js b/client/src/components/ui/Guide.js
index bc18366a..b16cab47 100644
--- a/client/src/components/ui/Guide.js
+++ b/client/src/components/ui/Guide.js
@@ -1,15 +1,14 @@
import React, { Fragment } from 'react';
import PropTypes from 'prop-types';
-import { Trans, withNamespaces } from 'react-i18next';
+import { Trans, withTranslation } from 'react-i18next';
-import Tabs from '../ui/Tabs';
-import Icons from '../ui/Icons';
+import Tabs from './Tabs';
+import Icons from './Icons';
const Guide = (props) => {
const { dnsAddresses } = props;
- const tlsAddress = (dnsAddresses && dnsAddresses.filter(item => item.includes('tls://'))) || '';
- const httpsAddress =
- (dnsAddresses && dnsAddresses.filter(item => item.includes('https://'))) || '';
+ const tlsAddress = (dnsAddresses && dnsAddresses.filter((item) => item.includes('tls://'))) || '';
+ const httpsAddress = (dnsAddresses && dnsAddresses.filter((item) => item.includes('https://'))) || '';
const showDnsPrivacyNotice = httpsAddress.length < 1 && tlsAddress.length < 1;
return (
@@ -34,6 +33,9 @@ const Guide = (props) => {
install_devices_router_list_3
+
+ install_devices_router_list_4
+
@@ -370,4 +372,4 @@ Guide.propTypes = {
t: PropTypes.func.isRequired,
};
-export default withNamespaces()(Guide);
+export default withTranslation()(Guide);
diff --git a/client/src/components/ui/Line.js b/client/src/components/ui/Line.js
index b74490e3..079678de 100644
--- a/client/src/components/ui/Line.js
+++ b/client/src/components/ui/Line.js
@@ -4,51 +4,49 @@ import { ResponsiveLine } from '@nivo/line';
import './Line.css';
-const Line = ({ data, color }) => (
- data &&
-
(color)}
- tooltip={slice => (
-
- {slice.data.map(d => (
-
+const Line = ({ data, color }) => data
+ &&
(color)}
+ tooltip={(slice) => (
+
+ {slice.data.map((d) => (
+
{d.data.y}
-
+
{d.data.x}
-
- ))}
-
+ ))}
+
{props.title}
diff --git a/client/src/components/ui/Popover.js b/client/src/components/ui/Popover.js
index 4f7b8d0f..bc58ac17 100644
--- a/client/src/components/ui/Popover.js
+++ b/client/src/components/ui/Popover.js
@@ -1,6 +1,6 @@
import React, { Component } from 'react';
import PropTypes from 'prop-types';
-import { Trans, withNamespaces } from 'react-i18next';
+import { Trans, withTranslation } from 'react-i18next';
import { getSourceData } from '../../helpers/trackers/trackers';
import { captitalizeWords } from '../../helpers/helpers';
@@ -53,4 +53,4 @@ Popover.propTypes = {
data: PropTypes.object.isRequired,
};
-export default withNamespaces()(Popover);
+export default withTranslation()(Popover);
diff --git a/client/src/components/ui/PopoverFilter.js b/client/src/components/ui/PopoverFilter.js
index 85642169..39a2778a 100644
--- a/client/src/components/ui/PopoverFilter.js
+++ b/client/src/components/ui/PopoverFilter.js
@@ -1,6 +1,6 @@
import React, { Component } from 'react';
import PropTypes from 'prop-types';
-import { Trans, withNamespaces } from 'react-i18next';
+import { Trans, withTranslation } from 'react-i18next';
import './Popover.css';
@@ -49,4 +49,4 @@ PopoverFilter.propTypes = {
service: PropTypes.string,
};
-export default withNamespaces()(PopoverFilter);
+export default withTranslation()(PopoverFilter);
diff --git a/client/src/components/ui/Status.js b/client/src/components/ui/Status.js
index 2eb785e0..ff3fda00 100644
--- a/client/src/components/ui/Status.js
+++ b/client/src/components/ui/Status.js
@@ -1,8 +1,8 @@
import React from 'react';
import PropTypes from 'prop-types';
-import { withNamespaces, Trans } from 'react-i18next';
+import { withTranslation, Trans } from 'react-i18next';
-import Card from '../ui/Card';
+import Card from './Card';
const Status = ({ message, buttonMessage, reloadPage }) => (
@@ -10,8 +10,8 @@ const Status = ({ message, buttonMessage, reloadPage }) => (
{message}
- {buttonMessage &&
-
@@ -48,7 +48,7 @@ Submit = connect((state) => {
export default flow([
- withNamespaces(),
+ withTranslation(),
reduxForm({
form: 'install',
destroyOnUnmount: false,
diff --git a/client/src/install/Setup/index.js b/client/src/install/Setup/index.js
index 82d8f84b..561f4665 100644
--- a/client/src/install/Setup/index.js
+++ b/client/src/install/Setup/index.js
@@ -112,8 +112,8 @@ class Setup extends Component {
return (
{processingDefault && }
- {!processingDefault &&
-
+ {!processingDefault
+ &&
diff --git a/client/src/login/Login/Form.js b/client/src/login/Login/Form.js
index 45274b55..d3d825d7 100644
--- a/client/src/login/Login/Form.js
+++ b/client/src/login/Login/Form.js
@@ -1,7 +1,7 @@
import React from 'react';
import PropTypes from 'prop-types';
import { Field, reduxForm } from 'redux-form';
-import { Trans, withNamespaces } from 'react-i18next';
+import { Trans, withTranslation } from 'react-i18next';
import flow from 'lodash/flow';
import { renderInputField, required } from '../../helpers/form';
@@ -69,7 +69,7 @@ Form.propTypes = {
};
export default flow([
- withNamespaces(),
+ withTranslation(),
reduxForm({
form: 'loginForm',
}),
diff --git a/client/src/login/Login/index.js b/client/src/login/Login/index.js
index 424a7a9d..88354dc2 100644
--- a/client/src/login/Login/index.js
+++ b/client/src/login/Login/index.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
import { connect } from 'react-redux';
import PropTypes from 'prop-types';
import flow from 'lodash/flow';
-import { withNamespaces, Trans } from 'react-i18next';
+import { withTranslation, Trans } from 'react-i18next';
import * as actionCreators from '../../actions/login';
import logo from '../../components/ui/svg/logo.svg';
@@ -23,7 +23,7 @@ class Login extends Component {
};
toggleText = () => {
- this.setState(prevState => ({
+ this.setState((prevState) => ({
isForgotPasswordVisible: !prevState.isForgotPasswordVisible,
}));
};
@@ -82,7 +82,7 @@ Login.propTypes = {
const mapStateToProps = ({ login, toasts }) => ({ login, toasts });
export default flow([
- withNamespaces(),
+ withTranslation(),
connect(
mapStateToProps,
actionCreators,
diff --git a/client/src/reducers/access.js b/client/src/reducers/access.js
index 79110279..cf1ad958 100644
--- a/client/src/reducers/access.js
+++ b/client/src/reducers/access.js
@@ -4,8 +4,8 @@ import * as actions from '../actions/access';
const access = handleActions(
{
- [actions.getAccessListRequest]: state => ({ ...state, processing: true }),
- [actions.getAccessListFailure]: state => ({ ...state, processing: false }),
+ [actions.getAccessListRequest]: (state) => ({ ...state, processing: true }),
+ [actions.getAccessListFailure]: (state) => ({ ...state, processing: false }),
[actions.getAccessListSuccess]: (state, { payload }) => {
const {
allowed_clients,
@@ -22,8 +22,8 @@ const access = handleActions(
return newState;
},
- [actions.setAccessListRequest]: state => ({ ...state, processingSet: true }),
- [actions.setAccessListFailure]: state => ({ ...state, processingSet: false }),
+ [actions.setAccessListRequest]: (state) => ({ ...state, processingSet: true }),
+ [actions.setAccessListFailure]: (state) => ({ ...state, processingSet: false }),
[actions.setAccessListSuccess]: (state) => {
const newState = {
...state,
@@ -32,8 +32,8 @@ const access = handleActions(
return newState;
},
- [actions.toggleClientBlockRequest]: state => ({ ...state, processingSet: true }),
- [actions.toggleClientBlockFailure]: state => ({ ...state, processingSet: false }),
+ [actions.toggleClientBlockRequest]: (state) => ({ ...state, processingSet: true }),
+ [actions.toggleClientBlockFailure]: (state) => ({ ...state, processingSet: false }),
[actions.toggleClientBlockSuccess]: (state, { payload }) => {
const {
allowed_clients,
diff --git a/client/src/reducers/clients.js b/client/src/reducers/clients.js
index 0946e437..7c6c309c 100644
--- a/client/src/reducers/clients.js
+++ b/client/src/reducers/clients.js
@@ -3,8 +3,8 @@ import { handleActions } from 'redux-actions';
import * as actions from '../actions/clients';
const clients = handleActions({
- [actions.addClientRequest]: state => ({ ...state, processingAdding: true }),
- [actions.addClientFailure]: state => ({ ...state, processingAdding: false }),
+ [actions.addClientRequest]: (state) => ({ ...state, processingAdding: true }),
+ [actions.addClientFailure]: (state) => ({ ...state, processingAdding: false }),
[actions.addClientSuccess]: (state) => {
const newState = {
...state,
@@ -13,8 +13,8 @@ const clients = handleActions({
return newState;
},
- [actions.deleteClientRequest]: state => ({ ...state, processingDeleting: true }),
- [actions.deleteClientFailure]: state => ({ ...state, processingDeleting: false }),
+ [actions.deleteClientRequest]: (state) => ({ ...state, processingDeleting: true }),
+ [actions.deleteClientFailure]: (state) => ({ ...state, processingDeleting: false }),
[actions.deleteClientSuccess]: (state) => {
const newState = {
...state,
@@ -23,8 +23,8 @@ const clients = handleActions({
return newState;
},
- [actions.updateClientRequest]: state => ({ ...state, processingUpdating: true }),
- [actions.updateClientFailure]: state => ({ ...state, processingUpdating: false }),
+ [actions.updateClientRequest]: (state) => ({ ...state, processingUpdating: true }),
+ [actions.updateClientFailure]: (state) => ({ ...state, processingUpdating: false }),
[actions.updateClientSuccess]: (state) => {
const newState = {
...state,
diff --git a/client/src/reducers/dnsConfig.js b/client/src/reducers/dnsConfig.js
index 9f55bee7..b3978217 100644
--- a/client/src/reducers/dnsConfig.js
+++ b/client/src/reducers/dnsConfig.js
@@ -8,9 +8,8 @@ const DEFAULT_BLOCKING_IPV6 = '::';
const dnsConfig = handleActions(
{
- [actions.getDnsConfigRequest]: state => ({ ...state, processingGetConfig: true }),
- [actions.getDnsConfigFailure]: state =>
- ({ ...state, processingGetConfig: false }),
+ [actions.getDnsConfigRequest]: (state) => ({ ...state, processingGetConfig: true }),
+ [actions.getDnsConfigFailure]: (state) => ({ ...state, processingGetConfig: false }),
[actions.getDnsConfigSuccess]: (state, { payload }) => {
const {
blocking_ipv4,
@@ -31,9 +30,8 @@ const dnsConfig = handleActions(
};
},
- [actions.setDnsConfigRequest]: state => ({ ...state, processingSetConfig: true }),
- [actions.setDnsConfigFailure]: state =>
- ({ ...state, processingSetConfig: false }),
+ [actions.setDnsConfigRequest]: (state) => ({ ...state, processingSetConfig: true }),
+ [actions.setDnsConfigFailure]: (state) => ({ ...state, processingSetConfig: false }),
[actions.setDnsConfigSuccess]: (state, { payload }) => ({
...state,
...payload,
diff --git a/client/src/reducers/encryption.js b/client/src/reducers/encryption.js
index c94e9015..a5cd7cbf 100644
--- a/client/src/reducers/encryption.js
+++ b/client/src/reducers/encryption.js
@@ -3,8 +3,8 @@ import { handleActions } from 'redux-actions';
import * as actions from '../actions/encryption';
const encryption = handleActions({
- [actions.getTlsStatusRequest]: state => ({ ...state, processing: true }),
- [actions.getTlsStatusFailure]: state => ({ ...state, processing: false }),
+ [actions.getTlsStatusRequest]: (state) => ({ ...state, processing: true }),
+ [actions.getTlsStatusFailure]: (state) => ({ ...state, processing: false }),
[actions.getTlsStatusSuccess]: (state, { payload }) => {
const newState = {
...state,
@@ -14,8 +14,8 @@ const encryption = handleActions({
return newState;
},
- [actions.setTlsConfigRequest]: state => ({ ...state, processingConfig: true }),
- [actions.setTlsConfigFailure]: state => ({ ...state, processingConfig: false }),
+ [actions.setTlsConfigRequest]: (state) => ({ ...state, processingConfig: true }),
+ [actions.setTlsConfigFailure]: (state) => ({ ...state, processingConfig: false }),
[actions.setTlsConfigSuccess]: (state, { payload }) => {
const newState = {
...state,
@@ -25,8 +25,8 @@ const encryption = handleActions({
return newState;
},
- [actions.validateTlsConfigRequest]: state => ({ ...state, processingValidate: true }),
- [actions.validateTlsConfigFailure]: state => ({ ...state, processingValidate: false }),
+ [actions.validateTlsConfigRequest]: (state) => ({ ...state, processingValidate: true }),
+ [actions.validateTlsConfigFailure]: (state) => ({ ...state, processingValidate: false }),
[actions.validateTlsConfigSuccess]: (state, { payload }) => {
const {
issuer = '',
diff --git a/client/src/reducers/filtering.js b/client/src/reducers/filtering.js
index 544e0aad..a8e5a766 100644
--- a/client/src/reducers/filtering.js
+++ b/client/src/reducers/filtering.js
@@ -4,38 +4,38 @@ import * as actions from '../actions/filtering';
const filtering = handleActions(
{
- [actions.setRulesRequest]: state => ({ ...state, processingRules: true }),
- [actions.setRulesFailure]: state => ({ ...state, processingRules: false }),
- [actions.setRulesSuccess]: state => ({ ...state, processingRules: false }),
+ [actions.setRulesRequest]: (state) => ({ ...state, processingRules: true }),
+ [actions.setRulesFailure]: (state) => ({ ...state, processingRules: false }),
+ [actions.setRulesSuccess]: (state) => ({ ...state, processingRules: false }),
[actions.handleRulesChange]: (state, { payload }) => {
const { userRules } = payload;
return { ...state, userRules };
},
- [actions.getFilteringStatusRequest]: state => ({
+ [actions.getFilteringStatusRequest]: (state) => ({
...state,
processingFilters: true,
check: {},
}),
- [actions.getFilteringStatusFailure]: state => ({ ...state, processingFilters: false }),
+ [actions.getFilteringStatusFailure]: (state) => ({ ...state, processingFilters: false }),
[actions.getFilteringStatusSuccess]: (state, { payload }) => ({
...state,
...payload,
processingFilters: false,
}),
- [actions.addFilterRequest]: state => ({
+ [actions.addFilterRequest]: (state) => ({
...state,
processingAddFilter: true,
isFilterAdded: false,
}),
- [actions.addFilterFailure]: state => ({
+ [actions.addFilterFailure]: (state) => ({
...state,
processingAddFilter: false,
isFilterAdded: false,
}),
- [actions.addFilterSuccess]: state => ({
+ [actions.addFilterSuccess]: (state) => ({
...state,
processingAddFilter: false,
isFilterAdded: true,
@@ -60,32 +60,32 @@ const filtering = handleActions(
return newState;
},
- [actions.toggleFilterRequest]: state => ({ ...state, processingConfigFilter: true }),
- [actions.toggleFilterFailure]: state => ({ ...state, processingConfigFilter: false }),
- [actions.toggleFilterSuccess]: state => ({ ...state, processingConfigFilter: false }),
+ [actions.toggleFilterRequest]: (state) => ({ ...state, processingConfigFilter: true }),
+ [actions.toggleFilterFailure]: (state) => ({ ...state, processingConfigFilter: false }),
+ [actions.toggleFilterSuccess]: (state) => ({ ...state, processingConfigFilter: false }),
- [actions.editFilterRequest]: state => ({ ...state, processingConfigFilter: true }),
- [actions.editFilterFailure]: state => ({ ...state, processingConfigFilter: false }),
- [actions.editFilterSuccess]: state => ({ ...state, processingConfigFilter: false }),
+ [actions.editFilterRequest]: (state) => ({ ...state, processingConfigFilter: true }),
+ [actions.editFilterFailure]: (state) => ({ ...state, processingConfigFilter: false }),
+ [actions.editFilterSuccess]: (state) => ({ ...state, processingConfigFilter: false }),
- [actions.refreshFiltersRequest]: state => ({ ...state, processingRefreshFilters: true }),
- [actions.refreshFiltersFailure]: state => ({ ...state, processingRefreshFilters: false }),
- [actions.refreshFiltersSuccess]: state => ({ ...state, processingRefreshFilters: false }),
+ [actions.refreshFiltersRequest]: (state) => ({ ...state, processingRefreshFilters: true }),
+ [actions.refreshFiltersFailure]: (state) => ({ ...state, processingRefreshFilters: false }),
+ [actions.refreshFiltersSuccess]: (state) => ({ ...state, processingRefreshFilters: false }),
- [actions.removeFilterRequest]: state => ({ ...state, processingRemoveFilter: true }),
- [actions.removeFilterFailure]: state => ({ ...state, processingRemoveFilter: false }),
- [actions.removeFilterSuccess]: state => ({ ...state, processingRemoveFilter: false }),
+ [actions.removeFilterRequest]: (state) => ({ ...state, processingRemoveFilter: true }),
+ [actions.removeFilterFailure]: (state) => ({ ...state, processingRemoveFilter: false }),
+ [actions.removeFilterSuccess]: (state) => ({ ...state, processingRemoveFilter: false }),
- [actions.setFiltersConfigRequest]: state => ({ ...state, processingSetConfig: true }),
- [actions.setFiltersConfigFailure]: state => ({ ...state, processingSetConfig: false }),
+ [actions.setFiltersConfigRequest]: (state) => ({ ...state, processingSetConfig: true }),
+ [actions.setFiltersConfigFailure]: (state) => ({ ...state, processingSetConfig: false }),
[actions.setFiltersConfigSuccess]: (state, { payload }) => ({
...state,
...payload,
processingSetConfig: false,
}),
- [actions.checkHostRequest]: state => ({ ...state, processingCheck: true }),
- [actions.checkHostFailure]: state => ({ ...state, processingCheck: false }),
+ [actions.checkHostRequest]: (state) => ({ ...state, processingCheck: true }),
+ [actions.checkHostFailure]: (state) => ({ ...state, processingCheck: false }),
[actions.checkHostSuccess]: (state, { payload }) => ({
...state,
check: payload,
diff --git a/client/src/reducers/index.js b/client/src/reducers/index.js
index 245cf17d..642d8503 100644
--- a/client/src/reducers/index.js
+++ b/client/src/reducers/index.js
@@ -18,8 +18,8 @@ import filtering from './filtering';
const settings = handleActions(
{
- [actions.initSettingsRequest]: state => ({ ...state, processing: true }),
- [actions.initSettingsFailure]: state => ({ ...state, processing: false }),
+ [actions.initSettingsRequest]: (state) => ({ ...state, processing: true }),
+ [actions.initSettingsFailure]: (state) => ({ ...state, processing: false }),
[actions.initSettingsSuccess]: (state, { payload }) => {
const { settingsList } = payload;
const newState = { ...state, settingsList, processing: false };
@@ -35,9 +35,9 @@ const settings = handleActions(
const newSettingsList = { ...settingsList, [settingKey]: newSetting };
return { ...state, settingsList: newSettingsList };
},
- [actions.testUpstreamRequest]: state => ({ ...state, processingTestUpstream: true }),
- [actions.testUpstreamFailure]: state => ({ ...state, processingTestUpstream: false }),
- [actions.testUpstreamSuccess]: state => ({ ...state, processingTestUpstream: false }),
+ [actions.testUpstreamRequest]: (state) => ({ ...state, processingTestUpstream: true }),
+ [actions.testUpstreamFailure]: (state) => ({ ...state, processingTestUpstream: false }),
+ [actions.testUpstreamSuccess]: (state) => ({ ...state, processingTestUpstream: false }),
},
{
processing: true,
@@ -49,10 +49,11 @@ const settings = handleActions(
const dashboard = handleActions(
{
- [actions.setDnsRunningStatus]: (state, { payload }) =>
- ({ ...state, isCoreRunning: payload }),
- [actions.dnsStatusRequest]: state => ({ ...state, processing: true }),
- [actions.dnsStatusFailure]: state => ({ ...state, processing: false }),
+ [actions.setDnsRunningStatus]: (state, { payload }) => (
+ { ...state, isCoreRunning: payload }
+ ),
+ [actions.dnsStatusRequest]: (state) => ({ ...state, processing: true }),
+ [actions.dnsStatusFailure]: (state) => ({ ...state, processing: false }),
[actions.dnsStatusSuccess]: (state, { payload }) => {
const {
version,
@@ -76,8 +77,8 @@ const dashboard = handleActions(
return newState;
},
- [actions.getVersionRequest]: state => ({ ...state, processingVersion: true }),
- [actions.getVersionFailure]: state => ({ ...state, processingVersion: false }),
+ [actions.getVersionRequest]: (state) => ({ ...state, processingVersion: true }),
+ [actions.getVersionFailure]: (state) => ({ ...state, processingVersion: false }),
[actions.getVersionSuccess]: (state, { payload }) => {
const currentVersion = state.dnsVersion === 'undefined' ? 0 : state.dnsVersion;
@@ -95,6 +96,7 @@ const dashboard = handleActions(
canAutoUpdate,
isUpdateAvailable: true,
processingVersion: false,
+ checkUpdateFlag: !!payload,
};
return newState;
}
@@ -105,15 +107,15 @@ const dashboard = handleActions(
};
},
- [actions.getUpdateRequest]: state => ({ ...state, processingUpdate: true }),
- [actions.getUpdateFailure]: state => ({ ...state, processingUpdate: false }),
+ [actions.getUpdateRequest]: (state) => ({ ...state, processingUpdate: true }),
+ [actions.getUpdateFailure]: (state) => ({ ...state, processingUpdate: false }),
[actions.getUpdateSuccess]: (state) => {
const newState = { ...state, processingUpdate: false };
return newState;
},
- [actions.toggleProtectionRequest]: state => ({ ...state, processingProtection: true }),
- [actions.toggleProtectionFailure]: state => ({ ...state, processingProtection: false }),
+ [actions.toggleProtectionRequest]: (state) => ({ ...state, processingProtection: true }),
+ [actions.toggleProtectionFailure]: (state) => ({ ...state, processingProtection: false }),
[actions.toggleProtectionSuccess]: (state) => {
const newState = {
...state,
@@ -128,8 +130,8 @@ const dashboard = handleActions(
return newState;
},
- [actions.getClientsRequest]: state => ({ ...state, processingClients: true }),
- [actions.getClientsFailure]: state => ({ ...state, processingClients: false }),
+ [actions.getClientsRequest]: (state) => ({ ...state, processingClients: true }),
+ [actions.getClientsFailure]: (state) => ({ ...state, processingClients: false }),
[actions.getClientsSuccess]: (state, { payload }) => {
const newState = {
...state,
@@ -139,8 +141,8 @@ const dashboard = handleActions(
return newState;
},
- [actions.getProfileRequest]: state => ({ ...state, processingProfile: true }),
- [actions.getProfileFailure]: state => ({ ...state, processingProfile: false }),
+ [actions.getProfileRequest]: (state) => ({ ...state, processingProfile: true }),
+ [actions.getProfileFailure]: (state) => ({ ...state, processingProfile: false }),
[actions.getProfileSuccess]: (state, { payload }) => ({
...state,
name: payload.name,
@@ -164,13 +166,14 @@ const dashboard = handleActions(
autoClients: [],
supportedTags: [],
name: '',
+ checkUpdateFlag: false,
},
);
const dhcp = handleActions(
{
- [actions.getDhcpStatusRequest]: state => ({ ...state, processing: true }),
- [actions.getDhcpStatusFailure]: state => ({ ...state, processing: false }),
+ [actions.getDhcpStatusRequest]: (state) => ({ ...state, processing: true }),
+ [actions.getDhcpStatusFailure]: (state) => ({ ...state, processing: false }),
[actions.getDhcpStatusSuccess]: (state, { payload }) => {
const { static_leases: staticLeases, ...values } = payload;
@@ -184,8 +187,8 @@ const dhcp = handleActions(
return newState;
},
- [actions.getDhcpInterfacesRequest]: state => ({ ...state, processingInterfaces: true }),
- [actions.getDhcpInterfacesFailure]: state => ({ ...state, processingInterfaces: false }),
+ [actions.getDhcpInterfacesRequest]: (state) => ({ ...state, processingInterfaces: true }),
+ [actions.getDhcpInterfacesFailure]: (state) => ({ ...state, processingInterfaces: false }),
[actions.getDhcpInterfacesSuccess]: (state, { payload }) => {
const newState = {
...state,
@@ -195,8 +198,8 @@ const dhcp = handleActions(
return newState;
},
- [actions.findActiveDhcpRequest]: state => ({ ...state, processingStatus: true }),
- [actions.findActiveDhcpFailure]: state => ({ ...state, processingStatus: false }),
+ [actions.findActiveDhcpRequest]: (state) => ({ ...state, processingStatus: true }),
+ [actions.findActiveDhcpFailure]: (state) => ({ ...state, processingStatus: false }),
[actions.findActiveDhcpSuccess]: (state, { payload }) => {
const { other_server: otherServer, static_ip: staticIP } = payload;
@@ -211,8 +214,8 @@ const dhcp = handleActions(
return newState;
},
- [actions.toggleDhcpRequest]: state => ({ ...state, processingDhcp: true }),
- [actions.toggleDhcpFailure]: state => ({ ...state, processingDhcp: false }),
+ [actions.toggleDhcpRequest]: (state) => ({ ...state, processingDhcp: true }),
+ [actions.toggleDhcpFailure]: (state) => ({ ...state, processingDhcp: false }),
[actions.toggleDhcpSuccess]: (state) => {
const { config } = state;
const newConfig = { ...config, enabled: !config.enabled };
@@ -225,8 +228,8 @@ const dhcp = handleActions(
return newState;
},
- [actions.setDhcpConfigRequest]: state => ({ ...state, processingConfig: true }),
- [actions.setDhcpConfigFailure]: state => ({ ...state, processingConfig: false }),
+ [actions.setDhcpConfigRequest]: (state) => ({ ...state, processingConfig: true }),
+ [actions.setDhcpConfigFailure]: (state) => ({ ...state, processingConfig: false }),
[actions.setDhcpConfigSuccess]: (state, { payload }) => {
const { config } = state;
const newConfig = { ...config, ...payload };
@@ -234,9 +237,9 @@ const dhcp = handleActions(
return newState;
},
- [actions.resetDhcpRequest]: state => ({ ...state, processingReset: true }),
- [actions.resetDhcpFailure]: state => ({ ...state, processingReset: false }),
- [actions.resetDhcpSuccess]: state => ({
+ [actions.resetDhcpRequest]: (state) => ({ ...state, processingReset: true }),
+ [actions.resetDhcpFailure]: (state) => ({ ...state, processingReset: false }),
+ [actions.resetDhcpSuccess]: (state) => ({
...state,
processingReset: false,
config: {
@@ -252,8 +255,8 @@ const dhcp = handleActions(
return newState;
},
- [actions.addStaticLeaseRequest]: state => ({ ...state, processingAdding: true }),
- [actions.addStaticLeaseFailure]: state => ({ ...state, processingAdding: false }),
+ [actions.addStaticLeaseRequest]: (state) => ({ ...state, processingAdding: true }),
+ [actions.addStaticLeaseFailure]: (state) => ({ ...state, processingAdding: false }),
[actions.addStaticLeaseSuccess]: (state, { payload }) => {
const { ip, mac, hostname } = payload;
const newLease = {
@@ -270,11 +273,11 @@ const dhcp = handleActions(
return newState;
},
- [actions.removeStaticLeaseRequest]: state => ({ ...state, processingDeleting: true }),
- [actions.removeStaticLeaseFailure]: state => ({ ...state, processingDeleting: false }),
+ [actions.removeStaticLeaseRequest]: (state) => ({ ...state, processingDeleting: true }),
+ [actions.removeStaticLeaseFailure]: (state) => ({ ...state, processingDeleting: false }),
[actions.removeStaticLeaseSuccess]: (state, { payload }) => {
const leaseToRemove = payload.ip;
- const leases = state.staticLeases.filter(item => item.ip !== leaseToRemove);
+ const leases = state.staticLeases.filter((item) => item.ip !== leaseToRemove);
const newState = {
...state,
staticLeases: leases,
diff --git a/client/src/reducers/install.js b/client/src/reducers/install.js
index b3f95dfb..5ffee899 100644
--- a/client/src/reducers/install.js
+++ b/client/src/reducers/install.js
@@ -7,8 +7,8 @@ import toasts from './toasts';
import { INSTALL_FIRST_STEP } from '../helpers/constants';
const install = handleActions({
- [actions.getDefaultAddressesRequest]: state => ({ ...state, processingDefault: true }),
- [actions.getDefaultAddressesFailure]: state => ({ ...state, processingDefault: false }),
+ [actions.getDefaultAddressesRequest]: (state) => ({ ...state, processingDefault: true }),
+ [actions.getDefaultAddressesFailure]: (state) => ({ ...state, processingDefault: false }),
[actions.getDefaultAddressesSuccess]: (state, { payload }) => {
const { interfaces } = payload;
const web = { ...state.web, port: payload.web_port };
@@ -20,15 +20,15 @@ const install = handleActions({
return newState;
},
- [actions.nextStep]: state => ({ ...state, step: state.step + 1 }),
- [actions.prevStep]: state => ({ ...state, step: state.step - 1 }),
+ [actions.nextStep]: (state) => ({ ...state, step: state.step + 1 }),
+ [actions.prevStep]: (state) => ({ ...state, step: state.step - 1 }),
- [actions.setAllSettingsRequest]: state => ({ ...state, processingSubmit: true }),
- [actions.setAllSettingsFailure]: state => ({ ...state, processingSubmit: false }),
- [actions.setAllSettingsSuccess]: state => ({ ...state, processingSubmit: false }),
+ [actions.setAllSettingsRequest]: (state) => ({ ...state, processingSubmit: true }),
+ [actions.setAllSettingsFailure]: (state) => ({ ...state, processingSubmit: false }),
+ [actions.setAllSettingsSuccess]: (state) => ({ ...state, processingSubmit: false }),
- [actions.checkConfigRequest]: state => ({ ...state, processingCheck: true }),
- [actions.checkConfigFailure]: state => ({ ...state, processingCheck: false }),
+ [actions.checkConfigRequest]: (state) => ({ ...state, processingCheck: true }),
+ [actions.checkConfigFailure]: (state) => ({ ...state, processingCheck: false }),
[actions.checkConfigSuccess]: (state, { payload }) => {
const web = { ...state.web, ...payload.web };
const dns = { ...state.dns, ...payload.dns };
diff --git a/client/src/reducers/login.js b/client/src/reducers/login.js
index e4c860a9..4eb1de98 100644
--- a/client/src/reducers/login.js
+++ b/client/src/reducers/login.js
@@ -6,8 +6,8 @@ import * as actions from '../actions/login';
import toasts from './toasts';
const login = handleActions({
- [actions.processLoginRequest]: state => ({ ...state, processingLogin: true }),
- [actions.processLoginFailure]: state => ({ ...state, processingLogin: false }),
+ [actions.processLoginRequest]: (state) => ({ ...state, processingLogin: true }),
+ [actions.processLoginFailure]: (state) => ({ ...state, processingLogin: false }),
[actions.processLoginSuccess]: (state, { payload }) => ({
...state, ...payload, processingLogin: false,
}),
diff --git a/client/src/reducers/queryLogs.js b/client/src/reducers/queryLogs.js
index de384461..1145bd3f 100644
--- a/client/src/reducers/queryLogs.js
+++ b/client/src/reducers/queryLogs.js
@@ -25,8 +25,8 @@ const queryLogs = handleActions(
page: payload,
}),
- [actions.setLogsFilterRequest]: state => ({ ...state, processingGetLogs: true }),
- [actions.setLogsFilterFailure]: state => ({ ...state, processingGetLogs: false }),
+ [actions.setLogsFilterRequest]: (state) => ({ ...state, processingGetLogs: true }),
+ [actions.setLogsFilterFailure]: (state) => ({ ...state, processingGetLogs: false }),
[actions.setLogsFilterSuccess]: (state, { payload }) => {
const { logs, oldest, filter } = payload;
const pageSize = 100;
@@ -37,7 +37,7 @@ const queryLogs = handleActions(
const rowsStart = pageSize * page;
const rowsEnd = (pageSize * page) + pageSize;
const logsSlice = logs.slice(rowsStart, rowsEnd);
- const isFiltered = Object.keys(filter).some(key => filter[key]);
+ const isFiltered = Object.keys(filter).some((key) => filter[key]);
return {
...state,
@@ -52,8 +52,8 @@ const queryLogs = handleActions(
};
},
- [actions.getLogsRequest]: state => ({ ...state, processingGetLogs: true }),
- [actions.getLogsFailure]: state => ({ ...state, processingGetLogs: false }),
+ [actions.getLogsRequest]: (state) => ({ ...state, processingGetLogs: true }),
+ [actions.getLogsFailure]: (state) => ({ ...state, processingGetLogs: false }),
[actions.getLogsSuccess]: (state, { payload }) => {
const {
logs, oldest, older_than, page, pageSize, initial,
@@ -84,37 +84,37 @@ const queryLogs = handleActions(
};
},
- [actions.clearLogsRequest]: state => ({ ...state, processingClear: true }),
- [actions.clearLogsFailure]: state => ({ ...state, processingClear: false }),
- [actions.clearLogsSuccess]: state => ({
+ [actions.clearLogsRequest]: (state) => ({ ...state, processingClear: true }),
+ [actions.clearLogsFailure]: (state) => ({ ...state, processingClear: false }),
+ [actions.clearLogsSuccess]: (state) => ({
...state,
logs: [],
processingClear: false,
}),
- [actions.getLogsConfigRequest]: state => ({ ...state, processingGetConfig: true }),
- [actions.getLogsConfigFailure]: state => ({ ...state, processingGetConfig: false }),
+ [actions.getLogsConfigRequest]: (state) => ({ ...state, processingGetConfig: true }),
+ [actions.getLogsConfigFailure]: (state) => ({ ...state, processingGetConfig: false }),
[actions.getLogsConfigSuccess]: (state, { payload }) => ({
...state,
...payload,
processingGetConfig: false,
}),
- [actions.setLogsConfigRequest]: state => ({ ...state, processingSetConfig: true }),
- [actions.setLogsConfigFailure]: state => ({ ...state, processingSetConfig: false }),
+ [actions.setLogsConfigRequest]: (state) => ({ ...state, processingSetConfig: true }),
+ [actions.setLogsConfigFailure]: (state) => ({ ...state, processingSetConfig: false }),
[actions.setLogsConfigSuccess]: (state, { payload }) => ({
...state,
...payload,
processingSetConfig: false,
}),
- [actions.getAdditionalLogsRequest]: state => ({
+ [actions.getAdditionalLogsRequest]: (state) => ({
...state, processingAdditionalLogs: true, processingGetLogs: true,
}),
- [actions.getAdditionalLogsFailure]: state => ({
+ [actions.getAdditionalLogsFailure]: (state) => ({
...state, processingAdditionalLogs: false, processingGetLogs: false,
}),
- [actions.getAdditionalLogsSuccess]: state => ({
+ [actions.getAdditionalLogsSuccess]: (state) => ({
...state, processingAdditionalLogs: false, processingGetLogs: false,
}),
},
diff --git a/client/src/reducers/rewrites.js b/client/src/reducers/rewrites.js
index d680b830..dad1efd5 100644
--- a/client/src/reducers/rewrites.js
+++ b/client/src/reducers/rewrites.js
@@ -4,8 +4,8 @@ import * as actions from '../actions/rewrites';
const rewrites = handleActions(
{
- [actions.getRewritesListRequest]: state => ({ ...state, processing: true }),
- [actions.getRewritesListFailure]: state => ({ ...state, processing: false }),
+ [actions.getRewritesListRequest]: (state) => ({ ...state, processing: true }),
+ [actions.getRewritesListFailure]: (state) => ({ ...state, processing: false }),
[actions.getRewritesListSuccess]: (state, { payload }) => {
const newState = {
...state,
@@ -15,8 +15,8 @@ const rewrites = handleActions(
return newState;
},
- [actions.addRewriteRequest]: state => ({ ...state, processingAdd: true }),
- [actions.addRewriteFailure]: state => ({ ...state, processingAdd: false }),
+ [actions.addRewriteRequest]: (state) => ({ ...state, processingAdd: true }),
+ [actions.addRewriteFailure]: (state) => ({ ...state, processingAdd: false }),
[actions.addRewriteSuccess]: (state, { payload }) => {
const newState = {
...state,
@@ -26,9 +26,9 @@ const rewrites = handleActions(
return newState;
},
- [actions.deleteRewriteRequest]: state => ({ ...state, processingDelete: true }),
- [actions.deleteRewriteFailure]: state => ({ ...state, processingDelete: false }),
- [actions.deleteRewriteSuccess]: state => ({ ...state, processingDelete: false }),
+ [actions.deleteRewriteRequest]: (state) => ({ ...state, processingDelete: true }),
+ [actions.deleteRewriteFailure]: (state) => ({ ...state, processingDelete: false }),
+ [actions.deleteRewriteSuccess]: (state) => ({ ...state, processingDelete: false }),
[actions.toggleRewritesModal]: (state) => {
const newState = {
diff --git a/client/src/reducers/services.js b/client/src/reducers/services.js
index d91cadf5..7c478366 100644
--- a/client/src/reducers/services.js
+++ b/client/src/reducers/services.js
@@ -4,17 +4,17 @@ import * as actions from '../actions/services';
const services = handleActions(
{
- [actions.getBlockedServicesRequest]: state => ({ ...state, processing: true }),
- [actions.getBlockedServicesFailure]: state => ({ ...state, processing: false }),
+ [actions.getBlockedServicesRequest]: (state) => ({ ...state, processing: true }),
+ [actions.getBlockedServicesFailure]: (state) => ({ ...state, processing: false }),
[actions.getBlockedServicesSuccess]: (state, { payload }) => ({
...state,
list: payload,
processing: false,
}),
- [actions.setBlockedServicesRequest]: state => ({ ...state, processingSet: true }),
- [actions.setBlockedServicesFailure]: state => ({ ...state, processingSet: false }),
- [actions.setBlockedServicesSuccess]: state => ({
+ [actions.setBlockedServicesRequest]: (state) => ({ ...state, processingSet: true }),
+ [actions.setBlockedServicesFailure]: (state) => ({ ...state, processingSet: false }),
+ [actions.setBlockedServicesSuccess]: (state) => ({
...state,
processingSet: false,
}),
diff --git a/client/src/reducers/stats.js b/client/src/reducers/stats.js
index 9a74c1b1..9c986eac 100644
--- a/client/src/reducers/stats.js
+++ b/client/src/reducers/stats.js
@@ -21,24 +21,24 @@ const defaultStats = {
const stats = handleActions(
{
- [actions.getStatsConfigRequest]: state => ({ ...state, processingGetConfig: true }),
- [actions.getStatsConfigFailure]: state => ({ ...state, processingGetConfig: false }),
+ [actions.getStatsConfigRequest]: (state) => ({ ...state, processingGetConfig: true }),
+ [actions.getStatsConfigFailure]: (state) => ({ ...state, processingGetConfig: false }),
[actions.getStatsConfigSuccess]: (state, { payload }) => ({
...state,
interval: payload.interval,
processingGetConfig: false,
}),
- [actions.setStatsConfigRequest]: state => ({ ...state, processingSetConfig: true }),
- [actions.setStatsConfigFailure]: state => ({ ...state, processingSetConfig: false }),
+ [actions.setStatsConfigRequest]: (state) => ({ ...state, processingSetConfig: true }),
+ [actions.setStatsConfigFailure]: (state) => ({ ...state, processingSetConfig: false }),
[actions.setStatsConfigSuccess]: (state, { payload }) => ({
...state,
interval: payload.interval,
processingSetConfig: false,
}),
- [actions.getStatsRequest]: state => ({ ...state, processingStats: true }),
- [actions.getStatsFailure]: state => ({ ...state, processingStats: false }),
+ [actions.getStatsRequest]: (state) => ({ ...state, processingStats: true }),
+ [actions.getStatsFailure]: (state) => ({ ...state, processingStats: false }),
[actions.getStatsSuccess]: (state, { payload }) => {
const {
dns_queries: dnsQueries,
@@ -78,9 +78,9 @@ const stats = handleActions(
return newState;
},
- [actions.resetStatsRequest]: state => ({ ...state, processingReset: true }),
- [actions.resetStatsFailure]: state => ({ ...state, processingReset: false }),
- [actions.resetStatsSuccess]: state => ({
+ [actions.resetStatsRequest]: (state) => ({ ...state, processingReset: true }),
+ [actions.resetStatsFailure]: (state) => ({ ...state, processingReset: false }),
+ [actions.resetStatsSuccess]: (state) => ({
...state,
...defaultStats,
processingReset: false,
diff --git a/client/src/reducers/toasts.js b/client/src/reducers/toasts.js
index 34698480..8da15547 100644
--- a/client/src/reducers/toasts.js
+++ b/client/src/reducers/toasts.js
@@ -1,7 +1,10 @@
import { handleActions } from 'redux-actions';
-import nanoid from 'nanoid';
+import { nanoid } from 'nanoid';
-import { addErrorToast, addSuccessToast, addNoticeToast, removeToast } from '../actions';
+import {
+ addErrorToast, addNoticeToast, addSuccessToast,
+} from '../actions/toasts';
+import { removeToast } from '../actions';
const toasts = handleActions({
[addErrorToast]: (state, { payload }) => {
@@ -35,7 +38,7 @@ const toasts = handleActions({
return newState;
},
[removeToast]: (state, { payload }) => {
- const filtered = state.notices.filter(notice => notice.id !== payload);
+ const filtered = state.notices.filter((notice) => notice.id !== payload);
const newState = { ...state, notices: filtered };
return newState;
},
diff --git a/client/webpack.common.js b/client/webpack.common.js
index 99b6dbae..173dd7ab 100644
--- a/client/webpack.common.js
+++ b/client/webpack.common.js
@@ -1,11 +1,10 @@
const path = require('path');
const autoprefixer = require('autoprefixer');
const HtmlWebpackPlugin = require('html-webpack-plugin');
-const ExtractTextPlugin = require('extract-text-webpack-plugin');
-const webpack = require('webpack');
const flexBugsFixes = require('postcss-flexbugs-fixes');
-const CleanWebpackPlugin = require('clean-webpack-plugin');
+const { CleanWebpackPlugin } = require('clean-webpack-plugin');
const CopyPlugin = require('copy-webpack-plugin');
+const MiniCssExtractPlugin = require('mini-css-extract-plugin');
const RESOURCES_PATH = path.resolve(__dirname);
const ENTRY_REACT = path.resolve(RESOURCES_PATH, 'src/index.js');
@@ -14,11 +13,20 @@ const ENTRY_LOGIN = path.resolve(RESOURCES_PATH, 'src/login/index.js');
const HTML_PATH = path.resolve(RESOURCES_PATH, 'public/index.html');
const HTML_INSTALL_PATH = path.resolve(RESOURCES_PATH, 'public/install.html');
const HTML_LOGIN_PATH = path.resolve(RESOURCES_PATH, 'public/login.html');
-const FAVICON_PATH = path.resolve(RESOURCES_PATH, 'public/favicon.png');
+const ASSETS_PATH = path.resolve(RESOURCES_PATH, 'public/assets');
const PUBLIC_PATH = path.resolve(__dirname, '../build/static');
+const PUBLIC_ASSETS_PATH = path.resolve(PUBLIC_PATH, 'assets');
+
+const BUILD_ENVS = {
+ dev: 'development',
+ prod: 'production',
+};
+
+const BUILD_ENV = BUILD_ENVS[process.env.BUILD_ENV];
const config = {
+ mode: BUILD_ENV,
target: 'web',
context: RESOURCES_PATH,
entry: {
@@ -40,10 +48,11 @@ const config = {
module: {
rules: [
{
- test: /\.css$/,
- use: ExtractTextPlugin.extract({
- fallback: 'style-loader',
- use: [{
+ test: /\.css$/i,
+ use: [
+ 'style-loader',
+ MiniCssExtractPlugin.loader,
+ {
loader: 'css-loader',
options: {
importLoaders: 1,
@@ -56,19 +65,12 @@ const config = {
plugins: () => [
flexBugsFixes,
autoprefixer({
- browsers: [
- '>1%',
- 'last 4 versions',
- 'Firefox ESR',
- 'not ie < 9',
- ],
flexbox: 'no-2009',
}),
],
},
},
- ],
- }),
+ ],
},
{
test: /\.js$/,
@@ -77,14 +79,6 @@ const config = {
loader: 'babel-loader',
options: {
cacheDirectory: true,
- presets: [
- ['env', {
- modules: false,
- }],
- 'react',
- 'stage-2',
- ],
- plugins: ['transform-runtime', 'transform-object-rest-spread'],
},
},
},
@@ -102,10 +96,7 @@ const config = {
],
},
plugins: [
- new webpack.DefinePlugin({
- 'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV),
- }),
- new CleanWebpackPlugin(['**/*.*'], {
+ new CleanWebpackPlugin({
root: PUBLIC_PATH,
verbose: false,
dry: false,
@@ -130,12 +121,17 @@ const config = {
filename: 'login.html',
template: HTML_LOGIN_PATH,
}),
- new ExtractTextPlugin({
+ new MiniCssExtractPlugin({
filename: '[name].[contenthash].css',
}),
- new CopyPlugin([
- { from: FAVICON_PATH, to: PUBLIC_PATH },
- ]),
+ new CopyPlugin({
+ patterns: [
+ {
+ from: ASSETS_PATH,
+ to: PUBLIC_ASSETS_PATH,
+ },
+ ],
+ }),
],
};
diff --git a/client/webpack.prod.js b/client/webpack.prod.js
index 1e85f453..d10970b9 100644
--- a/client/webpack.prod.js
+++ b/client/webpack.prod.js
@@ -1,5 +1,4 @@
const StyleLintPlugin = require('stylelint-webpack-plugin');
-const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
const merge = require('webpack-merge');
const common = require('./webpack.common.js');
@@ -20,6 +19,5 @@ module.exports = merge(common, {
new StyleLintPlugin({
files: '**/*.css',
}),
- new UglifyJsPlugin(),
],
});
diff --git a/dnsfilter/blocked_services.go b/dnsfilter/blocked_services.go
index 1c77d1bc..ccfed6bf 100644
--- a/dnsfilter/blocked_services.go
+++ b/dnsfilter/blocked_services.go
@@ -52,7 +52,7 @@ var serviceRulesArray = []svc{
"||snapads.com^",
"||impala-media-production.s3.amazonaws.com^",
}},
- {"discord", []string{"||discord.gg^", "||discordapp.net^", "||discordapp.com^", "||discord.media^"}},
+ {"discord", []string{"||discord.gg^", "||discordapp.net^", "||discordapp.com^", "||discord.com^", "||discord.media^"}},
{"ok", []string{"||ok.ru^"}},
{"skype", []string{"||skype.com^", "||skypeassets.com^"}},
{"vk", []string{"||vk.com^", "||userapi.com^", "||vk-cdn.net^", "||vkuservideo.net^"}},
@@ -157,6 +157,7 @@ var serviceRulesArray = []svc{
"||muscdn.com^",
"||bytedance.map.fastly.net^",
"||douyin.com^",
+ "||tiktokv.com^",
}},
}
diff --git a/dnsfilter/dnsfilter.go b/dnsfilter/dnsfilter.go
index 60a32d39..bcd597d8 100644
--- a/dnsfilter/dnsfilter.go
+++ b/dnsfilter/dnsfilter.go
@@ -7,6 +7,7 @@ import (
"net/http"
"os"
"runtime"
+ "runtime/debug"
"strings"
"sync"
@@ -389,6 +390,7 @@ func (d *Dnsfilter) CheckHost(host string, qtype uint16, setts *RequestFiltering
// Process rewrites table
// . Find CNAME for a domain name (exact match or by wildcard)
+// . if found and CNAME equals to domain name - this is an exception; exit
// . if found, set domain name to canonical name
// . repeat for the new domain name (Note: we return only the last CNAME)
// . Find A or AAAA record for a domain name (exact match or by wildcard)
@@ -408,6 +410,12 @@ func (d *Dnsfilter) processRewrites(host string) Result {
origHost := host
for len(rr) != 0 && rr[0].Type == dns.TypeCNAME {
log.Debug("Rewrite: CNAME for %s is %s", host, rr[0].Answer)
+
+ if host == rr[0].Answer { // "host == CNAME" is an exception
+ res.Reason = 0
+ return res
+ }
+
host = rr[0].Answer
_, ok := cnames[host]
if ok {
@@ -528,6 +536,9 @@ func (d *Dnsfilter) initFiltering(allowFilters, blockFilters []Filter) error {
d.filteringEngine = filteringEngine
d.rulesStorageWhite = rulesStorageWhite
d.filteringEngineWhite = filteringEngineWhite
+
+ // Make sure that the OS reclaims memory as soon as possible
+ debug.FreeOSMemory()
log.Debug("initialized filtering engine")
return nil
@@ -628,6 +639,11 @@ func makeResult(rule rules.Rule, reason Reason) Result {
return res
}
+// InitModule() - manually initialize blocked services map
+func InitModule() {
+ initBlockedServices()
+}
+
// New creates properly initialized DNS Filter that is ready to be used
func New(c *Config, blockFilters []Filter) *Dnsfilter {
@@ -677,8 +693,6 @@ func New(c *Config, blockFilters []Filter) *Dnsfilter {
}
d.BlockedServices = bsvcs
- initBlockedServices()
-
if blockFilters != nil {
err := d.initFiltering(nil, blockFilters)
if err != nil {
diff --git a/dnsfilter/dnsfilter_test.go b/dnsfilter/dnsfilter_test.go
index 532e1c3c..6515b53d 100644
--- a/dnsfilter/dnsfilter_test.go
+++ b/dnsfilter/dnsfilter_test.go
@@ -532,96 +532,6 @@ func TestClientSettings(t *testing.T) {
assert.True(t, r.IsFiltered && r.Reason == FilteredBlockedService)
}
-func TestRewrites(t *testing.T) {
- d := Dnsfilter{}
- // CNAME, A, AAAA
- d.Rewrites = []RewriteEntry{
- RewriteEntry{"somecname", "somehost.com", 0, nil},
- RewriteEntry{"somehost.com", "0.0.0.0", 0, nil},
-
- RewriteEntry{"host.com", "1.2.3.4", 0, nil},
- RewriteEntry{"host.com", "1.2.3.5", 0, nil},
- RewriteEntry{"host.com", "1:2:3::4", 0, nil},
- RewriteEntry{"www.host.com", "host.com", 0, nil},
- }
- d.prepareRewrites()
- r := d.processRewrites("host2.com")
- assert.Equal(t, NotFilteredNotFound, r.Reason)
-
- r = d.processRewrites("www.host.com")
- assert.Equal(t, ReasonRewrite, r.Reason)
- assert.Equal(t, "host.com", r.CanonName)
- assert.True(t, len(r.IPList) == 3)
- assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
- assert.True(t, r.IPList[1].Equal(net.ParseIP("1.2.3.5")))
- assert.True(t, r.IPList[2].Equal(net.ParseIP("1:2:3::4")))
-
- // wildcard
- d.Rewrites = []RewriteEntry{
- RewriteEntry{"host.com", "1.2.3.4", 0, nil},
- RewriteEntry{"*.host.com", "1.2.3.5", 0, nil},
- }
- d.prepareRewrites()
- r = d.processRewrites("host.com")
- assert.Equal(t, ReasonRewrite, r.Reason)
- assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
-
- r = d.processRewrites("www.host.com")
- assert.Equal(t, ReasonRewrite, r.Reason)
- assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.5")))
-
- r = d.processRewrites("www.host2.com")
- assert.Equal(t, NotFilteredNotFound, r.Reason)
-
- // override a wildcard
- d.Rewrites = []RewriteEntry{
- RewriteEntry{"a.host.com", "1.2.3.4", 0, nil},
- RewriteEntry{"*.host.com", "1.2.3.5", 0, nil},
- }
- d.prepareRewrites()
- r = d.processRewrites("a.host.com")
- assert.Equal(t, ReasonRewrite, r.Reason)
- assert.True(t, len(r.IPList) == 1)
- assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
-
- // wildcard + CNAME
- d.Rewrites = []RewriteEntry{
- RewriteEntry{"host.com", "1.2.3.4", 0, nil},
- RewriteEntry{"*.host.com", "host.com", 0, nil},
- }
- d.prepareRewrites()
- r = d.processRewrites("www.host.com")
- assert.Equal(t, ReasonRewrite, r.Reason)
- assert.Equal(t, "host.com", r.CanonName)
- assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
-
- // 2 CNAMEs
- d.Rewrites = []RewriteEntry{
- RewriteEntry{"b.host.com", "a.host.com", 0, nil},
- RewriteEntry{"a.host.com", "host.com", 0, nil},
- RewriteEntry{"host.com", "1.2.3.4", 0, nil},
- }
- d.prepareRewrites()
- r = d.processRewrites("b.host.com")
- assert.Equal(t, ReasonRewrite, r.Reason)
- assert.Equal(t, "host.com", r.CanonName)
- assert.True(t, len(r.IPList) == 1)
- assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
-
- // 2 CNAMEs + wildcard
- d.Rewrites = []RewriteEntry{
- RewriteEntry{"b.host.com", "a.host.com", 0, nil},
- RewriteEntry{"a.host.com", "x.somehost.com", 0, nil},
- RewriteEntry{"*.somehost.com", "1.2.3.4", 0, nil},
- }
- d.prepareRewrites()
- r = d.processRewrites("b.host.com")
- assert.Equal(t, ReasonRewrite, r.Reason)
- assert.Equal(t, "x.somehost.com", r.CanonName)
- assert.True(t, len(r.IPList) == 1)
- assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
-}
-
func prepareTestDir() string {
const dir = "./agh-test"
_ = os.RemoveAll(dir)
diff --git a/dnsfilter/rewrites.go b/dnsfilter/rewrites.go
index 029d3332..166ff0bb 100644
--- a/dnsfilter/rewrites.go
+++ b/dnsfilter/rewrites.go
@@ -42,21 +42,29 @@ func (a rewritesArray) Len() int { return len(a) }
func (a rewritesArray) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
-// Priority: CNAME, A/AAAA; exact, wildcard.
+// Priority:
+// . CNAME < A/AAAA;
+// . exact < wildcard;
+// . higher level wildcard < lower level wildcard
func (a rewritesArray) Less(i, j int) bool {
if a[i].Type == dns.TypeCNAME && a[j].Type != dns.TypeCNAME {
- return false
+ return true
} else if a[i].Type != dns.TypeCNAME && a[j].Type == dns.TypeCNAME {
- return true
- }
-
- if isWildcard(a[i].Domain) && !isWildcard(a[j].Domain) {
return false
- } else if !isWildcard(a[i].Domain) && isWildcard(a[j].Domain) {
- return true
}
- return i < j
+ if isWildcard(a[i].Domain) {
+ if !isWildcard(a[j].Domain) {
+ return false
+ }
+ } else {
+ if isWildcard(a[j].Domain) {
+ return true
+ }
+ }
+
+ // both are wildcards
+ return len(a[i].Domain) > len(a[j].Domain)
}
// Prepare entry for use
@@ -86,6 +94,7 @@ func (d *Dnsfilter) prepareRewrites() {
// Get the list of matched rewrite entries.
// Priority: CNAME, A/AAAA; exact, wildcard.
// If matched exactly, don't return wildcard entries.
+// If matched by several wildcards, select the more specific one
func findRewrites(a []RewriteEntry, host string) []RewriteEntry {
rr := rewritesArray{}
for _, r := range a {
@@ -111,7 +120,10 @@ func findRewrites(a []RewriteEntry, host string) []RewriteEntry {
break
}
}
+ } else {
+ rr = rr[:1]
}
+
return rr
}
diff --git a/dnsfilter/rewrites_test.go b/dnsfilter/rewrites_test.go
new file mode 100644
index 00000000..aac9cedd
--- /dev/null
+++ b/dnsfilter/rewrites_test.go
@@ -0,0 +1,167 @@
+package dnsfilter
+
+import (
+ "net"
+ "testing"
+
+ "github.com/stretchr/testify/assert"
+)
+
+func TestRewrites(t *testing.T) {
+ d := Dnsfilter{}
+ // CNAME, A, AAAA
+ d.Rewrites = []RewriteEntry{
+ RewriteEntry{"somecname", "somehost.com", 0, nil},
+ RewriteEntry{"somehost.com", "0.0.0.0", 0, nil},
+
+ RewriteEntry{"host.com", "1.2.3.4", 0, nil},
+ RewriteEntry{"host.com", "1.2.3.5", 0, nil},
+ RewriteEntry{"host.com", "1:2:3::4", 0, nil},
+ RewriteEntry{"www.host.com", "host.com", 0, nil},
+ }
+ d.prepareRewrites()
+ r := d.processRewrites("host2.com")
+ assert.Equal(t, NotFilteredNotFound, r.Reason)
+
+ r = d.processRewrites("www.host.com")
+ assert.Equal(t, ReasonRewrite, r.Reason)
+ assert.Equal(t, "host.com", r.CanonName)
+ assert.True(t, len(r.IPList) == 3)
+ assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
+ assert.True(t, r.IPList[1].Equal(net.ParseIP("1.2.3.5")))
+ assert.True(t, r.IPList[2].Equal(net.ParseIP("1:2:3::4")))
+
+ // wildcard
+ d.Rewrites = []RewriteEntry{
+ RewriteEntry{"host.com", "1.2.3.4", 0, nil},
+ RewriteEntry{"*.host.com", "1.2.3.5", 0, nil},
+ }
+ d.prepareRewrites()
+ r = d.processRewrites("host.com")
+ assert.Equal(t, ReasonRewrite, r.Reason)
+ assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
+
+ r = d.processRewrites("www.host.com")
+ assert.Equal(t, ReasonRewrite, r.Reason)
+ assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.5")))
+
+ r = d.processRewrites("www.host2.com")
+ assert.Equal(t, NotFilteredNotFound, r.Reason)
+
+ // override a wildcard
+ d.Rewrites = []RewriteEntry{
+ RewriteEntry{"a.host.com", "1.2.3.4", 0, nil},
+ RewriteEntry{"*.host.com", "1.2.3.5", 0, nil},
+ }
+ d.prepareRewrites()
+ r = d.processRewrites("a.host.com")
+ assert.Equal(t, ReasonRewrite, r.Reason)
+ assert.True(t, len(r.IPList) == 1)
+ assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
+
+ // wildcard + CNAME
+ d.Rewrites = []RewriteEntry{
+ RewriteEntry{"host.com", "1.2.3.4", 0, nil},
+ RewriteEntry{"*.host.com", "host.com", 0, nil},
+ }
+ d.prepareRewrites()
+ r = d.processRewrites("www.host.com")
+ assert.Equal(t, ReasonRewrite, r.Reason)
+ assert.Equal(t, "host.com", r.CanonName)
+ assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
+
+ // 2 CNAMEs
+ d.Rewrites = []RewriteEntry{
+ RewriteEntry{"b.host.com", "a.host.com", 0, nil},
+ RewriteEntry{"a.host.com", "host.com", 0, nil},
+ RewriteEntry{"host.com", "1.2.3.4", 0, nil},
+ }
+ d.prepareRewrites()
+ r = d.processRewrites("b.host.com")
+ assert.Equal(t, ReasonRewrite, r.Reason)
+ assert.Equal(t, "host.com", r.CanonName)
+ assert.True(t, len(r.IPList) == 1)
+ assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
+
+ // 2 CNAMEs + wildcard
+ d.Rewrites = []RewriteEntry{
+ RewriteEntry{"b.host.com", "a.host.com", 0, nil},
+ RewriteEntry{"a.host.com", "x.somehost.com", 0, nil},
+ RewriteEntry{"*.somehost.com", "1.2.3.4", 0, nil},
+ }
+ d.prepareRewrites()
+ r = d.processRewrites("b.host.com")
+ assert.Equal(t, ReasonRewrite, r.Reason)
+ assert.Equal(t, "x.somehost.com", r.CanonName)
+ assert.True(t, len(r.IPList) == 1)
+ assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
+}
+
+func TestRewritesLevels(t *testing.T) {
+ d := Dnsfilter{}
+ // exact host, wildcard L2, wildcard L3
+ d.Rewrites = []RewriteEntry{
+ RewriteEntry{"host.com", "1.1.1.1", 0, nil},
+ RewriteEntry{"*.host.com", "2.2.2.2", 0, nil},
+ RewriteEntry{"*.sub.host.com", "3.3.3.3", 0, nil},
+ }
+ d.prepareRewrites()
+
+ // match exact
+ r := d.processRewrites("host.com")
+ assert.Equal(t, ReasonRewrite, r.Reason)
+ assert.Equal(t, 1, len(r.IPList))
+ assert.Equal(t, "1.1.1.1", r.IPList[0].String())
+
+ // match L2
+ r = d.processRewrites("sub.host.com")
+ assert.Equal(t, ReasonRewrite, r.Reason)
+ assert.Equal(t, 1, len(r.IPList))
+ assert.Equal(t, "2.2.2.2", r.IPList[0].String())
+
+ // match L3
+ r = d.processRewrites("my.sub.host.com")
+ assert.Equal(t, ReasonRewrite, r.Reason)
+ assert.Equal(t, 1, len(r.IPList))
+ assert.Equal(t, "3.3.3.3", r.IPList[0].String())
+}
+
+func TestRewritesException(t *testing.T) {
+ d := Dnsfilter{}
+ // wildcard; exception for a sub-domain
+ d.Rewrites = []RewriteEntry{
+ RewriteEntry{"*.host.com", "2.2.2.2", 0, nil},
+ RewriteEntry{"sub.host.com", "sub.host.com", 0, nil},
+ }
+ d.prepareRewrites()
+
+ // match sub-domain
+ r := d.processRewrites("my.host.com")
+ assert.Equal(t, ReasonRewrite, r.Reason)
+ assert.Equal(t, 1, len(r.IPList))
+ assert.Equal(t, "2.2.2.2", r.IPList[0].String())
+
+ // match sub-domain, but handle exception
+ r = d.processRewrites("sub.host.com")
+ assert.Equal(t, NotFilteredNotFound, r.Reason)
+}
+
+func TestRewritesExceptionWC(t *testing.T) {
+ d := Dnsfilter{}
+ // wildcard; exception for a sub-wildcard
+ d.Rewrites = []RewriteEntry{
+ RewriteEntry{"*.host.com", "2.2.2.2", 0, nil},
+ RewriteEntry{"*.sub.host.com", "*.sub.host.com", 0, nil},
+ }
+ d.prepareRewrites()
+
+ // match sub-domain
+ r := d.processRewrites("my.host.com")
+ assert.Equal(t, ReasonRewrite, r.Reason)
+ assert.Equal(t, 1, len(r.IPList))
+ assert.Equal(t, "2.2.2.2", r.IPList[0].String())
+
+ // match sub-domain, but handle exception
+ r = d.processRewrites("my.sub.host.com")
+ assert.Equal(t, NotFilteredNotFound, r.Reason)
+}
diff --git a/dnsforward/config.go b/dnsforward/config.go
new file mode 100644
index 00000000..1fe9dfb2
--- /dev/null
+++ b/dnsforward/config.go
@@ -0,0 +1,264 @@
+package dnsforward
+
+import (
+ "crypto/tls"
+ "crypto/x509"
+ "errors"
+ "fmt"
+ "net"
+ "net/http"
+ "sort"
+
+ "github.com/AdguardTeam/golibs/log"
+ "github.com/joomcode/errorx"
+
+ "github.com/AdguardTeam/AdGuardHome/dnsfilter"
+ "github.com/AdguardTeam/dnsproxy/proxy"
+ "github.com/AdguardTeam/dnsproxy/upstream"
+)
+
+// FilteringConfig represents the DNS filtering configuration of AdGuard Home
+// The zero FilteringConfig is empty and ready for use.
+type FilteringConfig struct {
+ // Callbacks for other modules
+ // --
+
+ // Filtering callback function
+ FilterHandler func(clientAddr string, settings *dnsfilter.RequestFilteringSettings) `yaml:"-"`
+
+ // GetCustomUpstreamByClient - a callback function that returns upstreams configuration
+ // based on the client IP address. Returns nil if there are no custom upstreams for the client
+ GetCustomUpstreamByClient func(clientAddr string) *proxy.UpstreamConfig `yaml:"-"`
+
+ // Protection configuration
+ // --
+
+ ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of dnsfilter features
+ BlockingMode string `yaml:"blocking_mode"` // mode how to answer filtered requests
+ BlockingIPv4 string `yaml:"blocking_ipv4"` // IP address to be returned for a blocked A request
+ BlockingIPv6 string `yaml:"blocking_ipv6"` // IP address to be returned for a blocked AAAA request
+ BlockingIPAddrv4 net.IP `yaml:"-"`
+ BlockingIPAddrv6 net.IP `yaml:"-"`
+ BlockedResponseTTL uint32 `yaml:"blocked_response_ttl"` // if 0, then default is used (3600)
+
+ // IP (or domain name) which is used to respond to DNS requests blocked by parental control or safe-browsing
+ ParentalBlockHost string `yaml:"parental_block_host"`
+ SafeBrowsingBlockHost string `yaml:"safebrowsing_block_host"`
+
+ // Anti-DNS amplification
+ // --
+
+ Ratelimit uint32 `yaml:"ratelimit"` // max number of requests per second from a given IP (0 to disable)
+ RatelimitWhitelist []string `yaml:"ratelimit_whitelist"` // a list of whitelisted client IP addresses
+ RefuseAny bool `yaml:"refuse_any"` // if true, refuse ANY requests
+
+ // Upstream DNS servers configuration
+ // --
+
+ UpstreamDNS []string `yaml:"upstream_dns"`
+ BootstrapDNS []string `yaml:"bootstrap_dns"` // a list of bootstrap DNS for DoH and DoT (plain DNS only)
+ AllServers bool `yaml:"all_servers"` // if true, parallel queries to all configured upstream servers are enabled
+ FastestAddr bool `yaml:"fastest_addr"` // use Fastest Address algorithm
+
+ // Access settings
+ // --
+
+ AllowedClients []string `yaml:"allowed_clients"` // IP addresses of whitelist clients
+ DisallowedClients []string `yaml:"disallowed_clients"` // IP addresses of clients that should be blocked
+ BlockedHosts []string `yaml:"blocked_hosts"` // hosts that should be blocked
+
+ // DNS cache settings
+ // --
+
+ CacheSize uint32 `yaml:"cache_size"` // DNS cache size (in bytes)
+ CacheMinTTL uint32 `yaml:"cache_ttl_min"` // override TTL value (minimum) received from upstream server
+ CacheMaxTTL uint32 `yaml:"cache_ttl_max"` // override TTL value (maximum) received from upstream server
+
+ // Other settings
+ // --
+
+ BogusNXDomain []string `yaml:"bogus_nxdomain"` // transform responses with these IP addresses to NXDOMAIN
+ AAAADisabled bool `yaml:"aaaa_disabled"` // Respond with an empty answer to all AAAA requests
+ EnableDNSSEC bool `yaml:"enable_dnssec"` // Set DNSSEC flag in outcoming DNS request
+ EnableEDNSClientSubnet bool `yaml:"edns_client_subnet"` // Enable EDNS Client Subnet option
+}
+
+// TLSConfig is the TLS configuration for HTTPS, DNS-over-HTTPS, and DNS-over-TLS
+type TLSConfig struct {
+ TLSListenAddr *net.TCPAddr `yaml:"-" json:"-"`
+ StrictSNICheck bool `yaml:"strict_sni_check" json:"-"` // Reject connection if the client uses server name (in SNI) that doesn't match the certificate
+
+ CertificateChain string `yaml:"certificate_chain" json:"certificate_chain"` // PEM-encoded certificates chain
+ PrivateKey string `yaml:"private_key" json:"private_key"` // PEM-encoded private key
+
+ CertificatePath string `yaml:"certificate_path" json:"certificate_path"` // certificate file name
+ PrivateKeyPath string `yaml:"private_key_path" json:"private_key_path"` // private key file name
+
+ CertificateChainData []byte `yaml:"-" json:"-"`
+ PrivateKeyData []byte `yaml:"-" json:"-"`
+
+ cert tls.Certificate // nolint(structcheck) - linter thinks that this field is unused, while TLSConfig is directly included into ServerConfig
+ dnsNames []string // nolint(structcheck) // DNS names from certificate (SAN) or CN value from Subject
+}
+
+// ServerConfig represents server configuration.
+// The zero ServerConfig is empty and ready for use.
+type ServerConfig struct {
+ UDPListenAddr *net.UDPAddr // UDP listen address
+ TCPListenAddr *net.TCPAddr // TCP listen address
+ UpstreamConfig *proxy.UpstreamConfig // Upstream DNS servers config
+ OnDNSRequest func(d *proxy.DNSContext)
+
+ FilteringConfig
+ TLSConfig
+ TLSAllowUnencryptedDOH bool
+
+ TLSv12Roots *x509.CertPool // list of root CAs for TLSv1.2
+ TLSCiphers []uint16 // list of TLS ciphers to use
+
+ // Called when the configuration is changed by HTTP request
+ ConfigModified func()
+
+ // Register an HTTP handler
+ HTTPRegister func(string, string, func(http.ResponseWriter, *http.Request))
+}
+
+// if any of ServerConfig values are zero, then default values from below are used
+var defaultValues = ServerConfig{
+ UDPListenAddr: &net.UDPAddr{Port: 53},
+ TCPListenAddr: &net.TCPAddr{Port: 53},
+ FilteringConfig: FilteringConfig{BlockedResponseTTL: 3600},
+}
+
+// createProxyConfig creates and validates configuration for the main proxy
+func (s *Server) createProxyConfig() (proxy.Config, error) {
+ proxyConfig := proxy.Config{
+ UDPListenAddr: s.conf.UDPListenAddr,
+ TCPListenAddr: s.conf.TCPListenAddr,
+ Ratelimit: int(s.conf.Ratelimit),
+ RatelimitWhitelist: s.conf.RatelimitWhitelist,
+ RefuseAny: s.conf.RefuseAny,
+ CacheEnabled: true,
+ CacheSizeBytes: int(s.conf.CacheSize),
+ CacheMinTTL: s.conf.CacheMinTTL,
+ CacheMaxTTL: s.conf.CacheMaxTTL,
+ UpstreamConfig: s.conf.UpstreamConfig,
+ BeforeRequestHandler: s.beforeRequestHandler,
+ RequestHandler: s.handleDNSRequest,
+ AllServers: s.conf.AllServers,
+ EnableEDNSClientSubnet: s.conf.EnableEDNSClientSubnet,
+ FindFastestAddr: s.conf.FastestAddr,
+ }
+
+ if len(s.conf.BogusNXDomain) > 0 {
+ for _, s := range s.conf.BogusNXDomain {
+ ip := net.ParseIP(s)
+ if ip == nil {
+ log.Error("Invalid bogus IP: %s", s)
+ } else {
+ proxyConfig.BogusNXDomain = append(proxyConfig.BogusNXDomain, ip)
+ }
+ }
+ }
+
+ // TLS settings
+ err := s.prepareTLS(&proxyConfig)
+ if err != nil {
+ return proxyConfig, err
+ }
+
+ // Validate proxy config
+ if proxyConfig.UpstreamConfig == nil || len(proxyConfig.UpstreamConfig.Upstreams) == 0 {
+ return proxyConfig, errors.New("no upstream servers configured")
+ }
+
+ return proxyConfig, nil
+}
+
+// initDefaultSettings initializes default settings if nothing
+// is configured
+func (s *Server) initDefaultSettings() {
+ if len(s.conf.UpstreamDNS) == 0 {
+ s.conf.UpstreamDNS = defaultDNS
+ }
+ if len(s.conf.BootstrapDNS) == 0 {
+ s.conf.BootstrapDNS = defaultBootstrap
+ }
+ if len(s.conf.ParentalBlockHost) == 0 {
+ s.conf.ParentalBlockHost = parentalBlockHost
+ }
+ if len(s.conf.SafeBrowsingBlockHost) == 0 {
+ s.conf.SafeBrowsingBlockHost = safeBrowsingBlockHost
+ }
+ if s.conf.UDPListenAddr == nil {
+ s.conf.UDPListenAddr = defaultValues.UDPListenAddr
+ }
+ if s.conf.TCPListenAddr == nil {
+ s.conf.TCPListenAddr = defaultValues.TCPListenAddr
+ }
+}
+
+// prepareUpstreamSettings - prepares upstream DNS server settings
+func (s *Server) prepareUpstreamSettings() error {
+ upstreamConfig, err := proxy.ParseUpstreamsConfig(s.conf.UpstreamDNS, s.conf.BootstrapDNS, DefaultTimeout)
+ if err != nil {
+ return fmt.Errorf("DNS: proxy.ParseUpstreamsConfig: %s", err)
+ }
+ s.conf.UpstreamConfig = &upstreamConfig
+ return nil
+}
+
+// prepareIntlProxy - initializes DNS proxy that we use for internal DNS queries
+func (s *Server) prepareIntlProxy() {
+ intlProxyConfig := proxy.Config{
+ CacheEnabled: true,
+ CacheSizeBytes: 4096,
+ UpstreamConfig: s.conf.UpstreamConfig,
+ }
+ s.internalProxy = &proxy.Proxy{Config: intlProxyConfig}
+}
+
+// prepareTLS - prepares TLS configuration for the DNS proxy
+func (s *Server) prepareTLS(proxyConfig *proxy.Config) error {
+ if s.conf.TLSListenAddr != nil && len(s.conf.CertificateChainData) != 0 && len(s.conf.PrivateKeyData) != 0 {
+ proxyConfig.TLSListenAddr = s.conf.TLSListenAddr
+ var err error
+ s.conf.cert, err = tls.X509KeyPair(s.conf.CertificateChainData, s.conf.PrivateKeyData)
+ if err != nil {
+ return errorx.Decorate(err, "Failed to parse TLS keypair")
+ }
+
+ if s.conf.StrictSNICheck {
+ x, err := x509.ParseCertificate(s.conf.cert.Certificate[0])
+ if err != nil {
+ return errorx.Decorate(err, "x509.ParseCertificate(): %s", err)
+ }
+ if len(x.DNSNames) != 0 {
+ s.conf.dnsNames = x.DNSNames
+ log.Debug("DNS: using DNS names from certificate's SAN: %v", x.DNSNames)
+ sort.Strings(s.conf.dnsNames)
+ } else {
+ s.conf.dnsNames = append(s.conf.dnsNames, x.Subject.CommonName)
+ log.Debug("DNS: using DNS name from certificate's CN: %s", x.Subject.CommonName)
+ }
+ }
+
+ proxyConfig.TLSConfig = &tls.Config{
+ GetCertificate: s.onGetCertificate,
+ MinVersion: tls.VersionTLS12,
+ }
+ }
+ upstream.RootCAs = s.conf.TLSv12Roots
+ upstream.CipherSuites = s.conf.TLSCiphers
+ return nil
+}
+
+// Called by 'tls' package when Client Hello is received
+// If the server name (from SNI) supplied by client is incorrect - we terminate the ongoing TLS handshake.
+func (s *Server) onGetCertificate(ch *tls.ClientHelloInfo) (*tls.Certificate, error) {
+ if s.conf.StrictSNICheck && !matchDNSName(s.conf.dnsNames, ch.ServerName) {
+ log.Info("DNS: TLS: unknown SNI in Client Hello: %s", ch.ServerName)
+ return nil, fmt.Errorf("invalid SNI")
+ }
+ return &s.conf.cert, nil
+}
diff --git a/dnsforward/dnsforward.go b/dnsforward/dnsforward.go
index 4f630afb..e8d8a6b0 100644
--- a/dnsforward/dnsforward.go
+++ b/dnsforward/dnsforward.go
@@ -1,14 +1,10 @@
package dnsforward
import (
- "crypto/tls"
- "crypto/x509"
"fmt"
"net"
"net/http"
"runtime"
- "sort"
- "strings"
"sync"
"time"
@@ -16,9 +12,7 @@ import (
"github.com/AdguardTeam/AdGuardHome/querylog"
"github.com/AdguardTeam/AdGuardHome/stats"
"github.com/AdguardTeam/dnsproxy/proxy"
- "github.com/AdguardTeam/dnsproxy/upstream"
"github.com/AdguardTeam/golibs/log"
- "github.com/AdguardTeam/golibs/utils"
"github.com/joomcode/errorx"
"github.com/miekg/dns"
)
@@ -90,12 +84,6 @@ func (s *Server) Close() {
s.Unlock()
}
-func stringArrayDup(a []string) []string {
- a2 := make([]string, len(a))
- copy(a2, a)
- return a2
-}
-
// WriteDiskConfig - write configuration
func (s *Server) WriteDiskConfig(c *FilteringConfig) {
s.RLock()
@@ -110,100 +98,6 @@ func (s *Server) WriteDiskConfig(c *FilteringConfig) {
s.RUnlock()
}
-// FilteringConfig represents the DNS filtering configuration of AdGuard Home
-// The zero FilteringConfig is empty and ready for use.
-type FilteringConfig struct {
- // Filtering callback function
- FilterHandler func(clientAddr string, settings *dnsfilter.RequestFilteringSettings) `yaml:"-"`
-
- // This callback function returns the list of upstream servers for a client specified by IP address
- GetUpstreamsByClient func(clientAddr string) []upstream.Upstream `yaml:"-"`
-
- ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of dnsfilter features
-
- BlockingMode string `yaml:"blocking_mode"` // mode how to answer filtered requests
- BlockingIPv4 string `yaml:"blocking_ipv4"` // IP address to be returned for a blocked A request
- BlockingIPv6 string `yaml:"blocking_ipv6"` // IP address to be returned for a blocked AAAA request
- BlockingIPAddrv4 net.IP `yaml:"-"`
- BlockingIPAddrv6 net.IP `yaml:"-"`
-
- BlockedResponseTTL uint32 `yaml:"blocked_response_ttl"` // if 0, then default is used (3600)
- Ratelimit uint32 `yaml:"ratelimit"` // max number of requests per second from a given IP (0 to disable)
- RatelimitWhitelist []string `yaml:"ratelimit_whitelist"` // a list of whitelisted client IP addresses
- RefuseAny bool `yaml:"refuse_any"` // if true, refuse ANY requests
- BootstrapDNS []string `yaml:"bootstrap_dns"` // a list of bootstrap DNS for DoH and DoT (plain DNS only)
- AllServers bool `yaml:"all_servers"` // if true, parallel queries to all configured upstream servers are enabled
-
- EnableEDNSClientSubnet bool `yaml:"edns_client_subnet"` // Enable EDNS Client Subnet option
-
- EnableDNSSEC bool `yaml:"enable_dnssec"` // Set DNSSEC flag in outcoming DNS request
-
- // Respond with an empty answer to all AAAA requests
- AAAADisabled bool `yaml:"aaaa_disabled"`
-
- FastestAddrAlgo bool `yaml:"fastest_addr"` // use Fastest Address algorithm
-
- AllowedClients []string `yaml:"allowed_clients"` // IP addresses of whitelist clients
- DisallowedClients []string `yaml:"disallowed_clients"` // IP addresses of clients that should be blocked
- BlockedHosts []string `yaml:"blocked_hosts"` // hosts that should be blocked
-
- // IP (or domain name) which is used to respond to DNS requests blocked by parental control or safe-browsing
- ParentalBlockHost string `yaml:"parental_block_host"`
- SafeBrowsingBlockHost string `yaml:"safebrowsing_block_host"`
-
- CacheSize uint32 `yaml:"cache_size"` // DNS cache size (in bytes)
- CacheMinTTL uint32 `yaml:"cache_ttl_min"` // override TTL value (minimum) received from upstream server
- CacheMaxTTL uint32 `yaml:"cache_ttl_max"` // override TTL value (maximum) received from upstream server
- UpstreamDNS []string `yaml:"upstream_dns"`
-}
-
-// TLSConfig is the TLS configuration for HTTPS, DNS-over-HTTPS, and DNS-over-TLS
-type TLSConfig struct {
- TLSListenAddr *net.TCPAddr `yaml:"-" json:"-"`
- StrictSNICheck bool `yaml:"strict_sni_check" json:"-"` // Reject connection if the client uses server name (in SNI) that doesn't match the certificate
- CertificateChain string `yaml:"certificate_chain" json:"certificate_chain"` // PEM-encoded certificates chain
- PrivateKey string `yaml:"private_key" json:"private_key"` // PEM-encoded private key
-
- CertificatePath string `yaml:"certificate_path" json:"certificate_path"` // certificate file name
- PrivateKeyPath string `yaml:"private_key_path" json:"private_key_path"` // private key file name
-
- CertificateChainData []byte `yaml:"-" json:"-"`
- PrivateKeyData []byte `yaml:"-" json:"-"`
-
- cert tls.Certificate // nolint(structcheck) - linter thinks that this field is unused, while TLSConfig is directly included into ServerConfig
- dnsNames []string // nolint(structcheck) // DNS names from certificate (SAN) or CN value from Subject
-}
-
-// ServerConfig represents server configuration.
-// The zero ServerConfig is empty and ready for use.
-type ServerConfig struct {
- UDPListenAddr *net.UDPAddr // UDP listen address
- TCPListenAddr *net.TCPAddr // TCP listen address
- Upstreams []upstream.Upstream // Configured upstreams
- DomainsReservedUpstreams map[string][]upstream.Upstream // Map of domains and lists of configured upstreams
- OnDNSRequest func(d *proxy.DNSContext)
-
- FilteringConfig
- TLSConfig
- TLSAllowUnencryptedDOH bool
-
- TLSv12Roots *x509.CertPool // list of root CAs for TLSv1.2
- TLSCiphers []uint16 // list of TLS ciphers to use
-
- // Called when the configuration is changed by HTTP request
- ConfigModified func()
-
- // Register an HTTP handler
- HTTPRegister func(string, string, func(http.ResponseWriter, *http.Request))
-}
-
-// if any of ServerConfig values are zero, then default values from below are used
-var defaultValues = ServerConfig{
- UDPListenAddr: &net.UDPAddr{Port: 53},
- TCPListenAddr: &net.TCPAddr{Port: 53},
- FilteringConfig: FilteringConfig{BlockedResponseTTL: 3600},
-}
-
// Resolve - get IP addresses by host name from an upstream server.
// No request/response filtering is performed.
// Query log and Stats are not updated.
@@ -251,8 +145,9 @@ func (s *Server) startInternal() error {
}
// Prepare the object
-// nolint(gocyclo)
func (s *Server) Prepare(config *ServerConfig) error {
+ // 1. Initialize the server configuration
+ // --
if config != nil {
s.conf = *config
if s.conf.BlockingMode == "custom_ip" {
@@ -264,157 +159,50 @@ func (s *Server) Prepare(config *ServerConfig) error {
}
}
- if len(s.conf.UpstreamDNS) == 0 {
- s.conf.UpstreamDNS = defaultDNS
- }
- if len(s.conf.BootstrapDNS) == 0 {
- s.conf.BootstrapDNS = defaultBootstrap
- }
+ // 2. Set default values in the case if nothing is configured
+ // --
+ s.initDefaultSettings()
- upstreamConfig, err := proxy.ParseUpstreamsConfig(s.conf.UpstreamDNS, s.conf.BootstrapDNS, DefaultTimeout)
+ // 3. Prepare DNS servers settings
+ // --
+ err := s.prepareUpstreamSettings()
if err != nil {
- return fmt.Errorf("DNS: proxy.ParseUpstreamsConfig: %s", err)
- }
- s.conf.Upstreams = upstreamConfig.Upstreams
- s.conf.DomainsReservedUpstreams = upstreamConfig.DomainReservedUpstreams
-
- if len(s.conf.ParentalBlockHost) == 0 {
- s.conf.ParentalBlockHost = parentalBlockHost
- }
- if len(s.conf.SafeBrowsingBlockHost) == 0 {
- s.conf.SafeBrowsingBlockHost = safeBrowsingBlockHost
- }
- if s.conf.UDPListenAddr == nil {
- s.conf.UDPListenAddr = defaultValues.UDPListenAddr
- }
- if s.conf.TCPListenAddr == nil {
- s.conf.TCPListenAddr = defaultValues.TCPListenAddr
+ return err
}
- proxyConfig := proxy.Config{
- UDPListenAddr: s.conf.UDPListenAddr,
- TCPListenAddr: s.conf.TCPListenAddr,
- Ratelimit: int(s.conf.Ratelimit),
- RatelimitWhitelist: s.conf.RatelimitWhitelist,
- RefuseAny: s.conf.RefuseAny,
- CacheEnabled: true,
- CacheSizeBytes: int(s.conf.CacheSize),
- CacheMinTTL: s.conf.CacheMinTTL,
- CacheMaxTTL: s.conf.CacheMaxTTL,
- Upstreams: s.conf.Upstreams,
- DomainsReservedUpstreams: s.conf.DomainsReservedUpstreams,
- BeforeRequestHandler: s.beforeRequestHandler,
- RequestHandler: s.handleDNSRequest,
- AllServers: s.conf.AllServers,
- EnableEDNSClientSubnet: s.conf.EnableEDNSClientSubnet,
- FindFastestAddr: s.conf.FastestAddrAlgo,
+ // 3. Create DNS proxy configuration
+ // --
+ var proxyConfig proxy.Config
+ proxyConfig, err = s.createProxyConfig()
+ if err != nil {
+ return err
}
- intlProxyConfig := proxy.Config{
- CacheEnabled: true,
- CacheSizeBytes: 4096,
- Upstreams: s.conf.Upstreams,
- DomainsReservedUpstreams: s.conf.DomainsReservedUpstreams,
- }
- s.internalProxy = &proxy.Proxy{Config: intlProxyConfig}
+ // 4. Prepare a DNS proxy instance that we use for internal DNS queries
+ // --
+ s.prepareIntlProxy()
+ // 5. Initialize DNS access module
+ // --
s.access = &accessCtx{}
err = s.access.Init(s.conf.AllowedClients, s.conf.DisallowedClients, s.conf.BlockedHosts)
if err != nil {
return err
}
- if s.conf.TLSListenAddr != nil && len(s.conf.CertificateChainData) != 0 && len(s.conf.PrivateKeyData) != 0 {
- proxyConfig.TLSListenAddr = s.conf.TLSListenAddr
- s.conf.cert, err = tls.X509KeyPair(s.conf.CertificateChainData, s.conf.PrivateKeyData)
- if err != nil {
- return errorx.Decorate(err, "Failed to parse TLS keypair")
- }
-
- if s.conf.StrictSNICheck {
- x, err := x509.ParseCertificate(s.conf.cert.Certificate[0])
- if err != nil {
- return errorx.Decorate(err, "x509.ParseCertificate(): %s", err)
- }
- if len(x.DNSNames) != 0 {
- s.conf.dnsNames = x.DNSNames
- log.Debug("DNS: using DNS names from certificate's SAN: %v", x.DNSNames)
- sort.Strings(s.conf.dnsNames)
- } else {
- s.conf.dnsNames = append(s.conf.dnsNames, x.Subject.CommonName)
- log.Debug("DNS: using DNS name from certificate's CN: %s", x.Subject.CommonName)
- }
- }
-
- proxyConfig.TLSConfig = &tls.Config{
- GetCertificate: s.onGetCertificate,
- MinVersion: tls.VersionTLS12,
- }
- }
- upstream.RootCAs = s.conf.TLSv12Roots
- upstream.CipherSuites = s.conf.TLSCiphers
-
- if len(proxyConfig.Upstreams) == 0 {
- log.Fatal("len(proxyConfig.Upstreams) == 0")
- }
-
+ // 6. Register web handlers if necessary
+ // --
if !webRegistered && s.conf.HTTPRegister != nil {
webRegistered = true
s.registerHandlers()
}
- // Initialize and start the DNS proxy
+ // 7. Create the main DNS proxy instance
+ // --
s.dnsProxy = &proxy.Proxy{Config: proxyConfig}
return nil
}
-// Find value in a sorted array
-func findSorted(ar []string, val string) int {
- i := sort.SearchStrings(ar, val)
- if i == len(ar) || ar[i] != val {
- return -1
- }
- return i
-}
-
-func isWildcard(host string) bool {
- return len(host) >= 2 &&
- host[0] == '*' && host[1] == '.'
-}
-
-// Return TRUE if host name matches a wildcard pattern
-func matchDomainWildcard(host, wildcard string) bool {
- return isWildcard(wildcard) &&
- strings.HasSuffix(host, wildcard[1:])
-}
-
-// Return TRUE if client's SNI value matches DNS names from certificate
-func matchDNSName(dnsNames []string, sni string) bool {
- if utils.IsValidHostname(sni) != nil {
- return false
- }
- if findSorted(dnsNames, sni) != -1 {
- return true
- }
-
- for _, dn := range dnsNames {
- if matchDomainWildcard(sni, dn) {
- return true
- }
- }
- return false
-}
-
-// Called by 'tls' package when Client Hello is received
-// If the server name (from SNI) supplied by client is incorrect - we terminate the ongoing TLS handshake.
-func (s *Server) onGetCertificate(ch *tls.ClientHelloInfo) (*tls.Certificate, error) {
- if s.conf.StrictSNICheck && !matchDNSName(s.conf.dnsNames, ch.ServerName) {
- log.Info("DNS: TLS: unknown SNI in Client Hello: %s", ch.ServerName)
- return nil, fmt.Errorf("invalid SNI")
- }
- return &s.conf.cert, nil
-}
-
// Stop stops the DNS server
func (s *Server) Stop() error {
s.Lock()
@@ -479,695 +267,3 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
p.ServeHTTP(w, r)
}
}
-
-// Get IP address from net.Addr object
-// Note: we can't use net.SplitHostPort(a.String()) because of IPv6 zone:
-// https://github.com/AdguardTeam/AdGuardHome/issues/1261
-func ipFromAddr(a net.Addr) string {
- switch addr := a.(type) {
- case *net.UDPAddr:
- return addr.IP.String()
- case *net.TCPAddr:
- return addr.IP.String()
- }
- return ""
-}
-
-func (s *Server) beforeRequestHandler(p *proxy.Proxy, d *proxy.DNSContext) (bool, error) {
- ip := ipFromAddr(d.Addr)
- if s.access.IsBlockedIP(ip) {
- log.Tracef("Client IP %s is blocked by settings", ip)
- return false, nil
- }
-
- if len(d.Req.Question) == 1 {
- host := strings.TrimSuffix(d.Req.Question[0].Name, ".")
- if s.access.IsBlockedDomain(host) {
- log.Tracef("Domain %s is blocked by settings", host)
- return false, nil
- }
- }
-
- return true, nil
-}
-
-// To transfer information between modules
-type dnsContext struct {
- srv *Server
- proxyCtx *proxy.DNSContext
- setts *dnsfilter.RequestFilteringSettings // filtering settings for this client
- startTime time.Time
- result *dnsfilter.Result
- origResp *dns.Msg // response received from upstream servers. Set when response is modified by filtering
- origQuestion dns.Question // question received from client. Set when Rewrites are used.
- err error // error returned from the module
- protectionEnabled bool // filtering is enabled, dnsfilter object is ready
- responseFromUpstream bool // response is received from upstream servers
- origReqDNSSEC bool // DNSSEC flag in the original request from user
-}
-
-const (
- resultDone = iota // module has completed its job, continue
- resultFinish // module has completed its job, exit normally
- resultError // an error occurred, exit with an error
-)
-
-// Perform initial checks; process WHOIS & rDNS
-func processInitial(ctx *dnsContext) int {
- s := ctx.srv
- d := ctx.proxyCtx
- if s.conf.AAAADisabled && d.Req.Question[0].Qtype == dns.TypeAAAA {
- _ = proxy.CheckDisabledAAAARequest(d, true)
- return resultFinish
- }
-
- if s.conf.OnDNSRequest != nil {
- s.conf.OnDNSRequest(d)
- }
-
- // disable Mozilla DoH
- if (d.Req.Question[0].Qtype == dns.TypeA || d.Req.Question[0].Qtype == dns.TypeAAAA) &&
- d.Req.Question[0].Name == "use-application-dns.net." {
- d.Res = s.genNXDomain(d.Req)
- return resultFinish
- }
-
- return resultDone
-}
-
-// Apply filtering logic
-func processFilteringBeforeRequest(ctx *dnsContext) int {
- s := ctx.srv
- d := ctx.proxyCtx
-
- s.RLock()
- // Synchronize access to s.dnsFilter so it won't be suddenly uninitialized while in use.
- // This could happen after proxy server has been stopped, but its workers are not yet exited.
- //
- // A better approach is for proxy.Stop() to wait until all its workers exit,
- // but this would require the Upstream interface to have Close() function
- // (to prevent from hanging while waiting for unresponsive DNS server to respond).
-
- var err error
- ctx.protectionEnabled = s.conf.ProtectionEnabled && s.dnsFilter != nil
- if ctx.protectionEnabled {
- ctx.setts = s.getClientRequestFilteringSettings(d)
- ctx.result, err = s.filterDNSRequest(ctx)
- }
- s.RUnlock()
-
- if err != nil {
- ctx.err = err
- return resultError
- }
- return resultDone
-}
-
-// Pass request to upstream servers; process the response
-func processUpstream(ctx *dnsContext) int {
- s := ctx.srv
- d := ctx.proxyCtx
- if d.Res != nil {
- return resultDone // response is already set - nothing to do
- }
-
- if d.Addr != nil && s.conf.GetUpstreamsByClient != nil {
- clientIP := ipFromAddr(d.Addr)
- upstreams := s.conf.GetUpstreamsByClient(clientIP)
- if len(upstreams) > 0 {
- log.Debug("Using custom upstreams for %s", clientIP)
- d.Upstreams = upstreams
- }
- }
-
- if s.conf.EnableDNSSEC {
- opt := d.Req.IsEdns0()
- if opt == nil {
- log.Debug("DNS: Adding OPT record with DNSSEC flag")
- d.Req.SetEdns0(4096, true)
- } else if !opt.Do() {
- opt.SetDo(true)
- } else {
- ctx.origReqDNSSEC = true
- }
- }
-
- // request was not filtered so let it be processed further
- err := s.dnsProxy.Resolve(d)
- if err != nil {
- ctx.err = err
- return resultError
- }
-
- ctx.responseFromUpstream = true
- return resultDone
-}
-
-// Process DNSSEC after response from upstream server
-func processDNSSECAfterResponse(ctx *dnsContext) int {
- d := ctx.proxyCtx
-
- if !ctx.responseFromUpstream || // don't process response if it's not from upstream servers
- !ctx.srv.conf.EnableDNSSEC {
- return resultDone
- }
-
- optResp := d.Res.IsEdns0()
- if !ctx.origReqDNSSEC && optResp != nil && optResp.Do() {
- return resultDone
- }
-
- // Remove RRSIG records from response
- // because there is no DO flag in the original request from client,
- // but we have EnableDNSSEC set, so we have set DO flag ourselves,
- // and now we have to clean up the DNS records our client didn't ask for.
-
- answers := []dns.RR{}
- for _, a := range d.Res.Answer {
- switch a.(type) {
- case *dns.RRSIG:
- log.Debug("Removing RRSIG record from response: %v", a)
- default:
- answers = append(answers, a)
- }
- }
- d.Res.Answer = answers
-
- answers = []dns.RR{}
- for _, a := range d.Res.Ns {
- switch a.(type) {
- case *dns.RRSIG:
- log.Debug("Removing RRSIG record from response: %v", a)
- default:
- answers = append(answers, a)
- }
- }
- d.Res.Ns = answers
-
- return resultDone
-}
-
-// Apply filtering logic after we have received response from upstream servers
-func processFilteringAfterResponse(ctx *dnsContext) int {
- s := ctx.srv
- d := ctx.proxyCtx
- res := ctx.result
- var err error
-
- switch res.Reason {
- case dnsfilter.ReasonRewrite:
- if len(res.CanonName) == 0 {
- break
- }
- d.Req.Question[0] = ctx.origQuestion
- d.Res.Question[0] = ctx.origQuestion
-
- if len(d.Res.Answer) != 0 {
- answer := []dns.RR{}
- answer = append(answer, s.genCNAMEAnswer(d.Req, res.CanonName))
- answer = append(answer, d.Res.Answer...) // host -> IP
- d.Res.Answer = answer
- }
-
- case dnsfilter.NotFilteredWhiteList:
- // nothing
-
- default:
- if !ctx.protectionEnabled || // filters are disabled: there's nothing to check for
- !ctx.responseFromUpstream { // only check response if it's from an upstream server
- break
- }
- origResp2 := d.Res
- ctx.result, err = s.filterDNSResponse(ctx)
- if err != nil {
- ctx.err = err
- return resultError
- }
- if ctx.result != nil {
- ctx.origResp = origResp2 // matched by response
- } else {
- ctx.result = &dnsfilter.Result{}
- }
- }
-
- return resultDone
-}
-
-// Write Stats data and logs
-func processQueryLogsAndStats(ctx *dnsContext) int {
- elapsed := time.Since(ctx.startTime)
- s := ctx.srv
- d := ctx.proxyCtx
-
- shouldLog := true
- msg := d.Req
-
- // don't log ANY request if refuseAny is enabled
- if len(msg.Question) >= 1 && msg.Question[0].Qtype == dns.TypeANY && s.conf.RefuseAny {
- shouldLog = false
- }
-
- s.RLock()
- // Synchronize access to s.queryLog and s.stats so they won't be suddenly uninitialized while in use.
- // This can happen after proxy server has been stopped, but its workers haven't yet exited.
- if shouldLog && s.queryLog != nil {
- p := querylog.AddParams{
- Question: msg,
- Answer: d.Res,
- OrigAnswer: ctx.origResp,
- Result: ctx.result,
- Elapsed: elapsed,
- ClientIP: getIP(d.Addr),
- }
- if d.Upstream != nil {
- p.Upstream = d.Upstream.Address()
- }
- s.queryLog.Add(p)
- }
-
- s.updateStats(d, elapsed, *ctx.result)
- s.RUnlock()
-
- return resultDone
-}
-
-// handleDNSRequest filters the incoming DNS requests and writes them to the query log
-// nolint (gocyclo)
-func (s *Server) handleDNSRequest(p *proxy.Proxy, d *proxy.DNSContext) error {
- ctx := &dnsContext{srv: s, proxyCtx: d}
- ctx.result = &dnsfilter.Result{}
- ctx.startTime = time.Now()
-
- type modProcessFunc func(ctx *dnsContext) int
- mods := []modProcessFunc{
- processInitial,
- processFilteringBeforeRequest,
- processUpstream,
- processDNSSECAfterResponse,
- processFilteringAfterResponse,
- processQueryLogsAndStats,
- }
- for _, process := range mods {
- r := process(ctx)
- switch r {
- case resultDone:
- // continue: call the next filter
-
- case resultFinish:
- return nil
-
- case resultError:
- return ctx.err
- }
- }
-
- if d.Res != nil {
- d.Res.Compress = true // some devices require DNS message compression
- }
- return nil
-}
-
-// Get IP address from net.Addr
-func getIP(addr net.Addr) net.IP {
- switch addr := addr.(type) {
- case *net.UDPAddr:
- return addr.IP
- case *net.TCPAddr:
- return addr.IP
- }
- return nil
-}
-
-func (s *Server) updateStats(d *proxy.DNSContext, elapsed time.Duration, res dnsfilter.Result) {
- if s.stats == nil {
- return
- }
-
- e := stats.Entry{}
- e.Domain = strings.ToLower(d.Req.Question[0].Name)
- e.Domain = e.Domain[:len(e.Domain)-1] // remove last "."
- switch addr := d.Addr.(type) {
- case *net.UDPAddr:
- e.Client = addr.IP
- case *net.TCPAddr:
- e.Client = addr.IP
- }
- e.Time = uint32(elapsed / 1000)
- e.Result = stats.RNotFiltered
-
- switch res.Reason {
-
- case dnsfilter.FilteredSafeBrowsing:
- e.Result = stats.RSafeBrowsing
-
- case dnsfilter.FilteredParental:
- e.Result = stats.RParental
-
- case dnsfilter.FilteredSafeSearch:
- e.Result = stats.RSafeSearch
-
- case dnsfilter.FilteredBlackList:
- fallthrough
- case dnsfilter.FilteredInvalid:
- fallthrough
- case dnsfilter.FilteredBlockedService:
- e.Result = stats.RFiltered
- }
-
- s.stats.Update(e)
-}
-
-// getClientRequestFilteringSettings lookups client filtering settings
-// using the client's IP address from the DNSContext
-func (s *Server) getClientRequestFilteringSettings(d *proxy.DNSContext) *dnsfilter.RequestFilteringSettings {
- setts := s.dnsFilter.GetConfig()
- setts.FilteringEnabled = true
- if s.conf.FilterHandler != nil {
- clientAddr := ipFromAddr(d.Addr)
- s.conf.FilterHandler(clientAddr, &setts)
- }
- return &setts
-}
-
-// filterDNSRequest applies the dnsFilter and sets d.Res if the request was filtered
-func (s *Server) filterDNSRequest(ctx *dnsContext) (*dnsfilter.Result, error) {
- d := ctx.proxyCtx
- req := d.Req
- host := strings.TrimSuffix(req.Question[0].Name, ".")
- res, err := s.dnsFilter.CheckHost(host, d.Req.Question[0].Qtype, ctx.setts)
- if err != nil {
- // Return immediately if there's an error
- return nil, errorx.Decorate(err, "dnsfilter failed to check host '%s'", host)
-
- } else if res.IsFiltered {
- // log.Tracef("Host %s is filtered, reason - '%s', matched rule: '%s'", host, res.Reason, res.Rule)
- d.Res = s.genDNSFilterMessage(d, &res)
-
- } else if (res.Reason == dnsfilter.ReasonRewrite || res.Reason == dnsfilter.RewriteEtcHosts) &&
- len(res.IPList) != 0 {
- resp := s.makeResponse(req)
-
- name := host
- if len(res.CanonName) != 0 {
- resp.Answer = append(resp.Answer, s.genCNAMEAnswer(req, res.CanonName))
- name = res.CanonName
- }
-
- for _, ip := range res.IPList {
- ip4 := ip.To4()
- if req.Question[0].Qtype == dns.TypeA && ip4 != nil {
- a := s.genAAnswer(req, ip4)
- a.Hdr.Name = dns.Fqdn(name)
- resp.Answer = append(resp.Answer, a)
- } else if req.Question[0].Qtype == dns.TypeAAAA && ip4 == nil {
- a := s.genAAAAAnswer(req, ip)
- a.Hdr.Name = dns.Fqdn(name)
- resp.Answer = append(resp.Answer, a)
- }
- }
-
- d.Res = resp
-
- } else if res.Reason == dnsfilter.ReasonRewrite && len(res.CanonName) != 0 {
- ctx.origQuestion = d.Req.Question[0]
- // resolve canonical name, not the original host name
- d.Req.Question[0].Name = dns.Fqdn(res.CanonName)
-
- } else if res.Reason == dnsfilter.RewriteEtcHosts && len(res.ReverseHost) != 0 {
-
- resp := s.makeResponse(req)
- ptr := &dns.PTR{}
- ptr.Hdr = dns.RR_Header{
- Name: req.Question[0].Name,
- Rrtype: dns.TypePTR,
- Ttl: s.conf.BlockedResponseTTL,
- Class: dns.ClassINET,
- }
- ptr.Ptr = res.ReverseHost
- resp.Answer = append(resp.Answer, ptr)
- d.Res = resp
- }
-
- return &res, err
-}
-
-// If response contains CNAME, A or AAAA records, we apply filtering to each canonical host name or IP address.
-// If this is a match, we set a new response in d.Res and return.
-func (s *Server) filterDNSResponse(ctx *dnsContext) (*dnsfilter.Result, error) {
- d := ctx.proxyCtx
- for _, a := range d.Res.Answer {
- host := ""
-
- switch v := a.(type) {
- case *dns.CNAME:
- log.Debug("DNSFwd: Checking CNAME %s for %s", v.Target, v.Hdr.Name)
- host = strings.TrimSuffix(v.Target, ".")
-
- case *dns.A:
- host = v.A.String()
- log.Debug("DNSFwd: Checking record A (%s) for %s", host, v.Hdr.Name)
-
- case *dns.AAAA:
- host = v.AAAA.String()
- log.Debug("DNSFwd: Checking record AAAA (%s) for %s", host, v.Hdr.Name)
-
- default:
- continue
- }
-
- s.RLock()
- // Synchronize access to s.dnsFilter so it won't be suddenly uninitialized while in use.
- // This could happen after proxy server has been stopped, but its workers are not yet exited.
- if !s.conf.ProtectionEnabled || s.dnsFilter == nil {
- s.RUnlock()
- continue
- }
- res, err := s.dnsFilter.CheckHostRules(host, d.Req.Question[0].Qtype, ctx.setts)
- s.RUnlock()
-
- if err != nil {
- return nil, err
-
- } else if res.IsFiltered {
- d.Res = s.genDNSFilterMessage(d, &res)
- log.Debug("DNSFwd: Matched %s by response: %s", d.Req.Question[0].Name, host)
- return &res, nil
- }
- }
-
- return nil, nil
-}
-
-// Create a DNS response by DNS request and set necessary flags
-func (s *Server) makeResponse(req *dns.Msg) *dns.Msg {
- resp := dns.Msg{}
- resp.SetReply(req)
- resp.RecursionAvailable = true
- resp.Compress = true
- return &resp
-}
-
-// genDNSFilterMessage generates a DNS message corresponding to the filtering result
-func (s *Server) genDNSFilterMessage(d *proxy.DNSContext, result *dnsfilter.Result) *dns.Msg {
- m := d.Req
-
- if m.Question[0].Qtype != dns.TypeA && m.Question[0].Qtype != dns.TypeAAAA {
- return s.genNXDomain(m)
- }
-
- switch result.Reason {
- case dnsfilter.FilteredSafeBrowsing:
- return s.genBlockedHost(m, s.conf.SafeBrowsingBlockHost, d)
- case dnsfilter.FilteredParental:
- return s.genBlockedHost(m, s.conf.ParentalBlockHost, d)
- default:
- // If the query was filtered by "Safe search", dnsfilter also must return
- // the IP address that must be used in response.
- // In this case regardless of the filtering method, we should return it
- if result.Reason == dnsfilter.FilteredSafeSearch && result.IP != nil {
- return s.genResponseWithIP(m, result.IP)
- }
-
- if s.conf.BlockingMode == "null_ip" {
- // it means that we should return 0.0.0.0 or :: for any blocked request
-
- switch m.Question[0].Qtype {
- case dns.TypeA:
- return s.genARecord(m, []byte{0, 0, 0, 0})
- case dns.TypeAAAA:
- return s.genAAAARecord(m, net.IPv6zero)
- }
-
- } else if s.conf.BlockingMode == "custom_ip" {
- // means that we should return custom IP for any blocked request
-
- switch m.Question[0].Qtype {
- case dns.TypeA:
- return s.genARecord(m, s.conf.BlockingIPAddrv4)
- case dns.TypeAAAA:
- return s.genAAAARecord(m, s.conf.BlockingIPAddrv6)
- }
-
- } else if s.conf.BlockingMode == "nxdomain" {
- // means that we should return NXDOMAIN for any blocked request
-
- return s.genNXDomain(m)
- }
-
- // Default blocking mode
- // If there's an IP specified in the rule, return it
- // If there is no IP, return NXDOMAIN
- if result.IP != nil {
- return s.genResponseWithIP(m, result.IP)
- }
- return s.genNXDomain(m)
- }
-}
-
-func (s *Server) genServerFailure(request *dns.Msg) *dns.Msg {
- resp := dns.Msg{}
- resp.SetRcode(request, dns.RcodeServerFailure)
- resp.RecursionAvailable = true
- return &resp
-}
-
-func (s *Server) genARecord(request *dns.Msg, ip net.IP) *dns.Msg {
- resp := s.makeResponse(request)
- resp.Answer = append(resp.Answer, s.genAAnswer(request, ip))
- return resp
-}
-
-func (s *Server) genAAAARecord(request *dns.Msg, ip net.IP) *dns.Msg {
- resp := s.makeResponse(request)
- resp.Answer = append(resp.Answer, s.genAAAAAnswer(request, ip))
- return resp
-}
-
-func (s *Server) genAAnswer(req *dns.Msg, ip net.IP) *dns.A {
- answer := new(dns.A)
- answer.Hdr = dns.RR_Header{
- Name: req.Question[0].Name,
- Rrtype: dns.TypeA,
- Ttl: s.conf.BlockedResponseTTL,
- Class: dns.ClassINET,
- }
- answer.A = ip
- return answer
-}
-
-func (s *Server) genAAAAAnswer(req *dns.Msg, ip net.IP) *dns.AAAA {
- answer := new(dns.AAAA)
- answer.Hdr = dns.RR_Header{
- Name: req.Question[0].Name,
- Rrtype: dns.TypeAAAA,
- Ttl: s.conf.BlockedResponseTTL,
- Class: dns.ClassINET,
- }
- answer.AAAA = ip
- return answer
-}
-
-// generate DNS response message with an IP address
-func (s *Server) genResponseWithIP(req *dns.Msg, ip net.IP) *dns.Msg {
- if req.Question[0].Qtype == dns.TypeA && ip.To4() != nil {
- return s.genARecord(req, ip.To4())
- } else if req.Question[0].Qtype == dns.TypeAAAA &&
- len(ip) == net.IPv6len && ip.To4() == nil {
- return s.genAAAARecord(req, ip)
- }
-
- // empty response
- resp := s.makeResponse(req)
- return resp
-}
-
-func (s *Server) genBlockedHost(request *dns.Msg, newAddr string, d *proxy.DNSContext) *dns.Msg {
-
- ip := net.ParseIP(newAddr)
- if ip != nil {
- return s.genResponseWithIP(request, ip)
- }
-
- // look up the hostname, TODO: cache
- replReq := dns.Msg{}
- replReq.SetQuestion(dns.Fqdn(newAddr), request.Question[0].Qtype)
- replReq.RecursionDesired = true
-
- newContext := &proxy.DNSContext{
- Proto: d.Proto,
- Addr: d.Addr,
- StartTime: time.Now(),
- Req: &replReq,
- }
-
- err := s.dnsProxy.Resolve(newContext)
- if err != nil {
- log.Printf("Couldn't look up replacement host '%s': %s", newAddr, err)
- return s.genServerFailure(request)
- }
-
- resp := s.makeResponse(request)
- if newContext.Res != nil {
- for _, answer := range newContext.Res.Answer {
- answer.Header().Name = request.Question[0].Name
- resp.Answer = append(resp.Answer, answer)
- }
- }
-
- return resp
-}
-
-// Make a CNAME response
-func (s *Server) genCNAMEAnswer(req *dns.Msg, cname string) *dns.CNAME {
- answer := new(dns.CNAME)
- answer.Hdr = dns.RR_Header{
- Name: req.Question[0].Name,
- Rrtype: dns.TypeCNAME,
- Ttl: s.conf.BlockedResponseTTL,
- Class: dns.ClassINET,
- }
- answer.Target = dns.Fqdn(cname)
- return answer
-}
-
-func (s *Server) genNXDomain(request *dns.Msg) *dns.Msg {
- resp := dns.Msg{}
- resp.SetRcode(request, dns.RcodeNameError)
- resp.RecursionAvailable = true
- resp.Ns = s.genSOA(request)
- return &resp
-}
-
-func (s *Server) genSOA(request *dns.Msg) []dns.RR {
- zone := ""
- if len(request.Question) > 0 {
- zone = request.Question[0].Name
- }
-
- soa := dns.SOA{
- // values copied from verisign's nonexistent .com domain
- // their exact values are not important in our use case because they are used for domain transfers between primary/secondary DNS servers
- Refresh: 1800,
- Retry: 900,
- Expire: 604800,
- Minttl: 86400,
- // copied from AdGuard DNS
- Ns: "fake-for-negative-caching.adguard.com.",
- Serial: 100500,
- // rest is request-specific
- Hdr: dns.RR_Header{
- Name: zone,
- Rrtype: dns.TypeSOA,
- Ttl: s.conf.BlockedResponseTTL,
- Class: dns.ClassINET,
- },
- Mbox: "hostmaster.", // zone will be appended later if it's not empty or "."
- }
- if soa.Hdr.Ttl == 0 {
- soa.Hdr.Ttl = defaultValues.BlockedResponseTTL
- }
- if len(zone) > 0 && zone[0] != '.' {
- soa.Mbox += zone
- }
- return []dns.RR{&soa}
-}
diff --git a/dnsforward/dnsforward_http.go b/dnsforward/dnsforward_http.go
index 4658cbbf..c2c94061 100644
--- a/dnsforward/dnsforward_http.go
+++ b/dnsforward/dnsforward_http.go
@@ -51,7 +51,7 @@ func (s *Server) handleGetConfig(w http.ResponseWriter, r *http.Request) {
resp.EDNSCSEnabled = s.conf.EnableEDNSClientSubnet
resp.DNSSECEnabled = s.conf.EnableDNSSEC
resp.DisableIPv6 = s.conf.AAAADisabled
- resp.FastestAddr = s.conf.FastestAddrAlgo
+ resp.FastestAddr = s.conf.FastestAddr
resp.ParallelRequests = s.conf.AllServers
s.RUnlock()
@@ -170,7 +170,7 @@ func (s *Server) handleSetConfig(w http.ResponseWriter, r *http.Request) {
}
if js.Exists("fastest_addr") {
- s.conf.FastestAddrAlgo = req.FastestAddr
+ s.conf.FastestAddr = req.FastestAddr
}
if js.Exists("parallel_requests") {
@@ -343,8 +343,8 @@ func checkDNS(input string, bootstrap []string) error {
return fmt.Errorf("wrong upstream format: %s", err)
}
- // No need to check this entrance
- if input == "#" && !defaultUpstream {
+ // No need to check this DNS server
+ if input == "#" || !defaultUpstream {
return nil
}
diff --git a/dnsforward/dnsforward_test.go b/dnsforward/dnsforward_test.go
index 60b606bf..341f2fad 100644
--- a/dnsforward/dnsforward_test.go
+++ b/dnsforward/dnsforward_test.go
@@ -249,6 +249,39 @@ func TestBlockedRequest(t *testing.T) {
}
}
+func TestServerCustomClientUpstream(t *testing.T) {
+ s := createTestServer(t)
+ err := s.Start()
+ if err != nil {
+ t.Fatalf("Failed to start server: %s", err)
+ }
+ s.conf.GetCustomUpstreamByClient = func(clientAddr string) *proxy.UpstreamConfig {
+ uc := &proxy.UpstreamConfig{}
+ u := &testUpstream{}
+ u.ipv4 = map[string][]net.IP{}
+ u.ipv4["host."] = []net.IP{net.ParseIP("192.168.0.1")}
+ uc.Upstreams = append(uc.Upstreams, u)
+ return uc
+ }
+ addr := s.dnsProxy.Addr(proxy.ProtoUDP)
+
+ // Send test request
+ req := dns.Msg{}
+ req.Id = dns.Id()
+ req.RecursionDesired = true
+ req.Question = []dns.Question{
+ {Name: "host.", Qtype: dns.TypeA, Qclass: dns.ClassINET},
+ }
+
+ reply, err := dns.Exchange(&req, addr.String())
+
+ assert.Nil(t, err)
+ assert.Equal(t, dns.RcodeSuccess, reply.Rcode)
+ assert.NotNil(t, reply.Answer)
+ assert.Equal(t, "192.168.0.1", reply.Answer[0].(*dns.A).A.String())
+ assert.Nil(t, s.Stop())
+}
+
// testUpstream is a mock of real upstream.
// specify fields with necessary values to simulate real upstream behaviour
type testUpstream struct {
@@ -325,7 +358,9 @@ func (s *Server) startWithUpstream(u upstream.Upstream) error {
if err != nil {
return err
}
- s.dnsProxy.Upstreams = []upstream.Upstream{u}
+ s.dnsProxy.UpstreamConfig = &proxy.UpstreamConfig{
+ Upstreams: []upstream.Upstream{u},
+ }
return s.dnsProxy.Start()
}
@@ -353,8 +388,8 @@ func TestBlockCNAMEProtectionEnabled(t *testing.T) {
// but protection is disabled - response is NOT blocked
req := createTestMessage("badhost.")
reply, err := dns.Exchange(req, addr.String())
- assert.True(t, err == nil)
- assert.True(t, reply.Rcode == dns.RcodeSuccess)
+ assert.Nil(t, err)
+ assert.Equal(t, dns.RcodeSuccess, reply.Rcode)
}
func TestBlockCNAME(t *testing.T) {
@@ -368,23 +403,23 @@ func TestBlockCNAME(t *testing.T) {
// response is blocked
req := createTestMessage("badhost.")
reply, err := dns.Exchange(req, addr.String())
- assert.True(t, err == nil)
- assert.True(t, reply.Rcode == dns.RcodeNameError)
+ assert.Nil(t, err, nil)
+ assert.Equal(t, dns.RcodeNameError, reply.Rcode)
// 'whitelist.example.org' has a canonical name 'null.example.org' which is blocked by filters
// but 'whitelist.example.org' is in a whitelist:
// response isn't blocked
req = createTestMessage("whitelist.example.org.")
reply, err = dns.Exchange(req, addr.String())
- assert.True(t, err == nil)
- assert.True(t, reply.Rcode == dns.RcodeSuccess)
+ assert.Nil(t, err)
+ assert.Equal(t, dns.RcodeSuccess, reply.Rcode)
// 'example.org' has a canonical name 'cname1' with IP 127.0.0.255 which is blocked by filters:
// response is blocked
req = createTestMessage("example.org.")
reply, err = dns.Exchange(req, addr.String())
- assert.True(t, err == nil)
- assert.True(t, reply.Rcode == dns.RcodeNameError)
+ assert.Nil(t, err)
+ assert.Equal(t, dns.RcodeNameError, reply.Rcode)
_ = s.Stop()
}
@@ -455,7 +490,7 @@ func TestNullBlockedRequest(t *testing.T) {
func TestBlockedCustomIP(t *testing.T) {
rules := "||nxdomain.example.org^\n||null.example.org^\n127.0.0.1 host.example.org\n@@||whitelist.example.org^\n||127.0.0.255\n"
- filters := []dnsfilter.Filter{dnsfilter.Filter{
+ filters := []dnsfilter.Filter{{
ID: 0, Data: []byte(rules),
}}
c := dnsfilter.Config{}
@@ -475,27 +510,27 @@ func TestBlockedCustomIP(t *testing.T) {
conf.BlockingIPv4 = "0.0.0.1"
conf.BlockingIPv6 = "::1"
err = s.Prepare(&conf)
- assert.True(t, err == nil)
+ assert.Nil(t, err)
err = s.Start()
- assert.True(t, err == nil, "%s", err)
+ assert.Nil(t, err)
addr := s.dnsProxy.Addr(proxy.ProtoUDP)
req := createTestMessageWithType("null.example.org.", dns.TypeA)
reply, err := dns.Exchange(req, addr.String())
- assert.True(t, err == nil)
- assert.True(t, len(reply.Answer) == 1)
+ assert.Nil(t, err)
+ assert.Equal(t, 1, len(reply.Answer))
a, ok := reply.Answer[0].(*dns.A)
assert.True(t, ok)
- assert.True(t, a.A.String() == "0.0.0.1")
+ assert.Equal(t, "0.0.0.1", a.A.String())
req = createTestMessageWithType("null.example.org.", dns.TypeAAAA)
reply, err = dns.Exchange(req, addr.String())
- assert.True(t, err == nil)
- assert.True(t, len(reply.Answer) == 1)
+ assert.Nil(t, err)
+ assert.Equal(t, 1, len(reply.Answer))
a6, ok := reply.Answer[0].(*dns.AAAA)
assert.True(t, ok)
- assert.True(t, a6.AAAA.String() == "::1")
+ assert.Equal(t, "::1", a6.AAAA.String())
err = s.Stop()
if err != nil {
@@ -598,7 +633,7 @@ func createTestServer(t *testing.T) *Server {
127.0.0.1 host.example.org
@@||whitelist.example.org^
||127.0.0.255`
- filters := []dnsfilter.Filter{dnsfilter.Filter{
+ filters := []dnsfilter.Filter{{
ID: 0, Data: []byte(rules),
}}
c := dnsfilter.Config{}
diff --git a/dnsforward/filter.go b/dnsforward/filter.go
new file mode 100644
index 00000000..08c81c40
--- /dev/null
+++ b/dnsforward/filter.go
@@ -0,0 +1,150 @@
+package dnsforward
+
+import (
+ "strings"
+
+ "github.com/AdguardTeam/AdGuardHome/dnsfilter"
+ "github.com/AdguardTeam/dnsproxy/proxy"
+ "github.com/AdguardTeam/golibs/log"
+ "github.com/joomcode/errorx"
+ "github.com/miekg/dns"
+)
+
+func (s *Server) beforeRequestHandler(_ *proxy.Proxy, d *proxy.DNSContext) (bool, error) {
+ ip := ipFromAddr(d.Addr)
+ if s.access.IsBlockedIP(ip) {
+ log.Tracef("Client IP %s is blocked by settings", ip)
+ return false, nil
+ }
+
+ if len(d.Req.Question) == 1 {
+ host := strings.TrimSuffix(d.Req.Question[0].Name, ".")
+ if s.access.IsBlockedDomain(host) {
+ log.Tracef("Domain %s is blocked by settings", host)
+ return false, nil
+ }
+ }
+
+ return true, nil
+}
+
+// getClientRequestFilteringSettings lookups client filtering settings
+// using the client's IP address from the DNSContext
+func (s *Server) getClientRequestFilteringSettings(d *proxy.DNSContext) *dnsfilter.RequestFilteringSettings {
+ setts := s.dnsFilter.GetConfig()
+ setts.FilteringEnabled = true
+ if s.conf.FilterHandler != nil {
+ clientAddr := ipFromAddr(d.Addr)
+ s.conf.FilterHandler(clientAddr, &setts)
+ }
+ return &setts
+}
+
+// filterDNSRequest applies the dnsFilter and sets d.Res if the request was filtered
+func (s *Server) filterDNSRequest(ctx *dnsContext) (*dnsfilter.Result, error) {
+ d := ctx.proxyCtx
+ req := d.Req
+ host := strings.TrimSuffix(req.Question[0].Name, ".")
+ res, err := s.dnsFilter.CheckHost(host, d.Req.Question[0].Qtype, ctx.setts)
+ if err != nil {
+ // Return immediately if there's an error
+ return nil, errorx.Decorate(err, "dnsfilter failed to check host '%s'", host)
+
+ } else if res.IsFiltered {
+ // log.Tracef("Host %s is filtered, reason - '%s', matched rule: '%s'", host, res.Reason, res.Rule)
+ d.Res = s.genDNSFilterMessage(d, &res)
+
+ } else if (res.Reason == dnsfilter.ReasonRewrite || res.Reason == dnsfilter.RewriteEtcHosts) &&
+ len(res.IPList) != 0 {
+ resp := s.makeResponse(req)
+
+ name := host
+ if len(res.CanonName) != 0 {
+ resp.Answer = append(resp.Answer, s.genCNAMEAnswer(req, res.CanonName))
+ name = res.CanonName
+ }
+
+ for _, ip := range res.IPList {
+ ip4 := ip.To4()
+ if req.Question[0].Qtype == dns.TypeA && ip4 != nil {
+ a := s.genAAnswer(req, ip4)
+ a.Hdr.Name = dns.Fqdn(name)
+ resp.Answer = append(resp.Answer, a)
+ } else if req.Question[0].Qtype == dns.TypeAAAA && ip4 == nil {
+ a := s.genAAAAAnswer(req, ip)
+ a.Hdr.Name = dns.Fqdn(name)
+ resp.Answer = append(resp.Answer, a)
+ }
+ }
+
+ d.Res = resp
+
+ } else if res.Reason == dnsfilter.ReasonRewrite && len(res.CanonName) != 0 {
+ ctx.origQuestion = d.Req.Question[0]
+ // resolve canonical name, not the original host name
+ d.Req.Question[0].Name = dns.Fqdn(res.CanonName)
+
+ } else if res.Reason == dnsfilter.RewriteEtcHosts && len(res.ReverseHost) != 0 {
+
+ resp := s.makeResponse(req)
+ ptr := &dns.PTR{}
+ ptr.Hdr = dns.RR_Header{
+ Name: req.Question[0].Name,
+ Rrtype: dns.TypePTR,
+ Ttl: s.conf.BlockedResponseTTL,
+ Class: dns.ClassINET,
+ }
+ ptr.Ptr = res.ReverseHost
+ resp.Answer = append(resp.Answer, ptr)
+ d.Res = resp
+ }
+
+ return &res, err
+}
+
+// If response contains CNAME, A or AAAA records, we apply filtering to each canonical host name or IP address.
+// If this is a match, we set a new response in d.Res and return.
+func (s *Server) filterDNSResponse(ctx *dnsContext) (*dnsfilter.Result, error) {
+ d := ctx.proxyCtx
+ for _, a := range d.Res.Answer {
+ host := ""
+
+ switch v := a.(type) {
+ case *dns.CNAME:
+ log.Debug("DNSFwd: Checking CNAME %s for %s", v.Target, v.Hdr.Name)
+ host = strings.TrimSuffix(v.Target, ".")
+
+ case *dns.A:
+ host = v.A.String()
+ log.Debug("DNSFwd: Checking record A (%s) for %s", host, v.Hdr.Name)
+
+ case *dns.AAAA:
+ host = v.AAAA.String()
+ log.Debug("DNSFwd: Checking record AAAA (%s) for %s", host, v.Hdr.Name)
+
+ default:
+ continue
+ }
+
+ s.RLock()
+ // Synchronize access to s.dnsFilter so it won't be suddenly uninitialized while in use.
+ // This could happen after proxy server has been stopped, but its workers are not yet exited.
+ if !s.conf.ProtectionEnabled || s.dnsFilter == nil {
+ s.RUnlock()
+ continue
+ }
+ res, err := s.dnsFilter.CheckHostRules(host, d.Req.Question[0].Qtype, ctx.setts)
+ s.RUnlock()
+
+ if err != nil {
+ return nil, err
+
+ } else if res.IsFiltered {
+ d.Res = s.genDNSFilterMessage(d, &res)
+ log.Debug("DNSFwd: Matched %s by response: %s", d.Req.Question[0].Name, host)
+ return &res, nil
+ }
+ }
+
+ return nil, nil
+}
diff --git a/dnsforward/handle_dns.go b/dnsforward/handle_dns.go
new file mode 100644
index 00000000..7aabd25e
--- /dev/null
+++ b/dnsforward/handle_dns.go
@@ -0,0 +1,252 @@
+package dnsforward
+
+import (
+ "time"
+
+ "github.com/AdguardTeam/AdGuardHome/dnsfilter"
+ "github.com/AdguardTeam/dnsproxy/proxy"
+ "github.com/AdguardTeam/golibs/log"
+ "github.com/miekg/dns"
+)
+
+// To transfer information between modules
+type dnsContext struct {
+ srv *Server
+ proxyCtx *proxy.DNSContext
+ setts *dnsfilter.RequestFilteringSettings // filtering settings for this client
+ startTime time.Time
+ result *dnsfilter.Result
+ origResp *dns.Msg // response received from upstream servers. Set when response is modified by filtering
+ origQuestion dns.Question // question received from client. Set when Rewrites are used.
+ err error // error returned from the module
+ protectionEnabled bool // filtering is enabled, dnsfilter object is ready
+ responseFromUpstream bool // response is received from upstream servers
+ origReqDNSSEC bool // DNSSEC flag in the original request from user
+}
+
+const (
+ resultDone = iota // module has completed its job, continue
+ resultFinish // module has completed its job, exit normally
+ resultError // an error occurred, exit with an error
+)
+
+// handleDNSRequest filters the incoming DNS requests and writes them to the query log
+func (s *Server) handleDNSRequest(_ *proxy.Proxy, d *proxy.DNSContext) error {
+ ctx := &dnsContext{srv: s, proxyCtx: d}
+ ctx.result = &dnsfilter.Result{}
+ ctx.startTime = time.Now()
+
+ type modProcessFunc func(ctx *dnsContext) int
+ mods := []modProcessFunc{
+ processInitial,
+ processFilteringBeforeRequest,
+ processUpstream,
+ processDNSSECAfterResponse,
+ processFilteringAfterResponse,
+ processQueryLogsAndStats,
+ }
+ for _, process := range mods {
+ r := process(ctx)
+ switch r {
+ case resultDone:
+ // continue: call the next filter
+
+ case resultFinish:
+ return nil
+
+ case resultError:
+ return ctx.err
+ }
+ }
+
+ if d.Res != nil {
+ d.Res.Compress = true // some devices require DNS message compression
+ }
+ return nil
+}
+
+// Perform initial checks; process WHOIS & rDNS
+func processInitial(ctx *dnsContext) int {
+ s := ctx.srv
+ d := ctx.proxyCtx
+ if s.conf.AAAADisabled && d.Req.Question[0].Qtype == dns.TypeAAAA {
+ _ = proxy.CheckDisabledAAAARequest(d, true)
+ return resultFinish
+ }
+
+ if s.conf.OnDNSRequest != nil {
+ s.conf.OnDNSRequest(d)
+ }
+
+ // disable Mozilla DoH
+ if (d.Req.Question[0].Qtype == dns.TypeA || d.Req.Question[0].Qtype == dns.TypeAAAA) &&
+ d.Req.Question[0].Name == "use-application-dns.net." {
+ d.Res = s.genNXDomain(d.Req)
+ return resultFinish
+ }
+
+ return resultDone
+}
+
+// Apply filtering logic
+func processFilteringBeforeRequest(ctx *dnsContext) int {
+ s := ctx.srv
+ d := ctx.proxyCtx
+
+ s.RLock()
+ // Synchronize access to s.dnsFilter so it won't be suddenly uninitialized while in use.
+ // This could happen after proxy server has been stopped, but its workers are not yet exited.
+ //
+ // A better approach is for proxy.Stop() to wait until all its workers exit,
+ // but this would require the Upstream interface to have Close() function
+ // (to prevent from hanging while waiting for unresponsive DNS server to respond).
+
+ var err error
+ ctx.protectionEnabled = s.conf.ProtectionEnabled && s.dnsFilter != nil
+ if ctx.protectionEnabled {
+ ctx.setts = s.getClientRequestFilteringSettings(d)
+ ctx.result, err = s.filterDNSRequest(ctx)
+ }
+ s.RUnlock()
+
+ if err != nil {
+ ctx.err = err
+ return resultError
+ }
+ return resultDone
+}
+
+// Pass request to upstream servers; process the response
+func processUpstream(ctx *dnsContext) int {
+ s := ctx.srv
+ d := ctx.proxyCtx
+ if d.Res != nil {
+ return resultDone // response is already set - nothing to do
+ }
+
+ if d.Addr != nil && s.conf.GetCustomUpstreamByClient != nil {
+ clientIP := ipFromAddr(d.Addr)
+ upstreamsConf := s.conf.GetCustomUpstreamByClient(clientIP)
+ if upstreamsConf != nil {
+ log.Debug("Using custom upstreams for %s", clientIP)
+ d.CustomUpstreamConfig = upstreamsConf
+ }
+ }
+
+ if s.conf.EnableDNSSEC {
+ opt := d.Req.IsEdns0()
+ if opt == nil {
+ log.Debug("DNS: Adding OPT record with DNSSEC flag")
+ d.Req.SetEdns0(4096, true)
+ } else if !opt.Do() {
+ opt.SetDo(true)
+ } else {
+ ctx.origReqDNSSEC = true
+ }
+ }
+
+ // request was not filtered so let it be processed further
+ err := s.dnsProxy.Resolve(d)
+ if err != nil {
+ ctx.err = err
+ return resultError
+ }
+
+ ctx.responseFromUpstream = true
+ return resultDone
+}
+
+// Process DNSSEC after response from upstream server
+func processDNSSECAfterResponse(ctx *dnsContext) int {
+ d := ctx.proxyCtx
+
+ if !ctx.responseFromUpstream || // don't process response if it's not from upstream servers
+ !ctx.srv.conf.EnableDNSSEC {
+ return resultDone
+ }
+
+ if !ctx.origReqDNSSEC {
+ optResp := d.Res.IsEdns0()
+ if optResp != nil && !optResp.Do() {
+ return resultDone
+ }
+
+ // Remove RRSIG records from response
+ // because there is no DO flag in the original request from client,
+ // but we have EnableDNSSEC set, so we have set DO flag ourselves,
+ // and now we have to clean up the DNS records our client didn't ask for.
+
+ answers := []dns.RR{}
+ for _, a := range d.Res.Answer {
+ switch a.(type) {
+ case *dns.RRSIG:
+ log.Debug("Removing RRSIG record from response: %v", a)
+ default:
+ answers = append(answers, a)
+ }
+ }
+ d.Res.Answer = answers
+
+ answers = []dns.RR{}
+ for _, a := range d.Res.Ns {
+ switch a.(type) {
+ case *dns.RRSIG:
+ log.Debug("Removing RRSIG record from response: %v", a)
+ default:
+ answers = append(answers, a)
+ }
+ }
+ d.Res.Ns = answers
+ }
+
+ return resultDone
+}
+
+// Apply filtering logic after we have received response from upstream servers
+func processFilteringAfterResponse(ctx *dnsContext) int {
+ s := ctx.srv
+ d := ctx.proxyCtx
+ res := ctx.result
+ var err error
+
+ switch res.Reason {
+ case dnsfilter.ReasonRewrite:
+ if d.Res != nil {
+ break // response is already prepared
+ }
+ if len(res.CanonName) == 0 {
+ break
+ }
+ d.Req.Question[0] = ctx.origQuestion
+ d.Res.Question[0] = ctx.origQuestion
+
+ if len(d.Res.Answer) != 0 {
+ answer := []dns.RR{}
+ answer = append(answer, s.genCNAMEAnswer(d.Req, res.CanonName))
+ answer = append(answer, d.Res.Answer...) // host -> IP
+ d.Res.Answer = answer
+ }
+
+ case dnsfilter.NotFilteredWhiteList:
+ // nothing
+
+ default:
+ if !ctx.protectionEnabled || // filters are disabled: there's nothing to check for
+ !ctx.responseFromUpstream { // only check response if it's from an upstream server
+ break
+ }
+ origResp2 := d.Res
+ ctx.result, err = s.filterDNSResponse(ctx)
+ if err != nil {
+ ctx.err = err
+ return resultError
+ }
+ if ctx.result != nil {
+ ctx.origResp = origResp2 // matched by response
+ } else {
+ ctx.result = &dnsfilter.Result{}
+ }
+ }
+
+ return resultDone
+}
diff --git a/dnsforward/helpers.go b/dnsforward/helpers.go
deleted file mode 100644
index e7212355..00000000
--- a/dnsforward/helpers.go
+++ /dev/null
@@ -1,14 +0,0 @@
-package dnsforward
-
-import "net"
-
-// GetIPString is a helper function that extracts IP address from net.Addr
-func GetIPString(addr net.Addr) string {
- switch addr := addr.(type) {
- case *net.UDPAddr:
- return addr.IP.String()
- case *net.TCPAddr:
- return addr.IP.String()
- }
- return ""
-}
diff --git a/dnsforward/msg.go b/dnsforward/msg.go
new file mode 100644
index 00000000..a1078539
--- /dev/null
+++ b/dnsforward/msg.go
@@ -0,0 +1,225 @@
+package dnsforward
+
+import (
+ "log"
+ "net"
+ "time"
+
+ "github.com/AdguardTeam/AdGuardHome/dnsfilter"
+ "github.com/AdguardTeam/dnsproxy/proxy"
+ "github.com/miekg/dns"
+)
+
+// Create a DNS response by DNS request and set necessary flags
+func (s *Server) makeResponse(req *dns.Msg) *dns.Msg {
+ resp := dns.Msg{}
+ resp.SetReply(req)
+ resp.RecursionAvailable = true
+ resp.Compress = true
+ return &resp
+}
+
+// genDNSFilterMessage generates a DNS message corresponding to the filtering result
+func (s *Server) genDNSFilterMessage(d *proxy.DNSContext, result *dnsfilter.Result) *dns.Msg {
+ m := d.Req
+
+ if m.Question[0].Qtype != dns.TypeA && m.Question[0].Qtype != dns.TypeAAAA {
+ return s.genNXDomain(m)
+ }
+
+ switch result.Reason {
+ case dnsfilter.FilteredSafeBrowsing:
+ return s.genBlockedHost(m, s.conf.SafeBrowsingBlockHost, d)
+ case dnsfilter.FilteredParental:
+ return s.genBlockedHost(m, s.conf.ParentalBlockHost, d)
+ default:
+ // If the query was filtered by "Safe search", dnsfilter also must return
+ // the IP address that must be used in response.
+ // In this case regardless of the filtering method, we should return it
+ if result.Reason == dnsfilter.FilteredSafeSearch && result.IP != nil {
+ return s.genResponseWithIP(m, result.IP)
+ }
+
+ if s.conf.BlockingMode == "null_ip" {
+ // it means that we should return 0.0.0.0 or :: for any blocked request
+
+ switch m.Question[0].Qtype {
+ case dns.TypeA:
+ return s.genARecord(m, []byte{0, 0, 0, 0})
+ case dns.TypeAAAA:
+ return s.genAAAARecord(m, net.IPv6zero)
+ }
+
+ } else if s.conf.BlockingMode == "custom_ip" {
+ // means that we should return custom IP for any blocked request
+
+ switch m.Question[0].Qtype {
+ case dns.TypeA:
+ return s.genARecord(m, s.conf.BlockingIPAddrv4)
+ case dns.TypeAAAA:
+ return s.genAAAARecord(m, s.conf.BlockingIPAddrv6)
+ }
+
+ } else if s.conf.BlockingMode == "nxdomain" {
+ // means that we should return NXDOMAIN for any blocked request
+
+ return s.genNXDomain(m)
+ }
+
+ // Default blocking mode
+ // If there's an IP specified in the rule, return it
+ // If there is no IP, return NXDOMAIN
+ if result.IP != nil {
+ return s.genResponseWithIP(m, result.IP)
+ }
+ return s.genNXDomain(m)
+ }
+}
+
+func (s *Server) genServerFailure(request *dns.Msg) *dns.Msg {
+ resp := dns.Msg{}
+ resp.SetRcode(request, dns.RcodeServerFailure)
+ resp.RecursionAvailable = true
+ return &resp
+}
+
+func (s *Server) genARecord(request *dns.Msg, ip net.IP) *dns.Msg {
+ resp := s.makeResponse(request)
+ resp.Answer = append(resp.Answer, s.genAAnswer(request, ip))
+ return resp
+}
+
+func (s *Server) genAAAARecord(request *dns.Msg, ip net.IP) *dns.Msg {
+ resp := s.makeResponse(request)
+ resp.Answer = append(resp.Answer, s.genAAAAAnswer(request, ip))
+ return resp
+}
+
+func (s *Server) genAAnswer(req *dns.Msg, ip net.IP) *dns.A {
+ answer := new(dns.A)
+ answer.Hdr = dns.RR_Header{
+ Name: req.Question[0].Name,
+ Rrtype: dns.TypeA,
+ Ttl: s.conf.BlockedResponseTTL,
+ Class: dns.ClassINET,
+ }
+ answer.A = ip
+ return answer
+}
+
+func (s *Server) genAAAAAnswer(req *dns.Msg, ip net.IP) *dns.AAAA {
+ answer := new(dns.AAAA)
+ answer.Hdr = dns.RR_Header{
+ Name: req.Question[0].Name,
+ Rrtype: dns.TypeAAAA,
+ Ttl: s.conf.BlockedResponseTTL,
+ Class: dns.ClassINET,
+ }
+ answer.AAAA = ip
+ return answer
+}
+
+// generate DNS response message with an IP address
+func (s *Server) genResponseWithIP(req *dns.Msg, ip net.IP) *dns.Msg {
+ if req.Question[0].Qtype == dns.TypeA && ip.To4() != nil {
+ return s.genARecord(req, ip.To4())
+ } else if req.Question[0].Qtype == dns.TypeAAAA &&
+ len(ip) == net.IPv6len && ip.To4() == nil {
+ return s.genAAAARecord(req, ip)
+ }
+
+ // empty response
+ resp := s.makeResponse(req)
+ return resp
+}
+
+func (s *Server) genBlockedHost(request *dns.Msg, newAddr string, d *proxy.DNSContext) *dns.Msg {
+
+ ip := net.ParseIP(newAddr)
+ if ip != nil {
+ return s.genResponseWithIP(request, ip)
+ }
+
+ // look up the hostname, TODO: cache
+ replReq := dns.Msg{}
+ replReq.SetQuestion(dns.Fqdn(newAddr), request.Question[0].Qtype)
+ replReq.RecursionDesired = true
+
+ newContext := &proxy.DNSContext{
+ Proto: d.Proto,
+ Addr: d.Addr,
+ StartTime: time.Now(),
+ Req: &replReq,
+ }
+
+ err := s.dnsProxy.Resolve(newContext)
+ if err != nil {
+ log.Printf("Couldn't look up replacement host '%s': %s", newAddr, err)
+ return s.genServerFailure(request)
+ }
+
+ resp := s.makeResponse(request)
+ if newContext.Res != nil {
+ for _, answer := range newContext.Res.Answer {
+ answer.Header().Name = request.Question[0].Name
+ resp.Answer = append(resp.Answer, answer)
+ }
+ }
+
+ return resp
+}
+
+// Make a CNAME response
+func (s *Server) genCNAMEAnswer(req *dns.Msg, cname string) *dns.CNAME {
+ answer := new(dns.CNAME)
+ answer.Hdr = dns.RR_Header{
+ Name: req.Question[0].Name,
+ Rrtype: dns.TypeCNAME,
+ Ttl: s.conf.BlockedResponseTTL,
+ Class: dns.ClassINET,
+ }
+ answer.Target = dns.Fqdn(cname)
+ return answer
+}
+
+func (s *Server) genNXDomain(request *dns.Msg) *dns.Msg {
+ resp := dns.Msg{}
+ resp.SetRcode(request, dns.RcodeNameError)
+ resp.RecursionAvailable = true
+ resp.Ns = s.genSOA(request)
+ return &resp
+}
+
+func (s *Server) genSOA(request *dns.Msg) []dns.RR {
+ zone := ""
+ if len(request.Question) > 0 {
+ zone = request.Question[0].Name
+ }
+
+ soa := dns.SOA{
+ // values copied from verisign's nonexistent .com domain
+ // their exact values are not important in our use case because they are used for domain transfers between primary/secondary DNS servers
+ Refresh: 1800,
+ Retry: 900,
+ Expire: 604800,
+ Minttl: 86400,
+ // copied from AdGuard DNS
+ Ns: "fake-for-negative-caching.adguard.com.",
+ Serial: 100500,
+ // rest is request-specific
+ Hdr: dns.RR_Header{
+ Name: zone,
+ Rrtype: dns.TypeSOA,
+ Ttl: s.conf.BlockedResponseTTL,
+ Class: dns.ClassINET,
+ },
+ Mbox: "hostmaster.", // zone will be appended later if it's not empty or "."
+ }
+ if soa.Hdr.Ttl == 0 {
+ soa.Hdr.Ttl = defaultValues.BlockedResponseTTL
+ }
+ if len(zone) > 0 && zone[0] != '.' {
+ soa.Mbox += zone
+ }
+ return []dns.RR{&soa}
+}
diff --git a/dnsforward/stats.go b/dnsforward/stats.go
new file mode 100644
index 00000000..e9591abc
--- /dev/null
+++ b/dnsforward/stats.go
@@ -0,0 +1,91 @@
+package dnsforward
+
+import (
+ "net"
+ "strings"
+ "time"
+
+ "github.com/AdguardTeam/AdGuardHome/querylog"
+ "github.com/miekg/dns"
+
+ "github.com/AdguardTeam/AdGuardHome/dnsfilter"
+ "github.com/AdguardTeam/AdGuardHome/stats"
+ "github.com/AdguardTeam/dnsproxy/proxy"
+)
+
+// Write Stats data and logs
+func processQueryLogsAndStats(ctx *dnsContext) int {
+ elapsed := time.Since(ctx.startTime)
+ s := ctx.srv
+ d := ctx.proxyCtx
+
+ shouldLog := true
+ msg := d.Req
+
+ // don't log ANY request if refuseAny is enabled
+ if len(msg.Question) >= 1 && msg.Question[0].Qtype == dns.TypeANY && s.conf.RefuseAny {
+ shouldLog = false
+ }
+
+ s.RLock()
+ // Synchronize access to s.queryLog and s.stats so they won't be suddenly uninitialized while in use.
+ // This can happen after proxy server has been stopped, but its workers haven't yet exited.
+ if shouldLog && s.queryLog != nil {
+ p := querylog.AddParams{
+ Question: msg,
+ Answer: d.Res,
+ OrigAnswer: ctx.origResp,
+ Result: ctx.result,
+ Elapsed: elapsed,
+ ClientIP: getIP(d.Addr),
+ }
+ if d.Upstream != nil {
+ p.Upstream = d.Upstream.Address()
+ }
+ s.queryLog.Add(p)
+ }
+
+ s.updateStats(d, elapsed, *ctx.result)
+ s.RUnlock()
+
+ return resultDone
+}
+
+func (s *Server) updateStats(d *proxy.DNSContext, elapsed time.Duration, res dnsfilter.Result) {
+ if s.stats == nil {
+ return
+ }
+
+ e := stats.Entry{}
+ e.Domain = strings.ToLower(d.Req.Question[0].Name)
+ e.Domain = e.Domain[:len(e.Domain)-1] // remove last "."
+ switch addr := d.Addr.(type) {
+ case *net.UDPAddr:
+ e.Client = addr.IP
+ case *net.TCPAddr:
+ e.Client = addr.IP
+ }
+ e.Time = uint32(elapsed / 1000)
+ e.Result = stats.RNotFiltered
+
+ switch res.Reason {
+
+ case dnsfilter.FilteredSafeBrowsing:
+ e.Result = stats.RSafeBrowsing
+
+ case dnsfilter.FilteredParental:
+ e.Result = stats.RParental
+
+ case dnsfilter.FilteredSafeSearch:
+ e.Result = stats.RSafeSearch
+
+ case dnsfilter.FilteredBlackList:
+ fallthrough
+ case dnsfilter.FilteredInvalid:
+ fallthrough
+ case dnsfilter.FilteredBlockedService:
+ e.Result = stats.RFiltered
+ }
+
+ s.stats.Update(e)
+}
diff --git a/dnsforward/util.go b/dnsforward/util.go
new file mode 100644
index 00000000..f159f43a
--- /dev/null
+++ b/dnsforward/util.go
@@ -0,0 +1,87 @@
+package dnsforward
+
+import (
+ "net"
+ "sort"
+ "strings"
+
+ "github.com/AdguardTeam/golibs/utils"
+)
+
+// GetIPString is a helper function that extracts IP address from net.Addr
+func GetIPString(addr net.Addr) string {
+ switch addr := addr.(type) {
+ case *net.UDPAddr:
+ return addr.IP.String()
+ case *net.TCPAddr:
+ return addr.IP.String()
+ }
+ return ""
+}
+
+func stringArrayDup(a []string) []string {
+ a2 := make([]string, len(a))
+ copy(a2, a)
+ return a2
+}
+
+// Get IP address from net.Addr object
+// Note: we can't use net.SplitHostPort(a.String()) because of IPv6 zone:
+// https://github.com/AdguardTeam/AdGuardHome/issues/1261
+func ipFromAddr(a net.Addr) string {
+ switch addr := a.(type) {
+ case *net.UDPAddr:
+ return addr.IP.String()
+ case *net.TCPAddr:
+ return addr.IP.String()
+ }
+ return ""
+}
+
+// Get IP address from net.Addr
+func getIP(addr net.Addr) net.IP {
+ switch addr := addr.(type) {
+ case *net.UDPAddr:
+ return addr.IP
+ case *net.TCPAddr:
+ return addr.IP
+ }
+ return nil
+}
+
+// Find value in a sorted array
+func findSorted(ar []string, val string) int {
+ i := sort.SearchStrings(ar, val)
+ if i == len(ar) || ar[i] != val {
+ return -1
+ }
+ return i
+}
+
+func isWildcard(host string) bool {
+ return len(host) >= 2 &&
+ host[0] == '*' && host[1] == '.'
+}
+
+// Return TRUE if host name matches a wildcard pattern
+func matchDomainWildcard(host, wildcard string) bool {
+ return isWildcard(wildcard) &&
+ strings.HasSuffix(host, wildcard[1:])
+}
+
+// Return TRUE if client's SNI value matches DNS names from certificate
+func matchDNSName(dnsNames []string, sni string) bool {
+ if utils.IsValidHostname(sni) != nil {
+ return false
+ }
+ if findSorted(dnsNames, sni) != -1 {
+ return true
+ }
+
+ for _, dn := range dnsNames {
+ if matchDomainWildcard(sni, dn) {
+ return true
+ }
+ }
+ return false
+}
diff --git a/go.mod b/go.mod
index faab69fa..2e5cc689 100644
--- a/go.mod
+++ b/go.mod
@@ -3,9 +3,9 @@ module github.com/AdguardTeam/AdGuardHome
go 1.14
require (
- github.com/AdguardTeam/dnsproxy v0.27.0
+ github.com/AdguardTeam/dnsproxy v0.28.1
github.com/AdguardTeam/golibs v0.4.2
- github.com/AdguardTeam/urlfilter v0.10.0
+ github.com/AdguardTeam/urlfilter v0.10.1
github.com/NYTimes/gziphandler v1.1.1
github.com/fsnotify/fsnotify v1.4.7
github.com/gobuffalo/packr v1.30.1
diff --git a/go.sum b/go.sum
index 404a35e5..0eb016a2 100644
--- a/go.sum
+++ b/go.sum
@@ -1,12 +1,12 @@
-github.com/AdguardTeam/dnsproxy v0.27.0 h1:Xl8v3Fwm4t/eFHpJemEUUh+GHb7getPLZvdpcX6fJ20=
-github.com/AdguardTeam/dnsproxy v0.27.0/go.mod h1:hOYFV9TW+pd5XKYz7KZf2FFD8SvSPqjyGTxUae86s58=
+github.com/AdguardTeam/dnsproxy v0.28.1 h1:WkLjrUcVf/njbTLyL7bNt6e18zQjF2ZYv/HWwL9cMmU=
+github.com/AdguardTeam/dnsproxy v0.28.1/go.mod h1:hOYFV9TW+pd5XKYz7KZf2FFD8SvSPqjyGTxUae86s58=
github.com/AdguardTeam/golibs v0.4.0 h1:4VX6LoOqFe9p9Gf55BeD8BvJD6M6RDYmgEiHrENE9KU=
github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
github.com/AdguardTeam/golibs v0.4.2 h1:7M28oTZFoFwNmp8eGPb3ImmYbxGaJLyQXeIFVHjME0o=
github.com/AdguardTeam/golibs v0.4.2/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
github.com/AdguardTeam/gomitmproxy v0.2.0/go.mod h1:Qdv0Mktnzer5zpdpi5rAwixNJzW2FN91LjKJCkVbYGU=
-github.com/AdguardTeam/urlfilter v0.10.0 h1:/YZ4w/UF3KDkL4/QLrQtqalvwBfHHGgrMhk+u3Xm8Mo=
-github.com/AdguardTeam/urlfilter v0.10.0/go.mod h1:aMuejlNxpWppOVjiEV87X6z0eMf7wsXHTAIWQuylfZY=
+github.com/AdguardTeam/urlfilter v0.10.1 h1:ECago6OvZjOTKlOqxU39C+V/ecAslaCDYcf5s+/hwaY=
+github.com/AdguardTeam/urlfilter v0.10.1/go.mod h1:aMuejlNxpWppOVjiEV87X6z0eMf7wsXHTAIWQuylfZY=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I=
github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c=
diff --git a/home/auth.go b/home/auth.go
index c72ca546..a2d6d5f2 100644
--- a/home/auth.go
+++ b/home/auth.go
@@ -380,11 +380,10 @@ func optionalAuth(handler func(http.ResponseWriter, *http.Request)) func(http.Re
}
}
- } else if r.URL.Path == "/favicon.png" ||
- strings.HasPrefix(r.URL.Path, "/login.") ||
- strings.HasPrefix(r.URL.Path, "/__locales/") {
+ } else if strings.HasPrefix(r.URL.Path, "/assets/") ||
+ strings.HasPrefix(r.URL.Path, "/login.") {
// process as usual
-
+ // no additional auth requirements
} else if Context.auth != nil && Context.auth.AuthRequired() {
// redirect to login page if not authenticated
ok := false
diff --git a/home/clients.go b/home/clients.go
index 1c1719c5..96fb98f5 100644
--- a/home/clients.go
+++ b/home/clients.go
@@ -11,17 +11,18 @@ import (
"sync"
"time"
+ "github.com/AdguardTeam/dnsproxy/proxy"
+
"github.com/AdguardTeam/AdGuardHome/dhcpd"
"github.com/AdguardTeam/AdGuardHome/dnsfilter"
"github.com/AdguardTeam/AdGuardHome/dnsforward"
"github.com/AdguardTeam/AdGuardHome/util"
- "github.com/AdguardTeam/dnsproxy/upstream"
"github.com/AdguardTeam/golibs/log"
"github.com/AdguardTeam/golibs/utils"
)
const (
- clientsUpdatePeriod = 1 * time.Hour
+ clientsUpdatePeriod = 10 * time.Minute
)
var webHandlersRegistered = false
@@ -41,11 +42,12 @@ type Client struct {
BlockedServices []string
Upstreams []string // list of upstream servers to be used for the client's requests
- // Upstream objects:
+
+ // Custom upstream config for this client
// nil: not yet initialized
// not nil, but empty: initialized, no good upstreams
// not nil, not empty: Upstreams ready to be used
- upstreamObjects []upstream.Upstream
+ upstreamConfig *proxy.UpstreamConfig
}
type clientSource uint
@@ -276,16 +278,10 @@ func (clients *clientsContainer) Find(ip string) (Client, bool) {
return c, true
}
-func upstreamArrayCopy(a []upstream.Upstream) []upstream.Upstream {
- a2 := make([]upstream.Upstream, len(a))
- copy(a2, a)
- return a2
-}
-
// FindUpstreams looks for upstreams configured for the client
// If no client found for this IP, or if no custom upstreams are configured,
// this method returns nil
-func (clients *clientsContainer) FindUpstreams(ip string) []upstream.Upstream {
+func (clients *clientsContainer) FindUpstreams(ip string) *proxy.UpstreamConfig {
clients.lock.Lock()
defer clients.lock.Unlock()
@@ -294,22 +290,18 @@ func (clients *clientsContainer) FindUpstreams(ip string) []upstream.Upstream {
return nil
}
- if c.upstreamObjects == nil {
- c.upstreamObjects = make([]upstream.Upstream, 0)
- for _, us := range c.Upstreams {
- u, err := upstream.AddressToUpstream(us, upstream.Options{Timeout: dnsforward.DefaultTimeout})
- if err != nil {
- log.Error("upstream.AddressToUpstream: %s: %s", us, err)
- continue
- }
- c.upstreamObjects = append(c.upstreamObjects, u)
+ if len(c.Upstreams) == 0 {
+ return nil
+ }
+
+ if c.upstreamConfig == nil {
+ config, err := proxy.ParseUpstreamsConfig(c.Upstreams, config.DNS.BootstrapDNS, dnsforward.DefaultTimeout)
+ if err == nil {
+ c.upstreamConfig = &config
}
}
- if len(c.upstreamObjects) == 0 {
- return nil
- }
- return upstreamArrayCopy(c.upstreamObjects)
+ return c.upstreamConfig
}
// Find searches for a client by IP (and does not lock anything)
@@ -540,7 +532,7 @@ func (clients *clientsContainer) Update(name string, c Client) error {
}
// update upstreams cache
- c.upstreamObjects = nil
+ c.upstreamConfig = nil
*old = c
return nil
diff --git a/home/clients_test.go b/home/clients_test.go
index 50b96121..9f6131ca 100644
--- a/home/clients_test.go
+++ b/home/clients_test.go
@@ -236,3 +236,31 @@ func TestClientsAddExisting(t *testing.T) {
assert.True(t, ok)
assert.Nil(t, err)
}
+
+func TestClientsCustomUpstream(t *testing.T) {
+ clients := clientsContainer{}
+ clients.testing = true
+
+ clients.Init(nil, nil, nil)
+
+ // add client with upstreams
+ client := Client{
+ IDs: []string{"1.1.1.1", "1:2:3::4", "aa:aa:aa:aa:aa:aa"},
+ Name: "client1",
+ Upstreams: []string{
+ "1.1.1.1",
+ "[/example.org/]8.8.8.8",
+ },
+ }
+ ok, err := clients.Add(client)
+ assert.Nil(t, err)
+ assert.True(t, ok)
+
+ config := clients.FindUpstreams("1.2.3.4")
+ assert.Nil(t, config)
+
+ config = clients.FindUpstreams("1.1.1.1")
+ assert.NotNil(t, config)
+ assert.Equal(t, 1, len(config.Upstreams))
+ assert.Equal(t, 1, len(config.DomainReservedUpstreams))
+}
diff --git a/home/config.go b/home/config.go
index a8b5f31e..92862945 100644
--- a/home/config.go
+++ b/home/config.go
@@ -78,10 +78,11 @@ type dnsConfig struct {
// time interval for statistics (in days)
StatsInterval uint32 `yaml:"statistics_interval"`
- QueryLogEnabled bool `yaml:"querylog_enabled"` // if true, query log is enabled
- QueryLogInterval uint32 `yaml:"querylog_interval"` // time interval for query log (in days)
- QueryLogMemSize uint32 `yaml:"querylog_size_memory"` // number of entries kept in memory before they are flushed to disk
- AnonymizeClientIP bool `yaml:"anonymize_client_ip"` // anonymize clients' IP addresses in logs and stats
+ QueryLogEnabled bool `yaml:"querylog_enabled"` // if true, query log is enabled
+ QueryLogFileEnabled bool `yaml:"querylog_file_enabled"` // if true, query log will be written to a file
+ QueryLogInterval uint32 `yaml:"querylog_interval"` // time interval for query log (in days)
+ QueryLogMemSize uint32 `yaml:"querylog_size_memory"` // number of entries kept in memory before they are flushed to disk
+ AnonymizeClientIP bool `yaml:"anonymize_client_ip"` // anonymize clients' IP addresses in logs and stats
dnsforward.FilteringConfig `yaml:",inline"`
@@ -134,6 +135,7 @@ func initConfig() {
config.WebSessionTTLHours = 30 * 24
config.DNS.QueryLogEnabled = true
+ config.DNS.QueryLogFileEnabled = true
config.DNS.QueryLogInterval = 90
config.DNS.QueryLogMemSize = 1000
@@ -235,9 +237,10 @@ func (c *configuration) write() error {
}
if Context.queryLog != nil {
- dc := querylog.DiskConfig{}
+ dc := querylog.Config{}
Context.queryLog.WriteDiskConfig(&dc)
config.DNS.QueryLogEnabled = dc.Enabled
+ config.DNS.QueryLogFileEnabled = dc.FileEnabled
config.DNS.QueryLogInterval = dc.Interval
config.DNS.QueryLogMemSize = dc.MemSize
config.DNS.AnonymizeClientIP = dc.AnonymizeClientIP
diff --git a/home/control.go b/home/control.go
index 3cedcd87..e8b2fa8a 100644
--- a/home/control.go
+++ b/home/control.go
@@ -189,7 +189,7 @@ func postInstall(handler func(http.ResponseWriter, *http.Request)) func(http.Res
if Context.firstRun &&
!strings.HasPrefix(r.URL.Path, "/install.") &&
- r.URL.Path != "/favicon.png" {
+ !strings.HasPrefix(r.URL.Path, "/assets/") {
http.Redirect(w, r, "/install.html", http.StatusFound)
return
}
diff --git a/home/dns.go b/home/dns.go
index b03d0de3..db05f99a 100644
--- a/home/dns.go
+++ b/home/dns.go
@@ -11,7 +11,6 @@ import (
"github.com/AdguardTeam/AdGuardHome/stats"
"github.com/AdguardTeam/AdGuardHome/util"
"github.com/AdguardTeam/dnsproxy/proxy"
- "github.com/AdguardTeam/dnsproxy/upstream"
"github.com/AdguardTeam/golibs/log"
"github.com/joomcode/errorx"
)
@@ -41,6 +40,7 @@ func initDNSServer() error {
}
conf := querylog.Config{
Enabled: config.DNS.QueryLogEnabled,
+ FileEnabled: config.DNS.QueryLogFileEnabled,
BaseDir: baseDir,
Interval: config.DNS.QueryLogInterval,
MemSize: config.DNS.QueryLogMemSize,
@@ -176,7 +176,7 @@ func generateServerConfig() dnsforward.ServerConfig {
newconfig.TLSAllowUnencryptedDOH = tlsConf.AllowUnencryptedDOH
newconfig.FilterHandler = applyAdditionalFiltering
- newconfig.GetUpstreamsByClient = getUpstreamsByClient
+ newconfig.GetCustomUpstreamByClient = Context.clients.FindUpstreams
return newconfig
}
@@ -222,10 +222,6 @@ func getDNSAddresses() []string {
return dnsAddresses
}
-func getUpstreamsByClient(clientAddr string) []upstream.Upstream {
- return Context.clients.FindUpstreams(clientAddr)
-}
-
// If a client has his own settings, apply them
func applyAdditionalFiltering(clientAddr string, setts *dnsfilter.RequestFilteringSettings) {
Context.dnsFilter.ApplyBlockedServices(setts, nil, true)
diff --git a/home/filter.go b/home/filter.go
index ca5e4add..c4c9273e 100644
--- a/home/filter.go
+++ b/home/filter.go
@@ -461,26 +461,29 @@ func (f *Filtering) parseFilterContents(file io.Reader) (int, uint32, string) {
for {
line, err := r.ReadString('\n')
- if err != nil {
- break
- }
-
checksum = crc32.Update(checksum, crc32.IEEETable, []byte(line))
line = strings.TrimSpace(line)
if len(line) == 0 {
- continue
- }
+ //
- if line[0] == '!' {
+ } else if line[0] == '!' {
m := f.filterTitleRegexp.FindAllStringSubmatch(line, -1)
if len(m) > 0 && len(m[0]) >= 2 && !seenTitle {
name = m[0][1]
seenTitle = true
}
+
+ } else if line[0] == '#' {
+ //
+
} else {
rulesCount++
}
+
+ if err != nil {
+ break
+ }
}
return rulesCount, checksum, name
@@ -595,7 +598,7 @@ func (f *Filtering) updateIntl(filter *filter) (bool, error) {
log.Printf("Filter %d has been updated: %d bytes, %d rules",
filter.ID, total, rulesCount)
- if filterName != "" {
+ if len(filter.Name) == 0 {
filter.Name = filterName
}
filter.RulesCount = rulesCount
diff --git a/home/filter_test.go b/home/filter_test.go
index e4f10f1f..317741d8 100644
--- a/home/filter_test.go
+++ b/home/filter_test.go
@@ -14,6 +14,7 @@ import (
func testStartFilterListener() net.Listener {
http.HandleFunc("/filters/1.txt", func(w http.ResponseWriter, r *http.Request) {
content := `||example.org^$third-party
+# Inline comment example
||example.com^$third-party
0.0.0.0 example.com
`
diff --git a/home/home.go b/home/home.go
index a0e2ea1b..2f069359 100644
--- a/home/home.go
+++ b/home/home.go
@@ -208,6 +208,11 @@ func run(args options) {
}
}
+ // 'clients' module uses 'dnsfilter' module's static data (dnsfilter.BlockedSvcKnown()),
+ // so we have to initialize dnsfilter's static data first,
+ // but also avoid relying on automatic Go init() function
+ dnsfilter.InitModule()
+
config.DHCP.WorkDir = Context.workDir
config.DHCP.HTTPRegister = httpRegister
config.DHCP.ConfigModified = onConfigModified
@@ -335,6 +340,8 @@ func requireAdminRights() {
admin, _ := util.HaveAdminRights()
if //noinspection ALL
admin || isdelve.Enabled {
+ // Don't forget that for this to work you need to add "delve" tag explicitly
+ // https://stackoverflow.com/questions/47879070/how-can-i-see-if-the-goland-debugger-is-running-in-the-program
return
}
@@ -589,28 +596,34 @@ func printHTTPAddresses(proto string) {
if Context.tls != nil {
Context.tls.WriteDiskConfig(&tlsConf)
}
+
+ port := strconv.Itoa(config.BindPort)
+ if proto == "https" {
+ port = strconv.Itoa(tlsConf.PortHTTPS)
+ }
+
if proto == "https" && tlsConf.ServerName != "" {
if tlsConf.PortHTTPS == 443 {
log.Printf("Go to https://%s", tlsConf.ServerName)
} else {
- log.Printf("Go to https://%s:%d", tlsConf.ServerName, tlsConf.PortHTTPS)
+ log.Printf("Go to https://%s:%s", tlsConf.ServerName, port)
}
} else if config.BindHost == "0.0.0.0" {
log.Println("AdGuard Home is available on the following addresses:")
ifaces, err := util.GetValidNetInterfacesForWeb()
if err != nil {
// That's weird, but we'll ignore it
- address = net.JoinHostPort(config.BindHost, strconv.Itoa(config.BindPort))
+ address = net.JoinHostPort(config.BindHost, port)
log.Printf("Go to %s://%s", proto, address)
return
}
for _, iface := range ifaces {
- address = net.JoinHostPort(iface.Addresses[0], strconv.Itoa(config.BindPort))
+ address = net.JoinHostPort(iface.Addresses[0], port)
log.Printf("Go to %s://%s", proto, address)
}
} else {
- address = net.JoinHostPort(config.BindHost, strconv.Itoa(config.BindPort))
+ address = net.JoinHostPort(config.BindHost, port)
log.Printf("Go to %s://%s", proto, address)
}
}
diff --git a/home/tls.go b/home/tls.go
index 5977f859..157cda2a 100644
--- a/home/tls.go
+++ b/home/tls.go
@@ -39,7 +39,14 @@ func tlsCreate(conf tlsConfigSettings) *TLSMod {
t.conf = conf
if t.conf.Enabled {
if !t.load() {
- return nil
+ // Something is not valid - return an empty TLS config
+ return &TLSMod{conf: tlsConfigSettings{
+ Enabled: conf.Enabled,
+ ServerName: conf.ServerName,
+ PortHTTPS: conf.PortHTTPS,
+ PortDNSOverTLS: conf.PortDNSOverTLS,
+ AllowUnencryptedDOH: conf.AllowUnencryptedDOH,
+ }}
}
t.setCertFileTime()
}
@@ -48,13 +55,14 @@ func tlsCreate(conf tlsConfigSettings) *TLSMod {
func (t *TLSMod) load() bool {
if !tlsLoadConfig(&t.conf, &t.status) {
+ log.Error("failed to load TLS config: %s", t.status.WarningValidation)
return false
}
// validate current TLS config and update warnings (it could have been loaded from file)
data := validateCertificates(string(t.conf.CertificateChainData), string(t.conf.PrivateKeyData), t.conf.ServerName)
if !data.ValidPair {
- log.Error(data.WarningValidation)
+ log.Error("failed to validate certificate: %s", data.WarningValidation)
return false
}
t.status = data
@@ -191,7 +199,7 @@ type tlsConfig struct {
tlsConfigStatus `json:",inline"`
}
-func (t *TLSMod) handleTLSStatus(w http.ResponseWriter, r *http.Request) {
+func (t *TLSMod) handleTLSStatus(w http.ResponseWriter, _ *http.Request) {
t.confLock.Lock()
data := tlsConfig{
tlsConfigSettings: t.conf,
diff --git a/home/web.go b/home/web.go
index c2145caa..0d9881c2 100644
--- a/home/web.go
+++ b/home/web.go
@@ -3,6 +3,7 @@ package home
import (
"context"
"crypto/tls"
+ golog "log"
"net"
"net/http"
"strconv"
@@ -38,6 +39,17 @@ type Web struct {
portHTTPS int
httpServer *http.Server // HTTP module
httpsServer HTTPSServer // HTTPS module
+ errLogger *golog.Logger
+}
+
+// Proxy between Go's "log" and "golibs/log"
+type logWriter struct {
+}
+
+// HTTP server calls this function to log an error
+func (w *logWriter) Write(p []byte) (int, error) {
+ log.Debug("Web: %s", string(p))
+ return 0, nil
}
// CreateWeb - create module
@@ -47,6 +59,9 @@ func CreateWeb(conf *WebConfig) *Web {
w := Web{}
w.conf = conf
+ lw := logWriter{}
+ w.errLogger = golog.New(&lw, "", 0)
+
// Initialize and run the admin Web interface
box := packr.NewBox("../build/static")
@@ -115,7 +130,7 @@ func (web *Web) TLSConfigChanged(tlsConf tlsConfigSettings) {
// Start - start serving HTTP requests
func (web *Web) Start() {
// for https, we have a separate goroutine loop
- go web.httpServerLoop()
+ go web.tlsServerLoop()
// this loop is used as an ability to change listening host and/or port
for !web.httpsServer.shutdown {
@@ -124,7 +139,8 @@ func (web *Web) Start() {
// we need to have new instance, because after Shutdown() the Server is not usable
address := net.JoinHostPort(web.conf.BindHost, strconv.Itoa(web.conf.BindPort))
web.httpServer = &http.Server{
- Addr: address,
+ ErrorLog: web.errLogger,
+ Addr: address,
}
err := web.httpServer.ListenAndServe()
if err != http.ErrServerClosed {
@@ -151,7 +167,7 @@ func (web *Web) Close() {
log.Info("Stopped HTTP server")
}
-func (web *Web) httpServerLoop() {
+func (web *Web) tlsServerLoop() {
for {
web.httpsServer.cond.L.Lock()
if web.httpsServer.shutdown {
@@ -173,7 +189,8 @@ func (web *Web) httpServerLoop() {
// prepare HTTPS server
address := net.JoinHostPort(web.conf.BindHost, strconv.Itoa(web.conf.PortHTTPS))
web.httpsServer.server = &http.Server{
- Addr: address,
+ ErrorLog: web.errLogger,
+ Addr: address,
TLSConfig: &tls.Config{
Certificates: []tls.Certificate{web.httpsServer.cert},
MinVersion: tls.VersionTLS12,
diff --git a/home/whois.go b/home/whois.go
index 321b4ef2..a0d22bbb 100644
--- a/home/whois.go
+++ b/home/whois.go
@@ -1,6 +1,7 @@
package home
import (
+ "context"
"encoding/binary"
"fmt"
"io/ioutil"
@@ -120,7 +121,7 @@ func (w *Whois) query(target string, serverAddr string) (string, error) {
if addr == "whois.arin.net" {
target = "n + " + target
}
- conn, err := net.DialTimeout("tcp", serverAddr, time.Duration(w.timeoutMsec)*time.Millisecond)
+ conn, err := customDialContext(context.TODO(), "tcp", serverAddr)
if err != nil {
return "", err
}
diff --git a/home/whois_test.go b/home/whois_test.go
index 1c77b056..75af9f14 100644
--- a/home/whois_test.go
+++ b/home/whois_test.go
@@ -2,11 +2,29 @@ package home
import (
"testing"
+ "time"
+ "github.com/AdguardTeam/AdGuardHome/dnsforward"
+ "github.com/AdguardTeam/dnsproxy/proxy"
"github.com/stretchr/testify/assert"
)
+func prepareTestDNSServer() error {
+ config.DNS.Port = 1234
+ Context.dnsServer = dnsforward.NewServer(nil, nil, nil)
+ conf := &dnsforward.ServerConfig{}
+ uc, err := proxy.ParseUpstreamsConfig([]string{"1.1.1.1"}, nil, time.Second*5)
+ if err != nil {
+ return err
+ }
+ conf.UpstreamConfig = &uc
+ return Context.dnsServer.Prepare(conf)
+}
+
func TestWhois(t *testing.T) {
+ err := prepareTestDNSServer()
+ assert.Nil(t, err)
+
w := Whois{timeoutMsec: 5000}
resp, err := w.queryAll("8.8.8.8")
assert.True(t, err == nil)
diff --git a/main.go b/main.go
index 36946082..449e3834 100644
--- a/main.go
+++ b/main.go
@@ -1,7 +1,9 @@
package main
import (
+ "os"
"runtime/debug"
+ "time"
"github.com/AdguardTeam/AdGuardHome/home"
)
@@ -16,6 +18,32 @@ var channel = "release"
var goarm = ""
func main() {
- debug.SetGCPercent(10)
+ memoryUsage()
+
home.Main(version, channel, goarm)
}
+
+// memoryUsage implements a couple of not really beautiful hacks which purpose is to
+// make OS reclaim the memory freed by AdGuard Home as soon as possible.
+func memoryUsage() {
+ debug.SetGCPercent(10)
+
+ // madvdontneed: setting madvdontneed=1 will use MADV_DONTNEED
+ // instead of MADV_FREE on Linux when returning memory to the
+ // kernel. This is less efficient, but causes RSS numbers to drop
+ // more quickly.
+ _ = os.Setenv("GODEBUG", "madvdontneed=1")
+
+ // periodically call "debug.FreeOSMemory" so
+ // that the OS could reclaim the free memory
+ go func() {
+ ticker := time.NewTicker(15 * time.Second)
+ for {
+ select {
+ case t := <-ticker.C:
+ t.Second()
+ debug.FreeOSMemory()
+ }
+ }
+ }()
+}
diff --git a/openapi/CHANGELOG.md b/openapi/CHANGELOG.md
index 193b69fc..0638dddf 100644
--- a/openapi/CHANGELOG.md
+++ b/openapi/CHANGELOG.md
@@ -1,5 +1,12 @@
# AdGuard Home API Change Log
+## v0.103: API changes
+
+### API: Get querylog: GET /control/querylog
+
+* Added optional "offset" and "limit" parameters
+
+We are still using "older_than" approach in AdGuard Home UI, but we realize that it's easier to use offset/limit so here is this option now.
## v0.102: API changes
diff --git a/openapi/README.md b/openapi/README.md
index 48dacd1e..0c50be5c 100644
--- a/openapi/README.md
+++ b/openapi/README.md
@@ -12,6 +12,9 @@ The easiest way would be to use [Swagger Editor](http://editor.swagger.io/) and
2. `yarn start`
3. Open `http://localhost:4000/`
+### Changelog
+
+[Here](CHANGELOG.md) we keep track of all non-compatible changes that are being made.
### Authentication
diff --git a/openapi/index.html b/openapi/index.html
index e02e40e5..c78aa81c 100644
--- a/openapi/index.html
+++ b/openapi/index.html
@@ -1,60 +1,24 @@
-
-
+
-
AdGuard Home API
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
\ No newline at end of file
diff --git a/openapi/index.js b/openapi/index.js
deleted file mode 100644
index a63d206c..00000000
--- a/openapi/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-const express = require('express')
-
-const app = express()
-
-app.use(express.static(__dirname))
-
-console.log('Open http://localhost:4000/ to examine the API spec')
-app.listen(4000)
diff --git a/openapi/openapi.yaml b/openapi/openapi.yaml
index bad7c601..304c8dc5 100644
--- a/openapi/openapi.yaml
+++ b/openapi/openapi.yaml
@@ -1,1016 +1,912 @@
-swagger: '2.0'
+openapi: 3.0.3
info:
- title: 'AdGuard Home'
- description: 'AdGuard Home REST API. Admin web interface is built on top of this REST API.'
- version: '0.102'
-schemes:
- - http
-basePath: /control
-produces:
- - application/json
+ title: AdGuard Home
+ description: AdGuard Home REST API. Admin web interface is built on top of this REST API.
+ version: "0.102"
+ contact:
+ name: "AdGuard Home"
+ url: "https://github.com/AdguardTeam/AdGuardHome"
+
+servers:
+ - url: /control
+
tags:
- -
- name: global
- description: 'AdGuard Home server general settings and controls'
- -
- name: tls
- description: 'AdGuard Home HTTPS/DOH/DOT settings'
- -
- name: log
- description: 'AdGuard Home query log'
- -
- name: stats
- description: 'AdGuard Home statistics'
- -
- name: i18n
- description: 'Application localization'
- -
- name: filtering
- description: 'Rule-based filtering'
- -
- name: safebrowsing
- description: 'Blocking malware/phishing sites'
- -
- name: parental
- description: 'Blocking adult and explicit materials'
- -
- name: safesearch
- description: 'Enforce family-friendly results in search engines'
- -
- name: dhcp
- description: 'Built-in DHCP server controls'
- -
- name: clients
- description: 'Clients list operations'
- -
- name: install
- description: 'First-time install configuration handlers'
+ - name: clients
+ description: Clients list operations
+ - name: dhcp
+ description: Built-in DHCP server controls
+ - name: filtering
+ description: Rule-based filtering
+ - name: global
+ description: AdGuard Home server general settings and controls
+ - name: i18n
+ description: Application localization
+ - name: install
+ description: First-time install configuration handlers
+ - name: log
+ description: AdGuard Home query log
+ - name: parental
+ description: Blocking adult and explicit materials
+ - name: safebrowsing
+ description: Blocking malware/phishing sites
+ - name: safesearch
+ description: Enforce family-friendly results in search engines
+ - name: stats
+ description: AdGuard Home statistics
+ - name: tls
+ description: AdGuard Home HTTPS/DOH/DOT settings
+
paths:
-
- # API TO-DO LIST
- # TODO: Use JSON where it is possible
- # TODO: Use lower_case for all objects' properties
- # TODO: Move to definitions what's missing from there
-
- # --------------------------------------------------
- # General settings and controls
- # --------------------------------------------------
-
/status:
get:
tags:
- global
operationId: status
- summary: 'Get DNS server current status and general settings'
- produces:
- - application/json
+ summary: Get DNS server current status and general settings
responses:
- 200:
+ "200":
description: OK
- schema:
- $ref: "#/definitions/ServerStatus"
-
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/ServerStatus"
/dns_info:
get:
tags:
- global
operationId: dnsInfo
- summary: 'Get general DNS parameters'
+ summary: Get general DNS parameters
responses:
- 200:
+ "200":
description: OK
- schema:
- $ref: "#/definitions/DNSConfig"
-
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/DNSConfig"
/dns_config:
post:
tags:
- global
operationId: dnsConfig
- summary: "Set general DNS parameters"
- consumes:
- - application/json
- parameters:
- - in: "body"
- name: "body"
- schema:
- $ref: "#/definitions/DNSConfig"
+ summary: Set general DNS parameters
+ requestBody:
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/DNSConfig"
responses:
- 200:
+ "200":
description: OK
-
/test_upstream_dns:
post:
tags:
- global
operationId: testUpstreamDNS
- summary: "Test upstream configuration"
- consumes:
- - application/json
- parameters:
- - in: "body"
- name: "body"
- description: "Upstream configuration to be tested"
- schema:
- $ref: "#/definitions/UpstreamsConfig"
+ summary: Test upstream configuration
+ requestBody:
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/UpstreamsConfig"
+ description: Upstream configuration to be tested
responses:
- 200:
- description: 'Status of testing each requested server, with "OK" meaning that server works, any other text means an error.'
- examples:
+ "200":
+ description: Status of testing each requested server, with "OK" meaning that
+ server works, any other text means an error.
+ content:
application/json:
- 1.1.1.1: OK
- 1.0.0.1: OK
- 8.8.8.8: OK
- 8.8.4.4: OK
- "192.168.1.104:53535": "Couldn't communicate with DNS server"
-
+ examples:
+ response:
+ value:
+ 1.1.1.1: OK
+ 1.0.0.1: OK
+ 8.8.8.8: OK
+ 8.8.4.4: OK
+ 192.168.1.104:53535: Couldn't communicate with DNS server
/version.json:
post:
tags:
- global
operationId: getVersionJson
- summary: 'Gets information about the latest available version of AdGuard'
- consumes:
- - application/json
- parameters:
- - in: "body"
- name: "body"
- required: true
- schema:
- $ref: "#/definitions/GetVersionRequest"
- produces:
- - 'application/json'
+ summary: Gets information about the latest available version of AdGuard
+ requestBody:
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/GetVersionRequest"
+ required: true
responses:
- 200:
- description: 'Version info. If response message is empty, UI does not show a version update message.'
- schema:
- $ref: "#/definitions/VersionInfo"
- 500:
- description: 'Cannot write answer'
- 502:
- description: 'Cannot retrieve the version.json file contents'
+ "200":
+ description: Version info. If response message is empty, UI does not show a
+ version update message.
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/VersionInfo"
+ "500":
+ description: Cannot write answer
+ "502":
+ description: Cannot retrieve the version.json file contents
/update:
post:
tags:
- global
operationId: beginUpdate
- summary: 'Begin auto-upgrade procedure'
+ summary: Begin auto-upgrade procedure
responses:
- 200:
+ "200":
description: OK
- 500:
+ "500":
description: Failed
-
- # --------------------------------------------------
- # Query log methods
- # --------------------------------------------------
-
/querylog:
get:
tags:
- log
operationId: queryLog
- summary: 'Get DNS server query log'
+ summary: Get DNS server query log.
parameters:
- name: older_than
in: query
- type: string
+ description: Filter by older than
+ schema:
+ type: string
+ - name: offset
+ in: query
+ description:
+ Specify the ranking number of the first item on the page.
+ Even though it is possible to use "offset" and "older_than",
+ we recommend choosing one of them and sticking to it.
+ schema:
+ type: integer
+ - name: limit
+ in: query
+ description: Limit the number of records to be returned
+ schema:
+ type: integer
- name: filter_domain
in: query
- type: string
- description: "Filter by domain name"
+ description: Filter by domain name
+ schema:
+ type: string
- name: filter_client
in: query
- type: string
- description: "Filter by client"
+ description: Filter by client
+ schema:
+ type: string
- name: filter_question_type
in: query
- type: string
- description: "Filter by question type"
+ description: Filter by question type
+ schema:
+ type: string
- name: filter_response_status
in: query
- type: string
- description: "Filter by response status"
- enum:
- -
- - filtered
+ description: Filter by response status
+ schema:
+ type: string
+ enum:
+ - null
+ - filtered
responses:
- 200:
+ "200":
description: OK
- schema:
- $ref: '#/definitions/QueryLog'
-
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/QueryLog"
/querylog_info:
get:
tags:
- log
operationId: queryLogInfo
- summary: 'Get query log parameters'
+ summary: Get query log parameters
responses:
- 200:
+ "200":
description: OK
- schema:
- $ref: "#/definitions/QueryLogConfig"
-
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/QueryLogConfig"
/querylog_config:
post:
tags:
- log
operationId: queryLogConfig
- summary: "Set query log parameters"
- consumes:
- - application/json
- parameters:
- - in: "body"
- name: "body"
- schema:
- $ref: "#/definitions/QueryLogConfig"
+ summary: Set query log parameters
+ requestBody:
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/QueryLogConfig"
responses:
- 200:
+ "200":
description: OK
-
/querylog_clear:
post:
tags:
- log
operationId: querylogClear
- summary: 'Clear query log'
+ summary: Clear query log
responses:
- 200:
+ "200":
description: OK
-
- # --------------------------------------------------
- # General statistics methods
- # --------------------------------------------------
-
/stats:
get:
tags:
- stats
operationId: stats
- summary: 'Get DNS server statistics'
+ summary: Get DNS server statistics
responses:
- 200:
- description: 'Returns statistics data'
- schema:
- $ref: "#/definitions/Stats"
-
+ "200":
+ description: Returns statistics data
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/Stats"
/stats_reset:
post:
tags:
- stats
operationId: statsReset
- summary: "Reset all statistics to zeroes"
+ summary: Reset all statistics to zeroes
responses:
- 200:
+ "200":
description: OK
-
/stats_info:
get:
tags:
- stats
operationId: statsInfo
- summary: 'Get statistics parameters'
+ summary: Get statistics parameters
responses:
- 200:
+ "200":
description: OK
- schema:
- $ref: "#/definitions/StatsConfig"
-
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/StatsConfig"
/stats_config:
post:
tags:
- stats
operationId: statsConfig
- summary: "Set statistics parameters"
- consumes:
- - application/json
- parameters:
- - in: "body"
- name: "body"
- schema:
- $ref: "#/definitions/StatsConfig"
+ summary: Set statistics parameters
+ requestBody:
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/StatsConfig"
responses:
- 200:
+ "200":
description: OK
-
- # --------------------------------------------------
- # TLS server methods
- # --------------------------------------------------
-
/tls/status:
get:
tags:
- tls
operationId: tlsStatus
- summary: "Returns TLS configuration and its status"
+ summary: Returns TLS configuration and its status
responses:
- 200:
+ "200":
description: OK
- schema:
- $ref: "#/definitions/TlsConfig"
-
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/TlsConfig"
/tls/configure:
post:
tags:
- tls
operationId: tlsConfigure
- summary: "Updates current TLS configuration"
- consumes:
- - application/json
- parameters:
- - in: "body"
- name: "body"
- description: "TLS configuration JSON"
- required: true
- schema:
- $ref: "#/definitions/TlsConfig"
+ summary: Updates current TLS configuration
+ requestBody:
+ $ref: "#/components/requestBodies/TlsConfig"
responses:
- 200:
- description: "TLS configuration and its status"
- schema:
- $ref: "#/definitions/TlsConfig"
- 400:
- description: "Invalid configuration or unavailable port"
- 500:
- description: "Error occurred while applying configuration"
-
+ "200":
+ description: TLS configuration and its status
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/TlsConfig"
+ "400":
+ description: Invalid configuration or unavailable port
+ "500":
+ description: Error occurred while applying configuration
/tls/validate:
post:
tags:
- tls
operationId: tlsValidate
- summary: "Checks if the current TLS configuration is valid"
- consumes:
- - application/json
- parameters:
- - in: "body"
- name: "body"
- description: "TLS configuration JSON"
- required: true
- schema:
- $ref: "#/definitions/TlsConfig"
+ summary: Checks if the current TLS configuration is valid
+ requestBody:
+ $ref: "#/components/requestBodies/TlsConfig"
responses:
- 200:
- description: "TLS configuration and its status"
- schema:
- $ref: "#/definitions/TlsConfig"
- 400:
- description: "Invalid configuration or unavailable port"
-
- # --------------------------------------------------
- # DHCP server methods
- # --------------------------------------------------
-
+ "200":
+ description: TLS configuration and its status
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/TlsConfig"
+ "400":
+ description: Invalid configuration or unavailable port
/dhcp/status:
get:
tags:
- dhcp
operationId: dhcpStatus
- summary: "Gets the current DHCP settings and status"
+ summary: Gets the current DHCP settings and status
responses:
- 200:
+ "200":
description: OK
- schema:
- $ref: "#/definitions/DhcpStatus"
-
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/DhcpStatus"
/dhcp/set_config:
post:
tags:
- dhcp
operationId: dhcpSetConfig
- summary: "Updates the current DHCP server configuration"
- consumes:
- - application/json
- parameters:
- - in: "body"
- name: "body"
- description: "DHCP configuration JSON"
- required: true
- schema:
- $ref: "#/definitions/DhcpConfig"
+ summary: Updates the current DHCP server configuration
+ requestBody:
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/DhcpConfig"
+ description: DHCP configuration JSON
+ required: true
responses:
- 200:
+ "200":
description: OK
-
/dhcp/find_active_dhcp:
- post:
- tags:
- - dhcp
- operationId: checkActiveDhcp
- summary: "Searches for an active DHCP server on the network"
- responses:
- 200:
- description: OK
- schema:
- $ref: "#/definitions/DhcpSearchResult"
-
+ post:
+ tags:
+ - dhcp
+ operationId: checkActiveDhcp
+ summary: Searches for an active DHCP server on the network
+ responses:
+ "200":
+ description: OK
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/DhcpSearchResult"
/dhcp/add_static_lease:
post:
tags:
- dhcp
operationId: dhcpAddStaticLease
- summary: "Adds a static lease"
- consumes:
- - application/json
- parameters:
- - in: "body"
- name: "body"
- required: true
- schema:
- $ref: "#/definitions/DhcpStaticLease"
+ summary: Adds a static lease
+ requestBody:
+ $ref: "#/components/requestBodies/DhcpStaticLease"
responses:
- 200:
+ "200":
description: OK
-
/dhcp/remove_static_lease:
post:
tags:
- dhcp
operationId: dhcpRemoveStaticLease
- summary: "Removes a static lease"
- consumes:
- - application/json
- parameters:
- - in: "body"
- name: "body"
- required: true
- schema:
- $ref: "#/definitions/DhcpStaticLease"
+ summary: Removes a static lease
+ requestBody:
+ $ref: "#/components/requestBodies/DhcpStaticLease"
responses:
- 200:
+ "200":
description: OK
-
/dhcp/reset:
post:
tags:
- dhcp
operationId: dhcpReset
- summary: "Reset DHCP configuration"
+ summary: Reset DHCP configuration
responses:
- 200:
+ "200":
description: OK
-
- # --------------------------------------------------
- # Filtering status methods
- # --------------------------------------------------
-
/filtering/status:
get:
tags:
- filtering
operationId: filteringStatus
- summary: 'Get filtering parameters'
+ summary: Get filtering parameters
responses:
- 200:
+ "200":
description: OK
- schema:
- $ref: "#/definitions/FilterStatus"
-
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/FilterStatus"
/filtering/config:
post:
tags:
- filtering
operationId: filteringConfig
- summary: 'Set filtering parameters'
- parameters:
- - in: "body"
- name: "body"
- required: true
- schema:
- $ref: "#/definitions/FilterConfig"
+ summary: Set filtering parameters
+ requestBody:
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/FilterConfig"
+ required: true
responses:
- 200:
+ "200":
description: OK
-
/filtering/add_url:
post:
tags:
- filtering
operationId: filteringAddURL
- summary: 'Add filter URL or an absolute file path'
- consumes:
- - application/json
- parameters:
- - in: "body"
- name: "body"
- required: true
- schema:
- $ref: "#/definitions/AddUrlRequest"
+ summary: Add filter URL or an absolute file path
+ requestBody:
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/AddUrlRequest"
+ required: true
responses:
- 200:
+ "200":
description: OK
-
/filtering/remove_url:
post:
tags:
- filtering
operationId: filteringRemoveURL
- summary: 'Remove filter URL'
- consumes:
- - application/json
- parameters:
- - in: "body"
- name: "body"
- required: true
- schema:
- $ref: "#/definitions/RemoveUrlRequest"
+ summary: Remove filter URL
+ requestBody:
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/RemoveUrlRequest"
+ required: true
responses:
- 200:
+ "200":
description: OK
-
/filtering/set_url:
post:
tags:
- filtering
operationId: filteringSetURL
- summary: 'Set URL parameters'
- consumes:
- - application/json
- parameters:
- - in: "body"
- name: "body"
- schema:
- $ref: "#/definitions/FilterSetUrl"
+ summary: Set URL parameters
+ requestBody:
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/FilterSetUrl"
responses:
- 200:
+ "200":
description: OK
-
/filtering/refresh:
post:
tags:
- filtering
operationId: filteringRefresh
- summary: |
+ summary: >
Reload filtering rules from URLs
+
This might be needed if new URL was just added and you dont want to wait for automatic refresh to kick in.
+
This API request is ratelimited, so you can call it freely as often as you like, it wont create unneccessary burden on servers that host the URL.
+
This should work as intended, a `force` parameter is offered as last-resort attempt to make filter lists fresh.
- If you ever find yourself using `force` to make something work that otherwise wont, this is a bug and report it accordingly.
- consumes:
- - application/json
- parameters:
- - in: "body"
- name: "body"
- schema:
- $ref: "#/definitions/FilterRefreshRequest"
- responses:
- 200:
- description: OK
- schema:
- $ref: "#/definitions/FilterRefreshResponse"
+ If you ever find yourself using `force` to make something work that otherwise wont, this is a bug and report it accordingly.
+ requestBody:
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/FilterRefreshRequest"
+ responses:
+ "200":
+ description: OK
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/FilterRefreshResponse"
/filtering/set_rules:
post:
tags:
- filtering
operationId: filteringSetRules
- summary: 'Set user-defined filter rules'
- consumes:
- - text/plain
- parameters:
- - in: body
- name: rules
- description: 'All filtering rules, one line per rule'
- schema:
- # TODO: move to definitions
- type: string
- example: '@@||yandex.ru^|'
+ summary: Set user-defined filter rules
+ requestBody:
+ content:
+ text/plain:
+ schema:
+ type: string
+ example: "@@||yandex.ru^|"
+ description: All filtering rules, one line per rule
responses:
- 200:
+ "200":
description: OK
-
/filtering/check_host:
get:
tags:
- filtering
operationId: filteringCheckHost
- summary: 'Check if host name is filtered'
+ summary: Check if host name is filtered
parameters:
- name: name
in: query
- type: string
+ description: Filter by host name
+ schema:
+ type: string
responses:
- 200:
+ "200":
description: OK
- schema:
- $ref: "#/definitions/FilterCheckHostResponse"
-
- # --------------------------------------------------
- # Safebrowsing methods
- # --------------------------------------------------
-
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/FilterCheckHostResponse"
/safebrowsing/enable:
post:
tags:
- safebrowsing
operationId: safebrowsingEnable
- summary: 'Enable safebrowsing'
+ summary: Enable safebrowsing
responses:
- 200:
+ "200":
description: OK
-
/safebrowsing/disable:
post:
tags:
- safebrowsing
operationId: safebrowsingDisable
- summary: 'Disable safebrowsing'
+ summary: Disable safebrowsing
responses:
- 200:
+ "200":
description: OK
-
/safebrowsing/status:
get:
tags:
- safebrowsing
operationId: safebrowsingStatus
- summary: 'Get safebrowsing status'
+ summary: Get safebrowsing status
responses:
- 200:
+ "200":
description: OK
- examples:
+ content:
application/json:
- enabled: false
-
- # --------------------------------------------------
- # Parental control methods
- # --------------------------------------------------
-
+ examples:
+ response:
+ value:
+ enabled: false
/parental/enable:
post:
tags:
- parental
operationId: parentalEnable
- summary: 'Enable parental filtering'
- consumes:
- - text/plain
- parameters:
- - in: body
- name: sensitivity
- description: |
- Age sensitivity for parental filtering,
- EARLY_CHILDHOOD is 3
- YOUNG is 10
- TEEN is 13
- MATURE is 17
-
- required: true
- schema:
- type: string
- enum:
- - EARLY_CHILDHOOD
- - YOUNG
- - TEEN
- - MATURE
- example: 'sensitivity=TEEN'
+ summary: Enable parental filtering
+ requestBody:
+ content:
+ text/plain:
+ schema:
+ type: string
+ enum:
+ - EARLY_CHILDHOOD
+ - YOUNG
+ - TEEN
+ - MATURE
+ example: sensitivity=TEEN
+ description: |
+ Age sensitivity for parental filtering,
+ EARLY_CHILDHOOD is 3
+ YOUNG is 10
+ TEEN is 13
+ MATURE is 17
+ required: true
responses:
- 200:
+ "200":
description: OK
-
/parental/disable:
post:
tags:
- parental
operationId: parentalDisable
- summary: 'Disable parental filtering'
+ summary: Disable parental filtering
responses:
- 200:
+ "200":
description: OK
-
/parental/status:
get:
tags:
- parental
operationId: parentalStatus
- summary: 'Get parental filtering status'
+ summary: Get parental filtering status
responses:
- 200:
+ "200":
description: OK
- examples:
+ content:
application/json:
- enabled: true
- sensitivity: 13
-
- # --------------------------------------------------
- # Safe search methods
- # --------------------------------------------------
-
+ examples:
+ response:
+ value:
+ enabled: true
+ sensitivity: 13
/safesearch/enable:
post:
tags:
- safesearch
operationId: safesearchEnable
- summary: 'Enable safesearch'
+ summary: Enable safesearch
responses:
- 200:
+ "200":
description: OK
-
/safesearch/disable:
post:
tags:
- safesearch
operationId: safesearchDisable
- summary: 'Disable safesearch'
+ summary: Disable safesearch
responses:
- 200:
+ "200":
description: OK
-
/safesearch/status:
get:
tags:
- safesearch
operationId: safesearchStatus
- summary: 'Get safesearch status'
+ summary: Get safesearch status
responses:
- 200:
+ "200":
description: OK
- examples:
+ content:
application/json:
- enabled: false
-
- # --------------------------------------------------
- # Clients list methods
- # --------------------------------------------------
-
+ examples:
+ response:
+ value:
+ enabled: false
/clients:
get:
tags:
- clients
operationId: clientsStatus
- summary: 'Get information about configured clients'
+ summary: Get information about configured clients
responses:
- 200:
+ "200":
description: OK
- schema:
- $ref: "#/definitions/Clients"
-
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/Clients"
/clients/add:
post:
tags:
- clients
operationId: clientsAdd
- summary: 'Add a new client'
- parameters:
- - in: "body"
- name: "body"
- required: true
- schema:
- $ref: "#/definitions/Client"
+ summary: Add a new client
+ requestBody:
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/Client"
+ required: true
responses:
- 200:
+ "200":
description: OK
-
/clients/delete:
post:
tags:
- clients
operationId: clientsDelete
- summary: 'Remove a client'
- parameters:
- - in: "body"
- name: "body"
- required: true
- schema:
- $ref: "#/definitions/ClientDelete"
+ summary: Remove a client
+ requestBody:
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/ClientDelete"
+ required: true
responses:
- 200:
+ "200":
description: OK
-
/clients/update:
post:
tags:
- clients
operationId: clientsUpdate
- summary: 'Update client information'
- parameters:
- - in: "body"
- name: "body"
- required: true
- schema:
- $ref: "#/definitions/ClientUpdate"
+ summary: Update client information
+ requestBody:
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/ClientUpdate"
+ required: true
responses:
- 200:
+ "200":
description: OK
-
/clients/find:
get:
tags:
- clients
operationId: clientsFind
- summary: 'Get information about selected clients by their IP address'
+ summary: Get information about selected clients by their IP address
parameters:
- name: ip0
in: query
- type: string
+ description: Filter by IP address
+ schema:
+ type: string
responses:
- 200:
+ "200":
description: OK
- schema:
- $ref: "#/definitions/ClientsFindResponse"
-
-
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/ClientsFindResponse"
/blocked_services/list:
get:
tags:
- blocked_services
operationId: blockedServicesList
- summary: 'Get blocked services list'
+ summary: Get blocked services list
responses:
- 200:
+ "200":
description: OK
- schema:
- $ref: "#/definitions/BlockedServicesArray"
-
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/BlockedServicesArray"
/blocked_services/set:
post:
tags:
- blocked_services
operationId: blockedServicesSet
- summary: 'Set blocked services list'
- parameters:
- - in: body
- name: "body"
- schema:
- $ref: "#/definitions/BlockedServicesArray"
+ summary: Set blocked services list
+ requestBody:
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/BlockedServicesArray"
responses:
- 200:
+ "200":
description: OK
-
-
- # --------------------------------------------------
- # Rewrite methods
- # --------------------------------------------------
-
/rewrite/list:
get:
tags:
- rewrite
operationId: rewriteList
- summary: 'Get list of Rewrite rules'
+ summary: Get list of Rewrite rules
responses:
- 200:
+ "200":
description: OK
- schema:
- $ref: "#/definitions/RewriteList"
-
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/RewriteList"
/rewrite/add:
post:
tags:
- rewrite
operationId: rewriteAdd
- summary: 'Add a new Rewrite rule'
- parameters:
- - in: "body"
- name: "body"
- required: true
- schema:
- $ref: "#/definitions/RewriteEntry"
+ summary: Add a new Rewrite rule
+ requestBody:
+ $ref: "#/components/requestBodies/RewriteEntry"
responses:
- 200:
+ "200":
description: OK
-
/rewrite/delete:
post:
tags:
- rewrite
operationId: rewriteDelete
- summary: 'Remove a Rewrite rule'
- parameters:
- - in: "body"
- name: "body"
- required: true
- schema:
- $ref: "#/definitions/RewriteEntry"
+ summary: Remove a Rewrite rule
+ requestBody:
+ $ref: "#/components/requestBodies/RewriteEntry"
responses:
- 200:
+ "200":
description: OK
-
- # --------------------------------------------------
- # I18N methods
- # --------------------------------------------------
-
/i18n/change_language:
post:
tags:
- i18n
operationId: changeLanguage
- summary: "Change current language. Argument must be an ISO 639-1 two-letter code"
- consumes:
- - text/plain
- parameters:
- - in: body
- name: language
- description: "New language. It must be known to the server and must be an ISO 639-1 two-letter code"
- schema:
- # TODO: use JSON?
- type: string
- example: en
+ summary: Change current language. Argument must be an ISO 639-1 two-letter code
+ requestBody:
+ content:
+ text/plain:
+ schema:
+ type: string
+ example: en
+ description: New language. It must be known to the server and must be an ISO 639-1
+ two-letter code
responses:
- 200:
+ "200":
description: OK
-
/i18n/current_language:
get:
tags:
- i18n
operationId: currentLanguage
- summary: "Get currently set language. Result is ISO 639-1 two-letter code. Empty result means default language."
+ summary: Get currently set language. Result is ISO 639-1 two-letter code. Empty
+ result means default language.
responses:
- 200:
+ "200":
description: OK
- examples:
+ content:
text/plain:
- en
-
- # --------------------------------------------------
- # First-time install configuration methods
- # --------------------------------------------------
-
+ examples:
+ response:
+ value: en
/install/get_addresses:
get:
tags:
- install
operationId: installGetAddresses
- summary: "Gets the network interfaces information."
+ summary: Gets the network interfaces information.
responses:
- 200:
+ "200":
description: OK
- schema:
- $ref: "#/definitions/AddressesInfo"
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/AddressesInfo"
/install/check_config:
post:
tags:
- install
operationId: installCheckConfig
- summary: "Checks configuration"
- parameters:
- - in: "body"
- name: "body"
- description: "Configuration to be checked"
- required: true
- schema:
- $ref: "#/definitions/CheckConfigRequest"
+ summary: Checks configuration
+ requestBody:
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/CheckConfigRequest"
+ description: Configuration to be checked
+ required: true
responses:
- 200:
+ "200":
description: OK
- schema:
- $ref: "#/definitions/CheckConfigResponse"
- 400:
- description: "Failed to parse JSON or cannot listen on the specified address"
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/CheckConfigResponse"
+ "400":
+ description: Failed to parse JSON or cannot listen on the specified address
/install/configure:
post:
tags:
- install
operationId: installConfigure
- summary: "Applies the initial configuration."
- parameters:
- - in: "body"
- name: "body"
- description: "Initial configuration JSON"
- required: true
- schema:
- $ref: "#/definitions/InitialConfiguration"
+ summary: Applies the initial configuration.
+ requestBody:
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/InitialConfiguration"
+ description: Initial configuration JSON
+ required: true
responses:
- 200:
+ "200":
description: OK
- 400:
- description: "Failed to parse initial configuration or cannot listen to the specified addresses"
- 500:
- description: "Cannot start the DNS server"
-
+ "400":
+ description: Failed to parse initial configuration or cannot listen to the
+ specified addresses
+ "500":
+ description: Cannot start the DNS server
/login:
post:
tags:
- global
operationId: login
- summary: "Perform administrator log-in"
- consumes:
- - application/json
- parameters:
- - in: "body"
- name: "body"
- required: true
- schema:
- $ref: "#/definitions/Login"
+ summary: Perform administrator log-in
+ requestBody:
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/Login"
+ required: true
responses:
- 200:
+ "200":
description: OK
-
/logout:
get:
tags:
- global
operationId: logout
- summary: "Perform administrator log-out"
+ summary: Perform administrator log-out
responses:
- 302:
+ "302":
description: OK
-
/profile:
get:
tags:
@@ -1018,914 +914,920 @@ paths:
operationId: getProfile
summary: ""
responses:
- 200:
+ "200":
description: OK
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/ProfileInfo"
+
+components:
+ requestBodies:
+ TlsConfig:
+ content:
+ application/json:
schema:
- $ref: "#/definitions/ProfileInfo"
-
-definitions:
- ServerStatus:
- type: "object"
- description: "AdGuard Home server status and configuration"
- required:
- - "dns_address"
- - "dns_port"
- - "protection_enabled"
- - "querylog_enabled"
- - "running"
- - "bootstrap_dns"
- - "upstream_dns"
- - "version"
- - "language"
- properties:
- dns_address:
- type: "string"
- example: "127.0.0.1"
- dns_port:
- type: "integer"
- format: "int32"
- example: 53
- minimum: 1
- maximum: 65535
- protection_enabled:
- type: "boolean"
- dhcp_available:
- type: "boolean"
- querylog_enabled:
- type: "boolean"
- running:
- type: "boolean"
- version:
- type: "string"
- example: "0.1"
- language:
- type: "string"
- example: "en"
-
- DNSConfig:
- type: "object"
- description: "Query log configuration"
- properties:
- bootstrap_dns:
- type: "array"
- description: 'Bootstrap servers, port is optional after colon. Empty value will reset it to default values'
- items:
- type: "string"
- example:
- - "8.8.8.8:53"
- - "1.1.1.1:53"
- upstream_dns:
- type: "array"
- description: 'Upstream servers, port is optional after colon. Empty value will reset it to default values'
- items:
- type: "string"
- example:
- - "tls://1.1.1.1"
- - "tls://1.0.0.1"
- protection_enabled:
- type: "boolean"
- ratelimit:
- type: "integer"
- blocking_mode:
- type: "string"
- enum:
- - "default"
- - "nxdomain"
- - "null_ip"
- - "custom_ip"
- blocking_ipv4:
- type: "string"
- blocking_ipv6:
- type: "string"
- edns_cs_enabled:
- type: "boolean"
- dnssec_enabled:
- type: "boolean"
- fastest_addr:
- type: "boolean"
- parallel_requests:
- type: "boolean"
- description: "If true, parallel queries to all configured upstream servers are enabled"
-
- UpstreamsConfig:
- type: "object"
- description: "Upstreams configuration"
- required:
- - "bootstrap_dns"
- - "upstream_dns"
- properties:
- bootstrap_dns:
- type: "array"
- description: 'Bootstrap servers, port is optional after colon. Empty value will reset it to default values'
- items:
- type: "string"
- example:
- - "8.8.8.8:53"
- - "1.1.1.1:53"
- upstream_dns:
- type: "array"
- description: 'Upstream servers, port is optional after colon. Empty value will reset it to default values'
- items:
- type: "string"
- example:
- - "tls://1.1.1.1"
- - "tls://1.0.0.1"
-
- Filter:
- type: "object"
- description: "Filter subscription info"
- required:
- - "enabled"
- - "id"
- - "lastUpdated"
- - "name"
- - "rulesCount"
- - "url"
- properties:
- enabled:
- type: "boolean"
- id:
- type: "integer"
- example: 1234
- lastUpdated:
- type: "string"
- format: "date-time"
- example: "2018-10-30T12:18:57+03:00"
- name:
- type: "string"
- example: "AdGuard Simplified Domain Names filter"
- rulesCount:
- type: "integer"
- example: 5912
- url:
- type: "string"
- example: "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt"
-
- FilterStatus:
- type: "object"
- description: "Filtering settings"
- properties:
- enabled:
- type: "boolean"
- interval:
- type: "integer"
- filters:
- type: "array"
- items:
- $ref: "#/definitions/Filter"
- user_rules:
- type: "array"
- items:
- type: "string"
-
- FilterConfig:
- type: "object"
- description: "Filtering settings"
- properties:
- enabled:
- type: "boolean"
- interval:
- type: "integer"
-
- FilterSetUrl:
- type: "object"
- description: "Filtering URL settings"
- properties:
- url:
- type: "string"
- enabled:
- type: "boolean"
-
- FilterRefreshRequest:
- type: "object"
- description: "Refresh Filters request data"
- properties:
- whitelist:
- type: "boolean"
-
- FilterCheckHostResponse:
- type: "object"
- description: "Check Host Result"
- properties:
- reason:
- type: "string"
- description: "DNS filter status"
- enum:
- - "NotFilteredNotFound"
- - "NotFilteredWhiteList"
- - "NotFilteredError"
- - "FilteredBlackList"
- - "FilteredSafeBrowsing"
- - "FilteredParental"
- - "FilteredInvalid"
- - "FilteredSafeSearch"
- - "FilteredBlockedService"
- - "ReasonRewrite"
- filter_id:
- type: "integer"
- rule:
- type: "string"
- example: "||example.org^"
- description: "Filtering rule applied to the request (if any)"
- service_name:
- type: "string"
- description: "Set if reason=FilteredBlockedService"
- cname:
- type: "string"
- description: "Set if reason=ReasonRewrite"
- ip_addrs:
- type: "array"
- items:
- type: "string"
- description: "Set if reason=ReasonRewrite"
-
- FilterRefreshResponse:
- type: "object"
- description: "/filtering/refresh response data"
- properties:
- updated:
- type: "integer"
-
- GetVersionRequest:
- type: "object"
- description: "/version.json request data"
- properties:
- recheck_now:
- description: "If false, server will check for a new version data only once in several hours"
- type: "boolean"
- VersionInfo:
- type: "object"
- description: "Information about the latest available version of AdGuard Home"
- properties:
- new_version:
- type: "string"
- example: "v0.9"
- announcement:
- type: "string"
- example: "AdGuard Home v0.9 is now available!"
- announcement_url:
- type: "string"
- example: "https://github.com/AdguardTeam/AdGuardHome/releases/tag/v0.9"
- can_autoupdate:
- type: "boolean"
- Stats:
- type: "object"
- description: "Server statistics data"
- properties:
- time_units:
- type: "string"
- description: "Time units (hours | days)"
- example: "hours"
- num_dns_queries:
- type: "integer"
- description: "Total number of DNS queries"
- example: 123
- num_blocked_filtering:
- type: "integer"
- description: "Number of requests blocked by filtering rules"
- example: 50
- num_replaced_safebrowsing:
- type: "integer"
- description: "Number of requests blocked by safebrowsing module"
- example: 5
- num_replaced_safesearch:
- type: "integer"
- description: "Number of requests blocked by safesearch module"
- example: 5
- num_replaced_parental:
- type: "integer"
- description: "Number of blocked adult websites"
- example: 15
- avg_processing_time:
- type: "number"
- format: "float"
- description: "Average time in milliseconds on processing a DNS"
- example: 0.34
- top_queried_domains:
- type: "array"
- items:
- type: "object"
- top_clients:
- type: "array"
- items:
- type: "object"
- top_blocked_domains:
- type: "array"
- items:
- type: "object"
- dns_queries:
- type: "array"
- items:
- type: "integer"
- blocked_filtering:
- type: "array"
- items:
- type: "integer"
- replaced_safebrowsing:
- type: "array"
- items:
- type: "integer"
- replaced_parental:
- type: "array"
- items:
- type: "integer"
-
- StatsConfig:
- type: "object"
- description: "Statistics configuration"
- properties:
- interval:
- type: "integer"
- description: "Time period to keep data (1 | 7 | 30 | 90)"
-
- DhcpConfig:
- type: "object"
- description: "Built-in DHCP server configuration"
- required:
- - "enabled"
- - "gateway_ip"
- - "subnet_mask"
- - "range_start"
- - "range_end"
- - "lease_duration"
- properties:
- enabled:
- type: "boolean"
- gateway_ip:
- type: "string"
- example: "192.168.1.1"
- subnet_mask:
- type: "string"
- example: "255.255.255.0"
- range_start:
- type: "string"
- example: "192.168.1.2"
- range_end:
- type: "string"
- example: "192.168.10.50"
- lease_duration:
- type: "string"
- example: "12h"
- DhcpLease:
- type: "object"
- description: "DHCP lease information"
- required:
- - "mac"
- - "ip"
- - "hostname"
- - "expires"
- properties:
- mac:
- type: "string"
- example: "00:11:09:b3:b3:b8"
- ip:
- type: "string"
- example: "192.168.1.22"
- hostname:
- type: "string"
- example: "dell"
- expires:
- type: "string"
- format: "date-time"
- example: "2017-07-21T17:32:28Z"
- DhcpStaticLease:
- type: "object"
- description: "DHCP static lease information"
- required:
- - "mac"
- - "ip"
- - "hostname"
- - "expires"
- properties:
- mac:
- type: "string"
- example: "00:11:09:b3:b3:b8"
- ip:
- type: "string"
- example: "192.168.1.22"
- hostname:
- type: "string"
- example: "dell"
- DhcpStatus:
- type: "object"
- description: "Built-in DHCP server configuration and status"
- required:
- - "config"
- - "leases"
- properties:
- config:
- $ref: "#/definitions/DhcpConfig"
- leases:
- type: "array"
- items:
- $ref: "#/definitions/DhcpLease"
- static_leases :
- type: "array"
- items:
- $ref: "#/definitions/DhcpStaticLease"
- DhcpSearchResult:
- type: "object"
- description: "Information about a DHCP server discovered in the current network"
- properties:
- other_server:
- $ref: "#/definitions/DhcpSearchResultOtherServer"
- static_ip:
- $ref: "#/definitions/DhcpSearchResultStaticIP"
- DhcpSearchResultOtherServer:
- type: "object"
- properties:
- found:
- type: "string"
- description: "yes|no|error"
- example: "no"
- error:
- type: "string"
- description: "Set if found=error"
- example: ""
- DhcpSearchResultStaticIP:
- type: "object"
- properties:
- static:
- type: "string"
- description: "yes|no|error"
- example: "yes"
- ip:
- type: "string"
- description: "Set if static=no"
- example: ""
- DnsAnswer:
- type: "object"
- description: "DNS answer section"
- properties:
- ttl:
- type: "integer"
- example: 55
- type:
- type: "string"
- example: "A"
- value:
- type: "string"
- example: "217.69.139.201"
- DnsQuestion:
- type: "object"
- description: "DNS question section"
- properties:
- class:
- type: "string"
- example: "IN"
- host:
- type: "string"
- example: "example.org"
- type:
- type: "string"
- example: "A"
- AddUrlRequest:
- type: "object"
- description: "/add_url request data"
- properties:
- name:
- type: "string"
- url:
- description: "URL or an absolute path to the file containing filtering rules"
- type: "string"
- example: "https://filters.adtidy.org/windows/filters/15.txt"
- RemoveUrlRequest:
- type: "object"
- description: "/remove_url request data"
- properties:
- url:
- description: "Previously added URL containing filtering rules"
- type: "string"
- example: "https://filters.adtidy.org/windows/filters/15.txt"
- QueryLogItem:
- type: "object"
- description: "Query log item"
- properties:
- answer:
- type: "array"
- items:
- $ref: "#/definitions/DnsAnswer"
- original_answer:
- type: "array"
- description: "Answer from upstream server (optional)"
- items:
- $ref: "#/definitions/DnsAnswer"
- answer_dnssec:
- type: "boolean"
- client:
- type: "string"
- example: "192.168.0.1"
- elapsedMs:
- type: "string"
- example: "54.023928"
- question:
- $ref: "#/definitions/DnsQuestion"
- filterId:
- type: "integer"
- example: 123123
- description: "In case if there's a rule applied to this DNS request, this is ID of the filter that rule belongs to."
- rule:
- type: "string"
- example: "||example.org^"
- description: "Filtering rule applied to the request (if any)"
- reason:
- type: "string"
- description: "DNS filter status"
- enum:
- - "NotFilteredNotFound"
- - "NotFilteredWhiteList"
- - "NotFilteredError"
- - "FilteredBlackList"
- - "FilteredSafeBrowsing"
- - "FilteredParental"
- - "FilteredInvalid"
- - "FilteredSafeSearch"
- - "FilteredBlockedService"
- - "ReasonRewrite"
- service_name:
- type: "string"
- description: "Set if reason=FilteredBlockedService"
- status:
- type: "string"
- description: "DNS response status"
- example: "NOERROR"
- time:
- type: "string"
- description: "DNS request processing start time"
- example: "2018-11-26T00:02:41+03:00"
-
- QueryLog:
- type: "object"
- description: "Query log"
- properties:
- oldest:
- type: "string"
- example: "2018-11-26T00:02:41+03:00"
- data:
- type: "array"
- items:
- $ref: "#/definitions/QueryLogItem"
-
- QueryLogConfig:
- type: "object"
- description: "Query log configuration"
- properties:
- enabled:
- type: "boolean"
- description: "Is query log enabled"
- interval:
- type: "integer"
- description: "Time period to keep data (1 | 7 | 30 | 90)"
- anonymize_client_ip:
- type: "boolean"
- description: "Anonymize clients' IP addresses"
-
- TlsConfig:
- type: "object"
- description: "TLS configuration settings and status"
- properties:
- # TLS configuration
- enabled:
- type: "boolean"
- example: "true"
- description: "enabled is the encryption (DOT/DOH/HTTPS) status"
- server_name:
- type: "string"
- example: "example.org"
- description: "server_name is the hostname of your HTTPS/TLS server"
- force_https:
- type: "boolean"
- example: "true"
- description: "if true, forces HTTP->HTTPS redirect"
- port_https:
- type: "integer"
- format: "int32"
- example: 443
- description: "HTTPS port. If 0, HTTPS will be disabled."
- port_dns_over_tls:
- type: "integer"
- format: "int32"
- example: 853
- description: "DNS-over-TLS port. If 0, DOT will be disabled."
- certificate_chain:
- type: "string"
- description: "Base64 string with PEM-encoded certificates chain"
- private_key:
- type: "string"
- description: "Base64 string with PEM-encoded private key"
- certificate_path:
- type: "string"
- description: "Path to certificate file"
- private_key_path:
- type: "string"
- description: "Path to private key file"
- # Below goes validation fields
- valid_cert:
- type: "boolean"
- example: "true"
- description: "valid_cert is true if the specified certificates chain is a valid chain of X509 certificates"
- valid_chain:
- type: "boolean"
- example: "true"
- description: "valid_chain is true if the specified certificates chain is verified and issued by a known CA"
- subject:
- type: "string"
- example: "CN=example.org"
- description: "subject is the subject of the first certificate in the chain"
- issuer:
- type: "string"
- example: "CN=Let's Encrypt Authority X3,O=Let's Encrypt,C=US"
- description: "issuer is the issuer of the first certificate in the chain"
- not_before:
- type: "string"
- example: "2019-01-31T10:47:32Z"
- description: "not_before is the NotBefore field of the first certificate in the chain"
- not_after:
- type: "string"
- example: "2019-05-01T10:47:32Z"
- description: "not_after is the NotAfter field of the first certificate in the chain"
- dns_names:
- type: "array"
- items:
- type: "string"
- description: "dns_names is the value of SubjectAltNames field of the first certificate in the chain"
- example:
- - "*.example.org"
- valid_key:
- type: "boolean"
- example: "true"
- description: "valid_key is true if the key is a valid private key"
- key_type:
- type: "string"
- example: "RSA"
- description: "key_type is either RSA or ECDSA"
- warning_validation:
- type: "string"
- example: "You have specified an empty certificate"
- description: "warning_validation is a validation warning message with the issue description"
- valid_pair:
- type: "boolean"
- example: "true"
- description: "valid_pair is true if both certificate and private key are correct"
- NetInterface:
- type: "object"
- description: "Network interface info"
- properties:
- flags:
- type: "string"
- example: "up|broadcast|multicast"
- hardware_address:
- type: "string"
- example: "52:54:00:11:09:ba"
- mtu:
- type: "integer"
- format: "int32"
- example: 1500
- name:
- type: "string"
- example: "eth0"
- ip_addresses:
- type: "array"
- items:
- type: "string"
- example:
- - "127.0.0.1"
- AddressInfo:
- type: "object"
- description: "Port information"
- properties:
- ip:
- type: "string"
- example: "127.0.0.1"
- port:
- type: "integer"
- format: "int32"
- example: 53
- AddressesInfo:
- type: "object"
- description: "AdGuard Home addresses configuration"
- properties:
- dns_port:
- type: "integer"
- format: "int32"
- example: 53
- web_port:
- type: "integer"
- format: "int32"
- example: 80
- interfaces:
- type: "object"
- description: "Network interfaces dictionary (key is the interface name)"
- additionalProperties:
- $ref: "#/definitions/NetInterface"
-
- ProfileInfo:
- type: "object"
- description: "Information about the current user"
- properties:
- name:
- type: "string"
-
- Client:
- type: "object"
- description: "Client information"
- properties:
- name:
- type: "string"
- description: "Name"
- example: "localhost"
- ids:
- type: "array"
- description: "IP, CIDR or MAC address"
- items:
- type: "string"
- use_global_settings:
- type: "boolean"
- filtering_enabled:
- type: "boolean"
- parental_enabled:
- type: "boolean"
- safebrowsing_enabled:
- type: "boolean"
- safesearch_enabled:
- type: "boolean"
- use_global_blocked_services:
- type: "boolean"
- blocked_services:
- type: "array"
- items:
- type: "string"
- upstreams:
- type: "array"
- items:
- type: "string"
- ClientAuto:
- type: "object"
- description: "Auto-Client information"
- properties:
- ip:
- type: "string"
- description: "IP address"
- example: "127.0.0.1"
- name:
- type: "string"
- description: "Name"
- example: "localhost"
- source:
- type: "string"
- description: "The source of this information"
- example: "etc/hosts"
- ClientUpdate:
- type: "object"
- description: "Client update request"
- properties:
- name:
- type: "string"
- data:
- $ref: "#/definitions/Client"
- ClientDelete:
- type: "object"
- description: "Client delete request"
- properties:
- name:
- type: "string"
-
- ClientsFindResponse:
- type: "array"
- description: "Response to clients find operation"
- items:
- $ref: "#/definitions/ClientsFindEntry"
-
- ClientsFindEntry:
- type: "object"
- properties:
- "1.2.3.4":
- items:
- $ref: "#/definitions/Client"
-
- Clients:
- type: "object"
- properties:
- clients:
- $ref: "#/definitions/ClientsArray"
- auto_clients:
- $ref: "#/definitions/ClientsAutoArray"
- ClientsArray:
- type: "array"
- items:
- $ref: "#/definitions/Client"
- description: "Clients array"
- ClientsAutoArray:
- type: "array"
- items:
- $ref: "#/definitions/ClientAuto"
- description: "Auto-Clients array"
-
- RewriteList:
- type: "array"
- items:
- $ref: "#/definitions/RewriteEntry"
- description: "Rewrite rules array"
- RewriteEntry:
- type: "object"
- description: "Rewrite rule"
- properties:
- domain:
- type: "string"
- description: "Domain name"
- example: "example.org"
- answer:
- type: "string"
- description: "value of A, AAAA or CNAME DNS record"
- example: "127.0.0.1"
-
- BlockedServicesArray:
- type: "array"
- items:
- type: "string"
-
- CheckConfigRequest:
- type: "object"
- description: "Configuration to be checked"
- properties:
- dns:
- $ref: "#/definitions/CheckConfigRequestInfo"
- web:
- $ref: "#/definitions/CheckConfigRequestInfo"
- set_static_ip:
- type: "boolean"
- example: false
- CheckConfigRequestInfo:
- type: "object"
- properties:
- ip:
- type: "string"
- example: "127.0.0.1"
- port:
- type: "integer"
- format: "int32"
- example: 53
- autofix:
- type: "boolean"
- example: false
- CheckConfigResponse:
- type: "object"
- properties:
- dns:
- $ref: "#/definitions/CheckConfigResponseInfo"
- web:
- $ref: "#/definitions/CheckConfigResponseInfo"
- static_ip:
- $ref: "#/definitions/CheckConfigStaticIpInfo"
- CheckConfigResponseInfo:
- type: "object"
- properties:
- status:
- type: "string"
- example: ""
- can_autofix:
- type: "boolean"
- example: false
- CheckConfigStaticIpInfo:
- type: "object"
- properties:
- static:
- type: "string"
- example: "no"
- description: "Can be: yes, no, error"
- ip:
- type: "string"
- example: "192.168.1.1"
- description: "Current dynamic IP address. Set if static=no"
- error:
- type: "string"
- example: ""
- description: "Error text. Set if static=error"
-
-
- InitialConfiguration:
- type: "object"
- description: "AdGuard Home initial configuration (for the first-install wizard)"
- properties:
- dns:
- $ref: "#/definitions/AddressInfo"
- web:
- $ref: "#/definitions/AddressInfo"
- username:
- type: "string"
- description: "Basic auth username"
- example: "admin"
- password:
- type: "string"
- description: "Basic auth password"
- example: "password"
- Login:
- type: "object"
- description: "Login request data"
- properties:
- username:
- type: "string"
- description: "User name"
- password:
- type: "string"
- description: "Password"
+ $ref: "#/components/schemas/TlsConfig"
+ description: TLS configuration JSON
+ required: true
+ DhcpStaticLease:
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/DhcpStaticLease"
+ required: true
+ RewriteEntry:
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/RewriteEntry"
+ required: true
+ schemas:
+ ServerStatus:
+ type: object
+ description: AdGuard Home server status and configuration
+ required:
+ - dns_address
+ - dns_port
+ - protection_enabled
+ - querylog_enabled
+ - running
+ - bootstrap_dns
+ - upstream_dns
+ - version
+ - language
+ properties:
+ dns_address:
+ type: string
+ example: 127.0.0.1
+ dns_port:
+ type: integer
+ format: int32
+ example: 53
+ minimum: 1
+ maximum: 65535
+ protection_enabled:
+ type: boolean
+ querylog_enabled:
+ type: boolean
+ running:
+ type: boolean
+ version:
+ type: string
+ example: "0.1"
+ language:
+ type: string
+ example: en
+ DNSConfig:
+ type: object
+ description: Query log configuration
+ properties:
+ bootstrap_dns:
+ type: array
+ description: Bootstrap servers, port is optional after colon. Empty value will
+ reset it to default values
+ items:
+ type: string
+ example:
+ - 8.8.8.8:53
+ - 1.1.1.1:53
+ upstream_dns:
+ type: array
+ description: Upstream servers, port is optional after colon. Empty value will
+ reset it to default values
+ items:
+ type: string
+ example:
+ - tls://1.1.1.1
+ - tls://1.0.0.1
+ protection_enabled:
+ type: boolean
+ ratelimit:
+ type: integer
+ blocking_mode:
+ type: string
+ enum:
+ - default
+ - nxdomain
+ - null_ip
+ - custom_ip
+ blocking_ipv4:
+ type: string
+ blocking_ipv6:
+ type: string
+ edns_cs_enabled:
+ type: boolean
+ dnssec_enabled:
+ type: boolean
+ fastest_addr:
+ type: boolean
+ parallel_requests:
+ type: boolean
+ description: If true, parallel queries to all configured upstream servers are
+ enabled
+ UpstreamsConfig:
+ type: object
+ description: Upstreams configuration
+ required:
+ - bootstrap_dns
+ - upstream_dns
+ properties:
+ bootstrap_dns:
+ type: array
+ description: Bootstrap servers, port is optional after colon. Empty value will
+ reset it to default values
+ items:
+ type: string
+ example:
+ - 8.8.8.8:53
+ - 1.1.1.1:53
+ upstream_dns:
+ type: array
+ description: Upstream servers, port is optional after colon. Empty value will
+ reset it to default values
+ items:
+ type: string
+ example:
+ - tls://1.1.1.1
+ - tls://1.0.0.1
+ Filter:
+ type: object
+ description: Filter subscription info
+ required:
+ - enabled
+ - id
+ - lastUpdated
+ - name
+ - rulesCount
+ - url
+ properties:
+ enabled:
+ type: boolean
+ id:
+ type: integer
+ example: 1234
+ lastUpdated:
+ type: string
+ format: date-time
+ example: 2018-10-30T12:18:57+03:00
+ name:
+ type: string
+ example: AdGuard Simplified Domain Names filter
+ rulesCount:
+ type: integer
+ example: 5912
+ url:
+ type: string
+ example: https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt
+ FilterStatus:
+ type: object
+ description: Filtering settings
+ properties:
+ enabled:
+ type: boolean
+ interval:
+ type: integer
+ filters:
+ type: array
+ items:
+ $ref: "#/components/schemas/Filter"
+ user_rules:
+ type: array
+ items:
+ type: string
+ FilterConfig:
+ type: object
+ description: Filtering settings
+ properties:
+ enabled:
+ type: boolean
+ interval:
+ type: integer
+ FilterSetUrl:
+ type: object
+ description: Filtering URL settings
+ properties:
+ url:
+ type: string
+ enabled:
+ type: boolean
+ FilterRefreshRequest:
+ type: object
+ description: Refresh Filters request data
+ properties:
+ whitelist:
+ type: boolean
+ FilterCheckHostResponse:
+ type: object
+ description: Check Host Result
+ properties:
+ reason:
+ type: string
+ description: DNS filter status
+ enum:
+ - NotFilteredNotFound
+ - NotFilteredWhiteList
+ - NotFilteredError
+ - FilteredBlackList
+ - FilteredSafeBrowsing
+ - FilteredParental
+ - FilteredInvalid
+ - FilteredSafeSearch
+ - FilteredBlockedService
+ - ReasonRewrite
+ filter_id:
+ type: integer
+ rule:
+ type: string
+ example: "||example.org^"
+ description: Filtering rule applied to the request (if any)
+ service_name:
+ type: string
+ description: Set if reason=FilteredBlockedService
+ cname:
+ type: string
+ description: Set if reason=ReasonRewrite
+ ip_addrs:
+ type: array
+ items:
+ type: string
+ description: Set if reason=ReasonRewrite
+ FilterRefreshResponse:
+ type: object
+ description: /filtering/refresh response data
+ properties:
+ updated:
+ type: integer
+ GetVersionRequest:
+ type: object
+ description: /version.json request data
+ properties:
+ recheck_now:
+ description: If false, server will check for a new version data only once in
+ several hours
+ type: boolean
+ VersionInfo:
+ type: object
+ description: Information about the latest available version of AdGuard Home
+ properties:
+ new_version:
+ type: string
+ example: v0.9
+ announcement:
+ type: string
+ example: AdGuard Home v0.9 is now available!
+ announcement_url:
+ type: string
+ example: https://github.com/AdguardTeam/AdGuardHome/releases/tag/v0.9
+ can_autoupdate:
+ type: boolean
+ Stats:
+ type: object
+ description: Server statistics data
+ properties:
+ time_units:
+ type: string
+ description: Time units (hours | days)
+ example: hours
+ num_dns_queries:
+ type: integer
+ description: Total number of DNS queries
+ example: 123
+ num_blocked_filtering:
+ type: integer
+ description: Number of requests blocked by filtering rules
+ example: 50
+ num_replaced_safebrowsing:
+ type: integer
+ description: Number of requests blocked by safebrowsing module
+ example: 5
+ num_replaced_safesearch:
+ type: integer
+ description: Number of requests blocked by safesearch module
+ example: 5
+ num_replaced_parental:
+ type: integer
+ description: Number of blocked adult websites
+ example: 15
+ avg_processing_time:
+ type: number
+ format: float
+ description: Average time in milliseconds on processing a DNS
+ example: 0.34
+ top_queried_domains:
+ type: array
+ items:
+ type: object
+ top_clients:
+ type: array
+ items:
+ type: object
+ top_blocked_domains:
+ type: array
+ items:
+ type: object
+ dns_queries:
+ type: array
+ items:
+ type: integer
+ blocked_filtering:
+ type: array
+ items:
+ type: integer
+ replaced_safebrowsing:
+ type: array
+ items:
+ type: integer
+ replaced_parental:
+ type: array
+ items:
+ type: integer
+ StatsConfig:
+ type: object
+ description: Statistics configuration
+ properties:
+ interval:
+ type: integer
+ description: Time period to keep data (1 | 7 | 30 | 90)
+ DhcpConfig:
+ type: object
+ description: Built-in DHCP server configuration
+ required:
+ - enabled
+ - gateway_ip
+ - subnet_mask
+ - range_start
+ - range_end
+ - lease_duration
+ properties:
+ enabled:
+ type: boolean
+ gateway_ip:
+ type: string
+ example: 192.168.1.1
+ subnet_mask:
+ type: string
+ example: 255.255.255.0
+ range_start:
+ type: string
+ example: 192.168.1.2
+ range_end:
+ type: string
+ example: 192.168.10.50
+ lease_duration:
+ type: string
+ example: 12h
+ DhcpLease:
+ type: object
+ description: DHCP lease information
+ required:
+ - mac
+ - ip
+ - hostname
+ - expires
+ properties:
+ mac:
+ type: string
+ example: 00:11:09:b3:b3:b8
+ ip:
+ type: string
+ example: 192.168.1.22
+ hostname:
+ type: string
+ example: dell
+ expires:
+ type: string
+ format: date-time
+ example: 2017-07-21T17:32:28Z
+ DhcpStaticLease:
+ type: object
+ description: DHCP static lease information
+ required:
+ - mac
+ - ip
+ - hostname
+ - expires
+ properties:
+ mac:
+ type: string
+ example: 00:11:09:b3:b3:b8
+ ip:
+ type: string
+ example: 192.168.1.22
+ hostname:
+ type: string
+ example: dell
+ DhcpStatus:
+ type: object
+ description: Built-in DHCP server configuration and status
+ required:
+ - config
+ - leases
+ properties:
+ config:
+ $ref: "#/components/schemas/DhcpConfig"
+ leases:
+ type: array
+ items:
+ $ref: "#/components/schemas/DhcpLease"
+ static_leases:
+ type: array
+ items:
+ $ref: "#/components/schemas/DhcpStaticLease"
+ DhcpSearchResult:
+ type: object
+ description: Information about a DHCP server discovered in the current network
+ properties:
+ other_server:
+ $ref: "#/components/schemas/DhcpSearchResultOtherServer"
+ static_ip:
+ $ref: "#/components/schemas/DhcpSearchResultStaticIP"
+ DhcpSearchResultOtherServer:
+ type: object
+ properties:
+ found:
+ type: string
+ description: yes|no|error
+ example: no
+ error:
+ type: string
+ description: Set if found=error
+ example: ""
+ DhcpSearchResultStaticIP:
+ type: object
+ properties:
+ static:
+ type: string
+ description: yes|no|error
+ example: yes
+ ip:
+ type: string
+ description: Set if static=no
+ example: ""
+ DnsAnswer:
+ type: object
+ description: DNS answer section
+ properties:
+ ttl:
+ type: integer
+ example: 55
+ type:
+ type: string
+ example: A
+ value:
+ type: string
+ example: 217.69.139.201
+ DnsQuestion:
+ type: object
+ description: DNS question section
+ properties:
+ class:
+ type: string
+ example: IN
+ host:
+ type: string
+ example: example.org
+ type:
+ type: string
+ example: A
+ AddUrlRequest:
+ type: object
+ description: /add_url request data
+ properties:
+ name:
+ type: string
+ url:
+ description: URL or an absolute path to the file containing filtering rules
+ type: string
+ example: https://filters.adtidy.org/windows/filters/15.txt
+ RemoveUrlRequest:
+ type: object
+ description: /remove_url request data
+ properties:
+ url:
+ description: Previously added URL containing filtering rules
+ type: string
+ example: https://filters.adtidy.org/windows/filters/15.txt
+ QueryLogItem:
+ type: object
+ description: Query log item
+ properties:
+ answer:
+ type: array
+ items:
+ $ref: "#/components/schemas/DnsAnswer"
+ original_answer:
+ type: array
+ description: Answer from upstream server (optional)
+ items:
+ $ref: "#/components/schemas/DnsAnswer"
+ answer_dnssec:
+ type: boolean
+ client:
+ type: string
+ example: 192.168.0.1
+ elapsedMs:
+ type: string
+ example: "54.023928"
+ question:
+ $ref: "#/components/schemas/DnsQuestion"
+ filterId:
+ type: integer
+ example: 123123
+ description: In case if there's a rule applied to this DNS request, this is ID of
+ the filter that rule belongs to.
+ rule:
+ type: string
+ example: "||example.org^"
+ description: Filtering rule applied to the request (if any)
+ reason:
+ type: string
+ description: DNS filter status
+ enum:
+ - NotFilteredNotFound
+ - NotFilteredWhiteList
+ - NotFilteredError
+ - FilteredBlackList
+ - FilteredSafeBrowsing
+ - FilteredParental
+ - FilteredInvalid
+ - FilteredSafeSearch
+ - FilteredBlockedService
+ - ReasonRewrite
+ service_name:
+ type: string
+ description: Set if reason=FilteredBlockedService
+ status:
+ type: string
+ description: DNS response status
+ example: NOERROR
+ time:
+ type: string
+ description: DNS request processing start time
+ example: 2018-11-26T00:02:41+03:00
+ QueryLog:
+ type: object
+ description: Query log
+ properties:
+ oldest:
+ type: string
+ example: 2018-11-26T00:02:41+03:00
+ data:
+ type: array
+ items:
+ $ref: "#/components/schemas/QueryLogItem"
+ QueryLogConfig:
+ type: object
+ description: Query log configuration
+ properties:
+ enabled:
+ type: boolean
+ description: Is query log enabled
+ interval:
+ type: integer
+ description: Time period to keep data (1 | 7 | 30 | 90)
+ anonymize_client_ip:
+ type: boolean
+ description: Anonymize clients' IP addresses
+ TlsConfig:
+ type: object
+ description: TLS configuration settings and status
+ properties:
+ enabled:
+ type: boolean
+ example: "true"
+ description: enabled is the encryption (DOT/DOH/HTTPS) status
+ server_name:
+ type: string
+ example: example.org
+ description: server_name is the hostname of your HTTPS/TLS server
+ force_https:
+ type: boolean
+ example: "true"
+ description: if true, forces HTTP->HTTPS redirect
+ port_https:
+ type: integer
+ format: int32
+ example: 443
+ description: HTTPS port. If 0, HTTPS will be disabled.
+ port_dns_over_tls:
+ type: integer
+ format: int32
+ example: 853
+ description: DNS-over-TLS port. If 0, DOT will be disabled.
+ certificate_chain:
+ type: string
+ description: Base64 string with PEM-encoded certificates chain
+ private_key:
+ type: string
+ description: Base64 string with PEM-encoded private key
+ certificate_path:
+ type: string
+ description: Path to certificate file
+ private_key_path:
+ type: string
+ description: Path to private key file
+ valid_cert:
+ type: boolean
+ example: "true"
+ description: valid_cert is true if the specified certificates chain is a valid
+ chain of X509 certificates
+ valid_chain:
+ type: boolean
+ example: "true"
+ description: valid_chain is true if the specified certificates chain is verified
+ and issued by a known CA
+ subject:
+ type: string
+ example: CN=example.org
+ description: subject is the subject of the first certificate in the chain
+ issuer:
+ type: string
+ example: CN=Let's Encrypt Authority X3,O=Let's Encrypt,C=US
+ description: issuer is the issuer of the first certificate in the chain
+ not_before:
+ type: string
+ example: 2019-01-31T10:47:32Z
+ description: not_before is the NotBefore field of the first certificate in the
+ chain
+ not_after:
+ type: string
+ example: 2019-05-01T10:47:32Z
+ description: not_after is the NotAfter field of the first certificate in the chain
+ dns_names:
+ type: array
+ items:
+ type: string
+ description: dns_names is the value of SubjectAltNames field of the first
+ certificate in the chain
+ example:
+ - "*.example.org"
+ valid_key:
+ type: boolean
+ example: "true"
+ description: valid_key is true if the key is a valid private key
+ key_type:
+ type: string
+ example: RSA
+ description: key_type is either RSA or ECDSA
+ warning_validation:
+ type: string
+ example: You have specified an empty certificate
+ description: warning_validation is a validation warning message with the issue
+ description
+ valid_pair:
+ type: boolean
+ example: "true"
+ description: valid_pair is true if both certificate and private key are correct
+ NetInterface:
+ type: object
+ description: Network interface info
+ properties:
+ flags:
+ type: string
+ example: up|broadcast|multicast
+ hardware_address:
+ type: string
+ example: 52:54:00:11:09:ba
+ mtu:
+ type: integer
+ format: int32
+ example: 1500
+ name:
+ type: string
+ example: eth0
+ ip_addresses:
+ type: array
+ items:
+ type: string
+ example:
+ - 127.0.0.1
+ AddressInfo:
+ type: object
+ description: Port information
+ properties:
+ ip:
+ type: string
+ example: 127.0.0.1
+ port:
+ type: integer
+ format: int32
+ example: 53
+ AddressesInfo:
+ type: object
+ description: AdGuard Home addresses configuration
+ properties:
+ dns_port:
+ type: integer
+ format: int32
+ example: 53
+ web_port:
+ type: integer
+ format: int32
+ example: 80
+ interfaces:
+ type: object
+ description: Network interfaces dictionary (key is the interface name)
+ additionalProperties:
+ $ref: "#/components/schemas/NetInterface"
+ ProfileInfo:
+ type: object
+ description: Information about the current user
+ properties:
+ name:
+ type: string
+ Client:
+ type: object
+ description: Client information
+ properties:
+ name:
+ type: string
+ description: Name
+ example: localhost
+ ids:
+ type: array
+ description: IP, CIDR or MAC address
+ items:
+ type: string
+ use_global_settings:
+ type: boolean
+ filtering_enabled:
+ type: boolean
+ parental_enabled:
+ type: boolean
+ safebrowsing_enabled:
+ type: boolean
+ safesearch_enabled:
+ type: boolean
+ use_global_blocked_services:
+ type: boolean
+ blocked_services:
+ type: array
+ items:
+ type: string
+ upstreams:
+ type: array
+ items:
+ type: string
+ ClientAuto:
+ type: object
+ description: Auto-Client information
+ properties:
+ ip:
+ type: string
+ description: IP address
+ example: 127.0.0.1
+ name:
+ type: string
+ description: Name
+ example: localhost
+ source:
+ type: string
+ description: The source of this information
+ example: etc/hosts
+ ClientUpdate:
+ type: object
+ description: Client update request
+ properties:
+ name:
+ type: string
+ data:
+ $ref: "#/components/schemas/Client"
+ ClientDelete:
+ type: object
+ description: Client delete request
+ properties:
+ name:
+ type: string
+ ClientsFindResponse:
+ type: array
+ description: Response to clients find operation
+ items:
+ $ref: "#/components/schemas/ClientsFindEntry"
+ ClientsFindEntry:
+ type: object
+ properties:
+ 1.2.3.4:
+ items:
+ $ref: "#/components/schemas/Client"
+ Clients:
+ type: object
+ properties:
+ clients:
+ $ref: "#/components/schemas/ClientsArray"
+ auto_clients:
+ $ref: "#/components/schemas/ClientsAutoArray"
+ ClientsArray:
+ type: array
+ items:
+ $ref: "#/components/schemas/Client"
+ description: Clients array
+ ClientsAutoArray:
+ type: array
+ items:
+ $ref: "#/components/schemas/ClientAuto"
+ description: Auto-Clients array
+ RewriteList:
+ type: array
+ items:
+ $ref: "#/components/schemas/RewriteEntry"
+ description: Rewrite rules array
+ RewriteEntry:
+ type: object
+ description: Rewrite rule
+ properties:
+ domain:
+ type: string
+ description: Domain name
+ example: example.org
+ answer:
+ type: string
+ description: value of A, AAAA or CNAME DNS record
+ example: 127.0.0.1
+ BlockedServicesArray:
+ type: array
+ items:
+ type: string
+ CheckConfigRequest:
+ type: object
+ description: Configuration to be checked
+ properties:
+ dns:
+ $ref: "#/components/schemas/CheckConfigRequestInfo"
+ web:
+ $ref: "#/components/schemas/CheckConfigRequestInfo"
+ set_static_ip:
+ type: boolean
+ example: false
+ CheckConfigRequestInfo:
+ type: object
+ properties:
+ ip:
+ type: string
+ example: 127.0.0.1
+ port:
+ type: integer
+ format: int32
+ example: 53
+ autofix:
+ type: boolean
+ example: false
+ CheckConfigResponse:
+ type: object
+ properties:
+ dns:
+ $ref: "#/components/schemas/CheckConfigResponseInfo"
+ web:
+ $ref: "#/components/schemas/CheckConfigResponseInfo"
+ static_ip:
+ $ref: "#/components/schemas/CheckConfigStaticIpInfo"
+ CheckConfigResponseInfo:
+ type: object
+ properties:
+ status:
+ type: string
+ example: ""
+ can_autofix:
+ type: boolean
+ example: false
+ CheckConfigStaticIpInfo:
+ type: object
+ properties:
+ static:
+ type: string
+ example: no
+ description: "Can be: yes, no, error"
+ ip:
+ type: string
+ example: 192.168.1.1
+ description: Current dynamic IP address. Set if static=no
+ error:
+ type: string
+ example: ""
+ description: Error text. Set if static=error
+ InitialConfiguration:
+ type: object
+ description: AdGuard Home initial configuration (for the first-install wizard)
+ properties:
+ dns:
+ $ref: "#/components/schemas/AddressInfo"
+ web:
+ $ref: "#/components/schemas/AddressInfo"
+ username:
+ type: string
+ description: Basic auth username
+ example: admin
+ password:
+ type: string
+ description: Basic auth password
+ example: password
+ Login:
+ type: object
+ description: Login request data
+ properties:
+ username:
+ type: string
+ description: User name
+ password:
+ type: string
+ description: Password
diff --git a/openapi/package.json b/openapi/package.json
index 9b3d78ed..db0eb753 100644
--- a/openapi/package.json
+++ b/openapi/package.json
@@ -1,12 +1,12 @@
{
"name": "adguard-home-api",
- "version": "0.1.0",
+ "version": "0.2.0",
"private": true,
"scripts": {
- "start": "node index.js"
+ "start": "node_modules/.bin/speccy serve -p 4000 openapi.yaml",
+ "test": "node_modules/.bin/speccy lint openapi.yaml"
},
"dependencies": {
- "express": "^4.16.4",
- "swagger-ui-dist": "^3.20.1"
+ "speccy": "^0.11.0"
}
}
diff --git a/openapi/yarn.lock b/openapi/yarn.lock
index 2eeacbe0..c35697ff 100644
--- a/openapi/yarn.lock
+++ b/openapi/yarn.lock
@@ -2,44 +2,263 @@
# yarn lockfile v1
-accepts@~1.3.5:
- version "1.3.5"
- resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2"
- integrity sha1-63d99gEXI6OxTopywIBcjoZ0a9I=
+"@babel/code-frame@^7.0.0":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e"
+ integrity sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==
dependencies:
- mime-types "~2.1.18"
- negotiator "0.6.1"
+ "@babel/highlight" "^7.8.3"
+
+"@babel/helper-validator-identifier@^7.9.0":
+ version "7.9.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz#90977a8e6fbf6b431a7dc31752eee233bf052d80"
+ integrity sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==
+
+"@babel/highlight@^7.8.3":
+ version "7.9.0"
+ resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.9.0.tgz#4e9b45ccb82b79607271b2979ad82c7b68163079"
+ integrity sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==
+ dependencies:
+ "@babel/helper-validator-identifier" "^7.9.0"
+ chalk "^2.0.0"
+ js-tokens "^4.0.0"
+
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.9.2":
+ version "7.9.6"
+ resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.6.tgz#a9102eb5cadedf3f31d08a9ecf294af7827ea29f"
+ integrity sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==
+ dependencies:
+ regenerator-runtime "^0.13.4"
+
+"@cloudflare/json-schema-walker@^0.1.1":
+ version "0.1.1"
+ resolved "https://registry.yarnpkg.com/@cloudflare/json-schema-walker/-/json-schema-walker-0.1.1.tgz#d1cc94065327b0b3800158db40cb78124a3476de"
+ integrity sha512-P3n0hEgk1m6uKWgL4Yb1owzXVG4pM70G4kRnDQxZXiVvfCRtaqiHu+ZRiRPzmwGBiLTO1LWc2yR1M8oz0YkXww==
+
+"@types/color-name@^1.1.1":
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
+ integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
+
+accepts@~1.3.7:
+ version "1.3.7"
+ resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
+ integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==
+ dependencies:
+ mime-types "~2.1.24"
+ negotiator "0.6.2"
+
+ajv@^5.5.2:
+ version "5.5.2"
+ resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
+ integrity sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=
+ dependencies:
+ co "^4.6.0"
+ fast-deep-equal "^1.0.0"
+ fast-json-stable-stringify "^2.0.0"
+ json-schema-traverse "^0.3.0"
+
+ansi-regex@^2.0.0:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+ integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
+
+ansi-regex@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+ integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
+
+ansi-regex@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
+ integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
+
+ansi-styles@^3.2.1:
+ version "3.2.1"
+ resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+ integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
+ dependencies:
+ color-convert "^1.9.0"
+
+ansi-styles@^4.0.0:
+ version "4.2.1"
+ resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359"
+ integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==
+ dependencies:
+ "@types/color-name" "^1.1.1"
+ color-convert "^2.0.1"
+
+argparse@^1.0.7:
+ version "1.0.10"
+ resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+ integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
+ dependencies:
+ sprintf-js "~1.0.2"
array-flatten@1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
-body-parser@1.18.3:
- version "1.18.3"
- resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.3.tgz#5b292198ffdd553b3a0f20ded0592b956955c8b4"
- integrity sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ=
+async@^1.4.0:
+ version "1.5.2"
+ resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
+ integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
+
+better-ajv-errors@^0.6.1, better-ajv-errors@^0.6.7:
+ version "0.6.7"
+ resolved "https://registry.yarnpkg.com/better-ajv-errors/-/better-ajv-errors-0.6.7.tgz#b5344af1ce10f434fe02fc4390a5a9c811e470d1"
+ integrity sha512-PYgt/sCzR4aGpyNy5+ViSQ77ognMnWq7745zM+/flYO4/Yisdtp9wDQW2IKCyVYPUxQt3E/b5GBSwfhd1LPdlg==
dependencies:
- bytes "3.0.0"
+ "@babel/code-frame" "^7.0.0"
+ "@babel/runtime" "^7.0.0"
+ chalk "^2.4.1"
+ core-js "^3.2.1"
+ json-to-ast "^2.0.3"
+ jsonpointer "^4.0.1"
+ leven "^3.1.0"
+
+big.js@^5.2.2:
+ version "5.2.2"
+ resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
+ integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
+
+body-parser@1.19.0:
+ version "1.19.0"
+ resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a"
+ integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==
+ dependencies:
+ bytes "3.1.0"
content-type "~1.0.4"
debug "2.6.9"
depd "~1.1.2"
- http-errors "~1.6.3"
- iconv-lite "0.4.23"
+ http-errors "1.7.2"
+ iconv-lite "0.4.24"
on-finished "~2.3.0"
- qs "6.5.2"
- raw-body "2.3.3"
- type-is "~1.6.16"
+ qs "6.7.0"
+ raw-body "2.4.0"
+ type-is "~1.6.17"
-bytes@3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
- integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
+bytes@3.1.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
+ integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
-content-disposition@0.5.2:
- version "0.5.2"
- resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"
- integrity sha1-DPaLud318r55YcOoUXjLhdunjLQ=
+call-me-maybe@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"
+ integrity sha1-JtII6onje1y95gJQoV8DHBak1ms=
+
+camelcase@^2.0.1:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
+ integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=
+
+camelcase@^5.0.0:
+ version "5.3.1"
+ resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
+ integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
+
+chalk@^2.0.0, chalk@^2.4.1:
+ version "2.4.2"
+ resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+ integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
+ dependencies:
+ ansi-styles "^3.2.1"
+ escape-string-regexp "^1.0.5"
+ supports-color "^5.3.0"
+
+classnames@^2.2.0, classnames@^2.2.3, classnames@^2.2.6:
+ version "2.2.6"
+ resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.6.tgz#43935bffdd291f326dad0a205309b38d00f650ce"
+ integrity sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q==
+
+clipboard@^2.0.0:
+ version "2.0.6"
+ resolved "https://registry.yarnpkg.com/clipboard/-/clipboard-2.0.6.tgz#52921296eec0fdf77ead1749421b21c968647376"
+ integrity sha512-g5zbiixBRk/wyKakSwCKd7vQXDjFnAMGHoEyBogG/bw9kTD9GvdAvaoRR1ALcEzt3pVKxZR0pViekPMIS0QyGg==
+ dependencies:
+ good-listener "^1.2.2"
+ select "^1.1.2"
+ tiny-emitter "^2.0.0"
+
+cliui@^3.0.3:
+ version "3.2.0"
+ resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
+ integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=
+ dependencies:
+ string-width "^1.0.1"
+ strip-ansi "^3.0.1"
+ wrap-ansi "^2.0.0"
+
+cliui@^4.0.0:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
+ integrity sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==
+ dependencies:
+ string-width "^2.1.1"
+ strip-ansi "^4.0.0"
+ wrap-ansi "^2.0.0"
+
+cliui@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1"
+ integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==
+ dependencies:
+ string-width "^4.2.0"
+ strip-ansi "^6.0.0"
+ wrap-ansi "^6.2.0"
+
+co@^4.6.0:
+ version "4.6.0"
+ resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+ integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
+
+code-error-fragment@0.0.230:
+ version "0.0.230"
+ resolved "https://registry.yarnpkg.com/code-error-fragment/-/code-error-fragment-0.0.230.tgz#d736d75c832445342eca1d1fedbf17d9618b14d7"
+ integrity sha512-cadkfKp6932H8UkhzE/gcUqhRMNf8jHzkAN7+5Myabswaghu4xABTgPHDCjW+dBAJxj/SpkTYokpzDqY4pCzQw==
+
+code-point-at@^1.0.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+ integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
+
+color-convert@^1.9.0:
+ version "1.9.3"
+ resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+ integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
+ dependencies:
+ color-name "1.1.3"
+
+color-convert@^2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+ integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
+ dependencies:
+ color-name "~1.1.4"
+
+color-name@1.1.3:
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+ integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
+
+color-name@~1.1.4:
+ version "1.1.4"
+ resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
+ integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
+
+commander@^2.18.0:
+ version "2.20.3"
+ resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
+ integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
+
+content-disposition@0.5.3:
+ version "0.5.3"
+ resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd"
+ integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==
+ dependencies:
+ safe-buffer "5.1.2"
content-type@~1.0.4:
version "1.0.4"
@@ -51,10 +270,26 @@ cookie-signature@1.0.6:
resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
-cookie@0.3.1:
- version "0.3.1"
- resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
- integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=
+cookie@0.4.0:
+ version "0.4.0"
+ resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
+ integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
+
+core-js@^3.2.1:
+ version "3.6.5"
+ resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz#7395dc273af37fb2e50e9bd3d9fe841285231d1a"
+ integrity sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==
+
+cross-spawn@^6.0.0:
+ version "6.0.5"
+ resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
+ integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
+ dependencies:
+ nice-try "^1.0.4"
+ path-key "^2.0.1"
+ semver "^5.5.0"
+ shebang-command "^1.2.0"
+ which "^1.2.9"
debug@2.6.9:
version "2.6.9"
@@ -63,6 +298,21 @@ debug@2.6.9:
dependencies:
ms "2.0.0"
+decamelize@^1.1.1, decamelize@^1.2.0:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+ integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
+
+decko@^1.2.0:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/decko/-/decko-1.2.0.tgz#fd43c735e967b8013306884a56fbe665996b6817"
+ integrity sha1-/UPHNelnuAEzBohKVvvmZZlraBc=
+
+delegate@^3.1.2:
+ version "3.2.0"
+ resolved "https://registry.yarnpkg.com/delegate/-/delegate-3.2.0.tgz#b66b71c3158522e8ab5744f720d8ca0c2af59166"
+ integrity sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==
+
depd@~1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
@@ -73,75 +323,185 @@ destroy@~1.0.4:
resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
+dom-walk@^0.1.0:
+ version "0.1.2"
+ resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.2.tgz#0c548bef048f4d1f2a97249002236060daa3fd84"
+ integrity sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==
+
+dompurify@^1.0.10:
+ version "1.0.11"
+ resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-1.0.11.tgz#fe0f4a40d147f7cebbe31a50a1357539cfc1eb4d"
+ integrity sha512-XywCTXZtc/qCX3iprD1pIklRVk/uhl8BKpkTxr+ZyMVUzSUg7wkQXRBp/euJ5J5moa1QvfpvaPQVP71z1O59dQ==
+
ee-first@1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
+ejs@^2.5.2:
+ version "2.7.4"
+ resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba"
+ integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==
+
+emoji-regex@^8.0.0:
+ version "8.0.0"
+ resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+ integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
+
+emojis-list@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
+ integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
+
encodeurl@~1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
+end-of-stream@^1.1.0:
+ version "1.4.4"
+ resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
+ integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
+ dependencies:
+ once "^1.4.0"
+
+es6-promise@^3.2.1:
+ version "3.3.1"
+ resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-3.3.1.tgz#a08cdde84ccdbf34d027a1451bc91d4bcd28a613"
+ integrity sha1-oIzd6EzNvzTQJ6FFG8kdS80ophM=
+
escape-html@~1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
+escape-string-regexp@^1.0.5:
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+ integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
+
+esprima@^4.0.0:
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+ integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
+
etag@~1.8.1:
version "1.8.1"
resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
-express@^4.16.4:
- version "4.16.4"
- resolved "https://registry.yarnpkg.com/express/-/express-4.16.4.tgz#fddef61926109e24c515ea97fd2f1bdbf62df12e"
- integrity sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==
+eventemitter3@^3.0.0:
+ version "3.1.2"
+ resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.2.tgz#2d3d48f9c346698fce83a85d7d664e98535df6e7"
+ integrity sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==
+
+execa@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
+ integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
dependencies:
- accepts "~1.3.5"
+ cross-spawn "^6.0.0"
+ get-stream "^4.0.0"
+ is-stream "^1.1.0"
+ npm-run-path "^2.0.0"
+ p-finally "^1.0.0"
+ signal-exit "^3.0.0"
+ strip-eof "^1.0.0"
+
+express@^4.14.0:
+ version "4.17.1"
+ resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
+ integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==
+ dependencies:
+ accepts "~1.3.7"
array-flatten "1.1.1"
- body-parser "1.18.3"
- content-disposition "0.5.2"
+ body-parser "1.19.0"
+ content-disposition "0.5.3"
content-type "~1.0.4"
- cookie "0.3.1"
+ cookie "0.4.0"
cookie-signature "1.0.6"
debug "2.6.9"
depd "~1.1.2"
encodeurl "~1.0.2"
escape-html "~1.0.3"
etag "~1.8.1"
- finalhandler "1.1.1"
+ finalhandler "~1.1.2"
fresh "0.5.2"
merge-descriptors "1.0.1"
methods "~1.1.2"
on-finished "~2.3.0"
- parseurl "~1.3.2"
+ parseurl "~1.3.3"
path-to-regexp "0.1.7"
- proxy-addr "~2.0.4"
- qs "6.5.2"
- range-parser "~1.2.0"
+ proxy-addr "~2.0.5"
+ qs "6.7.0"
+ range-parser "~1.2.1"
safe-buffer "5.1.2"
- send "0.16.2"
- serve-static "1.13.2"
- setprototypeof "1.1.0"
- statuses "~1.4.0"
- type-is "~1.6.16"
+ send "0.17.1"
+ serve-static "1.14.1"
+ setprototypeof "1.1.1"
+ statuses "~1.5.0"
+ type-is "~1.6.18"
utils-merge "1.0.1"
vary "~1.1.2"
-finalhandler@1.1.1:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105"
- integrity sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==
+fast-deep-equal@^1.0.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
+ integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=
+
+fast-json-stable-stringify@^2.0.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
+ integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
+
+fast-levenshtein@^2.0.6:
+ version "2.0.6"
+ resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+ integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
+
+fast-safe-stringify@^2.0.7:
+ version "2.0.7"
+ resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz#124aa885899261f68aedb42a7c080de9da608743"
+ integrity sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA==
+
+finalhandler@~1.1.2:
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
+ integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
dependencies:
debug "2.6.9"
encodeurl "~1.0.2"
escape-html "~1.0.3"
on-finished "~2.3.0"
- parseurl "~1.3.2"
- statuses "~1.4.0"
+ parseurl "~1.3.3"
+ statuses "~1.5.0"
unpipe "~1.0.0"
+find-up@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
+ integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
+ dependencies:
+ locate-path "^3.0.0"
+
+find-up@^4.1.0:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
+ integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
+ dependencies:
+ locate-path "^5.0.0"
+ path-exists "^4.0.0"
+
+foreach@^2.0.4:
+ version "2.0.5"
+ resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
+ integrity sha1-C+4AUBiusmDQo6865ljdATbsG5k=
+
+format-util@^1.0.3:
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/format-util/-/format-util-1.0.5.tgz#1ffb450c8a03e7bccffe40643180918cc297d271"
+ integrity sha512-varLbTj0e0yVyRpqQhuWV+8hlePAgaoFRhNFj50BNjEIrw1/DphHSObtqwskVCPWNgzwPoQrZAbfa/SBiicNeg==
+
forwarded@~0.1.2:
version "0.1.2"
resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
@@ -152,20 +512,86 @@ fresh@0.5.2:
resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
-http-errors@1.6.3, http-errors@~1.6.2, http-errors@~1.6.3:
- version "1.6.3"
- resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
- integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=
+get-caller-file@^1.0.1:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
+ integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
+
+get-caller-file@^2.0.1:
+ version "2.0.5"
+ resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+ integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
+
+get-stream@^4.0.0:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
+ integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
+ dependencies:
+ pump "^3.0.0"
+
+global@^4.3.0:
+ version "4.4.0"
+ resolved "https://registry.yarnpkg.com/global/-/global-4.4.0.tgz#3e7b105179006a323ed71aafca3e9c57a5cc6406"
+ integrity sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==
+ dependencies:
+ min-document "^2.19.0"
+ process "^0.11.10"
+
+good-listener@^1.2.2:
+ version "1.2.2"
+ resolved "https://registry.yarnpkg.com/good-listener/-/good-listener-1.2.2.tgz#d53b30cdf9313dffb7dc9a0d477096aa6d145c50"
+ integrity sha1-1TswzfkxPf+33JoNR3CWqm0UXFA=
+ dependencies:
+ delegate "^3.1.2"
+
+grapheme-splitter@^1.0.4:
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
+ integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
+
+has-flag@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+ integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
+
+hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.3.0:
+ version "3.3.2"
+ resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
+ integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==
+ dependencies:
+ react-is "^16.7.0"
+
+http-errors@1.7.2:
+ version "1.7.2"
+ resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f"
+ integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==
dependencies:
depd "~1.1.2"
inherits "2.0.3"
- setprototypeof "1.1.0"
- statuses ">= 1.4.0 < 2"
+ setprototypeof "1.1.1"
+ statuses ">= 1.5.0 < 2"
+ toidentifier "1.0.0"
-iconv-lite@0.4.23:
- version "0.4.23"
- resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
- integrity sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==
+http-errors@~1.7.2:
+ version "1.7.3"
+ resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06"
+ integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==
+ dependencies:
+ depd "~1.1.2"
+ inherits "2.0.4"
+ setprototypeof "1.1.1"
+ statuses ">= 1.5.0 < 2"
+ toidentifier "1.0.0"
+
+http2-client@^1.2.5:
+ version "1.3.3"
+ resolved "https://registry.yarnpkg.com/http2-client/-/http2-client-1.3.3.tgz#90fc15d646cca86956b156d07c83947d57d659a9"
+ integrity sha512-nUxLymWQ9pzkzTmir24p2RtsgruLmhje7lH3hLX1IpwvyTg77fW+1brenPPP3USAR+rQ36p5sTA/x7sjCJVkAA==
+
+iconv-lite@0.4.24:
+ version "0.4.24"
+ resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+ integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
dependencies:
safer-buffer ">= 2.1.2 < 3"
@@ -174,16 +600,210 @@ inherits@2.0.3:
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
-ipaddr.js@1.8.0:
- version "1.8.0"
- resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.0.tgz#eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e"
- integrity sha1-6qM9bd16zo9/b+DJygRA5wZzix4=
+inherits@2.0.4:
+ version "2.0.4"
+ resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+ integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
+
+ini@^1.3.0:
+ version "1.3.5"
+ resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
+ integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
+
+invert-kv@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
+ integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY=
+
+invert-kv@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
+ integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==
+
+ipaddr.js@1.9.1:
+ version "1.9.1"
+ resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
+ integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
+
+is-fullwidth-code-point@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+ integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
+ dependencies:
+ number-is-nan "^1.0.0"
+
+is-fullwidth-code-point@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+ integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
+
+is-fullwidth-code-point@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
+ integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
+
+is-stream@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+ integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
+
+isexe@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+ integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
+
+"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+ integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
+
+js-yaml@^3.12.1, js-yaml@^3.2.3:
+ version "3.13.1"
+ resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
+ integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
+ dependencies:
+ argparse "^1.0.7"
+ esprima "^4.0.0"
+
+json-pointer@^0.6.0:
+ version "0.6.0"
+ resolved "https://registry.yarnpkg.com/json-pointer/-/json-pointer-0.6.0.tgz#8e500550a6aac5464a473377da57aa6cc22828d7"
+ integrity sha1-jlAFUKaqxUZKRzN32leqbMIoKNc=
+ dependencies:
+ foreach "^2.0.4"
+
+json-schema-ref-parser@^6.1.0:
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/json-schema-ref-parser/-/json-schema-ref-parser-6.1.0.tgz#30af34aeab5bee0431da805dac0eb21b574bf63d"
+ integrity sha512-pXe9H1m6IgIpXmE5JSb8epilNTGsmTb2iPohAXpOdhqGFbQjNeHHsZxU+C8w6T81GZxSPFLeUoqDJmzxx5IGuw==
+ dependencies:
+ call-me-maybe "^1.0.1"
+ js-yaml "^3.12.1"
+ ono "^4.0.11"
+
+json-schema-to-openapi-schema@^0.3.0:
+ version "0.3.0"
+ resolved "https://registry.yarnpkg.com/json-schema-to-openapi-schema/-/json-schema-to-openapi-schema-0.3.0.tgz#d8d4a1a321b3aa00dce71fa27ba5016f2d50288b"
+ integrity sha512-UaaAmmbAq61yQM5yLoVOM99GP1JI8YNVEv3QWbD/79YDNNKk99uGn1k2pa+ZSfdLILi/euGguVG8URmv5gR/Bw==
+ dependencies:
+ "@cloudflare/json-schema-walker" "^0.1.1"
+
+json-schema-traverse@^0.3.0:
+ version "0.3.1"
+ resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
+ integrity sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=
+
+json-to-ast@^2.0.3:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/json-to-ast/-/json-to-ast-2.1.0.tgz#041a9fcd03c0845036acb670d29f425cea4faaf9"
+ integrity sha512-W9Lq347r8tA1DfMvAGn9QNcgYm4Wm7Yc+k8e6vezpMnRT+NHbtlxgNBXRVjXe9YM6eTn6+p/MKOlV/aABJcSnQ==
+ dependencies:
+ code-error-fragment "0.0.230"
+ grapheme-splitter "^1.0.4"
+
+json5@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
+ integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
+ dependencies:
+ minimist "^1.2.0"
+
+jsonpointer@^4.0.1:
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
+ integrity sha1-T9kss04OnbPInIYi7PUfm5eMbLk=
+
+lcid@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
+ integrity sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=
+ dependencies:
+ invert-kv "^1.0.0"
+
+lcid@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf"
+ integrity sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==
+ dependencies:
+ invert-kv "^2.0.0"
+
+leven@^3.1.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
+ integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
+
+loader-utils@^1.1.0:
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
+ integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==
+ dependencies:
+ big.js "^5.2.2"
+ emojis-list "^3.0.0"
+ json5 "^1.0.1"
+
+locate-path@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
+ integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
+ dependencies:
+ p-locate "^3.0.0"
+ path-exists "^3.0.0"
+
+locate-path@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
+ integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
+ dependencies:
+ p-locate "^4.1.0"
+
+loose-envify@^1.4.0:
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
+ integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
+ dependencies:
+ js-tokens "^3.0.0 || ^4.0.0"
+
+lunr@2.3.6:
+ version "2.3.6"
+ resolved "https://registry.yarnpkg.com/lunr/-/lunr-2.3.6.tgz#f278beee7ffd56ad86e6e478ce02ab2b98c78dd5"
+ integrity sha512-swStvEyDqQ85MGpABCMBclZcLI/pBIlu8FFDtmX197+oEgKloJ67QnB+Tidh0340HmLMs39c4GrkPY3cmkXp6Q==
+
+map-age-cleaner@^0.1.1:
+ version "0.1.3"
+ resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
+ integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==
+ dependencies:
+ p-defer "^1.0.0"
+
+mark.js@^8.11.1:
+ version "8.11.1"
+ resolved "https://registry.yarnpkg.com/mark.js/-/mark.js-8.11.1.tgz#180f1f9ebef8b0e638e4166ad52db879beb2ffc5"
+ integrity sha1-GA8fnr74sOY45BZq1S24eb6y/8U=
+
+marked@^0.6.1:
+ version "0.6.3"
+ resolved "https://registry.yarnpkg.com/marked/-/marked-0.6.3.tgz#79babad78af638ba4d522a9e715cdfdd2429e946"
+ integrity sha512-Fqa7eq+UaxfMriqzYLayfqAE40WN03jf+zHjT18/uXNuzjq3TY0XTbrAoPeqSJrAmPz11VuUA+kBPYOhHt9oOQ==
media-typer@0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
+mem@^4.0.0:
+ version "4.3.0"
+ resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178"
+ integrity sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==
+ dependencies:
+ map-age-cleaner "^0.1.1"
+ mimic-fn "^2.0.0"
+ p-is-promise "^2.0.0"
+
+memoize-one@^5.0.0:
+ version "5.1.1"
+ resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.1.1.tgz#047b6e3199b508eaec03504de71229b8eb1d75c0"
+ integrity sha512-HKeeBpWvqiVJD57ZUAsJNm71eHTykffzcLZVYWiVfQeI1rJtuEaS7hQiEpWfVVk18donPwJEcFKIkCmPJNOhHA==
+
merge-descriptors@1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
@@ -194,32 +814,167 @@ methods@~1.1.2:
resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
-mime-db@~1.37.0:
- version "1.37.0"
- resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.37.0.tgz#0b6a0ce6fdbe9576e25f1f2d2fde8830dc0ad0d8"
- integrity sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==
+mime-db@1.44.0:
+ version "1.44.0"
+ resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
+ integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==
-mime-types@~2.1.18:
- version "2.1.21"
- resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.21.tgz#28995aa1ecb770742fe6ae7e58f9181c744b3f96"
- integrity sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==
+mime-types@~2.1.24:
+ version "2.1.27"
+ resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f"
+ integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==
dependencies:
- mime-db "~1.37.0"
+ mime-db "1.44.0"
-mime@1.4.1:
- version "1.4.1"
- resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
- integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==
+mime@1.6.0:
+ version "1.6.0"
+ resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+ integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
+
+mimic-fn@^2.0.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
+ integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
+
+min-document@^2.19.0:
+ version "2.19.0"
+ resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685"
+ integrity sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=
+ dependencies:
+ dom-walk "^0.1.0"
+
+minimist@^1.2.0:
+ version "1.2.5"
+ resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
+ integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+
+mobx-react@^5.4.3:
+ version "5.4.4"
+ resolved "https://registry.yarnpkg.com/mobx-react/-/mobx-react-5.4.4.tgz#b3de9c6eabcd0ed8a40036888cb0221ab9568b80"
+ integrity sha512-2mTzpyEjVB/RGk2i6KbcmP4HWcAUFox5ZRCrGvSyz49w20I4C4qql63grPpYrS9E9GKwgydBHQlA4y665LuRCQ==
+ dependencies:
+ hoist-non-react-statics "^3.0.0"
+ react-lifecycles-compat "^3.0.2"
ms@2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
-negotiator@0.6.1:
- version "0.6.1"
- resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
- integrity sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=
+ms@2.1.1:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
+ integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
+
+nconf-yaml@^1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/nconf-yaml/-/nconf-yaml-1.0.2.tgz#fea065333cf42b77a5e8060517969799d4156575"
+ integrity sha1-/qBlMzz0K3el6AYFF5aXmdQVZXU=
+ dependencies:
+ js-yaml "^3.2.3"
+
+nconf@^0.10.0:
+ version "0.10.0"
+ resolved "https://registry.yarnpkg.com/nconf/-/nconf-0.10.0.tgz#da1285ee95d0a922ca6cee75adcf861f48205ad2"
+ integrity sha512-fKiXMQrpP7CYWJQzKkPPx9hPgmq+YLDyxcG9N8RpiE9FoCkCbzD0NyW0YhE3xn3Aupe7nnDeIx4PFzYehpHT9Q==
+ dependencies:
+ async "^1.4.0"
+ ini "^1.3.0"
+ secure-keys "^1.0.0"
+ yargs "^3.19.0"
+
+negotiator@0.6.2:
+ version "0.6.2"
+ resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
+ integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
+
+nice-try@^1.0.4:
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
+ integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
+
+node-fetch-h2@^2.3.0:
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/node-fetch-h2/-/node-fetch-h2-2.3.0.tgz#c6188325f9bd3d834020bf0f2d6dc17ced2241ac"
+ integrity sha512-ofRW94Ab0T4AOh5Fk8t0h8OBWrmjb0SSB20xh1H8YnPV9EJ+f5AMoYSUQ2zgJ4Iq2HAK0I2l5/Nequ8YzFS3Hg==
+ dependencies:
+ http2-client "^1.2.5"
+
+node-fetch@^2.3.0:
+ version "2.6.0"
+ resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
+ integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==
+
+node-readfiles@^0.2.0:
+ version "0.2.0"
+ resolved "https://registry.yarnpkg.com/node-readfiles/-/node-readfiles-0.2.0.tgz#dbbd4af12134e2e635c245ef93ffcf6f60673a5d"
+ integrity sha1-271K8SE04uY1wkXvk//Pb2BnOl0=
+ dependencies:
+ es6-promise "^3.2.1"
+
+npm-run-path@^2.0.0:
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
+ integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
+ dependencies:
+ path-key "^2.0.0"
+
+number-is-nan@^1.0.0:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+ integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
+
+oas-kit-common@^1.0.7, oas-kit-common@^1.0.8:
+ version "1.0.8"
+ resolved "https://registry.yarnpkg.com/oas-kit-common/-/oas-kit-common-1.0.8.tgz#6d8cacf6e9097967a4c7ea8bcbcbd77018e1f535"
+ integrity sha512-pJTS2+T0oGIwgjGpw7sIRU8RQMcUoKCDWFLdBqKB2BNmGpbBMH2sdqAaOXUg8OzonZHU0L7vfJu1mJFEiYDWOQ==
+ dependencies:
+ fast-safe-stringify "^2.0.7"
+
+oas-linter@^3.0.0, oas-linter@^3.1.0:
+ version "3.1.2"
+ resolved "https://registry.yarnpkg.com/oas-linter/-/oas-linter-3.1.2.tgz#ff5eae63290cd2c0ef195bae9bcf5e91b6884c19"
+ integrity sha512-mv3HBG9aQz8PLGvonewIN9Y2Ra8QL6jvotRvf7NCdZ20n5vg4dO4y61UZh6s+KRDfJaU1PO+9Oxrn3EUN4Xygw==
+ dependencies:
+ should "^13.2.1"
+ yaml "^1.8.3"
+
+oas-resolver@^2.2.4, oas-resolver@^2.3.0:
+ version "2.3.2"
+ resolved "https://registry.yarnpkg.com/oas-resolver/-/oas-resolver-2.3.2.tgz#990a722ddcafe9b0b85893362963b829190b236f"
+ integrity sha512-toGCUv8wyZZmUAAsw4jn+511xNpUFW2ZLp4sAZ7xpERIeosrbxBxtkVxot9kXvdUHtPjRafi5+bkJ56TwQeYSQ==
+ dependencies:
+ node-fetch-h2 "^2.3.0"
+ oas-kit-common "^1.0.8"
+ reftools "^1.1.1"
+ yaml "^1.8.3"
+ yargs "^15.3.1"
+
+oas-schema-walker@^1.1.3:
+ version "1.1.4"
+ resolved "https://registry.yarnpkg.com/oas-schema-walker/-/oas-schema-walker-1.1.4.tgz#4b9d090c3622039741334d3e138510ff38197618"
+ integrity sha512-foVDDS0RJYMfhQEDh/WdBuCzydTcsCnGo9EeD8SpWq1uW10JXiz+8SfYVDA7LO87kjmlnTRZle/2gr5qxabaEA==
+
+oas-validator@^3.0.1, oas-validator@^3.4.0:
+ version "3.4.0"
+ resolved "https://registry.yarnpkg.com/oas-validator/-/oas-validator-3.4.0.tgz#7633b02e495af4a4e0224b249288b0928748476d"
+ integrity sha512-l/SxykuACi2U51osSsBXTxdsFc8Fw41xI7AsZkzgVgWJAzoEFaaNptt35WgY9C3757RUclsm6ye5GvSyYoozLQ==
+ dependencies:
+ ajv "^5.5.2"
+ better-ajv-errors "^0.6.7"
+ call-me-maybe "^1.0.1"
+ oas-kit-common "^1.0.7"
+ oas-linter "^3.1.0"
+ oas-resolver "^2.3.0"
+ oas-schema-walker "^1.1.3"
+ reftools "^1.1.0"
+ should "^13.2.1"
+ yaml "^1.8.3"
+
+object-assign@^4.1.1:
+ version "4.1.1"
+ resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+ integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
on-finished@~2.3.0:
version "2.3.0"
@@ -228,44 +983,271 @@ on-finished@~2.3.0:
dependencies:
ee-first "1.1.1"
-parseurl@~1.3.2:
- version "1.3.2"
- resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3"
- integrity sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=
+once@^1.3.1, once@^1.4.0:
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+ integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+ dependencies:
+ wrappy "1"
+
+ono@^4.0.11:
+ version "4.0.11"
+ resolved "https://registry.yarnpkg.com/ono/-/ono-4.0.11.tgz#c7f4209b3e396e8a44ef43b9cedc7f5d791d221d"
+ integrity sha512-jQ31cORBFE6td25deYeD80wxKBMj+zBmHTrVxnc6CKhx8gho6ipmWM5zj/oeoqioZ99yqBls9Z/9Nss7J26G2g==
+ dependencies:
+ format-util "^1.0.3"
+
+openapi-sampler@1.0.0-beta.14:
+ version "1.0.0-beta.14"
+ resolved "https://registry.yarnpkg.com/openapi-sampler/-/openapi-sampler-1.0.0-beta.14.tgz#e06807f33a9c0fab841e212f5fb90e7af4acf30c"
+ integrity sha512-NNmH9YAN5AaCE4w6MQXdCrmsOJJQTswHVSp075+h+iiG+OTonpZE8HzwocozovD2imx4lamkuxGLs4E4bO4Z+g==
+ dependencies:
+ json-pointer "^0.6.0"
+
+os-locale@^1.4.0:
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
+ integrity sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=
+ dependencies:
+ lcid "^1.0.0"
+
+os-locale@^3.0.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
+ integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==
+ dependencies:
+ execa "^1.0.0"
+ lcid "^2.0.0"
+ mem "^4.0.0"
+
+p-defer@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
+ integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=
+
+p-finally@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+ integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
+
+p-is-promise@^2.0.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e"
+ integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==
+
+p-limit@^2.0.0, p-limit@^2.2.0:
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
+ integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
+ dependencies:
+ p-try "^2.0.0"
+
+p-locate@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
+ integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
+ dependencies:
+ p-limit "^2.0.0"
+
+p-locate@^4.1.0:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
+ integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
+ dependencies:
+ p-limit "^2.2.0"
+
+p-try@^2.0.0:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
+ integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
+
+parseurl@~1.3.3:
+ version "1.3.3"
+ resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
+ integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
+
+path-exists@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
+ integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
+
+path-exists@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
+ integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
+
+path-key@^2.0.0, path-key@^2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
+ integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
path-to-regexp@0.1.7:
version "0.1.7"
resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
-proxy-addr@~2.0.4:
- version "2.0.4"
- resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.4.tgz#ecfc733bf22ff8c6f407fa275327b9ab67e48b93"
- integrity sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==
+perfect-scrollbar@^1.4.0:
+ version "1.5.0"
+ resolved "https://registry.yarnpkg.com/perfect-scrollbar/-/perfect-scrollbar-1.5.0.tgz#821d224ed8ff61990c23f26db63048cdc75b6b83"
+ integrity sha512-NrNHJn5mUGupSiheBTy6x+6SXCFbLlm8fVZh9moIzw/LgqElN5q4ncR4pbCBCYuCJ8Kcl9mYM0NgDxvW+b4LxA==
+
+polished@^3.0.3:
+ version "3.6.3"
+ resolved "https://registry.yarnpkg.com/polished/-/polished-3.6.3.tgz#68f4fe7ffad46530733029b939dd12978200cb59"
+ integrity sha512-QJ0q0b6gX1+0OJtPMfgVJxV0vg5XTa4im+Rca989dAtmsd/fEky3X+0A+V+OUXq1nyiDGplJwqD853dTS0gkPg==
+ dependencies:
+ "@babel/runtime" "^7.9.2"
+
+prismjs@^1.15.0:
+ version "1.20.0"
+ resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.20.0.tgz#9b685fc480a3514ee7198eac6a3bf5024319ff03"
+ integrity sha512-AEDjSrVNkynnw6A+B1DsFkd6AVdTnp+/WoUixFRULlCLZVRZlVQMVWio/16jv7G1FscUxQxOQhWwApgbnxr6kQ==
+ optionalDependencies:
+ clipboard "^2.0.0"
+
+process@^0.11.10:
+ version "0.11.10"
+ resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
+ integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
+
+prop-types@^15.5.0, prop-types@^15.6.1, prop-types@^15.7.2:
+ version "15.7.2"
+ resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
+ integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
+ dependencies:
+ loose-envify "^1.4.0"
+ object-assign "^4.1.1"
+ react-is "^16.8.1"
+
+proxy-addr@~2.0.5:
+ version "2.0.6"
+ resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz#fdc2336505447d3f2f2c638ed272caf614bbb2bf"
+ integrity sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==
dependencies:
forwarded "~0.1.2"
- ipaddr.js "1.8.0"
+ ipaddr.js "1.9.1"
-qs@6.5.2:
- version "6.5.2"
- resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
- integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
-
-range-parser@~1.2.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
- integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=
-
-raw-body@2.3.3:
- version "2.3.3"
- resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.3.tgz#1b324ece6b5706e153855bc1148c65bb7f6ea0c3"
- integrity sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==
+pump@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
+ integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
dependencies:
- bytes "3.0.0"
- http-errors "1.6.3"
- iconv-lite "0.4.23"
+ end-of-stream "^1.1.0"
+ once "^1.3.1"
+
+qs@6.7.0:
+ version "6.7.0"
+ resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
+ integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
+
+range-parser@~1.2.1:
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
+ integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
+
+raw-body@2.4.0:
+ version "2.4.0"
+ resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332"
+ integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==
+ dependencies:
+ bytes "3.1.0"
+ http-errors "1.7.2"
+ iconv-lite "0.4.24"
unpipe "1.0.0"
+react-dropdown@^1.6.4:
+ version "1.7.0"
+ resolved "https://registry.yarnpkg.com/react-dropdown/-/react-dropdown-1.7.0.tgz#20287aafabdece49a6595ebe40e3fa1a37c26456"
+ integrity sha512-zFZ73pgLA32hArpE4j/7DtOEhOMg240XG5QvbAb0/VinGekkHDVIakMyAFUKC5jDz8jqXEltgriqFW9R5iCtPQ==
+ dependencies:
+ classnames "^2.2.3"
+
+react-hot-loader@^4.8.0:
+ version "4.12.21"
+ resolved "https://registry.yarnpkg.com/react-hot-loader/-/react-hot-loader-4.12.21.tgz#332e830801fb33024b5a147d6b13417f491eb975"
+ integrity sha512-Ynxa6ROfWUeKWsTHxsrL2KMzujxJVPjs385lmB2t5cHUxdoRPGind9F00tOkdc1l5WBleOF4XEAMILY1KPIIDA==
+ dependencies:
+ fast-levenshtein "^2.0.6"
+ global "^4.3.0"
+ hoist-non-react-statics "^3.3.0"
+ loader-utils "^1.1.0"
+ prop-types "^15.6.1"
+ react-lifecycles-compat "^3.0.4"
+ shallowequal "^1.1.0"
+ source-map "^0.7.3"
+
+react-is@^16.7.0, react-is@^16.8.1:
+ version "16.13.1"
+ resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
+ integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
+
+react-lifecycles-compat@^3.0.2, react-lifecycles-compat@^3.0.4:
+ version "3.0.4"
+ resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
+ integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==
+
+react-tabs@^3.0.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/react-tabs/-/react-tabs-3.1.0.tgz#ecc50f034c1d6da2606fab9293055bbc861b382e"
+ integrity sha512-9RKc77HCPsjQDVPyZEw37g3JPtg26oSQ9o4mtaVXjJuLedDX5+TQcE+MRNKR+4aO3GMAY4YslCePGG1//MQ3Jg==
+ dependencies:
+ classnames "^2.2.0"
+ prop-types "^15.5.0"
+
+redoc@v2.0.0-rc.8-1:
+ version "2.0.0-rc.8-1"
+ resolved "https://registry.yarnpkg.com/redoc/-/redoc-2.0.0-rc.8-1.tgz#53e441f54e79ce25782525d937cd499af3b25e2d"
+ integrity sha512-/YoCdcl2QtveKz4CTXaqtOfCIaVgZZgcnfUNC5xK7xBl/LxTiNj3tUbgFmrYMLTZGzNdQ9TUJpsa7lXDKcr8Pw==
+ dependencies:
+ classnames "^2.2.6"
+ decko "^1.2.0"
+ dompurify "^1.0.10"
+ eventemitter3 "^3.0.0"
+ json-pointer "^0.6.0"
+ json-schema-ref-parser "^6.1.0"
+ lunr "2.3.6"
+ mark.js "^8.11.1"
+ marked "^0.6.1"
+ memoize-one "^5.0.0"
+ mobx-react "^5.4.3"
+ openapi-sampler "1.0.0-beta.14"
+ perfect-scrollbar "^1.4.0"
+ polished "^3.0.3"
+ prismjs "^1.15.0"
+ prop-types "^15.7.2"
+ react-dropdown "^1.6.4"
+ react-hot-loader "^4.8.0"
+ react-tabs "^3.0.0"
+ slugify "^1.3.4"
+ stickyfill "^1.1.1"
+ swagger2openapi "^5.2.3"
+ tslib "^1.9.3"
+
+reftools@^1.1.0, reftools@^1.1.1:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/reftools/-/reftools-1.1.1.tgz#09cff48f62c09cae40bd1fe9683f5412d2a4656d"
+ integrity sha512-7ySkzK7YpUeJP16rzJqEXTZ7IrAq/AL/p+wWejD9wdKQOe+mYYVAOB3w5ZTs2eoHfmAidwr/6PcC+q+LzPF/DQ==
+
+regenerator-runtime@^0.13.4:
+ version "0.13.5"
+ resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697"
+ integrity sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==
+
+require-directory@^2.1.1:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+ integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
+
+require-main-filename@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
+ integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
+
+require-main-filename@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
+ integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
+
safe-buffer@5.1.2:
version "5.1.2"
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
@@ -276,10 +1258,25 @@ safe-buffer@5.1.2:
resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
-send@0.16.2:
- version "0.16.2"
- resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1"
- integrity sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==
+secure-keys@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/secure-keys/-/secure-keys-1.0.0.tgz#f0c82d98a3b139a8776a8808050b824431087fca"
+ integrity sha1-8MgtmKOxOah3aogIBQuCRDEIf8o=
+
+select@^1.1.2:
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d"
+ integrity sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0=
+
+semver@^5.5.0:
+ version "5.7.1"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
+ integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+
+send@0.17.1:
+ version "0.17.1"
+ resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
+ integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==
dependencies:
debug "2.6.9"
depd "~1.1.2"
@@ -288,50 +1285,241 @@ send@0.16.2:
escape-html "~1.0.3"
etag "~1.8.1"
fresh "0.5.2"
- http-errors "~1.6.2"
- mime "1.4.1"
- ms "2.0.0"
+ http-errors "~1.7.2"
+ mime "1.6.0"
+ ms "2.1.1"
on-finished "~2.3.0"
- range-parser "~1.2.0"
- statuses "~1.4.0"
+ range-parser "~1.2.1"
+ statuses "~1.5.0"
-serve-static@1.13.2:
- version "1.13.2"
- resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1"
- integrity sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==
+serve-static@1.14.1:
+ version "1.14.1"
+ resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9"
+ integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==
dependencies:
encodeurl "~1.0.2"
escape-html "~1.0.3"
- parseurl "~1.3.2"
- send "0.16.2"
+ parseurl "~1.3.3"
+ send "0.17.1"
-setprototypeof@1.1.0:
+set-blocking@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+ integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
+
+setprototypeof@1.1.1:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
+ integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==
+
+shallowequal@^1.1.0:
version "1.1.0"
- resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
- integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
+ resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8"
+ integrity sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==
-"statuses@>= 1.4.0 < 2":
+shebang-command@^1.2.0:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+ integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
+ dependencies:
+ shebang-regex "^1.0.0"
+
+shebang-regex@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+ integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
+
+should-equal@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/should-equal/-/should-equal-2.0.0.tgz#6072cf83047360867e68e98b09d71143d04ee0c3"
+ integrity sha512-ZP36TMrK9euEuWQYBig9W55WPC7uo37qzAEmbjHz4gfyuXrEUgF8cUvQVO+w+d3OMfPvSRQJ22lSm8MQJ43LTA==
+ dependencies:
+ should-type "^1.4.0"
+
+should-format@^3.0.3:
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/should-format/-/should-format-3.0.3.tgz#9bfc8f74fa39205c53d38c34d717303e277124f1"
+ integrity sha1-m/yPdPo5IFxT04w01xcwPidxJPE=
+ dependencies:
+ should-type "^1.3.0"
+ should-type-adaptors "^1.0.1"
+
+should-type-adaptors@^1.0.1:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/should-type-adaptors/-/should-type-adaptors-1.1.0.tgz#401e7f33b5533033944d5cd8bf2b65027792e27a"
+ integrity sha512-JA4hdoLnN+kebEp2Vs8eBe9g7uy0zbRo+RMcU0EsNy+R+k049Ki+N5tT5Jagst2g7EAja+euFuoXFCa8vIklfA==
+ dependencies:
+ should-type "^1.3.0"
+ should-util "^1.0.0"
+
+should-type@^1.3.0, should-type@^1.4.0:
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/should-type/-/should-type-1.4.0.tgz#0756d8ce846dfd09843a6947719dfa0d4cff5cf3"
+ integrity sha1-B1bYzoRt/QmEOmlHcZ36DUz/XPM=
+
+should-util@^1.0.0:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/should-util/-/should-util-1.0.1.tgz#fb0d71338f532a3a149213639e2d32cbea8bcb28"
+ integrity sha512-oXF8tfxx5cDk8r2kYqlkUJzZpDBqVY/II2WhvU0n9Y3XYvAYRmeaf1PvvIvTgPnv4KJ+ES5M0PyDq5Jp+Ygy2g==
+
+should@^13.2.1:
+ version "13.2.3"
+ resolved "https://registry.yarnpkg.com/should/-/should-13.2.3.tgz#96d8e5acf3e97b49d89b51feaa5ae8d07ef58f10"
+ integrity sha512-ggLesLtu2xp+ZxI+ysJTmNjh2U0TsC+rQ/pfED9bUZZ4DKefP27D+7YJVVTvKsmjLpIi9jAa7itwDGkDDmt1GQ==
+ dependencies:
+ should-equal "^2.0.0"
+ should-format "^3.0.3"
+ should-type "^1.4.0"
+ should-type-adaptors "^1.0.1"
+ should-util "^1.0.0"
+
+signal-exit@^3.0.0:
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
+ integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
+
+slugify@^1.3.4:
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/slugify/-/slugify-1.4.0.tgz#c9557c653c54b0c7f7a8e786ef3431add676d2cb"
+ integrity sha512-FtLNsMGBSRB/0JOE2A0fxlqjI6fJsgHGS13iTuVT28kViI4JjUiNqp/vyis0ZXYcMnpR3fzGNkv+6vRlI2GwdQ==
+
+source-map@^0.7.3:
+ version "0.7.3"
+ resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
+ integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
+
+speccy@^0.11.0:
+ version "0.11.0"
+ resolved "https://registry.yarnpkg.com/speccy/-/speccy-0.11.0.tgz#8edcb76d3ebc146ae39a44f5ed095bd326fb07ff"
+ integrity sha512-f9XXngfae43WR9uz8m3yk935nsJIJH1YaRNNjEYqF+uL3yNlabFgixPKncJKXT2LfiMhhszwVSgrDgUaUvGBVQ==
+ dependencies:
+ commander "^2.18.0"
+ ejs "^2.5.2"
+ express "^4.14.0"
+ json-schema-to-openapi-schema "^0.3.0"
+ nconf "^0.10.0"
+ nconf-yaml "^1.0.2"
+ node-fetch "^2.3.0"
+ node-readfiles "^0.2.0"
+ oas-linter "^3.0.0"
+ oas-resolver "^2.2.4"
+ oas-validator "^3.0.1"
+ redoc v2.0.0-rc.8-1
+ yaml "^1.5.0"
+
+sprintf-js@~1.0.2:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+ integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
+
+"statuses@>= 1.5.0 < 2", statuses@~1.5.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
-statuses@~1.4.0:
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
- integrity sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==
+stickyfill@^1.1.1:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/stickyfill/-/stickyfill-1.1.1.tgz#39413fee9d025c74a7e59ceecb23784cc0f17f02"
+ integrity sha1-OUE/7p0CXHSn5ZzuyyN4TMDxfwI=
-swagger-ui-dist@^3.20.1:
- version "3.20.1"
- resolved "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-3.20.1.tgz#2e871faf29984bc5f253b8641ba38b244001cfa4"
- integrity sha512-iqFNNmJWH24leUj/ohS5iZTHLZSPZse8c9F+WSCMi6ZJcRBgYKcT413c8BR5BEdKvU1kkIwvYy7C8DOjTRq9hQ==
+string-width@^1.0.1:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+ integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
+ dependencies:
+ code-point-at "^1.0.0"
+ is-fullwidth-code-point "^1.0.0"
+ strip-ansi "^3.0.0"
-type-is@~1.6.16:
- version "1.6.16"
- resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
- integrity sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==
+string-width@^2.0.0, string-width@^2.1.1:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+ integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
+ dependencies:
+ is-fullwidth-code-point "^2.0.0"
+ strip-ansi "^4.0.0"
+
+string-width@^4.1.0, string-width@^4.2.0:
+ version "4.2.0"
+ resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5"
+ integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==
+ dependencies:
+ emoji-regex "^8.0.0"
+ is-fullwidth-code-point "^3.0.0"
+ strip-ansi "^6.0.0"
+
+strip-ansi@^3.0.0, strip-ansi@^3.0.1:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+ integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
+ dependencies:
+ ansi-regex "^2.0.0"
+
+strip-ansi@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+ integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
+ dependencies:
+ ansi-regex "^3.0.0"
+
+strip-ansi@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
+ integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
+ dependencies:
+ ansi-regex "^5.0.0"
+
+strip-eof@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
+ integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
+
+supports-color@^5.3.0:
+ version "5.5.0"
+ resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+ integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
+ dependencies:
+ has-flag "^3.0.0"
+
+swagger2openapi@^5.2.3:
+ version "5.4.0"
+ resolved "https://registry.yarnpkg.com/swagger2openapi/-/swagger2openapi-5.4.0.tgz#1e1c8909f7966b1f455bf1b66490093ac1c0029c"
+ integrity sha512-f5QqfXawiVijhjMtYqWZ55ESHPZFqrPC8L9idhIiuSX8O2qsa1i4MVGtCM3TQF+Smzr/6WfT/7zBuzG3aTgPAA==
+ dependencies:
+ better-ajv-errors "^0.6.1"
+ call-me-maybe "^1.0.1"
+ node-fetch-h2 "^2.3.0"
+ node-readfiles "^0.2.0"
+ oas-kit-common "^1.0.7"
+ oas-resolver "^2.3.0"
+ oas-schema-walker "^1.1.3"
+ oas-validator "^3.4.0"
+ reftools "^1.1.0"
+ yaml "^1.8.3"
+ yargs "^12.0.5"
+
+tiny-emitter@^2.0.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423"
+ integrity sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==
+
+toidentifier@1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
+ integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
+
+tslib@^1.9.3:
+ version "1.13.0"
+ resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043"
+ integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==
+
+type-is@~1.6.17, type-is@~1.6.18:
+ version "1.6.18"
+ resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
+ integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
dependencies:
media-typer "0.3.0"
- mime-types "~2.1.18"
+ mime-types "~2.1.24"
unpipe@1.0.0, unpipe@~1.0.0:
version "1.0.0"
@@ -347,3 +1535,121 @@ vary@~1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
+
+which-module@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
+ integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
+
+which@^1.2.9:
+ version "1.3.1"
+ resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+ integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
+ dependencies:
+ isexe "^2.0.0"
+
+window-size@^0.1.4:
+ version "0.1.4"
+ resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876"
+ integrity sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY=
+
+wrap-ansi@^2.0.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+ integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=
+ dependencies:
+ string-width "^1.0.1"
+ strip-ansi "^3.0.1"
+
+wrap-ansi@^6.2.0:
+ version "6.2.0"
+ resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
+ integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
+ dependencies:
+ ansi-styles "^4.0.0"
+ string-width "^4.1.0"
+ strip-ansi "^6.0.0"
+
+wrappy@1:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+ integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+
+y18n@^3.2.0:
+ version "3.2.1"
+ resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
+ integrity sha1-bRX7qITAhnnA136I53WegR4H+kE=
+
+"y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
+ integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
+
+yaml@^1.5.0, yaml@^1.8.3:
+ version "1.10.0"
+ resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz#3b593add944876077d4d683fee01081bd9fff31e"
+ integrity sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==
+
+yargs-parser@^11.1.1:
+ version "11.1.1"
+ resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"
+ integrity sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==
+ dependencies:
+ camelcase "^5.0.0"
+ decamelize "^1.2.0"
+
+yargs-parser@^18.1.1:
+ version "18.1.3"
+ resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
+ integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
+ dependencies:
+ camelcase "^5.0.0"
+ decamelize "^1.2.0"
+
+yargs@^12.0.5:
+ version "12.0.5"
+ resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
+ integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==
+ dependencies:
+ cliui "^4.0.0"
+ decamelize "^1.2.0"
+ find-up "^3.0.0"
+ get-caller-file "^1.0.1"
+ os-locale "^3.0.0"
+ require-directory "^2.1.1"
+ require-main-filename "^1.0.1"
+ set-blocking "^2.0.0"
+ string-width "^2.0.0"
+ which-module "^2.0.0"
+ y18n "^3.2.1 || ^4.0.0"
+ yargs-parser "^11.1.1"
+
+yargs@^15.3.1:
+ version "15.3.1"
+ resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.3.1.tgz#9505b472763963e54afe60148ad27a330818e98b"
+ integrity sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==
+ dependencies:
+ cliui "^6.0.0"
+ decamelize "^1.2.0"
+ find-up "^4.1.0"
+ get-caller-file "^2.0.1"
+ require-directory "^2.1.1"
+ require-main-filename "^2.0.0"
+ set-blocking "^2.0.0"
+ string-width "^4.2.0"
+ which-module "^2.0.0"
+ y18n "^4.0.0"
+ yargs-parser "^18.1.1"
+
+yargs@^3.19.0:
+ version "3.32.0"
+ resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.32.0.tgz#03088e9ebf9e756b69751611d2a5ef591482c995"
+ integrity sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU=
+ dependencies:
+ camelcase "^2.0.1"
+ cliui "^3.0.3"
+ decamelize "^1.1.1"
+ os-locale "^1.4.0"
+ string-width "^1.0.1"
+ window-size "^0.1.4"
+ y18n "^3.2.0"
diff --git a/querylog/decode.go b/querylog/decode.go
new file mode 100644
index 00000000..3f381140
--- /dev/null
+++ b/querylog/decode.go
@@ -0,0 +1,175 @@
+package querylog
+
+import (
+ "encoding/base64"
+ "strconv"
+ "strings"
+ "time"
+
+ "github.com/AdguardTeam/AdGuardHome/dnsfilter"
+ "github.com/AdguardTeam/golibs/log"
+ "github.com/miekg/dns"
+)
+
+// decodeLogEntry - decodes query log entry from a line
+// nolint (gocyclo)
+func decodeLogEntry(ent *logEntry, str string) {
+ var b bool
+ var i int
+ var err error
+ for {
+ k, v, t := readJSON(&str)
+ if t == jsonTErr {
+ break
+ }
+ switch k {
+ case "IP":
+ if len(ent.IP) == 0 {
+ ent.IP = v
+ }
+ case "T":
+ ent.Time, err = time.Parse(time.RFC3339, v)
+
+ case "QH":
+ ent.QHost = v
+ case "QT":
+ ent.QType = v
+ case "QC":
+ ent.QClass = v
+
+ case "Answer":
+ ent.Answer, err = base64.StdEncoding.DecodeString(v)
+ case "OrigAnswer":
+ ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
+
+ case "IsFiltered":
+ b, err = strconv.ParseBool(v)
+ ent.Result.IsFiltered = b
+ case "Rule":
+ ent.Result.Rule = v
+ case "FilterID":
+ i, err = strconv.Atoi(v)
+ ent.Result.FilterID = int64(i)
+ case "Reason":
+ i, err = strconv.Atoi(v)
+ ent.Result.Reason = dnsfilter.Reason(i)
+
+ case "Upstream":
+ ent.Upstream = v
+ case "Elapsed":
+ i, err = strconv.Atoi(v)
+ ent.Elapsed = time.Duration(i)
+
+ // pre-v0.99.3 compatibility:
+ case "Question":
+ var qstr []byte
+ qstr, err = base64.StdEncoding.DecodeString(v)
+ if err != nil {
+ break
+ }
+ q := new(dns.Msg)
+ err = q.Unpack(qstr)
+ if err != nil {
+ break
+ }
+ ent.QHost = q.Question[0].Name
+ if len(ent.QHost) == 0 {
+ break
+ }
+ ent.QHost = ent.QHost[:len(ent.QHost)-1]
+ ent.QType = dns.TypeToString[q.Question[0].Qtype]
+ ent.QClass = dns.ClassToString[q.Question[0].Qclass]
+ case "Time":
+ ent.Time, err = time.Parse(time.RFC3339, v)
+ }
+
+ if err != nil {
+ log.Debug("decodeLogEntry err: %s", err)
+ break
+ }
+ }
+}
+
+// Get value from "key":"value"
+func readJSONValue(s, name string) string {
+ i := strings.Index(s, "\""+name+"\":\"")
+ if i == -1 {
+ return ""
+ }
+ start := i + 1 + len(name) + 3
+ i = strings.IndexByte(s[start:], '"')
+ if i == -1 {
+ return ""
+ }
+ end := start + i
+ return s[start:end]
+}
+
+const (
+ jsonTErr = iota
+ jsonTObj
+ jsonTStr
+ jsonTNum
+ jsonTBool
+)
+
+// Parse JSON key-value pair
+// e.g.: "key":VALUE where VALUE is "string", true|false (boolean), or 123.456 (number)
+// Note the limitations:
+// . doesn't support whitespace
+// . doesn't support "null"
+// . doesn't validate boolean or number
+// . no proper handling of {} braces
+// . no handling of [] brackets
+// Return (key, value, type)
+func readJSON(ps *string) (string, string, int32) {
+ s := *ps
+ k := ""
+ v := ""
+ t := int32(jsonTErr)
+
+ q1 := strings.IndexByte(s, '"')
+ if q1 == -1 {
+ return k, v, t
+ }
+ q2 := strings.IndexByte(s[q1+1:], '"')
+ if q2 == -1 {
+ return k, v, t
+ }
+ k = s[q1+1 : q1+1+q2]
+ s = s[q1+1+q2+1:]
+
+ if len(s) < 2 || s[0] != ':' {
+ return k, v, t
+ }
+
+ if s[1] == '"' {
+ q2 = strings.IndexByte(s[2:], '"')
+ if q2 == -1 {
+ return k, v, t
+ }
+ v = s[2 : 2+q2]
+ t = jsonTStr
+ s = s[2+q2+1:]
+
+ } else if s[1] == '{' {
+ t = jsonTObj
+ s = s[1+1:]
+
+ } else {
+ sep := strings.IndexAny(s[1:], ",}")
+ if sep == -1 {
+ return k, v, t
+ }
+ v = s[1 : 1+sep]
+ if s[1] == 't' || s[1] == 'f' {
+ t = jsonTBool
+ } else if s[1] == '.' || (s[1] >= '0' && s[1] <= '9') {
+ t = jsonTNum
+ }
+ s = s[1+sep+1:]
+ }
+
+ *ps = s
+ return k, v, t
+}
diff --git a/querylog/decode_test.go b/querylog/decode_test.go
new file mode 100644
index 00000000..b5b3b7d9
--- /dev/null
+++ b/querylog/decode_test.go
@@ -0,0 +1,34 @@
+package querylog
+
+import (
+ "testing"
+
+ "github.com/stretchr/testify/assert"
+)
+
+func TestJSON(t *testing.T) {
+ s := `
+ {"keystr":"val","obj":{"keybool":true,"keyint":123456}}
+ `
+ k, v, jtype := readJSON(&s)
+ assert.Equal(t, jtype, int32(jsonTStr))
+ assert.Equal(t, "keystr", k)
+ assert.Equal(t, "val", v)
+
+ k, v, jtype = readJSON(&s)
+ assert.Equal(t, jtype, int32(jsonTObj))
+ assert.Equal(t, "obj", k)
+
+ k, v, jtype = readJSON(&s)
+ assert.Equal(t, jtype, int32(jsonTBool))
+ assert.Equal(t, "keybool", k)
+ assert.Equal(t, "true", v)
+
+ k, v, jtype = readJSON(&s)
+ assert.Equal(t, jtype, int32(jsonTNum))
+ assert.Equal(t, "keyint", k)
+ assert.Equal(t, "123456", v)
+
+ k, v, jtype = readJSON(&s)
+ assert.True(t, jtype == jsonTErr)
+}
diff --git a/querylog/json.go b/querylog/json.go
new file mode 100644
index 00000000..86f35e11
--- /dev/null
+++ b/querylog/json.go
@@ -0,0 +1,164 @@
+package querylog
+
+import (
+ "fmt"
+ "net"
+ "strconv"
+ "time"
+
+ "github.com/AdguardTeam/golibs/log"
+ "github.com/miekg/dns"
+)
+
+// Get Client IP address
+func (l *queryLog) getClientIP(clientIP string) string {
+ if l.conf.AnonymizeClientIP {
+ ip := net.ParseIP(clientIP)
+ if ip != nil {
+ ip4 := ip.To4()
+ const AnonymizeClientIP4Mask = 24
+ const AnonymizeClientIP6Mask = 112
+ if ip4 != nil {
+ clientIP = ip4.Mask(net.CIDRMask(AnonymizeClientIP4Mask, 32)).String()
+ } else {
+ clientIP = ip.Mask(net.CIDRMask(AnonymizeClientIP6Mask, 128)).String()
+ }
+ }
+ }
+
+ return clientIP
+}
+
+// entriesToJSON - converts log entries to JSON
+func (l *queryLog) entriesToJSON(entries []*logEntry, oldest time.Time) map[string]interface{} {
+ // init the response object
+ var data = []map[string]interface{}{}
+
+ // the elements order is already reversed (from newer to older)
+ for i := 0; i < len(entries); i++ {
+ entry := entries[i]
+ jsonEntry := l.logEntryToJSONEntry(entry)
+ data = append(data, jsonEntry)
+ }
+
+ var result = map[string]interface{}{}
+ result["oldest"] = ""
+ if !oldest.IsZero() {
+ result["oldest"] = oldest.Format(time.RFC3339Nano)
+ }
+ result["data"] = data
+
+ return result
+}
+
+func (l *queryLog) logEntryToJSONEntry(entry *logEntry) map[string]interface{} {
+ var msg *dns.Msg
+
+ if len(entry.Answer) > 0 {
+ msg = new(dns.Msg)
+ if err := msg.Unpack(entry.Answer); err != nil {
+ log.Debug("Failed to unpack dns message answer: %s: %s", err, string(entry.Answer))
+ msg = nil
+ }
+ }
+
+ jsonEntry := map[string]interface{}{
+ "reason": entry.Result.Reason.String(),
+ "elapsedMs": strconv.FormatFloat(entry.Elapsed.Seconds()*1000, 'f', -1, 64),
+ "time": entry.Time.Format(time.RFC3339Nano),
+ "client": l.getClientIP(entry.IP),
+ }
+ jsonEntry["question"] = map[string]interface{}{
+ "host": entry.QHost,
+ "type": entry.QType,
+ "class": entry.QClass,
+ }
+
+ if msg != nil {
+ jsonEntry["status"] = dns.RcodeToString[msg.Rcode]
+
+ opt := msg.IsEdns0()
+ dnssecOk := false
+ if opt != nil {
+ dnssecOk = opt.Do()
+ }
+ jsonEntry["answer_dnssec"] = dnssecOk
+ }
+
+ if len(entry.Result.Rule) > 0 {
+ jsonEntry["rule"] = entry.Result.Rule
+ jsonEntry["filterId"] = entry.Result.FilterID
+ }
+
+ if len(entry.Result.ServiceName) != 0 {
+ jsonEntry["service_name"] = entry.Result.ServiceName
+ }
+
+ answers := answerToMap(msg)
+ if answers != nil {
+ jsonEntry["answer"] = answers
+ }
+
+ if len(entry.OrigAnswer) != 0 {
+ a := new(dns.Msg)
+ err := a.Unpack(entry.OrigAnswer)
+ if err == nil {
+ answers = answerToMap(a)
+ if answers != nil {
+ jsonEntry["original_answer"] = answers
+ }
+ } else {
+ log.Debug("Querylog: msg.Unpack(entry.OrigAnswer): %s: %s", err, string(entry.OrigAnswer))
+ }
+ }
+
+ return jsonEntry
+}
+
+func answerToMap(a *dns.Msg) []map[string]interface{} {
+ if a == nil || len(a.Answer) == 0 {
+ return nil
+ }
+
+ var answers = []map[string]interface{}{}
+ for _, k := range a.Answer {
+ header := k.Header()
+ answer := map[string]interface{}{
+ "type": dns.TypeToString[header.Rrtype],
+ "ttl": header.Ttl,
+ }
+ // try most common record types
+ switch v := k.(type) {
+ case *dns.A:
+ answer["value"] = v.A.String()
+ case *dns.AAAA:
+ answer["value"] = v.AAAA.String()
+ case *dns.MX:
+ answer["value"] = fmt.Sprintf("%v %v", v.Preference, v.Mx)
+ case *dns.CNAME:
+ answer["value"] = v.Target
+ case *dns.NS:
+ answer["value"] = v.Ns
+ case *dns.SPF:
+ answer["value"] = v.Txt
+ case *dns.TXT:
+ answer["value"] = v.Txt
+ case *dns.PTR:
+ answer["value"] = v.Ptr
+ case *dns.SOA:
+ answer["value"] = fmt.Sprintf("%v %v %v %v %v %v %v", v.Ns, v.Mbox, v.Serial, v.Refresh, v.Retry, v.Expire, v.Minttl)
+ case *dns.CAA:
+ answer["value"] = fmt.Sprintf("%v %v \"%v\"", v.Flag, v.Tag, v.Value)
+ case *dns.HINFO:
+ answer["value"] = fmt.Sprintf("\"%v\" \"%v\"", v.Cpu, v.Os)
+ case *dns.RRSIG:
+ answer["value"] = fmt.Sprintf("%v %v %v %v %v %v %v %v %v", dns.TypeToString[v.TypeCovered], v.Algorithm, v.Labels, v.OrigTtl, v.Expiration, v.Inception, v.KeyTag, v.SignerName, v.Signature)
+ default:
+ // type unknown, marshall it as-is
+ answer["value"] = v
+ }
+ answers = append(answers, answer)
+ }
+
+ return answers
+}
diff --git a/querylog/qlog.go b/querylog/qlog.go
index 247bb519..27bcc01e 100644
--- a/querylog/qlog.go
+++ b/querylog/qlog.go
@@ -1,11 +1,8 @@
package querylog
import (
- "fmt"
- "net"
"os"
"path/filepath"
- "strconv"
"strings"
"sync"
"time"
@@ -17,10 +14,6 @@ import (
const (
queryLogFileName = "querylog.json" // .gz added during compression
- getDataLimit = 500 // GetData(): maximum log entries to return
-
- // maximum entries to parse when searching
- maxSearchEntries = 50000
)
// queryLog is a structure that writes and reads the DNS query log
@@ -36,6 +29,23 @@ type queryLog struct {
fileWriteLock sync.Mutex
}
+// logEntry - represents a single log entry
+type logEntry struct {
+ IP string `json:"IP"` // Client IP
+ Time time.Time `json:"T"`
+
+ QHost string `json:"QH"`
+ QType string `json:"QT"`
+ QClass string `json:"QC"`
+
+ Answer []byte `json:",omitempty"` // sometimes empty answers happen like binerdunt.top or rev2.globalrootservers.net
+ OrigAnswer []byte `json:",omitempty"`
+
+ Result dnsfilter.Result
+ Elapsed time.Duration
+ Upstream string `json:",omitempty"` // if empty, means it was cached
+}
+
// create a new instance of the query log
func newQueryLog(conf Config) *queryLog {
l := queryLog{}
@@ -63,11 +73,8 @@ func checkInterval(days uint32) bool {
return days == 1 || days == 7 || days == 30 || days == 90
}
-func (l *queryLog) WriteDiskConfig(dc *DiskConfig) {
- dc.Enabled = l.conf.Enabled
- dc.Interval = l.conf.Interval
- dc.MemSize = l.conf.MemSize
- dc.AnonymizeClientIP = l.conf.AnonymizeClientIP
+func (l *queryLog) WriteDiskConfig(c *Config) {
+ *c = *l.conf
}
// Clear memory buffer and remove log files
@@ -93,22 +100,6 @@ func (l *queryLog) clear() {
log.Debug("Query log: cleared")
}
-type logEntry struct {
- IP string `json:"IP"`
- Time time.Time `json:"T"`
-
- QHost string `json:"QH"`
- QType string `json:"QT"`
- QClass string `json:"QC"`
-
- Answer []byte `json:",omitempty"` // sometimes empty answers happen like binerdunt.top or rev2.globalrootservers.net
- OrigAnswer []byte `json:",omitempty"`
-
- Result dnsfilter.Result
- Elapsed time.Duration
- Upstream string `json:",omitempty"` // if empty, means it was cached
-}
-
func (l *queryLog) Add(params AddParams) {
if !l.conf.Enabled {
return
@@ -158,7 +149,14 @@ func (l *queryLog) Add(params AddParams) {
l.bufferLock.Lock()
l.buffer = append(l.buffer, &entry)
needFlush := false
- if !l.flushPending {
+
+ if !l.conf.FileEnabled {
+ if len(l.buffer) > int(l.conf.MemSize) {
+ // writing to file is disabled - just remove the oldest entry from array
+ l.buffer = l.buffer[1:]
+ }
+
+ } else if !l.flushPending {
needFlush = len(l.buffer) >= int(l.conf.MemSize)
if needFlush {
l.flushPending = true
@@ -168,235 +166,8 @@ func (l *queryLog) Add(params AddParams) {
// if buffer needs to be flushed to disk, do it now
if needFlush {
- // write to file
- // do it in separate goroutine -- we are stalling DNS response this whole time
- go l.flushLogBuffer(false) // nolint
+ go func() {
+ _ = l.flushLogBuffer(false)
+ }()
}
}
-
-// Parameters for getData()
-type getDataParams struct {
- OlderThan time.Time // return entries that are older than this value
- Domain string // filter by domain name in question
- Client string // filter by client IP
- QuestionType string // filter by question type
- ResponseStatus responseStatusType // filter by response status
- StrictMatchDomain bool // if Domain value must be matched strictly
- StrictMatchClient bool // if Client value must be matched strictly
-}
-
-// Response status
-type responseStatusType int32
-
-// Response status constants
-const (
- responseStatusAll responseStatusType = iota + 1
- responseStatusFiltered
-)
-
-// Gets log entries
-func (l *queryLog) getData(params getDataParams) map[string]interface{} {
- now := time.Now()
-
- if len(params.Client) != 0 && l.conf.AnonymizeClientIP {
- params.Client = l.getClientIP(params.Client)
- }
-
- // add from file
- fileEntries, oldest, total := l.searchFiles(params)
-
- if params.OlderThan.IsZero() {
- // In case if the timer is not precise (for instance, on Windows)
- // We really want to get all records including those added just before the call
- params.OlderThan = now.Add(time.Millisecond)
- }
-
- // add from memory buffer
- l.bufferLock.Lock()
- total += len(l.buffer)
- memoryEntries := make([]*logEntry, 0)
-
- // go through the buffer in the reverse order
- // from NEWER to OLDER
- for i := len(l.buffer) - 1; i >= 0; i-- {
- entry := l.buffer[i]
-
- if entry.Time.UnixNano() >= params.OlderThan.UnixNano() {
- // Ignore entries newer than what was requested
- continue
- }
-
- if !matchesGetDataParams(entry, params) {
- continue
- }
-
- memoryEntries = append(memoryEntries, entry)
- }
- l.bufferLock.Unlock()
-
- // now let's get a unified collection
- entries := append(memoryEntries, fileEntries...)
- if len(entries) > getDataLimit {
- // remove extra records
- entries = entries[:getDataLimit]
- }
- if len(entries) == getDataLimit {
- // change the "oldest" value here.
- // we cannot use the "oldest" we got from "searchFiles" anymore
- // because after adding in-memory records and removing extra records
- // the situation has changed
- oldest = entries[len(entries)-1].Time
- }
-
- // init the response object
- var data = []map[string]interface{}{}
-
- // the elements order is already reversed (from newer to older)
- for i := 0; i < len(entries); i++ {
- entry := entries[i]
- jsonEntry := l.logEntryToJSONEntry(entry)
- data = append(data, jsonEntry)
- }
-
- log.Debug("QueryLog: prepared data (%d/%d) older than %s in %s",
- len(entries), total, params.OlderThan, time.Since(now))
-
- var result = map[string]interface{}{}
- result["oldest"] = ""
- if !oldest.IsZero() {
- result["oldest"] = oldest.Format(time.RFC3339Nano)
- }
- result["data"] = data
- return result
-}
-
-// Get Client IP address
-func (l *queryLog) getClientIP(clientIP string) string {
- if l.conf.AnonymizeClientIP {
- ip := net.ParseIP(clientIP)
- if ip != nil {
- ip4 := ip.To4()
- const AnonymizeClientIP4Mask = 24
- const AnonymizeClientIP6Mask = 112
- if ip4 != nil {
- clientIP = ip4.Mask(net.CIDRMask(AnonymizeClientIP4Mask, 32)).String()
- } else {
- clientIP = ip.Mask(net.CIDRMask(AnonymizeClientIP6Mask, 128)).String()
- }
- }
- }
-
- return clientIP
-}
-
-func (l *queryLog) logEntryToJSONEntry(entry *logEntry) map[string]interface{} {
- var msg *dns.Msg
-
- if len(entry.Answer) > 0 {
- msg = new(dns.Msg)
- if err := msg.Unpack(entry.Answer); err != nil {
- log.Debug("Failed to unpack dns message answer: %s: %s", err, string(entry.Answer))
- msg = nil
- }
- }
-
- jsonEntry := map[string]interface{}{
- "reason": entry.Result.Reason.String(),
- "elapsedMs": strconv.FormatFloat(entry.Elapsed.Seconds()*1000, 'f', -1, 64),
- "time": entry.Time.Format(time.RFC3339Nano),
- "client": l.getClientIP(entry.IP),
- }
- jsonEntry["question"] = map[string]interface{}{
- "host": entry.QHost,
- "type": entry.QType,
- "class": entry.QClass,
- }
-
- if msg != nil {
- jsonEntry["status"] = dns.RcodeToString[msg.Rcode]
-
- opt := msg.IsEdns0()
- dnssecOk := false
- if opt != nil {
- dnssecOk = opt.Do()
- }
- jsonEntry["answer_dnssec"] = dnssecOk
- }
-
- if len(entry.Result.Rule) > 0 {
- jsonEntry["rule"] = entry.Result.Rule
- jsonEntry["filterId"] = entry.Result.FilterID
- }
-
- if len(entry.Result.ServiceName) != 0 {
- jsonEntry["service_name"] = entry.Result.ServiceName
- }
-
- answers := answerToMap(msg)
- if answers != nil {
- jsonEntry["answer"] = answers
- }
-
- if len(entry.OrigAnswer) != 0 {
- a := new(dns.Msg)
- err := a.Unpack(entry.OrigAnswer)
- if err == nil {
- answers = answerToMap(a)
- if answers != nil {
- jsonEntry["original_answer"] = answers
- }
- } else {
- log.Debug("Querylog: msg.Unpack(entry.OrigAnswer): %s: %s", err, string(entry.OrigAnswer))
- }
- }
-
- return jsonEntry
-}
-
-func answerToMap(a *dns.Msg) []map[string]interface{} {
- if a == nil || len(a.Answer) == 0 {
- return nil
- }
-
- var answers = []map[string]interface{}{}
- for _, k := range a.Answer {
- header := k.Header()
- answer := map[string]interface{}{
- "type": dns.TypeToString[header.Rrtype],
- "ttl": header.Ttl,
- }
- // try most common record types
- switch v := k.(type) {
- case *dns.A:
- answer["value"] = v.A.String()
- case *dns.AAAA:
- answer["value"] = v.AAAA.String()
- case *dns.MX:
- answer["value"] = fmt.Sprintf("%v %v", v.Preference, v.Mx)
- case *dns.CNAME:
- answer["value"] = v.Target
- case *dns.NS:
- answer["value"] = v.Ns
- case *dns.SPF:
- answer["value"] = v.Txt
- case *dns.TXT:
- answer["value"] = v.Txt
- case *dns.PTR:
- answer["value"] = v.Ptr
- case *dns.SOA:
- answer["value"] = fmt.Sprintf("%v %v %v %v %v %v %v", v.Ns, v.Mbox, v.Serial, v.Refresh, v.Retry, v.Expire, v.Minttl)
- case *dns.CAA:
- answer["value"] = fmt.Sprintf("%v %v \"%v\"", v.Flag, v.Tag, v.Value)
- case *dns.HINFO:
- answer["value"] = fmt.Sprintf("\"%v\" \"%v\"", v.Cpu, v.Os)
- case *dns.RRSIG:
- answer["value"] = fmt.Sprintf("%v %v %v %v %v %v %v %v %v", dns.TypeToString[v.TypeCovered], v.Algorithm, v.Labels, v.OrigTtl, v.Expiration, v.Inception, v.KeyTag, v.SignerName, v.Signature)
- default:
- // type unknown, marshall it as-is
- answer["value"] = v
- }
- answers = append(answers, answer)
- }
-
- return answers
-}
diff --git a/querylog/qlog_http.go b/querylog/qlog_http.go
index fae8dba6..19caa35c 100644
--- a/querylog/qlog_http.go
+++ b/querylog/qlog_http.go
@@ -4,13 +4,30 @@ import (
"encoding/json"
"fmt"
"net/http"
+ "net/url"
+ "strconv"
"time"
+ "github.com/AdguardTeam/AdGuardHome/util"
+
"github.com/AdguardTeam/golibs/jsonutil"
"github.com/AdguardTeam/golibs/log"
- "github.com/miekg/dns"
)
+type qlogConfig struct {
+ Enabled bool `json:"enabled"`
+ Interval uint32 `json:"interval"`
+ AnonymizeClientIP bool `json:"anonymize_client_ip"`
+}
+
+// Register web handlers
+func (l *queryLog) initWeb() {
+ l.conf.HTTPRegister("GET", "/control/querylog", l.handleQueryLog)
+ l.conf.HTTPRegister("GET", "/control/querylog_info", l.handleQueryLogInfo)
+ l.conf.HTTPRegister("POST", "/control/querylog_clear", l.handleQueryLogClear)
+ l.conf.HTTPRegister("POST", "/control/querylog_config", l.handleQueryLogConfig)
+}
+
func httpError(r *http.Request, w http.ResponseWriter, code int, format string, args ...interface{}) {
text := fmt.Sprintf(format, args...)
@@ -19,74 +36,18 @@ func httpError(r *http.Request, w http.ResponseWriter, code int, format string,
http.Error(w, text, code)
}
-type request struct {
- olderThan string
- filterDomain string
- filterClient string
- filterQuestionType string
- filterResponseStatus string
-}
-
-// "value" -> value, return TRUE
-func getDoubleQuotesEnclosedValue(s *string) bool {
- t := *s
- if len(t) >= 2 && t[0] == '"' && t[len(t)-1] == '"' {
- *s = t[1 : len(t)-1]
- return true
- }
- return false
-}
-
func (l *queryLog) handleQueryLog(w http.ResponseWriter, r *http.Request) {
- var err error
- req := request{}
- q := r.URL.Query()
- req.olderThan = q.Get("older_than")
- req.filterDomain = q.Get("filter_domain")
- req.filterClient = q.Get("filter_client")
- req.filterQuestionType = q.Get("filter_question_type")
- req.filterResponseStatus = q.Get("filter_response_status")
-
- params := getDataParams{
- Domain: req.filterDomain,
- Client: req.filterClient,
- ResponseStatus: responseStatusAll,
- }
- if len(req.olderThan) != 0 {
- params.OlderThan, err = time.Parse(time.RFC3339Nano, req.olderThan)
- if err != nil {
- httpError(r, w, http.StatusBadRequest, "invalid time stamp: %s", err)
- return
- }
+ params, err := l.parseSearchParams(r)
+ if err != nil {
+ httpError(r, w, http.StatusBadRequest, "failed to parse params: %s", err)
+ return
}
- if getDoubleQuotesEnclosedValue(¶ms.Domain) {
- params.StrictMatchDomain = true
- }
- if getDoubleQuotesEnclosedValue(¶ms.Client) {
- params.StrictMatchClient = true
- }
+ // search for the log entries
+ entries, oldest := l.search(params)
- if len(req.filterQuestionType) != 0 {
- _, ok := dns.StringToType[req.filterQuestionType]
- if !ok {
- httpError(r, w, http.StatusBadRequest, "invalid question_type")
- return
- }
- params.QuestionType = req.filterQuestionType
- }
-
- if len(req.filterResponseStatus) != 0 {
- switch req.filterResponseStatus {
- case "filtered":
- params.ResponseStatus = responseStatusFiltered
- default:
- httpError(r, w, http.StatusBadRequest, "invalid response_status")
- return
- }
- }
-
- data := l.getData(params)
+ // convert log entries to JSON
+ var data = l.entriesToJSON(entries, oldest)
jsonVal, err := json.Marshal(data)
if err != nil {
@@ -101,16 +62,10 @@ func (l *queryLog) handleQueryLog(w http.ResponseWriter, r *http.Request) {
}
}
-func (l *queryLog) handleQueryLogClear(w http.ResponseWriter, r *http.Request) {
+func (l *queryLog) handleQueryLogClear(_ http.ResponseWriter, _ *http.Request) {
l.clear()
}
-type qlogConfig struct {
- Enabled bool `json:"enabled"`
- Interval uint32 `json:"interval"`
- AnonymizeClientIP bool `json:"anonymize_client_ip"`
-}
-
// Get configuration
func (l *queryLog) handleQueryLogInfo(w http.ResponseWriter, r *http.Request) {
resp := qlogConfig{}
@@ -162,10 +117,85 @@ func (l *queryLog) handleQueryLogConfig(w http.ResponseWriter, r *http.Request)
l.conf.ConfigModified()
}
-// Register web handlers
-func (l *queryLog) initWeb() {
- l.conf.HTTPRegister("GET", "/control/querylog", l.handleQueryLog)
- l.conf.HTTPRegister("GET", "/control/querylog_info", l.handleQueryLogInfo)
- l.conf.HTTPRegister("POST", "/control/querylog_clear", l.handleQueryLogClear)
- l.conf.HTTPRegister("POST", "/control/querylog_config", l.handleQueryLogConfig)
+// "value" -> value, return TRUE
+func getDoubleQuotesEnclosedValue(s *string) bool {
+ t := *s
+ if len(t) >= 2 && t[0] == '"' && t[len(t)-1] == '"' {
+ *s = t[1 : len(t)-1]
+ return true
+ }
+ return false
+}
+
+// parseSearchCriteria - parses "searchCriteria" from the specified query parameter
+func (l *queryLog) parseSearchCriteria(q url.Values, name string, ct criteriaType) (bool, searchCriteria, error) {
+ val := q.Get(name)
+ if len(val) == 0 {
+ return false, searchCriteria{}, nil
+ }
+
+ c := searchCriteria{
+ criteriaType: ct,
+ value: val,
+ }
+ if getDoubleQuotesEnclosedValue(&c.value) {
+ c.strict = true
+ }
+
+ if ct == ctClient && l.conf.AnonymizeClientIP {
+ c.value = l.getClientIP(c.value)
+ }
+
+ if ct == ctFilteringStatus && !util.ContainsString(filteringStatusValues, c.value) {
+ return false, c, fmt.Errorf("invalid value %s", c.value)
+ }
+
+ return true, c, nil
+}
+
+// parseSearchParams - parses "searchParams" from the HTTP request's query string
+func (l *queryLog) parseSearchParams(r *http.Request) (*searchParams, error) {
+ p := newSearchParams()
+
+ var err error
+ q := r.URL.Query()
+ olderThan := q.Get("older_than")
+ if len(olderThan) != 0 {
+ p.olderThan, err = time.Parse(time.RFC3339Nano, olderThan)
+ if err != nil {
+ return nil, err
+ }
+ }
+
+ if limit, err := strconv.ParseInt(q.Get("limit"), 10, 64); err == nil {
+ p.limit = int(limit)
+
+ // If limit or offset are specified explicitly, we should change the default behavior
+ // and scan all log records until we found enough log entries
+ p.maxFileScanEntries = 0
+ }
+ if offset, err := strconv.ParseInt(q.Get("offset"), 10, 64); err == nil {
+ p.offset = int(offset)
+ p.maxFileScanEntries = 0
+ }
+
+ paramNames := map[string]criteriaType{
+ "filter_domain": ctDomain,
+ "filter_client": ctClient,
+ "filter_question_type": ctQuestionType,
+ "filter_response_status": ctFilteringStatus,
+ }
+
+ for k, v := range paramNames {
+ ok, c, err := l.parseSearchCriteria(q, k, v)
+ if err != nil {
+ return nil, err
+ }
+
+ if ok {
+ p.searchCriteria = append(p.searchCriteria, c)
+ }
+ }
+
+ return p, nil
}
diff --git a/querylog/qlog_test.go b/querylog/qlog_test.go
new file mode 100644
index 00000000..921d2870
--- /dev/null
+++ b/querylog/qlog_test.go
@@ -0,0 +1,253 @@
+package querylog
+
+import (
+ "net"
+ "os"
+ "testing"
+
+ "github.com/AdguardTeam/dnsproxy/proxyutil"
+
+ "github.com/AdguardTeam/AdGuardHome/dnsfilter"
+ "github.com/miekg/dns"
+ "github.com/stretchr/testify/assert"
+)
+
+func prepareTestDir() string {
+ const dir = "./agh-test"
+ _ = os.RemoveAll(dir)
+ _ = os.MkdirAll(dir, 0755)
+ return dir
+}
+
+// Check adding and loading (with filtering) entries from disk and memory
+func TestQueryLog(t *testing.T) {
+ conf := Config{
+ Enabled: true,
+ FileEnabled: true,
+ Interval: 1,
+ MemSize: 100,
+ }
+ conf.BaseDir = prepareTestDir()
+ defer func() { _ = os.RemoveAll(conf.BaseDir) }()
+ l := newQueryLog(conf)
+
+ // add disk entries
+ addEntry(l, "example.org", "1.1.1.1", "2.2.2.1")
+ // write to disk (first file)
+ _ = l.flushLogBuffer(true)
+ // start writing to the second file
+ _ = l.rotate()
+ // add disk entries
+ addEntry(l, "example.org", "1.1.1.2", "2.2.2.2")
+ // write to disk
+ _ = l.flushLogBuffer(true)
+ // add memory entries
+ addEntry(l, "test.example.org", "1.1.1.3", "2.2.2.3")
+ addEntry(l, "example.com", "1.1.1.4", "2.2.2.4")
+
+ // get all entries
+ params := newSearchParams()
+ entries, _ := l.search(params)
+ assert.Equal(t, 4, len(entries))
+ assertLogEntry(t, entries[0], "example.com", "1.1.1.4", "2.2.2.4")
+ assertLogEntry(t, entries[1], "test.example.org", "1.1.1.3", "2.2.2.3")
+ assertLogEntry(t, entries[2], "example.org", "1.1.1.2", "2.2.2.2")
+ assertLogEntry(t, entries[3], "example.org", "1.1.1.1", "2.2.2.1")
+
+ // search by domain (strict)
+ params = newSearchParams()
+ params.searchCriteria = append(params.searchCriteria, searchCriteria{
+ criteriaType: ctDomain,
+ strict: true,
+ value: "test.example.org",
+ })
+ entries, _ = l.search(params)
+ assert.Equal(t, 1, len(entries))
+ assertLogEntry(t, entries[0], "test.example.org", "1.1.1.3", "2.2.2.3")
+
+ // search by domain (not strict)
+ params = newSearchParams()
+ params.searchCriteria = append(params.searchCriteria, searchCriteria{
+ criteriaType: ctDomain,
+ strict: false,
+ value: "example.org",
+ })
+ entries, _ = l.search(params)
+ assert.Equal(t, 3, len(entries))
+ assertLogEntry(t, entries[0], "test.example.org", "1.1.1.3", "2.2.2.3")
+ assertLogEntry(t, entries[1], "example.org", "1.1.1.2", "2.2.2.2")
+ assertLogEntry(t, entries[2], "example.org", "1.1.1.1", "2.2.2.1")
+
+ // search by client IP (strict)
+ params = newSearchParams()
+ params.searchCriteria = append(params.searchCriteria, searchCriteria{
+ criteriaType: ctClient,
+ strict: true,
+ value: "2.2.2.2",
+ })
+ entries, _ = l.search(params)
+ assert.Equal(t, 1, len(entries))
+ assertLogEntry(t, entries[0], "example.org", "1.1.1.2", "2.2.2.2")
+
+ // search by client IP (part of)
+ params = newSearchParams()
+ params.searchCriteria = append(params.searchCriteria, searchCriteria{
+ criteriaType: ctClient,
+ strict: false,
+ value: "2.2.2",
+ })
+ entries, _ = l.search(params)
+ assert.Equal(t, 4, len(entries))
+ assertLogEntry(t, entries[0], "example.com", "1.1.1.4", "2.2.2.4")
+ assertLogEntry(t, entries[1], "test.example.org", "1.1.1.3", "2.2.2.3")
+ assertLogEntry(t, entries[2], "example.org", "1.1.1.2", "2.2.2.2")
+ assertLogEntry(t, entries[3], "example.org", "1.1.1.1", "2.2.2.1")
+}
+
+func TestQueryLogOffsetLimit(t *testing.T) {
+ conf := Config{
+ Enabled: true,
+ Interval: 1,
+ MemSize: 100,
+ }
+ conf.BaseDir = prepareTestDir()
+ defer func() { _ = os.RemoveAll(conf.BaseDir) }()
+ l := newQueryLog(conf)
+
+ // add 10 entries to the log
+ for i := 0; i < 10; i++ {
+ addEntry(l, "second.example.org", "1.1.1.1", "2.2.2.1")
+ }
+ // write them to disk (first file)
+ _ = l.flushLogBuffer(true)
+ // add 10 more entries to the log (memory)
+ for i := 0; i < 10; i++ {
+ addEntry(l, "first.example.org", "1.1.1.1", "2.2.2.1")
+ }
+
+ // First page
+ params := newSearchParams()
+ params.offset = 0
+ params.limit = 10
+ entries, _ := l.search(params)
+ assert.Equal(t, 10, len(entries))
+ assert.Equal(t, entries[0].QHost, "first.example.org")
+ assert.Equal(t, entries[9].QHost, "first.example.org")
+
+ // Second page
+ params.offset = 10
+ params.limit = 10
+ entries, _ = l.search(params)
+ assert.Equal(t, 10, len(entries))
+ assert.Equal(t, entries[0].QHost, "second.example.org")
+ assert.Equal(t, entries[9].QHost, "second.example.org")
+
+ // Second and a half page
+ params.offset = 15
+ params.limit = 10
+ entries, _ = l.search(params)
+ assert.Equal(t, 5, len(entries))
+ assert.Equal(t, entries[0].QHost, "second.example.org")
+ assert.Equal(t, entries[4].QHost, "second.example.org")
+
+ // Third page
+ params.offset = 20
+ params.limit = 10
+ entries, _ = l.search(params)
+ assert.Equal(t, 0, len(entries))
+}
+
+func TestQueryLogMaxFileScanEntries(t *testing.T) {
+ conf := Config{
+ Enabled: true,
+ FileEnabled: true,
+ Interval: 1,
+ MemSize: 100,
+ }
+ conf.BaseDir = prepareTestDir()
+ defer func() { _ = os.RemoveAll(conf.BaseDir) }()
+ l := newQueryLog(conf)
+
+ // add 10 entries to the log
+ for i := 0; i < 10; i++ {
+ addEntry(l, "example.org", "1.1.1.1", "2.2.2.1")
+ }
+ // write them to disk (first file)
+ _ = l.flushLogBuffer(true)
+
+ params := newSearchParams()
+ params.maxFileScanEntries = 5 // do not scan more than 5 records
+ entries, _ := l.search(params)
+ assert.Equal(t, 5, len(entries))
+
+ params.maxFileScanEntries = 0 // disable the limit
+ entries, _ = l.search(params)
+ assert.Equal(t, 10, len(entries))
+}
+
+func TestQueryLogFileDisabled(t *testing.T) {
+ conf := Config{
+ Enabled: true,
+ FileEnabled: false,
+ Interval: 1,
+ MemSize: 2,
+ }
+ conf.BaseDir = prepareTestDir()
+ defer func() { _ = os.RemoveAll(conf.BaseDir) }()
+ l := newQueryLog(conf)
+
+ addEntry(l, "example1.org", "1.1.1.1", "2.2.2.1")
+ addEntry(l, "example2.org", "1.1.1.1", "2.2.2.1")
+ addEntry(l, "example3.org", "1.1.1.1", "2.2.2.1")
+ // the oldest entry is now removed from mem buffer
+
+ params := newSearchParams()
+ ll, _ := l.search(params)
+ assert.Equal(t, 2, len(ll))
+ assert.Equal(t, "example3.org", ll[0].QHost)
+ assert.Equal(t, "example2.org", ll[1].QHost)
+}
+
+func addEntry(l *queryLog, host, answerStr, client string) {
+ q := dns.Msg{}
+ q.Question = append(q.Question, dns.Question{
+ Name: host + ".",
+ Qtype: dns.TypeA,
+ Qclass: dns.ClassINET,
+ })
+
+ a := dns.Msg{}
+ a.Question = append(a.Question, q.Question[0])
+ answer := new(dns.A)
+ answer.Hdr = dns.RR_Header{
+ Name: q.Question[0].Name,
+ Rrtype: dns.TypeA,
+ Class: dns.ClassINET,
+ }
+ answer.A = net.ParseIP(answerStr)
+ a.Answer = append(a.Answer, answer)
+ res := dnsfilter.Result{}
+ params := AddParams{
+ Question: &q,
+ Answer: &a,
+ Result: &res,
+ ClientIP: net.ParseIP(client),
+ Upstream: "upstream",
+ }
+ l.Add(params)
+}
+
+func assertLogEntry(t *testing.T, entry *logEntry, host, answer, client string) bool {
+ assert.Equal(t, host, entry.QHost)
+ assert.Equal(t, client, entry.IP)
+ assert.Equal(t, "A", entry.QType)
+ assert.Equal(t, "IN", entry.QClass)
+
+ msg := new(dns.Msg)
+ assert.Nil(t, msg.Unpack(entry.Answer))
+ assert.Equal(t, 1, len(msg.Answer))
+ ip := proxyutil.GetIPFromDNSRecord(msg.Answer[0])
+ assert.NotNil(t, ip)
+ assert.Equal(t, answer, ip.String())
+ return true
+}
diff --git a/querylog/querylog.go b/querylog/querylog.go
index 0e079ec3..2fa7ac9d 100644
--- a/querylog/querylog.go
+++ b/querylog/querylog.go
@@ -9,14 +9,6 @@ import (
"github.com/miekg/dns"
)
-// DiskConfig - configuration settings that are stored on disk
-type DiskConfig struct {
- Enabled bool
- Interval uint32
- MemSize uint32
- AnonymizeClientIP bool
-}
-
// QueryLog - main interface
type QueryLog interface {
Start()
@@ -28,12 +20,13 @@ type QueryLog interface {
Add(params AddParams)
// WriteDiskConfig - write configuration
- WriteDiskConfig(dc *DiskConfig)
+ WriteDiskConfig(c *Config)
}
// Config - configuration object
type Config struct {
- Enabled bool
+ Enabled bool // enable the module
+ FileEnabled bool // write logs to file
BaseDir string // directory where log file is stored
Interval uint32 // interval to rotate logs (in days)
MemSize uint32 // number of entries kept in memory before they are flushed to disk
diff --git a/querylog/querylog_file.go b/querylog/querylog_file.go
index 1eeeea7c..e1544fff 100644
--- a/querylog/querylog_file.go
+++ b/querylog/querylog_file.go
@@ -11,6 +11,10 @@ import (
// flushLogBuffer flushes the current buffer to file and resets the current buffer
func (l *queryLog) flushLogBuffer(fullFlush bool) error {
+ if !l.conf.FileEnabled {
+ return nil
+ }
+
l.fileFlushLock.Lock()
defer l.fileFlushLock.Unlock()
diff --git a/querylog/querylog_search.go b/querylog/querylog_search.go
index f9493af9..eda1f92d 100644
--- a/querylog/querylog_search.go
+++ b/querylog/querylog_search.go
@@ -1,18 +1,72 @@
package querylog
import (
- "encoding/base64"
"io"
- "strconv"
- "strings"
"time"
- "github.com/AdguardTeam/AdGuardHome/dnsfilter"
"github.com/AdguardTeam/AdGuardHome/util"
"github.com/AdguardTeam/golibs/log"
- "github.com/miekg/dns"
)
+// search - searches log entries in the query log using specified parameters
+// returns the list of entries found + time of the oldest entry
+func (l *queryLog) search(params *searchParams) ([]*logEntry, time.Time) {
+ now := time.Now()
+
+ if params.limit == 0 {
+ return []*logEntry{}, time.Time{}
+ }
+
+ // add from file
+ fileEntries, oldest, total := l.searchFiles(params)
+
+ // add from memory buffer
+ l.bufferLock.Lock()
+ total += len(l.buffer)
+ memoryEntries := make([]*logEntry, 0)
+
+ // go through the buffer in the reverse order
+ // from NEWER to OLDER
+ for i := len(l.buffer) - 1; i >= 0; i-- {
+ entry := l.buffer[i]
+ if !params.match(entry) {
+ continue
+ }
+ memoryEntries = append(memoryEntries, entry)
+ }
+ l.bufferLock.Unlock()
+
+ // limits
+ totalLimit := params.offset + params.limit
+
+ // now let's get a unified collection
+ entries := append(memoryEntries, fileEntries...)
+ if len(entries) > totalLimit {
+ // remove extra records
+ entries = entries[:totalLimit]
+ }
+ if params.offset > 0 {
+ if len(entries) > params.offset {
+ entries = entries[params.offset:]
+ } else {
+ entries = make([]*logEntry, 0)
+ oldest = time.Time{}
+ }
+ }
+ if len(entries) == totalLimit {
+ // change the "oldest" value here.
+ // we cannot use the "oldest" we got from "searchFiles" anymore
+ // because after adding in-memory records and removing extra records
+ // the situation has changed
+ oldest = entries[len(entries)-1].Time
+ }
+
+ log.Debug("QueryLog: prepared data (%d/%d) older than %s in %s",
+ len(entries), total, params.olderThan, time.Since(now))
+
+ return entries, oldest
+}
+
// searchFiles reads log entries from all log files and applies the specified search criteria.
// IMPORTANT: this method does not scan more than "maxSearchEntries" so you
// may need to call it many times.
@@ -21,7 +75,7 @@ import (
// * an array of log entries that we have read
// * time of the oldest processed entry (even if it was discarded)
// * total number of processed entries (including discarded).
-func (l *queryLog) searchFiles(params getDataParams) ([]*logEntry, time.Time, int) {
+func (l *queryLog) searchFiles(params *searchParams) ([]*logEntry, time.Time, int) {
entries := make([]*logEntry, 0)
oldest := time.Time{}
@@ -32,10 +86,10 @@ func (l *queryLog) searchFiles(params getDataParams) ([]*logEntry, time.Time, in
}
defer r.Close()
- if params.OlderThan.IsZero() {
+ if params.olderThan.IsZero() {
err = r.SeekStart()
} else {
- err = r.Seek(params.OlderThan.UnixNano())
+ err = r.Seek(params.olderThan.UnixNano())
if err == nil {
// Read to the next record right away
// The one that was specified in the "oldest" param is not needed,
@@ -45,14 +99,17 @@ func (l *queryLog) searchFiles(params getDataParams) ([]*logEntry, time.Time, in
}
if err != nil {
- log.Debug("Cannot Seek() to %v: %v", params.OlderThan, err)
+ log.Debug("Cannot Seek() to %v: %v", params.olderThan, err)
return entries, oldest, 0
}
+ totalLimit := params.offset + params.limit
total := 0
oldestNano := int64(0)
- // Do not scan more than 50k at once
- for total <= maxSearchEntries {
+ // By default, we do not scan more than "maxFileScanEntries" at once
+ // The idea is to make search calls faster so that the UI could handle it and show something
+ // This behavior can be overridden if "maxFileScanEntries" is set to 0
+ for total < params.maxFileScanEntries || params.maxFileScanEntries <= 0 {
entry, ts, err := l.readNextEntry(r, params)
if err == io.EOF {
@@ -65,8 +122,8 @@ func (l *queryLog) searchFiles(params getDataParams) ([]*logEntry, time.Time, in
if entry != nil {
entries = append(entries, entry)
- if len(entries) == getDataLimit {
- // Do not read more than "getDataLimit" records at once
+ if len(entries) == totalLimit {
+ // Do not read more than "totalLimit" records at once
break
}
}
@@ -82,7 +139,7 @@ func (l *queryLog) searchFiles(params getDataParams) ([]*logEntry, time.Time, in
// * log entry that matches search criteria or null if it was discarded (or if there's nothing to read)
// * timestamp of the processed log entry
// * error if we can't read anymore
-func (l *queryLog) readNextEntry(r *QLogReader, params getDataParams) (*logEntry, int64, error) {
+func (l *queryLog) readNextEntry(r *QLogReader, params *searchParams) (*logEntry, int64, error) {
line, err := r.ReadNext()
if err != nil {
return nil, 0, err
@@ -92,7 +149,7 @@ func (l *queryLog) readNextEntry(r *QLogReader, params getDataParams) (*logEntry
timestamp := readQLogTimestamp(line)
// Quick check without deserializing log entry
- if !quickMatchesGetDataParams(line, params) {
+ if !params.quickMatch(line) {
return nil, timestamp, nil
}
@@ -100,7 +157,7 @@ func (l *queryLog) readNextEntry(r *QLogReader, params getDataParams) (*logEntry
decodeLogEntry(&entry, line)
// Full check of the deserialized log entry
- if !matchesGetDataParams(&entry, params) {
+ if !params.match(&entry) {
return nil, timestamp, nil
}
@@ -120,257 +177,3 @@ func (l *queryLog) openReader() (*QLogReader, error) {
return NewQLogReader(files)
}
-
-// quickMatchesGetDataParams - quickly checks if the line matches getDataParams
-// this method does not guarantee anything and the reason is to do a quick check
-// without deserializing anything
-func quickMatchesGetDataParams(line string, params getDataParams) bool {
- if params.ResponseStatus == responseStatusFiltered {
- boolVal, ok := readJSONBool(line, "IsFiltered")
- if !ok || !boolVal {
- return false
- }
- }
-
- if len(params.Domain) != 0 {
- val := readJSONValue(line, "QH")
- if len(val) == 0 {
- return false
- }
-
- if (params.StrictMatchDomain && val != params.Domain) ||
- (!params.StrictMatchDomain && strings.Index(val, params.Domain) == -1) {
- return false
- }
- }
-
- if len(params.QuestionType) != 0 {
- val := readJSONValue(line, "QT")
- if val != params.QuestionType {
- return false
- }
- }
-
- if len(params.Client) != 0 {
- val := readJSONValue(line, "IP")
- if len(val) == 0 {
- log.Debug("QueryLog: failed to decodeLogEntry")
- return false
- }
-
- if (params.StrictMatchClient && val != params.Client) ||
- (!params.StrictMatchClient && strings.Index(val, params.Client) == -1) {
- return false
- }
- }
-
- return true
-}
-
-// matchesGetDataParams - returns true if the entry matches the search parameters
-func matchesGetDataParams(entry *logEntry, params getDataParams) bool {
- if params.ResponseStatus == responseStatusFiltered && !entry.Result.IsFiltered {
- return false
- }
-
- if len(params.QuestionType) != 0 {
- if entry.QType != params.QuestionType {
- return false
- }
- }
-
- if len(params.Domain) != 0 {
- if (params.StrictMatchDomain && entry.QHost != params.Domain) ||
- (!params.StrictMatchDomain && strings.Index(entry.QHost, params.Domain) == -1) {
- return false
- }
- }
-
- if len(params.Client) != 0 {
- if (params.StrictMatchClient && entry.IP != params.Client) ||
- (!params.StrictMatchClient && strings.Index(entry.IP, params.Client) == -1) {
- return false
- }
- }
-
- return true
-}
-
-// decodeLogEntry - decodes query log entry from a line
-// nolint (gocyclo)
-func decodeLogEntry(ent *logEntry, str string) {
- var b bool
- var i int
- var err error
- for {
- k, v, t := readJSON(&str)
- if t == jsonTErr {
- break
- }
- switch k {
- case "IP":
- if len(ent.IP) == 0 {
- ent.IP = v
- }
- case "T":
- ent.Time, err = time.Parse(time.RFC3339, v)
-
- case "QH":
- ent.QHost = v
- case "QT":
- ent.QType = v
- case "QC":
- ent.QClass = v
-
- case "Answer":
- ent.Answer, err = base64.StdEncoding.DecodeString(v)
- case "OrigAnswer":
- ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
-
- case "IsFiltered":
- b, err = strconv.ParseBool(v)
- ent.Result.IsFiltered = b
- case "Rule":
- ent.Result.Rule = v
- case "FilterID":
- i, err = strconv.Atoi(v)
- ent.Result.FilterID = int64(i)
- case "Reason":
- i, err = strconv.Atoi(v)
- ent.Result.Reason = dnsfilter.Reason(i)
-
- case "Upstream":
- ent.Upstream = v
- case "Elapsed":
- i, err = strconv.Atoi(v)
- ent.Elapsed = time.Duration(i)
-
- // pre-v0.99.3 compatibility:
- case "Question":
- var qstr []byte
- qstr, err = base64.StdEncoding.DecodeString(v)
- if err != nil {
- break
- }
- q := new(dns.Msg)
- err = q.Unpack(qstr)
- if err != nil {
- break
- }
- ent.QHost = q.Question[0].Name
- if len(ent.QHost) == 0 {
- break
- }
- ent.QHost = ent.QHost[:len(ent.QHost)-1]
- ent.QType = dns.TypeToString[q.Question[0].Qtype]
- ent.QClass = dns.ClassToString[q.Question[0].Qclass]
- case "Time":
- ent.Time, err = time.Parse(time.RFC3339, v)
- }
-
- if err != nil {
- log.Debug("decodeLogEntry err: %s", err)
- break
- }
- }
-}
-
-// Get bool value from "key":bool
-func readJSONBool(s, name string) (bool, bool) {
- i := strings.Index(s, "\""+name+"\":")
- if i == -1 {
- return false, false
- }
- start := i + 1 + len(name) + 2
- b := false
- if strings.HasPrefix(s[start:], "true") {
- b = true
- } else if !strings.HasPrefix(s[start:], "false") {
- return false, false
- }
- return b, true
-}
-
-// Get value from "key":"value"
-func readJSONValue(s, name string) string {
- i := strings.Index(s, "\""+name+"\":\"")
- if i == -1 {
- return ""
- }
- start := i + 1 + len(name) + 3
- i = strings.IndexByte(s[start:], '"')
- if i == -1 {
- return ""
- }
- end := start + i
- return s[start:end]
-}
-
-const (
- jsonTErr = iota
- jsonTObj
- jsonTStr
- jsonTNum
- jsonTBool
-)
-
-// Parse JSON key-value pair
-// e.g.: "key":VALUE where VALUE is "string", true|false (boolean), or 123.456 (number)
-// Note the limitations:
-// . doesn't support whitespace
-// . doesn't support "null"
-// . doesn't validate boolean or number
-// . no proper handling of {} braces
-// . no handling of [] brackets
-// Return (key, value, type)
-func readJSON(ps *string) (string, string, int32) {
- s := *ps
- k := ""
- v := ""
- t := int32(jsonTErr)
-
- q1 := strings.IndexByte(s, '"')
- if q1 == -1 {
- return k, v, t
- }
- q2 := strings.IndexByte(s[q1+1:], '"')
- if q2 == -1 {
- return k, v, t
- }
- k = s[q1+1 : q1+1+q2]
- s = s[q1+1+q2+1:]
-
- if len(s) < 2 || s[0] != ':' {
- return k, v, t
- }
-
- if s[1] == '"' {
- q2 = strings.IndexByte(s[2:], '"')
- if q2 == -1 {
- return k, v, t
- }
- v = s[2 : 2+q2]
- t = jsonTStr
- s = s[2+q2+1:]
-
- } else if s[1] == '{' {
- t = jsonTObj
- s = s[1+1:]
-
- } else {
- sep := strings.IndexAny(s[1:], ",}")
- if sep == -1 {
- return k, v, t
- }
- v = s[1 : 1+sep]
- if s[1] == 't' || s[1] == 'f' {
- t = jsonTBool
- } else if s[1] == '.' || (s[1] >= '0' && s[1] <= '9') {
- t = jsonTNum
- }
- s = s[1+sep+1:]
- }
-
- *ps = s
- return k, v, t
-}
diff --git a/querylog/querylog_test.go b/querylog/querylog_test.go
deleted file mode 100644
index 06de4101..00000000
--- a/querylog/querylog_test.go
+++ /dev/null
@@ -1,176 +0,0 @@
-package querylog
-
-import (
- "net"
- "os"
- "testing"
- "time"
-
- "github.com/AdguardTeam/AdGuardHome/dnsfilter"
- "github.com/miekg/dns"
- "github.com/stretchr/testify/assert"
-)
-
-func prepareTestDir() string {
- const dir = "./agh-test"
- _ = os.RemoveAll(dir)
- _ = os.MkdirAll(dir, 0755)
- return dir
-}
-
-// Check adding and loading (with filtering) entries from disk and memory
-func TestQueryLog(t *testing.T) {
- conf := Config{
- Enabled: true,
- Interval: 1,
- MemSize: 100,
- }
- conf.BaseDir = prepareTestDir()
- defer func() { _ = os.RemoveAll(conf.BaseDir) }()
- l := newQueryLog(conf)
-
- // add disk entries
- addEntry(l, "example.org", "1.1.1.1", "2.2.2.1")
- // write to disk (first file)
- _ = l.flushLogBuffer(true)
- // start writing to the second file
- _ = l.rotate()
- // add disk entries
- addEntry(l, "example.org", "1.1.1.2", "2.2.2.2")
- // write to disk
- _ = l.flushLogBuffer(true)
- // add memory entries
- addEntry(l, "test.example.org", "1.1.1.3", "2.2.2.3")
- addEntry(l, "example.com", "1.1.1.4", "2.2.2.4")
-
- // get all entries
- params := getDataParams{
- OlderThan: time.Time{},
- }
- d := l.getData(params)
- mdata := d["data"].([]map[string]interface{})
- assert.Equal(t, 4, len(mdata))
- assert.True(t, checkEntry(t, mdata[0], "example.com", "1.1.1.4", "2.2.2.4"))
- assert.True(t, checkEntry(t, mdata[1], "test.example.org", "1.1.1.3", "2.2.2.3"))
- assert.True(t, checkEntry(t, mdata[2], "example.org", "1.1.1.2", "2.2.2.2"))
- assert.True(t, checkEntry(t, mdata[3], "example.org", "1.1.1.1", "2.2.2.1"))
-
- // search by domain (strict)
- params = getDataParams{
- OlderThan: time.Time{},
- Domain: "test.example.org",
- StrictMatchDomain: true,
- }
- d = l.getData(params)
- mdata = d["data"].([]map[string]interface{})
- assert.True(t, len(mdata) == 1)
- assert.True(t, checkEntry(t, mdata[0], "test.example.org", "1.1.1.3", "2.2.2.3"))
-
- // search by domain (not strict)
- params = getDataParams{
- OlderThan: time.Time{},
- Domain: "example.org",
- StrictMatchDomain: false,
- }
- d = l.getData(params)
- mdata = d["data"].([]map[string]interface{})
- assert.Equal(t, 3, len(mdata))
- assert.True(t, checkEntry(t, mdata[0], "test.example.org", "1.1.1.3", "2.2.2.3"))
- assert.True(t, checkEntry(t, mdata[1], "example.org", "1.1.1.2", "2.2.2.2"))
- assert.True(t, checkEntry(t, mdata[2], "example.org", "1.1.1.1", "2.2.2.1"))
-
- // search by client IP (strict)
- params = getDataParams{
- OlderThan: time.Time{},
- Client: "2.2.2.2",
- StrictMatchClient: true,
- }
- d = l.getData(params)
- mdata = d["data"].([]map[string]interface{})
- assert.Equal(t, 1, len(mdata))
- assert.True(t, checkEntry(t, mdata[0], "example.org", "1.1.1.2", "2.2.2.2"))
-
- // search by client IP (part of)
- params = getDataParams{
- OlderThan: time.Time{},
- Client: "2.2.2",
- StrictMatchClient: false,
- }
- d = l.getData(params)
- mdata = d["data"].([]map[string]interface{})
- assert.Equal(t, 4, len(mdata))
- assert.True(t, checkEntry(t, mdata[0], "example.com", "1.1.1.4", "2.2.2.4"))
- assert.True(t, checkEntry(t, mdata[1], "test.example.org", "1.1.1.3", "2.2.2.3"))
- assert.True(t, checkEntry(t, mdata[2], "example.org", "1.1.1.2", "2.2.2.2"))
- assert.True(t, checkEntry(t, mdata[3], "example.org", "1.1.1.1", "2.2.2.1"))
-}
-
-func addEntry(l *queryLog, host, answerStr, client string) {
- q := dns.Msg{}
- q.Question = append(q.Question, dns.Question{
- Name: host + ".",
- Qtype: dns.TypeA,
- Qclass: dns.ClassINET,
- })
-
- a := dns.Msg{}
- a.Question = append(a.Question, q.Question[0])
- answer := new(dns.A)
- answer.Hdr = dns.RR_Header{
- Name: q.Question[0].Name,
- Rrtype: dns.TypeA,
- Class: dns.ClassINET,
- }
- answer.A = net.ParseIP(answerStr)
- a.Answer = append(a.Answer, answer)
- res := dnsfilter.Result{}
- params := AddParams{
- Question: &q,
- Answer: &a,
- Result: &res,
- ClientIP: net.ParseIP(client),
- Upstream: "upstream",
- }
- l.Add(params)
-}
-
-func checkEntry(t *testing.T, m map[string]interface{}, host, answer, client string) bool {
- mq := m["question"].(map[string]interface{})
- ma := m["answer"].([]map[string]interface{})
- ma0 := ma[0]
- if !assert.Equal(t, host, mq["host"].(string)) ||
- !assert.Equal(t, "IN", mq["class"].(string)) ||
- !assert.Equal(t, "A", mq["type"].(string)) ||
- !assert.Equal(t, answer, ma0["value"].(string)) ||
- !assert.Equal(t, client, m["client"].(string)) {
- return false
- }
- return true
-}
-
-func TestJSON(t *testing.T) {
- s := `
- {"keystr":"val","obj":{"keybool":true,"keyint":123456}}
- `
- k, v, jtype := readJSON(&s)
- assert.Equal(t, jtype, int32(jsonTStr))
- assert.Equal(t, "keystr", k)
- assert.Equal(t, "val", v)
-
- k, v, jtype = readJSON(&s)
- assert.Equal(t, jtype, int32(jsonTObj))
- assert.Equal(t, "obj", k)
-
- k, v, jtype = readJSON(&s)
- assert.Equal(t, jtype, int32(jsonTBool))
- assert.Equal(t, "keybool", k)
- assert.Equal(t, "true", v)
-
- k, v, jtype = readJSON(&s)
- assert.Equal(t, jtype, int32(jsonTNum))
- assert.Equal(t, "keyint", k)
- assert.Equal(t, "123456", v)
-
- k, v, jtype = readJSON(&s)
- assert.True(t, jtype == jsonTErr)
-}
diff --git a/querylog/search_criteria.go b/querylog/search_criteria.go
new file mode 100644
index 00000000..b2ba63f6
--- /dev/null
+++ b/querylog/search_criteria.go
@@ -0,0 +1,139 @@
+package querylog
+
+import (
+ "strings"
+
+ "github.com/AdguardTeam/AdGuardHome/dnsfilter"
+)
+
+type criteriaType int
+
+const (
+ ctDomain criteriaType = iota // domain name
+ ctClient // client IP address
+ ctQuestionType // question type
+ ctFilteringStatus // filtering status
+)
+
+const (
+ filteringStatusAll = "all"
+ filteringStatusFiltered = "filtered" // all kinds of filtering
+
+ filteringStatusBlocked = "blocked" // blocked or blocked service
+ filteringStatusBlockedSafebrowsing = "blocked_safebrowsing" // blocked by safebrowsing
+ filteringStatusBlockedParental = "blocked_parental" // blocked by parental control
+ filteringStatusWhitelisted = "whitelisted" // whitelisted
+ filteringStatusRewritten = "rewritten" // all kinds of rewrites
+ filteringStatusSafeSearch = "safe_search" // enforced safe search
+)
+
+// filteringStatusValues -- array with all possible filteringStatus values
+var filteringStatusValues = []string{
+ filteringStatusAll, filteringStatusFiltered, filteringStatusBlocked,
+ filteringStatusBlockedSafebrowsing, filteringStatusBlockedParental,
+ filteringStatusWhitelisted, filteringStatusRewritten, filteringStatusSafeSearch,
+}
+
+// searchCriteria - every search request may contain a list of different search criteria
+// we use each of them to match the query
+type searchCriteria struct {
+ criteriaType criteriaType // type of the criteria
+ strict bool // should we strictly match (equality) or not (indexOf)
+ value string // search criteria value
+}
+
+// quickMatch - quickly checks if the log entry matches this search criteria
+// the reason is to do it as quickly as possible without de-serializing the entry
+func (c *searchCriteria) quickMatch(line string) bool {
+ // note that we do this only for a limited set of criteria
+
+ switch c.criteriaType {
+ case ctDomain:
+ return c.quickMatchJSONValue(line, "QH")
+ case ctClient:
+ return c.quickMatchJSONValue(line, "IP")
+ case ctQuestionType:
+ return c.quickMatchJSONValue(line, "QT")
+ default:
+ return true
+ }
+}
+
+// quickMatchJSONValue - helper used by quickMatch
+func (c *searchCriteria) quickMatchJSONValue(line string, propertyName string) bool {
+ val := readJSONValue(line, propertyName)
+ if len(val) == 0 {
+ return false
+ }
+
+ if c.strict && c.value == val {
+ return true
+ }
+ if !c.strict && strings.Contains(val, c.value) {
+ return true
+ }
+
+ return false
+}
+
+// match - checks if the log entry matches this search criteria
+// nolint (gocyclo)
+func (c *searchCriteria) match(entry *logEntry) bool {
+ switch c.criteriaType {
+ case ctDomain:
+ if c.strict && entry.QHost == c.value {
+ return true
+ }
+ if !c.strict && strings.Contains(entry.QHost, c.value) {
+ return true
+ }
+ return false
+ case ctClient:
+ if c.strict && entry.IP == c.value {
+ return true
+ }
+ if !c.strict && strings.Contains(entry.IP, c.value) {
+ return true
+ }
+ return false
+ case ctQuestionType:
+ if c.strict && entry.QType == c.value {
+ return true
+ }
+ if !c.strict && strings.Contains(entry.QType, c.value) {
+ return true
+ }
+ case ctFilteringStatus:
+ res := entry.Result
+
+ switch c.value {
+ case filteringStatusAll:
+ return true
+ case filteringStatusFiltered:
+ return res.IsFiltered
+ case filteringStatusBlocked:
+ return res.IsFiltered &&
+ (res.Reason == dnsfilter.FilteredBlackList ||
+ res.Reason == dnsfilter.FilteredBlockedService)
+ case filteringStatusBlockedParental:
+ return res.IsFiltered && res.Reason == dnsfilter.FilteredParental
+ case filteringStatusBlockedSafebrowsing:
+ return res.IsFiltered && res.Reason == dnsfilter.FilteredSafeBrowsing
+ case filteringStatusWhitelisted:
+ return res.IsFiltered && res.Reason == dnsfilter.NotFilteredWhiteList
+ case filteringStatusRewritten:
+ return res.IsFiltered &&
+ (res.Reason == dnsfilter.ReasonRewrite ||
+ res.Reason == dnsfilter.RewriteEtcHosts)
+ case filteringStatusSafeSearch:
+ return res.IsFiltered && res.Reason == dnsfilter.FilteredSafeSearch
+ default:
+ return false
+ }
+
+ default:
+ return false
+ }
+
+ return false
+}
diff --git a/querylog/search_params.go b/querylog/search_params.go
new file mode 100644
index 00000000..da083e45
--- /dev/null
+++ b/querylog/search_params.go
@@ -0,0 +1,57 @@
+package querylog
+
+import "time"
+
+// searchParams represent the search query sent by the client
+type searchParams struct {
+ // searchCriteria - list of search criteria that we use to get filter results
+ searchCriteria []searchCriteria
+
+ // olderThen - return entries that are older than this value
+ // if not set - disregard it and return any value
+ olderThan time.Time
+
+ offset int // offset for the search
+ limit int // limit the number of records returned
+ maxFileScanEntries int // maximum log entries to scan in query log files. if 0 - no limit
+}
+
+// newSearchParams - creates an empty instance of searchParams
+func newSearchParams() *searchParams {
+ return &searchParams{
+ // default max log entries to return
+ limit: 500,
+
+ // by default, we scan up to 50k entries at once
+ maxFileScanEntries: 50000,
+ }
+}
+
+// quickMatchesGetDataParams - quickly checks if the line matches the searchParams
+// this method does not guarantee anything and the reason is to do a quick check
+// without deserializing anything
+func (s *searchParams) quickMatch(line string) bool {
+ for _, c := range s.searchCriteria {
+ if !c.quickMatch(line) {
+ return false
+ }
+ }
+
+ return true
+}
+
+// match - checks if the logEntry matches the searchParams
+func (s *searchParams) match(entry *logEntry) bool {
+ if !s.olderThan.IsZero() && entry.Time.UnixNano() >= s.olderThan.UnixNano() {
+ // Ignore entries newer than what was requested
+ return false
+ }
+
+ for _, c := range s.searchCriteria {
+ if !c.match(entry) {
+ return false
+ }
+ }
+
+ return true
+}
diff --git a/snapcraft.yaml b/snapcraft.yaml
index cda2f165..c5cda82b 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -18,7 +18,10 @@ grade: stable
confinement: strict
architectures:
- - build-on: [ amd64, i386, arm64, armhf ]
+ - build-on: amd64
+ - build-on: armhf
+ - build-on: i386
+ - build-on: arm64
parts:
adguard-home:
@@ -35,4 +38,4 @@ apps:
command: AdGuardHome -w ${SNAP_DATA} --no-check-update
plugs: [ network-bind ]
daemon: simple
- restart-condition: always
\ No newline at end of file
+ restart-condition: always
diff --git a/util/auto_hosts.go b/util/auto_hosts.go
index 046e80e3..6e78f1ee 100644
--- a/util/auto_hosts.go
+++ b/util/auto_hosts.go
@@ -154,14 +154,21 @@ func (a *AutoHosts) load(table map[string][]net.IP, tableRev map[string]string,
return
}
line = strings.TrimSpace(line)
+ if len(line) == 0 || line[0] == '#' {
+ continue
+ }
- ip := SplitNext(&line, ' ')
- ipAddr := net.ParseIP(ip)
+ fields := strings.Fields(line)
+ if len(fields) < 2 {
+ continue
+ }
+
+ ipAddr := net.ParseIP(fields[0])
if ipAddr == nil {
continue
}
- for {
- host := SplitNext(&line, ' ')
+ for i := 1; i != len(fields); i++ {
+ host := fields[i]
if len(host) == 0 {
break
}
diff --git a/util/helpers.go b/util/helpers.go
index 27ac4d71..b32ac456 100644
--- a/util/helpers.go
+++ b/util/helpers.go
@@ -10,6 +10,16 @@ import (
"strings"
)
+// ContainsString checks if "v" is in the array "arr"
+func ContainsString(arr []string, v string) bool {
+ for _, i := range arr {
+ if i == v {
+ return true
+ }
+ }
+ return false
+}
+
// fileExists returns TRUE if file exists
func FileExists(fn string) bool {
_, err := os.Stat(fn)
+
+ 
+
+
+ 
+