Skip to content

Commit

Permalink
Merge branch 'master' into 6220-average-processing-time
Browse files Browse the repository at this point in the history
  • Loading branch information
schzhn committed Nov 9, 2023
2 parents 37f2855 + f8fe9bf commit 387200c
Show file tree
Hide file tree
Showing 14 changed files with 515 additions and 458 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,16 @@ NOTE: Add new changes BELOW THIS COMMENT.
- Ability to specify multiple domain specific upstreams per line, e.g.
`[/domain1/../domain2/]upstream1 upstream2 .. upstreamN` ([#4977]).

### Changed

- The height of ready-to-use filter lists has been increased ([#6358]).
- Improved authentication failure logging ([#6357]).

### Fixed

- Average request processing time calculation ([#6220]).
- Redundant shortening long client names in the Top Clients table ([#6338]).
- Scrolling column headers in the tables ([#6337]).
- `$important,dnsrewrite` rules do not take precedence over allowlist rules
([#6204]).
- Dark mode DNS rewrite background ([#6329]).
Expand All @@ -41,6 +48,10 @@ NOTE: Add new changes BELOW THIS COMMENT.
[#6220]: https://github.com/AdguardTeam/AdGuardHome/issues/6220
[#6329]: https://github.com/AdguardTeam/AdGuardHome/issues/6329
[#6335]: https://github.com/AdguardTeam/AdGuardHome/issues/6335
[#6337]: https://github.com/AdguardTeam/AdGuardHome/issues/6337
[#6338]: https://github.com/AdguardTeam/AdGuardHome/issues/6338
[#6357]: https://github.com/AdguardTeam/AdGuardHome/issues/6357
[#6358]: https://github.com/AdguardTeam/AdGuardHome/issues/6358

<!--
NOTE: Add new changes ABOVE THIS COMMENT.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ opinion, this cannot be legitimately counted as a Pi-Hole's feature.
| Cross-platform || ❌ (not natively, only via Docker) |
| Running as a DNS-over-HTTPS or DNS-over-TLS server || ❌ (requires additional software) |
| Blocking phishing and malware domains || ❌ (requires non-default blocklists) |
| Parental control (blocking adult domains) || |
| Parental control (blocking adult domains) ||(requires non-default blocklists) |
| Force Safe search on search engines |||
| Per-client (device) configuration |||
| Access settings (choose who can use AGH DNS) |||
Expand Down
5 changes: 5 additions & 0 deletions client/src/components/App/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,11 @@ body {
overflow-y: auto;
}

.modal-body--filters {
max-height: 600px;
overflow-y: auto;
}

.modal-body__item:not(:first-child) {
padding-top: 1.5rem;
}
Expand Down
4 changes: 2 additions & 2 deletions client/src/components/Filters/Form.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const renderIcons = (iconsData) => iconsData.map(({
}) => <a key={iconName} href={href} target="_blank" rel="noopener noreferrer"
className={classNames('d-flex align-items-center', className)}
>
<svg className="nav-icon nav-icon--gray">
<svg className="icon icon--15 mr-1 icon--gray">
<use xlinkHref={`#${iconName}`} />
</svg>
</a>);
Expand Down Expand Up @@ -110,7 +110,7 @@ const Form = (props) => {
const openAddFiltersModal = () => openModal(MODAL_TYPE.ADD_FILTERS);

return <form onSubmit={handleSubmit}>
<div className="modal-body modal-body--medium">
<div className="modal-body modal-body--filters">
{modalType === MODAL_TYPE.SELECT_MODAL_TYPE
&& <div className="d-flex justify-content-around">
<button onClick={openFilteringListModal}
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/Logs/Logs.css
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
color: var(--gray-f3);
}

.logs__text--client {
.logs__table .logs__text--client {
padding-right: 32px;
}

Expand Down
7 changes: 7 additions & 0 deletions client/src/components/ui/Icons.css
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,13 @@
height: var(--size);
}

.icon--15 {
--size: 0.95rem;

width: var(--size);
height: var(--size);
}

.icon--gray {
color: var(--gray-a5);
}
Expand Down
4 changes: 0 additions & 4 deletions client/src/components/ui/ReactTable.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@
overflow: visible;
}

.ReactTable .rt-tbody {
overflow: visible;
}

.ReactTable .rt-noData {
color: var(--rt-nodata-color);
background-color: var(--rt-nodata-bgcolor);
Expand Down
6 changes: 6 additions & 0 deletions internal/dnsforward/clientid.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (

"github.com/AdguardTeam/dnsproxy/proxy"
"github.com/AdguardTeam/golibs/errors"
"github.com/AdguardTeam/golibs/log"
"github.com/AdguardTeam/golibs/netutil"
"github.com/quic-go/quic-go"
)
Expand Down Expand Up @@ -151,6 +152,8 @@ func (s *Server) clientIDFromDNSContext(pctx *proxy.DNSContext) (clientID string
// DNS-over-HTTPS requests, it will return the hostname part of the Host header
// if there is one.
func clientServerName(pctx *proxy.DNSContext, proto proxy.Proto) (srvName string, err error) {
from := "tls conn"

switch proto {
case proxy.ProtoHTTPS:
r := pctx.HTTPRequest
Expand All @@ -164,6 +167,7 @@ func clientServerName(pctx *proxy.DNSContext, proto proxy.Proto) (srvName string
}

srvName = host
from = "host header"
}
case proxy.ProtoQUIC:
qConn := pctx.QUICConnection
Expand All @@ -183,5 +187,7 @@ func clientServerName(pctx *proxy.DNSContext, proto proxy.Proto) (srvName string
srvName = tc.ConnectionState().ServerName
}

log.Debug("dnsforward: got client server name %q from %s", srvName, from)

return srvName, nil
}
Loading

0 comments on commit 387200c

Please sign in to comment.