mirror of
https://github.com/strukturag/nextcloud-spreed-signaling
synced 2024-06-04 23:12:29 +02:00
Support getting GeoIP DB from db-ip.com for tests.
This commit is contained in:
parent
f8eae0b71f
commit
7844a9c21a
15
geoip.go
15
geoip.go
|
@ -156,15 +156,18 @@ func (g *GeoLookup) updateUrl() error {
|
||||||
}
|
}
|
||||||
|
|
||||||
body := response.Body
|
body := response.Body
|
||||||
if strings.HasSuffix(g.url, ".gz") {
|
url := g.url
|
||||||
|
if strings.HasSuffix(url, ".gz") {
|
||||||
body, err = gzip.NewReader(body)
|
body, err = gzip.NewReader(body)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
url = strings.TrimSuffix(url, ".gz")
|
||||||
}
|
}
|
||||||
|
|
||||||
tarfile := tar.NewReader(body)
|
|
||||||
var geoipdata []byte
|
var geoipdata []byte
|
||||||
|
if strings.HasSuffix(url, ".tar") || strings.HasSuffix(url, "=tar") {
|
||||||
|
tarfile := tar.NewReader(body)
|
||||||
for {
|
for {
|
||||||
header, err := tarfile.Next()
|
header, err := tarfile.Next()
|
||||||
if err == io.EOF {
|
if err == io.EOF {
|
||||||
|
@ -183,9 +186,15 @@ func (g *GeoLookup) updateUrl() error {
|
||||||
}
|
}
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
geoipdata, err = io.ReadAll(body)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if len(geoipdata) == 0 {
|
if len(geoipdata) == 0 {
|
||||||
return fmt.Errorf("did not find MaxMind database in tarball from %s", g.url)
|
return fmt.Errorf("did not find GeoIP database in download from %s", g.url)
|
||||||
}
|
}
|
||||||
|
|
||||||
reader, err := maxminddb.FromBytes(geoipdata)
|
reader, err := maxminddb.FromBytes(geoipdata)
|
||||||
|
|
|
@ -24,12 +24,14 @@ package signaling
|
||||||
import (
|
import (
|
||||||
"archive/tar"
|
"archive/tar"
|
||||||
"compress/gzip"
|
"compress/gzip"
|
||||||
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"net"
|
"net"
|
||||||
"net/http"
|
"net/http"
|
||||||
"os"
|
"os"
|
||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
func testGeoLookupReader(t *testing.T, reader *GeoLookup) {
|
func testGeoLookupReader(t *testing.T, reader *GeoLookup) {
|
||||||
|
@ -57,13 +59,26 @@ func testGeoLookupReader(t *testing.T, reader *GeoLookup) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestGeoLookup(t *testing.T) {
|
func GetGeoIpUrlForTest(t *testing.T) string {
|
||||||
|
t.Helper()
|
||||||
|
|
||||||
|
var geoIpUrl string
|
||||||
|
if os.Getenv("USE_DB_IP_GEOIP_DATABASE") != "" {
|
||||||
|
now := time.Now().UTC()
|
||||||
|
geoIpUrl = fmt.Sprintf("https://download.db-ip.com/free/dbip-country-lite-%d-%.2d.mmdb.gz", now.Year(), now.Month())
|
||||||
|
}
|
||||||
|
if geoIpUrl == "" {
|
||||||
license := os.Getenv("MAXMIND_GEOLITE2_LICENSE")
|
license := os.Getenv("MAXMIND_GEOLITE2_LICENSE")
|
||||||
if license == "" {
|
if license == "" {
|
||||||
t.Skip("No MaxMind GeoLite2 license was set in MAXMIND_GEOLITE2_LICENSE environment variable.")
|
t.Skip("No MaxMind GeoLite2 license was set in MAXMIND_GEOLITE2_LICENSE environment variable.")
|
||||||
}
|
}
|
||||||
|
geoIpUrl = GetGeoIpDownloadUrl(license)
|
||||||
|
}
|
||||||
|
return geoIpUrl
|
||||||
|
}
|
||||||
|
|
||||||
reader, err := NewGeoLookupFromUrl(GetGeoIpDownloadUrl(license))
|
func TestGeoLookup(t *testing.T) {
|
||||||
|
reader, err := NewGeoLookupFromUrl(GetGeoIpUrlForTest(t))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
@ -77,12 +92,7 @@ func TestGeoLookup(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestGeoLookupCaching(t *testing.T) {
|
func TestGeoLookupCaching(t *testing.T) {
|
||||||
license := os.Getenv("MAXMIND_GEOLITE2_LICENSE")
|
reader, err := NewGeoLookupFromUrl(GetGeoIpUrlForTest(t))
|
||||||
if license == "" {
|
|
||||||
t.Skip("No MaxMind GeoLite2 license was set in MAXMIND_GEOLITE2_LICENSE environment variable.")
|
|
||||||
}
|
|
||||||
|
|
||||||
reader, err := NewGeoLookupFromUrl(GetGeoIpDownloadUrl(license))
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
@ -136,24 +146,22 @@ func TestGeoLookupCloseEmpty(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestGeoLookupFromFile(t *testing.T) {
|
func TestGeoLookupFromFile(t *testing.T) {
|
||||||
license := os.Getenv("MAXMIND_GEOLITE2_LICENSE")
|
geoIpUrl := GetGeoIpUrlForTest(t)
|
||||||
if license == "" {
|
|
||||||
t.Skip("No MaxMind GeoLite2 license was set in MAXMIND_GEOLITE2_LICENSE environment variable.")
|
|
||||||
}
|
|
||||||
|
|
||||||
url := GetGeoIpDownloadUrl(license)
|
resp, err := http.Get(geoIpUrl)
|
||||||
resp, err := http.Get(url)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
defer resp.Body.Close()
|
defer resp.Body.Close()
|
||||||
|
|
||||||
body := resp.Body
|
body := resp.Body
|
||||||
if strings.HasSuffix(url, ".gz") {
|
url := geoIpUrl
|
||||||
|
if strings.HasSuffix(geoIpUrl, ".gz") {
|
||||||
body, err = gzip.NewReader(body)
|
body, err = gzip.NewReader(body)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
url = strings.TrimSuffix(url, ".gz")
|
||||||
}
|
}
|
||||||
|
|
||||||
tmpfile, err := os.CreateTemp("", "geoipdb")
|
tmpfile, err := os.CreateTemp("", "geoipdb")
|
||||||
|
@ -164,8 +172,9 @@ func TestGeoLookupFromFile(t *testing.T) {
|
||||||
os.Remove(tmpfile.Name())
|
os.Remove(tmpfile.Name())
|
||||||
})
|
})
|
||||||
|
|
||||||
tarfile := tar.NewReader(body)
|
|
||||||
foundDatabase := false
|
foundDatabase := false
|
||||||
|
if strings.HasSuffix(url, ".tar") || strings.HasSuffix(url, "=tar") {
|
||||||
|
tarfile := tar.NewReader(body)
|
||||||
for {
|
for {
|
||||||
header, err := tarfile.Next()
|
header, err := tarfile.Next()
|
||||||
if err == io.EOF {
|
if err == io.EOF {
|
||||||
|
@ -188,9 +197,19 @@ func TestGeoLookupFromFile(t *testing.T) {
|
||||||
foundDatabase = true
|
foundDatabase = true
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
if _, err := io.Copy(tmpfile, body); err != nil {
|
||||||
|
tmpfile.Close()
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if err := tmpfile.Close(); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
foundDatabase = true
|
||||||
|
}
|
||||||
|
|
||||||
if !foundDatabase {
|
if !foundDatabase {
|
||||||
t.Fatal("Did not find MaxMind database in tarball")
|
t.Fatalf("Did not find GeoIP database in download from %s", geoIpUrl)
|
||||||
}
|
}
|
||||||
|
|
||||||
reader, err := NewGeoLookupFromFile(tmpfile.Name())
|
reader, err := NewGeoLookupFromFile(tmpfile.Name())
|
||||||
|
|
|
@ -221,6 +221,8 @@ connectionsperhost = 8
|
||||||
# register an account at "https://www.maxmind.com/en/geolite2/signup" for
|
# register an account at "https://www.maxmind.com/en/geolite2/signup" for
|
||||||
# free. See "https://dev.maxmind.com/geoip/geoip2/geolite2/" for further
|
# free. See "https://dev.maxmind.com/geoip/geoip2/geolite2/" for further
|
||||||
# information.
|
# information.
|
||||||
|
# You can also get a free GeoIP database from https://db-ip.com/ without
|
||||||
|
# registration. Provide the URL below in this case.
|
||||||
# Leave empty to disable GeoIP lookups.
|
# Leave empty to disable GeoIP lookups.
|
||||||
#license =
|
#license =
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue