- {tlsAddress && tlsAddress.length > 0 && (
+ {tlsAddress?.length > 0 && (
)}
- {httpsAddress && httpsAddress.length > 0 && (
+ {httpsAddress?.length > 0 && (
{!disabled
&& touched
- && (error && {error})}
+ && error && {error}}
;
renderSelectField.propTypes = {
diff --git a/client/src/helpers/formatClientCell.js b/client/src/helpers/formatClientCell.js
index 37776af1..9e125588 100644
--- a/client/src/helpers/formatClientCell.js
+++ b/client/src/helpers/formatClientCell.js
@@ -1,4 +1,4 @@
-import React, { Fragment } from 'react';
+import React from 'react';
import { normalizeWhois } from './helpers';
import { WHOIS_ICONS } from './constants';
@@ -11,12 +11,12 @@ const getFormattedWhois = (whois, t) => {
return (
{icon && (
-
+ <>
-
+
)}{whoisInfo[key]}
);
diff --git a/client/src/helpers/helpers.js b/client/src/helpers/helpers.js
index 0260248c..cc4d7219 100644
--- a/client/src/helpers/helpers.js
+++ b/client/src/helpers/helpers.js
@@ -142,7 +142,7 @@ export const addClientInfo = (data, clients, param) => (
const info = clients.find((item) => item[clientIp]) || '';
return {
...row,
- info: (info && info[clientIp]) || '',
+ info: info?.[clientIp] ?? '',
};
})
);
@@ -342,7 +342,7 @@ export const normalizeTopClients = (topClients) => topClients.reduce(
export const getClientInfo = (clients, ip) => {
const client = clients
- .find((item) => item.ip_addrs && item.ip_addrs.find((clientIp) => clientIp === ip));
+ .find((item) => item.ip_addrs?.find((clientIp) => clientIp === ip));
if (!client) {
return '';
@@ -403,7 +403,7 @@ export const secondsToMilliseconds = (seconds) => {
return seconds;
};
-export const normalizeRulesTextarea = (text) => text && text.replace(/^\n/g, '')
+export const normalizeRulesTextarea = (text) => text?.replace(/^\n/g, '')
.replace(/\n\s*\n/g, '\n');
export const isVersionGreater = (currentVersion, previousVersion) => (
@@ -415,7 +415,7 @@ export const normalizeWhois = (whois) => {
const {
city, country, ...values
} = whois;
- let location = (country && country) || '';
+ let location = country || '';
if (city && location) {
location = `${location}, ${city}`;
@@ -483,7 +483,7 @@ export const checkParental = (reason) => reason === FILTERED_STATUS.FILTERED_PAR
export const checkBlockedService = (reason) => reason === FILTERED_STATUS.FILTERED_BLOCKED_SERVICE;
export const getCurrentFilter = (url, filters) => {
- const filter = filters && filters.find((item) => url === item.url);
+ const filter = filters?.find((item) => url === item.url);
if (filter) {
const { enabled, name, url } = filter;
diff --git a/client/src/install/Setup/Settings.js b/client/src/install/Setup/Settings.js
index 37a84acc..a939af41 100644
--- a/client/src/install/Setup/Settings.js
+++ b/client/src/install/Setup/Settings.js
@@ -28,9 +28,9 @@ const renderInterfaces = ((interfaces) => (
flags,
} = option;
- if (option && ip_addresses && ip_addresses.length > 0) {
+ if (option && ip_addresses?.length > 0) {
const ip = getInterfaceIp(option);
- const isDown = flags && flags.includes('down');
+ const isDown = flags?.includes('down');
if (isDown) {
return (
diff --git a/client/src/reducers/access.js b/client/src/reducers/access.js
index cf1ad958..e90bb314 100644
--- a/client/src/reducers/access.js
+++ b/client/src/reducers/access.js
@@ -14,9 +14,9 @@ const access = handleActions(
} = payload;
const newState = {
...state,
- allowed_clients: (allowed_clients && allowed_clients.join('\n')) || '',
- disallowed_clients: (disallowed_clients && disallowed_clients.join('\n')) || '',
- blocked_hosts: (blocked_hosts && blocked_hosts.join('\n')) || '',
+ allowed_clients: allowed_clients?.join('\n') || '',
+ disallowed_clients: disallowed_clients?.join('\n') || '',
+ blocked_hosts: blocked_hosts?.join('\n') || '',
processing: false,
};
return newState;
@@ -42,9 +42,9 @@ const access = handleActions(
} = payload;
const newState = {
...state,
- allowed_clients: (allowed_clients && allowed_clients.join('\n')) || '',
- disallowed_clients: (disallowed_clients && disallowed_clients.join('\n')) || '',
- blocked_hosts: (blocked_hosts && blocked_hosts.join('\n')) || '',
+ allowed_clients: allowed_clients?.join('\n') || '',
+ disallowed_clients: disallowed_clients?.join('\n') || '',
+ blocked_hosts: blocked_hosts?.join('\n') || '',
processingSet: false,
};
return newState;
diff --git a/home/auth.go b/home/auth.go
index 3b524d29..3166052b 100644
--- a/home/auth.go
+++ b/home/auth.go
@@ -365,6 +365,7 @@ func parseCookie(cookie string) string {
return ""
}
+// nolint(gocyclo)
func optionalAuth(handler func(http.ResponseWriter, *http.Request)) func(http.ResponseWriter, *http.Request) {
return func(w http.ResponseWriter, r *http.Request) {
@@ -391,7 +392,11 @@ func optionalAuth(handler func(http.ResponseWriter, *http.Request)) func(http.Re
// redirect to login page if not authenticated
ok := false
cookie, err := r.Cookie(sessionCookieName)
- if err == nil {
+
+ if glProcessCookie(r) {
+ log.Debug("Auth: authentification was handled by GL-Inet submodule")
+
+ } else if err == nil {
r := Context.auth.CheckSession(cookie.Value)
if r == 0 {
ok = true
@@ -412,8 +417,13 @@ func optionalAuth(handler func(http.ResponseWriter, *http.Request)) func(http.Re
}
if !ok {
if r.URL.Path == "/" || r.URL.Path == "/index.html" {
- w.Header().Set("Location", "/login.html")
- w.WriteHeader(http.StatusFound)
+ if glProcessRedirect(w, r) {
+ log.Debug("Auth: redirected to login page by GL-Inet submodule")
+
+ } else {
+ w.Header().Set("Location", "/login.html")
+ w.WriteHeader(http.StatusFound)
+ }
} else {
w.WriteHeader(http.StatusForbidden)
_, _ = w.Write([]byte("Forbidden"))
@@ -510,6 +520,10 @@ func (a *Auth) GetUsers() []User {
// AuthRequired - if authentication is required
func (a *Auth) AuthRequired() bool {
+ if GLMode {
+ return true
+ }
+
a.lock.Lock()
r := (len(a.users) != 0)
a.lock.Unlock()
diff --git a/home/auth_glinet.go b/home/auth_glinet.go
new file mode 100644
index 00000000..7dd2790d
--- /dev/null
+++ b/home/auth_glinet.go
@@ -0,0 +1,102 @@
+package home
+
+import (
+ "bytes"
+ "encoding/binary"
+ "io/ioutil"
+ "net"
+ "net/http"
+ "os"
+ "time"
+ "unsafe"
+
+ "github.com/AdguardTeam/golibs/log"
+)
+
+// GLMode - enable GL-Inet compatibility mode
+var GLMode bool
+
+var glFilePrefix = "/tmp/gl_token_"
+
+const glTokenTimeoutSeconds = 3600
+const glCookieName = "Admin-Token"
+
+func glProcessRedirect(w http.ResponseWriter, r *http.Request) bool {
+ if !GLMode {
+ return false
+ }
+ // redirect to gl-inet login
+ host, _, _ := net.SplitHostPort(r.Host)
+ url := "http://" + host
+ log.Debug("Auth: redirecting to %s", url)
+ http.Redirect(w, r, url, http.StatusFound)
+ return true
+}
+
+func glProcessCookie(r *http.Request) bool {
+ if !GLMode {
+ return false
+ }
+
+ glCookie, glerr := r.Cookie(glCookieName)
+ if glerr != nil {
+ return false
+ }
+
+ log.Debug("Auth: GL cookie value: %s", glCookie.Value)
+ if glCheckToken(glCookie.Value) {
+ return true
+ }
+ log.Info("Auth: invalid GL cookie value: %s", glCookie)
+ return false
+}
+
+func glCheckToken(sess string) bool {
+ tokenName := glFilePrefix + sess
+ _, err := os.Stat(tokenName)
+ if err != nil {
+ log.Error("os.Stat: %s", err)
+ return false
+ }
+ tokenDate := glGetTokenDate(tokenName)
+ now := uint32(time.Now().UTC().Unix())
+ return now <= (tokenDate + glTokenTimeoutSeconds)
+}
+
+func archIsLittleEndian() bool {
+ var i int32 = 0x01020304
+ u := unsafe.Pointer(&i)
+ pb := (*byte)(u)
+ b := *pb
+ return (b == 0x04)
+}
+
+func glGetTokenDate(file string) uint32 {
+ f, err := os.Open(file)
+ if err != nil {
+ log.Error("os.Open: %s", err)
+ return 0
+ }
+ var dateToken uint32
+ bs, err := ioutil.ReadAll(f)
+ if err != nil {
+ log.Error("ioutil.ReadAll: %s", err)
+ return 0
+ }
+ buf := bytes.NewBuffer(bs)
+
+ if archIsLittleEndian() {
+ err := binary.Read(buf, binary.LittleEndian, &dateToken)
+ if err != nil {
+ log.Error("binary.Read: %s", err)
+ return 0
+ }
+ } else {
+ err := binary.Read(buf, binary.BigEndian, &dateToken)
+ if err != nil {
+ log.Error("binary.Read: %s", err)
+ return 0
+ }
+ }
+ return dateToken
+}
diff --git a/home/auth_glinet_test.go b/home/auth_glinet_test.go
new file mode 100644
index 00000000..171bb84e
--- /dev/null
+++ b/home/auth_glinet_test.go
@@ -0,0 +1,43 @@
+package home
+
+import (
+ "encoding/binary"
+ "io/ioutil"
+ "net/http"
+ "os"
+ "testing"
+ "time"
+
+ "github.com/stretchr/testify/assert"
+)
+
+func TestAuthGL(t *testing.T) {
+ dir := prepareTestDir()
+ defer func() { _ = os.RemoveAll(dir) }()
+
+ GLMode = true
+ glFilePrefix = dir + "/gl_token_"
+
+ tval := uint32(1)
+ data := make([]byte, 4)
+ if archIsLittleEndian() {
+ binary.LittleEndian.PutUint32(data, tval)
+ } else {
+ binary.BigEndian.PutUint32(data, tval)
+ }
+ assert.Nil(t, ioutil.WriteFile(glFilePrefix+"test", data, 0644))
+ assert.False(t, glCheckToken("test"))
+
+ tval = uint32(time.Now().UTC().Unix() + 60)
+ data = make([]byte, 4)
+ if archIsLittleEndian() {
+ binary.LittleEndian.PutUint32(data, tval)
+ } else {
+ binary.BigEndian.PutUint32(data, tval)
+ }
+ assert.Nil(t, ioutil.WriteFile(glFilePrefix+"test", data, 0644))
+ r, _ := http.NewRequest("GET", "http://localhost/", nil)
+ r.AddCookie(&http.Cookie{Name: glCookieName, Value: "test"})
+ assert.True(t, glProcessCookie(r))
+ GLMode = false
+}
diff --git a/home/home.go b/home/home.go
index e1338038..077455e8 100644
--- a/home/home.go
+++ b/home/home.go
@@ -263,6 +263,7 @@ func run(args options) {
}
sessFilename := filepath.Join(Context.getDataDir(), "sessions.db")
+ GLMode = args.glinetMode
Context.auth = InitAuth(sessFilename, config.Users, config.WebSessionTTLHours*60*60)
if Context.auth == nil {
log.Fatalf("Couldn't initialize Auth module")
@@ -525,6 +526,8 @@ type options struct {
// runningAsService flag is set to true when options are passed from the service runner
runningAsService bool
+
+ glinetMode bool // Activate GL-Inet mode
}
// loadOptions reads command line arguments and initializes configuration
@@ -559,6 +562,7 @@ func loadOptions() options {
{"check-config", "", "Check configuration and exit", nil, func() { o.checkConfig = true }},
{"no-check-update", "", "Don't check for updates", nil, func() { o.disableUpdate = true }},
{"verbose", "v", "Enable verbose output", nil, func() { o.verbose = true }},
+ {"glinet", "", "Run in GL-Inet compatibility mode", nil, func() { o.glinetMode = true }},
{"version", "", "Show the version and exit", nil, func() {
fmt.Printf("AdGuardHome %s\n", versionString)
os.Exit(0)