deblan-mirror/nextcloud-spreed-signaling
deblan-mirror/nextcloud-spreed-signaling
1
0
Fork 0
mirror of https://github.com/strukturag/nextcloud-spreed-signaling synced 2024-05-01 21:42:45 +02:00
Code Issues Releases Wiki Activity

Support getting GeoIP DB from db-ip.com for tests.

Browse source
This commit is contained in:
Joachim Bauch 2024-04-02 16:50:15 +02:00
parent f8eae0b71f
commit 7844a9c21a
No known key found for this signature in database
GPG key ID: 77C1D22D53E15F02
3 changed files with 78 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
geoip.go
View file

@ -156,36 +156,45 @@ func (g *GeoLookup) updateUrl() error {
}
body := response.Body
if strings.HasSuffix(g.url, ".gz") {
url := g.url
if strings.HasSuffix(url, ".gz") {
body, err = gzip.NewReader(body)
if err != nil {
return err
}
url = strings.TrimSuffix(url, ".gz")
}
tarfile := tar.NewReader(body)
var geoipdata []byte
for {
header, err := tarfile.Next()
if err == io.EOF {
if strings.HasSuffix(url, ".tar") || strings.HasSuffix(url, "=tar") {
tarfile := tar.NewReader(body)
for {
header, err := tarfile.Next()
if err == io.EOF {
break
} else if err != nil {
return err
}
if !strings.HasSuffix(header.Name, ".mmdb") {
continue
}
geoipdata, err = io.ReadAll(tarfile)
if err != nil {
return err
}
break
} else if err != nil {
return err
}
if !strings.HasSuffix(header.Name, ".mmdb") {
continue
}
geoipdata, err = io.ReadAll(tarfile)
} else {
geoipdata, err = io.ReadAll(body)
if err != nil {
return err
}
break
}
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)

85
geoip_test.go
View file

@ -24,12 +24,14 @@ package signaling
import (
"archive/tar"
"compress/gzip"
"fmt"
"io"
"net"
"net/http"
"os"
"strings"
"testing"
"time"
)
func testGeoLookupReader(t *testing.T, reader *GeoLookup) {
@ -57,13 +59,26 @@ func testGeoLookupReader(t *testing.T, reader *GeoLookup) {
}
}
func TestGeoLookup(t *testing.T) {
license := os.Getenv("MAXMIND_GEOLITE2_LICENSE")
if license == "" {
t.Skip("No MaxMind GeoLite2 license was set in MAXMIND_GEOLITE2_LICENSE environment variable.")
}
func GetGeoIpUrlForTest(t *testing.T) string {
t.Helper()
reader, err := NewGeoLookupFromUrl(GetGeoIpDownloadUrl(license))
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")
if license == "" {
t.Skip("No MaxMind GeoLite2 license was set in MAXMIND_GEOLITE2_LICENSE environment variable.")
}
geoIpUrl = GetGeoIpDownloadUrl(license)
}
return geoIpUrl
}
func TestGeoLookup(t *testing.T) {
reader, err := NewGeoLookupFromUrl(GetGeoIpUrlForTest(t))
if err != nil {
t.Fatal(err)
}
@ -77,12 +92,7 @@ func TestGeoLookup(t *testing.T) {
}
func TestGeoLookupCaching(t *testing.T) {
license := os.Getenv("MAXMIND_GEOLITE2_LICENSE")
if license == "" {
t.Skip("No MaxMind GeoLite2 license was set in MAXMIND_GEOLITE2_LICENSE environment variable.")
}
reader, err := NewGeoLookupFromUrl(GetGeoIpDownloadUrl(license))
reader, err := NewGeoLookupFromUrl(GetGeoIpUrlForTest(t))
if err != nil {
t.Fatal(err)
}
@ -136,24 +146,22 @@ func TestGeoLookupCloseEmpty(t *testing.T) {
}
func TestGeoLookupFromFile(t *testing.T) {
license := os.Getenv("MAXMIND_GEOLITE2_LICENSE")
if license == "" {
t.Skip("No MaxMind GeoLite2 license was set in MAXMIND_GEOLITE2_LICENSE environment variable.")
}
geoIpUrl := GetGeoIpUrlForTest(t)
url := GetGeoIpDownloadUrl(license)
resp, err := http.Get(url)
resp, err := http.Get(geoIpUrl)
if err != nil {
t.Fatal(err)
}
defer resp.Body.Close()
body := resp.Body
if strings.HasSuffix(url, ".gz") {
url := geoIpUrl
if strings.HasSuffix(geoIpUrl, ".gz") {
body, err = gzip.NewReader(body)
if err != nil {
t.Fatal(err)
}
url = strings.TrimSuffix(url, ".gz")
}
tmpfile, err := os.CreateTemp("", "geoipdb")
@ -164,21 +172,33 @@ func TestGeoLookupFromFile(t *testing.T) {
os.Remove(tmpfile.Name())
})
tarfile := tar.NewReader(body)
foundDatabase := false
for {
header, err := tarfile.Next()
if err == io.EOF {
if strings.HasSuffix(url, ".tar") || strings.HasSuffix(url, "=tar") {
tarfile := tar.NewReader(body)
for {
header, err := tarfile.Next()
if err == io.EOF {
break
} else if err != nil {
t.Fatal(err)
}
if !strings.HasSuffix(header.Name, ".mmdb") {
continue
}
if _, err := io.Copy(tmpfile, tarfile); err != nil {
tmpfile.Close()
t.Fatal(err)
}
if err := tmpfile.Close(); err != nil {
t.Fatal(err)
}
foundDatabase = true
break
} else if err != nil {
t.Fatal(err)
}
if !strings.HasSuffix(header.Name, ".mmdb") {
continue
}
if _, err := io.Copy(tmpfile, tarfile); err != nil {
} else {
if _, err := io.Copy(tmpfile, body); err != nil {
tmpfile.Close()
t.Fatal(err)
}
@ -186,11 +206,10 @@ func TestGeoLookupFromFile(t *testing.T) {
t.Fatal(err)
}
foundDatabase = true
break
}
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())

2
server.conf.in
View file

@ -221,6 +221,8 @@ connectionsperhost = 8
# register an account at "https://www.maxmind.com/en/geolite2/signup" for
# free. See "https://dev.maxmind.com/geoip/geoip2/geolite2/" for further
# 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.
#license =