- Location - lists.ipfire.org

[PATCH] Makefile: Build debian packages in own directory.
by Stefan Schantl 11 Dec '19

11 Dec '19

This helps to keep a much cleaner environment. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- Makefile.am | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 1b9d90e..bf1dde1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -421,4 +421,8 @@ $(DEBIAN_TARBALL_NAME): dist .PHONY: debian debian: $(DEBIAN_TARBALL_NAME) - debuild -i -us -uc -b + mkdir -pv debian-build/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/debian + cp -avf $(DEBIAN_TARBALL_NAME) debian-build + cp -avf debian/* debian-build/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/debian + cd debian-build && tar -xvf $(DEBIAN_TARBALL_NAME) + cd debian-build/$(PACKAGE_NAME)-$(PACKAGE_VERSION) && debuild -us -uc -- 2.20.1

1 0

[PATCH] perl: Add get_continent_code()
by Stefan Schantl 11 Dec '19

11 Dec '19

This function allows to get the continent code by a given country code. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- src/perl/Location.xs | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/src/perl/Location.xs b/src/perl/Location.xs index 02dff7d..5693744 100644 --- a/src/perl/Location.xs +++ b/src/perl/Location.xs @@ -166,6 +166,31 @@ lookup_asn(db, address) OUTPUT: RETVAL +# +# Get functions +# +SV* +get_continent_code(db, ccode) + struct loc_database* db; + char* ccode; + + CODE: + RETVAL = &PL_sv_undef; + + // Lookup country code + struct loc_country *country; + int err = loc_database_get_country(db, &country, ccode); + if(!err) { + //Extract the continent code for the given country code. + const char* continent_code = loc_country_get_continent_code(country); + RETVAL = newSVpv(continent_code, strlen(continent_code)); + + loc_country_unref(country); + } + + OUTPUT: + RETVAL + void DESTROY(db) struct loc_database* db; -- 2.20.1

1 0

[PATCH] location-exporter: Allow exporting by family
by Stefan Schantl 09 Dec '19

09 Dec '19

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- src/python/location-exporter.in | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/python/location-exporter.in b/src/python/location-exporter.in index 421ed02..3074b90 100644 --- a/src/python/location-exporter.in +++ b/src/python/location-exporter.in @@ -177,8 +177,8 @@ class Exporter(object): self.db = db self.writer = writer - def export(self, directory, countries, asns): - for family in (socket.AF_INET6, socket.AF_INET): + def export(self, directory, families, countries, asns): + for family in families: log.debug("Exporting family %s" % family) writers = {} @@ -242,6 +242,9 @@ class CLI(object): # directory parser.add_argument("--directory", help=_("Output directory"), required=True) + # family + parser.add_argument("--family", help=_("Specify address family"), choices=("ipv6", "ipv4")) + # Countries and Autonomous Systems parser.add_argument("objects", nargs="+") @@ -270,6 +273,14 @@ class CLI(object): def handle_export(self, ns): countries, asns = [], [] + # Translate family + if ns.family == "ipv6": + families = [ socket.AF_INET6 ] + elif ns.family == "ipv4": + families = [ socket.AF_INET ] + else: + families = [ socket.AF_INET6, socket.AF_INET ] + for object in ns.objects: if object.startswith("AS"): try: @@ -299,7 +310,7 @@ class CLI(object): assert writer e = Exporter(db, writer) - e.export(ns.directory, countries=countries, asns=asns) + e.export(ns.directory, countries=countries, asns=asns, families=families) def main(): -- 2.20.1

2 1

[PATCH] debian: Install location-exporter
by Stefan Schantl 06 Dec '19

06 Dec '19

This binary has no manpage yet, so lintian will provide a warning of the non existing manpage. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- debian/libloc.install | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/libloc.install b/debian/libloc.install index 55567b1..bc05c02 100644 --- a/debian/libloc.install +++ b/debian/libloc.install @@ -1,4 +1,5 @@ usr/bin/location-downloader +usr/bin/location-exporter usr/bin/location-query usr/lib/*/libloc.so.* usr/lib/python3*/*-packages/*.so -- 2.20.1

2 1

[PATCH] Add some more country codes.
by Stefan Schantl 27 Nov '19

27 Nov '19

* Bonaire, Sint Eustatius and Saba (BQ) * Curacao (CW) * South Sudan (SS) * Sint Maarten (SX) Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- countries.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/countries.txt b/countries.txt index 6bed149..716e774 100644 --- a/countries.txt +++ b/countries.txt @@ -29,6 +29,7 @@ BL NA BM NA BN AS BO SA +BQ SA BR SA BS NA BT AS @@ -51,6 +52,7 @@ CO SA CR NA CU NA CV AF +CW SA CX AS CY AS CZ EU @@ -207,8 +209,10 @@ SM EU SN AF SO AF SR SA +SS AF ST AF SV NA +SX NA SY AS SZ AF TC NA -- 2.20.1

1 0

[PATCH] Add support for packaging debian (deb) packages
by Stefan Schantl 25 Nov '19

25 Nov '19

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- debian/changelog | 5 ++++ debian/compat | 1 + debian/control | 52 +++++++++++++++++++++++++++++++++ debian/copyright | 26 +++++++++++++++++ debian/libloc-dev.install | 3 ++ debian/libloc-perl.install | 1 + debian/libloc.install | 6 ++++ debian/libloc.lintian-overrides | 1 + debian/libloc.manpages | 2 ++ debian/rules | 13 +++++++++ debian/source/format | 1 + 11 files changed, 111 insertions(+) create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/libloc-dev.install create mode 100644 debian/libloc-perl.install create mode 100644 debian/libloc.install create mode 100644 debian/libloc.lintian-overrides create mode 100644 debian/libloc.manpages create mode 100755 debian/rules create mode 100644 debian/source/format diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..0a47a3d --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +libloc (0.9.0-1) UNRELEASED; urgency=medium + + * Initial release. (Closes: #XXXXXX) + + -- Stefan Schantl <stefan.schantl(a)ipfire.org> Sun, 27 Oct 2019 18:55:44 +0100 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..f599e28 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +10 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..85e2f04 --- /dev/null +++ b/debian/control @@ -0,0 +1,52 @@ +Source: libloc +Maintainer: Stefan Schantl <stefan.schantl(a)ipfire.org> +Section: misc +Priority: optional +Standards-Version: 4.3.0 +Build-Depends: + debhelper (>= 11), + dh-python <!nopython>, + libpython3-all-dev <!nopython>, + libsystemd-dev, + python3-all-dev:any <!nopython>, +Rules-Requires-Root: no +Homepage: https://location.ipfire.org/ +Vcs-Git: https://git.ipfire.org/pub/git/location/libloc.git +Vcs-Browser: https://git.ipfire.org/pub/git/location/libloc.git + +Package: libloc +Architecture: any +Pre-Depends: + ${misc:Pre-Depends} +Depends: + perl, + ${shlibs:Depends}, + ${misc:Depends}, + ${python3:Depends}, +Multi-Arch: same +Description: Location library + A library to determine the location of someone on the Internet + +Package: libloc-dev +Architecture: any +Section: libdevel +Depends: + libloc (= ${binary:Version}), + ${misc:Depends}, +Suggests: + pkg-config, +Multi-Arch: same +Description: Development files for libloc. + Install this package if you wish to develop your own programs using + libloc. + +Package: libloc-perl +Architecture: any +Section: perl +Depends: + ${misc:Depends}, + ${perl:Depends}, + ${shlibs:Depends} +Multi-Arch: same +Description: Perl bindings for libloc + This package contains simple perl bindings for libloc. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..151d53a --- /dev/null +++ b/debian/copyright @@ -0,0 +1,26 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: libloc +Upstream-Contact: Michael Tremer <michael.tremer(a)ipfire.org> +Source: https://location.ipfire.org/download + +Files: * +Copyright: 2017-2019 IPFire Development team <info(a)ipfire.org> +License: LGPL-2.1 + +Files: debian/* +Copyright: 2019 Stefan Schantl stefan.schantl(a)ipfire.org> +License: LGPL-2.1 + +License: LGPL-2.1 + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published by the + Free Software Foundation; version 2.1 of the License, or (at + your option) any later version. + . + You should have received a copy of the GNU Lesser General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + . + The complete text of the GNU General Public License + can be found in /usr/share/common-licenses/LGPL-2.1 file. + . diff --git a/debian/libloc-dev.install b/debian/libloc-dev.install new file mode 100644 index 0000000..d93d217 --- /dev/null +++ b/debian/libloc-dev.install @@ -0,0 +1,3 @@ +usr/include/libloc +usr/lib/*/libloc.so +usr/lib/*/pkgconfig diff --git a/debian/libloc-perl.install b/debian/libloc-perl.install new file mode 100644 index 0000000..08e8cc4 --- /dev/null +++ b/debian/libloc-perl.install @@ -0,0 +1 @@ +usr/lib/*/perl/ diff --git a/debian/libloc.install b/debian/libloc.install new file mode 100644 index 0000000..55567b1 --- /dev/null +++ b/debian/libloc.install @@ -0,0 +1,6 @@ +usr/bin/location-downloader +usr/bin/location-query +usr/lib/*/libloc.so.* +usr/lib/python3*/*-packages/*.so +src/systemd/*.service /lib/systemd/system/ +src/systemd/*.timer /lib/systemd/system/ diff --git a/debian/libloc.lintian-overrides b/debian/libloc.lintian-overrides new file mode 100644 index 0000000..ca2589e --- /dev/null +++ b/debian/libloc.lintian-overrides @@ -0,0 +1 @@ +libloc: package-name-doesnt-match-sonames libloc0 diff --git a/debian/libloc.manpages b/debian/libloc.manpages new file mode 100644 index 0000000..c2f1630 --- /dev/null +++ b/debian/libloc.manpages @@ -0,0 +1,2 @@ +man/location-downloader.8 +man/location-query.8 diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..55d4334 --- /dev/null +++ b/debian/rules @@ -0,0 +1,13 @@ +#!/usr/bin/make -f + +# enable verbose mode +#export DH_VERBOSE=1 + +# enable all hardening build flags +export DEB_BUILD_MAINT_OPTIONS=hardening=+all + +%: + dh $@ --with python3 --with-systemd + +override_dh_perl: + dh_perl -d diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) -- 2.20.1

1 0

libloc: Approaching feature-completeness
by Michael Tremer 04 Oct '19

04 Oct '19

Good morning ladies and gentlemen, I would like to bring everyone up to speed since we have made huge progress on libloc and I would like to keep this momentum! What has happened in the last couple of weeks? Stefan has been working on Perl bindings which are essential to launch this on IPFire 2. The web UI makes a lot of use of looking up IP addresses and displaying the correct flag. That needs to be fast and therefore we could not rely on a CLI wrapper for location-query(8). The Perl module is super-lightweight and does not implement all features of libloc. Mainly it is ready-only since we do not need another tool to compose a database. For our purposes this is sufficient and easier to maintain. If anyone else needs more features, they can always be added later. The other thing I have been working on (with a lot of sweat, blood and tears) is walking through the tree to search it. This has been an outstanding issue for a long time and was fairly difficult to implement since a standard DFS was not possible to use. We have encoded information into the edges to store less information and this made it extremely difficult to extract again - on top of that comes that the implementation could not be recursive to be used in the Python wrapper. We now have a re-entrant search which performs super fast and uses very little memory. The depth of the tree is limited to 128, although we would never get too close to that. That results in a maximum stack size of 256 + 1 nodes and we walk through every edge and node only once which results in a performance of O(1) for computing and memory. It could not get better than that. Finally, I have extended the Python bindings to make use of all of this so that all networks belonging to an AS can now be listed with “list-networks-by-as” and all networks belonging to a country can be listed with “list-networks-by-cc”. I have added a man-page for location-query(8) which can be found here: https://man-pages.ipfire.org/libloc/location-query.html As far as I can see this now, we are approaching to be feature-complete for a 1.0 release. Of course there is still a long way to test this and make sure that we do not have any bugs in the database format or the code. Another major road block is that we do not have a database that is ready for prime time, yet, but the good news is that the toolkit is almost there! Best, -Michael

1 0

[PATCHv2] perl: Testsuite: Add tests for lookup_asn()
by Stefan Schantl 02 Oct '19

02 Oct '19

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- src/perl/t/Location.t | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/perl/t/Location.t b/src/perl/t/Location.t index 55a18f3..fd43946 100644 --- a/src/perl/t/Location.t +++ b/src/perl/t/Location.t @@ -11,7 +11,7 @@ use warnings; # Where to find the test database. my $testdb = $ENV{'database'}; -use Test::More tests => 5; +use Test::More tests => 6; BEGIN { use_ok('Location') }; ######################### @@ -42,3 +42,12 @@ if(defined($country_code)) { fail("Test 5 - Lookup country code for address not $country_code = &Location::lookup_country_code($db, "a.b.c.d"); if(defined($country_code)) { fail("Test 6 - Lookup country code for invalid address.") } + +my $as_number = &Location::lookup_asn($db, $address); +ok($as_number eq "204867", "Test 7 - Lookup Autonomous System Number for $address."); + +$as_number = &Location::lookup_asn($db, "1.1.1.1"); +if(defined($as_number)) { fail("Test 8 - Lookup Autonomous System Number for address not in Database.") } + +$as_number = &Location::lookup_asn($db, "a.b.c.d"); +if(defined($as_number)) { fail("Test 9 - Lookup Autonomous System Number for invalid address.") } -- 2.20.1

1 0

[PATCHv2] perl: Add function to perform AS number lookups.
by Stefan Schantl 02 Oct '19

02 Oct '19

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- src/perl/Location.xs | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/perl/Location.xs b/src/perl/Location.xs index cdbc7e7..b6c4dc5 100644 --- a/src/perl/Location.xs +++ b/src/perl/Location.xs @@ -113,6 +113,29 @@ lookup_country_code(db, address) OUTPUT: RETVAL +SV* +lookup_asn(db, address) + struct loc_database* db; + char* address; + + CODE: + RETVAL = &PL_sv_undef; + + // Lookup network + struct loc_network *network; + int err = loc_database_lookup_from_string(db, address, &network); + if (!err) { + // Extract the ASN + unsigned int as_number = loc_network_get_asn(network); + if (as_number > 0) { + RETVAL = newSViv(as_number); + } + + loc_network_unref(network); + } + OUTPUT: + RETVAL + void DESTROY(db) struct loc_database* db; -- 2.20.1

1 0

[PATCH 1/2] perl: Fix lookup if given address is invalid or not in DB.
by Stefan Schantl 02 Oct '19

02 Oct '19

In this case now undef will be returned. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- src/perl/Location.xs | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/perl/Location.xs b/src/perl/Location.xs index ab27f0b..cdbc7e7 100644 --- a/src/perl/Location.xs +++ b/src/perl/Location.xs @@ -92,27 +92,23 @@ get_license(db) # # Lookup functions # -char* +SV* lookup_country_code(db, address) struct loc_database* db; char* address; CODE: + RETVAL = &PL_sv_undef; + // Lookup network struct loc_network *network; int err = loc_database_lookup_from_string(db, address, &network); - if (err) { - croak("Could not look up for %s\n", address); - } - - // Extract the country code - const char* country_code = loc_network_get_country_code(network); - loc_network_unref(network); + if (!err) { + // Extract the country code + const char* country_code = loc_network_get_country_code(network); + RETVAL = newSVpv(country_code, strlen(country_code)); - if (country_code) { - RETVAL = strdup(country_code); - } else { - RETVAL = NULL; + loc_network_unref(network); } OUTPUT: RETVAL -- 2.20.1

1 1

2024

2023

2022

2021

2020

2019

2018

2017

Location