Add ip2location

Fix makefile

Author: Peter Pratscher

Makefile

@@ -2,7 +2,7 @@ GITCOMMIT=`git describe --always`
 VERSION=$$(git describe 2>/dev/null || echo "0.0.0-${GITCOMMIT}")
 GITDATE=`TZ=UTC git show -s --date=iso-strict-local --format=%cd HEAD`
 BUILDDATE=`date -u +"%Y-%m-%dT%H:%M:%S%:z"`
-PACKAGE=eth2-exporter
+PACKAGE=coda-explorer
 LDFLAGS="-X ${PACKAGE}/version.Version=${VERSION} -X ${PACKAGE}/version.BuildDate=${BUILDDATE} -X ${PACKAGE}/version.GitCommit=${GITCOMMIT} -X ${PACKAGE}/version.GitDate=${GITDATE}"
 
 all: explorer frontend statistics
@@ -19,8 +19,11 @@ statistics:
 frontend:
 	rm -rf bin/templates
 	rm -rf bin/static
+	rm -rf bin/ip2location
 	mkdir -p bin/templates/
 	mkdir -p bin/static/
+	mkdir -p bin/ip2location/
 	cp -r templates/ bin/
 	cp -r static/ bin/
+	cp -r ip2location/ bin/
 	go build --ldflags=${LDFLAGS} -o bin/frontend cmd/frontend/main.go

go.mod

@@ -12,6 +12,7 @@ require (
 	github.com/meatballhat/negroni-logrus v1.1.0
 	github.com/phyber/negroni-gzip v0.0.0-20180113114010-ef6356a5d029
 	github.com/sirupsen/logrus v1.4.2
+	github.com/tankbusta/go-ip2location v0.0.0-20160330022245-abd0501f28f8
 	github.com/urfave/negroni v1.0.0
 	github.com/zesik/proxyaddr v0.0.0-20161218060608-ec32c535184d
 	google.golang.org/appengine v1.6.5 // indirect

go.sum

@@ -30,6 +30,8 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/tankbusta/go-ip2location v0.0.0-20160330022245-abd0501f28f8 h1:HVRn2tOYSvoJbzsJJdSGOw9Bj3XyERFRoLUnXypDl5I=
+github.com/tankbusta/go-ip2location v0.0.0-20160330022245-abd0501f28f8/go.mod h1:Yb7iDRJ9y0YCIZGWoLwiL6iwuiACyNK2u2o1rwy+b+o=
 github.com/urfave/negroni v1.0.0 h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc=
 github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
 github.com/zesik/proxyaddr v0.0.0-20161218060608-ec32c535184d h1:Gsw/uTjNB2vkIEhBO3NAXjKo6QRY6D5B0GzMv980ses=

ip2location/IP2LOCATION-LITE-DB1.BIN

@@ -24,16 +24,26 @@ import (
 	"sync"
 	"sync/atomic"
 	"time"
+
+	"github.com/tankbusta/go-ip2location"
 )
 
 var latestHeight uint64
 var indexPageData atomic.Value
 var ready = sync.WaitGroup{}
+var GeoIpDb ip2location.IP2Location
 
 var logger = logrus.New().WithField("module", "services")
 
 // Init will initialize the services
 func Init() {
+
+	db, err := ip2location.NewIP2Location("ip2location/IP2LOCATION-LITE-DB1.BIN")
+	if err != nil {
+		logger.Fatalf("error opening ip2location database: %v", err)
+	}
+	GeoIpDb = db
+
 	ready.Add(2)
 	go heightUpdater()
 	go indexPageDataUpdater()

services/services.go

@@ -78,7 +78,7 @@ <h4 class="alert-heading"><i class="fas fa-exclamation-triangle mr-1"></i>Block
 					</div>
 					<div class="row border-bottom p-3">
 						<div class="col-md-2">Time:</div>
-						<div class="col-md-10"><span aria-local-date="{{.Ts.Unix}}">{{.Ts}}</span></div>
+						<div class="col-md-10"><span aria-local-date="{{.Ts.Unix}}">{{.Ts}}</span> (<span aria-local-date="{{.Ts.Unix}}" aria-local-date-format="FROMNOW"></span>)</div>
 					</div>
 					<div class="row border-bottom p-3">
 						<div class="col-md-2">Creator:</div>

templates/block.html

@@ -17,9 +17,11 @@
 package templates
 
 import (
+	"coda-explorer/services"
 	"fmt"
 	"github.com/lib/pq"
 	"html/template"
+	"net"
 	"strings"
 	"time"
 
@@ -35,6 +37,7 @@ func GetTemplateFuncs() template.FuncMap {
 		"formatPGIntArray":   formatPGIntArray,
 		"decodeBase58":       decodeBase58,
 		"joinHtml":           joinHtml,
+		"ipToCountry":        ipToCountry,
 	}
 
 	gtf.ForceInject(fm)
@@ -65,3 +68,17 @@ func decodeBase58(encoded string) string {
 func joinHtml(arg string, value []string) template.HTML {
 	return template.HTML(strings.Join(value, arg))
 }
+
+func ipToCountry(peer string) string {
+	ip, _, err := net.SplitHostPort(peer)
+	if err != nil {
+		return ""
+	}
+
+	rec, err := services.GeoIpDb.GetRecord(ip)
+
+	if err != nil {
+		return ""
+	}
+	return rec.CountryLong
+}

templates/funcs.go

@@ -61,7 +61,7 @@ <h1 class="h4 mb-1 mb-md-0">
 				<div class="col-md-10">
 					<ul class="list-unstyled">
                         {{range $peer := .Peers}}
-							<li class="text-muted"><small>{{$peer}}</small></li>
+							<li class="text-muted"><small>{{$peer}} ({{ipToCountry $peer}})</small></li>
                         {{end}}
 					</ul>
 				</div>