mirror of
https://github.com/octoleo/syncthing.git
synced 2024-11-09 23:00:58 +00:00
Add local geoip
This commit is contained in:
Audrius Butkevicius
parent
175769b53e
commit
50068b0b0f
@ -5,12 +5,12 @@ import (
|
||||
)
|
||||
|
||||
const (
|
||||
AssetsBuildDate = "Sun, 22 Nov 2015 22:45:35 GMT"
|
||||
AssetsBuildDate = "Wed, 13 Apr 2016 20:30:55 GMT"
|
||||
)
|
||||
|
||||
func Assets() map[string][]byte {
|
||||
var assets = make(map[string][]byte, 1)
|
||||
|
||||
assets["index.html"], _ = base64.StdEncoding.DecodeString("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")
|
||||
assets["index.html"], _ = base64.StdEncoding.DecodeString("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")
|
||||
return assets
|
||||
}
|
||||
|
||||
@ -103,6 +103,11 @@
|
||||
</tfoor>
|
||||
</table>
|
||||
</div>
|
||||
<hr>
|
||||
<p>
|
||||
This product includes GeoLite2 data created by MaxMind, available from
|
||||
<a href="http://www.maxmind.com">http://www.maxmind.com</a>.
|
||||
</p>
|
||||
</div>
|
||||
|
||||
|
||||
@ -200,15 +205,6 @@
|
||||
|
||||
$scope.uri[relay.url] = uri;
|
||||
|
||||
initProgress("Resolving location for " + uri.hostname);
|
||||
var resolveGeoIp = $http.get('http://ipinfo.io/' + uri.hostname).then(function (response) {
|
||||
progressDone("Resolving location for " + uri.hostname);
|
||||
|
||||
$scope.geoip[relay.url] = response.data;
|
||||
});
|
||||
|
||||
promises.push(resolveGeoIp);
|
||||
|
||||
var resolveStatus = $q.defer();
|
||||
|
||||
initProgress("Getting relay status for " + uri.hostname);
|
||||
@ -249,23 +245,22 @@
|
||||
|
||||
angular.forEach($scope.relays, function(relay) {
|
||||
var scope = $rootScope.$new(true);
|
||||
var geoip = $scope.geoip[relay.url];
|
||||
var loc = relay.location.latitude + "," + relay.location.longitude;
|
||||
|
||||
// Deal with overlapping markers
|
||||
while (geoip.loc in usedLocs) {
|
||||
var locParts = geoip.loc.split(',');
|
||||
while (loc in usedLocs) {
|
||||
var locParts = loc.split(',');
|
||||
locParts = [parseFloat(locParts[0]), parseFloat(locParts[1])];
|
||||
locParts[Math.round(Math.random())] += 0.5 * (Math.random() >= 0.5 ? 1 : -1);
|
||||
geoip.loc = locParts.join(',');
|
||||
loc = locParts.join(',');
|
||||
}
|
||||
|
||||
usedLocs[geoip.loc] = true;
|
||||
usedLocs[loc] = true;
|
||||
|
||||
var locParts = geoip.loc.split(',');
|
||||
var locParts = loc.split(',');
|
||||
var position = new google.maps.LatLng(locParts[0], locParts[1]);
|
||||
|
||||
scope.status = $scope.status[relay.url];
|
||||
scope.geoip = geoip;
|
||||
scope.relay = relay;
|
||||
scope.uri = $scope.uri[relay.url];
|
||||
|
||||
|
||||
@ -25,15 +25,23 @@ import (
|
||||
"github.com/golang/groupcache/lru"
|
||||
"github.com/juju/ratelimit"
|
||||
|
||||
"github.com/oschwald/geoip2-golang"
|
||||
|
||||
"github.com/syncthing/relaypoolsrv/auto"
|
||||
"github.com/syncthing/syncthing/lib/relay/client"
|
||||
"github.com/syncthing/syncthing/lib/sync"
|
||||
"github.com/syncthing/syncthing/lib/tlsutil"
|
||||
)
|
||||
|
||||
type location struct {
|
||||
Latitude float64 `json:"latitude"`
|
||||
Longitude float64 `json:"longitude"`
|
||||
}
|
||||
|
||||
type relay struct {
|
||||
URL string `json:"url"`
|
||||
uri *url.URL
|
||||
URL string `json:"url"`
|
||||
Location location `json:"location"`
|
||||
uri *url.URL
|
||||
}
|
||||
|
||||
func (r relay) String() string {
|
||||
@ -68,6 +76,7 @@ var (
|
||||
postLimit time.Duration
|
||||
permRelaysFile string
|
||||
ipHeader string
|
||||
geoipPath string
|
||||
|
||||
getMut sync.RWMutex = sync.NewRWMutex()
|
||||
getLRUCache *lru.Cache
|
||||
@ -96,6 +105,7 @@ func main() {
|
||||
flag.Int64Var(&postLimitBurst, "post-limit-burst", postLimitBurst, "Allowed burst post requests")
|
||||
flag.StringVar(&permRelaysFile, "perm-relays", "", "Path to list of permanent relays")
|
||||
flag.StringVar(&ipHeader, "ip-header", "", "Name of header which holds clients ip:port. Only meaningful when running behind a reverse proxy.")
|
||||
flag.StringVar(&geoipPath, "geoip", "GeoLite2-City.mmdb", "Path to GeoLite2-City database")
|
||||
|
||||
flag.Parse()
|
||||
|
||||
@ -333,6 +343,7 @@ func handlePostRequest(w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
newRelay.uri = uri
|
||||
newRelay.Location = getLocation(uri.Host)
|
||||
|
||||
for _, current := range permanentRelays {
|
||||
if current.uri.Host == newRelay.uri.Host {
|
||||
@ -483,8 +494,9 @@ func loadPermanentRelays(file string) {
|
||||
}
|
||||
|
||||
permanentRelays = append(permanentRelays, relay{
|
||||
URL: line,
|
||||
uri: uri,
|
||||
URL: line,
|
||||
Location: getLocation(uri.Host),
|
||||
uri: uri,
|
||||
})
|
||||
if debug {
|
||||
log.Println("Adding permanent relay", line)
|
||||
@ -506,3 +518,26 @@ func createTestCertificate() tls.Certificate {
|
||||
|
||||
return cert
|
||||
}
|
||||
|
||||
func getLocation(host string) location {
|
||||
db, err := geoip2.Open(geoipPath)
|
||||
if err != nil {
|
||||
return location{}
|
||||
}
|
||||
defer db.Close()
|
||||
|
||||
addr, err := net.ResolveTCPAddr("tcp", host)
|
||||
if err != nil {
|
||||
return location{}
|
||||
}
|
||||
|
||||
city, err := db.City(addr.IP)
|
||||
if err != nil {
|
||||
return location{}
|
||||
}
|
||||
|
||||
return location{
|
||||
Latitude: city.Location.Latitude,
|
||||
Longitude: city.Location.Longitude,
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user